mobility 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7e38eaafcd681f7aa78b56427f07460f7b995ce
-  data.tar.gz: 62b77800ad18af59905506a5a65fc30285a14299
+  metadata.gz: 2c84301d2ecd421dcefc6f2783adf3256e8c4764
+  data.tar.gz: b3469da9b842c321e1dd6241e1f7f3b61f171fa7
 SHA512:
-  metadata.gz: 473fbcc6e40aab4c828478959896d90e8403a96eca495c0df31bb8d9b2faa0e2e49fe3ecd8913035c38c3a69004284f17be963e1cb3aae1744a0f3191df69479
-  data.tar.gz: 31545c9e848c7c60ee7ef638063ed66999cded527ba115f943e7acbf84c72ae1944094a3e10a871131ee4ff35a52baf2640d5b1c22d01fc7daad5c5c8cd42e5d
+  metadata.gz: 9bd9d7c183fd82404f59b2c9c797628f061bba52ba788e02abde15519ce9694ee73e17f5906eb3972f8e4f255ffb580711d9fb8d522365f649fe89d0855b34a6
+  data.tar.gz: 397f40c255c47e8f79f62eac57bcce2372e4ee7ed5031d38d47503367ef9f712a300b4d8727a258b16f6b89834d73ce24fef9f3c44dfbd5e04388a04dbf0f024

data.tar.gz.sig

@@ -1,2 +1,2 @@
-;%����.ϳ�\���퇭Ҝ��3л\8h���n�ݣp�װ'%gג�k�CJ�Bz����]3�+x!�K�����v�����wh�jC#�l�>{K���������߭���>��@.:˕&;؇������9gwd�GP.K
-A��AV�-
+� g�t������e�݆�A���9�a�P���9d&c�H
+��֙��ӎ�a�Ԣ!�� 	

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## 0.3
 
+### 0.3.5 (December 24, 2017)
+* Make Default plugin handle Procs more gracefully
+  ([#137](https://github.com/shioyama/mobility/pull/137))
+* Show deprecation warning if keyword options passed to Default plugin
+  ([#147](https://github.com/shioyama/mobility/pull/147))
+
 ### 0.3.4 (December 6, 2017)
 * Move `translated_attribute_names` to `Mobility::ActiveRecord`
   ([#132](https://github.com/shioyama/mobility/pull/129))

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mobility (0.3.3)
+    mobility (0.4.0.alpha.1)
       i18n (>= 0.6.10, < 0.10)
       request_store (~> 1.0)
 
@@ -148,4 +148,4 @@ DEPENDENCIES
   yard (~> 0.9.0)
 
 BUNDLED WITH
-   1.16.0.pre.2
+   1.16.0

data/README.md

@@ -54,7 +54,7 @@ Installation
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'mobility', '~> 0.3.4'
+gem 'mobility', '~> 0.3.5'
 ```
 
 Mobility is cryptographically signed. To be sure the gem you install hasn't

data/lib/mobility/plugins/default.rb

@@ -5,11 +5,12 @@ module Mobility
 Defines value or proc to fall through to if return value from getter would
 otherwise be nil.
 
-If default is a proc, it is passed a hash with four keyword arguments:
-- +model+: the model instance
-- +attribute+: the attribute name (a String)
-- +locale+: the locale (a Symbol)
-- +options+: hash of options passed in to accessor
+If default is a +Proc+, it will be called with the context of the model, and
+passed arguments:
+- the attribute name (a String)
+- the locale (a Symbol)
+- hash of options passed in to accessor
+The proc can accept zero to three arguments (see examples below)
 
 @example With default enabled (falls through to default value)
   class Post
@@ -46,7 +47,7 @@ If default is a proc, it is passed a hash with four keyword arguments:
 @example Using Proc as default
   class Post
     extend Mobility
-    translates :title, default: lambda { |attribute:, locale:| "#{attribute} in #{locale}" }
+    translates :title, default: lambda { |attribute, locale| "#{attribute} in #{locale}" }
   end
 
   Mobility.locale = :en
@@ -54,7 +55,7 @@ If default is a proc, it is passed a hash with four keyword arguments:
   post.title
   #=> "title in en"
 
-  post.title(default: lambda { |model:| model.class.name.to_s })
+  post.title(default: lambda { self.class.name.to_s })
   #=> "Post"
 =end
     class Default < Module
@@ -70,10 +71,16 @@ If default is a proc, it is passed a hash with four keyword arguments:
           default = options.has_key?(:default) ? options.delete(:default) : default_option
           if (value = super(locale, options)).nil?
             return default unless default.is_a?(Proc)
-            default.call(model: model,
-                         attribute: attribute,
-                         locale: locale,
-                         options: options)
+            # TODO: Remove in v1.0
+            if default.parameters.any? { |n, v| [:keyreq, :keyopt].include?(n) && [:model, :attribute, :locale, :options].include?(v) }
+              warn %{
+WARNING: Passing keyword arguments to a Proc in the Default plugin is
+deprecated. See the API documentation for details.}
+              return default.call(model: model, attribute: attribute, locale: locale, options: options)
+            end
+            args = [attribute, locale, options]
+            args = args.first(default.arity) unless default.arity < 0
+            model.instance_exec(*args, &default)
           else
             value
           end

data/lib/mobility/version.rb

@@ -1,3 +1,3 @@
 module Mobility
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobility
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Chris Salzberg
@@ -30,7 +30,7 @@ cert_chain:
   eGDROPZoL5RXwiOnRbexxa7dcAxMrDfGB/hpiunIPWPsi4n5P7K/6OO/sGVMl9xv
   SZBPXjzrHdyOFLBYXB+PG7s3F/4=
   -----END CERTIFICATE-----
-date: 2017-12-06 00:00:00.000000000 Z
+date: 2017-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store
@@ -284,7 +284,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Pluggable Ruby translation framework