activerecord-rescue_from_duplicate 0.1.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a11b83416f44cb9784f4f3553af1a37c5aa64faed10362c9835aebc4fbcf674
-  data.tar.gz: eee8395cdf66b5a12f558d54426e39107a9035befa8e2a85f41f81244deda7a7
+  metadata.gz: 5e6132feb5c01f32d458d37eeccdc5551263280c72040d5718e10d53795d9c98
+  data.tar.gz: 5f9e6a0f3a05e9ced301db7f25f51176292af0fa33f0c9fe3dc3b91f7bceaef3
 SHA512:
-  metadata.gz: 4f3110c1c4e9dbaa7b3b66a66110f9655ebc32946493903904ee8ed1f373d6a8239549036cdb84476f198d20527634a9390560ec098ce48000823c93d10d3629
-  data.tar.gz: ab2b88cd0d9b117a70003d0666eb4e81c3c4834f0af19e28d59bc068c0f30776d2266d975561dbd0e69c77c6945861f73776ecc447990ed9cb0452988ea0651f
+  metadata.gz: '09bdf44118974354a00a74635d8b3b277f85bb9adf8d1fc48a186699962de82e834fef26ac5dc599a7b039c085eeb30815f900649e7ab0c5a33c4510fa3e5ede'
+  data.tar.gz: 03bc4fe8d528ab693e0619114af9662fecc5dcf914ce41ca5b1c8c98613f9c893afea72e5f6b5de303c7ef50324c9c83da107f807a1d9b54f69a92cfbd96705b

data/.github/workflows/ci.yml

@@ -0,0 +1,41 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: Ruby ${{ matrix.ruby }}
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_USER: "test"
+          POSTGRES_PASSWORD: "test"
+          POSTGRES_DB: "rescue_from_duplicate"
+        ports:
+          - "5432:5432"
+      mysql:
+        image: mysql:8.0
+        env:
+          MYSQL_USER: "test"
+          MYSQL_PASSWORD: "test"
+          MYSQL_ALLOW_EMPTY_PASSWORD: "true"
+          MYSQL_DATABASE: "rescue_from_duplicate"
+        ports:
+          - "3306:3306"
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["3.2"]
+    steps:
+    - name: Check out code
+      uses: actions/checkout@v4
+    - name: Set up Ruby ${{ matrix.ruby }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+        cache-version: 1
+    - name: Tests
+      run: bundle exec rake

data/.github/workflows/cla.yml

@@ -0,0 +1,24 @@
+# .github/workflows/cla.yml
+name: Contributor License Agreement (CLA)
+
+on:
+  pull_request_target:
+    types: [opened, synchronize]
+  issue_comment:
+    types: [created]
+
+jobs:
+  cla:
+    runs-on: ubuntu-latest
+    if: |
+      (github.event.issue.pull_request
+        && !github.event.issue.pull_request.merged_at
+        && contains(github.event.comment.body, 'signed')
+      )
+      || (github.event.pull_request && !github.event.pull_request.merged)
+    steps:
+      - uses: Shopify/shopify-cla-action@v1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          cla-token: ${{ secrets.CLA_TOKEN }}
+

data/README.md

@@ -10,8 +10,6 @@ Additionally, a macro allows you to assume that the record will be unique and re
 
 Tested with:
 
-- ActiveRecord: 3.2, 4.0, 4.1, 4.2, edge
-- Ruby 1.9.3, 2.0.0, 2.1.2
 - MySQL, PostgreSQL, Sqlite3
 
 **Note:**
@@ -69,7 +67,7 @@ And then execute:
 Or install it yourself as:
 
     $ gem install activerecord-rescue_from_duplicate
-    
+
 ## Development Setup
 
 Install:

data/activerecord-rescue_from_duplicate.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", ">= 5.2"
+  spec.add_dependency "activerecord", ">= 7"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/lib/rescue_from_duplicate/active_record/extension.rb

@@ -38,16 +38,19 @@ module RescueFromDuplicate::ActiveRecord
       attribute = handler.attributes.first
       options = handler.options.except(:case_sensitive, :scope).merge(value: self.send(:read_attribute_for_validation, attribute))
 
-      self.errors.add(attribute, :taken, options)
+      self.errors.add(attribute, :taken, **options)
       true
     end
 
     def exception_handler(exception)
+      handlers = self.class._rescue_from_duplicate_handlers
+      return if handlers.empty?
+
       columns = exception_columns(exception)
       return unless columns
       columns = columns.sort
 
-      self.class._rescue_from_duplicate_handlers.detect do |handler|
+      handlers.detect do |handler|
         handler.rescue? && columns == handler.columns
       end
     end
@@ -67,7 +70,7 @@ module RescueFromDuplicate::ActiveRecord
     end
 
     def sqlite3_exception_columns(exception)
-      extract_columns(exception.message[/columns? (.*) (?:is|are) not unique/, 1]) || 
+      extract_columns(exception.message[/columns? (.*) (?:is|are) not unique/, 1]) ||
       extract_columns(exception.message[/UNIQUE constraint failed: ([^:]*)\:?/, 1])
     end
 
@@ -77,7 +80,7 @@ module RescueFromDuplicate::ActiveRecord
     end
 
     def other_exception_columns(exception)
-      indexes = self.class.connection.indexes(self.class.table_name)
+      indexes = self.class.connection.schema_cache.indexes(self.class.table_name)
       indexes.detect{ |i| exception.message.include?(i.name) }.try(:columns) || []
     end
   end

data/lib/rescue_from_duplicate/active_record/version.rb

@@ -1,5 +1,5 @@
 module Activerecord
   module RescueFromDuplicate
-    VERSION = '0.1.5'
+    VERSION = '0.2.6'
   end
 end

data/lib/rescue_from_duplicate/active_record.rb

@@ -16,7 +16,7 @@ module RescueFromDuplicate
     klasses.each do |klass|
       klass._rescue_from_duplicate_handlers.each do |handler|
         next unless klass.connection.table_exists?(klass.table_name)
-        unique_indexes = klass.connection.indexes(klass.table_name).select(&:unique)
+        unique_indexes = klass.connection.schema_cache.indexes(klass.table_name).select(&:unique)
 
         unless unique_indexes.any? { |index| index.columns.map(&:to_s).sort == handler.columns }
           missing_unique_indexes << MissingUniqueIndex.new(klass, handler.attributes, handler.columns)

data/spec/rescue_from_duplicate_spec.rb

@@ -7,7 +7,8 @@ shared_examples 'database error rescuing' do
   subject { Rescuable.new }
 
   before do
-    allow(Rescuable).to(receive(:connection).and_return(double(indexes: [Rescuable.index])))
+    connection = double(schema_cache: double(indexes: [Rescuable.index]))
+    allow(Rescuable).to(receive(:connection).and_return(connection))
   end
 
   describe "#create_or_update when the validation fails" do
@@ -26,6 +27,13 @@ shared_examples 'database error rescuing' do
       it "raises an exception" do
         expect { subject.create_or_update }.to raise_error(ActiveRecord::RecordNotUnique)
       end
+
+      it "doesn't parse the message" do
+        allow(uniqueness_exception).to(
+          receive(:message).and_raise(StandardError, "Message should not have been accessed")
+        )
+        expect { subject.create_or_update }.to raise_error(ActiveRecord::RecordNotUnique)
+      end
     end
   end
 

data/spec/support/model.rb

@@ -13,7 +13,7 @@ CONNECTIONS = {
     username: "test",
     password: "test",
     host: "127.0.0.1",
-    port: "29292",
+    port: "5432",
   },
   test_mysql: {
     adapter: "mysql2",
@@ -21,7 +21,7 @@ CONNECTIONS = {
     username: "test",
     password: "test",
     host: "127.0.0.1",
-    port: "29291",
+    port: "3306",
   },
 }
 class CreateAllTables < ActiveRecord::Migration[5.2]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-rescue_from_duplicate
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Guillaume Malette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-25 00:00:00.000000000 Z
+date: 2023-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -143,9 +143,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
+- ".github/workflows/cla.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -186,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.4.22
 signing_key: 
 specification_version: 4
 summary: Rescue from MySQL and Sqlite duplicate errors when trying to insert records

data/.travis.yml

@@ -1,18 +0,0 @@
-sudo: false
-rvm:
-  - '2.5'
-  - '2.6'
-  - '2.7'
-
-env:
-  - DOCKER_COMPOSE_VERSION=1.20.1
-
-before_script:
-  - docker-compose --version
-  - docker-compose pull
-  - docker-compose build
-  - docker-compose up --no-start
-  - docker-compose start
-  - sleep 30 # Wait for databases to come online
-  - docker ps
-