steno 0.0.10 → 0.0.12

data/lib/steno/config.rb

@@ -23,28 +23,49 @@ class Steno::Config
     # @return [Steno::Config]
     def from_file(path, overrides = {})
       h = YAML.load_file(path)
-
       h = h["logging"] || {}
+      new(to_config_hash(h).merge(overrides))
+    end
+
+    def from_hash(hash)
+      new(to_config_hash(hash))
+    end
 
+    def to_config_hash(hash)
+      hash ||= {}
+      hash = symbolize_keys(hash)
+
+      level = hash[:level] || hash[:default_log_level]
       opts = {
         :sinks => [],
-        :default_log_level => h["level"].nil? ? :info : h["level"].to_sym,
+        :default_log_level => level.nil? ? :info : level.to_sym
       }
 
-      if h["file"]
-        opts[:sinks] << Steno::Sink::IO.for_file(h["file"])
+      if hash[:file]
+        opts[:sinks] << Steno::Sink::IO.for_file(hash[:file])
       end
 
-      if h["syslog"]
-        Steno::Sink::Syslog.instance.open(h["syslog"])
+      if hash[:syslog]
+        Steno::Sink::Syslog.instance.open(hash[:syslog])
         opts[:sinks] << Steno::Sink::Syslog.instance
       end
 
-      if opts[:sinks].empty?
-        opts[:sinks] << Steno::Sink::IO.new(STDOUT)
+      opts[:sinks] << Steno::Sink::IO.new(STDOUT) if opts[:sinks].empty?
+      opts
+    end
+
+    def symbolize_keys(hash)
+      hash ||= {}
+      symbolized = {}
+      hash.each_key do |key|
+        if !key.is_a? Symbol
+          symbolized[key.to_sym] = hash[key]
+        else
+          symbolized[key] = hash[key]
+        end
       end
 
-      new(opts.merge(overrides))
+      symbolized
     end
   end
 
@@ -66,4 +87,6 @@ class Steno::Config
       @default_log_level = :info
     end
   end
+
+  private_class_method :symbolize_keys
 end

data/lib/steno/version.rb

@@ -1,3 +1,3 @@
 module Steno
-  VERSION = "0.0.10"
+  VERSION = "0.0.12"
 end

data/spec/unit/config_spec.rb

@@ -4,6 +4,52 @@ require "yaml"
 require "spec_helper"
 
 describe Steno::Config do
+  describe ".from_hash" do
+    before :each do
+      @log_path = "some_file"
+
+      @mock_sink_file = mock("sink")
+      @mock_sink_file.stub(:codec=)
+      Steno::Sink::IO.should_receive(:for_file).with(@log_path)
+        .and_return(@mock_sink_file)
+
+      @mock_sink_syslog = mock("sink")
+      @mock_sink_syslog.stub(:codec=)
+      @mock_sink_syslog.should_receive(:open).with("test")
+      Steno::Sink::Syslog.should_receive(:instance).twice()
+        .and_return(@mock_sink_syslog)
+    end
+
+    after :each do
+      @config = Steno::Config.from_hash(@hash)
+
+      @config.default_log_level.should == :debug2
+      @config.context.should.class == Steno::Context::Null
+      @config.codec.should.class == Steno::Codec::Json
+
+      @config.sinks.size.should == 2
+      @config.sinks.should =~ [@mock_sink_file, @mock_sink_syslog]
+    end
+
+    it "should work for symbolized keys" do
+      @hash = {
+        :file => @log_path,
+        :level => "debug2",
+        :default_log_level => "warn",
+        :syslog => "test"
+      }
+    end
+
+    it "should work for non-symbolized keys" do
+      @hash = {
+        "file" => @log_path,
+        "level" => "debug2",
+        "default_log_level" => "warn",
+        "syslog" => "test"
+      }
+    end
+  end
+
   describe ".from_file" do
     before :each do
       @tmpdir = Dir.mktmpdir
@@ -32,7 +78,14 @@ describe Steno::Config do
 
     it "should set the default_log_level if a key with the same name is supplied" do
       write_config(@config_path, { "level" => "debug2" })
+      Steno::Config.from_file(@config_path).default_log_level.should == :debug2
+
+      write_config(@config_path, { "default_log_level" => "debug2" })
+      Steno::Config.from_file(@config_path).default_log_level.should == :debug2
+    end
 
+    it "should read the 'level' key if both default_log_level and level are spscified" do
+      write_config(@config_path, { "level" => "debug2", "default_log_level" => "warn" })
       Steno::Config.from_file(@config_path).default_log_level.should == :debug2
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: steno
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-25 00:00:00.000000000Z
+date: 2012-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape
-  requirement: &18015280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18015280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &18014180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18014180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &18010240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18010240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &17993800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17993800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &17989080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17989080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &17978960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +101,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17978960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A thread-safe logging library designed to support multiple log destinations.
 email:
 - mpage@rbcon.com
@@ -148,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A logging library.