mobility 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 826490fa3ce8fc86d22c06737a226e7b35aa509d1ccc47e777f1f2fb18eacc77
-  data.tar.gz: 4625eff941c67cde509b7e5d9e5f36deb7f204058d5ba4287d62a367244c007e
+  metadata.gz: bfb0cb0bd2a8efd18e8fab29abf7512a765086b4d6e3d27234d8c8d6085fd5d1
+  data.tar.gz: b143906e032fe332dbb169badc3cc3cd8dd876e4d45f2556ed1a8ae5d4cfb1ab
 SHA512:
-  metadata.gz: e496eb5a3a3635d749ded9019795ed4753dc9c4e2f25a89aa022a4ee5aa1116a5ff21b4f3f503f0cc3ecc7b7b087849d2f3fd5e805e0101d1fc23faa62f36823
-  data.tar.gz: 395035bbfa2e3309cc627706c466f58ab8c4f6dc5af63185365be8d3d79a623cf317626acd6b3d9ab95c4c936ca3136452b1513c268ca8979aeeaea76ae4539f
+  metadata.gz: 35d4c26eb09f5facee434046bb1c447fb43ff4a19ab0f911414239a3b8d758f2c41fb4ae857027e8f50041fc56caa64b3c7291c05b0e80491542d72e1c88c2e3
+  data.tar.gz: 04d437ce889463ef6049d2f8b3cb1695a22e444a3f4057cb62be6c9fee8cd4516210dc18be4bbcfdd4b7945fdd9bb95c4960cee3e7413d2130a02b188c4f87e2

data/CHANGELOG.md

@@ -1,13 +1,15 @@
 # Mobility Changelog
 
 ## Unreleased
-- Assign blank values in pg hash backends
-  ([#516](https://github.com/shioyama/mobility/pull/516))
-
-## 1.1
+- Simplify Fallbacks plugin
+  ([#531](https://github.com/shioyama/mobility/pull/531))
 
 ## 1.2
 
+### 1.2.2
+- Make models work with `Marshal.dump`
+  ([#532](https://github.com/shioyama/mobility/pull/532))
+
 ### 1.2.1
 - Refactor ColumnFallback plugin
   ([#530](https://github.com/shioyama/mobility/pull/530))
@@ -22,6 +24,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,44 +1,28 @@
-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)
+    mobility (1.2.1)
       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,12 +32,11 @@ 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)
@@ -67,7 +50,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)
@@ -85,18 +68,15 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
+    sequel (5.47.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
@@ -105,6 +85,7 @@ DEPENDENCIES
   pry-byebug
   rake (~> 12, >= 12.2.1)
   rspec (~> 3.0)
+  sequel (= 5.47)
   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.1'
+gem 'mobility', '~> 1.2.2'
 ```
 
 ### 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,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, **accessor_options)
+          return super(locale, **options) if !fallback || accessor_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 ? fallbacks[locale] : [locale, *fallback]
+          locales.each do |fallback_locale|
+            value = super(fallback_locale, **accessor_options)
+            return value if Util.present?(value)
           end
+
+          super(locale, **options)
         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/version.rb

@@ -8,7 +8,7 @@ module Mobility
   module VERSION
     MAJOR = 1
     MINOR = 2
-    TINY = 1
+    TINY = 2
     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.1
+  version: 1.2.2
 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-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store