activerecord-rescue_from_duplicate 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95ffd1c815f0296026de14cf92106766488a5472
-  data.tar.gz: 2f54109b6dbb3330942a64ce0644f95529e2431a
+  metadata.gz: 99a2e09bb6ac6774ef2e6e452cc1be0a1db87799
+  data.tar.gz: 1ae17a3c73dde0a7aa54c13f86d2a6d3b140c7f1
 SHA512:
-  metadata.gz: 76a7947095f99a17df0607fa139e45949ba4649f6bed2e9e1ee7efe2992863e697c9f0a285060c8003bc8c9282fb21478833859fd583f1fb02a8c54425a0dda4
-  data.tar.gz: 6e9d39085c3614245854a19023cdd4cd06d02ac8e20a7eee7f6ac2119b2b4fc78a92cef7f40f9b564b202af3cf4954c9b02f5bb1b68720e4aec0d664e721bf69
+  metadata.gz: 2d49bfe997a680e977e134344045aaf453afaf5da46a437522140e0dd50a3c5eb0ec72e6bcb03ceb6a8ee57136509abb7cde77daa8e9f0c4d8a94cfd3810f521
+  data.tar.gz: 4686cbe3e99568fb77f75bd6cede972053a49ad4b1cb64520a64ee4d793f3754921ee1e89d64ea3a33fc1ed524731aa836bf4e8d931ea3686a64741daf89b957

data/.gitignore

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

data/.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;'

data/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

data/{spec/gemfiles → 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

data/{spec/gemfiles → 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

data/{spec/gemfiles → 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

data/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

data/{spec/gemfiles → 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

data/lib/rescue_from_duplicate/active_record/extension.rb

@@ -24,22 +24,28 @@ module RescueFromDuplicate::ActiveRecord
 
     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
@@ -47,14 +53,13 @@ module RescueFromDuplicate::ActiveRecord
     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)
@@ -62,12 +67,13 @@ 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
 
     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)

data/lib/rescue_from_duplicate/active_record/version.rb

@@ -1,5 +1,5 @@
 module Activerecord
   module RescueFromDuplicate
-    VERSION = "0.0.7"
+    VERSION = '0.1.0'
   end
 end

data/spec/spec_helper.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-rescue_from_duplicate
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Guillaume Malette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2015-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -151,6 +151,11 @@ 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
 - lib/activerecord-rescue_from_duplicate.rb
 - lib/rescue_from_duplicate/active_record.rb
 - lib/rescue_from_duplicate/active_record/extension.rb
@@ -159,10 +164,6 @@ files:
 - lib/rescue_from_duplicate/rescuer.rb
 - lib/rescue_from_duplicate/uniqueness_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
@@ -189,16 +190,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Rescue from MySQL and Sqlite duplicate errors when trying to insert records
   that fail uniqueness validation
 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