myronmarston-factory_data_preloader 0.5.0 → 0.5.1

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 0.5.1 / 2009-07-07
+
+* Fixed a couple of bugs that caused the data to be preloaded multiple times or deleted multiple times.
+
 == 0.5.0 / 2009-07-07
 
 * Added better error handling.  The data[:key] = record form is deprecated in favor of data.add(:key) { record }.

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 5
-:patch: 0
+:patch: 1

data/lib/factory_data_preloader/factory_data.rb

@@ -38,7 +38,7 @@ module FactoryDataPreloader
       def delete_preload_data!
         # Delete them in the reverse order of the dependencies, to handle foreign keys
         FactoryDataPreloader.requested_preloaders.dependency_order.reverse.each do |preloader|
-          preloader.model_class.delete_all
+          preloader.delete_table_data!
         end
       end
 

data/lib/factory_data_preloader/preloader.rb

@@ -42,6 +42,7 @@ module FactoryDataPreloader
     end
 
     def preload!
+      return if preloaded?
       @data = PreloadedDataHash.new(self)
       print "Preloading #{model_type}:"
       benchmark_measurement = Benchmark.measure { self.proc.try(:call, @data) }
@@ -52,6 +53,13 @@ module FactoryDataPreloader
       !@data.nil?
     end
 
+    def delete_table_data!
+      unless @table_data_deleted
+        self.model_class.delete_all
+        @table_data_deleted = true
+      end
+    end
+
     def dependencies
       self.depends_on.collect { |dependency| AllPreloaders.instance.from_symbol(dependency) }
     end

data/test/preloader_test.rb

@@ -25,6 +25,8 @@ class PreloaderTest < Test::Unit::TestCase
         end
       end
 
+      should_change 'User.count', :by => 2
+
       should 'return the preloaded data when #get_record is called' do
         assert_equal 'York', @preloader.get_record(:thom).last_name
         assert_equal 'Doe',  @preloader.get_record(:john).last_name
@@ -34,6 +36,37 @@ class PreloaderTest < Test::Unit::TestCase
         assert_equal '', @err
         assert_match /Preloading users:\.\.\([\d\.]+ secs\)/, @out
       end
+
+      context 'when preloaded again' do
+        setup do
+          @out, @err = OutputCapturer.capture do
+            @preloader.preload!
+          end
+        end
+
+        should 'print nothing' do
+          assert_equal '', @err
+          assert_equal '', @out
+        end
+
+        should_not_change 'User.count'
+      end
+
+      should 'issue a delete statement if #delete_table_data! is called' do
+        User.expects(:delete_all).once
+        @preloader.delete_table_data!
+      end
+
+      context 'when #delete_table_data! is called' do
+        setup do
+          @preloader.delete_table_data!
+        end
+
+        should 'not issue another delete statement if #delete_table_data! is later called on the same preloader' do
+          User.expects(:delete_all).never
+          @preloader.delete_table_data!
+        end
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: myronmarston-factory_data_preloader
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Myron Marston