runcoderun-configatron 2.2.2.1 → 2.2.2.2

data/lib/configatron.rb

@@ -1,7 +1,7 @@
 base = File.join(File.dirname(__FILE__), 'configatron')
 require 'yaml'
 require 'erb'
-require File.join(base, 'blank_slate')
+require File.join(base, 'configatron_blank_slate')
 require File.join(base, 'configatron')
 require File.join(base, 'store')
 require File.join(base, 'errors')

data/lib/configatron/configatron.rb

@@ -1,10 +1,8 @@
 require 'singleton'
 
-class Configatron
+class Configatron < ConfigatronBlankSlate
   include Singleton
   
-  alias_method :send!, :send
-  
   def initialize # :nodoc:
     @_namespace = [:default]
     reset!
@@ -48,7 +46,7 @@ class Configatron
     @_store.delete(@_namespace.pop)
   end
   
-  undef :inspect # :nodoc:
-  undef :nil? # :nodoc:
+  # undef :inspect # :nodoc:
+  # undef :nil? # :nodoc:
   
 end

data/lib/configatron/configatron_blank_slate.rb

@@ -0,0 +1,59 @@
+#--
+# Copyright 2004, 2006 by Jim Weirich (jim@weirichhouse.org).
+# All rights reserved.
+
+# Permission is granted for use, copying, modification, distribution,
+# and distribution of modified versions of this work as long as the
+# above copyright notice is included.
+#++
+
+# This version of BlankSlate was taken from Builder and modified by Rob Sanheim
+# to remove hooks into the various built-in callbacks (ie method_added).
+# Not sure if we need that complexity (yet) in configatron's use case.
+#
+######################################################################
+# BlankSlate provides an abstract base class with no predefined
+# methods (except for <tt>\_\_send__</tt> and <tt>\_\_id__</tt>).
+# BlankSlate is useful as a base class when writing classes that
+# depend upon <tt>method_missing</tt> (e.g. dynamic proxies).
+#
+class ConfigatronBlankSlate
+  # These methods are used by configatron internals, so we have to whitelist them.
+  # We could probably do some alias magic to get them to be proper __foo style methods
+  #, but this is okay for now.
+  CONFIGATRON_WHITELIST = %w[instance_eval methods instance_variable_get is_a? class]
+  
+  class << self
+    
+    # Hide the method named +name+ in the BlankSlate class.  Don't
+    # hide methods in +CONFIGATRON_WHITELIST+ or any method beginning with "__".
+    def hide(name)
+      if instance_methods.include?(name.to_s) and
+        name !~ /^(__|#{CONFIGATRON_WHITELIST.join("|")})/
+        @hidden_methods ||= {}
+        @hidden_methods[name.to_sym] = instance_method(name)
+        undef_method name
+      end
+    end
+
+    def find_hidden_method(name)
+      @hidden_methods ||= {}
+      @hidden_methods[name] || superclass.find_hidden_method(name)
+    end
+
+    # Redefine a previously hidden method so that it may be called on a blank
+    # slate object.
+    def reveal(name)
+      bound_method = nil
+      unbound_method = find_hidden_method(name)
+      fail "Don't know how to reveal method '#{name}'" unless unbound_method
+      define_method(name) do |*args|
+        bound_method ||= unbound_method.bind(self)
+        bound_method.call(*args)
+      end
+    end
+  end
+
+  instance_methods.each { |m| hide(m) }
+  
+end

data/lib/configatron/store.rb

@@ -1,5 +1,5 @@
 class Configatron
-  class Store < BlankSlate
+  class Store < ::ConfigatronBlankSlate
     # alias_method :__send!, :__send__
     
     # Takes an optional Hash of parameters

data/spec/lib/blank_slate_spec.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 
-describe Configatron::BlankSlate do
+describe ConfigatronBlankSlate do
 
   before(:each) do
     configatron.reset!
@@ -8,14 +8,14 @@ describe Configatron::BlankSlate do
   
   it "should respond to __id__ and __send__ built in methods" do
     lambda {
-      Configatron::BlankSlate.new.__id__
-      Configatron::BlankSlate.new.__send__
+      ConfigatronBlankSlate.new.__id__
+      ConfigatronBlankSlate.new.__send__
     }.should_not raise_error(NoMethodError)
   end
   
   it "should have methods on the CONFIGATRON_WHITELIST" do
-    blank_slate = Configatron::BlankSlate.new
-    Configatron::BlankSlate::CONFIGATRON_WHITELIST.each do |meth|
+    blank_slate = ConfigatronBlankSlate.new
+    ConfigatronBlankSlate::CONFIGATRON_WHITELIST.each do |meth|
       lambda {
         blank_slate__send__
       }.should_not raise_error(NoMethodError)

data/spec/lib/configatron_spec.rb

@@ -25,10 +25,10 @@ describe "configatron" do
       configatron.one.should == 1
     end
     
-    it 'should protect basic methods' do
-      pending("Not sure if this really applies any more...there is no reason to _not_ let users set a key called 'object_id' now")
-      lambda{configatron.object_id = 123456}.should raise_error(Configatron::ProtectedParameter)
-      lambda{configatron.foo.object_id = 123456}.should raise_error(Configatron::ProtectedParameter)
+    it 'should allow setting properties with same name as Object/Kernel builtins' do
+      configatron.object_id.should be_nil
+      configatron.object_id = "my-object-id"
+      configatron.object_id.should == "my-object-id"
     end
     
     it 'should work with nested parameters' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: runcoderun-configatron
 version: !ruby/object:Gem::Version 
-  version: 2.2.2.1
+  version: 2.2.2.2
 platform: ruby
 authors: 
 - markbates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-20 00:00:00 -08:00
+date: 2009-02-11 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -22,8 +22,8 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
-- lib/configatron/blank_slate.rb
 - lib/configatron/configatron.rb
+- lib/configatron/configatron_blank_slate.rb
 - lib/configatron/core_ext/class.rb
 - lib/configatron/core_ext/kernel.rb
 - lib/configatron/core_ext/object.rb

data/lib/configatron/blank_slate.rb

@@ -1,61 +0,0 @@
-#--
-# Copyright 2004, 2006 by Jim Weirich (jim@weirichhouse.org).
-# All rights reserved.
-
-# Permission is granted for use, copying, modification, distribution,
-# and distribution of modified versions of this work as long as the
-# above copyright notice is included.
-#++
-
-# This version of BlankSlate was taken from Builder and modified by Rob Sanheim
-# to remove hooks into the various built-in callbacks (ie method_added).
-# Not sure if we need that complexity (yet) in configatron's use case.
-#
-######################################################################
-# BlankSlate provides an abstract base class with no predefined
-# methods (except for <tt>\_\_send__</tt> and <tt>\_\_id__</tt>).
-# BlankSlate is useful as a base class when writing classes that
-# depend upon <tt>method_missing</tt> (e.g. dynamic proxies).
-#
-class Configatron
-  class BlankSlate
-    # These methods are used by configatron internals, so we have to whitelist them.
-    # We could probably do some alias magic to get them to be proper __foo style methods
-    #, but this is okay for now.
-    CONFIGATRON_WHITELIST = %w[instance_eval methods instance_variable_get is_a? class]
-    
-    class << self
-      
-      # Hide the method named +name+ in the BlankSlate class.  Don't
-      # hide methods in +CONFIGATRON_WHITELIST+ or any method beginning with "__".
-      def hide(name)
-        if instance_methods.include?(name.to_s) and
-          name !~ /^(__|#{CONFIGATRON_WHITELIST.join("|")})/
-          @hidden_methods ||= {}
-          @hidden_methods[name.to_sym] = instance_method(name)
-          undef_method name
-        end
-      end
-
-      def find_hidden_method(name)
-        @hidden_methods ||= {}
-        @hidden_methods[name] || superclass.find_hidden_method(name)
-      end
-
-      # Redefine a previously hidden method so that it may be called on a blank
-      # slate object.
-      def reveal(name)
-        bound_method = nil
-        unbound_method = find_hidden_method(name)
-        fail "Don't know how to reveal method '#{name}'" unless unbound_method
-        define_method(name) do |*args|
-          bound_method ||= unbound_method.bind(self)
-          bound_method.call(*args)
-        end
-      end
-    end
-
-    instance_methods.each { |m| hide(m) }
-    
-  end
-end