fixture_farm 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 473a2a53021fcb6a622b9585c95769a343c7a5bbeaba96e25a347f96211ae156
-  data.tar.gz: ec5cbfaa5d092b11c1ba9716b47440795866fee6ae377d968ce1a44bf9a2e93c
+  metadata.gz: 3a4711e5c5ca0eaaebf6d44bfa7751f09e4ff1fc6b5969e4ed4af04d43469069
+  data.tar.gz: 6ed3b3e4961f21fb4435d3b571b9ab04e78cf3c7cdfe9cce8dc7c9021e663ae0
 SHA512:
-  metadata.gz: d32f502880c8e88e111c640cbdfa8ebfdf7a1369d06eb4421d55e9bfe3b014a91df399605037e77cdc0cbe8720c6a40808551f40c9d918af991d3dfba2ced2c5
-  data.tar.gz: e39d80ac110da1f67b1f219fe277bd83a85eb6e6e6dbac0cc4657fd6a22f6103ab469082a641c5caff11ed0b6d33f4a01c9fdcb1718c959422ef83819c1d318b
+  metadata.gz: 2ddd75078a5228b34a5d3034d339ddff5fefccc1f003595a96bbae9f97e7ae334c2833d29cb979e9cd890fb77c1b89d95f612fc0a55996bd2f9b22e218d528e8
+  data.tar.gz: 7d53ed3b3617c6456fb515b17f6ce87361349c79ee370ee9cc42f2ae1d9f4a4fd383c45f5f4c6fee3434c485e3122d579a540e4c346ef62c1d2914564ba65093

data/README.md

@@ -7,6 +7,31 @@ This gem lets you do two things:
 
 Generated fixture that `belongs_to` a record from an existing fixture, will reference that fixture by name.
 
+### Limitations
+
+- doesn't update fixtures
+- doesn't delete fixtures
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'fixture_farm', group: %i[development test]
+```
+
+And then execute:
+
+```bash
+bundle install
+```
+
+Or install it yourself as:
+
+```bash
+gem install fixture_farm
+```
+
 ## Usage
 
 ### Record as you browse
@@ -14,7 +39,13 @@ Generated fixture that `belongs_to` a record from an existing fixture, will refe
 To record as you browse in development add this to `ApplicationController`:
 
 ```ruby
-include FixtureFarm::ControllerHook if Rails.env.development?
+include FixtureFarm::ControllerHook if defined?(FixtureFarm)
+```
+
+And in `ApplicationJob` if needed:
+
+```ruby
+include FixtureFarm::ActiveJobHook if defined?(FixtureFarm)
 ```
 
 Then start/stop recording using tasks:
@@ -59,24 +90,5 @@ test 'some stuff does the right thing' do
 end
 ```
 
-## Installation
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'fixture_farm', group: %i[development test]
-```
-
-And then execute:
-
-```bash
-bundle install
-```
-
-Or install it yourself as:
-
-```bash
-gem install fixture_farm
-```
-
 ## License
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/lib/fixture_farm/active_job_hook.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'fixture_farm/hook'
+
+module FixtureFarm
+  module ActiveJobHook
+    extend ActiveSupport::Concern
+    include Hook
+
+    included do
+      around_perform :record_new_fixtures, if: :record_new_fixtures?
+    end
+  end
+end

data/lib/fixture_farm/active_record_extension.rb

@@ -7,7 +7,7 @@ module FixtureFarm
 
       return nil unless File.exist?(fixtures_file_path)
 
-      fixtures = YAML.load_file(fixtures_file_path)
+      fixtures = YAML.load_file(fixtures_file_path, permitted_classes: [ActiveSupport::HashWithIndifferentAccess])
       fixtures.keys.find do |key|
         ActiveRecord::FixtureSet.identify(key) == id
       end

data/lib/fixture_farm/controller_hook.rb

@@ -1,29 +1,14 @@
 # frozen_string_literal: true
 
-require "fixture_farm/fixture_recorder"
+require "fixture_farm/hook"
 
 module FixtureFarm
   module ControllerHook
     extend ActiveSupport::Concern
+    include Hook
 
     included do
       around_action :record_new_fixtures, if: :record_new_fixtures?
     end
-
-    private
-
-    def record_new_fixtures(&block)
-      fixture_recorder = FixtureRecorder.resume_recording_session
-
-      fixture_recorder.record_new_fixtures do
-        block.call
-      end
-    ensure
-      fixture_recorder.update_recording_session
-    end
-
-    def record_new_fixtures?
-      FixtureRecorder.recording_session_in_progress?
-    end
   end
 end

data/lib/fixture_farm/fixture_recorder.rb

@@ -13,7 +13,7 @@ module FixtureFarm
     def self.resume_recording_session
       start_recording_session! unless recording_session_in_progress?
 
-      recording_session = JSON.load_file(STORE_PATH)
+      recording_session = JSON.load_file(STORE_PATH, permitted_classes: [ActiveSupport::HashWithIndifferentAccess])
 
       new_models = recording_session['new_models'].map do |(class_name, id)|
         class_name.constantize.find(id)
@@ -113,7 +113,7 @@ module FixtureFarm
           end
 
           if belongs_to_association
-            associated_model_instance = model_instance.public_send(belongs_to_association.name)
+            associated_model_instance = find_assiciated_model_instance(model_instance, belongs_to_association)
 
             associated_fixture_name = named_new_fixtures.find do |_, fixture_model|
               fixture_model.id == associated_model_instance.id
@@ -125,9 +125,12 @@ module FixtureFarm
           end
         end.to_h
 
+        yaml_attributes.delete('created_at') if yaml_attributes['created_at'] == '<%= Time.zone.now %>'
+        yaml_attributes.delete('updated_at') if yaml_attributes['updated_at'] == '<%= Time.zone.now %>'
+
         fixtures_file_path = model_instance.fixtures_file_path
 
-        fixtures = File.exist?(fixtures_file_path) ? YAML.load_file(fixtures_file_path) : {}
+        fixtures = File.exist?(fixtures_file_path) ? YAML.load_file(fixtures_file_path, permitted_classes: [ActiveSupport::HashWithIndifferentAccess]) : {}
         fixtures[new_fixture_name] = yaml_attributes
 
         FileUtils.mkdir_p(fixtures_file_path.dirname)
@@ -139,6 +142,20 @@ module FixtureFarm
       end
     end
 
+    # Clear default_scope before finding associated model record.
+    # This, in particular, turns off ActsAsTenant, that otherwise
+    # might return no record if the tenant has changed by this point.
+    def find_assiciated_model_instance(model_instance, association)
+      associated_model_class = if association.polymorphic?
+                                 model_instance.public_send(association.foreign_type).safe_constantize
+                               else
+                                 association.klass
+                               end
+
+      id = model_instance.public_send(association.foreign_key)
+      associated_model_class.unscoped.find(id)
+    end
+
     def serialize_attributes(value)
       case value
       when ActiveSupport::TimeWithZone, Date

data/lib/fixture_farm/hook.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require "fixture_farm/fixture_recorder"
+
+module FixtureFarm
+  module Hook
+    def record_new_fixtures(&block)
+      fixture_recorder = FixtureRecorder.resume_recording_session
+      fixture_recorder.record_new_fixtures { block.call }
+    ensure
+      fixture_recorder.update_recording_session
+    end
+
+    private
+
+    def record_new_fixtures?
+      FixtureRecorder.recording_session_in_progress?
+    end
+  end
+end

data/lib/fixture_farm/version.rb

@@ -1,3 +1,3 @@
 module FixtureFarm
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/lib/fixture_farm.rb

@@ -5,10 +5,11 @@ require 'fixture_farm/version'
 module FixtureFarm
   autoload :ActiveRecordExtension, 'fixture_farm/active_record_extension'
   autoload :ControllerHook, 'fixture_farm/controller_hook'
+  autoload :ActiveJobHook, 'fixture_farm/active_job_hook'
   autoload :TestHelper, 'fixture_farm/test_helper'
   autoload :FixtureRecorder, 'fixture_farm/fixture_recorder'
 end
 
-ActiveSupport.on_load(:active_record) do |base|
-  base.include FixtureFarm::ActiveRecordExtension
+ActiveSupport.on_load(:active_record) do
+  include FixtureFarm::ActiveRecordExtension
 end

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fixture_farm
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - artemave
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-01 00:00:00.000000000 Z
+date: 2022-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.1.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.4.1
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.1.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.4.1
+        version: '6.2'
 description: 
 email:
 - mr@artem.rocks
@@ -45,9 +39,11 @@ files:
 - bin/fixture_farm
 - bin/fixture_farm.rb
 - lib/fixture_farm.rb
+- lib/fixture_farm/active_job_hook.rb
 - lib/fixture_farm/active_record_extension.rb
 - lib/fixture_farm/controller_hook.rb
 - lib/fixture_farm/fixture_recorder.rb
+- lib/fixture_farm/hook.rb
 - lib/fixture_farm/test_helper.rb
 - lib/fixture_farm/version.rb
 homepage: https://github.com/featurist/fixture_farm