tengine_support 0.3.21 → 0.3.22

data/VERSION

@@ -1 +1 @@
-0.3.21
+0.3.22

data/lib/tengine/support/config/definition/field.rb

@@ -28,8 +28,8 @@ class Tengine::Support::Config::Definition::Field
     ].join(' ')
   end
 
-  def default_value
-    default.respond_to?(:to_proc) ? __parent__.instance_eval(&default) : default
+  def default_value(context = __parent__)
+    default.respond_to?(:to_proc) ? context.instance_eval(&default) : default
   end
 
   def to_hash
@@ -57,7 +57,7 @@ class Tengine::Support::Config::Definition::Field
     '--' << name_array.join('-').gsub(%r{_}, '-')
   end
 
-  def convert(value)
+  def convert(value, context = self)
     return convertor.call(value) if convertor
     result = case self.type
     when :boolean then !!value
@@ -65,7 +65,7 @@ class Tengine::Support::Config::Definition::Field
     when :string then value.nil? ? nil : value.to_s
     else value
     end
-    result ||= default_value
+    result ||= default_value(context)
     if self.enum && !self.enum.include?(result)
       raise ArgumentError, "must be one of #{self.enum.inspect} but was #{result.inspect}"
     end

data/lib/tengine/support/config/definition/has_many_children.rb

@@ -88,7 +88,7 @@ module Tengine::Support::Config::Definition::HasManyChildren
           (field.default.respond_to?(:to_proc) ? self.instance_eval(&field.deault) : field.default)
       end
       define_method("#{field.__name__}=") do |value|
-        instance_variable_set("@#{field.__name__}", field.convert(value))
+        instance_variable_set("@#{field.__name__}", field.convert(value, self))
       end
     end
   end

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

@@ -62,7 +62,7 @@ module Tengine::Support::Config::Definition
         end
 
         define_method("#{field.__name__}=") do |value|
-          instance_variable_set("@#{field.__name__}", field.convert(value))
+          instance_variable_set("@#{field.__name__}", field.convert(value, self))
         end
       end
     end

data/spec/tengine/support/config_spec.rb

@@ -197,4 +197,20 @@ describe "config" do
     end
   end
 
+  describe ConfigSuite3 do
+    context "instance" do
+      subject{ ConfigSuite3.new }
+
+      it "ログの出力先のデフォルト値" do
+        subject.application_log.output.should == "STDOUT"
+      end
+
+      it "明示的にnilを設定してもデフォルト値が得られる" do
+        subject.application_log.output = nil
+        subject.application_log.output.should == "STDOUT"
+      end
+
+    end
+  end
+
 end

data/tengine_support.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "tengine_support"
-  s.version = "0.3.21"
+  s.version = "0.3.22"
 
   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.21
+  version: 0.3.22
   prerelease: 
 platform: ruby
 authors:
@@ -24,7 +24,7 @@ date: 2011-11-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70301920082660 !ruby/object:Gem::Requirement
+  requirement: &70308831312360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70301920082660
+  version_requirements: *70308831312360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70301920082060 !ruby/object:Gem::Requirement
+  requirement: &70308831311760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70301920082060
+  version_requirements: *70308831311760
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70301920081480 !ruby/object:Gem::Requirement
+  requirement: &70308831311160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *70301920081480
+  version_requirements: *70308831311160
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70301920080900 !ruby/object:Gem::Requirement
+  requirement: &70308831310560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.18
   type: :development
   prerelease: false
-  version_requirements: *70301920080900
+  version_requirements: *70308831310560
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70301920080300 !ruby/object:Gem::Requirement
+  requirement: &70308831309960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70301920080300
+  version_requirements: *70308831309960
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70301920079700 !ruby/object:Gem::Requirement
+  requirement: &70308831309360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *70301920079700
+  version_requirements: *70308831309360
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70301920079100 !ruby/object:Gem::Requirement
+  requirement: &70308831294480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70301920079100
+  version_requirements: *70308831294480
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70301920078540 !ruby/object:Gem::Requirement
+  requirement: &70308831293940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70301920078540
+  version_requirements: *70308831293940
 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
@@ -187,7 +187,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 925940090621977484
+      hash: -2904345591237646766
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: