HornsAndHooves-moribus 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 664930f1565d0d6eaa50dc8fba6c3f90763e70c709a748f2e572f493ef2f3de5
-  data.tar.gz: b9541ec330424313c0e71f9605af2f2cf615d6df92b2a29961a97675cc457683
+  metadata.gz: f9ed8306d0cb942466108234ba8408229a24b58155a0d49766343474f9b4f846
+  data.tar.gz: 44c7ecd497ac5cb564874f5278cd24ecfaf708cecd1efd65d12b7159c80f7ffc
 SHA512:
-  metadata.gz: 5af699607d6d67710af3e538cc23138b0a934236c5ce2b234ebc9a3349f989c6e7eaa1184a9608d5b3f77e5ff2898d2f96757d5805d39e7a1d4af349947cbef3
-  data.tar.gz: 7a8cec103bc680b45800f888adfda114b7cbe55d3ef5547694f2227cd79afff4f2e3b503782ae79b84f8beab7a80b6c0452369d464c8c8a9daf01e9c3c8335b3
+  metadata.gz: 9fa73e79e461f240134469e04c80a5f6d7baddb9b0638e010ddd24b2316c9123ebb25d220dccd80463f689f340fbe92b05795a2786e8e317fc780d787c872a0d
+  data.tar.gz: 96b2e59ab096002ab9ddb9c1e88305aa9c0127f61f4c19d75eb63206def9a8e8dceb4ce13e13a9aeb53ec4733167d3792a2facf582f695862dd599d42333656a

data/.ruby-version

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

data/.simplecov

@@ -12,7 +12,7 @@ SimpleCov.start do
   # Fail the build when coverage is weak:
   at_exit do
     SimpleCov.result.format!
-    threshold, actual = 99.751, SimpleCov.result.covered_percent
+    threshold, actual = 100, SimpleCov.result.covered_percent
     if actual < threshold
       msg = "\nLow coverage: "
       msg << red("#{actual}%")

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",      "> 4.0", "< 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

@@ -23,30 +23,25 @@ module Moribus
       # association-specific methods. See module description for example.
       def alias_association(alias_name, association_name)
         if reflection = reflect_on_association(association_name)
-          # Use Rails 4.1.x+ behavior, if available:
-          if ActiveRecord::Reflection.respond_to? :add_reflection then
-            ActiveRecord::Reflection.add_reflection self, alias_name, reflection
-          else
-            # Rails 4.0.x behavior:
-            reflections[alias_name] = reflections[association_name]
-          end
+          ActiveRecord::Reflection.add_reflection self, alias_name, reflection
+
           alias_association_methods(alias_name, reflection)
           reflection
         end
       end
 
       # Allows :alias option to alias belongs_to association
-      def belongs_to(name, scope = nil, options = {})
+      def belongs_to(name, scope = nil, **options)
         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
 
       # Allows :alias option to alias has_many association
-      def has_many(name, scope = nil, options = {}, &extension)
+      def has_many(name, scope = nil, **options, &extension)
         options = scope if scope.is_a?(Hash)
 
         alias_name = options.delete(:alias)
@@ -56,7 +51,7 @@ module Moribus
       end
 
       # Allows :alias option to alias has_one association
-      def has_one(name, scope = nil, options = {})
+      def has_one(name, scope = nil, **options)
         options = scope if scope.is_a?(Hash)
 
         alias_name = options.delete(:alias)

data/lib/moribus/extensions/delegate_associated.rb

@@ -33,7 +33,7 @@ module Moribus
       # presented in Customer, the code will result in exception without
       # the following hook:
       def column_for_attribute(name)
-        unless (column = super).nil?
+        unless (column = super).nil? || column.is_a?(ActiveRecord::ConnectionAdapters::NullColumn)
           return column
         end
 

data/lib/moribus/extensions/has_aggregated_extension.rb

@@ -71,7 +71,7 @@ module Moribus
             [name, "#{name}="]
           end
           klass.define_attribute_methods
-          attribute_methods = klass.generated_attribute_methods.instance_methods.select{ |m| m !~ EXCLUDE_METHODS_REGEXP }
+          attribute_methods = klass.__send__(:generated_attribute_methods).instance_methods.select{ |m| m !~ EXCLUDE_METHODS_REGEXP }
           custom_writers = klass.instance_methods(false).map(&:to_s) & klass.column_names.map{ |name| "#{name}=" }
           (attribute_methods + enum_methods.flatten + custom_writers).map(&:to_sym)
         end

data/lib/moribus/extensions/has_current_extension.rb

@@ -11,14 +11,12 @@ module Moribus
         else
           # Use custom update to avoid running ActiveRecord optimistic locking
           # and to avoid updating lock_version column:
-          klass          = target.class
-          is_current_col = klass.columns.detect { |c| c.name == "is_current" }
-          id_column      = klass.columns.detect { |c| c.name == klass.primary_key }
+          klass = target.class
 
           sql =  "UPDATE #{klass.quoted_table_name} " \
-                 "SET \"is_current\" = #{klass.quote_value(false, is_current_col)} "
+                 "SET \"is_current\" = #{klass.connection.quote(false)} "
           sql << "WHERE #{klass.quoted_primary_key} = " \
-                 "#{klass.quote_value(target.send(klass.primary_key), id_column)} "
+                 "#{klass.connection.quote(target.send(klass.primary_key))} "
 
           klass.connection.update sql
         end

data/lib/moribus/tracked_behavior.rb

@@ -116,7 +116,6 @@ module Moribus
     # TODO: need to find way to track stale objects
     def current_to_false_sql_statement
       klass              = self.class
-      is_current_col     = klass.columns.detect { |c| c.name == "is_current" }
       lock_column_name   = klass.locking_column
       lock_value         = current_lock_value
       lock_column        = if lock_value
@@ -124,17 +123,16 @@ module Moribus
                            else
                              nil
                            end
-      id_column          = klass.columns.detect { |c| c.name == klass.primary_key }
       quoted_lock_column = klass.connection.quote_column_name(lock_column_name)
 
       "UPDATE #{klass.quoted_table_name} " \
-      "SET \"is_current\" = #{klass.quote_value(false, is_current_col)} ".tap do |sql|
+      "SET \"is_current\" = #{klass.connection.quote(false)} ".tap do |sql|
         sql << "WHERE #{klass.quoted_primary_key} = " \
-               "#{klass.quote_value(@_before_to_new_record_values[:id], id_column)}"
+               "#{klass.connection.quote(@_before_to_new_record_values[:id])}"
 
         if lock_value
-          sql << " AND \"is_current\" = #{klass.quote_value(true, is_current_col)}"
-          sql << " AND #{quoted_lock_column} = #{klass.quote_value(lock_value, lock_column)}"
+          sql << " AND \"is_current\" = #{klass.connection.quote(true)}"
+          sql << " AND #{quoted_lock_column} = #{klass.connection.quote(lock_value)}"
         end
       end
     end

data/lib/moribus/version.rb

@@ -1,3 +1,3 @@
 module Moribus # :nodoc:
-  VERSION = "0.6.0" # :nodoc:
+  VERSION = "0.8.0" # :nodoc:
 end

data/lib/moribus.rb

@@ -96,9 +96,13 @@ module Moribus
       self.id         = existing.id
       self.created_at = existing.created_at if respond_to?(:created_at)
       self.updated_at = existing.updated_at if respond_to?(:updated_at)
-      @changed_attributes = {}
+
+      clear_changes_information
     else
       restore_before_to_new_record_values
+
+      clear_attribute_change(:created_at) if respond_to?(:created_at)
+      clear_attribute_change(:updated_at) if respond_to?(:updated_at)
     end
     @new_record = false
     true
@@ -145,14 +149,12 @@ module Moribus
 
     if respond_to?(:updated_at=)
       self.updated_at = nil
-      @changed_attributes =
-        ActiveSupport::HashWithIndifferentAccess.new(changed_attributes.dup.merge(updated_at: nil))
+      self.updated_at_will_change!
     end
 
     if respond_to?(:created_at=)
       self.created_at = nil
-      @changed_attributes =
-        ActiveSupport::HashWithIndifferentAccess.new(changed_attributes.dup.merge(created_at: nil))
+      self.created_at_will_change!
     end
 
     # mark all other attributes is changing

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/dummy/tmp/development_secret.txt

@@ -0,0 +1 @@
+02c924139ba4207bce788dd378b8f1f99976099325bbad4e85204e34d04970e039409db0f08ceea070238f4f5a41bdbc94fb6e51aeb0996a4ee32bcd3c31ede1

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/delegate_associated_spec.rb

@@ -132,5 +132,9 @@ describe Moribus::Extensions::DelegateAssociated do
     it "returns class db column if it exists" do
       expect(customer.column_for_attribute(:id)).not_to be_nil
     end
+
+    it "returns class db column if it doesn't exist" do
+      expect(customer.column_for_attribute(:foobar)).to be_nil
+    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,41 +221,41 @@ 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")
+                         /Attempted to update_current \(version #{@info2.lock_version}\) a stale object: SpecCustomerInfo\./)
       end
 
       it "updates lock_version incrementally for each new record" 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,38 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: HornsAndHooves-moribus
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - HornsAndHooves
 - Arthur Shagall
 - Artem Kuzko
 - Sergey Potapov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-14 00:00:00.000000000 Z
+date: 2021-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: power_enum
   requirement: !ruby/object:Gem::Requirement
@@ -107,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.
@@ -153,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
@@ -184,6 +179,7 @@ files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
+- spec/dummy/tmp/development_secret.txt
 - spec/moribus/aggregated_behavior_spec.rb
 - spec/moribus/alias_association_spec.rb
 - spec/moribus/extensions/delegate_associated_spec.rb
@@ -197,7 +193,7 @@ homepage: https://github.com/HornsAndHooves/moribus
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -212,14 +208,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
-signing_key: 
+rubygems_version: 3.0.3
+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
@@ -251,6 +247,7 @@ test_files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
+- spec/dummy/tmp/development_secret.txt
 - spec/moribus/aggregated_behavior_spec.rb
 - spec/moribus/alias_association_spec.rb
 - spec/moribus/extensions/delegate_associated_spec.rb