find_or_create_on_scopes 1.3.0 → 1.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1784f803ef131acfbeb60df1674c17cb27c094c8
+  data.tar.gz: 4e6f240d2fa16d2c38067623c05b2bf69643fc97
+SHA512:
+  metadata.gz: cb641ca46f1463e26aa6c928d13744a3a1010a1f4cad80a678f4bc12adb2795b6eb211fa673178602281c8680a405c6337fd1b31c58197c5561e9da17f34d4f2
+  data.tar.gz: 3d88a8fedcad268bafddfd54bcd32c4b6de87d7d085016e3c3e17c2dc6f3a0a75c84855f5e8926ab23f789c2f6af37cc673a8beaf9ebe5bc3d5a150713c749e9

data/README.textile

@@ -1,3 +1,8 @@
+h1. Deprecation Notice
+
+In Rails 3.2, the `first_or_create`, `first_or_create!`, and
+`first_or_initialize` methods were introduced, obviating the need for this gem.
+
 h1. find_or_create_on_scopes -- Conditional creators for ActiveRecord
 
 | *Author* | Tim Morgan |

data/find_or_create_on_scopes.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "find_or_create_on_scopes"
-  s.version = "1.3.0"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Morgan"]
-  s.date = "2013-02-19"
+  s.date = "2013-07-09"
   s.description = "Adds methods to ActiveRecord for conditionally finding, creating, or updating records."
   s.email = "git@timothymorgan.info"
   s.extra_rdoc_files = [
@@ -25,11 +25,11 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/riscfuture/find_or_create_on_scopes"
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9")
-  s.rubygems_version = "1.8.25"
+  s.rubygems_version = "2.0.3"
   s.summary = "find_or_create-type methods on ActiveRecord scopes"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activerecord>, [">= 3.1"])

data/lib/find_or_create_on_scopes.rb

@@ -56,13 +56,13 @@ module FindOrCreateOnScopes
   def create_or_update!(*args, &block)
     create_or_update_and_do :save!, *args, &block
   end
-  
+
   # Same as {#create_or_update} but does not save the record. Please note that
   # unless this method is called in a transaction, you might have a race
   # condition when trying to save the record.
   #
   # @see #create_or_update
-  
+
   def initialize_or_update(*args, &block)
     create_or_update_and_do nil, *args, &block
   end
@@ -73,10 +73,27 @@ module FindOrCreateOnScopes
     record = nil
     transaction do
       record = first || new(*args)
-      yield record if block_given? && record.new_record?
-      record.send(meth) if meth
+      if record.new_record?
+        yield record if block_given?
+        record.send(meth) if meth
+      end
     end
     return record
+  rescue => err
+    if (defined?(Mysql2::Error) && err.kind_of?(Mysql2::Error)) ||
+        (defined?(PG::Error) && err.kind_of?(PG::Error)) ||
+        (defined?(ActiveRecord::JDBCError) && err.kind_of?(ActiveRecord::JDBCError)) ||
+        err.kind_of?(ActiveRecord::ActiveRecordError)
+      if err.to_s.include?('duplicate key value violates unique constraint') ||
+          err.to_s.start_with?('Duplicate entry') ||
+          err.kind_of?(ActiveRecord::RecordNotUnique)
+        retry
+      else
+        raise
+      end
+    else
+      raise
+    end
   end
 
   def create_or_update_and_do(meth, *args)
@@ -88,7 +105,22 @@ module FindOrCreateOnScopes
       record.send(meth) if meth
     end
     return record
+  rescue => err
+    if (defined?(Mysql2::Error) && err.kind_of?(Mysql2::Error)) ||
+        (defined?(PG::Error) && err.kind_of?(PG::Error)) ||
+        (defined?(ActiveRecord::JDBCError) && err.kind_of?(ActiveRecord::JDBCError)) ||
+        err.kind_of?(ActiveRecord::ActiveRecordError)
+      if err.to_s.include?('duplicate key value violates unique constraint') ||
+          err.to_s.start_with?('Duplicate entry') ||
+          err.kind_of?(ActiveRecord::RecordNotUnique)
+        retry
+      else
+        raise err
+      end
+    else
+      raise err
+    end
   end
 end
 
-ActiveRecord::Relation.send :include, FindOrCreateOnScopes
+ActiveRecord::Relation.send :include, FindOrCreateOnScopes

metadata

@@ -1,110 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: find_or_create_on_scopes
 version: !ruby/object:Gem::Version
-  version: 1.3.0
-  prerelease: 
+  version: 1.4.0
 platform: ruby
 authors:
 - Tim Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Adds methods to ActiveRecord for conditionally finding, creating, or
@@ -122,26 +109,25 @@ files:
 - lib/find_or_create_on_scopes.rb
 homepage: http://github.com/riscfuture/find_or_create_on_scopes
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: find_or_create-type methods on ActiveRecord scopes
 test_files: []