Merge branch 'shioyama:master' into fix_active_record_table_backend

.github/workflows/ci.yml

@@ -28,27 +28,17 @@ jobs:
           - '3.2'
           - '3.1'
           - '3.0'
-          - '2.7'
-          - '2.6'
         database:
           - 'sqlite3'
           - 'mysql'
           - 'postgres'
         orm:
-          - name: 'active_record'
-            version: '4.2'
-          - name: 'active_record'
-            version: '5.0'
-          - name: 'active_record'
-            version: '5.1'
-          - name: 'active_record'
-            version: '5.2'
-          - name: 'active_record'
-            version: '6.0'
           - name: 'active_record'
             version: '6.1'
           - name: 'active_record'
             version: '7.0'
+          - name: 'active_record'
+            version: '7.1'
           - name: 'sequel'
             version: '5'
         experimental: [false]
@@ -66,14 +56,6 @@ jobs:
             feature: 'unit'
             orm:
             experimental: false
-          - ruby: '2.7'
-            feature: 'unit'
-            orm:
-            experimental: false
-          - ruby: '2.6'
-            feature: 'unit'
-            orm:
-            experimental: false
           - ruby: '3.2'
             feature: 'rails'
             orm:
@@ -155,126 +137,6 @@ jobs:
           - ruby: '3.0'
             feature: 'i18n_fallbacks'
             experimental: false
-          - ruby: '3.0'
-            database: 'sqlite3'
-            feature: 'unit'
-            orm:
-              name: 'active_record'
-              version: 'edge'
-            experimental: true
-          - ruby: '3.0'
-            database: 'mysql'
-            feature: 'unit'
-            orm:
-              name: 'active_record'
-              version: 'edge'
-            experimental: true
-          - ruby: '3.0'
-            database: 'postgres'
-            feature: 'unit'
-            orm:
-              name: 'active_record'
-              version: 'edge'
-            experimental: true
-          - ruby: '2.7'
-            feature: 'rails'
-            orm:
-              name: 'active_record'
-              version: '7.0'
-            database: 'sqlite3'
-            experimental: false
-          - ruby: '2.7'
-            feature: 'performance'
-            experimental: false
-          - ruby: '2.7'
-            feature: 'i18n_fallbacks'
-            experimental: false
-          - ruby: '2.7'
-            database: 'sqlite3'
-            feature: 'unit'
-            orm:
-              name: 'active_record'
-              version: 'edge'
-            experimental: true
-          - ruby: '2.7'
-            database: 'mysql'
-            feature: 'unit'
-            orm:
-              name: 'active_record'
-              version: 'edge'
-            experimental: true
-          - ruby: '2.7'
-            database: 'postgres'
-            feature: 'unit'
-            orm:
-              name: 'active_record'
-              version: 'edge'
-            experimental: true
-        exclude:
-          - ruby: '2.6'
-            orm:
-              name: 'active_record'
-              version: '7.0'
-          - ruby: '2.7'
-            orm:
-              name: 'active_record'
-              version: '4.2'
-          - ruby: '3.0'
-            orm:
-              name: 'active_record'
-              version: '4.2'
-          - ruby: '3.0'
-            orm:
-              name: 'active_record'
-              version: '5.0'
-          - ruby: '3.0'
-            orm:
-              name: 'active_record'
-              version: '5.1'
-          - ruby: '3.0'
-            orm:
-              name: 'active_record'
-              version: '5.2'
-          - ruby: '3.1'
-            orm:
-              name: 'active_record'
-              version: '4.2'
-          - ruby: '3.1'
-            orm:
-              name: 'active_record'
-              version: '5.0'
-          - ruby: '3.1'
-            orm:
-              name: 'active_record'
-              version: '5.1'
-          - ruby: '3.1'
-            orm:
-              name: 'active_record'
-              version: '5.2'
-          - ruby: '3.1'
-            orm:
-              name: 'active_record'
-              version: '6.0'
-          - ruby: '3.2'
-            orm:
-              name: 'active_record'
-              version: '4.2'
-          - ruby: '3.2'
-            orm:
-              name: 'active_record'
-              version: '5.0'
-          - ruby: '3.2'
-            orm:
-              name: 'active_record'
-              version: '5.1'
-          - ruby: '3.2'
-            orm:
-              name: 'active_record'
-              version: '5.2'
-          - ruby: '3.2'
-            orm:
-              name: 'active_record'
-              version: '6.0'
 
     env:
       DB: ${{ matrix.database }}
@@ -304,7 +166,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Update packages
         run: sudo apt-get update
       - name: Install Sqlite
@@ -314,7 +176,7 @@ jobs:
         run: sudo apt-get install libpq-dev postgresql-client -y
         if: matrix.database == 'postgres'
       - id: cache-bundler
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: vendor/bundle
           key: ${{ matrix.ruby }}-${{ matrix.orm.name }}-${{ matrix.orm.version }}-${{ matrix.feature }}-${{ hashFiles('mobility.gemspec') }}-${{ hashFiles('Gemfile') }}

CHANGELOG.md

@@ -2,6 +2,29 @@
 
 ## 1.3
 
+### (unreleased)
+
+- Allow `I18n.available_locales` to contain Strings
+  ([#612](https://github.com/shioyama/mobility/pull/612))
+
+### 1.3.0.rc3
+
+- Don't try to load generators if Rails is loaded but AR is not
+  ([#627](https://github.com/shioyama/mobility/pull/627)), thanks
+  [flop](https://github.com/flop)!
+- Allow compound foreign keys
+  ([#632](https://github.com/shioyama/mobility/pull/632)), thanks
+  [mival](https://github.com/mival)!
+- Fix active model `*_previously_changed?` and active record
+  `will_save_change_to_*?` and `saved_change_to_*?` dirty methods to accept
+  kwargs ([#639](https://github.com/shioyama/mobility/pull/639)) thanks
+  [doits](https://github.com/doits)!
+
+### 1.3.0.rc2
+
+- Pass `coder` as keyword argument to `serialize` (ActiveRecord version > 7.1)
+  ([#617](https://github.com/shioyama/mobility/pull/617))
+
 ### 1.3.0.rc1
 
 This version includes potentially breaking chnages for jsonb and hstore

Gemfile

@@ -10,7 +10,7 @@ group :development, :test do
   when 'active_record'
     orm_version ||= '7.0'
     case orm_version
-    when '4.2', '5.0', '5.1', '5.2', '6.0', '6.1', '7.0'
+    when '6.1', '7.0', '7.1'
       gem 'activerecord', "~> #{orm_version}.0"
     when 'edge'
       git 'https://github.com/rails/rails.git', branch: 'main' do

README.md

@@ -4,7 +4,6 @@ Mobility
 [![Gem Version](https://badge.fury.io/rb/mobility.svg)][gem]
 [![Build Status](https://github.com/shioyama/mobility/workflows/CI/badge.svg)][actions]
 [![Code Climate](https://api.codeclimate.com/v1/badges/72200f2b00c339ec4537/maintainability.svg)][codeclimate]
-[![Gitter Chat](https://badges.gitter.im/mobility-ruby/mobility.svg)](https://gitter.im/mobility-ruby/mobility)
 
 [gem]: https://rubygems.org/gems/mobility
 [actions]: https://github.com/shioyama/mobility/actions
@@ -55,17 +54,13 @@ Installation
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'mobility', '~> 1.3.0.rc1'
+gem 'mobility', '~> 1.3.0.rc3'
 ```
 
 ### ActiveRecord (Rails)
 
 Requirements:
-- ActiveRecord >= 5.0 (including 6.x)
-
-(Support for most backends and features is also supported with
-ActiveRecord/Rails 4.2, but there are some tests still failing. To see exactly
-what might not work, check pending specs in Rails 4.2 builds.)
+- ActiveRecord >= 6.1
 
 To translate attributes on a model, extend `Mobility`, then call `translates`
 passing in one or more attributes as well as a hash of options (see below).
@@ -1027,6 +1022,7 @@ Integrations
 * [mobility-actiontext](https://github.com/sedubois/mobility-actiontext): Translate
   Rails [Action Text](https://guides.rubyonrails.org/action_text_overview.html) rich text
   with Mobility.
+* [mobility_typed](https://github.com/GeorgeGorbanev/mobility_typed): Add type checking to Rails models accessors.
 
 Tutorials
 ---------

certs/shioyama.pem

@@ -1,26 +1,26 @@
 -----BEGIN CERTIFICATE-----
 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
-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
+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
-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
+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
 -----END CERTIFICATE-----

lib/mobility.rb

@@ -90,7 +90,7 @@ class Error < StandardError
   CALL_COMPILABLE_REGEXP = /\A[a-zA-Z_]\w*[!?]?\z/
   private_constant :CALL_COMPILABLE_REGEXP
 
-  require "rails/generators/mobility/generators" if defined?(Rails)
+  require "rails/generators/mobility/generators" if defined?(Rails) && defined?(ActiveRecord)
 
   class << self
     def extended(model_class)
@@ -228,9 +228,9 @@ def enforce_available_locales!(locale)
     #   methods (in LocaleAccessors) than is really necessary.
     def available_locales
       if defined?(Rails) && Rails.respond_to?(:application) && Rails.application
-        Rails.application.config.i18n.available_locales&.map(&:to_sym) || I18n.available_locales
+        Rails.application.config.i18n.available_locales&.map(&:to_sym) || I18n.available_locales.map(&:to_sym)
       else
-        I18n.available_locales
+        I18n.available_locales.map(&:to_sym)
       end
     end
 

lib/mobility/backends/active_record/serialized.rb

@@ -51,7 +51,13 @@ def self.build_node(attr, _locale)
 
       setup do |attributes, options|
         coder = { yaml: YAMLCoder, json: JSONCoder }[options[:format]]
-        attributes.each { |attribute| serialize (options[:column_affix] % attribute), coder }
+        attributes.each do |attribute|
+          if (::ActiveRecord::VERSION::STRING >= "7.1")
+            serialize (options[:column_affix] % attribute), coder: coder
+          else
+            serialize (options[:column_affix] % attribute), coder
+          end
+        end
       end
 
       # @!group Cache Methods

lib/mobility/backends/active_record/table.rb

@@ -109,7 +109,13 @@ def configure(options)
             options[:association_name] = :translations
             options[:subclass_name] ||= :Translation
           end
-          %i[foreign_key association_name subclass_name table_name].each { |key| options[key] = options[key].to_sym }
+          %i[foreign_key association_name subclass_name table_name].each { |key|
+          if options[key].is_a?(Enumerable)
+              options[key] = options[key].map!(&:to_sym)
+            else
+              options[key] = options[key].to_sym
+            end
+          }
         end
         # @!endgroup