solidus_support 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0418d7c8da75d25d26361a1df289e43da888b5467ca4117db150f4d48bbcc2f
-  data.tar.gz: c7bd4f7e00c64f65e3406419ca109a4ba07f29b0f024421f2cf3326f7968c844
+  metadata.gz: 52891f7c46410b049481d932d3936da5530d1eabd601d0af44760398b4560200
+  data.tar.gz: 47b62f091de89edaf01b1e57ce6b1fdf10c558f801ead911822b88bbd8baffa7
 SHA512:
-  metadata.gz: d94c4a8544749e76b9e32c7b07df94b2c7e94f9ed7fd08297af4f76c0cea669b0428dc31907ee6b1ebd535c365c181404bf417f835628f3c68503403b296eb41
-  data.tar.gz: 5a66ef8363f605ca39417ff732a1b5ae5a7dc2350bc908ebf717a8e55ec543f9524c50dacaaa923cd6afb74ee044eafef5da2431dee3caa34be3b694eb2f2836
+  metadata.gz: 2e55cb09d122d874ae9548420477d71a001fa7835f0027c976fca6cfef89351f0546b9477a5d219b9c80c15858e46edf510763b97301adf633dcaa97512d7237
+  data.tar.gz: 965ee76ae136fe8fc11987327044994b4fb1162a9f5516b1c50a47103ecc068acbf8cdc5ba5af68cb1b6e11bf41eb3c10bb50b0291f249dcee0c45341e0cfcd4

data/lib/solidus_support.rb

@@ -18,12 +18,12 @@ 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 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

@@ -24,6 +24,20 @@ module SolidusSupport
     module ClassMethods
       def activate
         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
+          Spree::Event.subscribers.each(&:subscribe!)
+        end
       end
 
       # Loads decorator files.
@@ -46,6 +60,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:
@@ -59,10 +80,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.1'
+  VERSION = '0.6.0'
 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_support
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - John Hawthorn
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-04-15 00:00:00.000000000 Z
+date: 2020-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -128,7 +128,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email: john@stembolt.com
 executables: []
 extensions: []
@@ -152,7 +152,6 @@ files:
 - lib/solidus_support/migration.rb
 - lib/solidus_support/version.rb
 - solidus_support.gemspec
-- spec/examples.txt
 - spec/solidus_support_spec.rb
 - spec/spec_helper.rb
 - spec/support/dummy_app.rb
@@ -161,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
@@ -176,13 +175,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.0.8
+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/support/dummy_app.rb
 - spec/support/dummy_app/database.yml