roqua-support 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43a3414d9e81150939fa2856d06119486f2901e2
-  data.tar.gz: 0045f7cbe60fd4bf49ca7aea4eb53aaffcd5b1ad
+  metadata.gz: f8db8a86e0ea4abd9792e5cf25865306e7b0cba1
+  data.tar.gz: 6d2bc6551743ff667987df984710536a4185a7f1
 SHA512:
-  metadata.gz: 5598469b76b2db4761c05b40ba12d533dac4a85160537fd7c6da0b8eeeaefeead355fef69e7c6c9abc8566b28e090dcc3eb344e1b15541c06addadbe60524f15
-  data.tar.gz: d27f814a7fee1c1009656f386d547c0df7a05612dfba06c330513a4e4e5ace7ed5fefc90570975b0aca573273248ff05f7d0370a463867b12cc1e233f175e9c7
+  metadata.gz: 8e717a9ebca1e2e98436d258567ee3a5c27e569f020bc72d0fb4c8debcbacb373051fa74f0c470da4c11aaab247a228f2579192f0579f17f0792d4baa2b76c62
+  data.tar.gz: e8655d8edb9832d7d0c892666c893ede37593c2ba7f48d800db990de8a5e08ff01fa829df3e1cda33adc45f5e8762531123dce7d747ef36804a7771189715244

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 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.
+* Add some clarifying comments to the ActiveRecord extensions.
+
 ## 0.1.3 / 2014-02-24
 
 * Add ActiveRecord \#uniq\_find\_or\_create\_by method to find or create records with uniqueness constraints enforced by the database.

data/Gemfile

@@ -2,3 +2,8 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in roqua-support.gemspec
 gemspec
+
+group :test do
+  gem 'guard-rspec', '~> 4.2.6'
+  gem 'fuubar',      '~> 1.3.2'
+end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    roqua-support (0.1.3)
+    roqua-support (0.1.4)
       activesupport (>= 3.2, < 5.0)
 
 GEM
@@ -14,11 +14,46 @@ GEM
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
     atomic (1.1.14)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    celluloid-io (0.15.0)
+      celluloid (>= 0.15.0)
+      nio4r (>= 0.5.0)
+    coderay (1.1.0)
     diff-lcs (1.2.5)
+    ffi (1.9.3)
+    formatador (0.2.4)
+    fuubar (1.3.2)
+      rspec (>= 2.14.0, < 3.1.0)
+      ruby-progressbar (~> 1.3)
+    guard (2.4.0)
+      formatador (>= 0.2.4)
+      listen (~> 2.1)
+      lumberjack (~> 1.0)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    guard-rspec (4.2.6)
+      guard (~> 2.1)
+      rspec (>= 2.14, < 4.0)
     i18n (0.6.9)
+    listen (2.5.0)
+      celluloid (>= 0.15.2)
+      celluloid-io (>= 0.15.0)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.4)
+    method_source (0.8.2)
     minitest (4.7.5)
     multi_json (1.8.4)
+    nio4r (1.0.0)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
     rake (10.1.1)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.3)
+      ffi (>= 0.5.0)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -27,8 +62,12 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
+    ruby-progressbar (1.4.1)
+    slop (3.4.7)
+    thor (0.18.1)
     thread_safe (0.1.3)
       atomic
+    timers (1.1.0)
     tzinfo (0.3.38)
 
 PLATFORMS
@@ -36,6 +75,8 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0)
+  fuubar (~> 1.3.2)
+  guard-rspec (~> 4.2.6)
   rake
   roqua-support!
   rspec (>= 2.12.0, < 4.0)

data/Guardfile

@@ -0,0 +1,8 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard :rspec, cmd: 'bundle exec rspec --format Fuubar --colour' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end

data/lib/roqua-support/version.rb

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

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

@@ -2,11 +2,26 @@ require 'active_support'
 
 module ActiveRecord
   class Base
+    # Use this method to find or create records that have uniqueness constraints enforced by the database.
+    # After calling the AR find_or_create_by method it queries the preexisting or created record by the attributes
+    # provided, thereby ensuring that a concurrently created record is returned when a AR RecordNotUnique error is
+    # raised. When no record can be found, because for instance validations fail on create, the created object
+    # 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
     ensure
       return find_by(attributes) || record
     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::RecordInvalid => exception
+    ensure
+      return find_by(attributes) || raise(exception)
+    end
   end
 end

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

@@ -8,14 +8,17 @@ module ActiveRecord
 
   class RecordNotUnique < StandardError
   end
+
+  class RecordInvalid < StandardError
+  end
 end
 
 describe ActiveRecord::Base do
-  describe '#uniq_find_or_create_by' do
-    let(:attributes) { double('attributes') }
-    let(:block)      { -> {} }
-    let(:record)     { double('record') }
+  let(:attributes) { double('attributes') }
+  let(:block)      { -> {} }
+  let(:record)     { double('record') }
 
+  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)
       ActiveRecord::Base.uniq_find_or_create_by attributes, &block
@@ -33,9 +36,35 @@ describe ActiveRecord::Base do
       expect(ActiveRecord::Base.uniq_find_or_create_by attributes, &block).to eq(record)
     end
 
-    it 'returns a created record for inspection when saving fails for some reason' do
+    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)
     end
   end
+
+  describe '#uniq_find_or_create_by!' do
+    it 'tries to find or create a record by the attributes provided' do
+      allow(ActiveRecord::Base).to receive(:find_by).with(attributes).and_return record
+      expect(ActiveRecord::Base).to receive(:find_or_create_by!).with(attributes, &block)
+      ActiveRecord::Base.uniq_find_or_create_by! attributes, &block
+    end
+
+    it 'returns a preexisting or created record by querying it' do
+      allow(ActiveRecord::Base).to receive(:find_by).with(attributes).and_return record
+      expect(ActiveRecord::Base.uniq_find_or_create_by! attributes, &block).to eq(record)
+    end
+
+    it 'returns a concurrenlty created record' 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 ActiveRecord::RecordNotUnique
+      expect(ActiveRecord::Base.uniq_find_or_create_by! attributes, &block).to eq(record)
+    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
+      expect { ActiveRecord::Base.uniq_find_or_create_by! attributes, &block }.to raise_error(exception)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roqua-support
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Marten Veldthuis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-24 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -90,6 +90,7 @@ files:
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile