simpleconf 0.0.3 → 0.0.4

data/lib/simpleconf/conf.rb

@@ -35,7 +35,12 @@ module SimpleConf
       fail "Other needs to be a SimpleConf::Conf" unless other.is_a? Conf
       check_and_change_overrides(other)
       self.__init_only__ = other.__init_only__
-      self.instance_eval(&other.__instance_block__)
+      if other.__instance_block__.is_a?(Proc)
+        self.instance_eval(&other.__instance_block__)
+      else
+        self.instance_eval(other.__instance_block__)
+      end
+
       __vars__.rmerge!(other.__vars__)
       nil
     end

data/lib/simpleconf/version.rb

@@ -1,3 +1,3 @@
 module SimpleConf
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/simpleconf_spec.rb

@@ -394,6 +394,40 @@ describe SimpleConf do
       @default.tree.ants.home.sq_feet.should == 5000
     end
 
+    it "should merge! a SimpleConf::Conf generated from a string" do
+      str = <<-EOS
+        port 90
+        socket "haha"
+        tree {
+          leafs 60, :override => false
+          bugs true
+          ants {
+            fast false
+            home {
+              big true
+              sq_feet 5000
+            }
+          }
+        }
+
+      EOS
+      @new = SimpleConf.build_from_string(str)
+
+      @default.merge!(@new)
+
+      @default.should be_an_instance_of(SimpleConf::Conf)
+
+      @default.server.should == "localhost"
+      @default.port.should == 90
+      @default.socket.should == "haha"
+      @default.tree.bugs.should == true
+      @default.tree.leafs.should == 60
+      @default.tree.height.should == 50
+      @default.tree.ants.big.should == false
+      @default.tree.ants.home.sq_feet.should == 5000
+
+    end
+
     it "should merge a SimpleConf::Conf" do
 
       new_conf = @default.merge(@new)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simpleconf
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-27 00:00:00.000000000Z
+date: 2011-07-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blankslate
-  requirement: &2152682220 !ruby/object:Gem::Requirement
+  requirement: &2154712360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152682220
+  version_requirements: *2154712360
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152681800 !ruby/object:Gem::Requirement
+  requirement: &2154711940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152681800
+  version_requirements: *2154711940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152681380 !ruby/object:Gem::Requirement
+  requirement: &2154711520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152681380
+  version_requirements: *2154711520
 description: Simple Configuration DSL that supports merging, locking and more.
 email:
 - ft.mikelewis@gmail.com