loquacious 1.6.3 → 1.6.4

data/History.txt

@@ -1,3 +1,9 @@
+== 1.6.4 / 2010-06-08
+
+* Bug Fixes
+  * Extending a configuration was not working properly
+  * Descriptions were being overwritten when extending a configuration
+
 == 1.6.3 / 2010-06-07
 
 * Bug Fixes

data/lib/loquacious/configuration.rb

@@ -27,12 +27,10 @@ module Loquacious
           return @table.has_key?(name) ? @table[name] : nil
         end
 
-        cfg = DSL.evaluate(&block)
-
         if @table.has_key? name
-          @table[name].merge! cfg
+          DSL.new(@table[name], &block)
         else
-          @table[name] = cfg
+          @table[name] = DSL.evaluate(&block)
         end
       end
 
@@ -105,7 +103,7 @@ module Loquacious
         end
       CODE
 
-      __desc[m] = nil
+      __desc[m] = nil unless __desc.has_key? m
 
       default = (args.empty? and !block) ? Loquacious::Undefined.new(m.to_s) : nil
       self.__send("#{m}=", default)
@@ -184,6 +182,8 @@ module Loquacious
     # configuration object.
     #
     class DSL
+      alias :__instance_eval :instance_eval
+
       instance_methods(true).each do |m|
         next if m[Keepers]
         undef_method m
@@ -215,11 +215,10 @@ module Loquacious
       # Creates a new DSL and evaluates the given _block_ in the context of
       # the DSL.
       #
-      def initialize( &block )
+      def initialize( config = nil, &block )
         @description = nil
-        @__config = Configuration.new
-        Object.instance_method(:instance_eval).bind(self).
-            call(&block) if block
+        @__config = config || Configuration.new
+        __instance_eval(&block)
       end
 
       # Dynamically adds the given _method_ to the configuration as an
@@ -235,10 +234,10 @@ module Loquacious
           self.desc(opts[:desc]) if opts.has_key? :desc
         end
 
-        __config.__send(m, *args, &block)
-        __config.__desc[m] = @description
-
+        rv = __config.__send(m, *args, &block)
+        __config.__desc[m] = @description if @description
         @description = nil
+        rv
       end
 
       # Store the _string_ as the description for the next attribute that

data/spec/configuration_spec.rb

@@ -124,6 +124,56 @@ describe Loquacious::Configuration do
     obj.third.should == 'Hello World!'
   end
 
+  it 'should return a value when evaluating inside the DSL' do
+    obj = Loquacious::Configuration.new  {
+            first   'foo'
+            second  {
+              bar    nil
+            }
+          }
+
+    obj.first.should == 'foo'
+    obj.second.bar.should be_nil
+
+    Loquacious::Configuration::DSL.new(obj) {
+      first 'bar'
+      second.bar 'no longer nil'
+    }
+
+    obj.first.should == 'bar'
+    obj.second.bar.should == 'no longer nil'
+  end
+
+  it 'should not delete descriptions' do
+    obj = Loquacious::Configuration.new  {
+            first 'foo', :desc => 'the first value'
+
+            desc 'the second value'
+            second  {
+              bar nil, :desc => 'time to go drinking'
+            }
+          }
+
+    obj.first.should == 'foo'
+    obj.second.bar.should be_nil
+
+    obj.__desc[:first].should == 'the first value'
+    obj.__desc[:second].should == 'the second value'
+    obj.second.__desc[:bar].should == 'time to go drinking'
+
+    Loquacious::Configuration::DSL.new(obj) {
+      first 'bar'
+      second.bar 'no longer nil'
+    }
+
+    obj.first.should == 'bar'
+    obj.second.bar.should == 'no longer nil'
+
+    obj.__desc[:first].should == 'the first value'
+    obj.__desc[:second].should == 'the second value'
+    obj.second.__desc[:bar].should == 'time to go drinking'
+  end
+
   # -----------------------------------------------------------------------
   describe 'when merging' do
 

data/version.txt

@@ -1 +1 @@
-1.6.3
+1.6.4

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 6
-  - 3
-  version: 1.6.3
+  - 4
+  version: 1.6.4
 platform: ruby
 authors: 
 - Tim Pease
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-07 00:00:00 -06:00
+date: 2010-06-08 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency