solidus_core 2.11.10 → 3.3.1

data/lib/generators/solidus/update/update_generator.rb

@@ -0,0 +1,112 @@
+# frozen_string_literal: true
+
+require 'spree/preferences/preference_differentiator'
+require 'rails/generators'
+
+module Solidus
+  # @private
+  class UpdateGenerator < ::Rails::Generators::Base
+    FROM = Spree.previous_solidus_minor_version
+
+    desc 'Generates a new initializer to preview the new defaults for current Solidus version'
+
+    source_root File.expand_path('templates', __dir__)
+
+    class_option :initializer_basename,
+                 type: :string,
+                 default: 'new_solidus_defaults',
+                 banner: 'The name for the new initializer'
+
+    class_option :previous_version_prompt,
+                 type: :boolean,
+                 default: true,
+                 banner: 'Prompt to warn about only previous version support'
+
+    class_option :from,
+                 type: :string,
+                 default: FROM,
+                 banner: 'Solidus version from which you are upgrading'
+
+    class_option :to,
+                 type: :string,
+                 default: Spree.solidus_version,
+                 hide: true
+
+    class_option :initializer_directory,
+                 type: :string,
+                 default: 'config/initializers/',
+                 hide: true
+
+    def create_new_defaults_initializer
+      previous_version_prompt = options[:previous_version_prompt]
+      return if previous_version_prompt && !yes?(<<~MSG, :red)
+        The update process is only supported if you are coming from version #{FROM}. If this is not the case, please, skip it and update your application to use Solidus #{FROM} before retrying.
+        If you are confident you want to upgrade from a previous version, you must rerun the generator with the "--from={OLD_VERSION}" argument.
+        Are you sure you want to continue? (y/N)
+      MSG
+
+      from = options[:from]
+      to = options[:to]
+      @from = from
+      @core_changes = core_changes_template(from, to)
+      @frontend_changes = frontend_changes_template(from, to)
+      @backend_changes = backend_changes_template(from, to)
+      @api_changes = api_changes_template(from, to)
+
+      template 'config/initializers/new_solidus_defaults.rb.tt',
+               File.join(options[:initializer_directory], "#{options[:initializer_basename]}.rb")
+    end
+
+    def print_message
+      say <<~MSG
+
+        ***********************************************************************
+
+        Other tasks may be needed to update to the new Solidus version. Please,
+        check https://github.com/solidusio/solidus/blob/v#{options[:to]}/CHANGELOG.md
+        for details.
+
+        Thanks for using Solidus!
+
+        ***********************************************************************
+
+      MSG
+    end
+
+    private
+
+    def core_changes_template(from, to)
+      changes_template_for(Spree::AppConfiguration, from, to)
+    end
+
+    def frontend_changes_template(from, to)
+      return '' unless defined?(Spree::Frontend::Engine)
+
+      changes_template_for(Spree::FrontendConfiguration, from, to)
+    end
+
+    def backend_changes_template(from, to)
+      return '' unless defined?(Spree::Backend::Engine)
+
+      changes_template_for(Spree::BackendConfiguration, from, to)
+    end
+
+    def api_changes_template(from, to)
+      return '' unless defined?(Spree::Api::Engine)
+
+      changes_template_for(Spree::ApiConfiguration, from, to)
+    end
+
+    def changes_template_for(klass, from, to)
+      changes = Spree::Preferences::PreferenceDifferentiator.new(klass).call(from: from, to: to)
+      return '# No changes' if changes.empty?
+
+      [
+        ["config.load_defaults('#{from}')"] +
+          changes.map do |pref_key, change|
+            "  # config.#{pref_key} = #{change[:to]}"
+          end.flatten
+      ].join("\n")
+    end
+  end
+end

data/lib/generators/spree/custom_user/custom_user_generator.rb

@@ -22,10 +22,12 @@ module Spree
       migration_template 'migration.rb.tt', "db/migrate/add_spree_fields_to_custom_user_table.rb"
       template 'authentication_helpers.rb.tt', "lib/spree/authentication_helpers.rb"
 
-      file_action = File.exist?('config/initializers/spree.rb') ? :append_file : :create_file
-      send(file_action, 'config/initializers/spree.rb') do
-        "Rails.application.config.to_prepare do\n  require_dependency 'spree/authentication_helpers'\nend\n"
-      end
+      initializer 'solidus_authentication', <<~RUBY
+        Rails.application.config.to_prepare do
+          ApplicationController.include Spree::AuthenticationHelpers, Spree::CurrentUserHelpers
+          Spree::Api::BaseController.include Spree::CurrentUserHelpers if defined? Spree::Api
+        end
+      RUBY
 
       gsub_file 'config/initializers/spree.rb', /Spree\.user_class.?=.?.+$/, %{Spree.user_class = "#{class_name}"}
     end

data/lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt

@@ -9,7 +9,8 @@ module Spree
     end
 
     def spree_current_user
-      current_user
+      # TODO: Replace this with your implementation for retrieving the current user
+      Spree.user_class.new
     end
   end
 
@@ -33,8 +34,3 @@ module Spree
     end
   end
 end
-
-ApplicationController.send :include, Spree::AuthenticationHelpers
-ApplicationController.send :include, Spree::CurrentUserHelpers
-
-Spree::Api::BaseController.send :include, Spree::CurrentUserHelpers

data/lib/generators/spree/custom_user/templates/migration.rb.tt

@@ -1,7 +1,11 @@
 class AddSpreeFieldsToCustomUserTable < ActiveRecord::Migration[4.2]
   def up
-    add_column <%= table_name.inspect %>, :spree_api_key, :string, :limit => 48
-    add_column <%= table_name.inspect %>, :ship_address_id, :integer
-    add_column <%= table_name.inspect %>, :bill_address_id, :integer
+    if table_exists?(<%= table_name.inspect %>)
+      add_column <%= table_name.inspect %>, :spree_api_key, :string, :limit => 48 unless column_exists?(<%= table_name.inspect %>, :spree_api_key)
+      add_column <%= table_name.inspect %>, :ship_address_id, :integer unless column_exists?(<%= table_name.inspect %>, :ship_address_id)
+      add_column <%= table_name.inspect %>, :bill_address_id, :integer unless column_exists?(<%= table_name.inspect %>, :bill_address_id)
+      add_column <%= table_name.inspect %>, :deleted_at, :datetime unless column_exists?(<%= table_name.inspect %>, :deleted_at)
+      add_index  <%= table_name.inspect %>, :deleted_at unless column_exists?(<%= table_name.inspect %>, :deleted_at)
+    end
   end
 end

data/lib/generators/spree/dummy/dummy_generator.rb

@@ -43,7 +43,7 @@ module Spree
       opts[:skip_test] = true
       opts[:skip_yarn] = true
       opts[:skip_bootsnap] = true
-      opts[:skip_webpack_install] = true
+      opts[:skip_javascript] = true
 
       puts "Generating dummy Rails application..."
       invoke Rails::Generators::AppGenerator,
@@ -55,6 +55,7 @@ module Spree
       @database = options[:database]
 
       template "rails/database.yml", "#{dummy_path}/config/database.yml", force: true
+      template "rails/storage.yml", "#{dummy_path}/config/storage/test.yml", force: true
       template "rails/boot.rb", "#{dummy_path}/config/boot.rb", force: true
       template "rails/application.rb.tt", "#{dummy_path}/config/application.rb", force: true
       template "rails/routes.rb", "#{dummy_path}/config/routes.rb", force: true
@@ -95,13 +96,15 @@ module Spree
     protected
 
     def inject_require_for(requirement)
-      inject_into_file 'config/application.rb', %[
-begin
-  require '#{requirement}'
-rescue LoadError
-  # #{requirement} is not available.
-end
-      ], before: /require '#{@lib_name}'/, verbose: true
+      inject_into_file 'config/application.rb', (
+        <<~RUBY
+          begin
+            require '#{requirement}'
+          rescue LoadError
+            # #{requirement} is not available.
+          end
+        RUBY
+      ), before: /require '#{@lib_name}'/, verbose: true
     end
 
     def dummy_path
@@ -117,7 +120,7 @@ end
         dummy_application_path = File.expand_path("#{dummy_path}/config/application.rb", destination_root)
         unless options[:pretend] || !File.exist?(dummy_application_path)
           contents = File.read(dummy_application_path)
-          contents[(contents.index("module #{module_name}"))..-1]
+          contents[(contents.index("module #{module_name}"))..]
         end
       end
     end

data/lib/generators/spree/dummy/templates/rails/application.rb.tt

@@ -7,4 +7,3 @@ Bundler.require(*Rails.groups(assets: %w(development test)))
 require '<%= lib_name %>'
 
 <%= application_definition %>
-

data/lib/generators/spree/dummy/templates/rails/database.yml

@@ -1,61 +1,105 @@
-<% if agent_number = ENV['TC_AGENT_NUMBER']
-database_prefix = agent_number + '_'
-end %>
+<% db = case ENV['DB']
+        when 'mysql'
+          'mysql'
+        when 'postgres', 'postgresql'
+          'postgres'
+        when 'sqlite', '', nil
+          'sqlite'
+        else
+          raise "Invalid DB specified: #{ENV['DB']}"
+        end %>
+<% db_host = case db
+             when 'mysql'
+               ENV['DB_MYSQL_HOST'] || ENV['DB_HOST']
+             when 'postgres'
+               ENV['DB_POSTGRES_HOST'] || ENV['DB_HOST']
+             else
+               ENV['DB_HOST']
+             end %>
+<% db_username = ENV['DB_USERNAME'] %>
+<% db_password = ENV['DB_PASSWORD'] %>
+
 <% case ENV['DB']
-  when 'sqlite' %>
-development:
-  adapter: sqlite3
-  database: db/solidus_development.sqlite3
-test:
-  adapter: sqlite3
-  database: db/solidus_test.sqlite3
-  timeout: 10000
-production:
-  adapter: sqlite3
-  database: db/solidus_production.sqlite3
-<% when 'mysql' %>
+  when 'mysql' %>
 development:
   adapter: mysql2
-  database: <%= database_prefix %><%= options[:lib_name] %>_solidus_development
+  database: <%= options[:lib_name] %>_solidus_development
+  <% unless db_username.blank? %>
+  username: <%= db_username %>
+  <% end %>
+  <% unless db_password.blank? %>
+  password: <%= db_password %>
+  <% end %>
+  <% unless db_host.blank? %>
+  host: <%= db_host %>
+  <% end %>
   encoding: utf8
 test:
   adapter: mysql2
-  <% if ENV['TRAVIS'] %>
-  username: root
-  password:
+  database: <%= options[:lib_name] %>_solidus_test
+  <% unless db_username.blank? %>
+  username: <%= db_username %>
+  <% end %>
+  <% unless db_password.blank? %>
+  password: <%= db_password %>
+  <% end %>
+  <% unless db_host.blank? %>
+  host: <%= db_host %>
   <% end %>
-  database: <%= database_prefix %><%= options[:lib_name] %>_solidus_test
   encoding: utf8
 production:
   adapter: mysql2
-  database: <%= database_prefix %><%= options[:lib_name] %>_solidus_production
+  database: <%= options[:lib_name] %>_solidus_production
+  <% unless db_username.blank? %>
+  username: <%= db_username %>
+  <% end %>
+  <% unless db_password.blank? %>
+  password: <%= db_password %>
+  <% end %>
+  <% unless db_host.blank? %>
+  host: <%= db_host %>
+  <% end %>
   encoding: utf8
 <% when 'postgres', 'postgresql' %>
-<% db_host = ENV['DB_HOST'] -%>
 development:
   adapter: postgresql
-  database: <%= database_prefix %><%= options[:lib_name] %>_solidus_development
-  username: postgres
-  min_messages: warning
-<% unless db_host.blank? %>
+  database: <%= options[:lib_name] %>_solidus_development
+  <% unless db_username.blank? %>
+  username: <%= db_username %>
+  <% end %>
+  <% unless db_password.blank? %>
+  password: <%= db_password %>
+  <% end %>
+  <% unless db_host.blank? %>
   host: <%= db_host %>
-<% end %>
+  <% end %>
+  min_messages: warning
 test:
   adapter: postgresql
-  database: <%= database_prefix %><%= options[:lib_name] %>_solidus_test
-  username: postgres
-  min_messages: warning
-<% unless db_host.blank? %>
+  database: <%= options[:lib_name] %>_solidus_test
+  <% unless db_username.blank? %>
+  username: <%= db_username %>
+  <% end %>
+  <% unless db_password.blank? %>
+  password: <%= db_password %>
+  <% end %>
+  <% unless db_host.blank? %>
   host: <%= db_host %>
-<% end %>
+  <% end %>
+  min_messages: warning
 production:
   adapter: postgresql
-  database: <%= database_prefix %><%= options[:lib_name] %>_solidus_production
-  username: postgres
-  min_messages: warning
-<% unless db_host.blank? %>
+  database: <%= options[:lib_name] %>_solidus_production
+  <% unless db_username.blank? %>
+  username: <%= db_username %>
+  <% end %>
+  <% unless db_password.blank? %>
+  password: <%= db_password %>
+  <% end %>
+  <% unless db_host.blank? %>
   host: <%= db_host %>
-<% end %>
+  <% end %>
+  min_messages: warning
 <% when 'sqlite', '', nil %>
 development:
   adapter: sqlite3
@@ -66,6 +110,4 @@ test:
 production:
   adapter: sqlite3
   database: db/solidus_production.sqlite3
-<% else %>
-  <% raise "Invalid DB specified: #{ENV['DB']}" %>
 <% end %>

data/lib/generators/spree/dummy/templates/rails/storage.yml

@@ -0,0 +1,3 @@
+test:
+  service: Disk
+  root: <%= File.expand_path("#{dummy_path}/tmp/storage", destination_root) %>

data/lib/generators/spree/dummy/templates/rails/test.rb

@@ -29,6 +29,8 @@ Dummy::Application.configure do
   config.action_mailer.delivery_method = :test
   ActionMailer::Base.default from: "solidus@example.com"
 
+  config.active_storage.service = :test
+
   # Raise on deprecation warnings
   if ENV['SOLIDUS_RAISE_DEPRECATIONS'].present?
     Spree::Deprecation.behavior = :raise