mobility 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21ca551cdc17159c12fc493282038fba6e5274bd0ff56f5cd9d95a5bb1080cff
-  data.tar.gz: 611ff563e7e3139c5db31ff1337a40082a9ed5e04349a87e748754cf32779817
+  metadata.gz: 4e614b2354ec6cfbc7d4b3d946beabc5214904c21432cceb0b78530ca389184e
+  data.tar.gz: fa9e5cf7097b92a203e38e07617254e42d3bc11f58254b4b13b359639b70902a
 SHA512:
-  metadata.gz: 88a9c728d973e58532241802e2f2b99fc1b6d95b5d41d41ff87b9818378294b6795f8d8461600047aa4b3d4024e7e557a4e7ef0738fc99474a8dc741c91ee459
-  data.tar.gz: 34a4ab6a5db631eb4e4fcddf519825e25e8efbec533ad1b9b92e4fdae7085149f29d25978a8c121b71ed701ed18db6de410ff2ddd157896364f379b215d98262
+  metadata.gz: ef1653434cb1e303f0496c9fecd810ea2d2772009dca94358949e293157e6f2a58341867ad6c117a5dc91469002acdd80b969d442126a7df95ea49f667360cc8
+  data.tar.gz: dceae9f7039d21bcd5d68a0a2f54515b39c0b8ab871c7386fe0834a88f973e91af5c27f48a85cdfe0d6479a8291a976abfee2208e16a116c4d75b03db54a8f87

data/CHANGELOG.md

@@ -21,6 +21,11 @@
 v1.0](https://github.com/shioyama/mobility/wiki/Introduction-to-Mobility-v1.0)
 for more details on how to upgrade.
 
+### 1.0.4
+- Correctly override default backend options, fixes
+  [#492](https://github.com/shioyama/mobility/issues/492)
+  ([#495](https://github.com/shioyama/mobility/pull/495))
+
 ### 1.0.3
 - Fix `Mobility.default_backend`
   ([#497](https://github.com/shioyama/mobility/pull/497))

data/README.md

@@ -56,7 +56,7 @@ To use the latest pre-version of Mobility 1.0, add this line to your
 application's Gemfile:
 
 ```ruby
-gem 'mobility', '~> 1.0.3'
+gem 'mobility', '~> 1.0.4'
 ```
 
 ### ActiveRecord (Rails)

data/lib/mobility/plugins/backend.rb

@@ -33,13 +33,6 @@ Defines:
       def initialize(*args, **original_options)
         super
 
-        # Validate that the default backend from config has valid keys
-        if (default = self.class.defaults[:backend])
-          name, backend_options = default
-          extra_keys = backend_options.keys - backend.valid_keys
-          raise InvalidOptionKey, "These are not valid #{name} backend keys: #{extra_keys.join(', ')}." unless extra_keys.empty?
-        end
-
         include InstanceMethods
       end
 
@@ -87,7 +80,7 @@ Defines:
 
         case options[:backend]
         when String, Symbol, Class
-          @backend, @backend_options = options[:backend], options
+          @backend, @backend_options = options[:backend], options.dup
         when Array
           @backend, @backend_options = options[:backend]
           @backend_options = @backend_options.merge(original_options)
@@ -105,6 +98,14 @@ Defines:
       def validate_options(options)
         return super unless backend
         super(options.slice(*(options.keys - backend.valid_keys)))
+
+        # Validate that the default backend from config has valid keys, or if
+        # it is overridden by an array input that the array has valid keys.
+        if options[:backend].is_a?(Array)
+          name, backend_options = options[:backend]
+          extra_keys = backend_options.keys - backend.valid_keys
+          raise InvalidOptionKey, "These are not valid #{name} backend keys: #{extra_keys.join(', ')}." unless extra_keys.empty?
+        end
       end
 
       # Override default argument-handling in DSL to store kwargs passed along

data/lib/mobility/version.rb

@@ -8,7 +8,7 @@ module Mobility
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 3
+    TINY = 4
     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.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Chris Salzberg
@@ -34,7 +34,7 @@ cert_chain:
   gSQml7TqcC6dZRsZRwYqzD9kUwdAJoCqno2CBUKs2l0yQAjFT36lRrVJznb7uWwa
   xpPFnsrtyaZW6Dty8TSG3qzmeGpmpIotA8x1VA==
   -----END CERTIFICATE-----
-date: 2021-01-24 00:00:00.000000000 Z
+date: 2021-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store