famili 1.1.2 → 1.2.0

data/lib/famili/attributes.rb

@@ -0,0 +1,27 @@
+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

data/lib/famili/child.rb

@@ -1,15 +1,16 @@
+require 'famili/attributes'
+
 module Famili
   class Child < BasicObject
     attr_reader :mother
 
     def initialize(mother, attributes)
       @mother = mother
-      @attributes = attributes
+      @attributes = Attributes.new(attributes)
     end
 
     def born
-      @unresolved_property_names = @attributes.keys
-      @model = @mother.class.model_class.new
+      @model = @mother.instantiate(@attributes)
       @meta_class = @model.singleton_class
       @model.instance_variable_set(:@__famili_child__, self)
       define_method_stub(:method_missing) do |name, *args|
@@ -20,10 +21,10 @@ module Famili
           send(@__famili_child__.munge(:method_missing), name, *args)
         end
       end
-      @unresolved_property_names.each do |key|
+      @attributes.unresolved_names.each do |key|
         define_property_stub(key)
       end
-      resolve_property(@unresolved_property_names.first) until @unresolved_property_names.empty?
+      resolve_property(@attributes.unresolved_names.first) until @attributes.unresolved_names.empty?
       undefine_method_stub(:method_missing)
       @model
     end
@@ -33,16 +34,8 @@ module Famili
     end
 
     def resolve_property(name)
-      @unresolved_property_names.delete(name)
       undefine_property_stub(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)
-      @model.send("#{name}=", attribute_value)
+      @model.send("#{name}=", @attributes.resolve(@model, name))
     end
 
     def define_property_stub(property_name)

data/lib/famili/delegate.rb

@@ -0,0 +1,15 @@
+class Module
+  def delegate(*method_names)
+    opts = method_names.pop
+    declarations = ''
+    to = opts[:to]
+    method_names.each do |name|
+      declarations << <<-RUBY
+        def #{name}(*args, &block)
+          #{to}.#{name}(*args, &block)
+        end
+      RUBY
+    end
+    module_eval declarations
+  end
+end

data/lib/famili/grand_mother.rb

@@ -1,6 +1,13 @@
 require 'famili/father'
 require "famili/lazy_value"
 
+unless Class.respond_to?(:class_attribute)
+  require 'famili/class_attribute'
+end
+unless Module.respond_to?(:delegate)
+  require 'famili/delegate'
+end
+
 module Famili
   class GrandMother
     class_attribute :father_class
@@ -12,12 +19,19 @@ module Famili
       @father ||= self.class.father_class.new(self, self.class.attributes)
     end
 
+    #noinspection RubyUnusedLocalVariable
+    def instantiate(attributes)
+      self.class.model_class.new
+    end
+
     def save(model)
     end
 
+    #noinspection RubyUnusedLocalVariable
     def before_save(model)
     end
 
+    #noinspection RubyUnusedLocalVariable
     def after_create(model)
     end
 

data/lib/famili/mother.rb

@@ -1,10 +1,6 @@
 require 'date'
 require 'famili/grand_mother'
 
-unless Class.respond_to?(:class_attribute)
-  require 'famili/class_attribute'
-end
-
 module Famili
   class Mother < Famili::GrandMother
     def save(model)

data/lib/famili/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: famili
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2013-08-20 00:00:00.000000000 Z
+date: 2013-08-21 00:00:00.000000000 Z
 dependencies: []
 description: Yet another object mother pattern implementation.
 email: 
@@ -19,8 +19,10 @@ 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
 - lib/famili/father.rb
 - lib/famili/grand_mother.rb
 - lib/famili/lazy_value.rb
@@ -37,7 +39,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      hash: -3118589739651311701
+      hash: -1151566627510109189
       version: '0'
       segments:
       - 0
@@ -46,7 +48,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      hash: -3118589739651311701
+      hash: -1151566627510109189
       version: '0'
       segments:
       - 0
@@ -56,5 +58,5 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: famili-1.1.2
+summary: famili-1.2.0
 test_files: []