solidus_support 0.5.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e720d17f4c4d0b8dfb852da8ea260bbaa7c069b83b07e102b96633bb65ed9e18
-  data.tar.gz: 66726d7f7d4ef6acecb63024eb7ac54888efaddb597f997c9cbda545642a4101
+  metadata.gz: 290b6b3d8d102c5a9346057f08c18b039395082f0d4a8ee7b59cff3f110d57a1
+  data.tar.gz: f6354f111b2875c3baac252f4046498f7f0e69cb7189f9d86a8c050a389c1c39
 SHA512:
-  metadata.gz: 1b3061f16c942f99c9f6689f03e89875a1e88ff2c0761a5ad10020b7f9c80c2971a70590eeb0eca458929e86c3617ef56e2ade8a0f5f8a01e60e8c285704faa6
-  data.tar.gz: f22c1b1daa5f11853f1d2625750927349d3e8a2b36ed4eba3a4aea62276be3e9375b4ab19d1b8132644893038a2dc04ac065342dbb28e1146b974870c3ffeb1c
+  metadata.gz: 193f63e10976f25a5b167603d53c0b9187e6edd2928dc2a5a56fb32b1599d58eec9afff4335a2dca4de6bd322e6b484a7866f8a19e3c5aebe6b69d6d2d426dd3
+  data.tar.gz: 602577640b806f17fd30d5bd90bda6b21bfd6fdf73b74674b88ae288365f1a5bb3eced6897e239fb3b2a415c396c2ed2612fdcc9ca87712c427b461194ac73d8

data/CHANGELOG.md

@@ -1,5 +1,57 @@
 # Changelog
 
+## [v0.7.0](https://github.com/solidusio/solidus_support/tree/v0.7.0) (2020-10-28)
+
+[Full Changelog](https://github.com/solidusio/solidus_support/compare/v0.6.0...v0.7.0)
+
+**Closed issues:**
+
+- Could we get a new release? [\#49](https://github.com/solidusio/solidus_support/issues/49)
+
+**Merged pull requests:**
+
+- Use `Spree::Event. activate\_all\_subscribers` when available [\#53](https://github.com/solidusio/solidus_support/pull/53) ([spaghetticode](https://github.com/spaghetticode))
+- Support Rails 5.1.x [\#51](https://github.com/solidusio/solidus_support/pull/51) ([brchristian](https://github.com/brchristian))
+- Remove redundant `solidus\_core` dev dependency [\#50](https://github.com/solidusio/solidus_support/pull/50) ([brchristian](https://github.com/brchristian))
+
+## [v0.6.0](https://github.com/solidusio/solidus_support/tree/v0.6.0) (2020-07-24)
+
+[Full Changelog](https://github.com/solidusio/solidus_support/compare/v0.5.1...v0.6.0)
+
+**Implemented enhancements:**
+
+- Autoload Solidus Event subscribers from extensions [\#45](https://github.com/solidusio/solidus_support/pull/45) ([spaghetticode](https://github.com/spaghetticode))
+
+**Fixed bugs:**
+
+- Load event subscribers only when Spree::Event is available [\#47](https://github.com/solidusio/solidus_support/pull/47) ([spaghetticode](https://github.com/spaghetticode))
+
+**Closed issues:**
+
+- Namespace Conflicts [\#48](https://github.com/solidusio/solidus_support/issues/48)
+
+**Merged pull requests:**
+
+- Stop using SolidusSupport.solidus\_gem\_version [\#46](https://github.com/solidusio/solidus_support/pull/46) ([elia](https://github.com/elia))
+- Add frontend/backend/api decorators to autoload path [\#44](https://github.com/solidusio/solidus_support/pull/44) ([kennyadsl](https://github.com/kennyadsl))
+
+## [v0.5.1](https://github.com/solidusio/solidus_support/tree/v0.5.1) (2020-04-15)
+
+[Full Changelog](https://github.com/solidusio/solidus_support/compare/v0.5.0...v0.5.1)
+
+**Merged pull requests:**
+
+- Push decorators to autoload path using config.autoload\_paths [\#43](https://github.com/solidusio/solidus_support/pull/43) ([kennyadsl](https://github.com/kennyadsl))
+
+## [v0.5.0](https://github.com/solidusio/solidus_support/tree/v0.5.0) (2020-02-18)
+
+[Full Changelog](https://github.com/solidusio/solidus_support/compare/v0.4.1...v0.5.0)
+
+**Merged pull requests:**
+
+- Load Solidus engine extension files automatically [\#42](https://github.com/solidusio/solidus_support/pull/42) ([aldesantis](https://github.com/aldesantis))
+- Deprecate SolidusSupport.solidus\_gem\_version [\#37](https://github.com/solidusio/solidus_support/pull/37) ([kennyadsl](https://github.com/kennyadsl))
+
 ## [v0.4.1](https://github.com/solidusio/solidus_support/tree/v0.4.1) (2020-01-16)
 
 [Full Changelog](https://github.com/solidusio/solidus_support/compare/v0.4.0...v0.4.1)

data/Gemfile

@@ -16,3 +16,15 @@ else
 end
 
 gemspec
+
+# There is an issue with Sprockets 4 not accepting a custom path for
+# the assets manifest, which doesn't play well with in-memory dummy
+# apps such as the one we use in this gem.
+
+# A fix was provided for sprockets-rails[1] but it was not accepted
+# yet.
+
+# [1]: rails/sprockets-rails#446
+#
+# Please do not remove this line until we have a solution.
+gem 'sprockets', '~> 3'

data/bin/console

@@ -3,6 +3,7 @@
 # frozen_string_literal: true
 
 require "bundler/setup"
+require "rails/all"
 require "solidus_support"
 
 # You can add fixtures and/or initialization code here to make experimenting

data/lib/solidus_support.rb

@@ -18,12 +18,22 @@ module SolidusSupport
 
     def reset_spree_preferences_deprecated?
       first_version_without_reset = Gem::Requirement.new('>= 2.9')
-      first_version_without_reset.satisfied_by?(solidus_gem_version)
+      first_version_without_reset.satisfied_by?(Spree.solidus_gem_version)
+    end
+
+    def combined_first_and_last_name_in_address?
+      versions_before_preference = Gem::Requirement.new('< 2.11.0')
+      versions_after_preference = Gem::Requirement.new('>= 3.0.0.alpha')
+
+      return false if versions_before_preference.satisfied_by?(Spree.solidus_gem_version)
+      return true if versions_after_preference.satisfied_by?(Spree.solidus_gem_version)
+
+      Spree::Config.use_combined_first_and_last_name_in_address
     end
 
     def new_gateway_code?
       first_version_with_new_gateway_code = Gem::Requirement.new('>= 2.3')
-      first_version_with_new_gateway_code.satisfied_by?(solidus_gem_version)
+      first_version_with_new_gateway_code.satisfied_by?(Spree.solidus_gem_version)
     end
 
     def payment_source_parent_class

data/lib/solidus_support/engine_extensions.rb

@@ -9,6 +9,10 @@ module SolidusSupport
       engine.extend ClassMethods
 
       engine.class_eval do
+        solidus_decorators_root.glob('*') do |decorators_folder|
+          config.autoload_paths += [decorators_folder]
+        end
+
         config.to_prepare(&method(:activate))
 
         enable_solidus_engine_support('backend') if SolidusSupport.backend_available?
@@ -19,15 +23,26 @@ module SolidusSupport
 
     module ClassMethods
       def activate
-        if Rails.respond_to?(:autoloaders) && Rails.autoloaders.main
-          # Add decorators folder to the Rails autoloader. This tells Zeitwerk to treat paths
-          # such as app/decorators/controllers as roots.
-          solidus_decorators_root.glob('*') do |decorators_folder|
-            Rails.autoloaders.main.push_dir(decorators_folder)
+        load_solidus_decorators_from(solidus_decorators_root)
+        load_solidus_subscribers_from(solidus_subscribers_root)
+      end
+
+      # Loads Solidus event subscriber files.
+      #
+      # This allows to add event subscribers to extensions without explicitly subscribing them,
+      # similarly to what happens in Solidus core.
+      def load_solidus_subscribers_from(path)
+        if defined? Spree::Event
+          path.glob("**/*_subscriber.rb") do |subscriber_path|
+            require_dependency(subscriber_path)
           end
-        end
 
-        load_solidus_decorators_from(solidus_decorators_root)
+          if Spree::Event.respond_to?(:activate_all_subscribers)
+            Spree::Event.activate_all_subscribers
+          else
+            Spree::Event.subscribers.each(&:subscribe!)
+          end
+        end
       end
 
       # Loads decorator files.
@@ -50,6 +65,13 @@ module SolidusSupport
         root.join('app/decorators')
       end
 
+      # Returns the root for this engine's Solidus event subscribers.
+      #
+      # @return [Path]
+      def solidus_subscribers_root
+        root.join("app/subscribers")
+      end
+
       # Enables support for a Solidus engine.
       #
       # This will tell Rails to:
@@ -63,10 +85,13 @@ module SolidusSupport
         paths['app/controllers'] << "lib/controllers/#{engine}"
         paths['app/views'] << "lib/views/#{engine}"
 
+        path = root.join("lib/decorators/#{engine}")
+
+        config.autoload_paths += path.glob('*')
+
         engine_context = self
         config.to_prepare do
           engine_context.instance_eval do
-            path = root.join("lib/decorators/#{engine}")
             load_solidus_decorators_from(path)
           end
         end

data/lib/solidus_support/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusSupport
-  VERSION = '0.5.0'
+  VERSION = '0.8.1'
 end

data/solidus_support.gemspec

@@ -21,13 +21,11 @@ Gem::Specification.new do |s|
   s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'activesupport', ['>= 5.2', '< 7.0.x']
-
+  s.add_development_dependency 'rails'
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec-rails'
   s.add_development_dependency 'rubocop'
   s.add_development_dependency 'rubocop-rspec'
-  s.add_development_dependency 'solidus_core'
   s.add_development_dependency 'solidus_dev_support'
 end

data/spec/solidus_support_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe SolidusSupport do
     let(:credit_card) { nil }
 
     before do
-      allow(described_class).to receive(:solidus_gem_version) do
+      allow(Spree).to receive(:solidus_gem_version) do
         Gem::Version.new(solidus_version)
       end
     end
@@ -42,4 +42,37 @@ RSpec.describe SolidusSupport do
     end
     # rubocop:enable RSpec/NestedGroups
   end
+
+  describe '.combined_first_and_last_name_in_address?' do
+    subject { described_class.combined_first_and_last_name_in_address? }
+
+    before do
+      allow(Spree).to receive(:solidus_gem_version) do
+        Gem::Version.new(solidus_version)
+      end
+    end
+
+    context 'when Solidus did not have the code to combine addresses fields' do
+      let(:solidus_version) { '2.9.3' }
+
+      it { is_expected.to be_falsey }
+    end
+
+    context 'when Solidus has preference to choose if combine addresses fields' do
+      let(:solidus_version) { '2.11.3' }
+      before do
+        allow(Spree::Config)
+          .to receive(:use_combined_first_and_last_name_in_address)
+          .and_return(true)
+      end
+
+      it { is_expected.to be_truthy }
+    end
+
+    context 'when Solidus only has code to combine addresses fields' do
+      let(:solidus_version) { '3.0.0' }
+
+      it { is_expected.to be_truthy }
+    end
+  end
 end

data/spec/support/dummy_app.rb

@@ -14,7 +14,6 @@ module DummyApp
   class Application < ::Rails::Application
     config.eager_load               = false
     config.paths['config/database'] = File.expand_path('dummy_app/database.yml', __dir__)
-    config.active_record.sqlite3.represent_boolean_as_integer = true
   end
 end
 

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: solidus_support
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.8.1
 platform: ruby
 authors:
 - John Hawthorn
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-02-18 00:00:00.000000000 Z
+date: 2021-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 7.0.x
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 7.0.x
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -100,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: solidus_core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: solidus_dev_support
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +108,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email: john@stembolt.com
 executables: []
 extensions: []
@@ -161,7 +141,7 @@ homepage: https://github.com/solidusio/solidus_support
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -176,8 +156,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Common runtime helpers for Solidus extensions.
 test_files: