Merge branch 'main' of https://github.com/apsislabs/slayer_rails

Author: wkirby

.github/workflows/test.yml

@@ -12,12 +12,12 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: ['2.7']
+        ruby-version: ['3.3', '3.2', '3.1', '3.0', '2.7']
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Ruby
-        uses: ruby/setup-ruby@359bebbc29cbe6c87da6bc9ea3bc930432750108
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
       - name: Install dependencies
@@ -28,4 +28,6 @@ jobs:
       - name: Rubocop
         run: rubocop
       - name: Run tests
-        run: bundle exec appraisal rspec
+        run: |
+          RAILS_ENV=test bundle exec rake dummy:db:schema:load
+          bundle exec appraisal rspec

Appraisals

@@ -1,11 +1,16 @@
 # frozen_string_literal: true
 
 appraise 'rails_6.1' do
-  gem 'rails', '6.1'
+  gem 'rails', '~> 6.1'
   gem 'tzinfo-data'
 end
 
 appraise 'rails_7.0' do
-  gem 'rails', '7.0'
+  gem 'rails', '~> 7.0'
+  gem 'tzinfo-data'
+end
+
+appraise 'rails_7.1' do
+  gem 'rails', '~> 7.1'
   gem 'tzinfo-data'
 end

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.7-buster
+FROM ruby:3.2-buster
 
 RUN apt-get update -qq && apt-get install -y --no-install-recommends \
   build-essential \

bin/ssh_to_container

@@ -0,0 +1,3 @@
+#! /bin/bash
+
+docker-compose exec ruby bash

gemfiles/rails_6.1.gemfile

@@ -1,15 +1,13 @@
-# frozen_string_literal: true
-
 # This file was generated by Appraisal
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'appraisal'
-gem 'byebug'
-gem 'nokogiri'
-gem 'rails', '6.1'
-gem 'rspec-rails'
-gem 'sqlite3'
-gem 'tzinfo-data'
+gem "appraisal"
+gem "byebug"
+gem "nokogiri"
+gem "rspec-rails"
+gem "sqlite3"
+gem "tzinfo-data"
+gem "rails", "~> 6.1"
 
-gemspec path: '../'
+gemspec path: "../"

gemfiles/rails_7.0.gemfile

@@ -1,15 +1,13 @@
-# frozen_string_literal: true
-
 # This file was generated by Appraisal
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'appraisal'
-gem 'byebug'
-gem 'nokogiri'
-gem 'rails', '7.0'
-gem 'rspec-rails'
-gem 'sqlite3'
-gem 'tzinfo-data'
+gem "appraisal"
+gem "byebug"
+gem "nokogiri"
+gem "rspec-rails"
+gem "sqlite3"
+gem "tzinfo-data"
+gem "rails", "~> 7.0"
 
-gemspec path: '../'
+gemspec path: "../"

gemfiles/rails_7.1.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "byebug"
+gem "nokogiri"
+gem "rspec-rails"
+gem "sqlite3"
+gem "tzinfo-data"
+gem "rails", "~> 7.1"
+
+gemspec path: "../"

lib/slayer_rails/extensions/translation.rb

@@ -7,13 +7,13 @@ module Translation
 
       # rubocop:disable Metrics/BlockLength
       included do
-        def translate(key, options = {})
-          I18n.translate(self.class.full_key(key), options.dup)
+        def translate(key, **options)
+          I18n.translate(self.class.full_key(key), **options)
         end
         alias_method :t, :translate
 
-        def localize(*args)
-          I18n.localize(*args)
+        def localize(*args, **kwargs)
+          I18n.localize(*args, **kwargs)
         end
         alias_method :l, :localize
 

slayer_rails.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'rails', '>= 4.2.0'
-  spec.add_runtime_dependency 'slayer', '>= 0.5.0'
+  spec.add_runtime_dependency 'slayer', '>= 0.5'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 12.0'

spec/dummy/application.rb

@@ -21,12 +21,6 @@ class Application < Rails::Application
     config.paths['log'] = 'tmp/log/development.log'
     config.paths.add 'config/routes.rb', with: "#{APP_ROOT}/config/routes.rb"
 
-    if Rails.version.match?(/^6.0/)
-      config.active_record.sqlite3.represent_boolean_as_integer = true
-    else
-      config.active_record.legacy_connection_handling = false
-    end
-
     def require_environment!
       initialize!
     end