famili 1.0.0 → 1.1.1

data/lib/famili/father.rb

@@ -27,7 +27,7 @@ module Famili
 
     def create(opts = {}, &block)
       model = build(opts, &block)
-      model.save!
+      @mother.save(model)
       @mother.after_create(model)
       model
     end

data/lib/famili/grand_mother.rb

@@ -0,0 +1,120 @@
+require 'famili/father'
+require "famili/lazy_value"
+
+module Famili
+  class GrandMother
+    class_attribute :father_class
+    self.father_class = Famili::Father
+
+    delegate :build, :create, :build_brothers, :create_brothers, :build_hash, :scoped, to: :father
+
+    def father
+      @father ||= self.class.father_class.new(self, self.class.attributes)
+    end
+
+    def save(model)
+    end
+
+    def before_save(model)
+    end
+
+    def after_create(model)
+    end
+
+    class << self
+      alias_method :class_name, :name
+
+      delegate :build, :create, :build_brothers, :create_brothers, :build_hash, :scoped, to: :new
+
+      def parent_class=(klass)
+        @parent_class = klass
+      end
+
+      def parent_class
+        @parent_class
+      end
+
+      def inherited(child)
+        child.parent_class = self
+      end
+
+      def name(&block)
+        return class_name unless block_given?
+        field(:name, &block)
+      end
+
+      def method_missing(method, &block)
+        return field(method, &block) if block_given?
+        super
+      end
+
+      def attributes
+        @attributes ||= parent_class && parent_class.attributes.clone || {}
+      end
+
+      def field(method, value = nil, &block)
+        block = -> { value } if value
+        attributes[method] = block
+      end
+
+      def lazy(&block)
+        Famili::LazyValue.new(&block)
+      end
+
+      def has(name, &block)
+        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?
+          father
+        end
+      end
+
+      def trait(name, &block)
+        attributes = collect_attributes(&block)
+        scope(name) { scoped(attributes) }
+      end
+
+      def scope(name, &block)
+        ensure_own_father_class.send(:define_method, name, &block)
+        delegate name, to: :father
+        singleton_class.delegate name, to: :new
+      end
+
+      def scopes
+        @scopes ||= parent_class && parent_class.scopes.dup || {}
+      end
+
+      def model_class(klass = nil)
+        if klass
+          self.model_class = klass
+          return
+        end
+
+        @model_class ||= if class_name =~ /(.*)Famili$/ || class_name =~ /Famili::(.*)/
+                           $1.split('::').inject(Object) do |mod, const|
+                             mod.const_get(const)
+                           end
+                         end
+      end
+
+      def model_class=(klass)
+        @model_class = klass
+      end
+
+      protected
+
+      def ensure_own_father_class
+        @father_class = self.father_class = Class.new(self.father_class) unless @father_class == father_class
+        @father_class
+      end
+
+      def collect_attributes
+        saved_attributes, @attributes = @attributes, {}
+        yield
+        @attributes
+      ensure
+        @attributes = saved_attributes
+      end
+    end
+  end
+end

data/lib/famili/mother.rb

@@ -1,20 +1,14 @@
 require 'date'
-require 'famili/father'
-require "famili/lazy_value"
+require 'famili/grand_mother'
 
 unless Class.respond_to?(:class_attribute)
   require 'famili/class_attribute'
 end
 
 module Famili
-  class Mother
-    class_attribute :father_class
-    self.father_class = Famili::Father
-
-    def before_save(model)
-    end
-
-    def after_create(model)
+  class Mother < Famili::GrandMother
+    def save(model)
+      model.save!
     end
 
     def unique
@@ -26,107 +20,10 @@ module Famili
     end
 
     class << self
-      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 += 1
       end
-
-      def parent_class=(klass)
-        @parent_class = klass
-      end
-
-      def parent_class
-        @parent_class
-      end
-
-      def inherited(child)
-        child.parent_class = self
-      end
-
-      def name(&block)
-        return class_name unless block_given?
-        field(:name, &block)
-      end
-
-      def method_missing(method, &block)
-        return field(method, &block) if block_given?
-        super
-      end
-
-      def attributes
-        @attributes ||= parent_class && parent_class.attributes.clone || {}
-      end
-
-      def field(method, value = nil, &block)
-        block = -> { value } if value
-        attributes[method] = block
-      end
-
-      def lazy(&block)
-        Famili::LazyValue.new(&block)
-      end
-
-      def has(name, &block)
-        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?
-          father
-        end
-      end
-
-      def new_father
-        father_class.new(self.new, attributes)
-      end
-
-      def trait(name, &block)
-        attributes = collect_attributes(&block)
-        scope(name) { scoped(attributes) }
-      end
-
-      def scope(name, &block)
-        ensure_own_father_class.send(:define_method, name, &block)
-        singleton_class.delegate name, to: :new_father
-      end
-
-      def scopes
-        @scopes ||= parent_class && parent_class.scopes.dup || {}
-      end
-
-      def model_class(klass = nil)
-        if klass
-          self.model_class = klass
-          return
-        end
-
-        @model_class ||= if class_name =~ /(.*)Famili$/ || class_name =~ /Famili::(.*)/
-                           $1.split('::').inject(Object) do |mod, const|
-                             mod.const_get(const)
-                           end
-                         end
-      end
-
-      def model_class=(klass)
-        @model_class = klass
-      end
-
-      protected
-
-      def ensure_own_father_class
-        @father_class = self.father_class = Class.new(self.father_class) unless @father_class == father_class
-        @father_class
-      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 = '1.0.0'
+    STRING = '1.1.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: famili
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2012-07-06 00:00:00.000000000 Z
+date: 2012-11-09 00:00:00.000000000 Z
 dependencies: []
 description: Yet another object mother pattern implementation.
 email: 
@@ -22,6 +22,7 @@ files:
 - lib/famili/child.rb
 - lib/famili/class_attribute.rb
 - lib/famili/father.rb
+- lib/famili/grand_mother.rb
 - lib/famili/lazy_value.rb
 - lib/famili/mother.rb
 - lib/famili/version.rb
@@ -40,7 +41,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2702514337539949147
+      hash: 845392613528680780
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -49,11 +50,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2702514337539949147
+      hash: 845392613528680780
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: famili-1.0.0
+summary: famili-1.1.1
 test_files: []