loquacious 1.6.4 → 1.7.0

data/History.txt

@@ -1,3 +1,10 @@
+== 1.7.0 / 2010-08-16
+
+* Enhancements
+  * Adding a "copy" function for configuration objects
+* Bug Fixes
+  * Fixing warnings
+
 == 1.6.4 / 2010-06-08
 
 * Bug Fixes

data/lib/loquacious/configuration.rb

@@ -47,19 +47,19 @@ module Loquacious
       alias :help :help_for
     end
 
-    Keepers = %r/^__|^object_id$|^initialize$|^\w+\?$/
     instance_methods(true).each do |m|
-      next if m[Keepers]
+      next if m[::Loquacious::KEEPERS]
       undef_method m
     end
     Kernel.methods.each do |m|
-      next if m[Keepers]
+      next if m[::Loquacious::KEEPERS]
       module_eval <<-CODE
         def #{m}( *args, &block )
           self.method_missing('#{m}', *args, &block)
         end
       CODE
     end
+    undef_method :method_missing rescue nil
 
     # Accessor for the description hash.
     attr_reader :__desc
@@ -185,21 +185,22 @@ module Loquacious
       alias :__instance_eval :instance_eval
 
       instance_methods(true).each do |m|
-        next if m[Keepers]
+        next if m[::Loquacious::KEEPERS]
         undef_method m
       end
       private_instance_methods(true).each do |m|
-        next if m[Keepers]
+        next if m[::Loquacious::KEEPERS]
         undef_method m
       end
       Kernel.methods.each do |m|
-        next if m[Keepers]
+        next if m[::Loquacious::KEEPERS]
         module_eval <<-CODE
           def #{m}( *args, &block )
             self.method_missing('#{m}', *args, &block)
           end
         CODE
       end
+      undef_method :method_missing rescue nil
 
       # Create a new DSL and evaluate the given _block_ in the context of
       # the DSL. Returns a newly created configuration object.

data/lib/loquacious/undefined.rb

@@ -12,23 +12,23 @@ module Loquacious
   #
   class Undefined
 
-    Keepers = %r/^__|^object_id$|^initialize$|^call$|^\w+\?$/
     instance_methods(true).each do |m|
-      next if m[Keepers]
+      next if m[::Loquacious::KEEPERS]
       undef_method m
     end
     private_instance_methods(true).each do |m|
-      next if m[Keepers]
+      next if m[::Loquacious::KEEPERS]
       undef_method m
     end
     Kernel.methods.each do |m|
-      next if m[Keepers]
+      next if m[::Loquacious::KEEPERS]
       module_eval <<-CODE
         def #{m}( *args, &block )
           self.method_missing('#{m}', *args, &block)
         end
       CODE
     end
+    undef_method :method_missing rescue nil
 
     @io = $stderr
     @first_time = true
@@ -84,7 +84,7 @@ information about the undefined properties.
     def method_missing( method, *args, &block )
       key = @key.dup << method.to_s
       Undefined.warn key
-      return Undefined.new key
+      return Undefined.new(key)
     end
 
   end  # class Undefined

data/lib/loquacious.rb

@@ -4,6 +4,9 @@ module Loquacious
   # :stopdoc:
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
+  KEEPERS = (RUBY_PLATFORM == 'java') ?
+            %r/^__|^object_id$|^initialize$|^singleton_method_added$|^\w+\?$/ :
+            %r/^__|^object_id$|^initialize$|^\w+\?$/
   # :startdoc:
 
   class << self
@@ -78,6 +81,7 @@ module Loquacious
     #
     #   Loquacious.remove :gem           # courtesy of rubygems
     #   Loquacious.remove :test, :file   # courtesy of rake
+    #   Loquacious.remove :main          # courtesy of main
     #
     def remove( *args )
       args.each { |name|
@@ -91,6 +95,41 @@ module Loquacious
       }
     end
 
+    # A helper method that will create a deep copy of a given Configuration
+    # object. This method accepts either a Configuration instance or a name
+    # that can be used to lookup the Configuration instance (via the
+    # "Loquacious.configuration_for" method).
+    #
+    #   Loquacious.copy(config)
+    #   Loquacious.copy('name')
+    #
+    # Optionally a block can be given. It will be used to modify the returned
+    # copy with the given values. The Configuration object being copied is
+    # never modified by this method.
+    #
+    #   Loquacious.copy(config) {
+    #     foo 'bar'
+    #     baz 'buz'
+    #   }
+    #
+    def copy( config, &block )
+      config = Configuration.for(config) unless config.instance_of? Configuration
+      return unless config
+
+      rv = Configuration.new
+      rv.merge!(config)
+
+      # deep copy
+      rv.__desc.each do |key,desc|
+        value = rv.__send(key)
+        next unless value.instance_of? Configuration
+        rv.__send("#{key}=", ::Loquacious.copy(value))
+      end
+
+      rv.merge!(Configuration::DSL.evaluate(&block)) if block
+      rv
+    end
+
   end  # class << self
 end  # module Loquacious
 
@@ -102,4 +141,3 @@ Loquacious.libpath {
   require 'loquacious/configuration/help'
 }
 
-# EOF

data/spec/loquacious_spec.rb

@@ -17,6 +17,60 @@ describe Loquacious do
   it "finds things releative to 'root'" do
     Loquacious.path('Rakefile').should == File.join(@root_dir, 'Rakefile')
   end
+
+  describe "when copying configuration objects" do
+    it "creates a deep copy" do
+      obj = Loquacious::Configuration.new  {
+              first   'foo'
+              second  {
+                bar   'baz'
+              }
+            }
+
+      copy = Loquacious.copy obj
+      copy.first = 'foobar'
+      copy.second.bar = 'buz'
+
+      obj.first.should == 'foo'
+      obj.second.bar.should == 'baz'
+      copy.first.should == 'foobar'
+      copy.second.bar.should == 'buz'
+    end
+
+    it "looks up a configuration object by name" do
+      Loquacious.config_for('by name') {
+        first   'foo'
+        second  {
+          bar   'baz'
+        }
+      }
+
+      copy = Loquacious.copy('by name')
+      copy.first.should == 'foo'
+      copy.second.bar.should == 'baz'
+    end
+
+    it "returns nil when a configuration object cannot be found" do
+      Loquacious.copy('does not exist').should be_nil
+    end
+
+    it "overrides options with a block" do
+      Loquacious.config_for('another by name') {
+        first   'foo'
+        second  {
+          bar   'baz'
+        }
+      }
+
+      copy = Loquacious.copy('another by name') {
+        second { bar 'foobar' }
+        third "hey I'm new"
+      }
+
+      copy.first.should == 'foo'
+      copy.second.bar.should == 'foobar'
+      copy.third.should == "hey I'm new"
+    end
+  end
 end
 
-# EOF

data/version.txt

@@ -1 +1 @@
-1.6.4
+1.7.0

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: loquacious
 version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: false
   segments: 
   - 1
-  - 6
-  - 4
-  version: 1.6.4
+  - 7
+  - 0
+  version: 1.7.0
 platform: ruby
 authors: 
 - Tim Pease
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 -06:00
+date: 2010-08-16 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 3
@@ -116,23 +119,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: codeforpeople
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Descriptive configuration files for Ruby written in Ruby