Fix CI

.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+/gemfiles/*.lock

.travis.yml

@@ -1,12 +1,14 @@
+sudo: false
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.2
+  - 2.0
+  - 2.1
+  - 2.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
+  - 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;'

Rakefile

@@ -1,4 +1,4 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
@@ -7,14 +7,11 @@ task :default => :spec
 
 namespace :spec do
   task :all do
-    %w(3.2 4.0 4.1 edge).each do |ar_version|
-      system(
-        {
-          "BUNDLE_GEMFILE" => "spec/gemfiles/Gemfile.ar-#{ar_version}",
-          "MYSQL" => "1"
-        },
-        "rspec"
-      )
+    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

spec/gemfiles/Gemfile.ar-3.2 → gemfiles/Gemfile.ar-3.2

@@ -6,5 +6,5 @@ gem 'rake'
 gem 'rspec'
 gem 'sqlite3'
 gem 'pg', '~> 0.11'
-gem 'mysql2'
+gem 'mysql2', '~> 0.3.20'
 gem 'simplecov', require: false

spec/gemfiles/Gemfile.ar-4.0 → gemfiles/Gemfile.ar-4.0

@@ -6,5 +6,5 @@ gem 'rake'
 gem 'rspec'
 gem 'sqlite3'
 gem 'pg', '~> 0.11'
-gem 'mysql2'
+gem 'mysql2', '~> 0.3.20'
 gem 'simplecov', require: false

spec/gemfiles/Gemfile.ar-4.1 → gemfiles/Gemfile.ar-4.1

@@ -6,5 +6,5 @@ gem 'rake'
 gem 'rspec'
 gem 'sqlite3'
 gem 'pg', '~> 0.11'
-gem 'mysql2'
+gem 'mysql2', '~> 0.3.20'
 gem 'simplecov', require: false

gemfiles/Gemfile.ar-4.2

@@ -0,0 +1,10 @@
+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

spec/gemfiles/Gemfile.ar-edge → gemfiles/Gemfile.ar-edge

@@ -8,5 +8,5 @@ gem 'rake'
 gem 'rspec'
 gem 'sqlite3'
 gem 'pg', '~> 0.11'
-gem 'mysql2'
+gem 'mysql2', '~> 0.3.20'
 gem 'simplecov', require: false

lib/rescue_from_duplicate/active_record/extension.rb

@@ -24,50 +24,56 @@ def _rescue_from_duplicate_handlers
 
     def create_or_update(*params, &block)
       super
-    rescue ActiveRecord::RecordNotUnique => exception
-      handler = exception_handler(exception)
+    rescue ActiveRecord::RecordNotUnique, ActiveRecord::StatementInvalid => exception
+      raise unless handle_unicity_error(exception)
+      false
+    end
+
+    private
 
-      raise exception unless handler
+    def handle_unicity_error(exception)
+      handler = exception_handler(exception)
+      return false unless handler
 
       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
+      true
     end
 
-    private
-
     def exception_handler(exception)
       columns = exception_columns(exception)
+      return unless columns
+      columns.sort!
 
       self.class._rescue_from_duplicate_handlers.detect do |handler|
         handler.rescue? && columns == handler.columns
       end
     end
 
     def exception_columns(exception)
-      case
-      when exception.message =~ /SQLite3::ConstraintException/
+      if exception.message =~ /SQLite3::ConstraintException/
         sqlite3_exception_columns(exception)
-      when exception.message =~ /PG::UniqueViolation/
+      elsif exception.message =~ /PG::UniqueViolation/
         postgresql_exception_columns(exception)
       else
         other_exception_columns(exception)
-      end.sort
+      end
     end
 
     def postgresql_exception_columns(exception)
       extract_columns(exception.message[/Key \((.*?)\)=\(.*?\) already exists./, 1])
     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
 
     def extract_columns(columns_string)
       return unless columns_string
-      columns_string.split(",").map(&:strip)
+      columns_string.split(",").map { |column| column.split('.').last.strip }
     end
 
     def other_exception_columns(exception)

spec/spec_helper.rb

@@ -15,8 +15,6 @@
 rescue LoadError
 end
 
-
-
 module RescueFromDuplicate
   class Base
     cattr_accessor :exception