activerecord-rescue_from_duplicate 0.1.1 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 99e556184dcd2af6057a37ec28413793958ecda0
-  data.tar.gz: 51098dffb2d6b8d5b89b28f2f2664be4e4e34202
+SHA256:
+  metadata.gz: 998e5fbd4ae44c14022a24a43b6501e37ebeaa4fae22d5ae98b150bb286c8013
+  data.tar.gz: a9aff249013923879e7e2e9a746a16d32851d15c5b9eb327113b3f1926905e1f
 SHA512:
-  metadata.gz: acaaf4ae2919df995ac930b8ea2bdefb400753fc18b3883c717bc8e204cf9c0d681c515cc20a9c04f0b8ba5f3c2ab7b09610d1c4e005a17cee0d0312c0d6937f
-  data.tar.gz: 423538cdfdfa906a50b17beeb2e697dcd7cc38cc23683a3c2b2092cf8c4b29a10d0b14f12e8be42bcbce5284cd74dd3eceee131df0db4f48b4d0b6e8a1fde9a4
+  metadata.gz: a61214eaacecb66b6aa8088a590ea9f944207ad2578868df5b29d517bc8abf61992b630ef8a28854d591a30409e99bccad6ecc3672936601a829b9fde1cb78ff
+  data.tar.gz: c0fbac267cb75a708a3dcd5a798e14861b6ff332826ef6d51bca73a2979bd5d1331679def180e8cde1c3be4839584ec7a454adbcb7f399345a32d5ba81a33393

data/.travis.yml

@@ -1,22 +1,18 @@
 sudo: false
 rvm:
-  - 2.1
-  - 2.2
-  - 2.3.1
-gemfile:
-  - gemfiles/Gemfile.ar-3.2
-  - gemfiles/Gemfile.ar-4.0
-  - gemfiles/Gemfile.ar-4.1
-  - gemfiles/Gemfile.ar-4.2
-  - gemfiles/Gemfile.ar-edge
-
-before_script:
-  - mysql -e 'create database rescue_from_duplicate;'
-  - psql -c 'create database rescue_from_duplicate;' -U postgres
+  - '2.5'
+  - '2.6'
+  - '2.7'
 
 env:
-  - POSTGRES=1 MYSQL=1
+  - 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
 
-matrix:
-  allow_failures:
-    - gemfile: gemfiles/Gemfile.ar-edge

data/README.md

@@ -69,6 +69,21 @@ And then execute:
 Or install it yourself as:
 
     $ gem install activerecord-rescue_from_duplicate
+    
+## Development Setup
+
+Install:
+
+- Have Docker installed
+- Clone the repo
+- `docker-compose up -d`
+
+Run tests:
+
+```
+rspec
+```
+
 
 ## Contributing
 

data/Rakefile

@@ -5,13 +5,3 @@ RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
 
-namespace :spec do
-  task :all do
-    Dir[File.expand_path('../gemfiles/*.lock', __FILE__)].each { |f| File.delete(f) }
-    Dir[File.expand_path('../gemfiles/*', __FILE__)].each do |gemfile|
-      env = {'BUNDLE_GEMFILE' => gemfile, 'MYSQL' => '1'}
-      system(env, 'bundle install')
-      system(env, 'bundle exec rspec')
-    end
-  end
-end

data/activerecord-rescue_from_duplicate.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'rescue_from_duplicate/active_record/version'
+require "rescue_from_duplicate/active_record/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "activerecord-rescue_from_duplicate"
@@ -18,14 +18,16 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'activerecord', '>= 3.2'
+  spec.add_dependency "activerecord", ">= 5.2"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'sqlite3'
-  spec.add_development_dependency 'mysql2'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'pg'
-  spec.add_development_dependency 'pry'
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "mysql2"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "pg"
+  spec.add_development_dependency "pry"
+
+  spec.metadata['allowed_push_host'] = "https://rubygems.org"
 end

data/docker-compose.yml

@@ -0,0 +1,18 @@
+mysql:
+  image: mysql:5.7
+  environment:
+    MYSQL_USER: "test"
+    MYSQL_PASSWORD: "test"
+    MYSQL_ALLOW_EMPTY_PASSWORD: "true"
+    MYSQL_DATABASE: "rescue_from_duplicate"
+  ports:
+    - "29291:3306"
+
+postgres:
+  image: postgres:10.3
+  environment:
+    POSTGRES_USER: "test"
+    POSTGRES_PASSWORD: "test"
+    POSTGRES_DB: "rescue_from_duplicate"
+  ports:
+    - "29292:5432"

data/lib/rescue_from_duplicate/active_record.rb

@@ -15,6 +15,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)
 
         unless unique_indexes.any? { |index| index.columns.map(&:to_s).sort == handler.columns }

data/lib/rescue_from_duplicate/active_record/extension.rb

@@ -22,7 +22,7 @@ module RescueFromDuplicate::ActiveRecord
       self._rescue_from_duplicates = []
     end
 
-    def create_or_update(*params, &block)
+    def create_or_update(*, **)
       super
     rescue ActiveRecord::RecordNotUnique, ActiveRecord::StatementInvalid => exception
       raise unless handle_unicity_error(exception)
@@ -38,14 +38,14 @@ 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)
       columns = exception_columns(exception)
       return unless columns
-      columns.sort!
+      columns = columns.sort
 
       self.class._rescue_from_duplicate_handlers.detect do |handler|
         handler.rescue? && columns == handler.columns
@@ -68,7 +68,7 @@ module RescueFromDuplicate::ActiveRecord
 
     def sqlite3_exception_columns(exception)
       extract_columns(exception.message[/columns? (.*) (?:is|are) not unique/, 1]) || 
-      extract_columns(exception.message[/UNIQUE constraint failed: ([^:]*)\:/, 1])
+      extract_columns(exception.message[/UNIQUE constraint failed: ([^:]*)\:?/, 1])
     end
 
     def extract_columns(columns_string)

data/lib/rescue_from_duplicate/active_record/version.rb

@@ -1,5 +1,5 @@
 module Activerecord
   module RescueFromDuplicate
-    VERSION = '0.1.1'
+    VERSION = '0.1.6'
   end
 end

data/spec/rescue_from_duplicate_spec.rb

@@ -2,16 +2,16 @@ require 'spec_helper'
 include RescueFromDuplicate
 
 shared_examples 'database error rescuing' do
-  let(:uniqueness_exception) { ::ActiveRecord::RecordNotUnique.new(message, nil) }
+  let(:uniqueness_exception) { ::ActiveRecord::RecordNotUnique.new(message) }
 
   subject { Rescuable.new }
 
   before do
-    allow(Rescuable).to receive(:connection).and_return(double(indexes: [Rescuable.index]))
+    allow(Rescuable).to(receive(:connection).and_return(double(indexes: [Rescuable.index])))
   end
 
   describe "#create_or_update when the validation fails" do
-    before { Base.stub(exception: uniqueness_exception) }
+    before { allow(Base).to(receive(:exception).and_return(uniqueness_exception)) }
 
     context "when the validator is present" do
       it "adds an error to the model" do
@@ -21,19 +21,19 @@ shared_examples 'database error rescuing' do
     end
 
     context "when the validator is not present" do
-      before { Rescuable.stub(validators: [Rescuable.presence_validator]) }
+      before { allow(Rescuable).to(receive(:validators).and_return([Rescuable.presence_validator])) }
 
       it "raises an exception" do
-        expect{ subject.create_or_update }.to raise_error(ActiveRecord::RecordNotUnique)
+        expect { subject.create_or_update }.to raise_error(ActiveRecord::RecordNotUnique)
       end
     end
   end
 
   describe "#create_or_update when using rescuer without validation" do
     before {
-      Rescuable.stub(_validators: {})
-      Rescuable.stub(_rescue_from_duplicates: [Rescuable.uniqueness_rescuer])
-      Base.stub(exception: uniqueness_exception)
+      allow(Rescuable).to(receive(:_validators).and_return({}))
+      allow(Rescuable).to(receive(:_rescue_from_duplicates).and_return([Rescuable.uniqueness_rescuer]))
+      allow(Base).to(receive(:exception).and_return(uniqueness_exception))
     }
 
     it "adds an error to the model" do
@@ -44,18 +44,14 @@ shared_examples 'database error rescuing' do
 end
 
 describe RescueFromDuplicate::ActiveRecord do
-  if defined?(MysqlModel)
-    context 'mysql' do
-      let(:message) { "Duplicate entry '1-Rescuable-toto' for key 'index_rescuable_on_shop_id_and_type_and_name'" }
-      it_behaves_like 'database error rescuing'
-    end
+  context 'mysql' do
+    let(:message) { "Duplicate entry '1-Rescuable-toto' for key 'index_rescuable_on_shop_id_and_type_and_name'" }
+    it_behaves_like 'database error rescuing'
   end
 
-  if defined?(PostgresqlModel)
-    context 'pgsql' do
-      let(:message) { "PG::UniqueViolation: ERROR:  duplicate key value violates unique constraint \"index_rescuable_on_shop_id_and_type_and_name\"\nDETAIL:  Key (shop_id, type, name)=(1, Rescuable, toto) already exists.\n: INSERT INTO \"postgresql_models\" (\"shop_id\", \"type\", \"name\") VALUES ($1, $2, $3) RETURNING \"id\"" }
-      it_behaves_like 'database error rescuing'
-    end
+  context 'pgsql' do
+    let(:message) { "PG::UniqueViolation: ERROR:  duplicate key value violates unique constraint \"index_rescuable_on_shop_id_and_type_and_name\"\nDETAIL:  Key (shop_id, type, name)=(1, Rescuable, toto) already exists.\n: INSERT INTO \"postgresql_models\" (\"shop_id\", \"type\", \"name\") VALUES ($1, $2, $3) RETURNING \"id\"" }
+    it_behaves_like 'database error rescuing'
   end
 
   context 'sqlite3' do

data/spec/rescuer_spec.rb

@@ -35,14 +35,10 @@ describe Sqlite3Model do
   it_behaves_like 'a model with rescued unique error without validator'
 end
 
-if defined?(MysqlModel)
-  describe MysqlModel do
-    it_behaves_like 'a model with rescued unique error without validator'
-  end
+describe MysqlModel do
+  it_behaves_like 'a model with rescued unique error without validator'
 end
 
-if defined?(PostgresqlModel)
-  describe PostgresqlModel do
-    it_behaves_like 'a model with rescued unique error without validator'
-  end
+describe PostgresqlModel do
+  it_behaves_like 'a model with rescued unique error without validator'
 end

data/spec/spec_helper.rb

@@ -83,8 +83,6 @@ module RescueFromDuplicate
         "index_rescuable_on_shop_id_and_type_and_name",
         true,
         ["shop_id", "type", "name"],
-        [nil, nil, nil],
-        nil
       )
     end
   end

data/spec/support/model.rb

@@ -1,18 +1,30 @@
-require 'active_record'
-require 'json'
-require 'yaml'
-
-AR_VERSION = Gem::Version.new(ActiveRecord::VERSION::STRING)
-AR_4_0 = Gem::Version.new('4.0')
-AR_4_1 = Gem::Version.new('4.1.0.beta')
-
-ActiveRecord::Base.configurations = {
-  'test_sqlite3' => {adapter: 'sqlite3', database: "/tmp/rescue_from_duplicate.db"},
-  'test_postgresql' => {adapter: 'postgresql', database: 'rescue_from_duplicate', username: 'postgres'},
-  'test_mysql' => {adapter: 'mysql2', database: 'rescue_from_duplicate', username: 'travis'},
+require "active_record"
+require "json"
+require "yaml"
+
+CONNECTIONS = {
+  test_sqlite3: {
+    adapter: "sqlite3",
+    database: "/tmp/rescue_from_duplicate.db",
+  },
+  test_postgresql: {
+    adapter: "postgresql",
+    database: "rescue_from_duplicate",
+    username: "test",
+    password: "test",
+    host: "127.0.0.1",
+    port: "29292",
+  },
+  test_mysql: {
+    adapter: "mysql2",
+    database: "rescue_from_duplicate",
+    username: "test",
+    password: "test",
+    host: "127.0.0.1",
+    port: "29291",
+  },
 }
-
-class CreateAllTables < ActiveRecord::Migration
+class CreateAllTables < ActiveRecord::Migration[5.2]
   def self.recreate_table(name, *args, &block)
     execute "drop table if exists #{name}"
 
@@ -30,17 +42,13 @@ class CreateAllTables < ActiveRecord::Migration
   end
 
   def self.up
-    if ENV['MYSQL']
-      ActiveRecord::Base.establish_connection('test_mysql')
-      recreate_table(:mysql_models)
-    end
+    ActiveRecord::Base.establish_connection(CONNECTIONS.fetch(:test_mysql))
+    recreate_table(:mysql_models)
 
-    if ENV['POSTGRES']
-      ActiveRecord::Base.establish_connection(ENV['POSTGRES_URL'] || 'test_postgresql')
-      recreate_table(:postgresql_models)
-    end
+    ActiveRecord::Base.establish_connection(CONNECTIONS.fetch(:test_postgresql))
+    recreate_table(:postgresql_models)
 
-    ActiveRecord::Base.establish_connection('test_sqlite3')
+    ActiveRecord::Base.establish_connection(CONNECTIONS.fetch(:test_sqlite3))
     recreate_table(:sqlite3_models)
   end
 end
@@ -50,43 +58,37 @@ CreateAllTables.up
 
 
 module TestModel
-  extend ActiveSupport::Concern
-
-  included do
-    rescue_from_duplicate :handle, scope: :relation_id, message: "handle must be unique for this relation"
+  def self.included(base)
+    base.rescue_from_duplicate(:handle, scope: :relation_id, message: "handle must be unique for this relation")
 
-    validates_uniqueness_of :name, rescue_from_duplicate: true, allow_nil: true
-    validates_uniqueness_of :size, allow_nil: true
+    base.validates(:name, uniqueness: { rescue_from_duplicate: true, case_sensitive: true }, allow_nil: true)
+    base.validates(:size, uniqueness: { rescue_from_duplicate: true }, allow_nil: true)
   end
 end
 
-if ENV['MYSQL']
-  class MysqlModel < ActiveRecord::Base
-    include TestModel
+class MysqlModel < ActiveRecord::Base
+  include TestModel
 
-    establish_connection 'test_mysql'
-  end
+  establish_connection(CONNECTIONS.fetch(:test_mysql))
 end
 
-if ENV['POSTGRES']
-  class PostgresqlModel < ActiveRecord::Base
-    include TestModel
+class PostgresqlModel < ActiveRecord::Base
+  include TestModel
 
-    establish_connection ENV['POSTGRES_URL'] || 'test_postgresql'
-  end
+  establish_connection(CONNECTIONS.fetch(:test_postgresql))
 end
 
 class Sqlite3Model < ActiveRecord::Base
   include TestModel
 
-  establish_connection 'test_sqlite3'
+  establish_connection(CONNECTIONS.fetch(:test_sqlite3))
 end
 
 Models = [
-  Sqlite3Model
+  Sqlite3Model,
+  MysqlModel,
+  PostgresqlModel,
 ]
-Models << MysqlModel if defined?(MysqlModel)
-Models << PostgresqlModel if defined?(PostgresqlModel)
 
 
 RSpec.configure do |config|

data/spec/validator_spec.rb

@@ -5,7 +5,8 @@ shared_examples 'a model with rescued uniqueness validator' do
     context 'when catching a race condition' do
 
       before(:each) {
-        ActiveRecord::Validations::UniquenessValidator.any_instance.stub(validate_each: nil)
+        allow_any_instance_of(ActiveRecord::Validations::UniquenessValidator)
+          .to(receive(:validate_each)).and_return(nil)
         described_class.create!(name: 'toto', size: 5)
       }
 
@@ -55,7 +56,7 @@ shared_examples 'missing index finding' do
 
     context 'indexes are missing' do
       before {
-        described_class.stub(_rescue_from_duplicate_handlers: [
+        allow(described_class).to(receive(:_rescue_from_duplicate_handlers).and_return([
           RescueFromDuplicate::UniquenessRescuer.new(
             ::ActiveRecord::Validations::UniquenessValidator.new(
               attributes: [:name],
@@ -63,7 +64,7 @@ shared_examples 'missing index finding' do
             )
           ),
           RescueFromDuplicate::Rescuer.new(:name, scope: [:hello])
-        ])
+        ]))
       }
 
       it 'returns the missing indexes' do
@@ -88,16 +89,12 @@ describe Sqlite3Model do
   it_behaves_like 'missing index finding'
 end
 
-if defined?(MysqlModel)
-  describe MysqlModel do
-    it_behaves_like 'a model with rescued uniqueness validator'
-    it_behaves_like 'missing index finding'
-  end
+describe MysqlModel do
+  it_behaves_like 'a model with rescued uniqueness validator'
+  it_behaves_like 'missing index finding'
 end
 
-if defined?(PostgresqlModel)
-  describe PostgresqlModel do
-    it_behaves_like 'a model with rescued uniqueness validator'
-    it_behaves_like 'missing index finding'
-  end
+describe PostgresqlModel do
+  it_behaves_like 'a model with rescued uniqueness validator'
+  it_behaves_like 'missing index finding'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-rescue_from_duplicate
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.6
 platform: ruby
 authors:
 - Guillaume Malette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2020-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -151,11 +151,7 @@ files:
 - README.md
 - Rakefile
 - activerecord-rescue_from_duplicate.gemspec
-- gemfiles/Gemfile.ar-3.2
-- gemfiles/Gemfile.ar-4.0
-- gemfiles/Gemfile.ar-4.1
-- gemfiles/Gemfile.ar-4.2
-- gemfiles/Gemfile.ar-edge
+- docker-compose.yml
 - lib/activerecord-rescue_from_duplicate.rb
 - lib/rescue_from_duplicate/active_record.rb
 - lib/rescue_from_duplicate/active_record/extension.rb
@@ -173,7 +169,8 @@ files:
 homepage: https://github.com/Shopify/activerecord-rescue_from_duplicate
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -189,8 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Rescue from MySQL and Sqlite duplicate errors when trying to insert records

data/gemfiles/Gemfile.ar-3.2

@@ -1,10 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'activerecord', '~> 3.2.15'
-gem 'bundler', '~> 1.3'
-gem 'rake'
-gem 'rspec'
-gem 'sqlite3'
-gem 'pg', '~> 0.11'
-gem 'mysql2', '~> 0.3.20'
-gem 'simplecov', require: false

data/gemfiles/Gemfile.ar-4.0

@@ -1,10 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'activerecord', '~> 4.0.0'
-gem 'bundler', '~> 1.3'
-gem 'rake'
-gem 'rspec'
-gem 'sqlite3'
-gem 'pg', '~> 0.11'
-gem 'mysql2', '~> 0.3.20'
-gem 'simplecov', require: false

data/gemfiles/Gemfile.ar-4.1

@@ -1,10 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'activerecord', '~> 4.1.0'
-gem 'bundler', '~> 1.3'
-gem 'rake'
-gem 'rspec'
-gem 'sqlite3'
-gem 'pg', '~> 0.11'
-gem 'mysql2', '~> 0.3.20'
-gem 'simplecov', require: false

data/gemfiles/Gemfile.ar-4.2

@@ -1,10 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'activerecord', '~> 4.2.0'
-gem 'bundler', '~> 1.3'
-gem 'rake'
-gem 'rspec'
-gem 'sqlite3'
-gem 'pg', '~> 0.11'
-gem 'mysql2', '~> 0.3.20'
-gem 'simplecov', require: false

data/gemfiles/Gemfile.ar-edge

@@ -1,12 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rails', github: 'rails/rails'
-gem 'arel', github: 'rails/arel'
-
-gem 'bundler', '~> 1.3'
-gem 'rake'
-gem 'rspec'
-gem 'sqlite3'
-gem 'pg', '~> 0.11'
-gem 'mysql2', '~> 0.3.20'
-gem 'simplecov', require: false