All proc evals (including after_config!) should eval_or_yield just li…

…ke all the regular blocks

.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+.yardoc

lib/confstruct/configuration.rb

@@ -8,13 +8,7 @@ def self.ConfigClass defaults=nil, &block
       @default_values = defaults
       if @default_values.nil?
         @default_values = HashWithStructAccess.new({})
-        if block_given?
-          if block.arity == -1
-            @default_values.instance_eval(&block)
-          else
-            yield @default_values
-          end
-        end
+        eval_or_yield @default_values, &block
       end
     end
     klazz
@@ -43,12 +37,11 @@ def configure *args, &block
       end
 
       if block_given?
-        if block.arity == -1
-          self.instance_eval(&block)
-        else
-          yield self
+        eval_or_yield self, &block
+        if self[:after_config!].is_a?(Proc)
+          p = self[:after_config!]
+          eval_or_yield self, &p
         end
-        self[:after_config!].call if self[:after_config!].is_a?(Proc)
       end
       self
     end

lib/confstruct/hash_with_struct_access.rb

@@ -1,4 +1,5 @@
 require 'delegate'
+require 'confstruct/utils'
 
 ##############
 # Confstruct::HashWithStructAccess is a Hash wrapper that provides deep struct access
@@ -109,15 +110,9 @@ def method_missing sym, *args, &block
         end
 
         if result.is_a?(HashWithStructAccess) and block_given?
-          if block.arity == -1
-            result.instance_eval(&block)
-          else
-            yield result
-          end
-        end
-
-        if result.is_a?(Proc) 
-          result.call(self)
+          eval_or_yield result, &block
+        elsif result.is_a?(Proc) 
+          eval_or_yield self, &result
         else
           result
         end

lib/confstruct/utils.rb

@@ -0,0 +1,13 @@
+module Kernel
+  def eval_or_yield obj, &block
+    if block_given?
+      if block.arity == -1
+        obj.instance_eval(&block)
+      else
+        block.call(obj)
+      end
+    else
+      obj
+    end
+  end
+end