famili 0.1.7 → 0.1.8

data/lib/famili/child.rb

@@ -36,7 +36,11 @@ module Famili
       @unresolved_property_names.delete(name)
       undefine_property_stub(name)
       attribute_value = @attributes[name]
-      attribute_value = @model.instance_exec(&attribute_value) if attribute_value.is_a?(::Proc)
+      if attribute_value.is_a?(::Proc)
+        attribute_value = @model.instance_exec(&attribute_value)
+      elsif attribute_value.is_a?(::Famili::Father)
+        attribute_value = attribute_value.create
+      end
       @model.send("#{name}=", attribute_value)
     end
 

data/lib/famili/father.rb

@@ -6,7 +6,7 @@ module Famili
       @mother = mother
       @attributes = attributes
     end
-    
+
     def build_hash(opts = {})
       attributes = build(opts).attributes.symbolize_keys
       attributes.delete(:updated_at)
@@ -15,7 +15,7 @@ module Famili
     end
 
     def build(opts = {})
-      attributes = merge(opts)      
+      attributes = merge(opts)
       model = Famili::Child.new(@mother, attributes).born
       yield model if block_given?
       @mother.before_save(model)
@@ -29,16 +29,24 @@ module Famili
       model
     end
 
-    def build_brothers(num, opts = {}, &block)
+    def produce_brothers(num, opts={}, init_block, &block)
       brothers = []
-      num.times { brothers << build(opts, &block) }
+      if init_block && init_block.arity == 2
+        num.times { |i| brothers << block.call(opts) { |o| init_block.call(o, i) } }
+      else
+        num.times { brothers << block.call(opts, &init_block) }
+      end
       brothers
     end
 
+    private_methods :produce_brothers
+
+    def build_brothers(num, opts = {}, &block)
+      produce_brothers(num, opts, block) { |brother_opts, &init_block| build(brother_opts, &init_block) }
+    end
+
     def create_brothers(num, opts = {}, &block)
-      brothers = []
-      num.times { brothers << create(opts, &block) }
-      brothers
+      produce_brothers(num, opts, block) { |brother_opts, &init_block| create(brother_opts, &init_block) }
     end
 
     def scoped(attributes = {})

data/lib/famili/mother.rb

@@ -18,10 +18,12 @@ module Famili
     end
 
     class << self
-      alias :class_name :name
+      alias_method :class_name, :name
+
+      delegate :build, :create, :build_brothers, :create_brothers, :build_hash, :scoped, to: :new_father
 
       def objects_sequence_number
-        @sequence_number ||=0
+        @sequence_number ||= 0
         @sequence_number += 1
       end
 
@@ -48,59 +50,39 @@ module Famili
       end
 
       def attributes
-        @attributes||=parent_class && parent_class.attributes.clone || {}
-        @attributes
+        @attributes ||= parent_class && parent_class.attributes.clone || {}
       end
 
-      def field(method, &block)
+      def field(method, value = nil, &block)
+        block = -> { value } if value
         attributes[method] = block
       end
 
-      def father
-        @father ||= Famili::Father.new(self.new, attributes)
-      end
-
-      def create(opts = {})
-        father.create(opts)
+      def has(name, &block)
+        pending_tasks.push(Proc.new do
+          father = "#{model_class.reflect_on_association(name.to_sym).klass.name}Famili".constantize.new_father
+          father = father.scoped(collect_attributes(&block)) if block_given?
+          attributes[name] = father
+        end)
       end
 
-      def build(opts = {})
-        father.build(opts)
+      def new_father
+        invoke_pending_tasks
+        Famili::Father.new(self.new, attributes)
       end
 
-      def build_hash(opts = {})
-        father.build_hash(opts)
-      end
-
-      def build_brothers(num, opts = {}, &block)
-        father.build_brothers(num, opts, &block)
-      end
-      
-      def create_brothers(num, opts = {}, &block)
-        father.create_brothers(num, opts, &block)
-      end
-
-      def scoped(attributes = {})
-        father.scoped(attributes)
-      end
-
-      def scope(name)
-        saved_attributes = @attributes
-        @attributes = {}
-        yield
-        scopes[name] = @attributes
+      def scope(name, &block)
+        scopes[name] = collect_attributes(&block)
         singleton_class.send(:define_method, name) do
-          father.send(name)
+          new_father.send(name)
         end
-      ensure
-        @attributes = saved_attributes
       end
 
       def scopes
         @scopes ||= parent_class && parent_class.scopes.dup || {}
       end
 
-      def model_class(klass=nil)
+      def model_class(klass = nil)
         if klass
           @model_class = klass
           return
@@ -112,6 +94,27 @@ module Famili
                            end
                          end
       end
+
+      protected
+
+      def pending_tasks
+        @pending_tasks ||= []
+      end
+
+      def invoke_pending_tasks
+        parent_class.invoke_pending_tasks if parent_class
+        if @pending_tasks
+          @pending_tasks.each(&:call)
+        end
+      end
+
+      def collect_attributes
+        saved_attributes, @attributes = @attributes, {}
+        yield
+        @attributes
+      ensure
+        @attributes = saved_attributes
+      end
     end
   end
 end

data/lib/famili/version.rb

@@ -1,5 +1,5 @@
 module Famili
   module Version
-    STRING = '0.1.7'
+    STRING = '0.1.8'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: famili
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2012-04-16 00:00:00.000000000Z
+date: 2012-06-28 00:00:00.000000000 Z
 dependencies: []
 description: Yet another object mother pattern implementation.
 email: 
@@ -38,7 +38,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -148278919315159194
+      hash: -3995658946911266953
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -47,11 +47,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -148278919315159194
+      hash: -3995658946911266953
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: famili-0.1.7
+summary: famili-0.1.8
 test_files: []