factory_girl-preload 1.0.3 → 2.0.0

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    factory_girl-preload (1.0.3)
-      factory_girl (~> 2.0)
+    factory_girl-preload (2.0.0)
+      factory_girl (~> 3.0)
 
 GEM
   remote: http://rubygems.org/
@@ -32,13 +32,13 @@ GEM
     builder (3.0.0)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    factory_girl (2.6.1)
-      activesupport (>= 2.3.9)
+    factory_girl (3.0.0)
+      activesupport (>= 3.0.0)
     hike (1.2.1)
     i18n (0.6.0)
     journey (1.0.3)
-    json (1.6.5)
-    multi_json (1.1.0)
+    json (1.6.6)
+    multi_json (1.2.0)
     mysql2 (0.3.11)
     rack (1.4.1)
     rack-cache (1.2)
@@ -57,19 +57,19 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    rspec-rails (2.8.1)
+    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)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    rspec-rails (2.9.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec (~> 2.8.0)
+      rspec (~> 2.9.0)
     sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)

data/README.rdoc

@@ -98,8 +98,9 @@ The new Factory Girl syntax is also supported:
     end
 
     preload do
-      factory(:john) { Factory(:user) }
-      factory(:ruby) { Factory(:skill, :user => users(:john)) }
+      # the create method is just a shortcut to FactoryGirl.create
+      factory(:john) { create(:user) }
+      factory(:ruby) { create(:skill, :user => users(:john)) }
     end
   end
 

data/factory_girl-preload.gemspec

@@ -4,7 +4,7 @@ require "factory_girl/preload/version"
 
 Gem::Specification.new do |s|
   s.name        = "factory_girl-preload"
-  s.version     = Factory::Preload::Version::STRING
+  s.version     = FactoryGirl::Preload::Version::STRING
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Nando Vieira"]
   s.email       = ["fnando.vieira@gmail.com"]
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "factory_girl", "~> 2.0"
+  s.add_dependency "factory_girl", "~> 3.0"
   s.add_development_dependency "activerecord", "~> 3.1"
   s.add_development_dependency "actionpack", "~> 3.1"
   s.add_development_dependency "rspec-rails", "~> 2.7"

data/lib/factory_girl/preload/extension.rb

@@ -1,15 +1,13 @@
-module Factory
+module FactoryGirl
   def self.preload(&block)
     Preload.preloaders << block
   end
-end
 
-module FactoryGirl
   module Syntax
     module Default
       class DSL
         def preload(&block)
-          ::Factory.preload(&block)
+          ::FactoryGirl.preload(&block)
         end
       end
     end

data/lib/factory_girl/preload/helpers.rb

@@ -1,4 +1,4 @@
-module Factory
+module FactoryGirl
   module Preload
     module Helpers
       def self.extended(base)
@@ -31,15 +31,19 @@ module Factory
 
       private
       def factory_get(name, model)
-        factory = Factory::Preload.factories[model.name][name] rescue nil
+        factory = Preload.factories[model.name][name] rescue nil
         raise "Couldn't find #{name.inspect} factory for #{model.name.inspect} model" unless factory
         factory
       end
 
+      def create(name, attrs = {})
+        FactoryGirl.create(name, attrs)
+      end
+
       def factory_set(name, &block)
-        record = block.call
-        Factory::Preload.factories[record.class.name] ||= {}
-        Factory::Preload.factories[record.class.name][name.to_sym] = record
+        record = instance_eval(&block)
+        Preload.factories[record.class.name] ||= {}
+        Preload.factories[record.class.name][name.to_sym] = record
       end
     end
   end

data/lib/factory_girl/preload/rspec2.rb

@@ -1,13 +1,13 @@
 require 'rspec/core'
 
 RSpec.configure do |config|
-  config.include Factory::Preload::Helpers
+  config.include FactoryGirl::Preload::Helpers
   config.before(:suite) do
-    Factory::Preload.clean
-    Factory::Preload.run
+    FactoryGirl::Preload.clean
+    FactoryGirl::Preload.run
   end
 
   config.before(:each) do
-    Factory::Preload.reload_factories
+    FactoryGirl::Preload.reload_factories
   end
 end

data/lib/factory_girl/preload/version.rb

@@ -1,9 +1,9 @@
-module Factory
+module FactoryGirl
   module Preload
     module Version
-      MAJOR = 1
+      MAJOR = 2
       MINOR = 0
-      PATCH = 3
+      PATCH = 0
       STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
     end
   end

data/lib/factory_girl/preload.rb

@@ -1,4 +1,4 @@
-module Factory
+module FactoryGirl
   module Preload
     autoload :Helpers, "factory_girl/preload/helpers"
     autoload :Version, "factory_girl/preload/version"

data/spec/factory_girl/preload_spec.rb

@@ -1,12 +1,12 @@
 require "spec_helper"
 
-describe Factory::Preload do
-  include Factory::Preload::Helpers
+describe FactoryGirl::Preload do
+  include FactoryGirl::Preload::Helpers
 
   it "queues preloader block" do
     block = proc {}
-    Factory.preload(&block)
-    Factory::Preload.preloaders.should include(block)
+    FactoryGirl.preload(&block)
+    FactoryGirl::Preload.preloaders.should include(block)
   end
 
   it "injects model methods" do
@@ -31,18 +31,18 @@ describe Factory::Preload do
 
   it "removes records" do
     User.count.should == 1
-    Factory::Preload.clean
+    FactoryGirl::Preload.clean
     User.count.should == 0
   end
 
   context "reloadable factories" do
     before :all do
-      Factory::Preload.clean
-      Factory::Preload.run
+      FactoryGirl::Preload.clean
+      FactoryGirl::Preload.run
     end
 
     before :each do
-      Factory::Preload.reload_factories
+      FactoryGirl::Preload.reload_factories
     end
 
     it "freezes object" do

data/spec/spec_helper.rb

@@ -26,4 +26,4 @@ RSpec.configure do |config|
   config.use_transactional_fixtures = true
 end
 
-Factory::Preload.run
+FactoryGirl::Preload.run

data/spec/support/factories.rb

@@ -9,7 +9,7 @@ FactoryGirl.define do
   end
 
   preload do
-    factory(:john) { Factory(:user) }
-    factory(:ruby) { Factory(:skill, :user => users(:john)) }
+    factory(:john) { create(:user) }
+    factory(:ruby) { create(:skill, :user => users(:john)) }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factory_girl-preload
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-05 00:00:00.000000000 Z
+date: 2012-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70131406513700 !ruby/object:Gem::Requirement
+  requirement: &70279175524660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70131406513700
+  version_requirements: *70279175524660
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70131406541320 !ruby/object:Gem::Requirement
+  requirement: &70279175524100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *70131406541320
+  version_requirements: *70279175524100
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70131406540860 !ruby/object:Gem::Requirement
+  requirement: &70279175523400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *70131406540860
+  version_requirements: *70279175523400
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70131406540360 !ruby/object:Gem::Requirement
+  requirement: &70279175522860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70131406540360
+  version_requirements: *70279175522860
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70131406539900 !ruby/object:Gem::Requirement
+  requirement: &70279175522160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *70131406539900
+  version_requirements: *70279175522160
 description: Preload factories (Factory Girl) just like fixtures. It will be easy
   and, probably, faster!
 email:
@@ -108,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 91843153823333779
+      hash: -816435126381893825
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 91843153823333779
+      hash: -816435126381893825
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11