factory_girl-preload 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf600819caff54fc1096ad8a47a7c0929f29d502
-  data.tar.gz: 6b08c0a4ef6dfb1d7770f54451c246e654d3ac4d
+  metadata.gz: 58ac6a913e3b86ef7e1095e07ce9e29b28333f41
+  data.tar.gz: 69fcbba46af74f561ad737413c5e815bd40ef054
 SHA512:
-  metadata.gz: 29804938666dd0c0aa882617b73b684562c55a4e8a8be0fdac25fbb11192b7c5141bdfff4675ea8974561ad4faca97c0347d8d3c91fd6223f983304fa62112a9
-  data.tar.gz: e40000efb9c3dc5001e7aa3761eeadbc2a08628630ed80f463d1ab48685f5443cb7c94c78eee50761d19315e926eca1aca318defdb880efc25faeea37642870f
+  metadata.gz: 3cc6c33b45a5cb489baebfbb2e4a23b5ea00c144727ccc7a5bfe3dc296de27077debcefa02386fead23fe30dd78d85ba90d35c7e50bdbd84e75ba2abe6f61feb
+  data.tar.gz: dd0c58ba266d546fb254798a32bfc383c082bbbc6195d007eabe2e4476261c4d0bfe826569e995a66b5bf2ca68647ed905727ccba98502935df07b59e8eae253

data/Gemfile.lock

@@ -1,29 +1,29 @@
 PATH
   remote: .
   specs:
-    factory_girl-preload (2.2.0)
-      factory_girl (>= 3.0)
+    factory_girl-preload (2.3.0)
+      factory_girl (>= 4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (4.1.2)
-      actionview (= 4.1.2)
-      activesupport (= 4.1.2)
+    actionpack (4.1.4)
+      actionview (= 4.1.4)
+      activesupport (= 4.1.4)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.2)
-      activesupport (= 4.1.2)
+    actionview (4.1.4)
+      activesupport (= 4.1.4)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.2)
-      activesupport (= 4.1.2)
+    activemodel (4.1.4)
+      activesupport (= 4.1.4)
       builder (~> 3.1)
-    activerecord (4.1.2)
-      activemodel (= 4.1.2)
-      activesupport (= 4.1.2)
+    activerecord (4.1.4)
+      activemodel (= 4.1.4)
+      activesupport (= 4.1.4)
       arel (~> 5.0.0)
-    activesupport (4.1.2)
+    activesupport (4.1.4)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -37,16 +37,16 @@ GEM
     erubis (2.7.0)
     factory_girl (4.4.0)
       activesupport (>= 3.0.0)
-    i18n (0.6.9)
+    i18n (0.6.11)
     json (1.8.1)
     method_source (0.8.2)
-    minitest (5.3.5)
+    minitest (5.4.0)
     mysql2 (0.3.16)
     pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pry-meta (0.0.7)
+    pry-meta (0.0.9)
       awesome_print
       pry
       pry-nav
@@ -59,9 +59,9 @@ GEM
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    railties (4.1.2)
-      actionpack (= 4.1.2)
-      activesupport (= 4.1.2)
+    railties (4.1.4)
+      actionpack (= 4.1.4)
+      activesupport (= 4.1.4)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.3.2)
@@ -81,7 +81,7 @@ GEM
       rspec-mocks (~> 3.0.0)
       rspec-support (~> 3.0.0)
     rspec-support (3.0.2)
-    slop (3.5.0)
+    slop (3.6.0)
     thor (0.19.1)
     thread_safe (0.3.4)
     tzinfo (1.2.1)

data/factory_girl-preload.gemspec

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
 require "factory_girl/preload/version"
 
@@ -17,7 +16,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", ">= 3.0"
+  s.add_dependency "factory_girl", ">= 4.0"
   s.add_development_dependency "activerecord"
   s.add_development_dependency "actionpack"
   s.add_development_dependency "rspec-rails"

data/lib/factory_girl/preload.rb

@@ -1,11 +1,15 @@
+require "factory_girl"
+
 module FactoryGirl
   module Preload
-    autoload :Helpers, "factory_girl/preload/helpers"
-    autoload :Version, "factory_girl/preload/version"
+    require "factory_girl/preload/helpers"
+    require "factory_girl/preload/version"
 
     require "factory_girl/preload/rspec2" if defined?(RSpec)
     require "factory_girl/preload/extension"
 
+    ::FactoryGirl::SyntaxRunner.send(:include, Helpers)
+
     class << self
       attr_accessor :preloaders
       attr_accessor :factories

data/lib/factory_girl/preload/version.rb

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

data/spec/factory_girl/preload_spec.rb

@@ -45,6 +45,10 @@ describe FactoryGirl::Preload do
     expect { FactoryGirl::Preload.clean }.to raise_error(%[Couldn't find invalid clean type])
   end
 
+  example "association uses preloaded record" do
+    expect(build(:skill).user).to eq(users(:john))
+  end
+
   context "removes records" do
     it "with deletion" do
       expect(User.count).to eq(1)
@@ -91,4 +95,8 @@ describe FactoryGirl::Preload do
   it "includes factory girl helpers" do
     expect(self.class.included_modules).to include(FactoryGirl::Syntax::Methods)
   end
+
+  it "includes helpers into factory girl" do
+    expect(FactoryGirl::SyntaxRunner.included_modules).to include(FactoryGirl::Preload::Helpers)
+  end
 end

data/spec/spec_helper.rb

@@ -2,21 +2,17 @@ ENV["RAILS_ENV"] = "test"
 require "rails"
 
 ENV["BUNDLE_GEMFILE"] = File.dirname(__FILE__) + "/../Gemfile"
-require "bundler"
-Bundler.setup
+require "bundler/setup"
 require "rails/all"
-Bundler.require(:default)
 
 require "rspec/rails"
 require "factory_girl"
-require File.dirname(__FILE__) + "/support/factories"
 
 module RSpec
   class Application < ::Rails::Application
     config.root = File.dirname(__FILE__) + "/support/app"
     config.active_support.deprecation = :log
     config.eager_load = false
-    # config.active_record.logger = Logger.new(STDOUT)
   end
 end
 
@@ -27,4 +23,6 @@ RSpec.configure do |config|
   config.use_transactional_fixtures = true
 end
 
+require "factory_girl/preload"
+require File.dirname(__FILE__) + "/support/factories"
 FactoryGirl::Preload.run

data/spec/support/factories.rb

@@ -5,7 +5,7 @@ FactoryGirl.define do
   end
 
   factory :skill do |f|
-    f.association :user
+    user { users(:john) }
   end
 
   factory :preload do |f|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factory_girl-preload
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-29 00:00:00.000000000 Z
+date: 2014-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_girl
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement