Merge pull request #14 from locomote/add_rails_71_72_80_support

dxg · web-flow · commit a6e03b04db8f · 2025-04-22T15:17:50.000+02:00
Add Rails 7.1, 7.2 &amp; 8.0 support
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,64 @@
+name: ci
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+
+env:
+  RAILS_ENV: test
+
+jobs:
+  not-a-draft-pr:
+    name: Continue if not draft PR
+    if: github.event.pull_request.draft == false
+    runs-on: ubuntu-latest
+    steps:
+      - run: exit 0
+
+  test:
+    name: Tests for version
+    needs: not-a-draft-pr
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+
+    strategy:
+      fail-fast: false
+      matrix:
+        rails-version: ['~> 7.0.1', '~> 7.1.0', '~> 7.2.0', '~> 8.0.0']
+        ruby-version: ['3.1.7', '3.2.8', '3.3.8', '3.4.3']
+        exclude:
+          - rails-version: '~> 8.0.0'
+            ruby-version: '3.1.7'
+          - rails-version: '~> 7.0.1'
+            ruby-version: '3.4.3'
+
+    env:
+      CI_RAILS_VERSION: ${{ matrix.rails-version }}
+      CI_RUBY_VERSION: ${{ matrix.ruby-version }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+
+      - name: Bundle
+        run: bundle install
+
+      - name: Run tests
+        run: bundle exec rake spec
+
+  # This is required to make requiring status checks easy in Github branch protection rules
+  test-success:
+    name: Tests
+    if: github.event.pull_request.draft == false
+    runs-on: ubuntu-latest
+    needs: test
+    steps:
+      - name: Check build matrix status
+        if: ${{ needs.test.result != 'success' }}
+        run: exit 1
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,67 +1,82 @@
 PATH
   remote: .
   specs:
-    translations_checker (2.0.0)
-      activesupport (~> 7.0.0)
+    translations_checker (2.1.0)
+      activesupport (~> 7)
       concurrent-ruby (= 1.3.4)
       naught (~> 1.1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.8.7)
+    activesupport (7.1.5.1)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
+      mutex_m
+      securerandom (>= 0.3)
       tzinfo (~> 2.0)
     ast (2.3.0)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
+    base64 (0.2.0)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
     codeclimate-engine-rb (0.4.1)
       virtus (~> 1.0)
-    coderay (1.1.2)
+    coderay (1.1.3)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     concurrent-ruby (1.3.4)
+    connection_pool (2.5.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.4.4)
+    diff-lcs (1.6.1)
+    drb (2.2.1)
     equalizer (0.0.11)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    method_source (0.9.0)
+    logger (1.7.0)
+    method_source (1.1.0)
     minitest (5.25.5)
+    mutex_m (0.3.0)
     naught (1.1.0)
     parallel (1.12.0)
     parser (2.4.0.2)
       ast (~> 2.3)
     powerpack (0.1.1)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
+    pry (0.15.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     rainbow (2.2.2)
       rake
     rake (12.3.3)
     reek (4.7.3)
       codeclimate-engine-rb (~> 0.4.0)
       parser (>= 2.4.0.0, < 2.5)
       rainbow (~> 2.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.3)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.2)
     rubocop (0.51.0)
       parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
@@ -70,6 +85,7 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.9.0)
+    securerandom (0.4.1)
     thread_safe (0.3.6)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -84,11 +100,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 2.4.22)
-  pry (~> 0.11.3)
+  bundler (~> 2.4)
+  pry (~> 0.15.2)
   rake (>= 12.3)
   reek (~> 4.7.3)
-  rspec (>= 3.7.0)
+  rspec (>= 3.13.0)
   rubocop (~> 0.51.0)
   translations_checker!
 
diff --git a/lib/translations_checker/version.rb b/lib/translations_checker/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TranslationsChecker
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end
diff --git a/spec/lib/translations_checker/diff_block_spec.rb b/spec/lib/translations_checker/diff_block_spec.rb
@@ -20,8 +20,8 @@
 
       it "returns the changes" do
         changes = [ double(:first_change), double(:second_change) ]
-        allow(TranslationsChecker::Change).to receive(:new).with(file_diff, "key_1", "-" => 8, "+" => 4).and_return changes[0]
-        allow(TranslationsChecker::Change).to receive(:new).with(file_diff, "key_2", "-" => 9, "+" => 5).and_return changes[1]
+        allow(TranslationsChecker::Change).to receive(:new).with(file_diff, "key_1", { "-" => 8, "+" => 4 }).and_return changes[0]
+        allow(TranslationsChecker::Change).to receive(:new).with(file_diff, "key_2", { "-" => 9, "+" => 5 }).and_return changes[1]
         expect(diff_block.changes).to eq changes
       end
     end
@@ -40,8 +40,8 @@
 
       it "returns the changes" do
         changes = [ double(:first_change), double(:second_change) ]
-        allow(TranslationsChecker::Change).to receive(:new).with(file_diff, "key/1", "-" => 8, "+" => 4).and_return changes[0]
-        allow(TranslationsChecker::Change).to receive(:new).with(file_diff, "key/2", "-" => 9, "+" => 5).and_return changes[1]
+        allow(TranslationsChecker::Change).to receive(:new).with(file_diff, "key/1", { "-" => 8, "+" => 4 }).and_return changes[0]
+        allow(TranslationsChecker::Change).to receive(:new).with(file_diff, "key/2", { "-" => 9, "+" => 5 }).and_return changes[1]
         expect(diff_block.changes).to eq changes
       end
     end
@@ -57,7 +57,7 @@
 
       it "returns the changes" do
         change = double(:change)
-        allow(TranslationsChecker::Change).to receive(:new).with(file_diff, "key", "-" => 6).and_return change
+        allow(TranslationsChecker::Change).to receive(:new).with(file_diff, "key", { "-" => 6 }).and_return change
         expect(diff_block.changes).to eq [ change ]
       end
     end
@@ -73,7 +73,7 @@
 
       it "returns the changes" do
         change = double(:change)
-        allow(TranslationsChecker::Change).to receive(:new).with(file_diff, "key", "+" => 5).and_return change
+        allow(TranslationsChecker::Change).to receive(:new).with(file_diff, "key", { "+" => 5 }).and_return change
         expect(diff_block.changes).to eq [ change ]
       end
     end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,5 +1,6 @@
 require "bundler/setup"
 require "translations_checker"
+require "pry"
 
 RSpec.configure do |config|
   # Enable flags like --only-failures and --next-failure
diff --git a/translations_checker.gemspec b/translations_checker.gemspec
@@ -19,16 +19,17 @@ Gem::Specification.new do |spec|
   spec.executables   = %w(translations_checker)
   spec.require_paths = %w(lib)
 
-  spec.required_ruby_version = ">= 3.1.0"
+  # Rails 8 requires >= 3.2
+  spec.required_ruby_version = ENV["CI_RUBY_VERSION"] || "~> 3.1"
 
-  spec.add_runtime_dependency "activesupport", "~> 7.0.0"
+  spec.add_runtime_dependency "activesupport", ENV["CI_RAILS_VERSION"] || "~> 7"
   spec.add_runtime_dependency "naught", "~> 1.1.0"
   spec.add_runtime_dependency 'concurrent-ruby', '1.3.4'
 
-  spec.add_development_dependency "bundler", "~> 2.4.22"
-  spec.add_development_dependency "pry", "~> 0.11.3"
+  spec.add_development_dependency "bundler", "~> 2.4"
+  spec.add_development_dependency "pry", "~> 0.15.2"
   spec.add_development_dependency "rake", ">= 12.3"
   spec.add_development_dependency "reek", "~> 4.7.3"
-  spec.add_development_dependency "rspec", ">= 3.7.0"
+  spec.add_development_dependency "rspec", ">= 3.13.0"
   spec.add_development_dependency "rubocop", "~> 0.51.0"
 end
