mobility 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b22675841d6b6330a4db417e3576767b42a81614b80cf376a208088ad9432de4
-  data.tar.gz: 1b2c44b38c87fc0b1e8ca5e463e9c265c09f0d307d0d663ba3aa39b6b5ca771b
+  metadata.gz: c5cedc8fabef42f478f93a4bb4fa1e8764759855dcded4d25f397c018f1811d2
+  data.tar.gz: 1fb647fdbcbafa3b8a5a6d47d71500e2481556aa72674c5269ea0dc560d63ca0
 SHA512:
-  metadata.gz: 708d6ba16ec279e6a114abc811d107aa759590c711ca389d7f4b86407e100fbaed30a38b7b787ef98008291c480715949b0d4562efc2d5120eba73587fc375db
-  data.tar.gz: bd8f79dd23f7c482292c011bb800d7db20dc3b1fb06797b53fdf91ecdb9c9895c1634e3b1da06e90cff4e7b32e4aa5ebdf8f5d8b5c76f1fafbc08ca891ac99dc
+  metadata.gz: ee138cb5544fc8942dc8a6dbf7fcfd54bf3829329075950755b8fea3ba676c430b880b14366dcfc09b66651b06577957e02130c5b4f2a62d7db96d02f1a150c8
+  data.tar.gz: 980502d8c285bedf8e2958a24cb77c129ee39f1cfb946c44bbd83f7cc89b30009a829bfb17b515aac9e02d3f3a810b1433cab416aabec67c1daab9c6f100683d

data/CHANGELOG.md

@@ -1,7 +1,37 @@
 # Mobility Changelog
 
+## Unreleased
+- Assign blank values in pg hash backends
+  ([#516](https://github.com/shioyama/mobility/pull/516))
+
 ## 1.1
 
+## 1.2
+
+### 1.2.0
+- Add ColumnFallback plugin
+	([#512](https://github.com/shioyama/mobility/pull/512))
+- Fix Sequel querying on untranslated attributes in `i18n` block
+	([#529](https://github.com/shioyama/mobility/pull/529))
+- Allow passing configured backend class as third argument to setup
+	([#528](https://github.com/shioyama/mobility/pull/528))
+- Clearly distinguish backend classes from their configured subclasses
+	([#527](Clearly distinguish backend classes from their configured subclasses))
+
+### 1.1.3
+- Do not swallow keyword args on ruby 3 in fallthrough accessors
+  ([#520](https://github.com/shioyama/mobility/pull/520)) thanks
+  [doits](https://github.com/doits)!
+- Assign blank values in pg hash backends
+  ([#516](https://github.com/shioyama/mobility/pull/516))
+
+### 1.1.2
+- Check whether class responds to mobility_attribute?
+  ([#515](https://github.com/shioyama/mobility/pull/515))
+
+### 1.1.1
+- Updated signing key
+
 ### 1.1.0
 - Remove `Mobility::Plugins::Attributes#each`
   ([#475](https://github.com/shioyama/mobility/pull/475))

data/Gemfile

@@ -12,8 +12,8 @@ group :development, :test do
     case orm_version
     when '4.2', '5.0', '5.1', '5.2', '6.0', '6.1'
       gem 'activerecord', "~> #{orm_version}.0"
-    when '6.2'
-      git 'https://github.com/rails/rails.git' do
+    when '7.0'
+      git 'https://github.com/rails/rails.git', branch: 'main' do
         gem 'activerecord'
         gem 'activesupport'
       end

data/Gemfile.lock

@@ -1,31 +1,20 @@
 PATH
   remote: .
   specs:
-    mobility (1.0.7)
+    mobility (1.2.0.alpha)
       i18n (>= 0.6.10, < 2)
       request_store (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.3.4)
-      activesupport (= 6.0.3.4)
-    activerecord (6.0.3.4)
-      activemodel (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
-    activesupport (6.0.3.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
     benchmark-ips (2.8.4)
     byebug (11.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     database_cleaner (1.99.0)
     diff-lcs (1.4.4)
-    ffi (1.14.2)
+    ffi (1.15.0)
     formatador (0.2.5)
     guard (2.16.2)
       formatador (>= 0.2.4)
@@ -41,14 +30,13 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    i18n (1.8.8)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    listen (3.4.1)
+    listen (3.5.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.2.8)
     method_source (1.0.0)
-    minitest (5.14.3)
     nenv (0.3.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -80,19 +68,15 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
+    sequel (5.48.0)
     shellany (0.0.1)
     thor (1.1.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
     yard (0.9.26)
-    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 6.0.0)
   benchmark-ips
   database_cleaner (~> 1.5, >= 1.5.3)
   guard-rspec
@@ -101,6 +85,7 @@ DEPENDENCIES
   pry-byebug
   rake (~> 12, >= 12.2.1)
   rspec (~> 3.0)
+  sequel (~> 5.0)
   yard (~> 0.9.0)
 
 BUNDLED WITH

data/README.md

@@ -12,7 +12,7 @@ Mobility
 [docs]: http://www.rubydoc.info/gems/mobility
 [wiki]: https://github.com/shioyama/mobility/wiki
 
-**This is the readme for version 1.0 of Mobility. If you are using an earlier
+**This is the readme for version 1.x of Mobility. If you are using an earlier
 version (0.8.x or earlier), you probably want the readme on the [0-8
 branch](https://github.com/shioyama/mobility/tree/0-8).**
 
@@ -55,7 +55,7 @@ Installation
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'mobility', '~> 1.1.0'
+gem 'mobility', '~> 1.2.0'
 ```
 
 ### ActiveRecord (Rails)
@@ -130,9 +130,7 @@ default `type` option for the KeyValue backend to `:string`.
  end
 ```
 
-We will assume the configuration above in the examples that follow. Other
-configuration options are described in the [API
-docs](http://www.rubydoc.info/gems/mobility/Mobility/Configuration).
+We will assume the configuration above in the examples that follow.
 
 See [Getting Started](#quickstart) to get started translating your models.
 
@@ -486,9 +484,7 @@ end
 ```
 
 Internally, Mobility assigns the fallbacks hash to an instance of
-`I18n::Locale::Fallbacks.new` (this can be customized by setting the
-`fallbacks_generator` configuration option, see the [API documentation on
-configuration](http://www.rubydoc.info/gems/mobility/Mobility/Configuration)).
+`I18n::Locale::Fallbacks.new`.
 
 By setting fallbacks for German and French to Japanese, values will fall
 through to the Japanese value if none is present for either of these locales,
@@ -1028,6 +1024,9 @@ Integrations
 * [mobility-ransack](https://github.com/shioyama/mobility-ransack): Search
   attributes translated by Mobility with
   [Ransack](https://github.com/activerecord-hackery/ransack).
+* [mobility-actiontext](https://github.com/sedubois/mobility-actiontext): Translate
+  Rails [Action Text](https://guides.rubyonrails.org/action_text_overview.html) rich text
+  with Mobility.
 
 Tutorials
 ---------

data/lib/mobility/backend.rb

@@ -21,8 +21,8 @@ On top of this, a backend will normally:
   corresponding to valid keys for configuring this backend.
 - implement a +configure+ class method to apply any normalization to the
   keys on the options hash included in +valid_keys+
-- call the +setup+ method yielding attributes and options to configure the
-  model class
+- call the +setup+ method yielding attributes and options (and optionally the
+  configured backend class) to configure the model class
 
 @example Defining a Backend
   class MyBackend
@@ -47,6 +47,13 @@ On top of this, a backend will normally:
     setup do |attributes, options|
       # Do something with attributes and options in context of model class.
     end
+
+    # The block can optionally take the configured backend class as its third
+    # argument:
+    #
+    # setup do |attributes, options, backend_class|
+    #   ...
+    # end
   end
 
 @see Mobility::Translations
@@ -117,7 +124,6 @@ On top of this, a backend will normally:
     # Extend included class with +setup+ method and other class methods
     def self.included(base)
       base.extend ClassMethods
-      base.singleton_class.attr_reader :options, :model_class
     end
 
     # Defines setup hooks for backend to customize model class.
@@ -136,9 +142,11 @@ On top of this, a backend will normally:
       def setup &block
         if @setup_block
           setup_block = @setup_block
-          @setup_block = lambda do |*args|
-            class_exec(*args, &setup_block)
-            class_exec(*args, &block)
+          exec_setup_block = method(:exec_setup_block)
+          @setup_block = lambda do |attributes, options, backend_class|
+            [setup_block, block].each do |blk|
+              exec_setup_block.call(self, attributes, options, backend_class, &blk)
+            end
           end
         else
           @setup_block = block
@@ -147,17 +155,6 @@ On top of this, a backend will normally:
 
       def inherited(subclass)
         subclass.instance_variable_set(:@setup_block, @setup_block)
-        subclass.instance_variable_set(:@options, @options)
-        subclass.instance_variable_set(:@model_class, @model_class)
-      end
-
-      # Call setup block on a class with attributes and options.
-      # @param model_class Class to be setup-ed
-      # @param [Array<String>] attribute_names
-      # @param [Hash] options
-      def setup_model(model_class, attribute_names)
-        return unless setup_block = @setup_block
-        model_class.class_exec(attribute_names, options, &setup_block)
       end
 
       # Build a subclass of this backend class for a given set of options
@@ -167,11 +164,7 @@ On top of this, a backend will normally:
       # @param [Hash] options
       # @return [Class] backend subclass
       def build_subclass(model_class, options)
-        Class.new(self) do
-          @model_class = model_class
-          configure(options) if respond_to?(:configure)
-          @options = options.freeze
-        end
+        ConfiguredBackend.build(self, model_class, options)
       end
 
       # Create instance and class methods to access value on options hash
@@ -188,10 +181,30 @@ On top of this, a backend will normally:
         EOM
       end
 
-      # Show useful information about this backend class, if it has no name.
-      # @return [String]
-      def inspect
-        name ? super : "#<#{superclass.name}>"
+      def options
+        raise_unconfigured!(:options)
+      end
+
+      def model_class
+        raise_unconfigured!(:model_class)
+      end
+
+      def setup_model(_model_class, _attributes)
+        raise_unconfigured!(:setup_model)
+      end
+
+      private
+
+      def raise_unconfigured!(method_name)
+        raise UnconfiguredError, "You are calling #{method_name} on an unconfigured backend class."
+      end
+
+      def exec_setup_block(model_class, *args, &block)
+        if block.arity == 3
+          model_class.class_exec(*args[0..2], &block)
+        else
+          model_class.class_exec(*args[0..1], &block)
+        end
       end
     end
 
@@ -204,5 +217,48 @@ On top of this, a backend will normally:
         backend.write(locale, value, options)
       end
     end
+
+    class ConfiguredError < StandardError; end
+    class UnconfiguredError < StandardError; end
+=begin
+
+Module included in configured backend classes, which in addition to methods on
+the parent backend class also have a +model_class+ and set of +options+.
+
+=end
+    module ConfiguredBackend
+      def self.build(backend_class, model_class, options)
+        Class.new(backend_class) do
+          extend ConfiguredBackend
+
+          @model_class = model_class
+          configure(options) if respond_to?(:configure)
+          @options = options.freeze
+        end
+      end
+
+      def self.extended(klass)
+        klass.singleton_class.attr_reader :options, :model_class
+      end
+
+      # Call setup block on a class with attributes and options.
+      # @param model_class Class to be setup-ed
+      # @param [Array<String>] attribute_names
+      # @param [Hash] options
+      def setup_model(model_class, attribute_names)
+        return unless setup_block = @setup_block
+        exec_setup_block(model_class, attribute_names, options, self, &setup_block)
+      end
+
+      def inherited(_)
+        raise ConfiguredError, "Configured backends cannot be subclassed."
+      end
+
+      # Show subclassed backend class name, if it has one.
+      # @return [String]
+      def inspect
+        (name = superclass.name) ? "#<#{name}>" : super
+      end
+    end
   end
 end

data/lib/mobility/backends/active_record/key_value.rb

@@ -65,6 +65,69 @@ Implements the {Mobility::Backends::KeyValue} backend for ActiveRecord models.
           end
         end
 
+        # Called from setup block. Can be overridden to customize behaviour.
+        def define_has_many_association(klass, attributes)
+          # Track all attributes for this association, so that we can limit the scope
+          # of keys for the association to only these attributes. We need to track the
+          # attributes assigned to the association in case this setup code is called
+          # multiple times, so we don't "forget" earlier attributes.
+          #
+          attrs_method_name = :"__#{association_name}_attributes"
+          association_attributes = (klass.instance_variable_get(:"@#{attrs_method_name}") || []) + attributes
+          klass.instance_variable_set(:"@#{attrs_method_name}", association_attributes)
+
+          b = self
+
+          klass.has_many association_name, ->{ where b.key_column => association_attributes },
+            as: belongs_to,
+            class_name: class_name.name,
+            inverse_of: belongs_to,
+            autosave:   true
+        end
+
+        # Called from setup block. Can be overridden to customize behaviour.
+        def define_initialize_dup(klass)
+          b = self
+          module_name = "MobilityArKeyValue#{association_name.to_s.camelcase}"
+          unless const_defined?(module_name)
+            callback_methods = Module.new do
+              define_method :initialize_dup do |source|
+                super(source)
+                self.send("#{b.association_name}=", source.send(b.association_name).map(&:dup))
+                # Set inverse on associations
+                send(b.association_name).each do |translation|
+                  translation.send(:"#{b.belongs_to}=", self)
+                end
+              end
+            end
+            klass.include const_set(module_name, callback_methods)
+          end
+        end
+
+        # Called from setup block. Can be overridden to customize behaviour.
+        def define_before_save_callback(klass)
+          b = self
+          klass.before_save do
+            send(b.association_name).select { |t| t.send(b.value_column).blank? }.each do |translation|
+              send(b.association_name).destroy(translation)
+            end
+          end
+        end
+
+        # Called from setup block. Can be overridden to customize behaviour.
+        def define_after_destroy_callback(klass)
+          # Ensure we only call after destroy hook once per translations class
+          b = self
+          translation_classes = [class_name, *Mobility::Backends::ActiveRecord::KeyValue::Translation.descendants].uniq
+          klass.after_destroy do
+            @mobility_after_destroy_translation_classes = [] unless defined?(@mobility_after_destroy_translation_classes)
+            (translation_classes - @mobility_after_destroy_translation_classes).each do |translation_class|
+              translation_class.where(b.belongs_to => self).destroy_all
+            end
+            @mobility_after_destroy_translation_classes += translation_classes
+          end
+        end
+
         private
 
         def join_translations(relation, key, locale, join_type)
@@ -149,55 +212,11 @@ Implements the {Mobility::Backends::KeyValue} backend for ActiveRecord models.
         end
       end
 
-      setup do |attributes, options|
-        association_name  = options[:association_name]
-        translation_class = options[:class_name]
-        key_column         = options[:key_column]
-        value_column       = options[:value_column]
-        belongs_to         = options[:belongs_to]
-
-        # Track all attributes for this association, so that we can limit the scope
-        # of keys for the association to only these attributes. We need to track the
-        # attributes assigned to the association in case this setup code is called
-        # multiple times, so we don't "forget" earlier attributes.
-        #
-        attrs_method_name = :"__#{association_name}_attributes"
-        association_attributes = (instance_variable_get(:"@#{attrs_method_name}") || []) + attributes
-        instance_variable_set(:"@#{attrs_method_name}", association_attributes)
-
-        has_many association_name, ->{ where key_column => association_attributes },
-          as: belongs_to,
-          class_name: translation_class.name,
-          inverse_of: belongs_to,
-          autosave:   true
-        before_save do
-          send(association_name).select { |t| t.send(value_column).blank? }.each do |translation|
-            send(association_name).destroy(translation)
-          end
-        end
-
-        module_name = "MobilityArKeyValue#{association_name.to_s.camelcase}"
-        unless const_defined?(module_name)
-          callback_methods = Module.new do
-            define_method :initialize_dup do |source|
-              super(source)
-              self.send("#{association_name}=", source.send(association_name).map(&:dup))
-              # Set inverse on associations
-              send(association_name).each do |translation|
-                translation.send(:"#{belongs_to}=", self)
-              end
-            end
-          end
-          include const_set(module_name, callback_methods)
-        end
-
-        # Ensure we only call after destroy hook once per translations class
-        translation_classes = [translation_class, *Mobility::Backends::ActiveRecord::KeyValue::Translation.descendants].uniq
-        after_destroy do
-          @mobility_after_destroy_translation_classes = [] unless defined?(@mobility_after_destroy_translation_classes)
-          (translation_classes - @mobility_after_destroy_translation_classes).each { |klass| klass.where(belongs_to => self).destroy_all }
-          @mobility_after_destroy_translation_classes += translation_classes
-        end
+      setup do |attributes, _options, backend_class|
+        backend_class.define_has_many_association(self, attributes)
+        backend_class.define_initialize_dup(self)
+        backend_class.define_before_save_callback(self)
+        backend_class.define_after_destroy_callback(self)
       end
 
       # Returns translation for a given locale, or builds one if none is present.

data/lib/mobility/backends/active_record/pg_hash.rb

@@ -32,7 +32,7 @@ Internal class used by ActiveRecord backends backed by a Postgres data type
           def self.dump(obj)
             if obj.is_a? ::Hash
               obj.inject({}) do |translations, (locale, value)|
-                translations[locale] = value if value.present?
+                translations[locale] = value unless value.nil?
                 translations
               end
             else

data/lib/mobility/backends/sequel/container.rb

@@ -57,9 +57,7 @@ Implements the {Mobility::Backends::Container} backend for Sequel models.
         end
       end
 
-      backend = self
-
-      setup do |attributes, options|
+      setup do |attributes, options, backend_class|
         column_name = options[:column_name]
         mod = Module.new do
           define_method :before_validation do
@@ -71,7 +69,7 @@ Implements the {Mobility::Backends::Container} backend for Sequel models.
           end
         end
         include mod
-        backend.define_hash_initializer(mod, [column_name])
+        backend_class.define_hash_initializer(mod, [column_name])
 
         plugin :defaults_setter
         attributes.each { |attribute| default_values[attribute.to_sym] = {} }

data/lib/mobility/backends/sequel/key_value.rb

@@ -51,6 +51,63 @@ Implements the {Mobility::Backends::KeyValue} backend for Sequel models.
           end
         end
 
+        # Called from setup block. Can be overridden to customize behaviour.
+        def define_one_to_many_association(klass, attributes)
+          belongs_to_id     = :"#{belongs_to}_id"
+          belongs_to_type   = :"#{belongs_to}_type"
+
+          # Track all attributes for this association, so that we can limit the scope
+          # of keys for the association to only these attributes. We need to track the
+          # attributes assigned to the association in case this setup code is called
+          # multiple times, so we don't "forget" earlier attributes.
+          #
+          attrs_method_name = :"#{association_name}_attributes"
+          association_attributes = (klass.instance_variable_get(:"@#{attrs_method_name}") || []) + attributes
+          klass.instance_variable_set(:"@#{attrs_method_name}", association_attributes)
+
+          klass.one_to_many association_name,
+            reciprocal:      belongs_to,
+            key:             belongs_to_id,
+            reciprocal_type: :one_to_many,
+            conditions:      { belongs_to_type => klass.to_s, key_column => association_attributes },
+            adder:           proc { |translation| translation.update(belongs_to_id => pk, belongs_to_type => self.class.to_s) },
+            remover:         proc { |translation| translation.update(belongs_to_id => nil, belongs_to_type => nil) },
+            clearer:         proc { send_(:"#{association_name}_dataset").update(belongs_to_id => nil, belongs_to_type => nil) },
+            class:           class_name
+        end
+
+        # Called from setup block. Can be overridden to customize behaviour.
+        def define_save_callbacks(klass, attributes)
+          b = self
+          callback_methods = Module.new do
+            define_method :before_save do
+              super()
+              send(b.association_name).select { |t| attributes.include?(t.__send__(b.key_column)) && Util.blank?(t.__send__(b.value_column)) }.each(&:destroy)
+            end
+            define_method :after_save do
+              super()
+              attributes.each { |attribute| mobility_backends[attribute].save_translations }
+            end
+          end
+          klass.include callback_methods
+        end
+
+        # Called from setup block. Can be overridden to customize behaviour.
+        def define_after_destroy_callback(klass)
+          # Clean up *all* leftover translations of this model, only once.
+          b = self
+          translation_classes = [class_name, *Mobility::Backends::Sequel::KeyValue::Translation.descendants].uniq
+          klass.define_method :after_destroy do
+            super()
+
+            @mobility_after_destroy_translation_classes = [] unless defined?(@mobility_after_destroy_translation_classes)
+            (translation_classes - @mobility_after_destroy_translation_classes).each do |translation_class|
+              translation_class.where(:"#{b.belongs_to}_id" => id, :"#{b.belongs_to}_type" => self.class.name).destroy
+            end
+            @mobility_after_destroy_translation_classes += translation_classes
+          end
+        end
+
         private
 
         def join_translations(dataset, attr, locale, join_type)
@@ -74,7 +131,7 @@ Implements the {Mobility::Backends::KeyValue} backend for Sequel models.
             visit_sql_identifier(predicate, locale)
           when ::Sequel::SQL::BooleanExpression
             visit_boolean(predicate, locale)
-          when ::Sequel::SQL::Expression
+          when ::Sequel::SQL::ComplexExpression
             visit(predicate.args, locale)
           else
             {}
@@ -123,61 +180,13 @@ Implements the {Mobility::Backends::KeyValue} backend for Sequel models.
         end
       end
 
-      backend = self
-
-      setup do |attributes, options|
-        association_name  = options[:association_name]
-        translation_class = options[:class_name]
-        key_column        = options[:key_column]
-        value_column      = options[:value_column]
-        belongs_to        = options[:belongs_to]
-        belongs_to_id     = :"#{belongs_to}_id"
-        belongs_to_type   = :"#{belongs_to}_type"
-
-        # Track all attributes for this association, so that we can limit the scope
-        # of keys for the association to only these attributes. We need to track the
-        # attributes assigned to the association in case this setup code is called
-        # multiple times, so we don't "forget" earlier attributes.
-        #
-        attrs_method_name = :"#{association_name}_attributes"
-        association_attributes = (instance_variable_get(:"@#{attrs_method_name}") || []) + attributes
-        instance_variable_set(:"@#{attrs_method_name}", association_attributes)
-
-        one_to_many association_name,
-          reciprocal:      belongs_to,
-          key:             belongs_to_id,
-          reciprocal_type: :one_to_many,
-          conditions:      { belongs_to_type => self.to_s, key_column => association_attributes },
-          adder:           proc { |translation| translation.update(belongs_to_id => pk, belongs_to_type => self.class.to_s) },
-          remover:         proc { |translation| translation.update(belongs_to_id => nil, belongs_to_type => nil) },
-          clearer:         proc { send_(:"#{association_name}_dataset").update(belongs_to_id => nil, belongs_to_type => nil) },
-          class:           translation_class
-
-        callback_methods = Module.new do
-          define_method :before_save do
-            super()
-            send(association_name).select { |t| attributes.include?(t.__send__(key_column)) && Util.blank?(t.__send__(value_column)) }.each(&:destroy)
-          end
-          define_method :after_save do
-            super()
-            attributes.each { |attribute| mobility_backends[attribute].save_translations }
-          end
-        end
-        include callback_methods
-
-        # Clean up *all* leftover translations of this model, only once.
-        translation_classes = [translation_class, *Mobility::Backends::Sequel::KeyValue::Translation.descendants].uniq
-        define_method :after_destroy do
-          super()
+      setup do |attributes, _options, backend_class|
+        backend_class.define_one_to_many_association(self, attributes)
+        backend_class.define_save_callbacks(self, attributes)
+        backend_class.define_after_destroy_callback(self)
 
-          @mobility_after_destroy_translation_classes = [] unless defined?(@mobility_after_destroy_translation_classes)
-          (translation_classes - @mobility_after_destroy_translation_classes).each do |klass|
-            klass.where(belongs_to_id => id, belongs_to_type => self.class.name).destroy
-          end
-          @mobility_after_destroy_translation_classes += translation_classes
-        end
         include(mod = Module.new)
-        backend.define_column_changes(mod, attributes)
+        backend_class.define_column_changes(mod, attributes)
       end
 
       # Returns translation for a given locale, or initializes one if none is present.

data/lib/mobility/backends/sequel/pg_hash.rb

@@ -33,22 +33,20 @@ jsonb).
           model[column_name.to_sym]
         end
 
-        backend = self
-
-        setup do |attributes, options|
+        setup do |attributes, options, backend_class|
           columns = attributes.map { |attribute| (options[:column_affix] % attribute).to_sym }
 
           mod = Module.new do
             define_method :before_validation do
               columns.each do |column|
-                self[column].delete_if { |_, v| Util.blank?(v) }
+                self[column].delete_if { |_, v| v.nil? }
               end
               super()
             end
           end
           include mod
-          backend.define_hash_initializer(mod, columns)
-          backend.define_column_changes(mod, attributes, column_affix: options[:column_affix])
+          backend_class.define_hash_initializer(mod, columns)
+          backend_class.define_column_changes(mod, attributes, column_affix: options[:column_affix])
 
           plugin :defaults_setter
           columns.each { |column| default_values[column] = {} }

data/lib/mobility/backends/sequel/table.rb

@@ -84,7 +84,7 @@ Implements the {Mobility::Backends::Table} backend for Sequel models.
             visit_sql_identifier(predicate, locale)
           when ::Sequel::SQL::BooleanExpression
             visit_boolean(predicate, locale)
-          when ::Sequel::SQL::Expression
+          when ::Sequel::SQL::ComplexExpression
             visit(predicate.args, locale)
           else
             nil
@@ -116,9 +116,7 @@ Implements the {Mobility::Backends::Table} backend for Sequel models.
         end
       end
 
-      backend = self
-
-      setup do |attributes, options|
+      setup do |attributes, options, backend_class|
         association_name = options[:association_name]
         subclass_name    = options[:subclass_name]
 
@@ -155,7 +153,7 @@ Implements the {Mobility::Backends::Table} backend for Sequel models.
         include callback_methods
 
         include(mod = Module.new)
-        backend.define_column_changes(mod, attributes)
+        backend_class.define_column_changes(mod, attributes)
       end
 
       def translation_for(locale, **)

data/lib/mobility/backends/serialized.rb

@@ -40,7 +40,7 @@ Format for serialization. Either +:yaml+ (default) or +:json+.
             return if obj.nil?
             if obj.is_a? ::Hash
               obj = obj.inject({}) do |translations, (locale, value)|
-                translations[locale] = value.to_s if Util.present?(value)
+                translations[locale] = value.to_s unless value.nil?
                 translations
               end
             else

data/lib/mobility/plugins/active_record/column_fallback.rb

@@ -0,0 +1,139 @@
+# frozen-string-literal: true
+
+module Mobility
+  module Plugins
+=begin
+
+Plugin to use an original column for a given locale, and otherwise use the backend.
+
+=end
+    module ActiveRecord
+      module ColumnFallback
+        extend Plugin
+
+        requires :column_fallback, include: false
+
+        included_hook do |_, backend_class|
+          case (column_fallback = options[:column_fallback])
+          when TrueClass
+            backend_class.include I18nDefaultLocaleBackend
+          when Array, Proc
+            backend_class.include BackendModule.new(column_fallback)
+          else
+            raise ArgumentError, "column_fallback value must be a boolean, an array of locales or a proc"
+          end
+        end
+
+        module I18nDefaultLocaleBackend
+          def read(locale, **)
+            locale == I18n.default_locale ? model.read_attribute(attribute) : super
+          end
+
+          def write(locale, value, **)
+            locale == I18n.default_locale ? model.send(:write_attribute, attribute, value) : super
+          end
+
+          def self.included(base)
+            base.extend(ClassMethods)
+          end
+
+          module ClassMethods
+            def build_node(attr, locale)
+              if locale == I18n.default_locale
+                model_class.arel_table[attr]
+              else
+                super
+              end
+            end
+          end
+        end
+
+        class BackendModule < Module
+          def initialize(column_fallback)
+            case (@column_fallback = column_fallback)
+            when Array
+              define_array_accessors
+            when Proc
+              define_proc_accessors
+            end
+          end
+
+          def included(base)
+            base.extend(ClassMethods.new(@column_fallback))
+          end
+
+          private
+
+          def define_array_accessors
+            column_fallback = @column_fallback
+
+            module_eval <<-EOM, __FILE__, __LINE__ + 1
+            def read(locale, **)
+              if #{column_fallback}.include?(locale)
+                model.read_attribute(attribute)
+              else
+                super
+              end
+            end
+
+            def write(locale, value, **)
+              if #{column_fallback}.include?(locale)
+                model.send(:write_attribute, attribute, value)
+              else
+                super
+              end
+            end
+            EOM
+          end
+
+          def define_proc_accessors
+            column_fallback = @column_fallback
+
+            define_method :read do |locale, **options|
+              if column_fallback.call(locale)
+                model.read_attribute(attribute)
+              else
+                super(locale, **options)
+              end
+            end
+
+            define_method :write do |locale, value, **options|
+              if column_fallback.call(locale)
+                model.send(:write_attribute, attribute, value)
+              else
+                super(locale, value, **options)
+              end
+            end
+          end
+
+          class ClassMethods < Module
+            def initialize(column_fallback)
+              case column_fallback
+              when Array
+                module_eval <<-EOM, __FILE__, __LINE__ + 1
+                def build_node(attr, locale)
+                  if #{column_fallback}.include?(locale)
+                    model_class.arel_table[attr]
+                  else
+                    super
+                  end
+                end
+                EOM
+              when Proc
+                define_method(:build_node) do |attr, locale|
+                  if column_fallback.call(locale)
+                    model_class.arel_table[attr]
+                  else
+                    super(attr, locale)
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+
+    register_plugin(:active_record_column_fallback, ActiveRecord::ColumnFallback)
+  end
+end

data/lib/mobility/plugins/active_record/query.rb

@@ -137,6 +137,8 @@ enabled for any one attribute on the model.
           end
 
           def order(opts, *rest)
+            return super unless @klass.respond_to?(:mobility_attribute?)
+
             case opts
             when Symbol, String
               @klass.mobility_attribute?(opts) ? order({ opts => :asc }, *rest) : super
@@ -161,6 +163,9 @@ enabled for any one attribute on the model.
               define_method method_name do |*attrs, &block|
                 return super(*attrs, &block) if (method_name == 'select' && block.present?)
 
+                if ::ActiveRecord::VERSION::STRING < '7.0'
+                  return super(*attrs, &block) unless @klass.respond_to?(:mobility_attribute?)
+                end
                 return super(*attrs, &block) unless attrs.any?(&@klass.method(:mobility_attribute?))
 
                 keys = attrs.dup

data/lib/mobility/plugins/active_record.rb

@@ -4,6 +4,7 @@ require_relative "./active_record/dirty"
 require_relative "./active_record/cache"
 require_relative "./active_record/query"
 require_relative "./active_record/uniqueness_validation"
+require_relative "./active_record/column_fallback"
 
 module Mobility
 =begin
@@ -24,6 +25,7 @@ dirty for active_record_dirty) is also enabled.
       requires :active_record_cache
       requires :active_record_query
       requires :active_record_uniqueness_validation
+      requires :active_record_column_fallback
 
 
       included_hook do |klass|

data/lib/mobility/plugins/column_fallback.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Mobility
+  module Plugins
+    module ColumnFallback
+      extend Plugin
+
+      default false
+
+      requires :backend, include: :before
+    end
+
+    register_plugin(:column_fallback, ColumnFallback)
+  end
+end

data/lib/mobility/plugins/fallthrough_accessors.rb

@@ -55,6 +55,13 @@ model class is generated.
           end
         end
 
+        # Following is needed in order to not swallow `kwargs` on ruby >= 3.0.
+        # Otherwise `kwargs` are not passed by `super` to a possible other
+        # `method_missing` defined like this:
+        #
+        # def method_missing(name, *args, **kwargs, &block); end
+        ruby2_keywords :method_missing
+
         define_method :respond_to_missing? do |method_name, include_private = false|
           (method_name =~ method_name_regex) || super(method_name, include_private)
         end

data/lib/mobility/plugins/sequel/column_fallback.rb

@@ -0,0 +1,133 @@
+# frozen-string-literal: true
+
+module Mobility
+=begin
+
+Plugin to use an original column for a given locale, and otherwise use the backend.
+
+=end
+  module Plugins
+    module Sequel
+      module ColumnFallback
+        extend Plugin
+
+        requires :column_fallback, include: false
+
+        included_hook do |_, backend_class|
+          case (column_fallback = options[:column_fallback])
+          when TrueClass
+            backend_class.include I18nDefaultLocaleBackend
+          when Array, Proc
+            backend_class.include BackendModule.new(column_fallback)
+          end
+        end
+
+        module I18nDefaultLocaleBackend
+          def read(locale, **)
+            locale == I18n.default_locale ? model[attribute.to_sym] : super
+          end
+
+          def write(locale, value, **)
+            if locale == I18n.default_locale
+              model[attribute.to_sym] = value
+            else
+              super
+            end
+          end
+
+          def self.included(base)
+            base.extend(ClassMethods)
+          end
+
+          module ClassMethods
+            def build_op(attr, locale)
+              if locale == I18n.default_locale
+                ::Sequel::SQL::QualifiedIdentifier.new(model_class.table_name, attr.to_sym)
+              else
+                super
+              end
+            end
+          end
+        end
+
+        class BackendModule < Module
+          def initialize(column_fallback)
+            case (@column_fallback = column_fallback)
+            when Array
+              define_array_accessors
+            when Proc
+              define_proc_accessors
+            end
+          end
+
+          def included(base)
+            base.extend(ClassMethods.new(@column_fallback))
+          end
+
+          private
+
+          def define_array_accessors
+            column_fallback = @column_fallback
+
+            module_eval <<-EOM, __FILE__, __LINE__ + 1
+            def read(locale, **)
+              #{column_fallback}.include?(locale) ? model[attribute.to_sym] : super
+            end
+
+            def write(locale, value, **)
+              if #{column_fallback}.include?(locale)
+                model[attribute.to_sym] = value
+              else
+                super
+              end
+            end
+            EOM
+          end
+
+          def define_proc_accessors
+            column_fallback = @column_fallback
+
+            define_method :read do |locale, **options|
+              column_fallback.call(locale) ? model[attribute.to_sym] : super(locale, **options)
+            end
+
+            define_method :write do |locale, value, **options|
+              if column_fallback.call(locale)
+                model[attribute.to_sym] = value
+              else
+                super(locale, value, **options)
+              end
+            end
+          end
+
+          class ClassMethods < Module
+            def initialize(column_fallback)
+              case column_fallback
+              when Array
+                module_eval <<-EOM, __FILE__, __LINE__ + 1
+                def build_op(attr, locale)
+                  if #{column_fallback}.include?(locale)
+                    ::Sequel::SQL::QualifiedIdentifier.new(model_class.table_name, attr.to_sym)
+                  else
+                    super
+                  end
+                end
+                EOM
+              when Proc
+                define_method(:build_op) do |attr, locale|
+                  if column_fallback.call(locale)
+                    ::Sequel::SQL::QualifiedIdentifier.new(model_class.table_name, attr.to_sym)
+                  else
+                    super(attr, locale)
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+
+    register_plugin(:sequel_column_fallback, Sequel::ColumnFallback)
+  end
+end

data/lib/mobility/plugins/sequel/query.rb

@@ -61,7 +61,7 @@ ActiveRecord query plugin.
               locale = args[0] || @global_locale
               @locales |= [locale]
               @model_class.mobility_backend_class(m).build_op(m.to_s, locale)
-            elsif @model_class.columns.include?(m.to_s)
+            elsif @model_class.columns.include?(m)
               ::Sequel::SQL::QualifiedIdentifier.new(@model_class.table_name, m)
             else
               super

data/lib/mobility/plugins/sequel.rb

@@ -9,6 +9,7 @@ require_relative "./sequel/backend"
 require_relative "./sequel/dirty"
 require_relative "./sequel/cache"
 require_relative "./sequel/query"
+require_relative "./sequel/column_fallback"
 
 module Mobility
   module Plugins
@@ -26,6 +27,7 @@ for sequel_dirty) is also enabled.
       requires :sequel_dirty
       requires :sequel_cache
       requires :sequel_query
+      requires :sequel_column_fallback
 
       included_hook do |klass|
         unless sequel_class?(klass)

data/lib/mobility/version.rb

@@ -7,7 +7,7 @@ module Mobility
 
   module VERSION
     MAJOR = 1
-    MINOR = 1
+    MINOR = 2
     TINY = 0
     PRE = nil
 

data/lib/mobility.rb

@@ -73,6 +73,9 @@ fallbacks plugin, whereas +Post+ uses +Translations+ which does not have that
 plugin enabled.
 
 =end
+
+def ruby2_keywords(*); end unless respond_to?(:ruby2_keywords, true)
+
 module Mobility
   # A generic exception used by Mobility.
   class Error < StandardError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobility
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Chris Salzberg
@@ -11,30 +11,30 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEODCCAqCgAwIBAgIBATANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhjaHJp
-  cy9EQz1kZWppbXN0YS9EQz1jb20wHhcNMjAwMjExMDEwMjM1WhcNMjEwMjEwMDEw
-  MjM1WjAjMSEwHwYDVQQDDBhjaHJpcy9EQz1kZWppbXN0YS9EQz1jb20wggGiMA0G
-  CSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC99crJF+gE4WQnN7S4xdacGpZWg7hZ
-  UlXPXM1vX4HVaw8essO6eNGafYqKRQKf3WDW4uM6kqPd4OZTfahGhocVtVScJYGi
-  5SRuw9rrJeFlojUkCSqy47on7t858OebbD28eo71sZLTclGmza6UpjiLZqy0AL4P
-  9dkK2j9pQJ3jYTNYteq7P6A109ExSGWbaRvkAKU+vTMJsK5MW2bWullsOGHrZiPW
-  7PXAaU33X29ddLu/zj/4qe83GVvnrprjw5RRgoQgP0Umw8zKG50XB7nS3TAUiaRz
-  oD+eKgOIeZpPRwemINf0VsP1L+/FnUS6BkzVCOV9MWhUbrkdxCHLrSB8JL4ooXXR
-  N/J4KlR5xpv6b+z+i2lScfkrH7r9RF4ZtpiDQzyCxvuIZOQTzUneUSzMIk9BaEN2
-  5S19cDUjW5fi75npJ+YnrUN83Ta3sa/Pp4dnUqiBK7WHBDnHMN6j7iASoAjKVTgM
-  8F/xjk4qgxA7vjv2obj2zv65CknnQprLCpMCAwEAAaN3MHUwCQYDVR0TBAIwADAL
-  BgNVHQ8EBAMCBLAwHQYDVR0OBBYEFOO4919GTuKTQA2Klo2QO3jGlbJTMB0GA1Ud
-  EQQWMBSBEmNocmlzQGRlamltc3RhLmNvbTAdBgNVHRIEFjAUgRJjaHJpc0BkZWpp
-  bXN0YS5jb20wDQYJKoZIhvcNAQELBQADggGBADfIFBldH77wyUv2RZ1kwvuvRvpL
-  RNFdQlCbuVSn3abRAmc9rIsh80syhjWjYnml3guf+g2tYB1rU3NeTFRVupdvcUWJ
-  T6mITUeDHpNoxF6KAp3zSsdoBoEHdOBNH7Jpxp+L3a2LZ0k6fW12xEafmymOD3fp
-  BmIrE2Vr9aUec2Sk4fbKEYqsxhmXx+o8kKU7tnxVYMv4cX5X3yo45FA7Rh2JQuub
-  MBT+NALoYFaSTHWIr/4tAolWVt8NNGUKEokaFjjf5gAGM6piq6ohTHl5dCtcEPX1
-  klHOa2pIFwuUAWoVCpZa9XzRV5qz+mUrU70DF9dX6Cotv/sKOIxiGvQLnwzlSQWH
-  iXMqkM6Y5FSwViOQy4U2egDDSTB5a16iAnN7/qzqex6SYTsQdSmyc0mWCb9rkIoF
-  gSQml7TqcC6dZRsZRwYqzD9kUwdAJoCqno2CBUKs2l0yQAjFT36lRrVJznb7uWwa
-  xpPFnsrtyaZW6Dty8TSG3qzmeGpmpIotA8x1VA==
+  cy9EQz1kZWppbWF0YS9EQz1jb20wHhcNMjEwMjE4MTMxMzA5WhcNMjIwMjE4MTMx
+  MzA5WjAjMSEwHwYDVQQDDBhjaHJpcy9EQz1kZWppbWF0YS9EQz1jb20wggGiMA0G
+  CSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDURCKbt5oY0sCp4kYK1u5SLzVHg6Q1
+  2LejeQvUGpR3gulWqrq/507XRxE/9FSpLfgo3cGGYio1/gg2Yp7pBI4ZNEz8d2Vg
+  6caWLHYtHYF0/jlo177UspEF1bt3lCCmaA/ZyQpvoLi76Jf6VCBjepMqhLjeBSsA
+  xUqSdgNT8lzduOzdYk/GWf2Trvyz72IN6rY7hSwJ/U4R2DusRNTbKC55iyu0MyqI
+  Nks33les0xQERucqes1YzSEnpott/GUQ/fFWV1Qx7M1hMnqbQIm493BueR6X95a2
+  B7/aqY7LUVVmn9p65NMBJhbbP/pbAcLYV0C+y1Jy9NaVQTpWmJXVKBpYwlAzOJOQ
+  +b/7MBzT5Zzudkq9OlA5rZJB0hFo/Bm38MOCTSTk1/RT+zmoOyb4bx/h400L4ZUt
+  bRGON33BZ99gPiYdGfd3Pc/7FooteJASjKIO4Hman2ELRIdu6Bq+fIkTdJBcruS/
+  XL6xoRitCG7CX0IqmMKuLiKA/J0amAikHGsCAwEAAaN3MHUwCQYDVR0TBAIwADAL
+  BgNVHQ8EBAMCBLAwHQYDVR0OBBYEFMNUGAhS68egZT6DOfJwrfIdCtT/MB0GA1Ud
+  EQQWMBSBEmNocmlzQGRlamltYXRhLmNvbTAdBgNVHRIEFjAUgRJjaHJpc0BkZWpp
+  bWF0YS5jb20wDQYJKoZIhvcNAQELBQADggGBAH1RnWhD9bum/ijqzAAlkGWYzGza
+  h/3seA2bg1r5bbttFjD48f7RepfoAMxAqfiUWcukoukJeu7UY8jWmUIn9ut1oXct
+  Fh0YnueLFzzmppCCU+/SX5mc1y7mHYZHiU5n8qy1wJ6ljLWXVeprgJ96NdnmxuVU
+  dzPPSDTex/x7xBvHiaPc/uZSLc173N3qdY/Cd0B3/OflYeU2h5UpIHnmXrsONdMC
+  Xohy+Rrr2yT09MPYG+llpLHDnXmTnPsOZUSL5Q4c/iolodv4xJZKwLMZwrm2hQl9
+  9Or9Os+qxY0zWxmWuAtTFrskLAMhckCPDEcqSZmW4CT1a/quC2Oh0y1GsXPcqtqt
+  hLRuwfTXGor6bg4CrU7GRbSqjvnBepct5lwZiZrOCnMEUpY+9Q8fwmG3o3B+wBsw
+  eBMcZq0d1tbtv1M1UXND9mOfhLZ31YvoSTPkrJiRpljUNgD0+ugelnr1/5X/9k8y
+  J9QOd3C5jpSShf/HMvpJnFuSYFm19cH9GrHjvw==
   -----END CERTIFICATE-----
-date: 2021-02-06 00:00:00.000000000 Z
+date: 2021-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store
@@ -198,6 +198,7 @@ files:
 - lib/mobility/plugins/active_record.rb
 - lib/mobility/plugins/active_record/backend.rb
 - lib/mobility/plugins/active_record/cache.rb
+- lib/mobility/plugins/active_record/column_fallback.rb
 - lib/mobility/plugins/active_record/dirty.rb
 - lib/mobility/plugins/active_record/query.rb
 - lib/mobility/plugins/active_record/uniqueness_validation.rb
@@ -209,6 +210,7 @@ files:
 - lib/mobility/plugins/backend.rb
 - lib/mobility/plugins/backend_reader.rb
 - lib/mobility/plugins/cache.rb
+- lib/mobility/plugins/column_fallback.rb
 - lib/mobility/plugins/default.rb
 - lib/mobility/plugins/dirty.rb
 - lib/mobility/plugins/fallbacks.rb
@@ -220,6 +222,7 @@ files:
 - lib/mobility/plugins/sequel.rb
 - lib/mobility/plugins/sequel/backend.rb
 - lib/mobility/plugins/sequel/cache.rb
+- lib/mobility/plugins/sequel/column_fallback.rb
 - lib/mobility/plugins/sequel/dirty.rb
 - lib/mobility/plugins/sequel/query.rb
 - lib/mobility/plugins/writer.rb