Merge pull request #102 from SuperGoodSoft/alistair/rails-7-gh-actions

Add Rails 7 support and switch to GH actions

Author: jarednorman

.circleci/config.yml

@@ -0,0 +1,25 @@
+name: Lint
+
+on: [pull_request]
+
+concurrency:
+  group: lint-${{ github.ref_name }}
+  cancel-in-progress: ${{ github.ref_name != 'master' }}
+
+permissions:
+  contents: read
+
+jobs:
+  ruby:
+    name: Check Ruby
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Install Ruby and gems
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.4"
+          bundler-cache: true
+      - name: Lint Ruby files
+        run: bundle exec rubocop -ESP

.github/workflows/lint.yml

@@ -0,0 +1,66 @@
+name: Test
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+  schedule:
+    - cron: "0 0 * * 4" # every Thursday
+concurrency:
+  group: test-${{ github.ref_name }}
+  cancel-in-progress: ${{ github.ref_name != 'master' }}
+permissions:
+  contents: read
+jobs:
+  rspec:
+    name: Solidus ${{ matrix.solidus-branch }}, Rails ${{ matrix.rails-version }} and Ruby ${{ matrix.ruby-version }} on ${{ matrix.database }}
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: true
+      matrix:
+        rails-version:
+          - "7.2"
+          - "8.0"
+        ruby-version:
+          - "3.2"
+          - "3.4"
+        solidus-branch:
+          - "v4.1"
+          - "v4.2"
+          - "v4.3"
+          - "v4.4"
+          - "v4.5"
+        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"
+    steps:
+      - uses: actions/checkout@v4
+      - name: Run extension tests
+        uses: solidusio/test-solidus-extension@main
+        with:
+          database: ${{ matrix.database }}
+          rails-version: ${{ matrix.rails-version }}
+          ruby-version: ${{ matrix.ruby-version }}
+          solidus-branch: ${{ matrix.solidus-branch }}
+      - name: Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v5
+        continue-on-error: true
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: ./coverage/coverage.xml

.github/workflows/test.yml

@@ -10,13 +10,21 @@ class Import < ApplicationRecord
       class_name: 'SolidusImporter::Row',
       inverse_of: :import,
       dependent: :destroy
-
-    enum state: {
-      created: 'created',
-      processing: 'processing',
-      failed: 'failed',
-      completed: 'completed'
-    }
+    if Rails.gem_version >= Gem::Version.new('7.1')
+      enum :state, {
+        created: 'created',
+        processing: 'processing',
+        failed: 'failed',
+        completed: 'completed'
+      }
+    else
+      enum state: {
+        created: 'created',
+        processing: 'processing',
+        failed: 'failed',
+        completed: 'completed'
+      }
+    end
 
     has_attached_file :file
 

app/models/solidus_importer/import.rb

@@ -8,14 +8,23 @@ class Row < ApplicationRecord
       class_name: 'SolidusImporter::Import',
       inverse_of: :rows
 
-    serialize :data, JSON
-
-    enum state: {
-      created: 'created',
-      processing: 'processing',
-      failed: 'failed',
-      completed: 'completed'
-    }
+    if Rails.gem_version >= Gem::Version.new('7.1')
+      serialize :data, coder: JSON
+      enum :state, {
+        created: 'created',
+        processing: 'processing',
+        failed: 'failed',
+        completed: 'completed'
+      }
+    else
+      serialize :data, JSON
+      enum state: {
+        created: 'created',
+        processing: 'processing',
+        failed: 'failed',
+        completed: 'completed'
+      }
+    end
 
     scope :created_or_failed, -> { where(state: %i[created failed]) }
     scope :failed_or_completed, -> { where(state: %i[failed completed]) }

app/models/solidus_importer/order_updater.rb

@@ -38,14 +38,18 @@ def self.import(user, params)
         end
 
         # Really ensure that the order totals & states are correct
-        updater = SolidusImporter::OrderUpdater.new(order)
-        updater.update
+        tax_adjuster_class = Spree::Config.tax_adjuster_class
+        Spree::Config.tax_adjuster_class = SolidusImporter::Tax::NullOrderAdjuster
+
+        order.updater.update
         if shipments_attrs.present?
           order.shipments.each_with_index do |shipment, index|
             shipment.update_columns(cost: shipments_attrs[index][:cost].to_f) if shipments_attrs[index][:cost].present?
           end
         end
         order.reload
+
+        Spree::Config.tax_adjuster_class = tax_adjuster_class
       end
     end
   end

app/models/solidus_importer/row.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module SolidusImporter
+  module Tax
+    class NullOrderAdjuster
+      attr_reader :order
+
+      def initialize(order)
+        @order = order
+      end
+
+      def adjust!
+      end
+    end
+  end
+end