famili 0.1.9 → 0.1.9.1

data/lib/famili/child.rb

@@ -38,9 +38,10 @@ module Famili
       attribute_value = @attributes[name]
       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
+      elsif attribute_value.respond_to?(:call)
+        attribute_value = attribute_value.call
       end
+      attribute_value = attribute_value.build if attribute_value.is_a?(::Famili::Father)
       @model.send("#{name}=", attribute_value)
     end
 

data/lib/famili/lazy_value.rb

@@ -0,0 +1,11 @@
+module Famili
+  class LazyValue
+    def initialize
+      @block = proc
+    end
+
+    def call
+      @value ||= @block.call
+    end
+  end
+end

data/lib/famili/mother.rb

@@ -1,5 +1,6 @@
 require 'date'
 require 'famili/father'
+require "famili/lazy_value"
 
 module Famili
   class Mother
@@ -37,7 +38,6 @@ module Famili
 
       def inherited(child)
         child.parent_class = self
-        child.pending_tasks = []
       end
 
       def name(&block)
@@ -59,16 +59,19 @@ module Famili
         attributes[method] = block
       end
 
+      def lazy(&block)
+        Famili::LazyValue.new(&block)
+      end
+
       def has(name, &block)
-        pending_tasks.push(Proc.new do
+        attributes[name] = lazy 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)
+          father
+        end
       end
 
       def new_father
-        invoke_pending_tasks if pending_tasks
         Famili::Father.new(self.new, attributes)
       end
 
@@ -85,7 +88,7 @@ module Famili
 
       def model_class(klass = nil)
         if klass
-          @model_class = klass
+          self.model_class = klass
           return
         end
 
@@ -96,18 +99,12 @@ module Famili
                          end
       end
 
-      protected
-
-      attr_accessor :pending_tasks
-
-      def invoke_pending_tasks
-        parent_class.invoke_pending_tasks if parent_class
-        if @pending_tasks
-          @pending_tasks.each(&:call)
-	  @pending_tasks = nil
-        end
+      def model_class=(klass)
+        @model_class = klass
       end
 
+      protected
+
       def collect_attributes
         saved_attributes, @attributes = @attributes, {}
         yield

data/lib/famili/version.rb

@@ -1,5 +1,5 @@
 module Famili
   module Version
-    STRING = '0.1.9'
+    STRING = '0.1.9.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: famili
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2012-07-02 00:00:00.000000000 Z
+date: 2012-07-03 00:00:00.000000000 Z
 dependencies: []
 description: Yet another object mother pattern implementation.
 email: 
@@ -21,6 +21,7 @@ files:
 - lib/famili.rb
 - lib/famili/child.rb
 - lib/famili/father.rb
+- lib/famili/lazy_value.rb
 - lib/famili/mother.rb
 - lib/famili/version.rb
 homepage: http://github.com/niquola/famili
@@ -38,7 +39,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2078673055765586338
+      hash: -1932633742867940772
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -47,11 +48,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2078673055765586338
+      hash: -1932633742867940772
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: famili-0.1.9
+summary: famili-0.1.9.1
 test_files: []