fixation 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 658d4e159e9f4f2a40209757beeb8992e52099ad
-  data.tar.gz: 445b6032756c033604a8683d583e2a3100122daf
+  metadata.gz: 7b9b89848ceefd67ecc8243402e8a739f088dc14
+  data.tar.gz: 782f9e638b36c56c45e74e842795da2349386936
 SHA512:
-  metadata.gz: 3a553d7eb6c23791c74c68bab53d6541e4254052e08525d62c6c658c702a363ebe358d86b8757a1de7952b3051bd1348dab721fd6b07da0a5f4558239a5c0abe
-  data.tar.gz: 5b858f89167561777658619076f3fb58c2dd87d91ee0a1ea247a1fb61b3a8fddc026a861ff3cc1d3ae151b2e3a49cf232a33bb650c6860c1448bf4d2cf59d74c
+  metadata.gz: 23a58a4aac7dcea633e894cdb79c01b830f24257e5a1ef3ef7cfc2180a5d185ac7ae93089a0bf6a3f57342beb709db07cb5f0bf0e821947ac81d641e6bab26cc
+  data.tar.gz: 5b97553515160b6baaca85486a0322cd75e94320e358ee4de553d7df98170c1614839e1686f65168e8db58728935198d7524c28f62fbb1a2a2eb7a041c0c59f3

data/README.md

@@ -47,7 +47,7 @@ config.include Fixation.fixture_methods
 
 ## Usage
 
-Simply use run your tests under spring.
+Simply run your tests under spring.
 
     bundle exec spring spec/models/my_spec.rb
 

data/lib/fixation.rb

@@ -192,9 +192,10 @@ module Fixation
 
     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
+      fixture_name = basename.gsub('/', '_')
+      @fixture_ids[fixture_name] = fixture_table.fixture_ids
+      @statements[fixture_name] = fixture_table.statements
+      @class_names[fixture_name] = fixture_table.class_name
     end
 
     def apply_fixtures(connection = ActiveRecord::Base.connection)
@@ -227,30 +228,29 @@ module Fixation
           super
         end
 
-        fixture_ids.each do |table_name, fixtures|
+        fixture_ids.each do |fixture_name, fixtures|
           begin
-            klass = class_names[table_name].constantize
+            klass = class_names[fixture_name].constantize
           rescue NameError
             next
           end
 
-          accessor_name = table_name
-          define_method(accessor_name) do |*fixture_names|
+          define_method(fixture_name) do |*fixture_names|
             force_reload = fixture_names.pop if fixture_names.last == true || fixture_names.last == :reload
 
-            @fixture_cache[table_name] ||= {}
+            @fixture_cache[fixture_name] ||= {}
 
             instances = fixture_names.map do |name|
               id = fixtures[name.to_s]
-              raise StandardError, "No fixture named '#{name}' found for fixture set '#{table_name}'" if id.nil?
+              raise StandardError, "No fixture named '#{name}' found for fixture set '#{fixture_name}'" if id.nil?
 
-              @fixture_cache[table_name].delete(name) if force_reload
-              @fixture_cache[table_name][name] ||= klass.find(id)
+              @fixture_cache[fixture_name].delete(name) if force_reload
+              @fixture_cache[fixture_name][name] ||= klass.find(id)
             end
 
             instances.size == 1 ? instances.first : instances
           end
-          private accessor_name
+          private fixture_name
         end
       end
     end

data/lib/fixation/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fixation
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Will Bryant
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler