active_record-json_associations 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dcecc3d5ba41f7deed96e8178f04221c39678799e3706b0c95938f91f197daf
-  data.tar.gz: c9fcdad4e8cbe19a16fc7bf3d27c8e176e5cedb06a415e95c36aff1b734ffb85
+  metadata.gz: 74ef04233cdf6b923c6be5762d8aa373428bf0ddd74a8fe48f46cbd9b3f16851
+  data.tar.gz: b40d4491c6619ecd3d858864706e3e05e459a3d3f3b20f50eadf0eed416c05db
 SHA512:
-  metadata.gz: a13fc51a526b61d909d6559e22969a9e4f7c75e880efc2ffc50b0c01e1b2aa7daf4858c33beb0dfbac7a57aa77329fd030af02db02efcb7058b8b78f93386328
-  data.tar.gz: e6d33f695da6f13a6ed3253ab90a0246e77a788f7593b3d1338ec8e11d6e449b4f294a8c690f5f4f2f506fb10478c3494e198fba7275d50b8d3f72f38e0d1485
+  metadata.gz: ea1b394dbe6ba8524b50228d9f226af19699171105cd8dda69b7f92f1b1fee6a9dfa06aa85301bfc2403fdb3831972799a38d01a6353c035235e1935fcc57bc2
+  data.tar.gz: e37aec9fff5cfe740cda139ed46c1b7fada912a30a26ebed3945ac6e0a8c7e9356071360278323867f949a666654cf47c9d351b2431c5a2b75fc568273b5439d

data/.github/workflows/ci.yml

@@ -0,0 +1,28 @@
+name: CI
+on: [push, pull_request]
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        gemfile: [ rails_5.1, rails_5.2, rails_6.0, rails_6.1, rails_7.0 ]
+        ruby: [ 2.6, 2.7, '3.0' ]
+        exclude:
+          - gemfile: rails_5.1
+            ruby: 3.0
+          - gemfile: rails_5.2
+            ruby: 3.0
+          - gemfile: rails_7.0
+            ruby: 2.6
+
+    runs-on: ubuntu-latest
+    env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - run: bundle exec rake
+

data/Appraisals

@@ -1,8 +1,3 @@
-appraise "rails-5.0" do
-  gem "rails", "~>5.0.0"
-  gem "sqlite3", "~>1.3.13" # 1.4 seems to break rails 5.0?
-end
-
 appraise "rails-5.1" do
   gem "rails", "~>5.1.0"
 end
@@ -19,3 +14,7 @@ appraise "rails-6.1" do
   gem "rails", "~>6.1.0"
 end
 
+appraise "rails-7.0" do
+  gem "rails", "~>7.0.0"
+end
+

data/gemfiles/{rails_5.0.gemfile → rails_7.0.gemfile}

@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~>5.0.0"
-gem "sqlite3", "~>1.3.13"
+gem "rails", "~>7.0.0"
 
 gemspec path: "../"

data/lib/active_record/json_associations/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module JsonAssociations
-    VERSION = "0.10.0"
+    VERSION = "0.11.0"
   end
 end

data/lib/active_record/json_associations.rb

@@ -24,20 +24,22 @@ module ActiveRecord
 
       if touch
         after_commit do
-          method = respond_to?(:saved_changes) ? :saved_changes : :previous_changes
-          old_ids, new_ids = send(method)[one_ids.to_s]
-          ids = Array(send(one_ids)) | Array(old_ids) | Array(new_ids)
-          scope = class_name.constantize.where(self.class.primary_key => ids)
-
-          if scope.respond_to?(:touch) # AR 6.0+
-            scope.touch_all
-          elsif self.class.respond_to?(:touch_attributes_with_time) # AR 5.1+
-            scope.update_all self.class.touch_attributes_with_time
-          else # AR 5.0
-            attributes = timestamp_attributes_for_update_in_model.inject({}) do |attributes, key|
-              attributes.merge(key => current_time_from_proper_timezone)
+          unless no_touching?
+            method = respond_to?(:saved_changes) ? :saved_changes : :previous_changes
+            old_ids, new_ids = send(method)[one_ids.to_s]
+            ids = Array(send(one_ids)) | Array(old_ids) | Array(new_ids)
+            scope = class_name.constantize.where(self.class.primary_key => ids)
+
+            if scope.respond_to?(:touch) # AR 6.0+
+              scope.touch_all
+            elsif self.class.respond_to?(:touch_attributes_with_time) # AR 5.1+
+              scope.update_all self.class.touch_attributes_with_time
+            else # AR 5.0
+              attributes = timestamp_attributes_for_update_in_model.inject({}) do |attributes, key|
+                attributes.merge(key => current_time_from_proper_timezone)
+              end
+              scope.update_all attributes
             end
-            scope.update_all attributes
           end
         end
       end

data/spec/json_associations_spec.rb

@@ -185,6 +185,14 @@ describe ActiveRecord::JsonAssociations do
         parent.update!(children: [peter, paul, mary])
         expect([peter, paul, mary].each(&:reload).map(&:updated_at)).to eq [new_time, new_time, new_time]
       end
+
+      it "skips touching if in a .no_touching block" do
+        children = [Child.create!, Child.create!]
+        parent = Parent.create!(children: children)
+        children.each { |child| child.update!(updated_at: old_time) }
+        ActiveRecord::Base.no_touching { parent.save! }
+        expect(children.each(&:reload).map(&:updated_at)).to eq [old_time, old_time]
+      end
     end
 
     describe "#child_ids" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record-json_associations
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-25 00:00:00.000000000 Z
+date: 2022-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -130,9 +130,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Appraisals
 - Gemfile
 - LICENSE.txt
@@ -140,11 +140,11 @@ files:
 - Rakefile
 - active_record-json_associations.gemspec
 - bin/setup
-- gemfiles/rails_5.0.gemfile
 - gemfiles/rails_5.1.gemfile
 - gemfiles/rails_5.2.gemfile
 - gemfiles/rails_6.0.gemfile
 - gemfiles/rails_6.1.gemfile
+- gemfiles/rails_7.0.gemfile
 - lib/active_record/json_associations.rb
 - lib/active_record/json_associations/version.rb
 - spec/json_associations_spec.rb
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Instead of a many-to-many join table, serialize the ids into a JSON array.

data/.travis.yml

@@ -1,18 +0,0 @@
-language: ruby
-rvm:
-  - 2.4
-  - 2.5
-  - 2.6
-  - 2.7
-gemfile:
-  - gemfiles/rails_5.0.gemfile
-  - gemfiles/rails_5.1.gemfile
-  - gemfiles/rails_5.2.gemfile
-  - gemfiles/rails_6.0.gemfile
-jobs:
-  exclude:
-    - rvm: 2.4
-      gemfile: gemfiles/rails_6.0.gemfile
-before_install:
-  - gem install bundler -v"~>1.17"
-