mobility 1.1.3 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 225a8aa8a3eb8691e9a89d60fdd56509b47f7f36d22d1bb8d0c6f485f0e7cc2d
-  data.tar.gz: be10ccdea2727e568da790950b4df0633a543094543f7fd5f9c89154d5ea803e
+  metadata.gz: 7b94201a6b91ad2fff4818aa37fa4fd99df97944d98f3888af6b76f732f71658
+  data.tar.gz: 8be29d872e1488575253302daa13b46d5f065c5dd9aa35c526c0fd561ae478c5
 SHA512:
-  metadata.gz: 6f350d0a8e5fcf4f1804716f2cdfc0d500abd033ca0243e0c6be663adedf3ee192d785546a1be1274acbd5738533c7b5e3b9f8c48446e22bde39c26de8217819
-  data.tar.gz: 78fb7729118181d00e21f78c1144166916270e555bb4191c05a10cc660fb57d36b8af034cc7d42bfbd3d66d9509d1686f80554f85538b9a6d0fd488becd12966
+  metadata.gz: a7afca6199b32df4105ad2bd55d33c6213677d424d6a4bb22e5d39e33b649de2e256a04b1f03e9c33d6374e5c4ec7858a7de9b2a0e190cc1a417da895981b7a0
+  data.tar.gz: 23ef1c7ca95c54872c5504a50af6c94116c94157586ba755a9ed57e6ca878647a1693460232840ed58c47f5807b6fd6c6db2283c397faf7a7e3402e93f675be3

data/CHANGELOG.md

@@ -1,8 +1,32 @@
 # Mobility Changelog
 
-## Unreleased
-- Assign blank values in pg hash backends
-  ([#516](https://github.com/shioyama/mobility/pull/516))
+## 1.2
+
+### 1.2.3
+- Fix passing wrong options to super in fallbacks plugin
+  ([#539](https://github.com/shioyama/mobility/pull/539))
+
+### 1.2.2
+- Make models work with `Marshal.dump`
+  ([#532](https://github.com/shioyama/mobility/pull/532))
+- Fix Sequel container op in Sequel
+  ([#533](https://github.com/shioyama/mobility/pull/533))
+- Simplify Fallbacks plugin
+  ([#531](https://github.com/shioyama/mobility/pull/531))
+
+### 1.2.1
+- Refactor ColumnFallback plugin
+  ([#530](https://github.com/shioyama/mobility/pull/530))
+
+### 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](https://github.com/shioyama/mobility/pull/527))
 
 ## 1.1
 
@@ -10,6 +34,8 @@
 - 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?

data/Gemfile.lock

@@ -1,28 +1,44 @@
+GIT
+  remote: https://github.com/rails/rails.git
+  revision: 0a751a021bfc0c71bb2a10ff8af9654c785c94f1
+  branch: main
+  specs:
+    activemodel (7.0.0.alpha2)
+      activesupport (= 7.0.0.alpha2)
+    activerecord (7.0.0.alpha2)
+      activemodel (= 7.0.0.alpha2)
+      activesupport (= 7.0.0.alpha2)
+    activesupport (7.0.0.alpha2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+
 PATH
   remote: .
   specs:
-    mobility (1.1.2)
+    mobility (1.3.0.alpha)
       i18n (>= 0.6.10, < 2)
       request_store (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    benchmark-ips (2.8.4)
+    benchmark-ips (2.9.1)
     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.15.0)
-    formatador (0.2.5)
-    guard (2.16.2)
+    ffi (1.15.4)
+    formatador (0.3.0)
+    guard (2.18.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
-      pry (>= 0.9.12)
+      pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
@@ -32,11 +48,12 @@ GEM
       rspec (>= 2.99.0, < 4.0)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    listen (3.5.1)
+    listen (3.7.0)
       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.4)
     nenv (0.3.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -50,7 +67,7 @@ GEM
       pry (~> 0.13.0)
     rack (2.2.3)
     rake (12.3.3)
-    rb-fsevent (0.10.4)
+    rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     request_store (1.5.0)
@@ -68,15 +85,18 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    sequel (5.44.0)
     shellany (0.0.1)
     thor (1.1.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     yard (0.9.26)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord!
+  activesupport!
   benchmark-ips
   database_cleaner (~> 1.5, >= 1.5.3)
   guard-rspec
@@ -85,7 +105,6 @@ DEPENDENCIES
   pry-byebug
   rake (~> 12, >= 12.2.1)
   rspec (~> 3.0)
-  sequel (~> 5.0)
   yard (~> 0.9.0)
 
 BUNDLED WITH

data/README.md

@@ -55,7 +55,7 @@ Installation
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'mobility', '~> 1.1.3'
+gem 'mobility', '~> 1.2.3'
 ```
 
 ### ActiveRecord (Rails)

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
@@ -70,6 +77,12 @@ On top of this, a backend will normally:
       @attribute = args[1]
     end
 
+    def ==(backend)
+      backend.class == self.class &&
+        backend.attribute == attribute &&
+        backend.model == model
+    end
+
     # @!macro [new] backend_reader
     #   Gets the translated value for provided locale from configured backend.
     #   @param [Symbol] locale Locale to read
@@ -117,7 +130,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 +148,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 +161,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 +170,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 +187,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 +223,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/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] = {} }
@@ -102,7 +100,7 @@ Implements the {Mobility::Backends::Container} backend for Sequel models.
       # @return [Mobility::Backends::Sequel::Container::JSONOp,Mobility::Backends::Sequel::Container::JSONBOp]
       def self.build_op(attr, locale)
         klass = const_get("#{options[:column_type].upcase}Op")
-        klass.new(klass.new(column_name.to_sym)[locale.to_s]).get_text(attr)
+        klass.new(klass.new(column_name.to_sym).get(locale.to_s)).get_text(attr)
       end
 
       class JSONOp < ::Sequel::Postgres::JSONOp; end

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,9 +33,7 @@ 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
@@ -47,8 +45,8 @@ jsonb).
             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/plugins/active_record/column_fallback.rb

@@ -0,0 +1,66 @@
+# 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|
+          backend_class.include BackendInstanceMethods
+          backend_class.extend BackendClassMethods
+        end
+
+        def self.use_column_fallback?(options, locale)
+          case column_fallback = options[:column_fallback]
+          when TrueClass
+            locale == I18n.default_locale
+          when Array
+            column_fallback.include?(locale)
+          when Proc
+            column_fallback.call(locale)
+          else
+            false
+          end
+        end
+
+        module BackendInstanceMethods
+          def read(locale, **)
+            if ColumnFallback.use_column_fallback?(options, locale)
+              model.read_attribute(attribute)
+            else
+              super
+            end
+          end
+
+          def write(locale, value, **)
+            if ColumnFallback.use_column_fallback?(options, locale)
+              model.send(:write_attribute, attribute, value)
+            else
+              super
+            end
+          end
+        end
+
+        module BackendClassMethods
+          def build_node(attr, locale)
+            if ColumnFallback.use_column_fallback?(options, locale)
+              model_class.arel_table[attr]
+            else
+              super
+            end
+          end
+        end
+      end
+    end
+
+    register_plugin(:active_record_column_fallback, ActiveRecord::ColumnFallback)
+  end
+end

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/backend.rb

@@ -114,15 +114,33 @@ Defines:
         defaults[key] = [backend, backend_options] if backend
       end
 
+      class MobilityBackends < Hash
+        def initialize(model)
+          @model = model
+          super()
+        end
+
+        def [](name)
+          return fetch(name) if has_key?(name)
+          return self[name.to_sym] if String === name
+          self[name] = @model.class.mobility_backend_class(name).new(@model, name.to_s)
+        end
+
+        def marshal_dump
+          @model
+        end
+
+        def marshal_load(model)
+          @model = model
+        end
+      end
+
       module InstanceMethods
         # Return a new backend for an attribute name.
         # @return [Hash] Hash of attribute names and backend instances
         # @api private
         def mobility_backends
-          @mobility_backends ||= ::Hash.new do |hash, name|
-            next hash[name.to_sym] if String === name
-            hash[name] = self.class.mobility_backend_class(name).new(self, name.to_s)
-          end
+          @mobility_backends ||= MobilityBackends.new(self)
         end
 
         def initialize_dup(other)

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/fallbacks.rb

@@ -117,8 +117,10 @@ the current locale was +nil+.
       # Applies fallbacks plugin to attributes. Completely disables fallbacks
       # on model if option is +false+.
       included_hook do |_, backend_class|
-        fallbacks = options[:fallbacks]
-        backend_class.include(BackendReader.new(fallbacks, method(:generate_fallbacks))) unless fallbacks == false
+        backend_class.include(BackendInstanceMethods) unless options[:fallbacks] == false
+        # This is weird. We need to find a better way to allow customization of
+        # rarely-customized code like this.
+        backend_class.define_method(:generate_fallbacks, &method(:generate_fallbacks))
       end
 
       private
@@ -134,33 +136,26 @@ the current locale was +nil+.
         end
       end
 
-      class BackendReader < Module
-        def initialize(fallbacks_option, fallbacks_generator)
-          @fallbacks_generator = fallbacks_generator
-          define_read(convert_option_to_fallbacks(fallbacks_option))
-        end
-
-        private
-
-        def define_read(fallbacks)
-          define_method :read do |locale, fallback: true, **options|
-            return super(locale, **options) if !fallback || options[:locale]
+      module BackendInstanceMethods
+        def read(locale, fallback: true, **kwargs)
+          return super(locale, **kwargs) if !fallback || kwargs[:locale]
 
-            locales = fallback == true ? fallbacks[locale] : [locale, *fallback]
-            locales.each do |fallback_locale|
-              value = super(fallback_locale, **options)
-              return value if Util.present?(value)
-            end
-
-            super(locale, **options)
+          locales = fallback == true ? fallbacks[locale] : [locale, *fallback]
+          locales.each do |fallback_locale|
+            value = super(fallback_locale, **kwargs)
+            return value if Util.present?(value)
           end
+
+          super(locale, **kwargs)
         end
 
-        def convert_option_to_fallbacks(option)
-          if option.is_a?(::Hash)
-            @fallbacks_generator[option]
-          elsif option == true
-            @fallbacks_generator[{}]
+        private
+
+        def fallbacks
+          if options[:fallbacks].is_a?(Hash)
+            generate_fallbacks(options[:fallbacks])
+          elsif options[:fallbacks] == true
+            generate_fallbacks({})
           else
             ::Hash.new { [] }
           end

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

@@ -0,0 +1,66 @@
+# 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|
+          backend_class.include BackendInstanceMethods
+          backend_class.extend BackendClassMethods
+        end
+
+        def self.use_column_fallback?(options, locale)
+          case column_fallback = options[:column_fallback]
+          when TrueClass
+            locale == I18n.default_locale
+          when Array
+            column_fallback.include?(locale)
+          when Proc
+            column_fallback.call(locale)
+          else
+            false
+          end
+        end
+
+        module BackendInstanceMethods
+          def read(locale, **)
+            if ColumnFallback.use_column_fallback?(options, locale)
+              model[attribute.to_sym]
+            else
+              super
+            end
+          end
+
+          def write(locale, value, **)
+            if ColumnFallback.use_column_fallback?(options, locale)
+              model[attribute.to_sym] = value
+            else
+              super
+            end
+          end
+        end
+
+        module BackendClassMethods
+          def build_op(attr, locale)
+            if ColumnFallback.use_column_fallback?(options, locale)
+              ::Sequel::SQL::QualifiedIdentifier.new(model_class.table_name, attr.to_sym)
+            else
+              super
+            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 = 3
     PRE = nil
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobility
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.3
 platform: ruby
 authors:
 - Chris Salzberg
@@ -34,7 +34,7 @@ cert_chain:
   eBMcZq0d1tbtv1M1UXND9mOfhLZ31YvoSTPkrJiRpljUNgD0+ugelnr1/5X/9k8y
   J9QOd3C5jpSShf/HMvpJnFuSYFm19cH9GrHjvw==
   -----END CERTIFICATE-----
-date: 2021-08-06 00:00:00.000000000 Z
+date: 2021-10-25 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