solidus_support 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cdd9849818af1dc56048136d30a8198d6d79c7245250824283659a47c396932
-  data.tar.gz: e82afa4bcca816ad08c7b0afb4ff09279104c99c111818d96ba26cf0f7dab2f7
+  metadata.gz: f806b6a51765583aba92e5da3dc943006b383572af0aaf02d1aba0ecce33ed5a
+  data.tar.gz: 46bb34278a3de81f7af8e2d90c4a3852430f204248904e37df898fbff4bac874
 SHA512:
-  metadata.gz: f619198e4c09da849dbab523854002358b35183d9c1cf13c5a24ae4001a986b6d5c38c5edc8d4ea06412581f4f14080a0abc1628d948409dbf47dc7be5364ee0
-  data.tar.gz: bb3060ebe160c24dca44376cab8d5c1cdb3bf377cc47312a1a70d15eaeabee3df045d566d464433f86b0943a24dbd5e2cbfd907a89c21374808defc0a054de72
+  metadata.gz: a2ffa3274fb6a3bb433a50de1051083567c11b79d770281cd7001b2aca0b184c8ffb6c3f08c2f67c82c34fee941260e3f270e0b7ef7a689e7bb7d090fb40edbb
+  data.tar.gz: a8d1e98aa2fbc7657c0d2c78a84597c6950ca7618b26dd5b1c57a3dd24ea34fdbf80020bc6bbb7e0b5a70d7eb88a42782ebcc38e60dd3ee68d78102f968f8e98

data/lib/solidus_support/engine_extensions.rb

@@ -37,16 +37,16 @@ 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 SolidusSupport::LegacyEventCompat.using_legacy?
-          path.glob("**/*_subscriber.rb") do |subscriber_path|
-            require_dependency(subscriber_path)
-          end
+        return unless SolidusSupport::LegacyEventCompat.using_legacy?
 
-          if Spree::Event.respond_to?(:activate_all_subscribers)
-            Spree::Event.activate_all_subscribers
-          else
-            Spree::Event.subscribers.each(&:subscribe!)
-          end
+        path.glob("**/*_subscriber.rb") do |subscriber_path|
+          require_dependency(subscriber_path)
+        end
+
+        if Spree::Event.respond_to?(:activate_all_subscribers)
+          Spree::Event.activate_all_subscribers
+        else
+          Spree::Event.subscribers.each(&:subscribe!)
         end
       end
 
@@ -130,13 +130,19 @@ module SolidusSupport
         end
 
         initializer "#{engine_name}_#{engine}_patch_paths" do
-          patch_paths = root.join("lib/patches/#{engine}").glob("*")
-          Flickwerk.patch_paths += patch_paths
+          if SolidusSupport.send(:"#{engine}_available?")
+            patch_paths = root.join("lib/patches/#{engine}").glob("*")
+            Flickwerk.patch_paths += patch_paths
+          end
         end
 
         initializer "#{engine_name}_#{engine}_user_patches" do |app|
           app.reloader.to_prepare do
-            Flickwerk.aliases["Spree.user_class"] = Spree.user_class_name
+            Flickwerk.aliases["Spree.user_class"] = if Spree.respond_to?(:user_class_name)
+                                                      Spree.user_class_name
+                                                    else
+                                                      Spree.user_class.name
+                                                    end
           end
         end
 

data/lib/solidus_support/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_support
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
 platform: ruby
 authors:
 - John Hawthorn