lib/sniff/fixture.rb in sniff-0.11.5 vs lib/sniff/fixture.rb in sniff-0.11.6

@@ -1,26 +1,22 @@
 require 'csv'
 
 module Sniff
   module Fixture
     extend self
-
-    # FIXME TODO this doesn't work for models where the model name is different from the table name
-    # (e.g. PetroleumAdministrationForDefenseDistrict, ResidentialEnergyConsumptionSurveyResponse)
+    
     def load_fixtures(fixtures_path)
       Encoding.default_external = 'UTF-8' if Object.const_defined?('Encoding')
       Dir.glob(File.join(fixtures_path, '**/*.csv')) do |fixture_file|
-        table_name = File.basename(fixture_file, '.csv')
-        model_name = table_name.singularize.camelize
+        model_name = File.basename(fixture_file, '.csv').singularize.camelize
         next unless Object.const_defined?(model_name)
-
+        
         model = model_name.constantize
         model.auto_upgrade! unless model.table_exists?
         ActiveRecord::Base.logger.info "Loading fixture #{fixture_file}"
         CSV.foreach(fixture_file, :headers => true) do |row|
-          ActiveRecord::Base.connection.insert_fixture(row, table_name) rescue ActiveRecord::RecordNotUnique
+          ActiveRecord::Base.connection.insert_fixture(row, model.table_name) rescue ActiveRecord::RecordNotUnique
         end
       end
     end
   end
 end
-