tengine_support 0.3.11 → 0.3.12

data/VERSION

@@ -1 +1 @@
-0.3.11
+0.3.12

data/lib/tengine/support/config/logger.rb

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 require 'tengine/support/config'
+require 'active_support/hash_with_indifferent_access'
 
 class Tengine::Support::Config::Logger
   include Tengine::Support::Config::Definition
@@ -19,18 +20,22 @@ class Tengine::Support::Config::Logger
   # field :formatter, 'Logging formatter, as a Proc that will take four arguments and return the formatted message.',
   #   :type => :proc, :hidden => true
 
-  def new_logger
-    case output
+  def new_logger(options = {})
+    options = ActiveSupport::HashWithIndifferentAccess.new(to_hash).update(options || {})
+    case output = options[:output]
     when "NULL" then return Tengine::Support::NullLogger.new
     when "STDOUT" then dev = STDOUT
     when "STDERR" then dev = STDERR
     else dev = output
     end
+    rotation = options[:rotation]
     shift_age = (rotation =~ /\A\d+\Z/) ? rotation.to_i : rotation
-    result = ::Logger.new(dev, shift_age, rotation_size)
-    result.level = ::Logger.const_get(level.to_s.upcase)
-    result.datetime_format = self.datetime_format if self.datetime_format
-    result.progname = self.progname if self.progname
+    result = ::Logger.new(dev, shift_age, options[:rotation_size])
+    result.level = ::Logger.const_get(options[:level].to_s.upcase)
+    dtf = options[:datetime_format]
+    result.datetime_format = dtf if dtf
+    progname = options[:progname]
+    result.progname = progname if progname
     result
   end
 

data/spec/tengine_support/config/logger_spec.rb

@@ -97,6 +97,18 @@ describe 'Tengine::Support::Config::Logger' do
       its(:progname){ should == nil}
     end
 
+    context "各属性の設定と引数を指定が両方ある場合" do
+      before{ @tempfile = Tempfile.new("test.log") }
+      after { @tempfile.close }
+      it "引数に指定されたオプションを優先" do
+        mock_logger = Logger.new("/dev/null")
+        Logger.should_receive(:new).with($stdout, nil, nil).and_return(mock_logger)
+        Tengine::Support::Config::Logger.new.tap{|c|
+          c.output = @tempfile.path
+        }.instantiate_children.new_logger(:output => $stdout)
+      end
+    end
+
     context "各属性を設定を指定する場合" do
       before{ @tempfile = Tempfile.new("test.log") }
       after { @tempfile.close }
@@ -143,7 +155,7 @@ describe 'Tengine::Support::Config::Logger' do
     end
 
     it "STDOUTの場合" do
-      config = Tengine::Support::Config::Logger.new
+      config = Tengine::Support::Config::Logger.new.instantiate_children
       config.output = "STDOUT"
       config.level = "warn"
       config.rotation = nil
@@ -159,7 +171,7 @@ describe 'Tengine::Support::Config::Logger' do
     end
 
     it "STDERRの場合" do
-      config = Tengine::Support::Config::Logger.new
+      config = Tengine::Support::Config::Logger.new.instantiate_children
       config.output = "STDERR"
       config.level = "warn"
       config.rotation = nil
@@ -171,7 +183,7 @@ describe 'Tengine::Support::Config::Logger' do
     end
 
     it "NULLの場合" do
-      config = Tengine::Support::Config::Logger.new
+      config = Tengine::Support::Config::Logger.new.instantiate_children
       config.output = "NULL"
       config.level = "warn"
       config.rotation = nil
@@ -191,7 +203,7 @@ describe 'Tengine::Support::Config::Logger' do
 
       %w[daily weekly monthly].each do |shift_age|
         it "shift_age が #{shift_age}" do
-          config = Tengine::Support::Config::Logger.new
+          config = Tengine::Support::Config::Logger.new.instantiate_children
           config.output = @filepath
           config.level = "info"
           config.rotation = shift_age
@@ -204,7 +216,7 @@ describe 'Tengine::Support::Config::Logger' do
       end
 
       it "shift_ageが整数値" do
-        config = Tengine::Support::Config::Logger.new
+        config = Tengine::Support::Config::Logger.new.instantiate_children
         config.output = @filepath
         config.level = "info"
         config.rotation = "3"

data/tengine_support.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "tengine_support"
-  s.version = "0.3.11"
+  s.version = "0.3.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["saishu", "w-irie", "taigou", "totty", "hiroshinakao", "g-morita", "guemon", "aoetk", "hattori-at-nt", "t-yamada", "y-karashima", "akm"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tengine_support
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
   prerelease: 
 platform: ruby
 authors:
@@ -24,7 +24,7 @@ date: 2011-11-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70216845797360 !ruby/object:Gem::Requirement
+  requirement: &70214217947760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70216845797360
+  version_requirements: *70214217947760
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70216845796800 !ruby/object:Gem::Requirement
+  requirement: &70214217946120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70216845796800
+  version_requirements: *70214217946120
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70216845796300 !ruby/object:Gem::Requirement
+  requirement: &70214217945180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *70216845796300
+  version_requirements: *70214217945180
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70216845795800 !ruby/object:Gem::Requirement
+  requirement: &70214217944200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.18
   type: :development
   prerelease: false
-  version_requirements: *70216845795800
+  version_requirements: *70214217944200
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70216845795300 !ruby/object:Gem::Requirement
+  requirement: &70214217927660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70216845795300
+  version_requirements: *70214217927660
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70216845787120 !ruby/object:Gem::Requirement
+  requirement: &70214217926460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *70216845787120
+  version_requirements: *70214217926460
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70216845786560 !ruby/object:Gem::Requirement
+  requirement: &70214217924640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70216845786560
+  version_requirements: *70214217924640
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70216845786080 !ruby/object:Gem::Requirement
+  requirement: &70214217922500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70216845786080
+  version_requirements: *70214217922500
 description: tengine_support provides utility classes/modules which is not included
   in active_support. It doesn't depend on other tengine gems.
 email: tengine@nautilus-technologies.com
@@ -177,7 +177,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2994922577368363732
+      hash: -155991243744560425
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: