loquacious 1.4.0 → 1.4.1

data/History.txt

@@ -1,3 +1,9 @@
+== 1.4.1 / 2009-11-29
+
+* 2 bug fixes
+  - Fixing warning message from jRuby
+  - Kernel methods can now be used as configuration attributes
+
 == 1.4.0 / 2009-11-07
 
 * 2 minor enhancement

data/Rakefile

@@ -19,8 +19,9 @@ Bones {
   version      Loquacious::VERSION
   readme_file  'README.rdoc'
   ignore_file  '.gitignore'
-  ruby_opts    %w[-W0]
+#  ruby_opts    %w[-W0]
   spec.opts << '--color'
+  rubyforge.name 'codeforpeople'
 
   depend_on 'rspec',        :development => true
   depend_on 'bones-git',    :development => true

data/lib/loquacious.rb

@@ -2,7 +2,7 @@
 module Loquacious
 
   # :stopdoc:
-  VERSION = '1.4.0'
+  VERSION = '1.4.1'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

data/lib/loquacious/configuration.rb

@@ -49,9 +49,18 @@ module Loquacious
       alias :help :help_for
     end
 
-    exceptions = %w[instance_of? kind_of? equal? object_id]
+    Keepers = %r/^__|^object_id$|^instance_of\?$|^kind_of\?$|^equal\?$/
     instance_methods.each do |m|
-      undef_method m unless m[%r/^__/] or exceptions.include? m.to_s
+      next if m[Keepers]
+      undef_method m
+    end
+    Kernel.methods.each do |m|
+      next if m[Keepers]
+      module_eval <<-CODE
+        def #{m}( *args, &block )
+          self.method_missing('#{m}', *args, &block)
+        end
+      CODE
     end
 
     # Accessor for the description hash.
@@ -104,7 +113,7 @@ module Loquacious
       ec = class << self; self; end
       ec.module_eval code
     rescue StandardError
-      raise Error, "cannot evalutate this code:\n#{code}\n"
+      Kernel.raise Error, "cannot evalutate this code:\n#{code}\n"
     end
 
     # Merge the contents of the _other_ configuration into this one. Values
@@ -116,7 +125,7 @@ module Loquacious
     #
     def merge!( other )
       return self if other.equal? self
-      raise Error, "can only merge another Configuration" unless other.kind_of?(Configuration)
+      Kernel.raise Error, "can only merge another Configuration" unless other.kind_of?(Configuration)
 
       other.__desc.each do |key,desc|
         value = other.__send__(key)
@@ -158,10 +167,18 @@ module Loquacious
     # configuration object.
     #
     class DSL
-      alias :__instance_eval :instance_eval
-
+      Keepers = %r/^__|^object_id$/
       instance_methods.each do |m|
-        undef_method m unless m[%r/^__/] or m.to_s == 'object_id'
+        next if m[Keepers]
+        undef_method m
+      end
+      Kernel.methods.each do |m|
+        next if m[Keepers]
+        module_eval <<-CODE
+          def #{m}( *args, &block )
+            self.method_missing('#{m}', *args, &block)
+          end
+        CODE
       end
 
       # Create a new DSL and evaluate the given _block_ in the context of
@@ -181,7 +198,8 @@ module Loquacious
       def initialize( &block )
         @description = nil
         @__config = Configuration.new
-        self.__instance_eval(&block) if block
+        Object.instance_method(:instance_eval).bind(self).
+            call(&block) if block
       end
 
       # Dynamically adds the given _method_ to the configuration as an

data/spec/configuration_spec.rb

@@ -71,6 +71,25 @@ describe Loquacious::Configuration do
     cfg[:five].should == 5
   end
 
+  it 'should allow Kernel methods to be treated as configuration attributes' do
+    cfg = Loquacious::Configuration.new {
+            fork   'spoon knife spork'
+            split  'join'
+            raise  'double down'
+            puts   'not what you think'
+          }
+
+    cfg['fork'].should == 'spoon knife spork'
+    cfg['split'].should == 'join'
+    cfg['raise'].should == 'double down'
+    cfg['puts'].should == 'not what you think'
+
+    cfg[:fork].should == 'spoon knife spork'
+    cfg[:split].should == 'join'
+    cfg[:raise].should == 'double down'
+    cfg[:puts].should == 'not what you think'
+  end
+
   # -----------------------------------------------------------------------
   describe 'when merging' do
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: loquacious
 version: !ruby/object:Gem::Version 
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors: 
 - Tim Pease
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-07 00:00:00 -07:00
+date: 2009-11-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.8
+        version: 1.2.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: bones-git
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.0
+        version: 1.1.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: bones-extras
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.1
+        version: 1.2.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: bones
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.0.0
+        version: 3.1.0
     version: 
 description: |-
   Descriptive configuration files for Ruby written in Ruby.
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: loquacious
+rubyforge_project: codeforpeople
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3