famili 0.1.9.1 → 1.0.0

data/lib/famili/class_attribute.rb

@@ -0,0 +1,40 @@
+class Module
+  def remove_possible_method(method)
+    if method_defined?(method) || private_method_defined?(method)
+      undef_method(method)
+    end
+  end
+end
+
+class Class
+  def class_attribute(*attrs)
+    attrs.each do |name|
+      class_eval <<-RUBY, __FILE__, __LINE__ + 1
+        def self.#{name}() nil end
+        def self.#{name}?() !!#{name} end
+
+        def self.#{name}=(val)
+          singleton_class.class_eval do
+            remove_possible_method(:#{name})
+            define_method(:#{name}) { val }
+          end
+
+          if singleton_class?
+            class_eval do
+              remove_possible_method(:#{name})
+              def #{name}
+                defined?(@#{name}) ? @#{name} : singleton_class.#{name}
+              end
+            end
+          end
+          val
+        end
+      RUBY
+    end
+  end
+
+  private
+  def singleton_class?
+    ancestors.first != self
+  end
+end

data/lib/famili/father.rb

@@ -2,6 +2,9 @@ require "famili/child"
 
 module Famili
   class Father
+    attr_reader :attributes
+    attr_reader :mother
+
     def initialize(mother, attributes)
       @mother = mother
       @attributes = attributes
@@ -50,21 +53,13 @@ module Famili
     end
 
     def scoped(attributes = {})
-      Famili::Father.new(@mother, merge(attributes))
-    end
-
-    def method_missing(name, *args)
-      if scope_attributes = @mother.class.scopes[name]
-        scoped(scope_attributes)
-      else
-        super(name, *args)
-      end
+      self.class.new(@mother, merge(attributes))
     end
 
     private
 
     def merge(attributes)
-      @attributes.merge(attributes)
+      self.attributes.merge(attributes)
     end
   end
 end

data/lib/famili/mother.rb

@@ -2,8 +2,15 @@ require 'date'
 require 'famili/father'
 require "famili/lazy_value"
 
+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
 
@@ -15,7 +22,7 @@ module Famili
     end
 
     def sequence_number
-      @sequence_number||= self.class.objects_sequence_number
+      @sequence_number ||= self.class.objects_sequence_number
     end
 
     class << self
@@ -72,14 +79,17 @@ module Famili
       end
 
       def new_father
-        Famili::Father.new(self.new, attributes)
+        father_class.new(self.new, attributes)
+      end
+
+      def trait(name, &block)
+        attributes = collect_attributes(&block)
+        scope(name) { scoped(attributes) }
       end
 
       def scope(name, &block)
-        scopes[name] = collect_attributes(&block)
-        singleton_class.send(:define_method, name) do
-          new_father.send(name)
-        end
+        ensure_own_father_class.send(:define_method, name, &block)
+        singleton_class.delegate name, to: :new_father
       end
 
       def scopes
@@ -105,6 +115,11 @@ module Famili
 
       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

data/lib/famili/version.rb

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

metadata

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