mobility 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c42bb66ac64ed65434f7550515f60ab7907001d6
-  data.tar.gz: 8a977f61b918d4ff6f0f23f6accb810b15c4d3d5
+  metadata.gz: 00e8866b69b091c9fd411212b4f262382dc00da3
+  data.tar.gz: 45f61733fe33af52d7b4be9e35d75aa0344b6c54
 SHA512:
-  metadata.gz: 3974c3e07c18c765342863943d098eed06ff944ff8339029bf3e24c27d81c0462688798706e771595a83ebc7fc36c99f156f65de35d27a68aab9bfe56e87103a
-  data.tar.gz: 2105d1889d4c54dafdcf41f98c2a76ee7e09773df1166caa86d31b7e320495a7e080757a9c8ec061472d341b86a35bb6059f8f981a6efe787fc7c5d39d388921
+  metadata.gz: a942928eba9620bdfccede2153501fa994c475d5174b1e7fdab2c76c2acaaf9a1787ec92938c46103afbb156aba5c70c729130311cbceed6903efd00a782c031
+  data.tar.gz: d455f2eb6fd95cf6a6a4a8a02293917a450be4a272bef424dd292d57bfab466caea1adce71ba3f64fb20770cbbb8dd681f8809b4f4112c111c40f2fd9fd38f88

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## 0.3
 
+### 0.3.3 (December 5, 2017)
+* Fix duping for AR KeyValue backend ([#126](https://github.com/shioyama/mobility/pull/126))
+* Pass locale and options to Proc in default plugin ([#122](https://github.com/shioyama/mobility/pull/122))
+
 ### 0.3.2 (December 1, 2017)
 * Fix issue with querying on translated attributes with Sequel Table backend ([#121](https://github.com/shioyama/mobility/pull/121))
 

data/Gemfile.lock

@@ -1,20 +1,51 @@
 PATH
   remote: .
   specs:
-    mobility (0.3.1)
+    mobility (0.3.2)
       i18n (>= 0.6.10, < 0.10)
       request_store (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    actionpack (5.2.0.beta2)
+      actionview (= 5.2.0.beta2)
+      activesupport (= 5.2.0.beta2)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.0.beta2)
+      activesupport (= 5.2.0.beta2)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activemodel (5.2.0.beta2)
+      activesupport (= 5.2.0.beta2)
+    activerecord (5.2.0.beta2)
+      activemodel (= 5.2.0.beta2)
+      activesupport (= 5.2.0.beta2)
+      arel (>= 9.0)
+    activesupport (5.2.0.beta2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (9.0.0)
+    builder (3.2.3)
     byebug (9.1.0)
     coderay (1.1.2)
     concurrent-ruby (1.0.5)
+    crass (1.0.3)
     database_cleaner (1.6.2)
     diff-lcs (1.3)
+    erubi (1.7.0)
     ffi (1.9.18)
     formatador (0.2.5)
+    generator_spec (0.9.4)
+      activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
     guard (2.14.1)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -35,10 +66,17 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
+    loofah (2.1.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
     lumberjack (1.0.12)
     method_source (0.9.0)
+    mini_portile2 (2.3.0)
+    minitest (5.10.3)
     mysql2 (0.4.10)
     nenv (0.3.0)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
@@ -49,6 +87,20 @@ GEM
     pry-byebug (3.5.1)
       byebug (~> 9.1)
       pry (~> 0.10)
+    rack (2.0.3)
+    rack-test (0.8.2)
+      rack (>= 1.0, < 3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (5.2.0.beta2)
+      actionpack (= 5.2.0.beta2)
+      activesupport (= 5.2.0.beta2)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
     rake (12.3.0)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
@@ -68,26 +120,30 @@ GEM
       rspec-support (~> 3.7.0)
     rspec-support (3.7.0)
     ruby_dep (1.5.0)
-    sequel (5.2.0)
     shellany (0.0.1)
     sqlite3 (1.3.13)
     thor (0.20.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.4)
+      thread_safe (~> 0.1)
     yard (0.9.12)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord (>= 5.2.0.beta1, < 5.3)
   bundler (~> 1.12)
   database_cleaner (~> 1.5, >= 1.5.3)
+  generator_spec (~> 0.9.4)
   guard-rspec
   mobility!
   mysql2 (~> 0.4.9)
   pg
   pry-byebug
+  railties (>= 5.2.0.beta1, < 5.3)
   rake (~> 12, >= 12.2.1)
   rspec (~> 3.0)
-  sequel (>= 5.0.0, < 6.0.0)
   sqlite3
   yard (~> 0.9.0)
 

data/README.md

@@ -4,7 +4,9 @@ Mobility
 [![Gem Version](https://badge.fury.io/rb/mobility.svg)][gem]
 [![Build Status](https://travis-ci.org/shioyama/mobility.svg?branch=master)][travis]
 [![Dependency Status](https://gemnasium.com/shioyama/mobility.svg)][gemnasium]
-[![Code Climate](https://codeclimate.com/github/shioyama/mobility/badges/gpa.svg)][codeclimate]
+[![Code Climate](https://api.codeclimate.com/v1/badges/72200f2b00c339ec4537/maintainability.svg)][codeclimate]
+
+[![Gitter Chat](https://badges.gitter.im/mobility-ruby/mobility.svg)](https://gitter.im/mobility-ruby/mobility)
 
 [gem]: https://rubygems.org/gems/mobility
 [travis]: https://travis-ci.org/shioyama/mobility
@@ -52,7 +54,7 @@ Installation
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'mobility', '~> 0.3.2'
+gem 'mobility', '~> 0.3.3'
 ```
 
 Mobility is cryptographically signed. To be sure the gem you install hasn't
@@ -110,7 +112,7 @@ See [Getting Started](#quickstart) to get started translating your models.
 ### Sequel
 
 Requirements:
-- Sequel >= 4.0, < 5.0 (5.0 support is in the works)
+- Sequel >= 4.0
 
 You can extend `Mobility` just like in ActiveRecord, or you can use the
 `mobility` plugin, which does the same thing:

data/lib/mobility/backends/active_record/key_value.rb

@@ -70,6 +70,19 @@ Implements the {Mobility::Backends::KeyValue} backend for ActiveRecord models.
         end
         after_destroy :mobility_destroy_key_value_translations
 
+        module_name = "MobilityArKeyValue#{association_name.to_s.camelcase}"
+        unless const_defined?(module_name)
+          callback_methods = Module.new do
+            define_method :initialize_dup do |source|
+              super(source)
+              self.send("#{association_name}=", source.send(association_name).map(&:dup))
+              # Set inverse on associations
+              send(association_name).each { |translation| translation.translatable = self }
+            end
+          end
+          include const_set(module_name, callback_methods)
+        end
+
         private
 
         # Clean up *all* leftover translations of this model, only once.

data/lib/mobility/backends/sequel/table/query_methods.rb

@@ -21,7 +21,7 @@ module Mobility
         define_method :"join_#{association_name}" do |**options|
           if joins = @opts[:join]
             # Return self if we've already joined this table
-            return self if joins.find { |clause| clause.table_expr == table_name }
+            return self if joins.any? { |clause| clause.table_expr == table_name }
           end
 
           join_type = options[:outer_join] ? :left_outer : :inner

data/lib/mobility/plugins/active_model/dirty.rb

@@ -2,6 +2,7 @@
 
 module Mobility
   module Plugins
+    module ActiveModel
 =begin
 
 Dirty tracking for models which include the +ActiveModel::Dirty+ module.
@@ -22,7 +23,6 @@ value of the translated attribute if passed to it.
 @see http://api.rubyonrails.org/classes/ActiveModel/Dirty.html Rails documentation for Active Model Dirty module
 
 =end
-    module ActiveModel
       module Dirty
         # @!group Backend Accessors
         # @!macro backend_writer

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

@@ -1,11 +1,5 @@
 module Mobility
   module Plugins
-=begin
-
-Module builder adding translated attributes to #attributes hash on model
-instance. See {Mobility::Plugins::AttributeMethods} for further details.
-
-=end
     module ActiveRecord
       module TranslatedAttributes
         def translated_attributes
@@ -17,6 +11,12 @@ instance. See {Mobility::Plugins::AttributeMethods} for further details.
         end
       end
 
+=begin
+
+Module builder adding translated attributes to #attributes hash on model
+instance. See {Mobility::Plugins::AttributeMethods} for further details.
+
+=end
       class AttributeMethods < Module
         def initialize(*attribute_names)
           include TranslatedAttributes

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

@@ -3,6 +3,7 @@ require "mobility/plugins/active_model/dirty"
 
 module Mobility
   module Plugins
+    module ActiveRecord
 =begin
 
 Dirty tracking for AR models. See {Mobility::Plugins::ActiveModel::Dirty} for
@@ -20,7 +21,6 @@ AR::Dirty plugin adds support for the following persistence-specific methods
 - +title_in_database+
 
 =end
-    module ActiveRecord
       module Dirty
         include ActiveModel::Dirty
 

data/lib/mobility/plugins/default.rb

@@ -5,6 +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
+
 @example With default enabled (falls through to default value)
   class Post
     extend Mobility
@@ -40,12 +46,13 @@ otherwise be nil.
 @example Using Proc as default
   class Post
     extend Mobility
-    translates :title, default: lambda { |model:, attribute:| attribute.to_s }
+    translates :title, default: lambda { |attribute:, locale:| "#{attribute} in #{locale}" }
   end
 
+  Mobility.locale = :en
   post = Post.new(title: nil)
   post.title
-  #=> "title"
+  #=> "title in en"
 
   post.title(default: lambda { |model:| model.class.name.to_s })
   #=> "Post"
@@ -62,7 +69,11 @@ otherwise be nil.
         define_method :read do |locale, options = {}|
           default = options.has_key?(:default) ? options.delete(:default) : default_option
           if (value = super(locale, options)).nil?
-            default.is_a?(Proc) ? default.call(model: model, attribute: attribute) : default
+            return default unless default.is_a?(Proc)
+            default.call(model: model,
+                         attribute: attribute,
+                         locale: locale,
+                         options: options)
           else
             value
           end

data/lib/mobility/plugins/dirty.rb

@@ -9,6 +9,7 @@ Dirty tracking for Mobility attributes. See class-specific implementations for
 details.
 
 @see Mobility::Plugins::ActiveModel::Dirty
+@see Mobility::Plugins::ActiveRecord::Dirty
 @see Mobility::Plugins::Sequel::Dirty
 
 @note Dirty tracking can have unexpected results when combined with fallbacks.

data/lib/mobility/version.rb

@@ -1,3 +1,3 @@
 module Mobility
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobility
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Chris Salzberg
@@ -30,7 +30,7 @@ cert_chain:
   eGDROPZoL5RXwiOnRbexxa7dcAxMrDfGB/hpiunIPWPsi4n5P7K/6OO/sGVMl9xv
   SZBPXjzrHdyOFLBYXB+PG7s3F/4=
   -----END CERTIFICATE-----
-date: 2017-12-01 00:00:00.000000000 Z
+date: 2017-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store