daddys_girl 0.6.1 → 0.7.0

data/Gemfile.lock

@@ -1,48 +1,50 @@
 PATH
   remote: .
   specs:
-    daddys_girl (0.6.0)
-      activerecord (~> 3.0.0)
-      factory_girl (~> 2.0)
+    daddys_girl (0.7.0)
+      activerecord (>= 3.0)
+      factory_girl (>= 2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (3.0.12)
-      activesupport (= 3.0.12)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.12)
-      activemodel (= 3.0.12)
-      activesupport (= 3.0.12)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.12)
-    arel (2.0.10)
-    builder (2.1.2)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
+      builder (~> 3.0.0)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.3)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    builder (3.0.0)
     diff-lcs (1.1.3)
-    factory_girl (2.6.4)
-      activesupport (>= 2.3.9)
-    i18n (0.5.0)
+    factory_girl (3.1.1)
+      activesupport (>= 3.0.0)
+    i18n (0.6.0)
+    multi_json (1.3.2)
     rspec (2.9.0)
       rspec-core (~> 2.9.0)
       rspec-expectations (~> 2.9.0)
       rspec-mocks (~> 2.9.0)
     rspec-core (2.9.0)
-    rspec-expectations (2.9.0)
+    rspec-expectations (2.9.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.9.0)
-    sqlite3 (1.3.5)
+    sqlite3 (1.3.6)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
-    tzinfo (0.3.32)
+    tzinfo (0.3.33)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 3.0.0)
+  activerecord (>= 3.0)
   daddys_girl!
-  factory_girl (~> 2.0)
+  factory_girl (>= 2.0)
   rspec (~> 2.0)
   sqlite3-ruby

data/README.md

@@ -20,6 +20,7 @@ Or install it yourself as:
 First, you must add a class definition to the Factory Girl factories file (normally spec/factories.rb)
 
 Methods:
+
 1. ```ClassName.spawn(params)```: creates an object, but does not save it
 2. ```ClassName.generate(params)```: creates an object and attempts to save it
 3. ```ClassName.generate!(params)```: creates an object, and throws an error if it can not save it

data/daddys_girl.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.name          = "daddys_girl"
   gem.require_paths = ["lib"]
   gem.version       = DaddysGirl::VERSION
-  gem.add_dependency "activerecord", "~> 3.0.0"
+  gem.add_dependency "activerecord", ">= 3.0"
   gem.add_dependency "factory_girl", ">= 2.0"
   gem.add_development_dependency "rspec", "~> 2.0"
   gem.add_development_dependency "sqlite3-ruby"

data/lib/daddys_girl.rb

@@ -24,38 +24,67 @@ ActiveRecord::Base.class_eval do
   end
 end
 
+if ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 0
+  ActiveRecord::Associations::AssociationProxy.class_eval do
+    def target_class_symbol
+      self.symbol
+    end
 
-ActiveRecord::Associations::AssociationProxy.class_eval do
-  def target_class_symbol
-    self.symbol
-  end
+    def generate(attributes = {})
+      attributes = attributes.merge(association_attribute)
+      begin
+        FactoryGirl.create(target_class_symbol, attributes)
+      rescue ActiveRecord::RecordInvalid
+        FactoryGirl.build(target_class_symbol, attributes)
+      end
+    end
 
-  def generate(attributes = {})
-    attributes = attributes.merge(association_attribute)
-    begin
+    def generate!(attributes = {})
+      attributes = attributes.merge(association_attribute)
       FactoryGirl.create(target_class_symbol, attributes)
-    rescue ActiveRecord::RecordInvalid
+    end
+
+    def spawn(attributes = {})
+      attributes = attributes.merge(association_attribute)
       FactoryGirl.build(target_class_symbol, attributes)
     end
-  end
 
-  def generate!(attributes = {})
-    attributes = attributes.merge(association_attribute)
-    FactoryGirl.create(target_class_symbol, attributes)
-  end
+    private
+    def owner_association
+      proxy_reflection.primary_key_name.to_sym
+    end
 
-  def spawn(attributes = {})
-    attributes = attributes.merge(association_attribute)
-    FactoryGirl.build(target_class_symbol, attributes)
+    def association_attribute
+      {owner_association => proxy_owner.id}
+    end
   end
+end
 
-  private
-  def owner_association
-    proxy_reflection.primary_key_name.to_sym
-  end
 
-  def association_attribute
-    {owner_association => proxy_owner.id}
+if ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR >= 1
+  ActiveRecord::Relation.class_eval do
+    def target_class_symbol
+      self.symbol
+    end
+
+    def generate(attributes = {})
+      attributes = attributes.merge(where_values_hash)
+      begin
+        FactoryGirl.create(target_class_symbol, attributes)
+      rescue ActiveRecord::RecordInvalid
+        FactoryGirl.build(target_class_symbol, attributes)
+      end
+    end
+
+    def generate!(attributes = {})
+      attributes = attributes.merge(where_values_hash)
+      FactoryGirl.create(target_class_symbol, attributes)
+    end
+
+    def spawn(attributes = {})
+      attributes = attributes.merge(where_values_hash)
+      FactoryGirl.build(target_class_symbol, attributes)
+    end
+
   end
 end
-

data/lib/daddys_girl/version.rb

@@ -1,3 +1,3 @@
 module DaddysGirl
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daddys_girl
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-13 00:00:00.000000000Z
+date: 2012-04-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &18497000 !ruby/object:Gem::Requirement
+  requirement: &70814090 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *18497000
+  version_requirements: *70814090
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &18496480 !ruby/object:Gem::Requirement
+  requirement: &70813810 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *18496480
+  version_requirements: *70813810
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &18495980 !ruby/object:Gem::Requirement
+  requirement: &70813510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *18495980
+  version_requirements: *70813510
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &18495600 !ruby/object:Gem::Requirement
+  requirement: &70813250 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18495600
+  version_requirements: *70813250
 description: Rubygem to provide object_daddy-like syntax for factory_girl
 email:
 - development@inventables.com