fixation 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3b3168e7c5df3c31609251ba4a7c645d706e765
-  data.tar.gz: f5bfe0e79605be818a4bf47096fc03a9f9ae74a3
+  metadata.gz: 658d4e159e9f4f2a40209757beeb8992e52099ad
+  data.tar.gz: 445b6032756c033604a8683d583e2a3100122daf
 SHA512:
-  metadata.gz: 67670b4cb21db3794e855a7cd3b7cf504c241ae5af6f493ee4c638c59a5a5e0b905f575c8c1e9650775341f9c97c9f3c9ce2345e604e8ef712d64abf85962b4d
-  data.tar.gz: 62086ce7f21c3c1c74d2f4329b63f8c4282ef0609378b2ac174a5f01c95d51c827ccfc562c9fa30aa04eaa79c568fd2e06e0be68d295ac9ddd103fef3e67f2aa
+  metadata.gz: 3a553d7eb6c23791c74c68bab53d6541e4254052e08525d62c6c658c702a363ebe358d86b8757a1de7952b3051bd1348dab721fd6b07da0a5f4558239a5c0abe
+  data.tar.gz: 5b858f89167561777658619076f3fb58c2dd87d91ee0a1ea247a1fb61b3a8fddc026a861ff3cc1d3ae151b2e3a49cf232a33bb650c6860c1448bf4d2cf59d74c

data/lib/fixation.rb

@@ -7,26 +7,28 @@ require "fixation/version"
 
 module Fixation
   class FixtureTable
-    attr_reader :filename, :table_name, :connection, :now
+    attr_reader :filename, :class_name, :table_name, :connection, :now
 
-    def initialize(filename, table_name, connection, now)
+    def initialize(filename, basename, connection, now)
       @filename = filename
-      @table_name = table_name
       @connection = connection
       @now = now
 
-      @klass_name = @table_name.classify
+      @class_name = basename.classify
       begin
-        @klass = @klass_name.constantize
+        @klass = @class_name.constantize
         @klass = nil unless @klass < ActiveRecord::Base
       rescue NameError
-        ActiveRecord::Base.logger.warn "couldn't load #{@klass_name} for fixture table #{table_name}: #{$!}"
+        ActiveRecord::Base.logger.warn "couldn't load #{class_name} for fixture table #{table_name}: #{$!}"
       end
 
       if @klass
+        @table_name = @klass.table_name
         @primary_key = @klass.primary_key
         @record_timestamps = @klass.record_timestamps
         @inheritance_column = @klass.inheritance_column
+      else
+        @table_name = basename.gsub('/', '_')
       end
     end
 
@@ -181,18 +183,18 @@ module Fixation
       Fixation.paths.each do |path|
         Dir["#{path}/{**,*}/*.yml"].each do |pathname|
           basename = pathname[path.size + 1..-5]
-          compile_fixture_file(pathname, basename.gsub('/', '_'), basename.classify, connection, now) if ::File.file?(pathname)
+          compile_fixture_file(pathname, basename, connection, now) if ::File.file?(pathname)
         end
       end
 
       puts "#{Time.now} built fixtures for #{@fixture_ids.size} tables" if Fixation.trace
     end
 
-    def compile_fixture_file(filename, table_name, class_name, connection, now)
-      fixture_table = FixtureTable.new(filename, table_name, connection, now)
-      @fixture_ids[table_name] = fixture_table.fixture_ids
-      @statements[table_name] = fixture_table.statements
-      @class_names[table_name] = class_name
+    def compile_fixture_file(filename, basename, connection, now)
+      fixture_table = FixtureTable.new(filename, basename, connection, now)
+      @fixture_ids[fixture_table.table_name] = fixture_table.fixture_ids
+      @statements[fixture_table.table_name] = fixture_table.statements
+      @class_names[fixture_table.table_name] = fixture_table.class_name
     end
 
     def apply_fixtures(connection = ActiveRecord::Base.connection)

data/lib/fixation/version.rb

@@ -1,3 +1,3 @@
 module Fixation
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fixation
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Will Bryant