factory_girl-preload 1.0.2 → 1.0.3

data/Gemfile.lock

@@ -1,84 +1,82 @@
 PATH
   remote: .
   specs:
-    factory_girl-preload (1.0.2)
+    factory_girl-preload (1.0.3)
       factory_girl (~> 2.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (3.1.1)
-      activemodel (= 3.1.1)
-      activesupport (= 3.1.1)
+    actionpack (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.2)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
       rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.2)
-    activemodel (3.1.1)
-      activesupport (= 3.1.1)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.2)
+      activesupport (= 3.2.2)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.1)
-      activemodel (= 3.1.1)
-      activesupport (= 3.1.1)
-      arel (~> 2.2.1)
+    activerecord (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.1.1)
+    activesupport (3.2.2)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (2.2.1)
+    arel (3.0.2)
     builder (3.0.0)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    factory_girl (2.2.0)
-      activesupport
+    factory_girl (2.6.1)
+      activesupport (>= 2.3.9)
     hike (1.2.1)
     i18n (0.6.0)
-    json (1.6.1)
-    multi_json (1.0.3)
-    mysql2 (0.3.7)
-    rack (1.3.5)
-    rack-cache (1.1)
+    journey (1.0.3)
+    json (1.6.5)
+    multi_json (1.1.0)
+    mysql2 (0.3.11)
+    rack (1.4.1)
+    rack-cache (1.2)
       rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    railties (3.1.1)
-      actionpack (= 3.1.1)
-      activesupport (= 3.1.1)
+    railties (3.2.2)
+      actionpack (= 3.2.2)
+      activesupport (= 3.2.2)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
     rake (0.9.2.2)
-    rdoc (3.11)
+    rdoc (3.12)
       json (~> 1.4)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
+    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.7.0)
-    rspec-rails (2.7.0)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.7.0)
-    sprockets (2.0.3)
+    rspec-mocks (2.8.0)
+    rspec-rails (2.8.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.8.0)
+    sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     thor (0.14.6)
     tilt (1.3.3)
-    tzinfo (0.3.30)
+    tzinfo (0.3.32)
 
 PLATFORMS
   ruby

data/lib/factory_girl/preload/helpers.rb

@@ -8,7 +8,7 @@ module Factory
       def self.included(base)
         Dir[Rails.application.root.join("app/models/**/*.rb")].each do |file|
           require_dependency file
-        end
+        end if defined?(Rails)
 
         ActiveRecord::Base.descendants.each do |model|
           method_name = model.name.underscore.gsub("/", "_").pluralize

data/lib/factory_girl/preload/version.rb

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

data/lib/factory_girl/preload.rb

@@ -25,9 +25,15 @@ module Factory
     end
 
     def self.clean(*names)
-      query = ActiveRecord::Base.connection.class.name == "ActiveRecord::ConnectionAdapters::SQLite3Adapter" ? "DELETE FROM %s" : "TRUNCATE TABLE %s"
+      query = case ActiveRecord::Base.connection.adapter_name
+        when "SQLite"     then "DELETE FROM %s"
+        when "PostgreSQL" then "TRUNCATE TABLE %s RESTART IDENTITY"
+        else "TRUNCATE TABLE %s"
+      end
       names = ActiveRecord::Base.descendants.collect(&:table_name).uniq if names.empty?
-      names.each {|table| ActiveRecord::Base.connection.execute(query % ActiveRecord::Base.connection.quote_table_name(table))}
+      ActiveRecord::Base.connection.disable_referential_integrity do
+        names.each {|table| ActiveRecord::Base.connection.execute(query % ActiveRecord::Base.connection.quote_table_name(table))}
+      end
     end
 
     def self.reload_factories

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factory_girl-preload
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-06 00:00:00.000000000 Z
+date: 2012-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70355889609140 !ruby/object:Gem::Requirement
+  requirement: &70131406513700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70355889609140
+  version_requirements: *70131406513700
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70355889455760 !ruby/object:Gem::Requirement
+  requirement: &70131406541320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *70355889455760
+  version_requirements: *70131406541320
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70355889452840 !ruby/object:Gem::Requirement
+  requirement: &70131406540860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *70355889452840
+  version_requirements: *70131406540860
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70355889448420 !ruby/object:Gem::Requirement
+  requirement: &70131406540360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70355889448420
+  version_requirements: *70131406540360
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70355889233540 !ruby/object:Gem::Requirement
+  requirement: &70131406539900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *70355889233540
+  version_requirements: *70131406539900
 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: -1397438181810469630
+      hash: 91843153823333779
 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: -1397438181810469630
+      hash: 91843153823333779
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11