Merge pull request #12 from cbeer/master

fix issue #11; Ruby 1.9 subclasses of Procs behave differently than in 1.8.

lib/confstruct/hash_with_struct_access.rb

@@ -2,7 +2,11 @@
 require 'confstruct/utils'
 
 module Confstruct
-  class Deferred < Proc
+  class Deferred
+    attr_reader :block
+    def initialize &block
+      @block = block
+    end
     def inspect(full=false)
       if full
         super
@@ -77,7 +81,7 @@ def initialize hash = @@hash_class.new
     def [] key
       result = structurize! super(symbolize!(key))
       if result.is_a?(Deferred)
-        result = eval_or_yield self, &result
+        result = eval_or_yield self, &result.block
       end
       result
     end
@@ -236,4 +240,4 @@ def do_deep_merge! source, target
     end
 
   end
-end
+end

spec/confstruct/hash_with_struct_access_spec.rb

@@ -181,7 +181,8 @@
           :default_branch => 'master',
           :regular_proc => lambda { |a,b,c| puts "#{a}: #{b} #{c}" },
           :reverse_url => Confstruct.deferred { self.url.reverse },
-          :upcase_url => Confstruct.deferred { |c| c.url.upcase }
+          :upcase_url => Confstruct.deferred { |c| c.url.upcase },
+          :introspective => Confstruct.deferred { |c| c }
         }
       }
     end
@@ -239,6 +240,10 @@
       @hwsa.github.local_hello.should == 'Bonjour, Monde!'
       @hwsa.github.local_time.should == 'French Time!'
     end
+
+    it "should send the confstruct object as a parameter when evaluating the deferred" do
+      @hwsa.github.introspective.should be_a_kind_of(Confstruct::HashWithStructAccess)
+    end
 
   end
 
@@ -264,4 +269,4 @@
     end
   end
 
-end
+end