famili 1.2.0 → 1.3.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZGFlYmM2NGYxNDVhN2IxOGJiZTA4NGJkNjE2YWNhOTZlYjE1OGZmMA==
+  data.tar.gz: !binary |-
+    MWU2OTdiZjQzMmI4NjYxZjU3ZmNhODhjN2VhMTE3ODUyZjc5N2U2ZA==
+SHA512:
+  metadata.gz: !binary |-
+    YTNmNGRhYTE1M2I5YTMxNWZhNTEwYTQ0NjI2NDAzNWJlNzY4OWQ4NzQxZWUx
+    YjIyNzc3YzYyMzg2ZTA0YzIxNDU2Y2FlN2I2ZDk5OGE2Yzg2MjZhMzc5MzVm
+    ZTgwZmQzOTZlMDMzZDQ4YzI0NzgxZDM4MzIwODg4NWUwY2IxODk=
+  data.tar.gz: !binary |-
+    MTNhM2NkNDAzYjg5ZDAyZDAyY2FlMDQ5NjVhZGU2NzMzZmVmNzhhZjYxYmE3
+    OWRjOWRiNDk5MmY4MjVlOTM4NzczNDk4ODk1ZmYwY2I1NTUyMTI5M2U3ZTU3
+    ZTM2NjdmZDY0MzFjMGU3YzUyZTBhNzIwZGIwYjg3YTU2NzRhNjc=

data/lib/famili.rb

@@ -1,4 +1,5 @@
 $:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 module Famili
   autoload :Mother,'famili/mother'
+  autoload :GrandMother, 'famili/grand_mother'
 end

data/lib/famili/child.rb

@@ -1,66 +1,98 @@
-require 'famili/attributes'
-
 module Famili
   class Child < BasicObject
-    attr_reader :mother
-
     def initialize(mother, attributes)
       @mother = mother
-      @attributes = Attributes.new(attributes)
+      @attributes = attributes
+      @unresolved_attribute_names = attributes.keys.dup
+      @cached_attributes = {}
     end
 
-    def born
-      @model = @mother.instantiate(@attributes)
-      @meta_class = @model.singleton_class
-      @model.instance_variable_set(:@__famili_child__, self)
+    def [](name)
+      resolve_attribute(name)
+    end
+
+    def resolve_attributes(instance = nil, &block)
+      bind(instance, &block) if instance
+      resolve_attribute(unresolved_attribute_names.first) until unresolved_attribute_names.empty?
+      unbind if instance
+      instance
+    end
+
+    def bind(instance, &block)
+      @instance = instance
+      @resolve_callback = block
+      @instance.instance_variable_set(:@__famili_child__, self)
       define_method_stub(:method_missing) do |name, *args|
-        mother = @__famili_child__.mother
+        mother = @__famili_child__.__send__(:mother)
         if mother.respond_to?(name)
           mother.send(name, *args)
+        elsif (value = @__famili_child__.__send__(:cached_attributes)[name])
+          value
         else
-          send(@__famili_child__.munge(:method_missing), name, *args)
+          send(@__famili_child__.__send__(:munge, :method_missing), name, *args)
         end
       end
-      @attributes.unresolved_names.each do |key|
-        define_property_stub(key)
-      end
-      resolve_property(@attributes.unresolved_names.first) until @attributes.unresolved_names.empty?
+      @attributes.each { |attr_name, _| define_property_stub(attr_name) }
+    end
+
+    def unbind
+      @resolve_callback = nil
+      @attributes.each { |attr_name, _| undefine_property_stub(attr_name) }
       undefine_method_stub(:method_missing)
-      @model
+      @instance.send(:remove_instance_variable, :@__famili_child__)
     end
 
-    def munge(property_name)
-      "__famili_child_proxied_#{property_name}"
+    private
+
+    attr_reader :mother, :unresolved_attribute_names, :cached_attributes
+
+    def meta_class
+      @instance.singleton_class
     end
 
-    def resolve_property(name)
-      undefine_property_stub(name)
-      @model.send("#{name}=", @attributes.resolve(@model, name))
+    def munge(property_name)
+      "__famili_child_proxied_#{property_name}"
     end
 
     def define_property_stub(property_name)
       define_method_stub property_name do
-        @__famili_child__.resolve_property(property_name)
-      end if @model.respond_to?(property_name)
+        @__famili_child__[property_name]
+      end if @instance.respond_to?(property_name)
     end
 
     def undefine_property_stub(property_name)
-      undefine_method_stub(property_name) if @meta_class.send(:method_defined?, munge(property_name))
+      undefine_method_stub(property_name) if meta_class.send(:method_defined?, munge(property_name))
     end
 
     def define_method_stub(method_name, &block)
-      @meta_class.send(:alias_method, munge(method_name), method_name)
-      @meta_class.send(:define_method, method_name, &block)
+      meta_class.send(:alias_method, munge(method_name), method_name)
+      meta_class.send(:define_method, method_name, &block)
     end
 
     def undefine_method_stub(method_name)
       munged_name = munge(method_name)
-      if @meta_class.send(:method_defined?, munged_name)
-        @meta_class.send(:alias_method, method_name, munged_name)
-        @meta_class.send(:remove_method, munged_name)
+      if meta_class.send(:method_defined?, munged_name)
+        meta_class.send(:alias_method, method_name, munged_name)
+        meta_class.send(:remove_method, munged_name)
       else
-        @meta_class.send(:remove_method, method_name)
+        meta_class.send(:remove_method, method_name)
       end
     end
+
+    def resolve_attribute(name)
+      @cached_attributes[name] ||=
+        if unresolved_attribute_names.delete(name)
+          attribute_value = @attributes[name]
+          if attribute_value.is_a?(::Proc)
+            attribute_value = @instance.instance_exec(&attribute_value)
+          elsif attribute_value.respond_to?(:call)
+            attribute_value = attribute_value.call
+          end
+          attribute_value = attribute_value.build if attribute_value.is_a?(::Famili::Father)
+          undefine_property_stub(name)
+          @resolve_callback.call(@instance, name, attribute_value) if @resolve_callback
+          attribute_value
+        end
+    end
   end
 end

data/lib/famili/father.rb

@@ -19,17 +19,17 @@ module Famili
 
     def build(opts = {})
       attributes = merge(opts)
-      model = Famili::Child.new(@mother, attributes).born
-      yield model if block_given?
-      @mother.before_save(model)
-      model
+      instance = @mother.born(Famili::Child.new(@mother, attributes))
+      yield instance if block_given?
+      @mother.before_save(instance)
+      instance
     end
 
     def create(opts = {}, &block)
-      model = build(opts, &block)
-      @mother.save(model)
-      @mother.after_create(model)
-      model
+      instance = build(opts, &block)
+      @mother.save(instance)
+      @mother.after_create(instance)
+      instance
     end
 
     def produce_brothers(num, opts={}, init_block, &block)

data/lib/famili/grand_mother.rb

@@ -24,6 +24,12 @@ module Famili
       self.class.model_class.new
     end
 
+    def born(child)
+      child.resolve_attributes(instantiate(child)) do |instance, name, value|
+        instance.send("#{name}=", value)
+      end
+    end
+
     def save(model)
     end
 

data/lib/famili/version.rb

@@ -1,5 +1,5 @@
 module Famili
   module Version
-    STRING = '1.2.0'
+    STRING = '1.3.0'
   end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: famili
 version: !ruby/object:Gem::Version
-  version: 1.2.0
-  prerelease: 
+  version: 1.3.0
 platform: ruby
 authors:
 - niquola
@@ -10,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2013-09-27 00:00:00.000000000 Z
 dependencies: []
 description: Yet another object mother pattern implementation.
 email: 
@@ -19,7 +18,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/famili.rb
-- lib/famili/attributes.rb
 - lib/famili/child.rb
 - lib/famili/class_attribute.rb
 - lib/famili/delegate.rb
@@ -30,6 +28,7 @@ files:
 - lib/famili/version.rb
 homepage: http://github.com/niquola/famili
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
@@ -39,24 +38,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      hash: -1151566627510109189
       version: '0'
-      segments:
-      - 0
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      hash: -1151566627510109189
       version: '0'
-      segments:
-      - 0
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.1.3
 signing_key: 
-specification_version: 3
-summary: famili-1.2.0
+specification_version: 4
+summary: famili-1.3.0
 test_files: []

data/lib/famili/attributes.rb

@@ -1,27 +0,0 @@
-module Famili
-  class Attributes
-    attr :unresolved_names
-
-    def initialize(attributes)
-      @attributes = attributes
-      @unresolved_names = attributes.keys
-    end
-
-    def [](name)
-      (@cached_attributes ||= {})[name] ||= resolve(nil, name)
-    end
-
-    def resolve(model, name)
-      if unresolved_names.delete(name)
-        attribute_value = @attributes[name]
-        if attribute_value.is_a?(::Proc)
-          attribute_value = model.instance_exec(&attribute_value)
-        elsif attribute_value.respond_to?(:call)
-          attribute_value = attribute_value.call
-        end
-        attribute_value = attribute_value.build if attribute_value.is_a?(::Famili::Father)
-        attribute_value
-      end
-    end
-  end
-end