mobility 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 517f855df0698bb34baeac4033972a5950df7333
-  data.tar.gz: 569bf64eb02f45abd227d75bf28e53fd8a2aa4a1
+  metadata.gz: e0b92c27c73b5d4052c752d8d63a5b6790696f89
+  data.tar.gz: b58166a5c8ef6acdb721b5d4976be04834b65031
 SHA512:
-  metadata.gz: d6431a9d3884fffec244488d8f56e906f5a514eb9f74e14b9d6fff192fe43046ad3bfe6a00720bf27e383e613c38b8269fac2a58aa6996b25b483aac6450b6bd
-  data.tar.gz: d78ecb91bd70a1f3266a550f5fb69297e0259dd08ba7cae7091bec8146fb85d72230d9d0ebeea803118a11f96fc5ac41cf7b2041f9efdd60daed81d1dba10342
+  metadata.gz: 497358cffc62727e4197b38cca78eb7b7fec7b591921fc814ee84c915be6925f3082d7820f07541212ad42704e6dd55a89503b59ce56b14c56aaa8823108b7d8
+  data.tar.gz: 82b9f2c2de83f49ba2b2bc2f716d3aacc61631cb430e29977c6d7281b87f85b871b73aa6b71f5dce9b2e54f15f4bbf0659c48c3ec462753f5012aa602eb9d9c6

checksums.yaml.gz.sig

@@ -1,3 +1,2 @@
-�����ut�T�h/���V��]Xu�	ϙ�#�����J��7��|P��o
-̫2:}�B��j��!�Pq8�Zk=	Hc��k��V#���H������#"
-iEI����[=��0
+$��y�;i�����I�mLJ�(������xeܧ��U��R�ˀ�"<֋�ժb]a����N�B��s�.p���:^6��n�f���?^��=��z�҇q��';��.�����A�_P0F%�b�-U�b��V��fqW*#&��#�M:W �-���'��I%����
+���o�A��v��uh���gH�����ȠtSڽ�Y�<P-ba�,�X�S�B��	G�4�v�E$�ź�B��,J

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## 0.4
 
+### 0.5.1 (March 21, 2018)
+* Fix issues with Dirty plugin in ActiveRecord 5.2.0.rc2
+  ([#166](https://github.com/shioyama/mobility/pull/166))
+
 ### 0.5.0 (March 16, 2018)
 * Support PostgreSQL json column format as Json backend and dynamically in
   Container backend ([#182](https://github.com/shioyama/mobility/pull/182) and

data/Gemfile

@@ -12,10 +12,8 @@ group :development, :test do
     elsif ENV['RAILS_VERSION'] == '5.1'
       gem 'activerecord', '>= 5.1', '< 5.2'
     else
-      # TODO: change to '>= 5.2.0.beta1, < 5.3'
-      #   once dirty specs pass in 5.2.0.rc1
-      gem 'activerecord', '5.2.0.beta2'
-      gem 'railties', '5.2.0.beta2'
+      gem 'activerecord', '>= 5.2.0.rc2', '< 5.3'
+      gem 'railties', '>= 5.2.0.rc2', '< 5.3'
     end
     gem "generator_spec", '~> 0.9.4'
   elsif ENV['ORM'] == 'sequel'

data/Gemfile.lock

@@ -8,28 +8,28 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.2.0.beta2)
-      actionview (= 5.2.0.beta2)
-      activesupport (= 5.2.0.beta2)
+    actionpack (5.2.0.rc2)
+      actionview (= 5.2.0.rc2)
+      activesupport (= 5.2.0.rc2)
       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)
+    actionview (5.2.0.rc2)
+      activesupport (= 5.2.0.rc2)
       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)
+    activemodel (5.2.0.rc2)
+      activesupport (= 5.2.0.rc2)
+    activerecord (5.2.0.rc2)
+      activemodel (= 5.2.0.rc2)
+      activesupport (= 5.2.0.rc2)
       arel (>= 9.0)
-    activesupport (5.2.0.beta2)
+    activesupport (5.2.0.rc2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (9.0.0)
@@ -61,13 +61,13 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    i18n (0.9.5)
+    i18n (1.0.0)
       concurrent-ruby (~> 1.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    loofah (2.2.0)
+    loofah (2.2.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lumberjack (1.0.12)
@@ -96,9 +96,9 @@ GEM
       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)
+    railties (5.2.0.rc2)
+      actionpack (= 5.2.0.rc2)
+      activesupport (= 5.2.0.rc2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
@@ -106,7 +106,7 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
-    request_store (1.4.0)
+    request_store (1.4.1)
       rack (>= 1.4)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
@@ -134,7 +134,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (= 5.2.0.beta2)
+  activerecord (>= 5.2.0.rc2, < 5.3)
   benchmark-ips
   bundler (~> 1.12)
   database_cleaner (~> 1.5, >= 1.5.3)
@@ -144,7 +144,7 @@ DEPENDENCIES
   mysql2 (~> 0.4.9)
   pg (< 1.0)
   pry-byebug
-  railties (= 5.2.0.beta2)
+  railties (>= 5.2.0.rc2, < 5.3)
   rake (~> 12, >= 12.2.1)
   rspec (~> 3.0)
   sqlite3

data/README.md

@@ -22,7 +22,7 @@ different languages. For examples of what Mobility can do, see the
 <a href="#companies-using-mobility">Companies using Mobility</a> section below.
 
 Storage of translations is handled by customizable "backends" which encapsulate
-different storage strategies. The default, preferred way to store translations
+different storage strategies. The default way to store translations
 is to put them all in a set of two shared tables, but many alternatives are
 also supported, including [translatable
 columns](http://dejimata.com/2017/3/3/translating-with-mobility#strategy-1) and
@@ -54,7 +54,7 @@ Installation
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'mobility', '~> 0.5.0'
+gem 'mobility', '~> 0.5.1'
 ```
 
 Mobility is cryptographically signed. To be sure the gem you install hasn't

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

@@ -68,7 +68,6 @@ Implements the {Mobility::Backends::KeyValue} backend for ActiveRecord models.
             send(association_name).destroy(translation)
           end
         end
-        after_destroy :mobility_destroy_key_value_translations
 
         module_name = "MobilityArKeyValue#{association_name.to_s.camelcase}"
         unless const_defined?(module_name)
@@ -98,13 +97,12 @@ Implements the {Mobility::Backends::KeyValue} backend for ActiveRecord models.
       end
 
       module DestroyKeyValueTranslations
-        private
-
-        # Clean up *all* leftover translations of this model, only once.
-        def mobility_destroy_key_value_translations
-          [:string, :text].freeze.each do |type|
-            Mobility::ActiveRecord.const_get("#{type.capitalize}Translation").
-              where(translatable: self).destroy_all
+        def self.included(model_class)
+          model_class.after_destroy do
+            [:string, :text].each do |type|
+              Mobility::ActiveRecord.const_get("#{type.capitalize}Translation").
+                where(translatable: self).destroy_all
+            end
           end
         end
       end

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

@@ -54,7 +54,7 @@ module Mobility
         define_method :where! do |opts, *rest|
           if i18n_keys = q.extract_attributes(opts)
             opts = opts.with_indifferent_access
-            i18n_nulls = i18n_keys.reject { |key| opts[key] && Array.wrap(opts[key]).all? }
+            i18n_nulls = i18n_keys.reject { |key| opts[key] && Array(opts[key]).all? }
             i18n_keys.each { |attr| opts["#{attr}_#{association_name}"] = { value: opts.delete(attr) }}
             super(opts, *rest).
               send("join_#{association_name}", *(i18n_keys - i18n_nulls)).

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

@@ -7,11 +7,14 @@ Defines query methods for Postgres backends. Including class must define a
 single method, +matches+, which accepts a column, value and locale to
 match, and returns an Arel node.
 
-This module avoids 99% duplication between hstore and jsonb backend querying
-code.
+This module avoids a lot of duplication between hstore/json/jsonb/container
+backend querying code.
 
+@see Mobility::Backends::ActiveRecord::Json::QueryMethods
 @see Mobility::Backends::ActiveRecord::Jsonb::QueryMethods
 @see Mobility::Backends::ActiveRecord::Hstore::QueryMethods
+@see Mobility::Backends::ActiveRecord::Container::JsonQueryMethods
+@see Mobility::Backends::ActiveRecord::Container::JsonbQueryMethods
 
 =end
       module PgQueryMethods

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

@@ -92,7 +92,7 @@ module Mobility
             options = {
               # We only need an OUTER JOIN if every value is either nil, or an
               # array with at least one nil value.
-              outer_join: opts.values_at(*i18n_keys).compact.all? { |v| !Array.wrap(v).all? }
+              outer_join: opts.values_at(*i18n_keys).compact.all? { |v| !Array(v).all? }
             }
             i18n_keys.each { |attr| opts["#{translation_class.table_name}.#{attr}"] = opts.delete(attr) }
             super(opts, *rest).send("join_#{association_name}", options)

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

@@ -33,7 +33,7 @@ Implements the {Mobility::Backends::KeyValue} backend for Sequel models.
       # @option options [Class] class_name Translation model class
       def initialize(model, attribute, options = {})
         super
-        @class_name       = options[:class_name]
+        @class_name = options[:class_name]
       end
 
       # @!group Backend Configuration
@@ -83,23 +83,8 @@ Implements the {Mobility::Backends::KeyValue} backend for Sequel models.
         end
         include callback_methods
 
+        include DestroyKeyValueTranslations
         include Mobility::Sequel::ColumnChanges.new(*attributes)
-
-        private
-
-        # Clean up *all* leftover translations of this model, only once.
-        def self.mobility_key_value_callbacks_module
-          @mobility_key_value_destroy_callbacks_module ||= Module.new do
-            def after_destroy
-              super
-              [:string, :text].freeze.each do |type|
-                Mobility::Sequel.const_get("#{type.capitalize}Translation").
-                  where(translatable_id: id, translatable_type: self.class.name).destroy
-              end
-            end
-          end
-        end unless respond_to?(:mobility_key_value_callbacks_module, true)
-        include mobility_key_value_callbacks_module
       end
 
       setup_query_methods(QueryMethods)
@@ -121,6 +106,17 @@ Implements the {Mobility::Backends::KeyValue} backend for Sequel models.
         end
       end
 
+      # Clean up *all* leftover translations of this model, only once.
+      module DestroyKeyValueTranslations
+        def after_destroy
+          super
+          [:string, :text].freeze.each do |type|
+            Mobility::Sequel.const_get("#{type.capitalize}Translation").
+              where(translatable_id: id, translatable_type: self.class.name).destroy
+          end
+        end
+      end
+
       class CacheRequired < ::StandardError; end
 
       module Cache

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

@@ -13,8 +13,8 @@ private methods:
   returns an SQL expression which checks that the column has a value in the
   locale
 
-(The +matches+ method is implemented slightly differently for hstore and
-jsonb columns.)
+(The +matches+ and +has_locale+ methods are implemented slightly differently
+for hstore/json/jsonb/container backends.)
 
 =end
       module PgQueryMethods

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

@@ -122,6 +122,24 @@ AR::Dirty plugin adds support for the following persistence-specific methods
                 mobility_changed_attributes.include?(attr) ? __send__(attr) : super
               end
             end
+
+            # @note This is necessary due to a performance fix in e12607
+            #   which skips setting @previously_changed if @attributes is
+            #   defined. For Mobility models using the Dirty plugin, there will
+            #   be cases where @attributes has been set, but there are *other*
+            #   changes on virtual translated attributes which need to also be
+            #   assigned. In this case, we use the presence of such changed
+            #   virtual attributes as an alternative trigger to set this variable.
+            #
+            #   See:
+            #   - https://github.com/rails/rails/commit/e126078a0e013acfe0a397a8dad33b2c9de78732
+            #   - https://github.com/shioyama/mobility/pull/166
+            def changes_applied
+              if defined?(@attributes) && mobility_changed_attributes.any?
+                @previously_changed = changes
+              end
+              super
+            end
           end
         end
       end

data/lib/mobility/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mobility
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobility
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Chris Salzberg
@@ -30,7 +30,7 @@ cert_chain:
   eGDROPZoL5RXwiOnRbexxa7dcAxMrDfGB/hpiunIPWPsi4n5P7K/6OO/sGVMl9xv
   SZBPXjzrHdyOFLBYXB+PG7s3F/4=
   -----END CERTIFICATE-----
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2018-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store