roqua-support 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8db8a86e0ea4abd9792e5cf25865306e7b0cba1
-  data.tar.gz: 6d2bc6551743ff667987df984710536a4185a7f1
+  metadata.gz: 62b713d3e5154df4114e38724df34637620903af
+  data.tar.gz: 9248b7cc7833517983955066fe280e5fda61a673
 SHA512:
-  metadata.gz: 8e717a9ebca1e2e98436d258567ee3a5c27e569f020bc72d0fb4c8debcbacb373051fa74f0c470da4c11aaab247a228f2579192f0579f17f0792d4baa2b76c62
-  data.tar.gz: e8655d8edb9832d7d0c892666c893ede37593c2ba7f48d800db990de8a5e08ff01fa829df3e1cda33adc45f5e8762531123dce7d747ef36804a7771189715244
+  metadata.gz: a34115a92fdc6f8b30dbd835b68e1921eb9c519e80122890df104428b7ea9f91f1decb9d1aff568cefd23ba8d7a2d3c55cb4d1effebd28f1cf39d014844114f1
+  data.tar.gz: 037d2ca3d79ae8d2cd722e5abfd88dde320fdb8698662af6dbec7cea04b7ed27c790306802243568e5dd9a16eae2a8a3a4f5654b626de5af3a49f6ba3812c9e4

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.5 / 2014-03-10
+
+* Make sure to raise when uniq_find_or_create cannot find a record
+
 ## 0.1.4 / 2014-02-25
 
 * Add ActiveRecord \#uniq\_find\_or\_create\_by! method to find or create records with uniqueness constraints enforced by the database.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    roqua-support (0.1.4)
+    roqua-support (0.1.5)
       activesupport (>= 3.2, < 5.0)
 
 GEM
@@ -44,7 +44,7 @@ GEM
     lumberjack (1.0.4)
     method_source (0.8.2)
     minitest (4.7.5)
-    multi_json (1.8.4)
+    multi_json (1.9.0)
     nio4r (1.0.0)
     pry (0.9.12.6)
       coderay (~> 1.0)

data/lib/roqua-support/version.rb

@@ -1,5 +1,5 @@
 module Roqua
   module Support
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

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

@@ -9,16 +9,16 @@ module ActiveRecord
     # containing the validation errors is returned instead.
     def self.uniq_find_or_create_by(attributes, &block)
       record = find_or_create_by(attributes, &block)
-    rescue ActiveRecord::RecordNotUnique
+    rescue ActiveRecord::RecordNotUnique => exception
     ensure
-      return find_by(attributes) || record
+      return find_by(attributes) || record || raise(exception)
     end
 
     # Use this method if you want an exception to be raised when creating a new record fails due to some validation
     # error other than uniqueness.
     def self.uniq_find_or_create_by!(attributes, &block)
       find_or_create_by!(attributes, &block)
-    rescue ActiveRecord::RecordNotUnique
+    rescue ActiveRecord::RecordNotUnique => exception
     rescue ActiveRecord::RecordInvalid => exception
     ensure
       return find_by(attributes) || raise(exception)

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

@@ -20,7 +20,7 @@ describe ActiveRecord::Base do
 
   describe '#uniq_find_or_create_by' do
     it 'tries to find or create a record by the attributes provided' do
-      expect(ActiveRecord::Base).to receive(:find_or_create_by).with(attributes, &block)
+      expect(ActiveRecord::Base).to receive(:find_or_create_by).with(attributes, &block).and_return record
       ActiveRecord::Base.uniq_find_or_create_by attributes, &block
     end
 
@@ -36,6 +36,15 @@ describe ActiveRecord::Base do
       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)
+                                                              .and_raise ActiveRecord::RecordNotUnique
+      expect do
+        ActiveRecord::Base.uniq_find_or_create_by attributes, &block
+      end.to raise_error ActiveRecord::RecordNotUnique
+    end
+
     it 'returns the created record for inspection when validation fails' do
       allow(ActiveRecord::Base).to receive(:find_or_create_by).with(attributes, &block).and_return record
       expect(ActiveRecord::Base.uniq_find_or_create_by attributes, &block).to eq(record)
@@ -61,6 +70,15 @@ describe ActiveRecord::Base do
       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)
+                                                               .and_raise ActiveRecord::RecordNotUnique
+      expect do
+        ActiveRecord::Base.uniq_find_or_create_by! attributes, &block
+      end.to raise_error ActiveRecord::RecordNotUnique
+    end
+
     it 'raises when creating a new record causes validation failures not due to concurrency' do
       exception = ActiveRecord::RecordInvalid.new 'some_validation_error'
       allow(ActiveRecord::Base).to receive(:find_or_create_by!).with(attributes, &block).and_raise exception

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roqua-support
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Marten Veldthuis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport