mongoid_retry 0.0.2 → 0.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 85cfaa98a33299febfd6e306fc4df74cf7e6bd69
+  data.tar.gz: 78788d07abb8a1e486a883b97d4d1e08fc78630a
+SHA512:
+  metadata.gz: 2f6a21f82f65d737c6270cb135c770955385f2ad1eeac4e51b5672d2e98da7d2d248eb436948b8c1ef2178bd46a4a0bcf8c44be6162e0ca8ad4f4199a6ff6188
+  data.tar.gz: 78df40f589ffd83681982a753a6ce2e0279ddab80a1e0e1564d802101d05f6bbba883bb80f3b076261ad82df75713e5d2bc9dcd4e2ce98cc16a3ed744ace7328

data/.travis.yml

@@ -1,7 +1,9 @@
 language: ruby
 rvm:
+  - 2.1.0
+  - 2.0.0
   - 1.9.3
 services: mongodb
 gemfile:
   - Gemfile
-  - gemfiles/mongoid-2
+  - gemfiles/mongoid-2

data/README.md

@@ -32,6 +32,12 @@ end
 
     Fruit.new(type: 'apple').save_and_retry
 
+ `#save_and_retry` takes a hash of options:
+
+ - `:retries` Specifies the number of times to retry before failing. Defaults to 3.
+ - `:allow_delete` If true, this will delete any conflicting documents if a duplicate key error is encountered.
+
+
 ## Contributing
 
 1. Fork it

data/lib/mongoid/mongoid_retry.rb

@@ -4,6 +4,7 @@ module Mongoid
   module MongoidRetry
 
     DUPLICATE_KEY_ERROR_CODES = [11000,11001]
+    MAX_RETRIES = 3
 
     if Mongoid::VERSION < '3'
       def self.error_message(exception)
@@ -28,27 +29,33 @@ module Mongoid
     end
 
     # Catch a duplicate key error
-    def save_and_retry
+    def save_and_retry(options = {})
       if ::Mongoid::VERSION < '3'
         begin
           safely.save!
         rescue Mongo::OperationFailure => e
-          retry_if_duplicate_key_error(e)
+          retry_if_duplicate_key_error(e, options)
         end
       else
         begin
           with(safe: true).save!
         rescue Moped::Errors::OperationFailure => e
-          retry_if_duplicate_key_error(e)
+          retry_if_duplicate_key_error(e, options)
         end
       end
     end
 
-    def retry_if_duplicate_key_error(e)
-      if ::Mongoid::MongoidRetry.is_a_duplicate_key_error?(e)
+    def retry_if_duplicate_key_error(e, options)
+      retries = options.fetch(:retries, MAX_RETRIES)
+      if ::Mongoid::MongoidRetry.is_a_duplicate_key_error?(e) && retries > 0
         keys = duplicate_key(e)
         if (duplicate = find_duplicate(keys))
-          update_document!(duplicate)
+          if options[:allow_delete]
+            duplicate.delete
+            save_and_retry(options)
+          else
+            update_document!(duplicate, options.merge(retries: retries - 1))
+          end
         end
       else
         raise e
@@ -67,11 +74,11 @@ module Mongoid
       fields.inject({}) {|hash, key| hash[key] = send(key) if respond_to?(key); hash}
     end
 
-    def update_document!(duplicate)
+    def update_document!(duplicate, options = {})
       attributes.except("_id").each_pair do |key, value|
         duplicate[key] = value
       end
-      duplicate.save_and_retry
+      duplicate.save_and_retry(options)
     end
 
   end

data/lib/mongoid_retry/version.rb

@@ -1,3 +1,3 @@
 module MongoidRetry
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/retry_spec.rb

@@ -50,6 +50,32 @@ describe Mongoid::MongoidRetry do
         Thing.count.should == 1
       end
     end
+
+    describe "with conflicting documents" do
+      before(:each) do
+        Thing.create(name: 'banana', color: 'yellow')
+        Thing.create(name: 'apple', color: 'red')
+      end
+
+      subject { Thing.new(name: 'banana', color: 'red') }
+
+      it "should raise error" do
+        expect { subject.save_and_retry }.to raise_error
+      end
+
+      it "should delete conflicting document" do
+        subject.save_and_retry(allow_delete: true)
+        expect(Thing.count).to eq(1)
+      end
+
+      it "should save the new document" do
+        subject.save_and_retry(allow_delete: true)
+        expect(Thing.all.last.name).to eq('banana')
+        expect(Thing.all.last.color).to eq('red')
+      end
+
+    end
+
   end
 
-end
+end

metadata

@@ -1,78 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_retry
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.0.3
 platform: ruby
 authors:
 - Travis Dahlke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-30 00:00:00.000000000 Z
+date: 2014-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '2.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'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   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: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
 description: Provides a 'save_and_retry' method that will attempt to save a document
@@ -84,8 +75,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -100,33 +91,26 @@ files:
 - spec/support/models/thing.rb
 homepage: http://www.github.com/travisdahlke/mongoid_retry
 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: '0'
-      segments:
-      - 0
-      hash: -909191123557611916
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -909191123557611916
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Catch mongo duplicate key errors and retry
 test_files:
 - spec/retry_spec.rb