solidus_subscriptions 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1121154a5a07221430e6e96512ba434fb46f50be524cd48bb894c44f88793c52
-  data.tar.gz: 9869b12284c983cee09bd75f8e4467aea1789b042c2c7da9cbcab36eb1da20c7
+  metadata.gz: cacdf4a162fd48c74388cc6b4562b1154d3faa718b17f24d7e4dfb0a669d9ce4
+  data.tar.gz: dc9f15fb75083a9b07ba9ebda13472b74cf940580811ab8da3fba17064ddc4b8
 SHA512:
-  metadata.gz: d81b22eb6487b3e0963a93ccf56ffb6b2f0ef79196b28a5b0e2633c411f511d091f176723a187a717cd516094891d204eebb869806687774a583b9b1f96a3582
-  data.tar.gz: 97ddff9ba7136ee880ffeb4e97c7bc03c56d4ce1eaee292ab287b2b4ae80d84d6b860328938985c355cc31e81a47c6eddc585388e2ddd3ae560fc1adc2d8705a
+  metadata.gz: 432b9e489106aa3bb89e0ae7df0abfe1eaacd65addeedcb7940fdcf0592e70720d8952a5cefce7df8ed97c0f5944e8e12d5388594eb72a2264b0efb98affd992
+  data.tar.gz: 890f2248311fd25b8f322936070dc2bf4308c329fb2a52f188ebea2f80641dc0210ee04d526437deb840160f676343f22c6ddc16ebfcf84f3bd71075e5c37e32

data/.circleci/config.yml

@@ -12,7 +12,7 @@ jobs:
     parameters:
       solidus:
         type: string
-        default: master
+        default: main
       db:
         type: string
         default: "postgres"
@@ -38,7 +38,7 @@ workflows:
       - run-specs:
           name: &name "run-specs-solidus-<< matrix.solidus >>-ruby-<< matrix.ruby >>-db-<< matrix.db >>"
           matrix:
-            parameters: { solidus: ["master"], ruby: ["3.2"], db: ["postgres"] }
+            parameters: { solidus: ["main"], ruby: ["3.2"], db: ["postgres"] }
       - run-specs:
           name: *name
           matrix:
@@ -48,7 +48,7 @@ workflows:
           matrix:
             parameters: { solidus: ["older"], ruby: ["3.0"], db: ["sqlite"] }
 
-  "Weekly run specs against master":
+  "Weekly run specs against main":
     triggers:
       - schedule:
           cron: "0 0 * * 4" # every Thursday
@@ -60,7 +60,7 @@ workflows:
       - run-specs:
           name: *name
           matrix:
-            parameters: { solidus: ["master"], ruby: ["3.2"], db: ["postgres"] }
+            parameters: { solidus: ["main"], ruby: ["3.2"], db: ["postgres"] }
       - run-specs:
           name: *name
           matrix:

data/Gemfile

@@ -3,14 +3,17 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
-solidus_git, solidus_frontend_git = if (branch == 'master') || (branch >= 'v3.2')
-                                      %w[solidusio/solidus solidusio/solidus_frontend]
-                                    else
-                                      %w[solidusio/solidus] * 2
-                                    end
-gem 'solidus', github: solidus_git, branch: branch
-gem 'solidus_frontend', github: solidus_frontend_git, branch: branch
+branch = ENV.fetch('SOLIDUS_BRANCH', 'main')
+gem 'solidus', github: 'solidusio/solidus', branch: branch
+
+# The solidus_frontend gem has been pulled out since v3.2
+if branch >= 'v3.2'
+  gem 'solidus_frontend'
+elsif branch == 'main'
+  gem 'solidus_frontend', github: 'solidusio/solidus_frontend'
+else
+  gem 'solidus_frontend', github: 'solidusio/solidus', branch: branch
+end
 
 # Needed to help Bundler figure out how to resolve dependencies,
 # otherwise it takes forever to resolve them.

data/README.md

@@ -13,24 +13,27 @@ Add solidus_subscriptions to your Gemfile:
 gem 'solidus_subscriptions', github: 'solidusio/solidus_subscriptions'
 ```
 
+### Starter Frontend
+
 Bundle your dependencies and run the installation generator:
 
 ```shell
 $ bundle
-$ bin/rails generate solidus_subscriptions:install --frontend=starter
+$ bin/rails generate solidus_subscriptions:install
 ```
 
-Please, be aware that the starter installation only works with the default
+Please, be aware that the installation only works with the default
 implementation of the starter frontend. Any customization to the files that
 will be modified by the installer might break the installation procedure.
 If that happens, try to adapt the installed code on top of the customizations
 of the store.
 
+### Legacy Frontend
 
 If you are using the legacy `solidus_frontend` gem, please run this command instead:
 
 ```shell
-$ bin/rails generate solidus_subscriptions:install
+$ bin/rails generate solidus_subscriptions:install --frontend=classic
 ```
 
 ### Guest checkout

data/app/models/solidus_subscriptions/promotion/rules/subscription_creation_order.rb

@@ -24,7 +24,7 @@ module SolidusSubscriptions
         #   to it.
         #
         # @return [Boolean]
-        def eligible?(order, **_options)
+        def eligible?(order, _options = {})
           order.subscription_line_items.any?
         end
 

data/app/models/solidus_subscriptions/promotion/rules/subscription_installment_order.rb

@@ -22,7 +22,7 @@ module SolidusSubscriptions
         #   to it.
         #
         # @return [Boolean]
-        def eligible?(order, **_options)
+        def eligible?(order, _options = {})
           order.subscription_order?
         end
       end

data/bin/sandbox

@@ -22,7 +22,7 @@ if [ ! -z $SOLIDUS_BRANCH ]
 then
   BRANCH=$SOLIDUS_BRANCH
 else
-  BRANCH="master"
+  BRANCH="main"
 fi
 
 extension_name="solidus_subscriptions"
@@ -71,7 +71,7 @@ unbundled bundle exec rails generate solidus:install \
   --payment-method=none \
   $@
 
-unbundled bundle exec rails generate ${extension_name}:install --frontend=starter --auto-run-migrations=true
+unbundled bundle exec rails generate ${extension_name}:install --auto-run-migrations=true
 
 echo
 echo "🚀 Sandbox app successfully created for $extension_name!"

data/lib/generators/solidus_subscriptions/install/install_generator.rb

@@ -6,7 +6,8 @@ module SolidusSubscriptions
       source_root File.expand_path('templates', __dir__)
 
       class_option :auto_run_migrations, type: :boolean, default: false
-      class_option :frontend, type: :string, default: 'classic'
+      # Either 'starter' or 'classic'
+      class_option :frontend, type: :string, default: 'starter'
 
       def copy_initializer
         template 'initializer.rb', 'config/initializers/solidus_subscriptions.rb'

data/lib/solidus_subscriptions/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusSubscriptions
-  VERSION = '2.0.0'
+  VERSION = '2.0.2'
 end

data/solidus_subscriptions.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'deface'
   spec.add_dependency 'httparty', '~> 0.18'
   spec.add_dependency 'i18n'
-  spec.add_dependency 'solidus_core', '>= 2.11', '< 4'
+  spec.add_dependency 'solidus_core', '>= 2.11', '< 5'
   spec.add_dependency 'solidus_support', '~> 0.9'
   spec.add_dependency 'state_machines'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_subscriptions
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-03 00:00:00.000000000 Z
+date: 2023-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -61,7 +61,7 @@ dependencies:
         version: '2.11'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -71,7 +71,7 @@ dependencies:
         version: '2.11'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: solidus_support
   requirement: !ruby/object:Gem::Requirement