assignable_values 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c64f8e5f3fa58f5d618e5f38b34700b78c7448e1
-  data.tar.gz: b90a4dc2764d21648b4a05aacc82df635d66c344
+  metadata.gz: 80416120490eb1fa174ee1af4318c93ce18fd432
+  data.tar.gz: e4379495924e83d42bb9b610b9adef3ba4ca3b01
 SHA512:
-  metadata.gz: 4775a81d5bf1cf18e5b91aa4bebe4f0115f304a23d8c64430f38239cf32df51b7ca9b60b0a8d053d206886c2c279249ea01067dd11ea05e89006dfac33fbf687
-  data.tar.gz: 3681d4acbc2c467654806b955aa12d3e5325442ef02dfec8409b3ce9329c2d0478e701ecc64f8bd48c9569929fb526f952229b0f2563cc6c258d2f4e3cd8b920
+  metadata.gz: efb7a94db723785ea7e3eab7c2a8919aa32cd16441c3f4b60d63d7463f63720a35d2f46c97fb81dd7c876d55337f7982f6a9fc525905401393abbf56fe94dedf
+  data.tar.gz: d7094fe9d1419a44aa156e3b315ffcb981b449b1c419a8e5d52500389d2be0bbf14ab7cc8db79cca895931ac3a3027556de7a8d58957ac98001b822074f9209e

data/.ruby-version

@@ -1 +1 @@
-2.1.8
+2.3.1

data/.travis.yml

@@ -4,6 +4,7 @@ rvm:
   - 1.8.7
   - 2.1.8
   - 2.3.1
+  - 2.4.2
 
 gemfile:
   - gemfiles/Gemfile.2.3
@@ -18,10 +19,16 @@ matrix:
       rvm: 2.1.8
     - gemfile: gemfiles/Gemfile.2.3
       rvm: 2.3.1
+    - gemfile: gemfiles/Gemfile.2.3
+      rvm: 2.4.2
     - gemfile: gemfiles/Gemfile.3.2
       rvm: 2.3.1
+    - gemfile: gemfiles/Gemfile.3.2
+      rvm: 2.4.2
     - gemfile: gemfiles/Gemfile.4.2
       rvm: 1.8.7
+    - gemfile: gemfiles/Gemfile.4.2
+      rvm: 2.4.2
     - gemfile: gemfiles/Gemfile.5.0
       rvm: 2.1.8
     - gemfile: gemfiles/Gemfile.5.0

data/gemfiles/Gemfile.3.2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    assignable_values (0.13.1)
+    assignable_values (0.13.2)
       activerecord (>= 2.3)
 
 GEM

data/gemfiles/Gemfile.4.2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    assignable_values (0.13.1)
+    assignable_values (0.13.2)
       activerecord (>= 2.3)
 
 GEM
@@ -67,4 +67,4 @@ DEPENDENCIES
   rspec_candy
 
 BUNDLED WITH
-   1.15.4
+   1.16.1

data/gemfiles/Gemfile.5.0.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    assignable_values (0.13.1)
+    assignable_values (0.13.2)
       activerecord (>= 2.3)
 
 GEM
@@ -64,4 +64,4 @@ DEPENDENCIES
   rspec_candy
 
 BUNDLED WITH
-   1.15.4
+   1.16.1

data/gemfiles/Gemfile.5.1.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    assignable_values (0.13.1)
+    assignable_values (0.13.2)
       activerecord (>= 2.3)
 
 GEM
@@ -65,4 +65,4 @@ DEPENDENCIES
   rspec_candy
 
 BUNDLED WITH
-   1.15.4
+   1.16.1

data/lib/assignable_values/active_record/restriction/belongs_to_association.rb

@@ -27,11 +27,15 @@ module AssignableValues
         end
 
         def has_previously_saved_value?(record)
-          !record.new_record? && record.respond_to?(association_id_was_method)
+          if record.respond_to?(:attribute_in_database)
+            !record.new_record? # Rails >= 5.1
+          else
+            !record.new_record? && record.respond_to?(association_id_was_method) # Rails <= 5.0
+          end
         end
 
         def previously_saved_value(record)
-          if old_id = record.send(association_id_was_method).presence
+          if old_id = association_id_was(record)
             if old_id == association_id(record)
               current_value(record) # no need to query the database if nothing changed
             else
@@ -46,6 +50,14 @@ module AssignableValues
 
         private
 
+        def association_id_was(record)
+          if record.respond_to?(:attribute_in_database)
+            record.attribute_in_database(:"#{association_id_method}").presence # Rails >= 5.1
+          else
+            record.send(association_id_was_method).presence # Rails <= 5.0
+          end
+        end
+
         def association_id_was_method
           :"#{association_id_method}_was"
         end

data/lib/assignable_values/active_record/restriction/scalar_attribute.rb

@@ -75,15 +75,27 @@ module AssignableValues
         end
 
         def has_previously_saved_value?(record)
-          !record.new_record? && record.respond_to?(value_was_method)
+          if record.respond_to?(:attribute_in_database)
+            !record.new_record?  # Rails >= 5.1
+          else
+            !record.new_record? && record.respond_to?(value_was_method) # Rails <= 5.0
+          end
         end
 
         def previously_saved_value(record)
-          record.send(value_was_method)
+          value_was(record)
         end
 
         private
 
+        def value_was(record)
+          if record.respond_to?(:attribute_in_database)
+            record.attribute_in_database(:"#{property}") # Rails >= 5.1
+          else
+            record.send(value_was_method) # Rails <= 5.0
+          end
+        end
+
         def value_was_method
           :"#{property}_was"
         end

data/lib/assignable_values/version.rb

@@ -1,3 +1,3 @@
 module AssignableValues
-  VERSION = '0.13.1'
+  VERSION = '0.13.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: assignable_values
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-24 00:00:00.000000000 Z
+date: 2018-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -100,4 +100,3 @@ test_files:
 - spec/support/database.travis.yml
 - spec/support/i18n.yml
 - spec/support/models.rb
-has_rdoc: