tengine_support 0.3.17 → 0.3.18

data/VERSION

@@ -1 +1 @@
-0.3.17
+0.3.18

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

@@ -6,9 +6,9 @@ module Tengine::Support::Config::Definition::HasManyChildren
     @children ||= []
   end
 
-  def child_by_name(__name__)
-    __name__= __name__.to_sym if __name__.respond_to?(:to_sym)
-    children.detect{|child| child.__name__ == __name__}
+  def child_by_name(name)
+    name = name.to_sym if name.respond_to?(:to_sym)
+    children.detect{|child| child.__name__ == name}
   end
 
   def find(name_array)
@@ -21,16 +21,16 @@ module Tengine::Support::Config::Definition::HasManyChildren
     end
   end
 
-  def add(__name__, klass, options = {}, &block)
+  def add(name, klass, options = {}, &block)
     result = klass.new
     result.__parent__ = self
-    result.__name__ = __name__
+    result.__name__ = name
     result.instantiate_children
 
     dependencies = options[:dependencies] || {}
     klass.definition_reference_names.each do |res_name|
       name_array = dependencies[res_name]
-      raise "missing dependency of #{__name__.inspect} in :dependencies options to add(#{__name__.inspect}, #{klass.name}...)" unless name_array
+      raise "missing dependency of #{name.inspect} in :dependencies options to add(#{name.inspect}, #{klass.name}...)" unless name_array
       obj = root.find(Array(name_array))
       raise "#{name_array.inspect} not found" unless obj
       result.send("#{res_name}=", obj)
@@ -49,30 +49,30 @@ module Tengine::Support::Config::Definition::HasManyChildren
     end
 
     children << result
-    (class << self; self; end).class_eval{ define_method(__name__){ result } }
+    (class << self; self; end).class_eval{ define_method(name){ result } }
     result.instance_eval(&block) if block
     result
   end
 
-  def group(__name__, options = {}, &block)
-    result = Tengine::Support::Config::Definition::Group.new(__name__, options)
+  def group(name, options = {}, &block)
+    result = Tengine::Support::Config::Definition::Group.new(name, options)
     result.__parent__ = self
-    (class << self; self; end).class_eval{ define_method(__name__){ result } }
+    (class << self; self; end).class_eval{ define_method(name){ result } }
     children << result
     result.instance_eval(&block) if block
     result
   end
 
-  def field(__name__, *args, &block)
+  def field(name, *args, &block)
     attrs = args.last.is_a?(Hash) ? args.pop : {}
     attrs[:description] = args.first unless args.empty?
     attrs.update({
-        :__name__ => __name__,
+        :__name__ => name,
         :__parent__ => self,
         :__block__ => block,
         :__type__ => attrs[:__type__] || :field,
       })
-    if field = children.detect{|child| child.__name__ == __name__}
+    if field = children.detect{|child| child.__name__ == name}
       new_field = field.dup
       new_field.update(attrs)
       idx = self.children.index(field)
@@ -100,10 +100,16 @@ module Tengine::Support::Config::Definition::HasManyChildren
     end
   end
 
-  def action(__name__, *args, &block)
+  def ignore(*names)
+    @ignoreds ||= []
+    names = names.flatten.map(&:to_sym)
+    @ignoreds.concat(names)
+  end
+
+  def action(name, *args, &block)
     attrs = args.last.is_a?(Hash) ? args.pop : {}
     attrs.update({
-        :__name__ => __name__,
+        :__name__ => name,
         :__parent__ => self,
         :__block__ => block,
         :__type__ => :action,
@@ -149,11 +155,16 @@ module Tengine::Support::Config::Definition::HasManyChildren
   end
 
   def load(hash)
-    hash.each do |__name__, value|
-      child = child_by_name(__name__)
-      raise "child not found for #{__name__.inspect} on #{__name__}" unless child
+    hash.each do |name, value|
+      name = name.to_sym
+      next if @ignoreds && @ignoreds.include?(name)
+      child = child_by_name(name)
+      unless child
+        where = respond_to?(:__name__) ? " on " + __name__.inspect : ""
+        raise "child not found for #{name.inspect}#{where}"
+      end
       if child.is_a?(Tengine::Support::Config::Definition::Field)
-        self.send("#{__name__}=", value)
+        self.send("#{name}=", value)
       else
         child.load(value)
       end

data/spec/support/suite.rb

@@ -34,6 +34,7 @@ EOS
     add(:process_stderr_log, App1::LoggerConfig,
       :parameters => { :logger_name => "#{File.basename(__FILE__, '.*')}_stderr" },
       :dependencies => { :process_config => :process, :log_common => :log_common,}, &hide_about_rotation)
+    ignore(:app2_settings, :app3_settings)
     separator("\nGeneral:")
     __action__(:version, "show version"){ STDOUT.puts "1.1.1"; exit }
     __action__(:dump_skelton, "dump skelton of config"){ STDOUT.puts YAML.dump(root.to_hash); exit }
@@ -53,7 +54,7 @@ EOS
 end
 
 # build_suite1 との違いは、:dbが Tengine::Support::Config::Mongoid::Connectionではなくて、
-# 単なるhashのfieldとして定義している点です
+# 単なるhashのfieldとして定義している点と ignore(:app2_settings, :app3_settings) の定義がない点です。
 def build_suite2
   Tengine::Support::Config.suite do
     banner <<EOS

data/spec/tengine/support/config_spec/load_spec.rb

@@ -126,6 +126,16 @@ describe "config" do
       it_should_behave_like "load_spec_01.yml's data with db config"
     end
 
+    describe :load_file do
+      before(:all) do
+        @suite = build_suite1
+        @suite.load_file(File.expand_path('load_spec_01_with_other_settings.yml.erb', File.dirname(__FILE__)))
+      end
+      subject{ @suite }
+      it_should_behave_like "load_spec_01.yml's data common"
+      it_should_behave_like "load_spec_01.yml's data with db config"
+    end
+
     describe :load_file_by_suite3 do
       before(:all) do
         @suite = build_suite3

data/spec/tengine/support/config_spec/load_spec_01_with_other_settings.yml.erb

@@ -0,0 +1,48 @@
+process:
+  daemon: true
+  pid_dir: "./tmp/pids"
+
+db:
+  host: 'localhost'
+  port: 27020
+  username:
+  password:
+  database: 'tengine_production'
+
+event_queue:
+  connection:
+    host: 'rabbitmq1'
+    port: 5672
+    # vhost:
+    # user:
+    # pass:
+  exchange:
+    name: 'tengine_event_exchange'
+    type: 'direct'
+    durable: true
+  queue:
+    name: 'tengine_event_queue'
+    durable: true
+
+log_common:
+  rotation: 5
+  rotation_size: <%= 1024 * 1024 * 1024 %>
+  level: 'info'
+
+application_log:
+  output: "log/application.log"
+  rotation: 'daily'
+  level: 'debug'
+
+process_stdout_log:
+  output: "log/stdout.log"
+  level: 'warn'
+
+process_stderr_log:
+  output: "log/stderr.log"
+  level: 'info'
+
+app2_settings: foo
+app3_settings:
+  foo: 10
+  bar: 20

data/tengine_support.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "tengine_support"
-  s.version = "0.3.17"
+  s.version = "0.3.18"
 
   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"]
@@ -57,6 +57,7 @@ Gem::Specification.new do |s|
     "spec/tengine/support/config_spec/load_config_file_by_config_option_spec.rb",
     "spec/tengine/support/config_spec/load_spec.rb",
     "spec/tengine/support/config_spec/load_spec_01.yml.erb",
+    "spec/tengine/support/config_spec/load_spec_01_with_other_settings.yml.erb",
     "spec/tengine/support/config_spec/load_spec_02.yml.erb",
     "spec/tengine/support/config_spec/parse_spec.rb",
     "spec/tengine/support/core_ext/array/deep_dup_spec.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tengine_support
 version: !ruby/object:Gem::Version
-  version: 0.3.17
+  version: 0.3.18
   prerelease: 
 platform: ruby
 authors:
@@ -24,7 +24,7 @@ date: 2011-11-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70103819887020 !ruby/object:Gem::Requirement
+  requirement: &70145159644480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70103819887020
+  version_requirements: *70145159644480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70103819885900 !ruby/object:Gem::Requirement
+  requirement: &70145159644000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70103819885900
+  version_requirements: *70145159644000
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70103819884700 !ruby/object:Gem::Requirement
+  requirement: &70145159643420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *70103819884700
+  version_requirements: *70145159643420
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70103819862800 !ruby/object:Gem::Requirement
+  requirement: &70145159642880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.18
   type: :development
   prerelease: false
-  version_requirements: *70103819862800
+  version_requirements: *70145159642880
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70103819861580 !ruby/object:Gem::Requirement
+  requirement: &70145159642280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70103819861580
+  version_requirements: *70145159642280
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70103819860420 !ruby/object:Gem::Requirement
+  requirement: &70145159641680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *70103819860420
+  version_requirements: *70145159641680
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70103819858940 !ruby/object:Gem::Requirement
+  requirement: &70145159641100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70103819858940
+  version_requirements: *70145159641100
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70103819857380 !ruby/object:Gem::Requirement
+  requirement: &70145159640520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70103819857380
+  version_requirements: *70145159640520
 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
@@ -159,6 +159,7 @@ files:
 - spec/tengine/support/config_spec/load_config_file_by_config_option_spec.rb
 - spec/tengine/support/config_spec/load_spec.rb
 - spec/tengine/support/config_spec/load_spec_01.yml.erb
+- spec/tengine/support/config_spec/load_spec_01_with_other_settings.yml.erb
 - spec/tengine/support/config_spec/load_spec_02.yml.erb
 - spec/tengine/support/config_spec/parse_spec.rb
 - spec/tengine/support/core_ext/array/deep_dup_spec.rb
@@ -186,7 +187,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1778274084898480628
+      hash: 643492627916563818
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: