roqua-support 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b4f2e07189d3ee1b5b4c0e6472bd3c1b4ba2c6a
-  data.tar.gz: 3ae9698e6c4b77a16e7ff1226cb9269e3d3f428c
+  metadata.gz: d04050aedf6fdfafa5b9a9a6cabc22b11f57f215
+  data.tar.gz: 06c935c3e34b4d9b402d63717a4800d398d0d127
 SHA512:
-  metadata.gz: 6ab8c7979cb7a686033f05b6a0a9e64e028a94a59a6a6186a5621826e91f044dcedb0075dfe337b38c32eb623a6f45d63ff64c0b38e52bfb65bbfded5b518281
-  data.tar.gz: 86c8129d450c4e37237488eeef12ffc1766813b8d3b0d78762b2ec4531aec0c83cbaeb9cd4db439edaddd47cc8bd2dab90f75758797d275c050b2fddc02284e0
+  metadata.gz: e4d6e986f2ab7560d71eba134b8f2b2b5dc8407c7ce01fa59af20f6ca828b9646fe5551e370289e03efd0ce3f702ce9feff6df7e5f887905d695446031c8870b
+  data.tar.gz: 1a33aae58fd341f06e1695de7e1af81f8f170dde10fdd804fa48eff30235462279fdd3a6f3d97e629a620912fa5909363d9dbb57ef2d0b1ee675eb5199bfc8df

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.1.8 / 2014-06-17
+
+* catch Mysql2 errors
 * remove dubious return from ensure in activerecord extensions
 
 ## 0.1.5 / 2014-03-10

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    roqua-support (0.1.7)
+    roqua-support (0.1.8)
       activesupport (>= 3.2, < 5.0)
 
 GEM
@@ -64,7 +64,7 @@ GEM
     ruby-progressbar (1.4.1)
     slop (3.4.7)
     thor (0.18.1)
-    thread_safe (0.3.3)
+    thread_safe (0.3.4)
     timers (1.1.0)
     tzinfo (1.1.0)
       thread_safe (~> 0.1)

data/circle.yml

@@ -0,0 +1,3 @@
+machine:
+  ruby:
+    version: 2.1.0

data/lib/roqua-support/version.rb

@@ -1,5 +1,5 @@
 module Roqua
   module Support
-    VERSION = "0.1.7"
+    VERSION = "0.1.8"
   end
 end

data/lib/roqua/core_ext/activerecord/uniq_find_or_create.rb

@@ -9,6 +9,12 @@ module ActiveRecord
     # containing the validation errors is returned instead.
     def self.uniq_find_or_create_by(attributes, &block)
       find_or_create_by(attributes, &block)
+    # When a real race condition occurs, activerecord has no clue about a uniqueness constraint
+    # being violated (this is exactly why validates :attribute, uniqueness: true does not work
+    # for these cases) and a plain Mysql2::Error exception is raised instead of
+    # ActiveRecord::RecordNotUnique
+    rescue Mysql2::Error => exception
+      find_by(attributes) || raise(exception)
     rescue ActiveRecord::RecordNotUnique => exception
       find_by(attributes) || raise(exception)
     end
@@ -17,6 +23,12 @@ module ActiveRecord
     # error other than uniqueness.
     def self.uniq_find_or_create_by!(attributes, &block)
       find_or_create_by!(attributes, &block)
+    # When a real race condition occurs, activerecord has no clue about a uniqueness constraint
+    # being violated (this is exactly why validates :attribute, uniqueness: true does not work
+    # for these cases) and a plain Mysql2::Error exception is raised instead of
+    # ActiveRecord::RecordNotUnique
+    rescue Mysql2::Error => exception
+      find_by(attributes) || raise(exception)
     rescue ActiveRecord::RecordNotUnique => exception
       find_by(attributes) || raise(exception)
     rescue ActiveRecord::RecordInvalid => exception

data/spec/roqua/core_ext/activerecord/uniq_find_or_create_spec.rb

@@ -13,9 +13,14 @@ module ActiveRecord
   end
 end
 
+module Mysql2
+  class Error < StandardError
+  end
+end
+
 describe ActiveRecord::Base do
   let(:attributes) { double('attributes') }
-  let(:block)      { -> {} }
+  let(:block)      { -> (*args){} }
   let(:record)     { double('record') }
 
   describe '#uniq_find_or_create_by' do
@@ -36,6 +41,13 @@ describe ActiveRecord::Base do
       expect(ActiveRecord::Base.uniq_find_or_create_by attributes, &block).to eq(record)
     end
 
+    it 'returns a concurrenlty created record when activerecord is unaware of the uniqueness violation' do
+      allow(ActiveRecord::Base).to receive(:find_by).with(attributes).and_return record
+      allow(ActiveRecord::Base).to receive(:find_or_create_by).with(attributes, &block)
+                                                              .and_raise Mysql2::Error
+      expect(ActiveRecord::Base.uniq_find_or_create_by attributes, &block).to eq(record)
+    end
+
     it 'raises when a concurrent record is detected by the database but could not be queried for unknown reasons' do
       allow(ActiveRecord::Base).to receive(:find_by).with(attributes).and_return nil
       allow(ActiveRecord::Base).to receive(:find_or_create_by).with(attributes, &block)
@@ -70,6 +82,13 @@ describe ActiveRecord::Base do
       expect(ActiveRecord::Base.uniq_find_or_create_by! attributes, &block).to eq(record)
     end
 
+    it 'returns a concurrenlty created record when activerecord is unaware of the uniqueness violation' do
+      allow(ActiveRecord::Base).to receive(:find_by).with(attributes).and_return record
+      allow(ActiveRecord::Base).to receive(:find_or_create_by!).with(attributes, &block)
+                                                               .and_raise Mysql2::Error
+      expect(ActiveRecord::Base.uniq_find_or_create_by! attributes, &block).to eq(record)
+    end
+
     it 'raises when a concurrent record is detected by the database but could not be queried for unknown reasons' do
       allow(ActiveRecord::Base).to receive(:find_by).with(attributes).and_return nil
       allow(ActiveRecord::Base).to receive(:find_or_create_by!).with(attributes, &block)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roqua-support
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Marten Veldthuis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -94,6 +94,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- circle.yml
 - lib/roqua-support.rb
 - lib/roqua-support/version.rb
 - lib/roqua/core_ext/activerecord/uniq_find_or_create.rb
@@ -137,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Helper objects and proxies used by a lot of RoQua applications