HornsAndHooves-moribus 0.7.2 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 030306473aaa6548bb98b95cce958cc4861fbf923ac99e33df4c31c5e5e54298
-  data.tar.gz: 8fa274a49fd8f7aaefdb30fb388281c089c0029fb0d861299ca760d5544d3ed8
+  metadata.gz: 54e52262da75d0c70f93a440dab8adbebc1c9ccb23d8bf9eff905572ca9028ae
+  data.tar.gz: a4c982838e5ea190585f1e8d8bfe776574584bb669136f372506fec7d9e5e38e
 SHA512:
-  metadata.gz: e541ea1a31728d2156e52602601abb8a1e24181b7dcd90a0799e6a588cc78e48e2ba7833e236ca7a4230ac8fc29ea50e741e2914adaedb8f21291f4e924c6929
-  data.tar.gz: 0e744f9a43ac59e002928c05fe12c8ee69d06245733ad85d7417042ccf1d1a544a9c56f0b40cfad97d48e4f7476cefdb5c1d6e742b6edf14aeebf2f50c7ca473
+  metadata.gz: 7b1bbadc5517c5309af3dd7f8dcc358e9966f5c7ef0ba6bbf3ee47b466d1771ab27620a3204ac45635bcd71f9619e16010eb5559d3b651adc951663cadeec101
+  data.tar.gz: 268eab60e758cc9f5f4dee5c44d8d60dfc6b5ec0f471d7108b73ba1bafe62b963b09724929fa3e65b5a07a400f9024545cb9a26bbc626ba944d1d4a75f65fa22

data/.ruby-version

@@ -1 +1 @@
-2.4.6
+2.6.6

data/HornsAndHooves-moribus.gemspec

@@ -20,12 +20,12 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  s.add_dependency "rails",      "~> 5"
+  s.add_dependency "rails",      "~> 6"
   s.add_dependency "power_enum", ">= 2.7.0"
   s.add_dependency "yard",       ">= 0"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
   s.add_development_dependency "rspec-rails"
-  s.add_development_dependency "sqlite3", "~> 1.3.6"
+  s.add_development_dependency "sqlite3"
 end

data/lib/moribus/aggregated_cache_behavior.rb

@@ -31,7 +31,7 @@ module Moribus
       class_attribute :aggregated_records_cache
       self.aggregated_records_cache = {}
 
-      after_save :cache_aggregated_record, :on => :create
+      after_save :cache_aggregated_record
     end
 
     # Class methods for model that includes AggregatedCacheBehavior

data/lib/moribus/alias_association.rb

@@ -45,7 +45,7 @@ module Moribus
         options = scope if scope.is_a?(Hash)
 
         alias_name = options.delete(:alias)
-        reflection = super(name, scope, options, &extension)
+        reflection = super(name, scope, **options, &extension)
         alias_association(alias_name, name) if alias_name
         reflection
       end
@@ -55,7 +55,7 @@ module Moribus
         options = scope if scope.is_a?(Hash)
 
         alias_name = options.delete(:alias)
-        reflection = super(name, scope, options)
+        reflection = super(name, scope, **options)
         alias_association(alias_name, name) if alias_name
         reflection
       end

data/lib/moribus/extensions/has_current_extension.rb

@@ -6,21 +6,32 @@ module Moribus
       # Sets 'is_current' flag of overridden record to false, instead
       # of deleting it or setting foreign key to nil.
       def remove_target!(*)
+        # Use custom update to avoid running ActiveRecord optimistic locking
+        # and to avoid updating lock_version column:
         if target.new_record?
           target.is_current = false
+          target.updated_at = Time.zone.now if has_updated_at_column?
         else
-          # Use custom update to avoid running ActiveRecord optimistic locking
-          # and to avoid updating lock_version column:
           klass = target.class
 
           sql =  "UPDATE #{klass.quoted_table_name} " \
                  "SET \"is_current\" = #{klass.connection.quote(false)} "
+
+          sql << %{, "updated_at" = #{klass.connection.quote(Time.zone.now)} } if has_updated_at_column?
+
           sql << "WHERE #{klass.quoted_primary_key} = " \
                  "#{klass.connection.quote(target.send(klass.primary_key))} "
 
           klass.connection.update sql
         end
       end
+
+      # Is the record has a column with name `updated_at`
+      #
+      # @return [Boolean]
+      private def has_updated_at_column?
+        target.class.column_names.include?("updated_at")
+      end
     end
   end
 end

data/lib/moribus/macros.rb

@@ -91,7 +91,7 @@ module Moribus
         scope = current_scope
       end
 
-      reflection = has_one(name, scope, options)
+      reflection = has_one(name, scope, **options)
       reflection = normalize_reflection(reflection, name)
       reflection.options[:is_current] = true
       accepts_nested_attributes_for name
@@ -106,7 +106,7 @@ module Moribus
     # by special aggregated functionality (attribute delegation. See
     # Extensions::HasAggregatedExtension)
     def has_aggregated(name, options = {})
-      reflection = belongs_to(name, options)
+      reflection = belongs_to(name, **options)
       reflection = normalize_reflection(reflection, name)
       reflection.options[:aggregated] = true
       accepts_nested_attributes_for name

data/lib/moribus/version.rb

@@ -1,3 +1,3 @@
 module Moribus # :nodoc:
-  VERSION = "0.7.2" # :nodoc:
+  VERSION = "0.9.1" # :nodoc:
 end

data/spec/dummy/app/assets/config/manifest.js

@@ -0,0 +1,5 @@
+// Sprockets 4.0+ requires this file to define asset paths.
+
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

data/spec/moribus/aggregated_behavior_spec.rb

@@ -93,7 +93,7 @@ describe Moribus::AggregatedBehavior do
 
     it "looks up self and replaces id with existing on update" do
       name = SpecPersonName.create first_name: "Alice", last_name: "Smith"
-      name.update_attributes first_name: "John"
+      name.update! first_name: "John"
       expect(name.id).to eq @existing.id
     end
 

data/spec/moribus/extensions/has_current_extension_spec.rb

@@ -16,6 +16,7 @@ describe Moribus::Extensions::HasCurrentExtension do
 
     class SpecCustomer < MoribusSpecModel(spec_status_id: :integer)
       has_one_current :spec_customer_info, inverse_of: :spec_customer, dependent: :destroy
+      delegate_associated :previous_id, to: :spec_customer_info
     end
   end
 
@@ -24,17 +25,45 @@ describe Moribus::Extensions::HasCurrentExtension do
   end
 
   let(:customer) { SpecCustomer.create }
-  let!(:info)    { SpecCustomerInfo.create(spec_customer: customer, is_current: true) }
+  let!(:info) do
+    SpecCustomerInfo.create(spec_customer: customer, is_current: true, created_at: 1.hour.ago, updated_at: 1.hour.ago)
+  end
 
   describe ".remove_target!" do
-    before do
-      allow(customer.spec_customer_info).to receive(:new_record?).and_return(true)
+    context "new record" do
+      before do
+        allow(customer.spec_customer_info).to receive(:new_record?).and_return(true)
+      end
+
+      it "sets 'is_current' flag of overridden record to false for new record" do
+        old_info = customer.spec_customer_info
+        customer.spec_customer_info = SpecCustomerInfo.new
+        expect(old_info.is_current).to be false
+      end
+
+      it "sets 'is_current' flag updates updated_at column" do
+        old_info = customer.spec_customer_info
+        customer.spec_customer_info = SpecCustomerInfo.new
+        expect(old_info.updated_at >= old_info.created_at + 1.hour).to be true
+      end
     end
 
-    it "sets 'is_current' flag of overridden record to false for new record" do
-      old_info = customer.spec_customer_info
-      customer.spec_customer_info = SpecCustomerInfo.new
-      expect(old_info.is_current).to be_falsey
+    context "persisted record" do
+      it "sets 'is_current' flag updates updated_at column" do
+        old_info = customer.spec_customer_info
+        customer.spec_customer_info = SpecCustomerInfo.new
+        old_info.reload
+        # I use 59 minutes instead of hour because there can be small difference in milliseconds
+        expect(old_info.updated_at >= old_info.created_at + 59.minutes).to be true
+      end
+
+      it "sets 'is_current' flag updates updated_at column" do
+        old_info = customer.spec_customer_info
+        customer.update!(previous_id: 123)
+        old_info.reload
+        # I use 59 minutes instead of hour because there can be small difference in milliseconds
+        expect(old_info.updated_at >= old_info.created_at + 59.minutes).to be true
+      end
     end
   end
 end

data/spec/moribus_spec.rb

@@ -128,7 +128,7 @@ describe Moribus do
 
       suppress(Exception) do
         expect {
-          @info.update_attributes spec_customer_id: nil, spec_person_name_id: 2
+          @info.update! spec_customer_id: nil, spec_person_name_id: 2
         }.not_to change(SpecCustomerInfo, :count)
       end
 
@@ -155,25 +155,25 @@ describe Moribus do
 
     it "creates a new current record if updated" do
       expect {
-        @info.update_attributes(spec_person_name_id: 2)
+        @info.update!(spec_person_name_id: 2)
       }.to change(SpecCustomerInfo, :count).by(1)
     end
 
     it "replaces itself with new id" do
       old_id = @info.id
-      @info.update_attributes(spec_person_name_id: 2)
+      @info.update!(spec_person_name_id: 2)
       expect(@info.id).not_to eq old_id
     end
 
     it "sets is_current record to false for superseded record" do
       old_id = @info.id
-      @info.update_attributes(spec_person_name_id: 2)
+      @info.update!(spec_person_name_id: 2)
       expect(SpecCustomerInfo.find(old_id).is_current).to eq false
     end
 
     it "sets previous_id to the id of the previous record" do
       old_id = @info.id
-      @info.update_attributes(spec_person_name_id: 2)
+      @info.update!(spec_person_name_id: 2)
       expect(@info.previous_id).to eq old_id
     end
 
@@ -191,7 +191,7 @@ describe Moribus do
                                         status:        "unverified",
                                         is_current:    true
                                       )
-      expect{ email.update_attributes(status: "verified") }.not_to raise_error
+      expect{ email.update!(status: "verified") }.not_to raise_error
     end
 
     describe "updated_at and created_at" do
@@ -221,9 +221,9 @@ describe Moribus do
       end
 
       it "raises a stale object error" do
-        @info1.update_attributes(spec_person_name_id: 3)
+        @info1.update!(spec_person_name_id: 3)
 
-        expect{ @info2.update_attributes(spec_person_name_id: 4) }.
+        expect{ @info2.update!(spec_person_name_id: 4) }.
           to raise_error(ActiveRecord::StaleObjectError,
                          /Attempted to update_current \(version #{@info2.lock_version}\) a stale object: SpecCustomerInfo\./)
       end
@@ -232,30 +232,30 @@ describe Moribus do
         spec_customer_info = @customer.spec_customer_info
 
         expect {
-          spec_customer_info.update_attributes(spec_person_name_id: 3)
+          spec_customer_info.update!(spec_person_name_id: 3)
         }.to change { spec_customer_info.lock_version }.from(0).to(1)
 
         expect {
-          spec_customer_info.update_attributes(spec_person_name_id: 4)
+          spec_customer_info.update!(spec_person_name_id: 4)
         }.to change { spec_customer_info.lock_version }.from(1).to(2)
       end
 
       it "does not fail to update if a lock version growth is for any reason not monotonic" do
         spec_customer_info = @customer.spec_customer_info
 
-        spec_customer_info.update_attributes(spec_person_name_id: 3)
-        spec_customer_info.update_attributes(spec_person_name_id: 4)
+        spec_customer_info.update!(spec_person_name_id: 3)
+        spec_customer_info.update!(spec_person_name_id: 4)
 
         SpecCustomerInfo.where(spec_customer_id: @customer.id, lock_version: 1).delete_all
 
         expect {
-          spec_customer_info.update_attributes(spec_person_name_id: 5)
+          spec_customer_info.update!(spec_person_name_id: 5)
         }.to change { spec_customer_info.lock_version }.from(2).to(3)
       end
 
       it "does not fail if no locking_column is present" do
         email = SpecCustomerEmail.create(spec_customer_id: 1, email: "foo@bar.com")
-        expect{ email.update_attributes(email: "foo2@bar.com") }.not_to raise_error
+        expect{ email.update!(email: "foo2@bar.com") }.not_to raise_error
       end
 
       it "updates lock_version column based on parent relation" do
@@ -263,11 +263,11 @@ describe Moribus do
         spec_customer_info = @customer.spec_customer_info
 
         expect {
-          spec_customer_info.update_attributes(spec_person_name_id: 3)
+          spec_customer_info.update!(spec_person_name_id: 3)
         }.to change { spec_customer_info.lock_version }.from(0).to(1)
 
         expect {
-          spec_customer_info.update_attributes(spec_customer: @other_customer)
+          spec_customer_info.update!(spec_customer: @other_customer)
         }.to change { spec_customer_info.lock_version }.from(1).to(0)
       end
 
@@ -282,10 +282,10 @@ describe Moribus do
 
         expect( other_info_with_type.lock_version ).to eq 0
 
-        info_with_type.update_attributes(spec_status: :active)
+        info_with_type.update!(spec_status: :active)
         expect( info_with_type.lock_version ).to eq 1
 
-        info_with_type.update_attributes(spec_status: :inactive)
+        info_with_type.update!(spec_status: :inactive)
         expect( info_with_type.lock_version ).to eq 2
 
         expect( other_info_with_type.lock_version ).to eq 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: HornsAndHooves-moribus
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.9.1
 platform: ruby
 authors:
 - HornsAndHooves
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-11 00:00:00.000000000 Z
+date: 2022-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: power_enum
   requirement: !ruby/object:Gem::Requirement
@@ -101,16 +101,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
 description: |-
   Introduces Aggregated and Tracked behavior to ActiveRecord::Base models, as well
       as Macros and Extensions modules for more efficient usage.
@@ -147,6 +147,7 @@ files:
 - lib/moribus/version.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
@@ -207,14 +208,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.9
+rubygems_version: 3.0.8
 signing_key:
 specification_version: 4
 summary: Introduces Aggregated and Tracked behavior to ActiveRecord::Base models
 test_files:
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb