active_record-json_associations 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da40cb0d7c64c3ae4fc7e90333a9ceb5687ed65676435f68edc66563e13f609c
-  data.tar.gz: 77cd9023e9877aa3709162fbcfc1ac08c4ea5c7c581264fff450e20af58b6e2e
+  metadata.gz: 82a8dd8639c2897e523652a7415754704227798f98e753681d0199cc70ec055d
+  data.tar.gz: bf59af54b968501e6b087a65ba7d95b5783fe5ec20c4c41182b5882bbdb9604d
 SHA512:
-  metadata.gz: e219263a6d06ff6bc97dd86df3a289c82642f6b3c333779e107e8f21ae07c75fcad39f110cd84f7ef25303f752b43ee81b51c78a0d9f12591877cafddf861657
-  data.tar.gz: 705383f050a1e3b84524c5a6dcc74e8e30027a3d663cd944e616da033527afd63f13bf4872c6b4c8175385939b240ceb6a0e4d4265622e53efa52e299831b3e2
+  metadata.gz: 1fbc06fdc2cd8dbf92bc5d336ab5d1b1dc45f393e26ae47e45573f346be04912544dee4b31097a3fa1767ce1981c05fa5eb046fd5428947afd9cfeb90cf9827c
+  data.tar.gz: 402f51353a4b4865e67ae982cc4794aa60658e2afc3e97c1c8faf3eb03f93ed0306020b4618dc870e62aa34c184d85dd3e424b647254bedaf5436b92a7af0199

data/Appraisals

@@ -15,3 +15,7 @@ appraise "rails-6.0" do
   gem "rails", "~>6.0.0"
 end
 
+appraise "rails-6.1" do
+  gem "rails", "~>6.1.0"
+end
+

data/README.md

@@ -43,6 +43,14 @@ And a scope method for finding records assocatied with an id:
 Parent.child_ids_including(2) # => [<Parent child_ids: [1,2,3]>]
 ```
 
+Or any of specified array of ids:
+
+```ruby
+Parent.child_ids_including([2,4,5]) # => [<Parent child_ids: [1,2,3]>]
+```
+
+`touch: true` can be specified on belongs_to_many to touch the associated records' timestamps when the record is modified.
+
 It also adds an `json_foreign_key` option to `has_many` for specifying that the foreign keys are in a json array.
 
 ```ruby

data/active_record-json_associations.gemspec

@@ -26,5 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "byebug"
+  spec.add_development_dependency "timecop"
 end
 

data/gemfiles/rails_6.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~>6.1.0"
+
+gemspec path: "../"

data/lib/active_record/json_associations.rb

@@ -11,7 +11,7 @@ module ActiveRecord
     end
     private_constant :FIELD_INCLUDE_SCOPE_BUILDER_PROC
 
-    def belongs_to_many(many, class_name: nil)
+    def belongs_to_many(many, class_name: nil, touch: nil)
       one = many.to_s.singularize
       one_ids = :"#{one}_ids"
       one_ids_equals = :"#{one_ids}="
@@ -22,10 +22,39 @@ module ActiveRecord
 
       serialize one_ids, JSON
 
+      if touch
+        after_commit do
+          if respond_to?(:saved_changes)
+            old_ids, new_ids = saved_changes[one_ids.to_s]
+          else
+            old_ids, new_ids = previous_changes[one_ids.to_s]
+          end
+          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
+        end
+      end
+
       extend Module.new {
         define_method :"#{one_ids}_including" do |id|
           raise "can't query for a record that does not have an id!" if id.blank?
-          FIELD_INCLUDE_SCOPE_BUILDER_PROC.call(self, one_ids, id)
+          if id.is_a?(Hash)
+            Array(id[:any]).inject(none) do |context, id|
+              context.or(FIELD_INCLUDE_SCOPE_BUILDER_PROC.call(self, one_ids, id))
+            end
+          else
+            FIELD_INCLUDE_SCOPE_BUILDER_PROC.call(self, one_ids, id)
+          end
         end
       }
 

data/lib/active_record/json_associations/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module JsonAssociations
-    VERSION = "0.7.0"
+    VERSION = "0.9.0"
   end
 end

data/spec/json_associations_spec.rb

@@ -9,16 +9,21 @@ describe ActiveRecord::JsonAssociations do
         create_table :parents do |t|
           t.text :child_ids
           t.text :fuzzy_ids
+          t.timestamps
         end
 
-        create_table :children
+        create_table :children do |t|
+          t.timestamps
+        end
 
-        create_table :pets
+        create_table :pets do |t|
+          t.timestamps
+        end
       end
     end
 
     class Parent < ActiveRecord::Base
-      belongs_to_many :children
+      belongs_to_many :children, touch: true
       belongs_to_many :fuzzies, class_name: "Pet"
     end
 
@@ -38,6 +43,7 @@ describe ActiveRecord::JsonAssociations do
  
   describe ".belongs_to_many :children" do
     subject { Parent.new }
+    let!(:winner) { Parent.create! }
 
     describe ".child_ids_including" do
       context "finds records with the specified id" do
@@ -63,6 +69,113 @@ describe ActiveRecord::JsonAssociations do
           expect(Parent.child_ids_including(child.id)).to eq [parent]
         end
       end
+
+      context "finds records including any of the specified array of ids" do
+        let(:peter) { Child.create! }
+        let(:paul) { Child.create! }
+
+        it "both as the whole json array" do
+          parent = Parent.create(children: [peter, paul])
+          expect(Parent.child_ids_including(any: [peter.id, paul.id])).to eq [parent]
+        end
+
+        it "one as the whole json array" do
+          parent = Parent.create(children: [peter])
+          expect(Parent.child_ids_including(any: [peter.id, paul.id])).to eq [parent]
+        end
+
+        it "the other as the whole json array" do
+          parent = Parent.create(children: [paul])
+          expect(Parent.child_ids_including(any: [peter.id, paul.id])).to eq [parent]
+        end
+
+        it "both at the beginning of the json array" do
+          parent = Parent.create(children: [peter, paul, Child.create!])
+          expect(Parent.child_ids_including(any: [peter.id, paul.id])).to eq [parent]
+        end
+
+        it "one at the beginning of the json array" do
+          parent = Parent.create(children: [peter, Child.create!])
+          expect(Parent.child_ids_including(any: [peter.id, paul.id])).to eq [parent]
+        end
+
+        it "the other at the beginning of the json array" do
+          parent = Parent.create(children: [paul, Child.create!])
+          expect(Parent.child_ids_including(any: [peter.id, paul.id])).to eq [parent]
+        end
+
+        it "both in the middle of the json array" do
+          parent = Parent.create(children: [Child.create!, peter, paul, Child.create!])
+          expect(Parent.child_ids_including(any: [peter.id, paul.id])).to eq [parent]
+        end
+
+        it "one in the middle of the json array" do
+          parent = Parent.create(children: [Child.create!, peter, Child.create!])
+          expect(Parent.child_ids_including(any: [peter.id, paul.id])).to eq [parent]
+        end
+
+        it "the other in the middle of the json array" do
+          parent = Parent.create(children: [Child.create!, paul, Child.create!])
+          expect(Parent.child_ids_including(any: [peter.id, paul.id])).to eq [parent]
+        end
+
+        it "both at the end of the json array" do
+          parent = Parent.create(children: [Child.create!, peter, paul])
+          expect(Parent.child_ids_including(any: [peter.id, paul.id])).to eq [parent]
+        end
+
+        it "one at the end of the json array" do
+          parent = Parent.create(children: [Child.create!, peter])
+          expect(Parent.child_ids_including(any: [peter.id, paul.id])).to eq [parent]
+        end
+
+        it "the other at the end of the json array" do
+          parent = Parent.create(children: [Child.create!, paul])
+          expect(Parent.child_ids_including(any: [peter.id, paul.id])).to eq [parent]
+        end
+      end
+    end
+
+    describe "touch: true" do
+      around do |example|
+        old_zone = Time.zone
+        Time.zone = "UTC"
+        example.run
+        Time.zone = old_zone
+      end
+
+      let(:old_time) { 1.year.ago.round }
+      let(:new_time) { 1.second.ago.round }
+
+      around do |example|
+        Timecop.freeze(new_time) do
+          example.run
+        end
+      end
+
+      it "touches associated records" do
+        children = [Child.create!(updated_at: old_time), Child.create!(updated_at: old_time)]
+        fuzzies = [Pet.create!(updated_at: old_time), Pet.create!(updated_at: old_time)]
+        parent = Parent.create!(children: children, fuzzies: fuzzies)
+        expect(children.each(&:reload).map(&:updated_at)).to eq [new_time, new_time] # touch: true
+        expect(fuzzies.each(&:reload).map(&:updated_at)).to eq [old_time, old_time] # touch: nil
+      end
+
+      it "touches removed associated records" do
+        peter, paul, mary = Child.create!, Child.create!, Child.create!
+        parent = Parent.create!(children: [peter, paul, mary])
+        [peter, paul, mary].each { |child| child.update_column :updated_at, old_time }
+        parent.update!(children: [peter, paul])
+        expect([peter, paul, mary].each(&:reload).map(&:updated_at)).to eq [new_time, new_time, new_time]
+      end
+
+      it "touches added associated records" do
+        peter, paul, mary = Child.create!, Child.create!, Child.create!
+        parent = Parent.create!(children: [peter, paul])
+        [peter, paul, mary].each { |child| child.update_column :updated_at, old_time }
+        parent.update!(children: [peter, paul, mary])
+        expect([peter, paul, mary].each(&:reload).map(&:updated_at)).to eq [new_time, new_time, new_time]
+      end
     end
 
     describe "#child_ids" do

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require "byebug"
+require "timecop"
 
 RSpec.configure do |config|
   config.filter_run focus: true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record-json_associations
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-27 00:00:00.000000000 Z
+date: 2021-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Instead of a many-to-many join table, serialize the ids into a JSON array.
 email:
 - micah@botandrose.com
@@ -130,6 +144,7 @@ files:
 - gemfiles/rails_5.1.gemfile
 - gemfiles/rails_5.2.gemfile
 - gemfiles/rails_6.0.gemfile
+- gemfiles/rails_6.1.gemfile
 - lib/active_record/json_associations.rb
 - lib/active_record/json_associations/version.rb
 - spec/json_associations_spec.rb