find_or_create_on_scopes 1.4.0 → 1.4.1

checksums.yaml

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

data/{README.textile → README.md}

@@ -1,40 +1,43 @@
-h1. Deprecation Notice
+find_or_create_on_scopes
+========================
 
-In Rails 3.2, the `first_or_create`, `first_or_create!`, and
-`first_or_initialize` methods were introduced, obviating the need for this gem.
+**Conditional creators for ActiveRecord**
 
-h1. find_or_create_on_scopes -- Conditional creators for ActiveRecord
+|             |                                 |
+|:------------|:--------------------------------|
+| **Author**  | Tim Morgan                      |
+| **Version** | 1.2 (Sep 12, 2011)              |
+| **License** | Released under the MIT license. |
 
-| *Author* | Tim Morgan |
-| *Version* | 1.2 (Sep 12, 2011) |
-| *License* | Released under the MIT license. |
+About
+-----
 
-h2. About
-
-@find_or_create_on_scopes@ adds handy @find_or_create@-type methods to
-@ActiveRecord@. You can use these methods to conditionally create, initialize,
+`find_or_create_on_scopes` adds handy `find_or_create`-type methods to
+`ActiveRecord`. You can use these methods to conditionally create, initialize,
 or update records depending on the presence of similar records. They work on
 your base model class and any scopes derived therefrom. (See _Usage_ for
 examples.)
 
-h2. Installation
+Installation
+------------
 
-*Important Note:* This gem requires Ruby 1.9. Ruby 1.8 is not and will never be
-supported.
+**Important Note:** This gem requires Ruby 1.9+. Ruby 1.8 is not and will never
+be supported.
 
-To install, simply add the @find_or_create_on_scopes@ gem to your Rails
-application's @Gemfile@:
+To install, simply add the `find_or_create_on_scopes` gem to your Rails
+application's `Gemfile`:
 
-<pre><code>
+```` ruby
 gem 'find_or_create_on_scopes'
-</code></pre>
+````
 
-h2. Usage
+Usage
+-----
 
 See the {FindOrCreateOnScopes} module documentation for the complete list of
 conditional creators/updaters. Some basic examples to give you an overview:
 
-<pre><code>
+```` ruby
 # Tries to find a user named 'riscfuture'. If such a User exists, returns it. If
 # not, creates a user and sets its password to '123'.
 User.where(login: 'riscfuture').find_or_create(password: '123')
@@ -43,4 +46,4 @@ User.where(login: 'riscfuture').find_or_create(password: '123')
 # password to '123'. If not, creates a new user and sets its password to '123'.
 # Raises an exception if validation fails.
 User.where(login: 'riscfuture').create_or_update!(password: '123')
-</code></pre>
+````

data/find_or_create_on_scopes.gemspec

@@ -2,30 +2,31 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: find_or_create_on_scopes 1.4.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "find_or_create_on_scopes"
-  s.version = "1.4.0"
+  s.version = "1.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Tim Morgan"]
-  s.date = "2013-07-09"
+  s.date = "2016-01-22"
   s.description = "Adds methods to ActiveRecord for conditionally finding, creating, or updating records."
   s.email = "git@timothymorgan.info"
   s.extra_rdoc_files = [
     "LICENSE",
-    "README.textile"
+    "README.md"
   ]
   s.files = [
     "LICENSE",
-    "README.textile",
+    "README.md",
     "find_or_create_on_scopes.gemspec",
     "lib/find_or_create_on_scopes.rb"
   ]
   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 = "2.0.3"
+  s.rubygems_version = "2.5.1"
   s.summary = "find_or_create-type methods on ActiveRecord scopes"
 
   if s.respond_to? :specification_version then
@@ -35,14 +36,14 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activerecord>, [">= 3.1"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
-      s.add_development_dependency(%q<RedCloth>, [">= 0"])
+      s.add_development_dependency(%q<redcarpet>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
     else
       s.add_dependency(%q<activerecord>, [">= 3.1"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
-      s.add_dependency(%q<RedCloth>, [">= 0"])
+      s.add_dependency(%q<redcarpet>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
     end
@@ -50,7 +51,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activerecord>, [">= 3.1"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])
-    s.add_dependency(%q<RedCloth>, [">= 0"])
+    s.add_dependency(%q<redcarpet>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
   end

data/lib/find_or_create_on_scopes.rb

@@ -1,4 +1,4 @@
-# Adds @find_or_create@-type methods to named scopes.
+# Adds `find_or_create`-type methods to named scopes.
 
 module FindOrCreateOnScopes
 
@@ -6,7 +6,7 @@ module FindOrCreateOnScopes
   # found. If not found, creates a new record with the attributes of the current
   # scope and the provided attributes.
   #
-  # @param [Array] *args Arguments to pass to the @create@ method.
+  # @param [Array] args Arguments to pass to the `create` method.
   # @yield [record] Yields the record before it is saved.
   # @yieldparam [ActiveRecord::Base] record The found or created record before
   #   it is saved.
@@ -16,7 +16,7 @@ module FindOrCreateOnScopes
     find_or_initialize_and_do :save, *args, &block
   end
 
-  # Same as {#find_or_create} but calls @save!@ instead of @save@ on the record.
+  # Same as {#find_or_create} but calls `save!` instead of `save` on the record.
   #
   # @see #find_or_create
 
@@ -38,7 +38,7 @@ module FindOrCreateOnScopes
   # the provided attributes if found. If not found, creates a new record with
   # the current scope's attributes and the provided attributes.
   #
-  # @param [Array] *args Arguments to pass to the @assign_attributes@ method.
+  # @param [Array] args Arguments to pass to the `assign_attributes` method.
   # @yield [record] Yields the record before it is saved.
   # @yieldparam [ActiveRecord::Base] record The found or created record before
   #   it is saved.
@@ -48,7 +48,7 @@ module FindOrCreateOnScopes
     create_or_update_and_do :save, *args, &block
   end
 
-  # Same as {#create_or_update} but calls @save!@ instead of @save@ on the
+  # Same as {#create_or_update} but calls `save!` instead of `save` on the
   # record.
   #
   # @see #create_or_update
@@ -113,7 +113,20 @@ module FindOrCreateOnScopes
       if err.to_s.include?('duplicate key value violates unique constraint') ||
           err.to_s.start_with?('Duplicate entry') ||
           err.kind_of?(ActiveRecord::RecordNotUnique)
-        retry
+
+        # sadly there's no way to tell which keys are the duplicate ones from a
+        # SQL error, so we just retry 3 times and then give up :/
+        if @_focos_retries
+          if @_focos_retries > 3
+            raise
+          else
+            @_focos_retries += 1
+            retry
+          end
+        else
+          @_focos_retries = 1
+          retry
+        end
       else
         raise err
       end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: find_or_create_on_scopes
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Tim Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-09 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: RedCloth
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Adds methods to ActiveRecord for conditionally finding, creating, or
@@ -101,10 +101,10 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE
-- README.textile
+- README.md
 files:
 - LICENSE
-- README.textile
+- README.md
 - find_or_create_on_scopes.gemspec
 - lib/find_or_create_on_scopes.rb
 homepage: http://github.com/riscfuture/find_or_create_on_scopes
@@ -116,17 +116,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: find_or_create-type methods on ActiveRecord scopes