eac_rails_gem_support 0.4.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2d27c9e93e9f57c4fbbda5273500380a91a06a3023131841d081faebd62f51c
-  data.tar.gz: 62e24d1ea6d28f56920adcd043c3ec21ed0598389e3301f9be6b981a00c3a813
+  metadata.gz: 2d285679a888e05aa97fb48708eb226ea50c113a99ad4e18b394be4f1c28bc41
+  data.tar.gz: 7a58f04b0049e2ce31abb0a9bd4d3cfb12ea9416197aae33cc9881a454eeb06e
 SHA512:
-  metadata.gz: e1e0d339d245a463eaa995179b230333e4c5097abbe1f9e50764649155c45f9e744ee4edfda1ff1d3a5d07c0b74c21dbed6f786f821a7ca6d68904548b35af16
-  data.tar.gz: 6a7c4fcd80333110416a5e1767aac16fc9b037ca2270d6f8d7f49be94d8890927cf1239ccf5c31cafc84d1a74b2f290e8d4d69f9937f5731c203e2863f1721bd
+  metadata.gz: 8800c2b55b5310b90116679ef19525309dbb7eeee653c647260d2ee921f99022d7c412d76f25fa7135951f981017b432ea8531608a7f00c12baedca69cbc5874
+  data.tar.gz: b4d526791901f0d834749aac2db43f391ffd6404a3ef72b37adebfae7d7e9a59a88274db6bb4ee6e82d5344c4058adca076f29ac5a43187a1ab39e7359e70744

data/lib/eac_rails_gem_support/factory_bot/instance_registry.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacRailsGemSupport
+  module FactoryBot
+    class InstanceRegistry
+      class << self
+        def default
+          @default ||= ::EacRailsGemSupport::FactoryBot::InstanceRegistry.new
+        end
+
+        delegate :fetch, :reset, to: :default
+
+        def sanitize_key(key)
+          key.to_sym
+        end
+      end
+
+      def fetch(key)
+        key = self.class.sanitize_key(key)
+        if fetched.key?(key)
+          fetched.fetch(key)
+        else
+          fetched[key] = ::FactoryBot.create(key)
+        end
+      end
+
+      def reset
+        @fetched = nil
+      end
+
+      private
+
+      def fetched
+        @fetched ||= {}
+      end
+    end
+  end
+end

data/lib/eac_rails_gem_support/rspec/appendable_rails_app.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'eac_rails_gem_support/patches/object/template'
 require 'avm/eac_ruby_base1/sources/base'
 require 'eac_ruby_utils/core_ext'
+require 'eac_templates/core_ext'
 require 'fileutils'
 
 module EacRailsGemSupport

data/lib/eac_rails_gem_support/rspec/minitest_support.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module EacRailsGemSupport
+  module Rspec
+    module MinitestSupport
+      def assert_difference(code, message = nil, compare_method = :not_to, &block)
+        before_value = assert_difference_call(code)
+        block.call
+        after_value = assert_difference_call(code)
+        expect(after_value).send(compare_method, eq(before_value), message)
+      end
+
+      def assert_no_difference(code, message = nil, &block)
+        assert_difference(code, message, :to, &block)
+      end
+
+      def assert_equal(expected_value, actual_value, message = nil)
+        expect(actual_value).to eq(expected_value), message
+      end
+
+      def assert_not(expected_value, message = nil)
+        expect(expected_value).to be_falsy, message
+      end
+
+      def assert_not_equal(expected_value, actual_value, message = nil)
+        expect(actual_value).not_to eq(expected_value), message
+      end
+
+      private
+
+      def assert_difference_call(code)
+        if code.is_a?(::Proc)
+          code.call
+        elsif code.is_a?(::String)
+          eval(code) # rubocop:disable Security/Eval
+        else
+          raise "Unmapped type for \"#{code}\""
+        end
+      end
+    end
+  end
+end

data/lib/eac_rails_gem_support/rspec/setup/factory_bot.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
+require 'eac_rails_gem_support/factory_bot/instance_registry'
 
 module EacRailsGemSupport
   module Rspec
@@ -10,6 +11,14 @@ module EacRailsGemSupport
           require 'factory_bot_rails'
           rspec_config.include ::FactoryBot::Syntax::Methods
           Spring.after_fork { ::FactoryBot.reload } if defined?(Spring)
+          rspec_config.include HelpMethods
+          rspec_config.after { ::EacRailsGemSupport::FactoryBot::InstanceRegistry.reset }
+        end
+
+        module HelpMethods
+          def factory_bot_fetch(key)
+            ::EacRailsGemSupport::FactoryBot::InstanceRegistry.fetch(key)
+          end
         end
       end
     end

data/lib/eac_rails_gem_support/rspec/setup.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'eac_rails_gem_support/rspec/minitest_support'
 require 'eac_ruby_utils/core_ext'
 
 module EacRailsGemSupport
@@ -9,13 +10,18 @@ module EacRailsGemSupport
       require_sub __FILE__, include_modules: true
 
       def self.extended(obj)
+        obj.setup_minitest_support
         obj.singleton_class.include(::EacRubyUtils::SimpleCache)
         obj.setup_rails_env
         return unless obj.setup_rails_app
 
-        obj.setup_fixtures
-        obj.setup_capybara
-        obj.setup_factory_bot
+        %w[fixtures capybara factory_bot].each do |item|
+          obj.send("setup_#{item}")
+        end
+      end
+
+      def setup_minitest_support
+        rspec_config.include ::EacRailsGemSupport::Rspec::MinitestSupport
       end
     end
   end

data/lib/eac_rails_gem_support/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRailsGemSupport
-  VERSION = '0.4.1'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_rails_gem_support
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-05 00:00:00.000000000 Z
+date: 2022-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm-eac_ruby_base1
@@ -16,33 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.21'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.37'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.37.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.37'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.37.1
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.1
   type: :runtime
@@ -50,6 +59,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.1
 - !ruby/object:Gem::Dependency
@@ -58,20 +70,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.95'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.95.1
+        version: '0.104'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.95'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.95.1
+        version: '0.104'
 - !ruby/object:Gem::Dependency
   name: eac_templates
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +87,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -91,21 +97,21 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -113,6 +119,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.2.8
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.2.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -120,34 +129,43 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.2.8
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.2.8.1
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.1.2
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
 description: 
 email: 
 executables: []
@@ -155,10 +173,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/eac_rails_gem_support.rb
-- lib/eac_rails_gem_support/patches/object.rb
-- lib/eac_rails_gem_support/patches/object/template.rb
+- lib/eac_rails_gem_support/factory_bot/instance_registry.rb
 - lib/eac_rails_gem_support/rspec.rb
 - lib/eac_rails_gem_support/rspec/appendable_rails_app.rb
+- lib/eac_rails_gem_support/rspec/minitest_support.rb
 - lib/eac_rails_gem_support/rspec/setup.rb
 - lib/eac_rails_gem_support/rspec/setup/capybara.rb
 - lib/eac_rails_gem_support/rspec/setup/factory_bot.rb

data/lib/eac_rails_gem_support/patches/object/template.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_templates/patches/object/template'
-
-::EacTemplates::Searcher.default.included_paths <<
-  ::File.expand_path('../../../../template', __dir__)

data/lib/eac_rails_gem_support/patches/object.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-require_sub __FILE__