solidus_support 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c47f29279cf2922b38a65fd166de8cbc1e2c220166f8c9f6a29a678591bcc7f
-  data.tar.gz: 597472813f4a5afa136d10c1be1f106bf66c277616a3d083d03fa5a9d33a467f
+  metadata.gz: c43a1b7508840f6023b1575287415fc3bf181d5ea05126243c97b8838ad2be1c
+  data.tar.gz: 98c56af653e3ae527b117d5ebdec7ef9832ff5e0e8a059fc7de881ed5b1f0949
 SHA512:
-  metadata.gz: ba3d4fb41d2268a51f448da89adac7ffeb7f2b543c60db3f734f54e42a14b60dcf0332f2478ccf94cf9f64c053c98f7a71a631f86b4ac05362a0330b257a8569
-  data.tar.gz: 0c3f781f43b12300e52903e3b94d2f0b38d2da83b79b3719e21a6b2031ee45e6af9e8195df1d880888f4849d4e7071dc1671cf3448e5682aeeb39bc43107718d
+  metadata.gz: 3c8284f184e195e9e0ddbbf60ce476da9f4ac78e0666566d8696d0b41c54a53efa1badf3dc43140f55ad32bff25b1861eaf4275bc009999092c46cad387439ad
+  data.tar.gz: 8f1e30f574df23d1c8c71be6c3e4d0525c5f440d82d84d470b9d932bc0b72c5993a477a7d7151e19bba2d2cdb063a4216c5bf2275e099126ac309f9ed1ca5037

data/.circleci/config.yml

@@ -8,28 +8,54 @@ orbs:
   solidusio_extensions: solidusio/extensions@volatile
 
 jobs:
-  run-specs-with-postgres:
-    executor: solidusio_extensions/postgres
+  run-specs:
+    parameters:
+      solidus:
+        type: string
+        default: main
+      db:
+        type: string
+        default: "postgres"
+      ruby:
+        type: string
+        default: "3.2"
+    executor:
+      name: solidusio_extensions/<< parameters.db >>
+      ruby_version: << parameters.ruby >>
     steps:
-      - solidusio_extensions/run-tests
-  run-specs-with-mysql:
-    executor: solidusio_extensions/mysql
-    steps:
-      - solidusio_extensions/run-tests
+      - checkout
+      - solidusio_extensions/run-tests-solidus-<< parameters.solidus >>
 
 workflows:
   "Run specs on supported Solidus versions":
     jobs:
-      - run-specs-with-postgres
-      - run-specs-with-mysql
-  "Weekly run specs against master":
+      - run-specs:
+          name: &name "run-specs-solidus-<< matrix.solidus >>-ruby-<< matrix.ruby >>-db-<< matrix.db >>"
+          matrix:
+            parameters: { solidus: ["main"], ruby: ["3.2"], db: ["postgres"] }
+      - run-specs:
+          name: *name
+          matrix:
+            parameters: { solidus: ["current"], ruby: ["3.1"], db: ["mysql"] }
+      - run-specs:
+          name: *name
+          matrix:
+            parameters: { solidus: ["older"], ruby: ["3.0"], db: ["sqlite"] }
+
+  "Weekly run specs against main":
     triggers:
       - schedule:
           cron: "0 0 * * 4" # every Thursday
           filters:
             branches:
               only:
-                - master
+                - main
     jobs:
-      - run-specs-with-postgres
-      - run-specs-with-mysql
+      - run-specs:
+          name: *name
+          matrix:
+            parameters: { solidus: ["main"], ruby: ["3.2"], db: ["postgres"] }
+      - run-specs:
+          name: *name
+          matrix:
+            parameters: { solidus: ["current"], ruby: ["3.1"], db: ["mysql"] }

data/.github/stale.yml

@@ -1,17 +1 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - pinned
-  - security
-# Label to use when marking an issue as stale
-staleLabel: wontfix
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false
+_extends: .github

data/Gemfile

@@ -3,7 +3,7 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
+branch = ENV.fetch('SOLIDUS_BRANCH', 'main')
 gem 'solidus_core', github: 'solidusio/solidus', branch: branch
 
 case ENV['DB']

data/lib/solidus_support/engine_extensions.rb

@@ -107,14 +107,15 @@ module SolidusSupport
         end
 
         if SolidusSupport.send(:"#{engine}_available?")
-          path = root.join("lib/decorators/#{engine}")
-
-          config.autoload_paths += path.glob('*')
+          decorators_path = root.join("lib/decorators/#{engine}")
+          controllers_path = root.join("lib/controllers/#{engine}")
+          config.autoload_paths += decorators_path.glob('*')
+          config.autoload_paths += controllers_path.glob('*')
 
           engine_context = self
           config.to_prepare do
             engine_context.instance_eval do
-              load_solidus_decorators_from(path)
+              load_solidus_decorators_from(decorators_path)
             end
           end
         end

data/lib/solidus_support/version.rb

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

data/spec/examples.txt

@@ -1,15 +1,9 @@
-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 |
+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  |

data/spec/solidus_support/legacy_event_compat/legacy_event_compat_spec.rb

@@ -2,7 +2,7 @@
 
 require 'omnes'
 
-RSpec.describe SolidusSupport::LegacyEventCompat::Subscriber do
+RSpec.describe SolidusSupport::LegacyEventCompat::Subscriber, if: Spree.solidus_version < Gem::Version.new("4.0.0.dev") do
   subject { Module.new.include(Spree::Event::Subscriber).include(described_class) }
 
   describe '#omnes_subscriber' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_support
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - John Hawthorn
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-02 00:00:00.000000000 Z
+date: 2023-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -122,7 +122,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.2
-description: 
+description:
 email: john@stembolt.com
 executables: []
 extensions: []
@@ -160,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
@@ -175,15 +175,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Common runtime helpers for Solidus extensions.
 test_files:
 - spec/examples.txt
-- 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/legacy_event_compat/legacy_event_compat_spec.rb
 - spec/solidus_support_spec.rb
+- spec/spec_helper.rb
+- spec/support/dummy_app/database.yml
+- spec/support/dummy_app.rb