Merge branch 'TECH-4/Configuration-DSL'

reevoo · Aug 15, 2016 · 6043185 · 6043185
2 parents 25c1681 + ee35801
commit 6043185
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 8 deletions.
diff --git a/lib/sapience.rb b/lib/sapience.rb
@@ -13,6 +13,7 @@
 
 require "sapience/configuration"
 require "sapience/ansi_colors"
+require "sapience/core_ext/hash"
 require "sapience/core_ext/thread"
 require "sapience/base"
 require "sapience/log"

diff --git a/lib/sapience/core_ext/hash.rb b/lib/sapience/core_ext/hash.rb
@@ -0,0 +1,25 @@
+class Hash
+  # Returns a Hash with all keys symbolized
+  def deep_symbolize_keys!
+    deep_transform_keys! { |key| key.to_sym rescue key } # rubocop:disable RescueModifier
+  end
+
+  def deep_transform_keys!(&block)
+    _deep_transform_keys_in_object!(self, &block)
+  end
+
+  def _deep_transform_keys_in_object!(object, &block)
+    case object
+    when Hash
+      object.keys.each do |key|
+        value = object.delete(key)
+        object[yield(key)] = _deep_transform_keys_in_object!(value, &block)
+      end
+      object
+    when Array
+      object.map! { |e| _deep_transform_keys_in_object!(e, &block)}
+    else
+      object
+    end
+  end
+end
diff --git a/lib/sapience/logger.rb b/lib/sapience/logger.rb
@@ -120,7 +120,7 @@ def self.queue
     #   By default logs to STDERR
     def self.logger
       @@logger ||= begin
-        l      = Sapience::Appender::File.new(STDERR, :warn)
+        l      = Sapience::Appender::File.new(io: STDERR, level: :warn)
         l.name = name
         l
       end

diff --git a/lib/sapience/sapience.rb b/lib/sapience/sapience.rb
@@ -334,10 +334,11 @@ def self.constantize_symbol(symbol, namespace = "Sapience::Appender")
     klass = "#{namespace}::#{camelize(symbol.to_s)}"
     constantize(klass)
   rescue NameError
-    raise(ArgumentError, "Could not convert symbol: #{symbol} to a class in: #{namespace}. Looking for: #{class_name}")
+    raise(ArgumentError, "Could not convert symbol: #{symbol} to a class in: #{namespace}. Looking for: #{klass}")
   end
 
   def self.constantize(class_name)
+    return class_name unless class_name.is_a?(String)
     if RUBY_VERSION.to_i >= 2
       Object.const_get(class_name)
     else

diff --git a/spec/lib/sapience/appender/file_spec.rb b/spec/lib/sapience/appender/file_spec.rb
@@ -85,7 +85,7 @@
 
   describe "custom formatter" do
     before do
-      @appender = Sapience::Appender::File.new(@io) do |log|
+      @appender = Sapience::Appender::File.new(io: @io) do |log|
         if log.tags and (log.tags.size > 0)
           tags = (log.tags.collect { |tag| "[#{tag}]" }.join(" ") + " ")
         end

diff --git a/spec/lib/sapience/appender/sentry_spec.rb b/spec/lib/sapience/appender/sentry_spec.rb
@@ -17,7 +17,7 @@
             error_message: "AppenderRavenTest log message",
             context: {
               pid: a_kind_of(Integer),
-              thread: nil,
+              thread: a_kind_of(String),
               time: a_kind_of(Time),
               level: level,
               level_index: a_kind_of(Integer),
@@ -42,7 +42,7 @@
             name: "Sapience::Appender::Sentry",
             message: "AppenderRavenTest log message",
             pid: a_kind_of(Integer),
-            thread: nil,
+            thread: a_kind_of(String),
             time: a_kind_of(Time),
             level: level,
             level_index: a_kind_of(Integer),
@@ -66,7 +66,7 @@
             error_message: "AppenderRavenTest log message",
             context: {
               pid: a_kind_of(Integer),
-              thread: nil,
+              thread: a_kind_of(String),
               time: a_kind_of(Time),
               level: level,
               level_index: a_kind_of(Integer),
@@ -88,7 +88,7 @@
             name: "Sapience::Appender::Sentry",
             message: "AppenderRavenTest log message",
             pid: a_kind_of(Integer),
-            thread: nil,
+            thread: a_kind_of(String),
             time: a_kind_of(Time),
             level: level,
             level_index: a_kind_of(Integer),

diff --git a/spec/lib/sapience/loggable_spec.rb b/spec/lib/sapience/loggable_spec.rb
@@ -66,7 +66,7 @@ class Subclass < Base
     before do
       @time = Time.new
       @io = StringIO.new
-      @appender = Sapience::Appender::File.new(@io)
+      @appender = Sapience::Appender::File.new(io: @io)
       Sapience.config.default_level = :trace
       @mock_logger = MockLogger.new
       @appender = Sapience.add_appender(:wrapper, logger: (@mock_logger))