activerecord-rescue_from_duplicate 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDA5ZTEwOWE2NjIxMTQ5MWY0MDI0YTM2NDZmNzFlYTkwZDE4NGQzMw==
-  data.tar.gz: !binary |-
-    NThhZTcxOTExYzkyZjZhNTYyYjFiZTJlZjRhODdmZWM2MjEwZDNmNg==
+SHA1:
+  metadata.gz: 4d59c5d63f6929f47bcf86422995f8cd95893edf
+  data.tar.gz: 547f6c3633d0df084d64cc85c5afbd50a45db1a1
 SHA512:
-  metadata.gz: !binary |-
-    NDljN2M4MjcxZmUxMjhhNGRjNTgyZDk3YThkNTBkYzEzODc3MWNjMmNkMTE2
-    ZWI0ZDQ3YmMzN2EwMTUwNTVjNmEyYmE4MGY5ODQxODJhNDU5ZWJmYTZjYjU4
-    YjUwZDI0MjUwNjcyYTI0MTJmNjdmMWU0YzQ4ZWRiZDk2OTExNmU=
-  data.tar.gz: !binary |-
-    MzRhMDQ1MmM2MTdmZGJiZTRmZGFmNGQ5ZjdhYWY3MDJkNGRkZjI2MzRiMTJi
-    NmEzMjJhYTIzYjA0MjQ4NWZmMDMyMzZhNThiZjgyMzFjNDIxOWI5MDY4MTU2
-    Mjg2NjhlZGUzOWQ2Y2EwYTY2MzQ2YzZmZTYzMTBiOGE0YjliOGE=
+  metadata.gz: 8195739d842dc67951c013505698d11ac0fb591dd70fa1723eb17cc153c1b68d92b9dbf8ddd750de1043e69e64b4ae6d8b792c4d57e2a4371c62bff52d0012d6
+  data.tar.gz: 77fe96c1d679bb986c413713c645575e59539335d1a8d1b5acfc584d35c2762c144a386c8fa9fd7d2c5befa8a32822a3b181e5c0488920bfa01c94005465f1f7

data/README.md

@@ -1,5 +1,7 @@
 # ActiveRecord - RescueFromDuplicate
 
+[![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.
 

data/lib/rescue_from_duplicate/active_record/extension.rb

@@ -4,10 +4,10 @@ module RescueFromDuplicate::ActiveRecord
   module Extension
     def create_or_update(*params, &block)
       super
-    rescue ActiveRecord::RecordNotUnique => e
-      validator = exception_validator(e)
+    rescue ActiveRecord::RecordNotUnique => exception
+      validator = exception_validator(exception)
 
-      raise e unless validator
+      raise exception unless validator
 
       attribute = validator.attributes.first
       options = validator.options.except(:case_sensitive, :scope).merge(:value => self.send(:read_attribute_for_validation, attribute))
@@ -43,7 +43,7 @@ module RescueFromDuplicate::ActiveRecord
 
     def other_exception_columns(exception)
       indexes = self.class.connection.indexes(self.class.table_name)
-      indexes.detect{ |i| exception.message.include?(i.name) }.try(:columns)
+      indexes.detect{ |i| exception.message.include?(i.name) }.try(:columns) || []
     end
 
     def rescue_with_validator(columns, validator)

data/lib/rescue_from_duplicate/active_record/version.rb

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

data/spec/rescue_from_duplicate_spec.rb

@@ -12,11 +12,11 @@ shared_examples 'database error rescuing' do
 
   describe "#exception_columns" do
     context "index cannot be found" do
-      let(:message) { super().gsub(/index_\w+/, "index_toto").gsub(/column .* is/, 'toto') }
+      let(:message) { super().gsub(/index_\w+/, "index_toto").gsub(/column .* is/, 'column toto is') }
       let(:exception) { ActiveRecord::RecordNotUnique.new(message, nil) }
 
-      it "returns nil" do
-        expect(subject.exception_columns(exception)).to be_nil
+      it "returns an array" do
+        expect(subject.exception_columns(exception)).to be_a Array
       end
     end
 
@@ -53,6 +53,39 @@ shared_examples 'database error rescuing' do
         expect(subject.exception_validator(uniqueness_exception)).to be_nil
       end
     end
+
+    context "no validator" do
+      before {
+        Rescuable.stub(:_validators => {})
+      }
+
+      it "returns nil" do
+        expect(subject.exception_validator(uniqueness_exception)).to be_nil
+      end
+    end
+
+    context "no index on the table" do
+      before {
+        Rescuable.stub(:index => nil)
+        Rescuable.stub(:connection => double(:indexes => []))
+      }
+
+      let(:message) { super().gsub(/column (.*) is/, 'column toto is') }
+
+      it "returns nil" do
+        expect(subject.exception_validator(uniqueness_exception)).to be_nil
+      end
+    end
+
+    context "columns part of the index of another table" do
+      before {
+        subject.stub(:exception_columns => ['foo', 'baz'])
+      }
+
+      it "returns nil" do
+        expect(subject.exception_validator(uniqueness_exception)).to be_nil
+      end
+    end
   end
 
   describe "#create_or_update when the validation fails" do

data/spec/support/model.rb

@@ -8,8 +8,8 @@ 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: 'gmalette', username: 'gmalette', host: '127.0.0.1'},
-  'test_mysql' => {adapter: 'mysql2', database: 'rescue_from_duplicate', username: 'root', host: '127.0.0.1', port: 13306},
+  'test_postgresql' => {adapter: 'postgresql', database: 'rescue_from_duplicate', username: 'postgres'},
+  'test_mysql' => {adapter: 'mysql2', database: 'rescue_from_duplicate', username: 'travis'},
 }
 
 class CreateAllTables < ActiveRecord::Migration

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-rescue_from_duplicate
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Guillaume Malette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2013-12-17 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
@@ -42,112 +42,112 @@ dependencies:
   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
   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
   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
   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
@@ -186,17 +186,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.1.9
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Rescue from MySQL and Sqlite duplicate errors when trying to insert records
@@ -209,4 +209,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/model.rb
 - spec/validator_spec.rb
-has_rdoc: