acts_as_replaceable 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a57f730f9d08ae246d17fb2a676d682a852a3349
-  data.tar.gz: f149a43c73d15bd6785f72d142de3a0b77a4c36a
+SHA256:
+  metadata.gz: 30bcf32b9f0dfe41412a58f51f84c005042e925f463cc90279a5b036dc8283eb
+  data.tar.gz: d3339e413d4cfcf298655f893990c7b0b020b3f4ce9197fb44c80639a14a9e59
 SHA512:
-  metadata.gz: fdd162a3dbc9f54a0fc784e374f75a20249a5ac6c39bc0a182e81b5b4ec41140fb72aeb85340699d3fefc241b4527f9af796098bf879c4f961b25c375171c027
-  data.tar.gz: 9bceccadf52afb97451d77d7d313ea0c48d36dce68759b589bc536046c044d2b2cd444c8c0c1b118b12b814ef01a62f0e9c1f88a3e54d92d2d01e293337cd41a
+  metadata.gz: '0900b51b609176b16ffd78048bc9ecede2f6a9ceea01a7ace1e86f27740235d3b38a289267cee909b8a82c42a7844cee97713b2080b2368de0fc4e7da269f6fe'
+  data.tar.gz: 7c9ddecdaefc99ede6aa48387d064399b29d754918de655ac8a6d2785e34d6f8bf3b1b205fa389d0e2ff5497b7486d44b137fddd27be7c68bae1193c1c0491b4

data/lib/acts_as_replaceable/acts_as_replaceable.rb

@@ -1,4 +1,4 @@
-require 'digest'
+require 'openssl'
 require 'timeout'
 
 module ActsAsReplaceable
@@ -40,6 +40,10 @@ module ActsAsReplaceable
 
   module HelperMethods
     def self.sanitize_attribute_names(klass, *args)
+      unless klass.table_exists?
+        ActiveRecord::Base.logger.warn "(acts_as_replaceable) table `#{klass.table_name}` does not exist so excluding all attribute names"
+        return []
+      end
       # Intersect the proposed attributes with the column names so we don't start assigning attributes that don't exist. e.g. if the model doesn't have timestamps
       klass.column_names & args.flatten.compact.collect(&:to_s)
     end
@@ -64,6 +68,8 @@ module ActsAsReplaceable
           sql << "#{attribute_name} IS NULL"
         end
       end
+
+      return nil if sql.empty?
       return [sql.join(' AND ')] + binds
     end
 
@@ -86,7 +92,7 @@ module ActsAsReplaceable
 
     # Searches the database for an existing copies of record
     def self.find_existing(record)
-      existing = record.class
+      existing = record.class.default_scoped
       existing = existing.where match_conditions(record)
       existing = existing.where insensitive_match_conditions(record)
     end
@@ -104,7 +110,7 @@ module ActsAsReplaceable
     # eg. In a multi-threaded environment, 'find_or_create' is prone to failure due to the possibility
     # that the process is preempted between the 'find' and 'create' logic
     def self.lock(record, timeout = 20)
-      lock_id  = "ActsAsReplaceable/#{Digest::MD5.digest([match_conditions(record), insensitive_match_conditions(record)].inspect)}"
+      lock_id  = "ActsAsReplaceable/#{OpenSSL::Digest::MD5.digest([match_conditions(record), insensitive_match_conditions(record)].inspect)}"
       acquired = false
 
       # Acquire the lock by atomically incrementing and returning the value to see if we're first
@@ -175,6 +181,14 @@ module ActsAsReplaceable
       # Inherit target's attributes for those in acts_as_replaceable_options[:inherit]
       ActsAsReplaceable::HelperMethods.copy_attributes(acts_as_replaceable_options[:inherit], existing, self)
 
+      # Rails 5 introduced AR::Dirty and started using `mutations_from_database` to
+      # lookup `id_in_database` which is required for the `_update_record` call
+      #
+      # This chunk of code is copied from https://api.rubyonrails.org/classes/ActiveRecord/Persistence.html#method-i-becomes
+      if existing.respond_to?(:mutations_from_database, true)
+        instance_variable_set("@mutations_from_database", existing.send(:mutations_from_database) || nil)
+      end
+
       @new_record        = false
       @has_been_replaced = true
       @has_not_changed   = !ActsAsReplaceable::HelperMethods.mark_changes(self, existing)

data/spec/acts_as_replaceable_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'acts_as_dag' do
+describe 'acts_as_replaceable' do
   before(:each) do
     [Material, Item, Person].each(&:destroy_all) # Because we're using sqlite3 and it doesn't support transactional specs (afaik)
   end
@@ -14,6 +14,16 @@ describe 'acts_as_dag' do
     end
   end
 
+  describe "Model" do
+    it 'evaluates without error when no database table exists' do
+      eval("class NoTable < ActiveRecord::Base; end")
+      klass = NoTable
+
+      klass.table_name = "some_table_that_does_not_exist"
+      expect(klass.acts_as_replaceable).to be_nil
+    end
+  end
+
   describe "Helper Methods" do
     before(:each) { @record = insert_model(Material, :name => 'glass')}
 
@@ -109,6 +119,12 @@ describe 'acts_as_dag' do
       Person.where(:first_name => 'John').count.should == 1
     end
 
+    it "should correctly detect difference between blank and nil values" do
+      a = Person.create! :first_name => 'John', :last_name => ''
+      a = Person.create! :first_name => 'John', :last_name => nil
+      Person.where(:first_name => 'John').count.should == 2
+    end
+
     it "should inherit the id of the existing record" do
       a = Material.create! :name => 'wood'
       b = Material.create! :name => 'wood'

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 require 'active_record'
 require 'logger'
 require 'acts_as_replaceable'
+require 'byebug'
 
 ActiveRecord::Base.logger = Logger.new(STDOUT)
 ActiveRecord::Base.logger.level = Logger::INFO

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_replaceable
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Nicholas Jakobsen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2024-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,62 +17,48 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.6
+        version: 4.1.8
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.6
+        version: 4.1.8
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.3.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 description: 
 email: technical@rrnpilot.org
 executables: []
@@ -102,8 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 3.3.23
 signing_key: 
 specification_version: 4
 summary: Overloads the create_or_update_without_callbacks method to allow duplicate