active_data 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fd00914914806d951a6e19e1927d9256d681c3af5b2125b67e06b3d90ad368f
-  data.tar.gz: ceeb1a7d53206a65d045d7a46017d261a0d872aa384bdebc7f11f4500861226d
+  metadata.gz: 1c1d3b2c3318d731085fd9a76ef956e1d9fe4b52877b21384acb02e146c2408d
+  data.tar.gz: d95da2f65fd5a789369359e3787afd4f380f29e4a5e87afb599bcaff80fe57bf
 SHA512:
-  metadata.gz: 995f37a727c0815e131189133c31a8bb767f7001fecef437305e81723c11ec25f54884cc50411fb34e53d213fb7482298af8ac2d576e51da68044fb2deb287e5
-  data.tar.gz: e9609fb34fba1628e4bc3d341378c2fea985fa021b2463ed61d5f9b2b9ae997315d07a54de516402459b2dc51dffc66076f1e64a492021895b507c3770330d58
+  metadata.gz: 9d31b3015091e0d535d80e835d6f05e10526c5f4173b57c0d7c5b771d1b823109abb7e33fbb081d2fc1940c15916a6904221c2c9ec96c0014532af664d2b2ce3
+  data.tar.gz: 7c825f0e284920b89ee85faa0a2e56dd11199ae3a3cc55b6aff902695e2214326ee273fb1005395c9181522a019cfe7e12fdd32d7d83b80cb5a0c651734a2f0c

data/.travis.yml

@@ -1,32 +1,15 @@
 sudo: false
 
-rvm:
-  - 2.2.10
-  - 2.3.7
-  - 2.4.4
-  - rbx
-
-gemfile:
-  - gemfiles/rails.4.0.gemfile
-  - gemfiles/rails.4.1.gemfile
-  - gemfiles/rails.4.2.gemfile
-  - gemfiles/rails.5.0.gemfile
-  - gemfiles/rails.5.1.gemfile
-  - gemfiles/rails.5.2.gemfile
-
 matrix:
-  allow_failures:
-    - rvm: rbx
-  exclude:
-    - rvm: 2.4.4
-      gemfile: gemfiles/rails.4.0.gemfile
-    - rvm: 2.4.4
-      gemfile: gemfiles/rails.4.1.gemfile
-    - rvm: 2.4.4
+  include:
+    - rvm: 2.3.8
       gemfile: gemfiles/rails.4.2.gemfile
-
-before_install:
-  - gem update --system --no-doc
+    - rvm: 2.4.7
+      gemfile: gemfiles/rails.5.1.gemfile
+    - rvm: 2.5.6
+      gemfile: gemfiles/rails.5.2.gemfile
+    - rvm: 2.6.4
+      gemfile: gemfiles/rails.6.0.gemfile
 
 script:
   - bundle exec rspec

data/Appraisals

@@ -1,7 +1,8 @@
-%w[4.0 4.1 4.2 5.0 5.1 5.2].each do |version|
+%w[4.2 5.1 5.2 6.0].each do |version|
   appraise "rails.#{version}" do
     gem 'activesupport', "~> #{version}.0"
     gem 'activemodel', "~> #{version}.0"
     gem 'activerecord', "~> #{version}.0"
+    gem 'sqlite3', '~> 1.3.6' if version < '6.0'
   end
 end

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # master
 
+# Version 1.1.5
+
+* Rails 6 support (#70, #71)
+
 # Version 1.1.4
 
 ## Changes

data/active_data.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec', '~> 3.7.0'
   gem.add_development_dependency 'rspec-its'
   gem.add_development_dependency 'rubocop', '0.52.1'
-  gem.add_development_dependency 'rubysl', '~> 2.0' if RUBY_ENGINE == 'rbx'
   gem.add_development_dependency 'sqlite3'
   gem.add_development_dependency 'uuidtools'
 

data/gemfiles/rails.4.2.gemfile

@@ -5,6 +5,7 @@ source "https://rubygems.org"
 gem "activesupport", "~> 4.2.0"
 gem "activemodel", "~> 4.2.0"
 gem "activerecord", "~> 4.2.0"
+gem "sqlite3", "~> 1.3.6"
 
 group :test do
   gem "guard"

data/gemfiles/rails.5.1.gemfile

@@ -5,6 +5,7 @@ source "https://rubygems.org"
 gem "activesupport", "~> 5.1.0"
 gem "activemodel", "~> 5.1.0"
 gem "activerecord", "~> 5.1.0"
+gem "sqlite3", "~> 1.3.6"
 
 group :test do
   gem "guard"

data/gemfiles/rails.5.2.gemfile

@@ -5,6 +5,7 @@ source "https://rubygems.org"
 gem "activesupport", "~> 5.2.0"
 gem "activemodel", "~> 5.2.0"
 gem "activerecord", "~> 5.2.0"
+gem "sqlite3", "~> 1.3.6"
 
 group :test do
   gem "guard"

data/gemfiles/{rails.4.0.gemfile → rails.6.0.gemfile}

@@ -2,9 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "activesupport", "~> 4.0.0"
-gem "activemodel", "~> 4.0.0"
-gem "activerecord", "~> 4.0.0"
+gem "activesupport", "~> 6.0.0"
+gem "activemodel", "~> 6.0.0"
+gem "activerecord", "~> 6.0.0"
 
 group :test do
   gem "guard"

data/lib/active_data/model/attributes/base.rb

@@ -81,8 +81,13 @@ module ActiveData
           pollute = owner.class.dirty? && !owner.send(:attribute_changed?, name)
 
           if pollute
-            previous_value = read
+            previous_value = owner.__send__(name)
+            owner.send("#{name}_will_change!")
+
             result = yield
+
+            owner.__send__(:clear_attribute_changes, [name]) if owner.__send__(name) == previous_value
+
             if previous_value != read || (
               read.respond_to?(:changed?) &&
               read.changed?

data/lib/active_data/version.rb

@@ -1,3 +1,3 @@
 module ActiveData
-  VERSION = '1.1.4'.freeze
+  VERSION = '1.1.5'.freeze
 end

data/spec/lib/active_data/model/dirty_spec.rb

@@ -71,8 +71,8 @@ describe ActiveData::Model::Dirty do
   specify { expect(Model.new(numbers: '42').changes).to eq('numbers' => [[], [42]]) }
 
   # Have no idea how should it work right now
-  specify { expect(Model.new(title: 'Hello').changes).to eq('title' => [{}, 'Hello']) }
-  specify { expect(Model.new(title_translations: {en: 'Hello'}).changes).to eq('title' => [{}, 'Hello']) }
+  specify { expect(Model.new(title: 'Hello').changes).to eq('title' => [nil, 'Hello']) }
+  specify { expect(Model.new(title_translations: {en: 'Hello'}).changes).to eq('title' => [nil, 'Hello']) }
 
   specify { expect(Model.new).not_to respond_to :something_changed? }
   specify { expect(Model.new).to respond_to :n_changed? }

data/spec/lib/active_data/model/representation_spec.rb

@@ -39,11 +39,17 @@ describe ActiveData::Model::Representation do
     end
 
     context 'dirty' do
-      before { Post.include ActiveData::Model::Dirty }
+      before do
+        Author.include ActiveData::Model::Dirty
+        Post.include ActiveData::Model::Dirty
+      end
 
       specify do
         expect(Post.new(author: author, rate: '33').changes)
           .to eq('author' => [nil, author], 'rate' => [42, 33])
+
+        expect(Post.new(author: author, rate: '33').changes)
+          .to eq('author' => [nil, author])
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_data
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - pyromaniac
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-14 00:00:00.000000000 Z
+date: 2019-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -199,12 +199,10 @@ files:
 - README.md
 - Rakefile
 - active_data.gemspec
-- gemfiles/rails.4.0.gemfile
-- gemfiles/rails.4.1.gemfile
 - gemfiles/rails.4.2.gemfile
-- gemfiles/rails.5.0.gemfile
 - gemfiles/rails.5.1.gemfile
 - gemfiles/rails.5.2.gemfile
+- gemfiles/rails.6.0.gemfile
 - lib/active_data.rb
 - lib/active_data/active_record/associations.rb
 - lib/active_data/active_record/nested_attributes.rb
@@ -333,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Working with hashes in AR style

data/gemfiles/rails.4.1.gemfile

@@ -1,14 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activesupport", "~> 4.1.0"
-gem "activemodel", "~> 4.1.0"
-gem "activerecord", "~> 4.1.0"
-
-group :test do
-  gem "guard"
-  gem "guard-rspec"
-end
-
-gemspec path: "../"

data/gemfiles/rails.5.0.gemfile

@@ -1,14 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activesupport", "~> 5.0.0"
-gem "activemodel", "~> 5.0.0"
-gem "activerecord", "~> 5.0.0"
-
-group :test do
-  gem "guard"
-  gem "guard-rspec"
-end
-
-gemspec path: "../"