lib/surrounded/context/initializing.rb in surrounded-0.9.6 vs lib/surrounded/context/initializing.rb in surrounded-0.9.7

@@ -1,44 +1,48 @@
 module Surrounded
   module Context
     module Initializing
       # Shorthand for creating an instance level initialize method which
       # handles the mapping of the given arguments to their named role.
-      def initialize_without_keywords(*setup_args)
-        private_attr_reader(*setup_args)
-      
-        mod = Module.new
-        line = __LINE__
-        mod.class_eval "
-          def initialize(#{setup_args.join(',')})
-            map_roles(#{setup_args.to_s}.zip([#{setup_args.join(',')}]))
-          end
-        ", __FILE__, line
-        const_set("ContextInitializer", mod)
-        include mod
+      def initialize_without_keywords(*setup_args, &block)
+        parameters = setup_args.join(',')
+        default_initializer(parameters, setup_args, &block)
       end
-      def initialize(*setup_args)
+      def initialize(*setup_args, &block)
         warn "Deprecated: The behavior of 'initialize' will require keywords in the future
             Consider using keyword arguments or switching to 'initialize_without_keywords'\n\n"
-        initialize_without_keywords(*setup_args)
+        initialize_without_keywords(*setup_args, &block)
       end
 
-      def keyword_initialize(*setup_args)
+      def keyword_initialize(*setup_args, &block)
+        parameters = setup_args.map{|a| "#{a}:"}.join(',')
+        default_initializer(parameters, setup_args, &block)
+      end
+      alias initialize_with_keywords keyword_initialize
+
+      def initializer_block
+        @initializer_block
+      end
+
+      def apply_initializer_block(instance)
+        instance.instance_eval(&initializer_block) if initializer_block
+      end
+
+      def default_initializer(params, setup_args, &block)
         private_attr_reader(*setup_args)
 
         parameters = setup_args.map{|a| "#{a}:"}.join(',')
-
+        @initializer_block = block || nil
         mod = Module.new
-        line = __LINE__
-        mod.class_eval %{
-          def initialize(#{parameters})
+        line = __LINE__; mod.class_eval %{
+          def initialize(#{params})
             @role_map = role_mapper_class.new
             map_roles(#{setup_args.to_s}.zip([#{setup_args.join(',')}]))
+            self.class.apply_initializer_block(self)
           end
         }, __FILE__, line
         const_set("ContextInitializer", mod)
         include mod
       end
-      alias initialize_with_keywords keyword_initialize
     end
   end
 end
\ No newline at end of file