solidus_support 0.8.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d0b61a92f9ea8174330391a7bad3543dc0725f68e9fd380011391e580abab75
-  data.tar.gz: 269a38d161f392811ed2ec1c2a523b67a92557b7a9828c2c2639a2d504df06a6
+  metadata.gz: 8c47f29279cf2922b38a65fd166de8cbc1e2c220166f8c9f6a29a678591bcc7f
+  data.tar.gz: 597472813f4a5afa136d10c1be1f106bf66c277616a3d083d03fa5a9d33a467f
 SHA512:
-  metadata.gz: 34ab8b557078b085cd966e3e45652ba7f20e4b26588f74a66f94da5f0dc7cd1824f68672d354656d346baa97bc1f8d3e37b469ab0871d5a247af1a7368b23bb2
-  data.tar.gz: 4401a91bdecea435d21f175ea4c1dd77b3f68006ed6221338435e6e1f8a27de6b0533dfdb88ec3ab6401554125d0de187fd38ff7a77a99fc59350292734eab4f
+  metadata.gz: ba3d4fb41d2268a51f448da89adac7ffeb7f2b543c60db3f734f54e42a14b60dcf0332f2478ccf94cf9f64c053c98f7a71a631f86b4ac05362a0330b257a8569
+  data.tar.gz: 0c3f781f43b12300e52903e3b94d2f0b38d2da83b79b3719e21a6b2031ee45e6af9e8195df1d880888f4849d4e7071dc1671cf3448e5682aeeb39bc43107718d

data/CHANGELOG.md

@@ -1,5 +1,48 @@
 # Changelog
 
+## [v0.9.1](https://github.com/solidusio/solidus_support/tree/v0.9.1) (2022-06-01)
+
+[Full Changelog](https://github.com/solidusio/solidus_support/compare/v0.9.0...v0.9.1)
+
+**Merged pull requests:**
+
+- Add extension paths before `initialize_cache` [\#71](https://github.com/solidusio/solidus_support/pull/71) ([gsmendoza](https://github.com/gsmendoza))
+
+## [v0.9.0](https://github.com/solidusio/solidus_support/tree/v0.9.0) (2022-05-25)
+
+[Full Changelog](https://github.com/solidusio/solidus_support/compare/v0.8.1...v0.9.0)
+
+**Closed issues:**
+
+- Release 0.5.2  version [\#64](https://github.com/solidusio/solidus_support/issues/64)
+
+**Merged pull requests:**
+
+- Compatibility layer for the legacy/new event system [\#70](https://github.com/solidusio/solidus_support/pull/70) ([waiting-for-dev](https://github.com/waiting-for-dev))
+- Fix dependency on the engines load order when adding paths [\#65](https://github.com/solidusio/solidus_support/pull/65) ([waiting-for-dev](https://github.com/waiting-for-dev))
+- Remove support for Solidus \<= 2.3 [\#62](https://github.com/solidusio/solidus_support/pull/62) ([elia](https://github.com/elia))
+- Update the changelog with the latest releases [\#61](https://github.com/solidusio/solidus_support/pull/61) ([elia](https://github.com/elia))
+
+## [v0.8.1](https://github.com/solidusio/solidus_support/tree/v0.8.1) (2021-01-27)
+
+[Full Changelog](https://github.com/solidusio/solidus_support/compare/v0.8.0...v0.8.1)
+
+**Merged pull requests:**
+
+- Fix combined\_first\_and\_last\_name\_in\_address version [\#59](https://github.com/solidusio/solidus_support/pull/59) ([kennyadsl](https://github.com/kennyadsl))
+
+## [v0.8.0](https://github.com/solidusio/solidus_support/tree/v0.8.0) (2021-01-19)
+
+[Full Changelog](https://github.com/solidusio/solidus_support/compare/v0.7.0...v0.8.0)
+
+**Implemented enhancements:**
+
+- Add a method to check if combined address name is being used  [\#58](https://github.com/solidusio/solidus_support/pull/58) ([kennyadsl](https://github.com/kennyadsl))
+
+**Fixed bugs:**
+
+- Fix project' specs [\#57](https://github.com/solidusio/solidus_support/pull/57) ([kennyadsl](https://github.com/kennyadsl))
+
 ## [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)
@@ -10,9 +53,9 @@
 
 **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))
+- 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))
+- 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)
 
@@ -50,7 +93,11 @@
 **Merged pull requests:**
 
 - Load Solidus engine extension files automatically [\#42](https://github.com/solidusio/solidus_support/pull/42) ([aldesantis](https://github.com/aldesantis))
+- Update solidus\_dev\_support [\#41](https://github.com/solidusio/solidus_support/pull/41) ([aldesantis](https://github.com/aldesantis))
+- Replace manual cache checks w/ require\_dependency [\#39](https://github.com/solidusio/solidus_support/pull/39) ([elia](https://github.com/elia))
+- Fixes isse when zeitwerk is not enabled [\#38](https://github.com/solidusio/solidus_support/pull/38) ([softr8](https://github.com/softr8))
 - Deprecate SolidusSupport.solidus\_gem\_version [\#37](https://github.com/solidusio/solidus_support/pull/37) ([kennyadsl](https://github.com/kennyadsl))
+- Spring cleaning [\#33](https://github.com/solidusio/solidus_support/pull/33) ([aldesantis](https://github.com/aldesantis))
 
 ## [v0.4.1](https://github.com/solidusio/solidus_support/tree/v0.4.1) (2020-01-16)
 
@@ -61,13 +108,6 @@
 - Should use require\_dependency instead of require/load [\#34](https://github.com/solidusio/solidus_support/issues/34)
 - Add a LICENSE [\#20](https://github.com/solidusio/solidus_support/issues/20)
 
-**Merged pull requests:**
-
-- Update solidus\_dev\_support [\#41](https://github.com/solidusio/solidus_support/pull/41) ([aldesantis](https://github.com/aldesantis))
-- Replace manual cache checks w/ require\_dependency [\#39](https://github.com/solidusio/solidus_support/pull/39) ([elia](https://github.com/elia))
-- Fixes isse when zeitwerk is not enabled [\#38](https://github.com/solidusio/solidus_support/pull/38) ([softr8](https://github.com/softr8))
-- Spring cleaning [\#33](https://github.com/solidusio/solidus_support/pull/33) ([aldesantis](https://github.com/aldesantis))
-
 ## [v0.4.0](https://github.com/solidusio/solidus_support/tree/v0.4.0) (2019-12-16)
 
 [Full Changelog](https://github.com/solidusio/solidus_support/compare/v0.3.2...v0.4.0)
@@ -95,7 +135,7 @@
 - Add `capybara-screenshot` dependency [\#23](https://github.com/solidusio/solidus_support/pull/23) ([spaghetticode](https://github.com/spaghetticode))
 - Do not reset spree preferences starting from v2.9 [\#22](https://github.com/solidusio/solidus_support/pull/22) ([kennyadsl](https://github.com/kennyadsl))
 - Update Travis config [\#19](https://github.com/solidusio/solidus_support/pull/19) ([aitbw](https://github.com/aitbw))
-- Override Capybara JS driver via `CAPYBARA\_DRIVER` ENV variable [\#18](https://github.com/solidusio/solidus_support/pull/18) ([spaghetticode](https://github.com/spaghetticode))
+- Override Capybara JS driver via `CAPYBARA_DRIVER` ENV variable [\#18](https://github.com/solidusio/solidus_support/pull/18) ([spaghetticode](https://github.com/spaghetticode))
 - Migrate from Poltergeist to Headless Chrome [\#16](https://github.com/solidusio/solidus_support/pull/16) ([aitbw](https://github.com/aitbw))
 - Remove running rubocop on rake task [\#14](https://github.com/solidusio/solidus_support/pull/14) ([kennyadsl](https://github.com/kennyadsl))
 - Cleanup extension [\#13](https://github.com/solidusio/solidus_support/pull/13) ([kennyadsl](https://github.com/kennyadsl))

data/lib/solidus_support/engine_extensions.rb

@@ -15,9 +15,9 @@ module SolidusSupport
 
         config.to_prepare(&method(:activate))
 
-        enable_solidus_engine_support('backend') if SolidusSupport.backend_available?
-        enable_solidus_engine_support('frontend') if SolidusSupport.frontend_available?
-        enable_solidus_engine_support('api') if SolidusSupport.api_available?
+        enable_solidus_engine_support('backend')
+        enable_solidus_engine_support('frontend')
+        enable_solidus_engine_support('api')
       end
     end
 
@@ -32,7 +32,7 @@ module SolidusSupport
       # 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
+        if SolidusSupport::LegacyEventCompat.using_legacy?
           path.glob("**/*_subscriber.rb") do |subscriber_path|
             require_dependency(subscriber_path)
           end
@@ -82,17 +82,40 @@ module SolidusSupport
       #
       # @see #load_solidus_decorators_from
       def enable_solidus_engine_support(engine)
-        paths['app/controllers'] << "lib/controllers/#{engine}"
-        paths['app/views'] << "lib/views/#{engine}"
+        # In the past, view and controller paths of Solidus extensions were
+        # added at extension loading time. As a result, if an extension
+        # customizing a Solidus engine is loaded before that engine
+        # (for example, the extension is declared before the `solidus_frontend`
+        # engine in the `Gemfile`), then the extension's paths for that Solidus
+        # engine wouldn't be loaded.
+
+        # The initializer below runs before `initialize_cache` because
+        # `initialize_cache` runs 1) after the Solidus engines have already
+        # loaded BUT 2) before Rails has added the paths to `$LOAD_PATH`.
+        # Normally, it would be sufficient to run the initializer below before
+        # the `set_load_path` initializer. However, external gems such as
+        # Deface may also change the load paths immediately before
+        # `set_load_path`. To ensure that our extension paths are not affected
+        # by those gems, we work around those gems by adding our paths before
+        # `initialize_cache`, which is the Rails initializer called before
+        # `set_load_path`.
+        initializer "#{name}_#{engine}_paths", before: :initialize_cache do
+          if SolidusSupport.send(:"#{engine}_available?")
+            paths['app/controllers'] << "lib/controllers/#{engine}"
+            paths['app/views'] << "lib/views/#{engine}"
+          end
+        end
 
-        path = root.join("lib/decorators/#{engine}")
+        if SolidusSupport.send(:"#{engine}_available?")
+          path = root.join("lib/decorators/#{engine}")
 
-        config.autoload_paths += path.glob('*')
+          config.autoload_paths += path.glob('*')
 
-        engine_context = self
-        config.to_prepare do
-          engine_context.instance_eval do
-            load_solidus_decorators_from(path)
+          engine_context = self
+          config.to_prepare do
+            engine_context.instance_eval do
+              load_solidus_decorators_from(path)
+            end
           end
         end
       end

data/lib/solidus_support/legacy_event_compat/bus.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module SolidusSupport
+  module LegacyEventCompat
+    # Compatibility for some event-driven operations
+    module Bus
+      # Publication of an event
+      #
+      # If extensions want to support the legacy sytem, they need to use a
+      # compatible API. That means it's not possible to publish an instance as
+      # event, which is something supported by Omnes but not the legacy adapter.
+      # Instead, a payload can be given. E.g.:
+      #
+      # ```
+      # SolidusSupport::LegacyEventCompat::Bus.publish(:foo, bar: :baz)
+      # ```
+      #
+      # Legacy subscribers will receive an
+      # `ActiveSupport::Notifications::Fanout`, while omnes subscribers will get
+      # an `Omnes::UnstructuredEvent`. Both instances are compatible as they
+      # implement a `#payload` method.
+      #
+      # @param event_name [Symbol]
+      # @param payload [Hash<Symbol, Any>]
+      def self.publish(event_name, **payload)
+        if SolidusSupport::LegacyEventCompat.using_legacy?
+          Spree::Event.fire(event_name, payload)
+        else
+          Spree::Bus.publish(event_name, **payload, caller_location: caller_locations(1)[0])
+        end
+      end
+    end
+  end
+end

data/lib/solidus_support/legacy_event_compat/subscriber.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+begin
+  require "omnes"
+rescue LoadError
+end
+
+module SolidusSupport
+  module LegacyEventCompat
+    # Compatibility for subscriber modules
+    #
+    # Thanks to this module, extensions can create legacy subscriber modules
+    # (see {Spree::Event::Subscriber}) and translate them automatically to an
+    # {Omnes::Subscriber}). E.g.:
+    #
+    # ```
+    # module MyExtension
+    #   module MySubscriber
+    #     include Spree::Event::Subscriber
+    #     include SolidusSupport::LegacyEventCompat::Subscriber
+    #
+    #     event_action :order_finalized
+    #
+    #     def order_finalized(event)
+    #       event.payload[:order].do_something
+    #     end
+    #   end
+    # end
+    #
+    # MyExtension::MySubscriber.omnes_subscriber.subscribe_to(Spree::Bus)
+    # ```
+    #
+    # The generated omnes subscriptions will call the corresponding legacy
+    # subscriber method with the omnes event. It'll compatible as long as the
+    # omnes event responds to the `#payload` method (see
+    # {Omnes::UnstructuredEvent}).
+    module Subscriber
+      # @api private
+      ADAPTER = lambda do |legacy_subscriber, legacy_subscriber_method, _omnes_subscriber, omnes_event|
+        legacy_subscriber.send(legacy_subscriber_method, omnes_event)
+      end
+
+      def self.included(legacy_subscriber)
+        legacy_subscriber.define_singleton_method(:omnes_subscriber) do
+          @omnes_subscriber ||= Class.new.include(::Omnes::Subscriber).tap do |subscriber|
+            legacy_subscriber.event_actions.each do |(legacy_subscriber_method, event_name)|
+              subscriber.handle(event_name.to_sym, with: ADAPTER.curry[legacy_subscriber, legacy_subscriber_method])
+            end
+          end.new
+        end
+      end
+    end
+  end
+end

data/lib/solidus_support/legacy_event_compat.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'solidus_support/legacy_event_compat/bus'
+require 'solidus_support/legacy_event_compat/subscriber'
+
+module SolidusSupport
+  # Compatibility middleman for {Spree::Event} and {Spree::Bus}
+  #
+  # Solidus v3.2 changed to use [Omnes](https://github.com/nebulab/omnes) as the
+  # backbone for event-driven behavior (see {Spree::Bus}) by default. Before
+  # that, a custom adapter based on {ActiveSupport::Notifications} was used (see
+  # {Spree::Event}. Both systems are still supported on v3.2.
+  #
+  # This module provides compatibility support so that extensions can easily
+  # target both systems regardless of the underlying circumstances:
+  #
+  # - Solidus v3.2 with the new system.
+  # - Solidus v3.2 with the legacy system.
+  # - Solidus v2.9 to v3.1, when only {Spree::Event} existed.
+  # - Possible future versions of Solidus, whether the legacy system is
+  # eventually removed or not.
+  module LegacyEventCompat
+    # Returns whether the application is using the legacy event system
+    #
+    # @return [Boolean]
+    def self.using_legacy?
+      legacy_present? &&
+        (legacy_alone? ||
+         legacy_chosen?)
+    end
+
+    def self.legacy_present?
+      defined?(Spree::Event)
+    end
+    private_class_method :legacy_present?
+
+    def self.legacy_alone?
+      !Spree::Config.respond_to?(:use_legacy_events)
+    end
+    private_class_method :legacy_alone?
+
+    def self.legacy_chosen?
+      Spree::Config.use_legacy_events
+    end
+    private_class_method :legacy_chosen?
+  end
+end

data/lib/solidus_support/version.rb

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

data/lib/solidus_support.rb

@@ -2,6 +2,7 @@
 
 require 'solidus_support/version'
 require 'solidus_support/migration'
+require 'solidus_support/legacy_event_compat'
 require 'solidus_support/engine_extensions'
 require 'solidus_core'
 
@@ -22,7 +23,7 @@ module SolidusSupport
     end
 
     def combined_first_and_last_name_in_address?
-      versions_before_preference = Gem::Requirement.new('< 2.10')
+      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)
@@ -32,27 +33,38 @@ module SolidusSupport
     end
 
     def new_gateway_code?
-      first_version_with_new_gateway_code = Gem::Requirement.new('>= 2.3')
-      first_version_with_new_gateway_code.satisfied_by?(Spree.solidus_gem_version)
+      ActiveSupport::Deprecation.warn <<-WARN.squish, caller
+        SolidusSupport.new_gateway_code? is deprecated without replacement and will be removed
+        in solidus_support 1.0.
+      WARN
+
+      true
     end
 
     def payment_source_parent_class
-      if new_gateway_code?
-        Spree::PaymentSource
-      else
-        Spree::Base
-      end
+      ActiveSupport::Deprecation.warn <<-WARN.squish, caller
+        SolidusSupport.payment_source_parent_class is deprecated and will be removed
+        in solidus_support 1.0. Please use Spree::PaymentSource instead.
+      WARN
+
+      Spree::PaymentSource
     end
 
     def payment_method_parent_class(credit_card: false)
-      if new_gateway_code?
-        if credit_card
-          Spree::PaymentMethod::CreditCard
-        else
-          Spree::PaymentMethod
-        end
+      if credit_card
+        ActiveSupport::Deprecation.warn <<-WARN.squish, caller
+          SolidusSupport.payment_method_parent_class(credit_card: true) is deprecated and will be removed
+          in solidus_support 1.0. Please use Spree::PaymentMethod::CreditCard instead.
+        WARN
+
+        Spree::PaymentMethod::CreditCard
       else
-        Spree::Gateway
+        ActiveSupport::Deprecation.warn <<-WARN.squish, caller
+          SolidusSupport.payment_method_parent_class(credit_card: false) is deprecated and will be removed
+          in solidus_support 1.0. Please use Spree::PaymentMethod instead.
+        WARN
+
+        Spree::PaymentMethod
       end
     end
 

data/solidus_support.gemspec

@@ -28,4 +28,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rubocop'
   s.add_development_dependency 'rubocop-rspec'
   s.add_development_dependency 'solidus_dev_support'
+  s.add_development_dependency 'omnes', '~> 0.2.2'
 end

data/spec/examples.txt

@@ -1,9 +1,15 @@
-example_id                                | status | run_time        |
------------------------------------------ | ------ | --------------- |
-./spec/solidus_support_spec.rb[1:1:1:1]   | passed | 0.00024 seconds |
-./spec/solidus_support_spec.rb[1:1:2:1]   | passed | 0.00028 seconds |
-./spec/solidus_support_spec.rb[1:1:3:1:1] | passed | 0.00094 seconds |
-./spec/solidus_support_spec.rb[1:1:3:2:1] | passed | 0.25256 seconds |
-./spec/solidus_support_spec.rb[1:2:1:1]   | passed | 0.00599 seconds |
-./spec/solidus_support_spec.rb[1:2:2:1]   | passed | 0.00026 seconds |
-./spec/solidus_support_spec.rb[1:2:3:1]   | passed | 0.0002 seconds  |
+example_id                                                                    | status | run_time        |
+----------------------------------------------------------------------------- | ------ | --------------- |
+./spec/solidus_support/legacy_event_compat/bus_spec.rb[1:1:1]                 | passed | 0.00015 seconds |
+./spec/solidus_support/legacy_event_compat/legacy_event_compat_spec.rb[1:1:1] | passed | 0.00016 seconds |
+./spec/solidus_support/legacy_event_compat/legacy_event_compat_spec.rb[1:1:2] | passed | 0.00021 seconds |
+./spec/solidus_support/legacy_event_compat/legacy_event_compat_spec.rb[1:1:3] | passed | 0.00019 seconds |
+./spec/solidus_support/legacy_event_compat/legacy_event_compat_spec.rb[1:1:4] | passed | 0.00025 seconds |
+./spec/solidus_support/legacy_event_compat/legacy_event_compat_spec.rb[1:1:5] | passed | 0.00033 seconds |
+./spec/solidus_support/legacy_event_compat/legacy_event_compat_spec.rb[1:1:6] | passed | 0.0006 seconds  |
+./spec/solidus_support/legacy_event_compat/legacy_event_compat_spec.rb[1:1:7] | passed | 0.00102 seconds |
+./spec/solidus_support_spec.rb[1:1:1:1]                                       | passed | 0.00042 seconds |
+./spec/solidus_support_spec.rb[1:1:2:1]                                       | passed | 0.21514 seconds |
+./spec/solidus_support_spec.rb[1:2:1:1]                                       | passed | 0.00021 seconds |
+./spec/solidus_support_spec.rb[1:2:2:1]                                       | passed | 0.00042 seconds |
+./spec/solidus_support_spec.rb[1:2:3:1]                                       | passed | 0.00104 seconds |

data/spec/solidus_support/legacy_event_compat/bus_spec.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+RSpec.describe SolidusSupport::LegacyEventCompat::Bus do
+  describe '#publish' do
+    if SolidusSupport::LegacyEventCompat.using_legacy?
+      it 'forwards to Spree::Event' do
+        box = nil
+        subscription = Spree::Event.subscribe(:foo) { |event| box = event.payload[:bar] }
+
+        described_class.publish(:foo, bar: :baz)
+
+        expect(box).to be(:baz)
+      ensure
+        Spree::Event.unsubscribe(subscription)
+      end
+    else
+      it 'forwards to Spree::Bus' do
+        box = nil
+        Spree::Bus.register(:foo)
+        subscription = Spree::Bus.subscribe(:foo) { |event| box = event.payload[:bar] }
+
+        described_class.publish(:foo, bar: :baz)
+
+        expect(box).to be(:baz)
+      ensure
+        Spree::Bus.unsubscribe(subscription)
+        Spree::Bus.registry.unregister(:foo)
+      end
+    end
+  end
+end

data/spec/solidus_support/legacy_event_compat/legacy_event_compat_spec.rb

@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+require 'omnes'
+
+RSpec.describe SolidusSupport::LegacyEventCompat::Subscriber do
+  subject { Module.new.include(Spree::Event::Subscriber).include(described_class) }
+
+  describe '#omnes_subscriber' do
+    it 'returns an Omnes::Subscriber' do
+      subject.module_eval do
+        event_action :foo
+
+        def foo(_event); end
+      end
+
+      expect(subject.omnes_subscriber.is_a?(Omnes::Subscriber)).to be(true)
+    end
+
+    it 'adds single-event definitions matching legacy event actions' do
+      subject.module_eval do
+        event_action :foo
+
+        def foo(_event); end
+      end
+      bus = Omnes::Bus.new
+      bus.register(:foo)
+
+      subscriptions = subject.omnes_subscriber.subscribe_to(bus)
+
+      event = Struct.new(:omnes_event_name).new(:foo)
+      expect(subscriptions.first.matches?(event)).to be(true)
+    end
+
+    it 'coerces event names given as Strings' do
+      subject.module_eval do
+        event_action 'foo'
+
+        def foo(_event); end
+      end
+      bus = Omnes::Bus.new
+      bus.register(:foo)
+
+      subscriptions = subject.omnes_subscriber.subscribe_to(bus)
+
+      event = Struct.new(:omnes_event_name).new(:foo)
+      expect(subscriptions.first.matches?(event)).to be(true)
+    end
+
+    it 'executes legacy event action methods as handlers with the omnes event' do
+      subject.module_eval do
+        event_action :foo
+
+        def foo(event)
+          event[:bar]
+        end
+      end
+      bus = Omnes::Bus.new
+      bus.register(:foo)
+
+      subscriptions = subject.omnes_subscriber.subscribe_to(bus)
+
+      expect(
+        bus.publish(:foo, bar: :baz).executions.first.result
+      ).to be(:baz)
+    end
+
+    it 'distingish when event name is given explicitly' do
+      subject.module_eval do
+        event_action :foo, event_name: :bar
+
+        def foo(_event)
+          :bar
+        end
+      end
+      bus = Omnes::Bus.new
+      bus.register(:bar)
+
+      subscriptions = subject.omnes_subscriber.subscribe_to(bus)
+
+      expect(
+        bus.publish(:bar).executions.first.result
+      ).to be(:bar)
+    end
+
+    it "returns the same omnes subscriber instance if called again" do
+      expect(subject.omnes_subscriber).to be(subject.omnes_subscriber)
+    end
+
+    it "doesn't fail when no event action has been defined" do
+      expect { subject.omnes_subscriber }.not_to raise_error
+    end
+  end
+end

data/spec/solidus_support_spec.rb

@@ -12,35 +12,18 @@ RSpec.describe SolidusSupport do
       end
     end
 
-    context 'with Solidus < 2.3' do
-      let(:solidus_version) { '2.2.1' }
-
-      it { is_expected.to eq(Spree::Gateway) }
-    end
-
-    context 'with Solidus >= 2.3' do
+    context 'with credit_card: false' do
       let(:solidus_version) { '2.3.1' }
 
       it { is_expected.to eq(Spree::PaymentMethod) }
     end
 
-    # rubocop:disable RSpec/NestedGroups
     context 'with credit_card: true' do
       let(:credit_card) { true }
+      let(:solidus_version) { '2.3.1' }
 
-      context 'with Solidus < 2.3' do
-        let(:solidus_version) { '2.2.1' }
-
-        it { is_expected.to eq(Spree::Gateway) }
-      end
-
-      context 'with Solidus >= 2.3' do
-        let(:solidus_version) { '2.3.1' }
-
-        it { is_expected.to eq(Spree::PaymentMethod::CreditCard) }
-      end
+      it { is_expected.to eq(Spree::PaymentMethod::CreditCard) }
     end
-    # rubocop:enable RSpec/NestedGroups
   end
 
   describe '.combined_first_and_last_name_in_address?' do
@@ -59,7 +42,7 @@ RSpec.describe SolidusSupport do
     end
 
     context 'when Solidus has preference to choose if combine addresses fields' do
-      let(:solidus_version) { '2.10.3' }
+      let(:solidus_version) { '2.11.3' }
       before do
         allow(Spree::Config)
           .to receive(:use_combined_first_and_last_name_in_address)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_support
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.1
 platform: ruby
 authors:
 - John Hawthorn
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-21 00:00:00.000000000 Z
+date: 2022-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -108,7 +108,21 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+- !ruby/object:Gem::Dependency
+  name: omnes
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+description: 
 email: john@stembolt.com
 executables: []
 extensions: []
@@ -129,10 +143,15 @@ files:
 - bin/setup
 - lib/solidus_support.rb
 - lib/solidus_support/engine_extensions.rb
+- lib/solidus_support/legacy_event_compat.rb
+- lib/solidus_support/legacy_event_compat/bus.rb
+- lib/solidus_support/legacy_event_compat/subscriber.rb
 - lib/solidus_support/migration.rb
 - lib/solidus_support/version.rb
 - solidus_support.gemspec
 - spec/examples.txt
+- spec/solidus_support/legacy_event_compat/bus_spec.rb
+- spec/solidus_support/legacy_event_compat/legacy_event_compat_spec.rb
 - spec/solidus_support_spec.rb
 - spec/spec_helper.rb
 - spec/support/dummy_app.rb
@@ -141,7 +160,7 @@ homepage: https://github.com/solidusio/solidus_support
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -156,13 +175,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Common runtime helpers for Solidus extensions.
 test_files:
-- spec/spec_helper.rb
 - spec/examples.txt
-- spec/solidus_support_spec.rb
+- spec/solidus_support/legacy_event_compat/legacy_event_compat_spec.rb
+- spec/solidus_support/legacy_event_compat/bus_spec.rb
 - spec/support/dummy_app.rb
 - spec/support/dummy_app/database.yml
+- spec/spec_helper.rb
+- spec/solidus_support_spec.rb