lib/nina/builder.rb in nina-0.1.2 vs lib/nina/builder.rb in nina-0.1.4

@@ -29,12 +29,11 @@
 
       def factory(name, *args, **kwargs, &block)
         build_order_list << name
         super
         define_singleton_method(name) do |klass = nil, &definition|
-          factories[__method__].subclass.base_class(klass) if klass
-          factories[__method__].subclass(&definition) if definition
+          factories[__method__].subclass(produces: klass, &definition)
         end
       end
     end
 
     def initialize(name, abstract_factory: nil, callbacks: nil, &def_block)
@@ -63,21 +62,21 @@
       yield @initialization if block
 
       @assembler.inject(
         @abstract_factory.build_order_list,
         @initialization.to_h,
-        callbacks: callbacks,
+        callbacks: callbacks.to_h,
         delegate: delegate
       )
     end
 
     def nest(delegate: false, &block)
       yield @initialization if block
 
       @assembler.inject(
         @abstract_factory.build_order_list.reverse,
         @initialization.to_h,
-        callbacks: callbacks,
+        callbacks: callbacks.to_h,
         delegate: delegate
       )
     end
 
     def subclass(&def_block)