activerecord-rescue_from_duplicate 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d59c5d63f6929f47bcf86422995f8cd95893edf
-  data.tar.gz: 547f6c3633d0df084d64cc85c5afbd50a45db1a1
+  metadata.gz: e499e51bfc3ec5a7d05bd7835a0cbb3916607905
+  data.tar.gz: d6c76963003fc3bac1b594f490680ad622251b3c
 SHA512:
-  metadata.gz: 8195739d842dc67951c013505698d11ac0fb591dd70fa1723eb17cc153c1b68d92b9dbf8ddd750de1043e69e64b4ae6d8b792c4d57e2a4371c62bff52d0012d6
-  data.tar.gz: 77fe96c1d679bb986c413713c645575e59539335d1a8d1b5acfc584d35c2762c144a386c8fa9fd7d2c5befa8a32822a3b181e5c0488920bfa01c94005465f1f7
+  metadata.gz: 9dbc186269181a05853c12fed297986f0529dfb26bc3297a1758fc304da0c5966a634ed84044ccd0c67c08f4456e0f32d76938473845a45fe123982d3d54511c
+  data.tar.gz: 224278194bf55ade9ba082e1841513faa2b29ecbef1918887476dcb9bd126636e5d0c0e24a0ab9ec6b172ebc62d8f81b4040a0bc501fc96e85f29ba1d84d0fe3

data/.travis.yml

@@ -1,9 +1,11 @@
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.2
 gemfile:
   - spec/gemfiles/Gemfile.ar-3.2
   - spec/gemfiles/Gemfile.ar-4.0
+  - spec/gemfiles/Gemfile.ar-4.1
   - spec/gemfiles/Gemfile.ar-edge
 
 before_script:
@@ -11,16 +13,8 @@ before_script:
   - psql -c 'create database rescue_from_duplicate;' -U postgres
 
 env:
-  - POSTGRES=1
-  - MYSQL=1
+  - POSTGRES=1 MYSQL=1
 
 matrix:
   allow_failures:
     - gemfile: gemfiles/Gemfile.ar-edge
-    - env: POSTGRES=1
-    - gemfile: gemfiles/Gemfile.ar-edge
-      env: MYSQL=1
-      rvm: 1.9.3
-    - gemfile: gemfiles/Gemfile.ar-edge
-      env: MYSQL=1
-      rvm: 2.0.0

data/README.md

@@ -2,53 +2,74 @@
 
 [![Build Status](https://travis-ci.org/Shopify/activerecord-rescue_from_duplicate.png?branch=master)](https://travis-ci.org/Shopify/activerecord-rescue_from_duplicate)
 
-This gem will rescue from MySQL and Sqlite errors when trying to insert records that fail uniqueness validation.
-PostgreSQL is not supported at the moment because of the errors raised when using prepared statements.
+This gem will rescue SQL errors when trying to insert records that fail uniqueness validation.
 
 It complements `:validates_uniqueness_of` and will add appropriate errors.
 
-**Note:**
+Additionally, a macro allows you to assume that the record will be unique and rescue gracefully otherwise.
 
-* All `before_*` filters will have been run.
-* Unlike failed validation, `ActiveRecord::RecordNotSaved` will be raised when using `create!`, `save!` or other `!` methods.
+Tested with:
 
-## Installation
-
-Add this line to your application's Gemfile:
+- ActiveRecord: 3.2, 4.0, 4.1, edge
+- Ruby 1.9.3, 2.0.0, 2.1.2
+- MySQL, PostgreSQL, Sqlite3
 
-    gem 'activerecord-rescue_from_duplicate'
-
-And then execute:
+**Note:**
 
-    $ bundle
+* `after_validation`, `before_save`, `before_create` will have been run. Make sure they don't have undesired side-effects.
+* Unlike failed validation, `ActiveRecord::RecordNotSaved` will be raised when using `create!`, `save!` or other `!` methods.
 
-Or install it yourself as:
+## Usage
 
-    $ gem install activerecord-rescue_from_duplicate
+### With validation
 
-## Usage
+Add the `rescue_from_duplicate: true` to any regular uniqueness validation.
 
-Add the `:rescue_from_duplicate => true` to any regular uniqueness validation.
+This will use the Rails standard validation, performing a `SELECT` to ensure the record is valid. In the case of a race condition, an error will be added to the model, and no exception will be thrown.
 
 ```ruby
 class ModelWithUniquenessValidator < ActiveRecord::Base
-  validates_uniqueness_of :name, :scope => :shop_id, :rescue_from_duplicate => true
+  validates_uniqueness_of :name, scope: :shop_id, rescue_from_duplicate: true
 end
 ```
 
 If two of this statement go in at the same time, and the original validation on uniqueness of name passes, the DBMS will raise an duplicate record error.
 
 ```ruby
-a = ModelWithUniquenessValidator.create(:name => "name")
+a = ModelWithUniquenessValidator.create(name: "name")
 
 # in a different thread, causing race condition
-b = ModelWithUniquenessValidator.create(:name => "name")
+b = ModelWithUniquenessValidator.create(name: "name")
 
 a.persisted? #=> true
 b.persisted? #=> false
 b.errors[:name] #=> ["has already been taken"]
 ```
 
+### Without validation
+
+You can use this if you don't need to check that the record is unique before attempting to insert it. It will not add any validation to the model, but it will add an error if the persistance fails.
+
+```ruby
+class ModelWithUniqueToken < ActiveRecord::Base
+  rescue_from_duplicate :token, scope: :shop_id
+end
+```
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'activerecord-rescue_from_duplicate'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install activerecord-rescue_from_duplicate
+
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -7,7 +7,7 @@ task :default => :spec
 
 namespace :spec do
   task :all do
-    %w(3.2 4.0 edge).each do |ar_version|
+    %w(3.2 4.0 4.1 edge).each do |ar_version|
       system(
         {
           "BUNDLE_GEMFILE" => "spec/gemfiles/Gemfile.ar-#{ar_version}",

data/activerecord-rescue_from_duplicate.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = "activerecord-rescue_from_duplicate"
   spec.version       = Activerecord::RescueFromDuplicate::VERSION
   spec.authors       = ["Guillaume Malette"]
-  spec.email         = ["guillaume@jadedpixel.com"]
+  spec.email         = ["guillaume@shopify.com"]
   spec.description   = %q{Rescue from MySQL and Sqlite duplicate errors}
   spec.summary       = %q{Rescue from MySQL and Sqlite duplicate errors when trying to insert records that fail uniqueness validation}
   spec.homepage      = "https://github.com/Shopify/activerecord-rescue_from_duplicate"
@@ -22,11 +22,10 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'sqlite3'
-  spec.add_development_dependency 'pg'
   spec.add_development_dependency 'mysql2'
   spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'pg'
   spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'pry-debugger'
 end

data/lib/rescue_from_duplicate/active_record.rb

@@ -8,6 +8,7 @@ module RescueFromDuplicate
 end
 
 require 'rescue_from_duplicate/active_record/extension'
+require 'rescue_from_duplicate/rescuer'
 
 ActiveSupport.on_load(:active_record) do
   ::ActiveRecord::Base.send :include, RescueFromDuplicate::ActiveRecord::Extension

data/lib/rescue_from_duplicate/active_record/extension.rb

@@ -2,51 +2,85 @@ require 'active_support/core_ext/class'
 
 module RescueFromDuplicate::ActiveRecord
   module Extension
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def rescue_from_duplicate(attribute, options = {})
+        self._rescue_from_duplicates += [RescueFromDuplicate::Rescuer.new(attribute, options)]
+      end
+    end
+
+    included do
+      class_attribute :_rescue_from_duplicates
+      self._rescue_from_duplicates = []
+    end
+
     def create_or_update(*params, &block)
       super
     rescue ActiveRecord::RecordNotUnique => exception
-      validator = exception_validator(exception)
+      handler = exception_validator(exception) || exception_rescuer(exception)
 
-      raise exception unless validator
+      raise exception unless handler
 
-      attribute = validator.attributes.first
-      options = validator.options.except(:case_sensitive, :scope).merge(:value => self.send(:read_attribute_for_validation, attribute))
+      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)
       false
     end
 
     def exception_validator(exception)
-      columns = exception_columns(exception).sort
+      columns = exception_columns(exception)
 
       self._validators.each do |attribute, validators|
         validators.each do |validator|
           next unless validator.is_a?(ActiveRecord::Validations::UniquenessValidator)
-          return validator if rescue_with_validator(columns, validator)
+          return validator if rescue_with_validator?(columns, validator)
         end
       end
 
       nil
     end
 
+    protected
+
     def exception_columns(exception)
-      exception.message =~ /SQLite3::ConstraintException/ ? sqlite3_exception_columns(exception) : other_exception_columns(exception)
+      columns = case
+      when exception.message =~ /SQLite3::ConstraintException/
+        sqlite3_exception_columns(exception)
+      when exception.message =~ /PG::UniqueViolation/
+        postgresql_exception_columns(exception)
+      else
+        other_exception_columns(exception)
+      end
     end
 
-    protected
+    def exception_rescuer(exception)
+      columns = exception_columns(exception)
+
+      _rescue_from_duplicates.detect { |rescuer| rescuer.matches?(columns) }
+    end
+
+    def postgresql_exception_columns(exception)
+      extract_columns(exception.message[/Key \((.*?)\)=\(.*?\) already exists./, 1])
+    end
 
     def sqlite3_exception_columns(exception)
-      columns = exception.message[/column (.*) is not unique/, 1]
-      return unless columns
-      columns.split(",").map(&:strip)
+      extract_columns(exception.message[/columns? (.*) (?:is|are) not unique/, 1])
+    end
+
+    def extract_columns(columns_string)
+      return unless columns_string
+      columns_string.split(",").map(&:strip).sort
     end
 
     def other_exception_columns(exception)
       indexes = self.class.connection.indexes(self.class.table_name)
-      indexes.detect{ |i| exception.message.include?(i.name) }.try(:columns) || []
+      columns = indexes.detect{ |i| exception.message.include?(i.name) }.try(:columns) || []
+      columns.sort
     end
 
-    def rescue_with_validator(columns, validator)
+    def rescue_with_validator?(columns, validator)
       validator_columns = (Array(validator.options[:scope]) + validator.attributes).map(&:to_s).sort
       return false unless columns == validator_columns
       validator.options.fetch(:rescue_from_duplicate) { false }

data/lib/rescue_from_duplicate/active_record/version.rb

@@ -1,5 +1,5 @@
 module Activerecord
   module RescueFromDuplicate
-    VERSION = "0.0.2"
+    VERSION = "0.0.4"
   end
 end

data/lib/rescue_from_duplicate/rescuer.rb

@@ -0,0 +1,15 @@
+module RescueFromDuplicate
+  class Rescuer
+    attr_reader :attributes, :options
+
+    def initialize(attribute, options)
+      @attributes = [attribute]
+      @columns = [attribute, *Array(options[:scope])].map(&:to_s)
+      @options = options
+    end
+
+    def matches?(columns)
+      @columns == columns.map(&:to_s).sort
+    end
+  end
+end

data/shipit.rubygems.yml

@@ -0,0 +1 @@
+# using the default shipit config

data/spec/gemfiles/Gemfile.ar-3.2

@@ -7,4 +7,4 @@ gem 'rspec'
 gem 'sqlite3'
 gem 'pg', '~> 0.11'
 gem 'mysql2'
-gem 'coveralls', require: false
+gem 'simplecov', require: false

data/spec/gemfiles/Gemfile.ar-4.0

@@ -7,4 +7,4 @@ gem 'rspec'
 gem 'sqlite3'
 gem 'pg', '~> 0.11'
 gem 'mysql2'
-gem 'coveralls', require: false
+gem 'simplecov', require: false

data/spec/gemfiles/Gemfile.ar-4.1

@@ -0,0 +1,10 @@
+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'
+gem 'simplecov', require: false

data/spec/gemfiles/Gemfile.ar-edge

@@ -9,4 +9,4 @@ gem 'rspec'
 gem 'sqlite3'
 gem 'pg', '~> 0.11'
 gem 'mysql2'
-gem 'coveralls', require: false
+gem 'simplecov', require: false

data/spec/rescue_from_duplicate_spec.rb

@@ -7,24 +7,7 @@ shared_examples 'database error rescuing' do
   subject { Rescuable.new }
 
   before do
-    Rescuable.stub(:connection => double(:indexes => [Rescuable.index]))
-  end
-
-  describe "#exception_columns" do
-    context "index cannot be found" do
-      let(:message) { super().gsub(/index_\w+/, "index_toto").gsub(/column .* is/, 'column toto is') }
-      let(:exception) { ActiveRecord::RecordNotUnique.new(message, nil) }
-
-      it "returns an array" do
-        expect(subject.exception_columns(exception)).to be_a Array
-      end
-    end
-
-    context "index can be found" do
-      it "returns the columns" do
-        expect(subject.exception_columns(uniqueness_exception).sort).to eq ["shop_id", "type", "name"].sort
-      end
-    end
+    allow(Rescuable).to receive(:connection).and_return(double(indexes: [Rescuable.index]))
   end
 
   describe "#exception_validator" do
@@ -36,7 +19,7 @@ shared_examples 'database error rescuing' do
 
     context "validator cannot be found" do
       before {
-        Rescuable.stub(:_validators => {:name => [Rescuable.presence_validator]})
+        Rescuable.stub(_validators: {name: [Rescuable.presence_validator]})
       }
 
       it "returns nil" do
@@ -46,7 +29,7 @@ shared_examples 'database error rescuing' do
 
     context "validator doesn't specify :rescue_from_duplicate" do
       before {
-        Rescuable.stub(:_validators => {:name => [Rescuable.uniqueness_validator_without_rescue]})
+        Rescuable.stub(_validators: {name: [Rescuable.uniqueness_validator_without_rescue]})
       }
 
       it "returns nil" do
@@ -56,7 +39,7 @@ shared_examples 'database error rescuing' do
 
     context "no validator" do
       before {
-        Rescuable.stub(:_validators => {})
+        Rescuable.stub(_validators: {})
       }
 
       it "returns nil" do
@@ -66,11 +49,11 @@ shared_examples 'database error rescuing' do
 
     context "no index on the table" do
       before {
-        Rescuable.stub(:index => nil)
-        Rescuable.stub(:connection => double(:indexes => []))
+        Rescuable.stub(index: nil)
+        Rescuable.stub(connection: double(indexes: []))
       }
 
-      let(:message) { super().gsub(/column (.*) is/, 'column toto is') }
+      let(:message) { super().gsub(/column (.*?) is/, 'column toto is').gsub(/Key \((.*?)\)=/, 'Key (toto)=') }
 
       it "returns nil" do
         expect(subject.exception_validator(uniqueness_exception)).to be_nil
@@ -79,7 +62,7 @@ shared_examples 'database error rescuing' do
 
     context "columns part of the index of another table" do
       before {
-        subject.stub(:exception_columns => ['foo', 'baz'])
+        subject.stub(exception_columns: ['foo', 'baz'])
       }
 
       it "returns nil" do
@@ -89,7 +72,7 @@ shared_examples 'database error rescuing' do
   end
 
   describe "#create_or_update when the validation fails" do
-    before { Base.stub(:exception => uniqueness_exception) }
+    before { Base.stub(exception: uniqueness_exception) }
 
     context "when the validator is present" do
       it "adds an error to the model" do
@@ -99,13 +82,26 @@ shared_examples 'database error rescuing' do
     end
 
     context "when the validator is not present" do
-      before { Rescuable.stub(:_validators => {:name => [Rescuable.presence_validator]}) }
+      before { Rescuable.stub(_validators: {name: [Rescuable.presence_validator]}) }
 
       it "raises an exception" do
         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)
+    }
+
+    it "adds an error to the model" do
+      subject.create_or_update
+      expect(subject.errors[:name]).to eq ["is not unique by type and shop id"]
+    end
+  end
 end
 
 describe RescueFromDuplicate::ActiveRecord do

data/spec/rescuer_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe RescueFromDuplicate::Rescuer do
+  subject { RescueFromDuplicate::Rescuer.new(:name, scope: :shop_id) }
+
+  context "#matches?" do
+    it 'is true when the columns are the same' do
+      expect(subject.matches?(["shop_id", "name"])).to be true
+    end
+
+    it 'is false when the columns are not the same' do
+      expect(subject.matches?(["shop_id", "toto"])).to be false
+    end
+  end
+end
+
+shared_examples 'a model with rescued unique error without validator' do
+  describe 'create!' do
+    context 'when catching a race condition' do
+      before {
+        described_class.create!(relation_id: 1, handle: 'toto')
+      }
+
+      it 'adds an error on the model' do
+        model = described_class.create(relation_id: 1, handle: 'toto')
+        expect(model.errors[:handle]).to eq(["handle must be unique for this relation"])
+      end
+    end
+  end
+end
+
+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
+end
+
+if defined?(PostgresqlModel)
+  describe PostgresqlModel do
+    it_behaves_like 'a model with rescued unique error without validator'
+  end
+end

data/spec/spec_helper.rb

@@ -1,23 +1,20 @@
+require 'simplecov'
+
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+SimpleCov.start do
+  add_filter '/spec/'
+end
+
 require 'active_record'
 require 'activerecord-rescue_from_duplicate'
 
 begin
   require 'pry'
-  require 'pry-debugger'
 rescue LoadError
 end
 
-require 'simplecov'
-require 'coveralls'
-
-# lib = File.expand_path('../lib', __FILE__)
-# $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-# SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-#   SimpleCov::Formatter::HTMLFormatter,
-#   Coveralls::SimpleCov::Formatter
-# ]
-# SimpleCov.start
 
 
 module RescueFromDuplicate
@@ -56,7 +53,7 @@ module RescueFromDuplicate
 
     def self._validators
       @validators ||= {
-        :name =>
+        name:
         [
           uniqueness_validator,
           presence_validator
@@ -66,21 +63,27 @@ module RescueFromDuplicate
 
     def self.uniqueness_validator
       @uniqueness_validator ||= ::ActiveRecord::Validations::UniquenessValidator.new(
-        :attributes => [:name],
-        :case_sensitive => true, :scope => [:shop_id, :type],
-        :rescue_from_duplicate => true
+        attributes: [:name],
+        case_sensitive: true, scope: [:shop_id, :type],
+        rescue_from_duplicate: true
       ).tap { |o| o.setup(self) if o.respond_to?(:setup) }
     end
 
     def self.uniqueness_validator_without_rescue
       @uniqueness_validator_without_rescue ||= ::ActiveRecord::Validations::UniquenessValidator.new(
-        :attributes => [:name],
-        :case_sensitive => true, :scope => [:shop_id, :type]
+        attributes: [:name],
+        case_sensitive: true, scope: [:shop_id, :type]
       ).tap { |o| o.setup(self) if o.respond_to?(:setup) }
     end
 
+    def self.uniqueness_rescuer
+      @uniqueness_rescuer ||= RescueFromDuplicate::Rescuer.new(
+        :name, scope: [:shop_id, :type], message: "is not unique by type and shop id"
+      )
+    end
+
     def self.presence_validator
-      @presence_validator ||= ActiveModel::Validations::PresenceValidator.new(:attributes => [:name])
+      @presence_validator ||= ActiveModel::Validations::PresenceValidator.new(attributes: [:name])
     end
 
     def self.index
@@ -107,7 +110,6 @@ Dir[File.expand_path(File.join(File.dirname(__FILE__), 'support', '**', '*.rb'))
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 

data/spec/support/model.rb

@@ -17,12 +17,16 @@ class CreateAllTables < ActiveRecord::Migration
     execute "drop table if exists #{name}"
 
     create_table(name, *args) do |t|
+      t.integer :relation_id
+      t.string :handle
+
       t.string :name
       t.integer :size
     end
 
-    add_index name, :name, :unique => true
-    add_index name, :size, :unique => true
+    add_index name, [:relation_id, :handle], unique: true
+    add_index name, :name, unique: true
+    add_index name, :size, unique: true
   end
 
   def self.up
@@ -49,8 +53,10 @@ module TestModel
   extend ActiveSupport::Concern
 
   included do
-    validates_uniqueness_of :name, :rescue_from_duplicate => true
-    validates_uniqueness_of :size
+    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
   end
 end
 

data/spec/validator_spec.rb

@@ -1,22 +1,22 @@
 require 'spec_helper'
 
-shared_examples 'a model with rescued unique' do
+shared_examples 'a model with rescued uniqueness validator' do
   describe 'create!' do
     context 'when catching a race condition' do
 
       before(:each) {
-        ActiveRecord::Validations::UniquenessValidator.any_instance.stub(:validate_each => nil)
-        described_class.create!(:name => 'toto', :size => 5)
+        ActiveRecord::Validations::UniquenessValidator.any_instance.stub(validate_each: nil)
+        described_class.create!(name: 'toto', size: 5)
       }
 
       it 'raises an ActiveRecord::RecordNotSaved error' do
-        expect{ described_class.create!(:name => 'toto') }.to raise_error(ActiveRecord::RecordNotSaved)
+        expect{ described_class.create!(name: 'toto') }.to raise_error(ActiveRecord::RecordNotSaved)
       end
 
       it "doesn't save the record" do
         expect{
           begin
-            described_class.create!(:name => 'toto')
+            described_class.create!(name: 'toto')
           rescue ActiveRecord::RecordNotSaved
             # NOOP
           end
@@ -27,8 +27,8 @@ shared_examples 'a model with rescued unique' do
         expect {
           begin
             described_class.transaction do
-              described_class.create(:name => 'not toto', :size => 55)
-              described_class.create!(:name => 'toto')
+              described_class.create(name: 'not toto', size: 55)
+              described_class.create!(name: 'toto')
             end
           rescue ActiveRecord::RecordNotSaved
             # NOOP
@@ -39,24 +39,24 @@ shared_examples 'a model with rescued unique' do
 
     context "with no race condition" do
       it 'saves the model' do
-        expect{ described_class.create!(:name => 'toto') }.to change(described_class, :count).by(1)
+        expect{ described_class.create!(name: 'toto') }.to change(described_class, :count).by(1)
       end
     end
   end
 end
 
 describe Sqlite3Model do
-  it_behaves_like 'a model with rescued unique'
+  it_behaves_like 'a model with rescued uniqueness validator'
 end
 
 if defined?(MysqlModel)
   describe MysqlModel do
-    it_behaves_like 'a model with rescued unique'
+    it_behaves_like 'a model with rescued uniqueness validator'
   end
 end
 
 if defined?(PostgresqlModel)
   describe PostgresqlModel do
-    it_behaves_like 'a model with rescued unique'
+    it_behaves_like 'a model with rescued uniqueness validator'
   end
 end

metadata

@@ -1,165 +1,151 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-rescue_from_duplicate
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Guillaume Malette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-17 00:00:00.000000000 Z
+date: 2014-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-debugger
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Rescue from MySQL and Sqlite duplicate errors
 email:
-- guillaume@jadedpixel.com
+- guillaume@shopify.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -169,10 +155,14 @@ files:
 - lib/rescue_from_duplicate/active_record.rb
 - lib/rescue_from_duplicate/active_record/extension.rb
 - lib/rescue_from_duplicate/active_record/version.rb
+- lib/rescue_from_duplicate/rescuer.rb
+- shipit.rubygems.yml
 - spec/gemfiles/Gemfile.ar-3.2
 - spec/gemfiles/Gemfile.ar-4.0
+- spec/gemfiles/Gemfile.ar-4.1
 - spec/gemfiles/Gemfile.ar-edge
 - spec/rescue_from_duplicate_spec.rb
+- spec/rescuer_spec.rb
 - spec/spec_helper.rb
 - spec/support/model.rb
 - spec/validator_spec.rb
@@ -186,17 +176,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rescue from MySQL and Sqlite duplicate errors when trying to insert records
@@ -204,8 +194,10 @@ summary: Rescue from MySQL and Sqlite duplicate errors when trying to insert rec
 test_files:
 - spec/gemfiles/Gemfile.ar-3.2
 - spec/gemfiles/Gemfile.ar-4.0
+- spec/gemfiles/Gemfile.ar-4.1
 - spec/gemfiles/Gemfile.ar-edge
 - spec/rescue_from_duplicate_spec.rb
+- spec/rescuer_spec.rb
 - spec/spec_helper.rb
 - spec/support/model.rb
 - spec/validator_spec.rb