solidus_core 3.2.1 → 3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 042052d428d45b820e494786dd25b4854e6d3c2f38e5ee080806174e0c677098
-  data.tar.gz: a2a869fec21b3aec695772aac0ffa71db9297c804d335fa0a19837f8b3551846
+  metadata.gz: dc968f634c0e31f7ad3d1928133d5d682df2669617eaca7abdc87379228d7e30
+  data.tar.gz: a2e38014e3d24fe363651e7e27f5b8fa21b93105f1269e67adee3e20ec1665fa
 SHA512:
-  metadata.gz: 460488089ef09d746e12fbc3d6ce3497bd17fb949a60a1a6aeed35b1714c5702922876bb28a2c81729d9d937eeacde1469262bf8e94013850335730134146e3f
-  data.tar.gz: 72fb6ebd3ff554117b0e1375ad8933834c02e709a48b87751ec83660043a77b34b4369b4c80067e50bfa1572dc1c2bae3ee14e9d31ab35a399dcb17674a2592c
+  metadata.gz: 8fbc377c572b99bb42d055b1479f2be9c5bca450019f70bef38adf76a3bfd69057c90824150036c7ed1330d9052f3916f09a48a252b85f31c0719f33f5d52c43
+  data.tar.gz: c57b6889ddf53bcf23fc1ed0012a9759ef72a031a72e1c8a8a838abfb8594b8f401bb17a973d17c37347aae44f37411181ab9a663e884659ebeb6122c06481c4

data/app/models/concerns/spree/user_methods.rb

@@ -90,6 +90,21 @@ module Spree
       orders.none?
     end
 
+    # Updates the roles in keeping with the given ability's permissions
+    #
+    # Roles that are not accessible to the given ability will be ignored. It
+    # also ensure not to remove non accessible roles when assigning new
+    # accessible ones.
+    #
+    # @param given_roles [Spree::Role]
+    # @param ability [Spree::Ability]
+    def update_spree_roles(given_roles, ability:)
+      accessible_roles = Spree::Role.accessible_by(ability)
+      non_accessible_roles = Spree::Role.all - accessible_roles
+      new_accessible_roles = given_roles - non_accessible_roles
+      self.spree_roles = spree_roles - accessible_roles + new_accessible_roles
+    end
+
     private
 
     def check_for_deletion

data/lib/generators/solidus/install/install_generator/install_frontend.rb

@@ -11,42 +11,48 @@ module Solidus
         @generator_context = generator_context
       end
 
-      def call(frontend, installer_adds_auth:)
+      def call(frontend)
         case frontend
         when 'solidus_frontend'
           install_solidus_frontend
         when 'solidus_starter_frontend'
-          install_solidus_starter_frontend(installer_adds_auth)
+          install_solidus_starter_frontend
         end
       end
 
       private
 
-      def install_solidus_frontend
-        unless @bundler_context.component_in_gemfile?(:frontend)
-          BundlerContext.bundle_cleanly do
-            `bundle add solidus_frontend`
-            `bundle install`
-          end
-        end
+      def bundle_command(command)
+        @generator_context.say_status :run, "bundle #{command}"
+        bundle_path = Gem.bin_path("bundler", "bundle")
 
-        @generator_context.generate('solidus_frontend:install')
+        BundlerContext.bundle_cleanly do
+          system(
+            Gem.ruby,
+            bundle_path,
+            *command.shellsplit,
+          )
+        end
       end
 
-      def install_solidus_starter_frontend(installer_adds_auth)
-        @bundler_context.remove(['solidus_frontend']) if @bundler_context.component_in_gemfile?(:frontend)
+      def install_solidus_frontend
+        unless @bundler_context.component_in_gemfile?(:frontend)
+          bundle_command 'add solidus_frontend'
+        end
 
-        # TODO: Move installation of solidus_auth_devise to the
-        # solidus_starter_frontend template
-        unless auth_present?(installer_adds_auth)
-          BundlerContext.bundle_cleanly { `bundle add solidus_auth_devise` }
-          @generator_context.generate('solidus:auth:install --auto-run-migrations')
+        # Solidus bolt will be handled in the installer as a payment method.
+        begin
+          skip_solidus_bolt = ENV['SKIP_SOLIDUS_BOLT']
+          ENV['SKIP_SOLIDUS_BOLT'] = 'true'
+          @generator_context.generate("solidus_frontend:install #{@generator_context.options[:auto_accept] ? '--auto-accept' : ''}")
+        ensure
+          ENV['SKIP_SOLIDUS_BOLT'] = skip_solidus_bolt
         end
-        `LOCATION="https://raw.githubusercontent.com/solidusio/solidus_starter_frontend/main/template.rb" bin/rails app:template`
       end
 
-      def auth_present?(installer_adds_auth)
-        installer_adds_auth || @bundler_context.component_in_gemfile?(:auth_devise)
+      def install_solidus_starter_frontend
+        @bundler_context.remove(['solidus_frontend']) if @bundler_context.component_in_gemfile?(:frontend)
+        @generator_context.apply "https://raw.githubusercontent.com/solidusio/solidus_starter_frontend/v3.2/template.rb"
       end
     end
   end

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

@@ -19,6 +19,12 @@ module Solidus
       'none'
     ].freeze
 
+    PAYMENT_METHODS = {
+      'paypal' => 'solidus_paypal_commerce_platform',
+      'bolt' => 'solidus_bolt',
+      'none' => nil,
+    }
+
     class_option :migrate, type: :boolean, default: true, banner: 'Run Solidus migrations'
     class_option :seed, type: :boolean, default: true, banner: 'Load seed data (migrations must be run)'
     class_option :sample, type: :boolean, default: true, banner: 'Load sample data (migrations must be run)'
@@ -28,13 +34,18 @@ module Solidus
     class_option :admin_email, type: :string
     class_option :admin_password, type: :string
     class_option :lib_name, type: :string, default: 'spree'
-    class_option :with_authentication, type: :boolean, default: true
+    class_option :with_authentication, type: :boolean, default: nil
     class_option :enforce_available_locales, type: :boolean, default: nil
     class_option :frontend,
                  type: :string,
                  enum: FRONTENDS,
                  default: nil,
                  desc: "Indicates which frontend to install."
+    class_option :payment_method,
+                 type: :string,
+                 enum: PAYMENT_METHODS.keys,
+                 default: nil,
+                 desc: "Indicates which payment method to install."
 
     def self.source_paths
       paths = superclass.source_paths
@@ -118,7 +129,8 @@ module Solidus
     end
 
     def install_auth_plugin
-      if options[:with_authentication] && (options[:auto_accept] || !no?("
+      with_authentication = options[:with_authentication]
+      with_authentication.nil? and with_authentication = (options[:auto_accept] || !no?("
         Solidus has a default authentication extension that uses Devise.
         You can find more info at https://github.com/solidusio/solidus_auth_devise.
 
@@ -127,11 +139,32 @@ module Solidus
 
         Would you like to install it? (Y/n)"))
 
+      if with_authentication
         @plugins_to_be_installed << 'solidus_auth_devise'
         @plugin_generators_to_run << 'solidus:auth:install'
       end
     end
 
+    def install_payment_method
+      say_status :warning, set_color(
+        "Selecting a payment along with `solidus_starter_frontend` might require manual integration.",
+        :yellow
+      ), :yellow
+
+      name = options[:payment_method]
+      name ||= PAYMENT_METHODS.keys.first if options[:auto_accept]
+      name ||= ask("
+  You can select a payment method to be included in the installation process.
+  Please select a payment method name:", limited_to: PAYMENT_METHODS.keys, default: PAYMENT_METHODS.keys.first)
+
+      gem_name = PAYMENT_METHODS.fetch(name)
+
+      if gem_name
+        @plugins_to_be_installed << gem_name
+        @plugin_generators_to_run << "#{gem_name}:install"
+      end
+    end
+
     def include_seed_data
       append_file "db/seeds.rb", <<-RUBY.strip_heredoc
 
@@ -150,19 +183,6 @@ module Solidus
       rake 'db:create'
     end
 
-    def run_bundle_install_if_needed_by_plugins
-      @plugins_to_be_installed.each do |plugin_name|
-        gem plugin_name
-      end
-
-      BundlerContext.bundle_cleanly { run "bundle install" } if @plugins_to_be_installed.any?
-      run "spring stop" if defined?(Spring)
-
-      @plugin_generators_to_run.each do |plugin_generator_name|
-        generate "#{plugin_generator_name} --skip_migrations=true"
-      end
-    end
-
     def install_frontend
       return if options[:frontend] == 'none'
 
@@ -174,9 +194,22 @@ module Solidus
 
       say_status :installing, frontend
 
-      InstallFrontend.
-        new(bundler_context: bundler_context, generator_context: self).
-        call(frontend, installer_adds_auth: @plugins_to_be_installed.include?('solidus_auth_devise'))
+      InstallFrontend
+        .new(bundler_context: bundler_context, generator_context: self)
+        .call(frontend)
+    end
+
+    def run_bundle_install_if_needed_by_plugins
+      @plugins_to_be_installed.each do |plugin_name|
+        gem plugin_name
+      end
+
+      BundlerContext.bundle_cleanly { run "bundle install" } if @plugins_to_be_installed.any?
+      run "spring stop" if defined?(Spring)
+
+      @plugin_generators_to_run.each do |plugin_generator_name|
+        generate "#{plugin_generator_name} --skip_migrations=true"
+      end
     end
 
     def run_migrations

data/lib/spree/core/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  VERSION = "3.2.1"
+  VERSION = "3.2.3"
 
   def self.solidus_version
     VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.3
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-09 00:00:00.000000000 Z
+date: 2022-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer