frozen_record 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67e64312afdfd4c73a509f158999cda26d2f33ad
-  data.tar.gz: d2dece97641dd7a82863f091d9d157f770cb4135
+  metadata.gz: 933e76edb412172ed157cf1ed9e574707fa7061f
+  data.tar.gz: 8b515acc39df4dd9de0e09d5fb8318fe9003ba1b
 SHA512:
-  metadata.gz: 249a5e72ada5b1bed9ffd20028a3dfc5662b45f0f6501f71eebf314cd18214e3383c035f418a57dcc4e4a891c3b26c94e50628acb8d6cc284d162d154dc9f540
-  data.tar.gz: dfadb3c6375a7a6b6800219542fd49161b5525209336b62d8723b9d5d805193b1fcab3bd4c713c9d2009972c2b85b2d78134bc68606bbdbcf234ec8d2a18c8c2
+  metadata.gz: e91cf29881b8d0f5b972df7e849cf0f3b621ac6f2ce64b6cf6dba771c3cf247add9c91f9d3fe044b9244b1f9009545e117463352559ce96153ea3374636f8087
+  data.tar.gz: 4496c6d25dc7e487df51efeabd808e0df16cde00cd834eee0d46ab11d51e25cf7f5a36fc56e274e8d18086477c123ff819624457e663e450017266db5dd7653e

data/lib/frozen_record/base.rb

@@ -84,8 +84,8 @@ module FrozenRecord
         load_records
       end
 
-      def load_records
-        if auto_reloading && file_changed?
+      def load_records(force: false)
+        if force || (auto_reloading && file_changed?)
           @records = nil
           undefine_attribute_methods
         end

data/lib/frozen_record/test_helper.rb

@@ -6,24 +6,24 @@ module FrozenRecord
       def load_fixture(model_class, alternate_base_path)
         @cache ||= {}
 
-        ensure_model_class_is_frozenrecord(model_class)
+        unless model_class < FrozenRecord::Base
+          raise ArgumentError, "Model class (#{model_class}) does not inherit from #{FrozenRecord::Base}"
+        end
 
         return if @cache.key?(model_class)
 
-        @cache[model_class] = {
-          old_base_path: model_class.base_path,
-          old_auto_reloading: model_class.auto_reloading,
-        }
+        @cache[model_class] ||= model_class.base_path
 
-        model_class.auto_reloading = true
         model_class.base_path = alternate_base_path
+        model_class.load_records(force: true)
       end
 
       def unload_fixtures
-        @cache.each do |model_class, cached_values|
-          model_class.base_path = cached_values[:old_base_path]
-          model_class.load_records
-          model_class.auto_reloading = cached_values[:old_auto_reloading]
+        return unless defined?(@cache) && @cache
+
+        @cache.each do |model_class, old_base_path|
+          model_class.base_path = old_base_path
+          model_class.load_records(force: true)
         end
 
         @cache = nil
@@ -32,8 +32,6 @@ module FrozenRecord
       private
 
       def ensure_model_class_is_frozenrecord(model_class)
-        return if model_class < FrozenRecord::Base
-        raise ArgumentError, "Model class (#{model_class}) does not inherit from #{FrozenRecord::Base}"
       end
     end
   end

data/lib/frozen_record/version.rb

@@ -1,3 +1,3 @@
 module FrozenRecord
-  VERSION = '0.12.0'
+  VERSION = '0.12.1'
 end

data/spec/spec_helper.rb

@@ -24,4 +24,6 @@ RSpec.configure do |config|
   config.filter_run :focus
 
   config.order = 'random'
+
+  config.before { FrozenRecord::TestHelper.unload_fixtures }
 end

data/spec/test_helper_spec.rb

@@ -47,5 +47,11 @@ describe 'test fixture loading' do
 
       expect(Country.count).to be == 3
     end
+
+    it 'does has no effect if no alternate fixtures were loaded' do
+      FrozenRecord::TestHelper.unload_fixtures
+
+      expect(Country.count).to be == 3
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frozen_record
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-06 00:00:00.000000000 Z
+date: 2019-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel