active_type 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dedf631cb94b6d78cba8e784416802df866a1f8acbdcf3fd7d25f4d15bada221
-  data.tar.gz: f5a41ad162f78acca060c78341b71709f6bfcedd3dbfffcee510a39b48e1b077
+  metadata.gz: 5dd2986e6945783f4c52776074f66d614ecbbcef28f5eb1471ebf450dd68c8d2
+  data.tar.gz: 763be8835f5184df763527d0b10b8af06edf12168a8d76ebc67951680e097cb7
 SHA512:
-  metadata.gz: 2b573202922cbdcb5b37f22b4006184c6b5133ee1637778ed2381dc4c47a4974e31715eba54048eae1de0b224a20ec80b36f861368ac4d9312eed2b03371c8be
-  data.tar.gz: d995b70abef2d78358677a4b6c7e26bb701b5914ef24f088e806f0cf895efad3b90ce2a9487c195da2934927e7f68bb573ea5244471baab2ee1212baaa72e034
+  metadata.gz: 301557809bffecdb33705cb01d68a1da237d6d0d30e726239e8c2af57c59eeb81c8c3287796f49c76abe0c4a65ab4196d4d23374224c0796ae207355f58e6019
+  data.tar.gz: bebb85d3edc8733b3816ee82925659a804836eaddc20d100c171a1eeb034134e3159de414d62fadc406d243c13b4ed4116b74127e777bf9da1d9872af7c3ea2b

data/.travis.yml

@@ -9,10 +9,10 @@ gemfile:
   - Gemfile.4.2.mysql2
   - Gemfile.4.2.pg
   - Gemfile.4.2.sqlite3
-  - Gemfile.5.1.pg
   - Gemfile.5.2.mysql2
   - Gemfile.5.2.sqlite3
   - Gemfile.5.2.pg
+  - Gemfile.6.0.pg
 before_script:
   - psql -c 'create database active_type_test;' -U postgres
   - mysql -e 'create database IF NOT EXISTS active_type_test;'
@@ -38,5 +38,11 @@ matrix:
       gemfile: Gemfile.4.2.pg
     - rvm: "2.5.3"
       gemfile: Gemfile.4.2.sqlite3
+    - rvm: "2.3.8"
+      gemfile: Gemfile.6.0.pg
+    - rvm: "2.4.5"
+      gemfile: Gemfile.6.0.pg
 install:
   - bundle install --no-deployment --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
+addons:
+  postgresql: 9.3

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## 1.1.1 (2019-05-07)
+
+* Improved dirty tracking (`#changes?` etc) for virtual attributes to bring it more in line with
+  the behaviour of non-virtual attributes. Behaviour with ActiveRecord < 4 remains unchanged.
+  Thanks to @lowski.
+
 ## 1.1.0 (2019-03-04)
 
 * For some use cases, users need to access ActiveRecord's original `.attribute` method, which ActiveType overrides. We now alias `.attribute` as `.ar_attribute`.

data/Gemfile.3.2.mysql2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (1.1.0)
+    active_type (1.1.1)
       activerecord (>= 3.2)
 
 GEM

data/Gemfile.3.2.sqlite3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (1.1.0)
+    active_type (1.1.1)
       activerecord (>= 3.2)
 
 GEM

data/Gemfile.4.2.mysql2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (1.1.0)
+    active_type (1.1.1)
       activerecord (>= 3.2)
 
 GEM

data/Gemfile.4.2.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (1.1.0)
+    active_type (1.1.1)
       activerecord (>= 3.2)
 
 GEM

data/Gemfile.4.2.sqlite3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (1.1.0)
+    active_type (1.1.1)
       activerecord (>= 3.2)
 
 GEM

data/Gemfile.5.2.mysql2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (1.1.0)
+    active_type (1.1.1)
       activerecord (>= 3.2)
 
 GEM

data/Gemfile.5.2.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (1.1.0)
+    active_type (1.1.1)
       activerecord (>= 3.2)
 
 GEM

data/Gemfile.5.2.sqlite3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (1.1.0)
+    active_type (1.1.1)
       activerecord (>= 3.2)
 
 GEM

data/{Gemfile.5.1.pg → Gemfile.6.0.pg}

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', '~>5.1.0'
+gem 'activerecord', '~>6.0.0beta'
 gem 'rspec', '~>3.4'
 gem 'pg'
 gem 'rake'

data/Gemfile.6.0.pg.lock

@@ -0,0 +1,59 @@
+PATH
+  remote: .
+  specs:
+    active_type (1.1.1)
+      activerecord (>= 3.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (6.0.0.beta3)
+      activesupport (= 6.0.0.beta3)
+    activerecord (6.0.0.beta3)
+      activemodel (= 6.0.0.beta3)
+      activesupport (= 6.0.0.beta3)
+    activesupport (6.0.0.beta3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 1.3, >= 1.3.1)
+    concurrent-ruby (1.1.5)
+    diff-lcs (1.3)
+    gemika (0.3.4)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    minitest (5.11.3)
+    pg (1.1.4)
+    rake (12.3.2)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    zeitwerk (1.4.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  active_type!
+  activerecord (~> 6.0.0beta)
+  gemika
+  pg
+  rake
+  rspec (~> 3.4)
+
+BUNDLED WITH
+   1.16.6

data/lib/active_type/version.rb

@@ -1,3 +1,3 @@
 module ActiveType
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/lib/active_type/virtual_attributes.rb

@@ -75,13 +75,13 @@ module ActiveType
       def build_dirty_tracking_methods(name)
         @module.module_eval <<-BODY, __FILE__, __LINE__ + 1
           def #{name}_was
-            nil
+            virtual_attributes_were["#{name}"]
           end
         BODY
 
         @module.module_eval <<-BODY, __FILE__, __LINE__ + 1
           def #{name}_changed?
-            not #{name}.nil?
+            #{name} != virtual_attributes_were["#{name}"]
           end
         BODY
 
@@ -125,6 +125,7 @@ module ActiveType
     def initialize_dup(other)
       @virtual_attributes_cache = {}
       @virtual_attributes = VirtualAttributes.deep_dup(virtual_attributes)
+      @virtual_attributes_were = VirtualAttributes.deep_dup(virtual_attributes_were)
 
       super
     end
@@ -133,6 +134,10 @@ module ActiveType
       @virtual_attributes ||= {}
     end
 
+    def virtual_attributes_were
+      @virtual_attributes_were ||= {}
+    end
+
     def virtual_attributes_cache
       @virtual_attributes_cache ||= {}
     end
@@ -168,6 +173,31 @@ module ActiveType
       end
     end
 
+    def changed?
+      self.class._virtual_column_names.any? { |attr| virtual_attributes_were[attr] != send(attr) } || super
+    end
+
+    def changes
+      changes = self.class._virtual_column_names.each_with_object({}) do |attr, changes|
+        current_value = send(attr)
+        previous_value = virtual_attributes_were[attr]
+        changes[attr] = [previous_value, current_value] if  previous_value != current_value
+      end
+
+      super.merge(changes)
+    end
+
+    if ActiveRecord::VERSION::MAJOR >= 4
+      def changes_applied
+        super
+
+        virtual_attributes.each do |attr, _|
+          value = read_virtual_attribute(attr)
+          virtual_attributes_were[attr] = value.duplicable? ? value.clone : value
+        end
+      end
+    end
+
     def read_virtual_attribute(name)
       name = name.to_s
       if virtual_attributes_cache.has_key?(name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_type
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Tobias Kraze
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-04 00:00:00.000000000 Z
+date: 2019-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,14 +75,14 @@ files:
 - Gemfile.4.2.pg.lock
 - Gemfile.4.2.sqlite3
 - Gemfile.4.2.sqlite3.lock
-- Gemfile.5.1.pg
-- Gemfile.5.1.pg.lock
 - Gemfile.5.2.mysql2
 - Gemfile.5.2.mysql2.lock
 - Gemfile.5.2.pg
 - Gemfile.5.2.pg.lock
 - Gemfile.5.2.sqlite3
 - Gemfile.5.2.sqlite3.lock
+- Gemfile.6.0.pg
+- Gemfile.6.0.pg.lock
 - Gemfile.lock
 - LICENSE
 - README.md
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Make any Ruby object quack like ActiveRecord

data/Gemfile.5.1.pg.lock

@@ -1,59 +0,0 @@
-PATH
-  remote: .
-  specs:
-    active_type (1.1.0)
-      activerecord (>= 3.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (5.1.6.1)
-      activesupport (= 5.1.6.1)
-    activerecord (5.1.6.1)
-      activemodel (= 5.1.6.1)
-      activesupport (= 5.1.6.1)
-      arel (~> 8.0)
-    activesupport (5.1.6.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (8.0.0)
-    concurrent-ruby (1.1.4)
-    diff-lcs (1.3)
-    gemika (0.3.4)
-    i18n (1.5.3)
-      concurrent-ruby (~> 1.0)
-    minitest (5.11.3)
-    pg (0.21.0)
-    rake (12.0.0)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  active_type!
-  activerecord (~> 5.1.0)
-  gemika
-  pg
-  rake
-  rspec (~> 3.4)
-
-BUNDLED WITH
-   1.16.6