mobility 1.2.1 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 826490fa3ce8fc86d22c06737a226e7b35aa509d1ccc47e777f1f2fb18eacc77
-  data.tar.gz: 4625eff941c67cde509b7e5d9e5f36deb7f204058d5ba4287d62a367244c007e
+  metadata.gz: ad89c4b8f858e06961d867d4d6fef4ae2b7fa05228c29beb1262d6bdfbd60eff
+  data.tar.gz: 8e626e914ffc5533cd1d7932f66bf7c14acaeae2b0b1bd9cba17539a23389fb6
 SHA512:
-  metadata.gz: e496eb5a3a3635d749ded9019795ed4753dc9c4e2f25a89aa022a4ee5aa1116a5ff21b4f3f503f0cc3ecc7b7b087849d2f3fd5e805e0101d1fc23faa62f36823
-  data.tar.gz: 395035bbfa2e3309cc627706c466f58ab8c4f6dc5af63185365be8d3d79a623cf317626acd6b3d9ab95c4c936ca3136452b1513c268ca8979aeeaea76ae4539f
+  metadata.gz: 4d1d31e256f1f2cd9c04ed2f83d73dcef576248bbc0dfc28550da9d2d7e9c66aef0df73ab955324b0669dfdd13ad2bf790049125e16bd9a263d8c3df10713c84
+  data.tar.gz: 00a3d9bd1b1fd47fd0e9c732d9ee40709761490029269b629500c876b5d4acdb847e8c512a8de9329a213578202430120b956adb322c7921300895f9dabd8931

data/CHANGELOG.md

@@ -1,12 +1,26 @@
 # Mobility Changelog
 
-## Unreleased
-- Assign blank values in pg hash backends
-  ([#516](https://github.com/shioyama/mobility/pull/516))
+## 1.2
 
-## 1.1
+### 1.2.5
+- Avoid referencing ActiveRecord::Base
+  ([#550](https://github.com/shioyama/mobility/pull/550))
 
-## 1.2
+### 1.2.4
+- Fix fallbacks performance regression
+  ([#548](https://github.com/shioyama/mobility/pull/548))
+
+### 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
@@ -22,6 +36,8 @@
 - Clearly distinguish backend classes from their configured subclasses
   ([#527](https://github.com/shioyama/mobility/pull/527))
 
+## 1.1
+
 ### 1.1.3
 - Do not swallow keyword args on ruby 3 in fallthrough accessors
   ([#520](https://github.com/shioyama/mobility/pull/520)) thanks

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/rails/rails.git
-  revision: 53000f3a2df5c59252d019bbb8d46728b291ec74
+  revision: 5647a9c1ced68d20338552d47a3b755e10a271c4
   branch: main
   specs:
     activemodel (7.0.0.alpha2)
@@ -17,28 +17,28 @@ GIT
 PATH
   remote: .
   specs:
-    mobility (1.2.0)
+    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.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)
@@ -48,7 +48,7 @@ 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)
@@ -67,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)

data/README.md

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

data/lib/mobility/backend.rb

@@ -77,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

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

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

@@ -117,8 +117,21 @@ 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
+        unless options[:fallbacks] == false
+          backend_class.include(BackendInstanceMethods)
+
+          fallbacks =
+            if options[:fallbacks].is_a?(Hash)
+              generate_fallbacks(options[:fallbacks])
+            elsif options[:fallbacks] == true
+              generate_fallbacks({})
+            else
+              ::Hash.new { [] }
+            end
+
+          backend_class.singleton_class.attr_reader :fallbacks
+          backend_class.instance_variable_set(:@fallbacks, fallbacks)
+        end
       end
 
       private
@@ -134,36 +147,17 @@ 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
+      module BackendInstanceMethods
+        def read(locale, fallback: true, **kwargs)
+          return super(locale, **kwargs) if !fallback || kwargs[:locale]
 
-        def define_read(fallbacks)
-          define_method :read do |locale, fallback: true, **options|
-            return super(locale, **options) if !fallback || options[: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 ? self.class.fallbacks[locale] : [locale, *fallback]
+          locales.each do |fallback_locale|
+            value = super(fallback_locale, **kwargs)
+            return value if Util.present?(value)
           end
-        end
 
-        def convert_option_to_fallbacks(option)
-          if option.is_a?(::Hash)
-            @fallbacks_generator[option]
-          elsif option == true
-            @fallbacks_generator[{}]
-          else
-            ::Hash.new { [] }
-          end
+          super(locale, **kwargs)
         end
       end
     end

data/lib/mobility/version.rb

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

data/lib/rails/generators/mobility/backend_generators/base.rb

@@ -46,7 +46,9 @@ module Mobility
         connection.data_source_exists?(table_name)
       end
 
-      delegate :connection, to: ::ActiveRecord::Base
+      def connection
+        ::ActiveRecord::Base.connection
+      end
 
       def truncate_index_name(index_name)
         if index_name.size < connection.index_name_length

data.tar.gz.sig

@@ -1,2 +1,3 @@
-��P�a�Y���W7�L�ey?��BsR�
-�p��ʶ�)���{�U���A��KE��Yd&���&9A
+$�����ј���I!4-��fX��
�y;P��X���w8�}�	^�R�bV�eW޴Ɂ���>�E�?�ҖЖU~G^
�q0�N�ˆ�$M��깖+����.Sh�i�\06ʩ2NG�����1�۲���*70����<
+�w����*�4��)c`a[�s߸HVj�
+E����O�A�xܿ���@9rW�I�o��:.;ɛ����K]yu\	��8�����[�:�y�^$���m:�H���b	��"k8�)і¤�@f

metadata

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