tengine_support 0.3.8 → 0.3.9

data/VERSION

@@ -1 +1 @@
-0.3.8
+0.3.9

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

@@ -83,7 +83,11 @@ module Tengine::Support::Config::Definition::HasManyChildren
       self.children << field
     end
     (class << self; self; end).module_eval do
-      attr_accessor field.__name__
+      define_method(field.__name__) do
+        instance_variable_get("@#{field.__name__}") || 
+          (field.default.respond_to?(:to_proc) ? self.instance_eval(&field.deault) : field.default)
+      end
+      attr_writer field.__name__
     end
   end
 

data/spec/support/suite.rb

@@ -65,7 +65,13 @@ EOS
     field(:action, "test|load|start|enable|stop|force-stop|status|activate", :type => :string, :default => "start")
     load_config(:config, "path/to/config_file", :type => :string)
     add(:process, App1::ProcessConfig)
-    field(:db, "settings to connect to db", :type => :hash)
+    field(:db, "settings to connect to db", :type => :hash, :default => {
+        :host => 'localhost',
+        :port => 27017,
+        :username => nil,
+        :password => nil,
+        :database => 'tengine_production',
+      })
     group(:event_queue, :hidden => true) do
       add(:connection, Tengine::Support::Config::Amqp::Connection)
       add(:exchange  , Tengine::Support::Config::Amqp::Exchange, :defaults => {:name => 'tengine_event_exchange'})
@@ -107,7 +113,7 @@ end
 
 
 
-# build_suite1 との違いは、Tengine::Support::Config::Definition::Suiteを直接newするのではなく
+# build_suite2 との違いは、Tengine::Support::Config::Definition::Suiteを直接newするのではなく
 # 継承したものをnewしている点です。それ以外は変わりません
 def build_suite3(*args)
   ConfigSuite3.new(*args)
@@ -124,7 +130,15 @@ EOS
     field(:action, "test|load|start|enable|stop|force-stop|status|activate", :type => :string, :default => "start")
     load_config(:config, "path/to/config_file", :type => :string)
     add(:process, App1::ProcessConfig)
-    add(:db, Tengine::Support::Config::Mongoid::Connection, :defaults => {:database => "tengine_production"})
+    # field(:db, "settings to connect to db", :type => :hash,
+    #   :default => {:database => "tengine_production"})
+    field(:db, "settings to connect to db", :type => :hash, :default => {
+        :host => 'localhost',
+        :port => 27017,
+        :username => nil,
+        :password => nil,
+        :database => 'tengine_production',
+      })
     group(:event_queue, :hidden => true) do
       add(:connection, Tengine::Support::Config::Amqp::Connection)
       add(:exchange  , Tengine::Support::Config::Amqp::Exchange, :defaults => {:name => 'tengine_event_exchange'})

data/spec/tengine_support/config_spec/dump_skelton_spec.rb

@@ -71,7 +71,6 @@ describe "dump_skelton" do
   end
 
 
-  context :suite2 do
     suite2_skelton = {
       :action => 'start',
       :config => nil,
@@ -79,7 +78,13 @@ describe "dump_skelton" do
         :daemon => nil,
         :pid_dir => nil,
       },
-      :db => nil,
+      :db => {
+        :host => 'localhost',
+        :port => 27017,
+        :username => nil,
+        :password => nil,
+        :database => 'tengine_production',
+      },
       :event_queue => {
         :connection => {
           :host => 'localhost',
@@ -122,14 +127,34 @@ describe "dump_skelton" do
       }.freeze,
     }
 
+
+  context :suite2 do
+    subject{ build_suite2 }
     it do
-      @suite = build_suite2
       STDOUT.should_receive(:puts).with(YAML.dump(suite2_skelton))
       expect{
-        @suite.parse!(%w[--dump-skelton])
+        subject.parse!(%w[--dump-skelton])
       }.to raise_error(SystemExit)
     end
+  end
 
+  context :suite3 do
+    subject{ build_suite3 }
+    it do
+      STDOUT.should_receive(:puts).with(YAML.dump(suite2_skelton))
+      expect{
+        subject.parse!(%w[--dump-skelton])
+      }.to raise_error(SystemExit)
+    end
+    it do
+      subject.db.should == {
+        :host => 'localhost',
+        :port => 27017,
+        :username => nil,
+        :password => nil,
+        :database => 'tengine_production',
+      }
+    end
   end
 
 end

data/spec/tengine_support/config_spec/load_config_file_by_config_option_spec.rb

@@ -42,7 +42,7 @@ describe "config" do
       end
 
       shared_examples_for "load_config_file_by_config_option_on_file" do
-        it { subject.action.should == nil}
+        it { subject.action.should == 'start'}
         it { subject.config.should == nil}
         it { subject.log_common.level.should == "info"}
         it { subject.process_stdout_log.level.should == "warn"}

data/spec/tengine_support/config_spec/load_spec.rb

@@ -6,7 +6,7 @@ require 'tengine/support/yaml_with_erb'
 describe "config" do
   shared_examples_for "load_spec_01.yml's data common" do
     describe "accessors" do
-      it { subject.action.should == nil}
+      it { subject.action.should == "start"}
       it { subject.config.should == nil}
       it { subject.process.should be_a(App1::ProcessConfig) }
       it { subject.process.daemon.should == true}
@@ -37,7 +37,7 @@ describe "config" do
     end
 
     describe "like Hash" do
-      it { subject[:action].should == nil}
+      it { subject[:action].should == "start"}
       it { subject[:config].should == nil}
       it { subject[:process].should be_a(App1::ProcessConfig) }
       it { subject[:process][:daemon].should == true}
@@ -91,6 +91,20 @@ describe "config" do
     end
   end
 
+  shared_examples_for "load_spec_01.yml's data with db Hash" do
+    describe "accessors" do
+      it do
+        subject.db.should == {
+          'host'=> "localhost",
+          'port' => 27020,
+          'username' => nil,
+          'password' => nil,
+          'database' => "tengine_production"
+        }
+      end
+    end
+  end
+
   context "app1 setting" do
     describe :load do
       before(:all) do
@@ -119,7 +133,7 @@ describe "config" do
       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"
+      it_should_behave_like "load_spec_01.yml's data with db Hash"
     end
 
     describe :load_file_by_suite3_with_filepath do
@@ -128,7 +142,7 @@ describe "config" do
       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"
+      it_should_behave_like "load_spec_01.yml's data with db Hash"
     end
 
     describe :load_file_by_suite3_with_hash do
@@ -137,7 +151,7 @@ describe "config" do
       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"
+      it_should_behave_like "load_spec_01.yml's data with db Hash"
     end
 
 

data/spec/tengine_support/config_spec.rb

@@ -33,7 +33,7 @@ describe "config" do
       end
 
       describe "accessors" do
-        it { subject.action.should == nil}
+        it { subject.action.should == "start"}
         it { subject.config.should == nil}
         it { subject.process.should be_a(App1::ProcessConfig) }
         it { subject.process.daemon.should == nil}

data/tengine_support.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "tengine_support"
-  s.version = "0.3.8"
+  s.version = "0.3.9"
 
   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.8
+  version: 0.3.9
   prerelease: 
 platform: ruby
 authors:
@@ -24,7 +24,7 @@ date: 2011-11-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70128460903100 !ruby/object:Gem::Requirement
+  requirement: &70223758524920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70128460903100
+  version_requirements: *70223758524920
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70128460901720 !ruby/object:Gem::Requirement
+  requirement: &70223758524320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70128460901720
+  version_requirements: *70223758524320
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70128460900180 !ruby/object:Gem::Requirement
+  requirement: &70223758523720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *70128460900180
+  version_requirements: *70223758523720
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70128460898040 !ruby/object:Gem::Requirement
+  requirement: &70223758523180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.18
   type: :development
   prerelease: false
-  version_requirements: *70128460898040
+  version_requirements: *70223758523180
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70128460896360 !ruby/object:Gem::Requirement
+  requirement: &70223758522660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70128460896360
+  version_requirements: *70223758522660
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70128460894640 !ruby/object:Gem::Requirement
+  requirement: &70223758522060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *70128460894640
+  version_requirements: *70223758522060
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70128460891220 !ruby/object:Gem::Requirement
+  requirement: &70223758521460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70128460891220
+  version_requirements: *70223758521460
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70128458416220 !ruby/object:Gem::Requirement
+  requirement: &70223758520860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70128458416220
+  version_requirements: *70223758520860
 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: 3648561208823462858
+      hash: 952268646322731472
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: