mobility 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5cedc8fabef42f478f93a4bb4fa1e8764759855dcded4d25f397c018f1811d2
-  data.tar.gz: 1fb647fdbcbafa3b8a5a6d47d71500e2481556aa72674c5269ea0dc560d63ca0
+  metadata.gz: 826490fa3ce8fc86d22c06737a226e7b35aa509d1ccc47e777f1f2fb18eacc77
+  data.tar.gz: 4625eff941c67cde509b7e5d9e5f36deb7f204058d5ba4287d62a367244c007e
 SHA512:
-  metadata.gz: ee138cb5544fc8942dc8a6dbf7fcfd54bf3829329075950755b8fea3ba676c430b880b14366dcfc09b66651b06577957e02130c5b4f2a62d7db96d02f1a150c8
-  data.tar.gz: 980502d8c285bedf8e2958a24cb77c129ee39f1cfb946c44bbd83f7cc89b30009a829bfb17b515aac9e02d3f3a810b1433cab416aabec67c1daab9c6f100683d
+  metadata.gz: e496eb5a3a3635d749ded9019795ed4753dc9c4e2f25a89aa022a4ee5aa1116a5ff21b4f3f503f0cc3ecc7b7b087849d2f3fd5e805e0101d1fc23faa62f36823
+  data.tar.gz: 395035bbfa2e3309cc627706c466f58ab8c4f6dc5af63185365be8d3d79a623cf317626acd6b3d9ab95c4c936ca3136452b1513c268ca8979aeeaea76ae4539f

data/CHANGELOG.md

@@ -8,15 +8,19 @@
 
 ## 1.2
 
+### 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))
+  ([#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))
+  ([#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))
+  ([#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))
+  ([#527](https://github.com/shioyama/mobility/pull/527))
 
 ### 1.1.3
 - Do not swallow keyword args on ruby 3 in fallthrough accessors

data/Gemfile.lock

@@ -1,7 +1,23 @@
+GIT
+  remote: https://github.com/rails/rails.git
+  revision: 53000f3a2df5c59252d019bbb8d46728b291ec74
+  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.2.0.alpha)
+    mobility (1.2.0)
       i18n (>= 0.6.10, < 2)
       request_store (~> 1.0)
 
@@ -37,6 +53,7 @@ GEM
       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)
@@ -68,15 +85,18 @@ 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)
+    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.2.0'
+gem 'mobility', '~> 1.2.1'
 ```
 
 ### ActiveRecord (Rails)

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

@@ -14,120 +14,47 @@ Plugin to use an original column for a given locale, and otherwise use the backe
         requires :column_fallback, include: false
 
         included_hook do |_, backend_class|
-          case (column_fallback = options[:column_fallback])
+          backend_class.include BackendInstanceMethods
+          backend_class.extend BackendClassMethods
+        end
+
+        def self.use_column_fallback?(options, locale)
+          case column_fallback = options[:column_fallback]
           when TrueClass
-            backend_class.include I18nDefaultLocaleBackend
-          when Array, Proc
-            backend_class.include BackendModule.new(column_fallback)
+            locale == I18n.default_locale
+          when Array
+            column_fallback.include?(locale)
+          when Proc
+            column_fallback.call(locale)
           else
-            raise ArgumentError, "column_fallback value must be a boolean, an array of locales or a proc"
+            false
           end
         end
 
-        module I18nDefaultLocaleBackend
+        module BackendInstanceMethods
           def read(locale, **)
-            locale == I18n.default_locale ? model.read_attribute(attribute) : super
+            if ColumnFallback.use_column_fallback?(options, locale)
+              model.read_attribute(attribute)
+            else
+              super
+            end
           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
+            if ColumnFallback.use_column_fallback?(options, locale)
+              model.send(:write_attribute, attribute, value)
+            else
+              super
             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
+        module BackendClassMethods
+          def build_node(attr, locale)
+            if ColumnFallback.use_column_fallback?(options, locale)
+              model_class.arel_table[attr]
+            else
+              super
             end
           end
         end

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

@@ -14,114 +14,47 @@ Plugin to use an original column for a given locale, and otherwise use the backe
         requires :column_fallback, include: false
 
         included_hook do |_, backend_class|
-          case (column_fallback = options[:column_fallback])
+          backend_class.include BackendInstanceMethods
+          backend_class.extend BackendClassMethods
+        end
+
+        def self.use_column_fallback?(options, locale)
+          case column_fallback = options[:column_fallback]
           when TrueClass
-            backend_class.include I18nDefaultLocaleBackend
-          when Array, Proc
-            backend_class.include BackendModule.new(column_fallback)
+            locale == I18n.default_locale
+          when Array
+            column_fallback.include?(locale)
+          when Proc
+            column_fallback.call(locale)
+          else
+            false
           end
         end
 
-        module I18nDefaultLocaleBackend
+        module BackendInstanceMethods
           def read(locale, **)
-            locale == I18n.default_locale ? model[attribute.to_sym] : super
+            if ColumnFallback.use_column_fallback?(options, locale)
+              model[attribute.to_sym]
+            else
+              super
+            end
           end
 
           def write(locale, value, **)
-            if locale == I18n.default_locale
+            if ColumnFallback.use_column_fallback?(options, 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
+        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

data/lib/mobility/version.rb

@@ -8,7 +8,7 @@ module Mobility
   module VERSION
     MAJOR = 1
     MINOR = 2
-    TINY = 0
+    TINY = 1
     PRE = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobility
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Chris Salzberg
@@ -34,7 +34,7 @@ cert_chain:
   eBMcZq0d1tbtv1M1UXND9mOfhLZ31YvoSTPkrJiRpljUNgD0+ugelnr1/5X/9k8y
   J9QOd3C5jpSShf/HMvpJnFuSYFm19cH9GrHjvw==
   -----END CERTIFICATE-----
-date: 2021-09-26 00:00:00.000000000 Z
+date: 2021-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store