Merge pull request #103 from SuperGoodSoft/alistair/ci-check

Fix CI

Author: jarednorman

.git-blame-ignore-revs

@@ -0,0 +1,3 @@
+# .git-blame-ignore-revs
+# Convert to standardrb
+18cd5bfae471a37917a8e4cb8cad341067716648

.github/workflows/lint.yml

@@ -22,4 +22,4 @@ jobs:
           ruby-version: "3.4"
           bundler-cache: true
       - name: Lint Ruby files
-        run: bundle exec rubocop -ESP
+        run: bundle exec standardrb

.github/workflows/test.yml

@@ -22,33 +22,20 @@ jobs:
           - "7.2"
           - "8.0"
         ruby-version:
-          - "3.2"
+          - "3.3"
           - "3.4"
         solidus-branch:
-          - "v4.1"
-          - "v4.2"
-          - "v4.3"
           - "v4.4"
           - "v4.5"
+          - "v4.6"
+          - "main"
         database:
           - "postgresql"
           - "mysql"
           - "sqlite"
         exclude:
-          - rails-version: "7.2"
-            solidus-branch: "v4.3"
-          - rails-version: "7.2"
-            solidus-branch: "v4.2"
-          - rails-version: "7.2"
-            solidus-branch: "v4.1"
-          - ruby-version: "3.4"
-            rails-version: "7.0"
-          - ruby-version: "3.2"
-            rails-version: "8.0"
-          - solidus-branch: "v4.3"
-            rails-version: "8.0"
-          - solidus-branch: "v4.4"
-            rails-version: "8.0"
+          - rails-version: "8.0"
+            solidus-branch: "v4.4"
     steps:
       - uses: actions/checkout@v4
       - name: Run extension tests

.rubocop.yml

@@ -1,17 +1,5 @@
 require:
-  - solidus_dev_support/rubocop
+  - standard
 
-AllCops:
-  NewCops: disable
-
-Rails/SkipsModelValidations:
-  Enabled: false
-
-RSpec/MultipleExpectations:
-  Enabled: false
-
-RSpec/MultipleMemoizedHelpers:
-  Enabled: false
-
-RSpec/NestedGroups:
-  Max: 4
+inherit_gem:
+  standard: config/base.yml

Gemfile

@@ -1,32 +1,40 @@
 # frozen_string_literal: true
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-branch = ENV.fetch('SOLIDUS_BRANCH', 'main')
-solidus_git, solidus_frontend_git = if (branch == 'main') || (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")
 
-# Needed to help Bundler figure out how to resolve dependencies,
-# otherwise it takes forever to resolve them.
-# See https://github.com/bundler/bundler/issues/6677
-gem 'rails', '>0.a'
+gem "solidus", github: "solidusio/solidus", branch: branch
+
+# The `solidus_frontend` gem is deprecated and isn't expected to have major
+# version updates after v3.2.
+if branch >= "v3.2"
+  gem "solidus_frontend"
+elsif branch == "main"
+  gem "solidus_frontend", github: "solidusio/solidus_frontend", branch: branch
+else
+  gem "solidus_frontend", github: "solidusio/solidus", branch: branch
+end
+
+rails_requirement_string = ENV.fetch("RAILS_VERSION", "~> 8.0")
+gem "rails", rails_requirement_string
+
+gem "state_machines", "0.6.0"
 
 # Provides basic authentication functionality for testing parts of your engine
-gem 'solidus_auth_devise'
+gem "solidus_auth_devise"
 
-case ENV['DB']
-when 'mysql'
-  gem 'mysql2'
-when 'postgresql'
-  gem 'pg'
+case ENV["DB"]
+when "mysql"
+  gem "mysql2"
+when "postgresql"
+  gem "pg"
 else
-  gem 'sqlite3'
+  rails_version = Gem::Requirement.new(rails_requirement_string).requirements[0][1]
+  sqlite_version = (rails_version < Gem::Version.new(7.2)) ? "~> 1.4" : "~> 2.0"
+
+  gem "sqlite3", sqlite_version
 end
 
 gemspec
@@ -36,4 +44,4 @@ gemspec
 #
 # We use `send` instead of calling `eval_gemfile` to work around an issue with
 # how Dependabot parses projects: https://github.com/dependabot/dependabot-core/issues/1658.
-send(:eval_gemfile, 'Gemfile-local') if File.exist? 'Gemfile-local'
+send(:eval_gemfile, "Gemfile-local") if File.exist? "Gemfile-local"

README.md

@@ -177,10 +177,10 @@ bin/setup
 bin/rake
 ```
 
-To run [Rubocop](https://github.com/bbatsov/rubocop) static code analysis run
+To run [Standard](https://github.com/standardrb/standard)
 
 ```shell
-bundle exec rubocop
+bundle exec standardrb --fix
 ```
 
 When testing your application's integration with this extension you may use its factories.

Rakefile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'solidus_dev_support/rake_tasks'
+require "solidus_dev_support/rake_tasks"
 SolidusDevSupport::RakeTasks.install
 
-task default: 'extension:specs'
+task default: "extension:specs"

app/controllers/spree/admin/solidus_importer/import_rows_controller.rb

@@ -6,7 +6,8 @@ module SolidusImporter
       class ImportRowsController < BaseController
         before_action :load_data, only: %i[show]
 
-        def show; end
+        def show
+        end
 
         private
 
@@ -15,8 +16,8 @@ def load_data
           return unless (@log_entry = ::Spree::LogEntry.find_by(source: @import_row))
 
           @log_details = JSON.parse(@log_entry.details)
-          target_class = @log_details['class_name']&.constantize
-          @target_entity = target_class.find_by(id: @log_details['id']) if target_class
+          target_class = @log_details["class_name"]&.constantize
+          @target_entity = target_class.find_by(id: @log_details["id"]) if target_class
         end
       end
     end

app/controllers/spree/admin/solidus_importer/imports_controller.rb

@@ -10,9 +10,9 @@ class ImportsController < ResourceController
         def index
           @search = ::SolidusImporter::Import.ransack(params[:q])
           @imports = @search.result(distinct: true)
-                            .page(params[:page])
-                            .per(params[:per_page] || Spree::Config[:orders_per_page])
-                            .order(id: :desc)
+            .page(params[:page])
+            .per(params[:per_page] || Spree::Config[:orders_per_page])
+            .order(id: :desc)
         end
 
         def show

app/jobs/solidus_importer/import_job.rb

@@ -7,7 +7,7 @@ class ImportJob < ApplicationJob
     retry_on ActiveRecord::Deadlocked
 
     def perform(source, import_type = nil)
-      raise ArgumentError, 'Missing import source' unless source
+      raise ArgumentError, "Missing import source" unless source
 
       if source.is_a?(Integer)
         perform_import_from_model(source)