mobility 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b2c85161a42ab2c88e2794d754ce12233267609
-  data.tar.gz: cae36c91d8ebcaa6e626a1409b6b28acd2e123d5
+  metadata.gz: 608d78d453d3a4a8c70d081851ad41b7469ea359
+  data.tar.gz: 25a56ec92b1f17a64b0f7ff2305709ac461a0b21
 SHA512:
-  metadata.gz: 74dc7a52f90f4949bbe061e34dbcead628fbeba9e04582d687f1db0930b4bcdf19cc69e3e6fcb397a47d6e30f5311dc71cf4254152d544ac77cd6d5770022979
-  data.tar.gz: 47b403bd4f85a0401a662eb5ff69233eca34a6965ed8f9d8a0c82480622d6e41abf623f7efed257db8e8b978a28144d7eba56238ef8692c8b6b25665090d23c7
+  metadata.gz: 0ee3ca1d2c69def85e662c064809c611cd1f93f4ec512ba85fdd011b4349de739175421cd6a1658060691e8ff8122c808056c254c24bfba2c7bfc803fd1fad7e
+  data.tar.gz: 4d32541308d245ea15bc1a2867876448e5fc637c30a794127807c5f63789c21f0f221160a54264777866a07416c7e09ff6d1d5df4e223ad3de74459fd54d788b

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## 0.1
 
+### 0.1.18 (June 21, 2017)
+* Fix deprecation warnings when using ActiveRecord 5.1
+  ([#44](https://github.com/shioyama/mobility/pull/44))
+
 ### 0.1.17 (June 16, 2017)
 * Fix STI issues ([#43](https://github.com/shioyama/mobility/pull/43))
 

data/Gemfile.lock

@@ -1,45 +1,45 @@
 PATH
   remote: .
   specs:
-    mobility (0.1.16)
+    mobility (0.1.17)
       i18n (>= 0.6.10, < 0.9)
       request_store (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.0.3)
-      actionview (= 5.0.3)
-      activesupport (= 5.0.3)
+    actionpack (5.1.1)
+      actionview (= 5.1.1)
+      activesupport (= 5.1.1)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.3)
-      activesupport (= 5.0.3)
+    actionview (5.1.1)
+      activesupport (= 5.1.1)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
+      erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activemodel (5.0.3)
-      activesupport (= 5.0.3)
-    activerecord (5.0.3)
-      activemodel (= 5.0.3)
-      activesupport (= 5.0.3)
-      arel (~> 7.0)
-    activesupport (5.0.3)
+    activemodel (5.1.1)
+      activesupport (= 5.1.1)
+    activerecord (5.1.1)
+      activemodel (= 5.1.1)
+      activesupport (= 5.1.1)
+      arel (~> 8.0)
+    activesupport (5.1.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (7.1.4)
+    arel (8.0.0)
     builder (3.2.3)
     byebug (9.0.6)
     coderay (1.1.1)
     concurrent-ruby (1.0.5)
     database_cleaner (1.6.1)
     diff-lcs (1.3)
-    erubis (2.7.0)
+    erubi (1.6.0)
     ffi (1.9.18)
     formatador (0.2.5)
     generator_spec (0.9.4)
@@ -59,7 +59,7 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    i18n (0.8.1)
+    i18n (0.8.4)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -77,7 +77,7 @@ GEM
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    pg (0.20.0)
+    pg (0.21.0)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -93,16 +93,16 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (5.0.3)
-      actionpack (= 5.0.3)
-      activesupport (= 5.0.3)
+    railties (5.1.1)
+      actionpack (= 5.1.1)
+      activesupport (= 5.1.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.5.0)
     rb-fsevent (0.9.8)
-    rb-inotify (0.9.8)
-      ffi (>= 0.5.0)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
     request_store (1.3.2)
     rspec (3.6.0)
       rspec-core (~> 3.6.0)
@@ -131,7 +131,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (>= 5.0, < 5.1)
+  activerecord (>= 5.1, < 5.2)
   bundler (~> 1.12)
   database_cleaner (~> 1.5, >= 1.5.3)
   generator_spec (~> 0.9.4)

data/README.md

@@ -47,7 +47,7 @@ Installation
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'mobility', '~> 0.1.17'
+gem 'mobility', '~> 0.1.18'
 ```
 
 To translate attributes on a model, include (or extend) `Mobility`, then call
@@ -58,9 +58,6 @@ To translate attributes on a model, include (or extend) `Mobility`, then call
 Requirements:
 - ActiveRecord >= 5.0
 
-Using Mobility with Rails 5.1 will currently result in some deprecation
-warnings. This will be fixed soon.
-
 (Support for some backends is also supported with ActiveRecord/Rails 4.2, see
 the [active_record-4.2
 branch](https://github.com/shioyama/mobility/tree/active_record_4.2).)

data/lib/mobility.rb

@@ -102,7 +102,7 @@ module Mobility
 
       if Loaded::ActiveRecord
         model_class.include(ActiveRecord)                   if model_class < ::ActiveRecord::Base
-        model_class.include(ActiveModel::AttributeMethods)  if model_class.ancestors.include?(::ActiveModel::AttributeMethods)
+        model_class.include(ActiveRecord::AttributeMethods) if model_class.ancestors.include?(::ActiveRecord::AttributeMethods)
       end
 
       if Loaded::Sequel

data/lib/mobility/active_model.rb

@@ -1,6 +1,5 @@
 module Mobility
   module ActiveModel
-    autoload :AttributeMethods, "mobility/active_model/attribute_methods"
     autoload :BackendResetter,  "mobility/active_model/backend_resetter"
   end
 end

data/lib/mobility/active_record.rb

@@ -5,6 +5,7 @@ Module loading ActiveRecord-specific classes for Mobility models.
 
 =end
   module ActiveRecord
+    autoload :AttributeMethods,    "mobility/active_record/attribute_methods"
     autoload :BackendResetter,     "mobility/active_record/backend_resetter"
     autoload :ModelTranslation,    "mobility/active_record/model_translation"
     autoload :StringTranslation,   "mobility/active_record/string_translation"
@@ -12,20 +13,6 @@ Module loading ActiveRecord-specific classes for Mobility models.
     autoload :Translation,         "mobility/active_record/translation"
     autoload :UniquenessValidator, "mobility/active_record/uniqueness_validator"
 
-    def changes_applied
-      @previously_changed = changes
-      super
-    end
-
-    def clear_changes_information
-      @previously_changed = ActiveSupport::HashWithIndifferentAccess.new
-      super
-    end
-
-    def previous_changes
-      super.merge(@previously_changed ||= ActiveSupport::HashWithIndifferentAccess.new)
-    end
-
     def self.included(model_class)
       model_class.extend(ClassMethods)
       model_class.const_set(:UniquenessValidator,

data/lib/mobility/{active_model → active_record}/attribute_methods.rb

@@ -1,8 +1,8 @@
 module Mobility
-  module ActiveModel
+  module ActiveRecord
 =begin
 
-Included into model if model has +ActiveModel::AttributeMethods+ among its
+Included into model if model has +ActiveRecord::AttributeMethods+ among its
 ancestors.
 
 =end

data/lib/mobility/backend/active_record.rb

@@ -2,6 +2,7 @@ module Mobility
   module Backend
     module ActiveRecord
       autoload :Column,       'mobility/backend/active_record/column'
+      autoload :Dirty,        'mobility/backend/active_record/dirty'
       autoload :Hstore,       'mobility/backend/active_record/hstore'
       autoload :Jsonb,        'mobility/backend/active_record/jsonb'
       autoload :KeyValue,     'mobility/backend/active_record/key_value'

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

@@ -0,0 +1,45 @@
+module Mobility
+  module Backend
+    module ActiveRecord::Dirty
+      include ActiveModel::Dirty
+
+      # @param [Class] backend_class Class of backend
+      def self.included(backend_class)
+        backend_class.extend(ActiveModel::Dirty::ClassMethods)
+        backend_class.extend(ClassMethods)
+      end
+
+      module ClassMethods
+        def setup_model(model_class, attributes, **options)
+          super
+
+          method_name_regex = /\A(#{attributes.join('|'.freeze)})_([a-z]{2}(_[a-z]{2})?)(=?|\??)\z/.freeze
+          mod = Module.new do
+            define_method :has_attribute? do |attr_name|
+              super(attr_name) || !!method_name_regex.match(attr_name)
+            end
+          end
+
+          model_class.class_eval do
+            extend mod
+
+            method_name = ::ActiveRecord::VERSION::STRING < '5.1' ? :changes_applied : :changes_internally_applied
+            define_method method_name do
+              @previously_changed = changes
+              super()
+            end
+
+            def clear_changes_information
+              @previously_changed = ActiveSupport::HashWithIndifferentAccess.new
+              super
+            end
+
+            def previous_changes
+              (@previously_changed ||= ActiveSupport::HashWithIndifferentAccess.new).merge(super)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mobility/backend/dirty.rb

@@ -25,7 +25,8 @@ details.
       def self.for(model_class)
         model_class ||= Object
         if Loaded::ActiveRecord && model_class.ancestors.include?(::ActiveModel::Dirty)
-          Backend::ActiveModel::Dirty
+          (model_class < ::ActiveRecord::Base) ?
+            Backend::ActiveRecord::Dirty : Backend::ActiveModel::Dirty
         elsif Loaded::Sequel && model_class < ::Sequel::Model
           Backend::Sequel::Dirty
         else

data/lib/mobility/version.rb

@@ -1,3 +1,3 @@
 module Mobility
-  VERSION = "0.1.17"
+  VERSION = "0.1.18"
 end

data/lib/mobility/wrapper.rb

@@ -29,7 +29,7 @@ simple delegator, so any missing method will be delegated to the model class.
     end
 
     def initialize_dup(other)
-      @modules = other.modules.map(&:dup)
+      @modules = other.modules.dup
       super
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mobility
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - Chris Salzberg
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-15 00:00:00.000000000 Z
+date: 2017-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store
@@ -149,9 +149,9 @@ files:
 - lib/generators/rails/mobility/translations_generator.rb
 - lib/mobility.rb
 - lib/mobility/active_model.rb
-- lib/mobility/active_model/attribute_methods.rb
 - lib/mobility/active_model/backend_resetter.rb
 - lib/mobility/active_record.rb
+- lib/mobility/active_record/attribute_methods.rb
 - lib/mobility/active_record/backend_resetter.rb
 - lib/mobility/active_record/model_translation.rb
 - lib/mobility/active_record/string_translation.rb
@@ -165,6 +165,7 @@ files:
 - lib/mobility/backend/active_record.rb
 - lib/mobility/backend/active_record/column.rb
 - lib/mobility/backend/active_record/column/query_methods.rb
+- lib/mobility/backend/active_record/dirty.rb
 - lib/mobility/backend/active_record/hash_valued.rb
 - lib/mobility/backend/active_record/hstore.rb
 - lib/mobility/backend/active_record/hstore/query_methods.rb