factory_girl-preload 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e77301eb1edb16a785cb0dbcd0d628bbd2081808
-  data.tar.gz: d1594901d3ed7e85a6175d92c6f71945cfe06eab
+  metadata.gz: ab3729f171070e0df3264bee3761fb1204c77076
+  data.tar.gz: ce6e84d25feb7922e5aa4a2da6cf9b8147e66c7b
 SHA512:
-  metadata.gz: 5dae2a72f6e597ae5e8126cc56f25c34fd12170e5e6ade711b369f7853adca2829268821a72430be83983327cb69018f76ab1d46cc2824d37449bc467c0712cd
-  data.tar.gz: d24f97ef86de07b1b10f0a623e64d834408a33fe0677ddb5d591ce034abd17e2ab3d4ccc99bbe2ed18dcbbcac0667042c48a388ad817d34a4500adf72c5d3795
+  metadata.gz: c363f8016ab5703304da1e83712e5e0ce62447465c49c226920fb2229c7e0616bfadbb8bbc2e3d5aa15aa29d8f3225ea7b6a2de6ed5745ff7af28b777bc0f998
+  data.tar.gz: 58ae144f6f9c5211d7d8e566d2eee5b9b199dc2faae7b1aa48f45439756df6f285921e614e4be35a93135ef5a4f8a47e1abe703dffaa66a3378ebaa80c8a1c3d

data/Gemfile.lock

@@ -1,69 +1,89 @@
 PATH
   remote: .
   specs:
-    factory_girl-preload (2.1.0)
+    factory_girl-preload (2.1.1)
       factory_girl (>= 3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (4.0.3)
-      activesupport (= 4.0.3)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
+    actionpack (4.1.0)
+      actionview (= 4.1.0)
+      activesupport (= 4.1.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.3)
-      activesupport (= 4.0.3)
-      builder (~> 3.1.0)
-    activerecord (4.0.3)
-      activemodel (= 4.0.3)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.3)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.3)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+    actionview (4.1.0)
+      activesupport (= 4.1.0)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.0)
+      activesupport (= 4.1.0)
+      builder (~> 3.1)
+    activerecord (4.1.0)
+      activemodel (= 4.1.0)
+      activesupport (= 4.1.0)
+      arel (~> 5.0.0)
+    activesupport (4.1.0)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    arel (4.0.2)
-    atomic (1.1.15)
-    builder (3.1.4)
+      tzinfo (~> 1.1)
+    arel (5.0.1.20140414130214)
+    ast (1.1.0)
+    builder (3.2.2)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     factory_girl (4.4.0)
       activesupport (>= 3.0.0)
     i18n (0.6.9)
-    minitest (4.7.5)
-    multi_json (1.9.0)
+    json (1.8.1)
+    minitest (5.3.3)
     mysql2 (0.3.15)
+    parser (2.1.7)
+      ast (~> 1.1)
+      slop (~> 3.4, >= 3.4.5)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    railties (4.0.3)
-      actionpack (= 4.0.3)
-      activesupport (= 4.0.3)
+    railties (4.1.0)
+      actionpack (= 4.1.0)
+      activesupport (= 4.1.0)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.1)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    rspec-rails (2.14.1)
+    rainbow (2.0.0)
+    rake (10.3.0)
+    rspec-collection_matchers (0.0.3)
+      rspec-expectations (>= 2.99.0.beta1)
+    rspec-core (3.0.0.beta2)
+      rspec-support (= 3.0.0.beta2)
+    rspec-expectations (3.0.0.beta2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (= 3.0.0.beta2)
+    rspec-mocks (3.0.0.beta2)
+      rspec-support (= 3.0.0.beta2)
+    rspec-rails (3.0.0.beta2)
       actionpack (>= 3.0)
       activemodel (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    thor (0.18.1)
-    thread_safe (0.2.0)
-      atomic (>= 1.1.7, < 2)
-    tzinfo (0.3.39)
+      rspec-collection_matchers
+      rspec-core (= 3.0.0.beta2)
+      rspec-expectations (= 3.0.0.beta2)
+      rspec-mocks (= 3.0.0.beta2)
+      rspec-support (= 3.0.0.beta2)
+    rspec-support (3.0.0.beta2)
+    slop (3.5.0)
+    thor (0.19.1)
+    thread_safe (0.3.3)
+    transpec (1.10.4)
+      activesupport (~> 4.0)
+      bundler (~> 1.3)
+      json (~> 1.8)
+      parser (>= 2.1.6, < 3.0)
+      rainbow (>= 1.99.1, < 3.0)
+    tzinfo (1.1.0)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
@@ -73,4 +93,5 @@ DEPENDENCIES
   activerecord
   factory_girl-preload!
   mysql2
-  rspec-rails
+  rspec-rails (= 3.0.0.beta2)
+  transpec

data/factory_girl-preload.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.add_dependency "factory_girl", ">= 3.0"
   s.add_development_dependency "activerecord"
   s.add_development_dependency "actionpack"
-  s.add_development_dependency "rspec-rails"
+  s.add_development_dependency "rspec-rails", "3.0.0.beta2"
+  s.add_development_dependency "transpec"
   s.add_development_dependency "mysql2"
 end

data/lib/factory_girl/preload/helpers.rb

@@ -15,7 +15,7 @@ module FactoryGirl
 
           class_eval <<-RUBY, __FILE__, __LINE__
             def #{method_name}(name)
-              factory(name, ::#{model})
+              factory(name, ::#{model.name})
             end
           RUBY
         end

data/lib/factory_girl/preload/version.rb

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

data/spec/factory_girl/preload_spec.rb

@@ -6,16 +6,16 @@ describe FactoryGirl::Preload do
   it "queues preloader block" do
     block = proc {}
     FactoryGirl.preload(&block)
-    FactoryGirl::Preload.preloaders.should include(block)
+    expect(FactoryGirl::Preload.preloaders).to include(block)
   end
 
   it "should lazy load all factories, loading only when used" do
-    FactoryGirl::Preload.record_ids['User'][:john].should eq(1)
-    FactoryGirl::Preload.factories['User'][:john].should be_nil
+    expect(FactoryGirl::Preload.record_ids['User'][:john]).to eq(1)
+    expect(FactoryGirl::Preload.factories['User'][:john]).to be_nil
 
     user = users(:john)
 
-    FactoryGirl::Preload.factories['User'][:john].should eq(user)
+    expect(FactoryGirl::Preload.factories['User'][:john]).to eq(user)
   end
 
   it "injects model methods" do
@@ -23,19 +23,19 @@ describe FactoryGirl::Preload do
   end
 
   it "returns :john factory for User model" do
-    users(:john).should be_an(User)
+    expect(users(:john)).to be_an(User)
   end
 
   it "returns :ruby factory for Skill model" do
-    skills(:ruby).should be_a(Skill)
+    expect(skills(:ruby)).to be_a(Skill)
   end
 
   it "returns :my factory for Preload model" do
-    preloads(:my).should be_a(Preload)
+    expect(preloads(:my)).to be_a(Preload)
   end
 
   it "reuses existing factories" do
-    skills(:ruby).user.should == users(:john)
+    expect(skills(:ruby).user).to eq(users(:john))
   end
 
   it "raises error for missing factories" do
@@ -49,17 +49,17 @@ describe FactoryGirl::Preload do
 
   context "removes records" do
     it "with deletion" do
-      User.count.should == 1
+      expect(User.count).to eq(1)
       FactoryGirl::Preload.clean_with = :deletion
       FactoryGirl::Preload.clean
-      User.count.should == 0
+      expect(User.count).to eq(0)
     end
 
     it "with truncation" do
-      User.count.should == 1
+      expect(User.count).to eq(1)
       FactoryGirl::Preload.clean_with = :truncation
       FactoryGirl::Preload.clean
-      User.count.should == 0
+      expect(User.count).to eq(0)
     end
   end
 
@@ -75,18 +75,18 @@ describe FactoryGirl::Preload do
 
     it "freezes object" do
       users(:john).destroy
-      users(:john).should be_frozen
+      expect(users(:john)).to be_frozen
     end
 
     it "updates invitation count" do
       users(:john).increment(:invitations)
       users(:john).save
-      users(:john).invitations.should == 1
+      expect(users(:john).invitations).to eq(1)
     end
 
     it "reloads factory" do
-      users(:john).invitations.should == 0
-      users(:john).should_not be_frozen
+      expect(users(:john).invitations).to eq(0)
+      expect(users(:john)).not_to be_frozen
     end
   end
 end

data/spec/spec_helper.rb

@@ -15,6 +15,7 @@ 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

data/spec/support/app/app/models/category.rb

@@ -0,0 +1,3 @@
+class Category < ActiveRecord::Base
+  has_and_belongs_to_many :users
+end

data/spec/support/app/app/models/user.rb

@@ -1,3 +1,4 @@
 class User < ActiveRecord::Base
   has_many :skills
+  has_and_belongs_to_many :categories
 end

data/spec/support/app/db/schema.rb

@@ -3,6 +3,8 @@ ActiveRecord::Schema.define(:version => 0) do
     drop_table :users
     drop_table :skills
     drop_table :preloads
+    drop_table :categories
+    drop_table :categories_users
   rescue Exception => e
   end
 
@@ -21,4 +23,12 @@ ActiveRecord::Schema.define(:version => 0) do
   create_table :skills do |t|
     t.references :user
   end
+
+  create_table :categories do |t|
+  end
+
+  create_table :categories_users, :id => false do |t|
+    t.references :category
+    t.references :user
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factory_girl-preload
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_girl
@@ -54,6 +54,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.0.beta2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.0.beta2
+- !ruby/object:Gem::Dependency
+  name: transpec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -103,6 +117,7 @@ files:
 - lib/factory_girl/preload/version.rb
 - spec/factory_girl/preload_spec.rb
 - spec/spec_helper.rb
+- spec/support/app/app/models/category.rb
 - spec/support/app/app/models/preload.rb
 - spec/support/app/app/models/skill.rb
 - spec/support/app/app/models/user.rb
@@ -133,4 +148,13 @@ signing_key:
 specification_version: 4
 summary: Preload factories (Factory Girl) just like fixtures. It will be easy and,
   probably, faster!
-test_files: []
+test_files:
+- spec/factory_girl/preload_spec.rb
+- spec/spec_helper.rb
+- spec/support/app/app/models/category.rb
+- spec/support/app/app/models/preload.rb
+- spec/support/app/app/models/skill.rb
+- spec/support/app/app/models/user.rb
+- spec/support/app/config/database.yml
+- spec/support/app/db/schema.rb
+- spec/support/factories.rb