mongoid_retry 0.0.1 → 0.0.2

data/.travis.yml

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

data/README.md

@@ -1,9 +1,8 @@
-[![Build Status](https://secure.travis-ci.org/travisdahlke/mongoid_retry.png)](http://travis-ci.org/travisdahlke/mongoid_retry)
-
+[![Build Status](https://travis-ci.org/travisdahlke/mongoid_retry.png?branch=master)](https://travis-ci.org/travisdahlke/mongoid_retry)
 # MongoidRetry
 
 Overcome duplicate key errors in MongoDB by catching the exception, finding the existing document, and updating it instead.
-This is currently only compatible with Mongoid 2.x.
+Compatible with Mongoid 2 and 3.
 
 ## Installation
 

data/gemfiles/mongoid-2

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+gem "mongoid", "~> 2.0"

data/lib/mongoid/mongoid_retry.rb

@@ -5,34 +5,64 @@ module Mongoid
 
     DUPLICATE_KEY_ERROR_CODES = [11000,11001]
 
+    if Mongoid::VERSION < '3'
+      def self.error_message(exception)
+        exception.message
+      end
+
+      def self.error_code(exception)
+        exception.error_code
+      end
+    else
+      def self.error_message(exception)
+        exception.details["err"]
+      end
+
+      def self.error_code(exception)
+        exception.details["code"]
+      end
+    end
+
+    def self.is_a_duplicate_key_error?(exception)
+      DUPLICATE_KEY_ERROR_CODES.include?(error_code(exception))
+    end
+
     # Catch a duplicate key error
     def save_and_retry
-      begin
-        save!
-      rescue Mongo::OperationFailure => e
-        if is_a_duplicate_key_error?(e)
-          keys = duplicate_key(e)
-          if (duplicate = find_duplicate(keys))
-            update_document!(duplicate)
-          end
-        else
-          raise e
+      if ::Mongoid::VERSION < '3'
+        begin
+          safely.save!
+        rescue Mongo::OperationFailure => e
+          retry_if_duplicate_key_error(e)
+        end
+      else
+        begin
+          with(safe: true).save!
+        rescue Moped::Errors::OperationFailure => e
+          retry_if_duplicate_key_error(e)
         end
       end
     end
 
-    private
-
-    def is_a_duplicate_key_error?(exception)
-      DUPLICATE_KEY_ERROR_CODES.include?(exception.error_code)
+    def retry_if_duplicate_key_error(e)
+      if ::Mongoid::MongoidRetry.is_a_duplicate_key_error?(e)
+        keys = duplicate_key(e)
+        if (duplicate = find_duplicate(keys))
+          update_document!(duplicate)
+        end
+      else
+        raise e
+      end
     end
 
+    private
+
     def find_duplicate(keys)
-      self.class.first(conditions: keys)
+      self.class.where(keys).first
     end
 
     def duplicate_key(exception)
-      index = exception.message[/(?<=\.\$)\w*/,0]
+      index = ::Mongoid::MongoidRetry.error_message(exception)[/(?<=\.\$)\w*/,0]
       fields = index.split(/\d/).map{|s| s.gsub(/^_|_-?$/,'')}
       fields.inject({}) {|hash, key| hash[key] = send(key) if respond_to?(key); hash}
     end

data/lib/mongoid_retry/version.rb

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

data/mongoid_retry.gemspec

@@ -15,7 +15,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = MongoidRetry::VERSION
 
-  gem.add_runtime_dependency "mongoid", ['~> 2.0']
+  gem.add_runtime_dependency "mongoid", ['> 2.0']
   gem.add_development_dependency "rspec"
+  gem.add_development_dependency "database_cleaner"
   gem.add_development_dependency('rake', ['>= 0.9.2'])
 end

data/spec/spec_helper.rb

@@ -3,13 +3,17 @@ require 'bundler/setup'
 
 require 'mongoid'
 require 'mongoid/mongoid_retry'
+require 'database_cleaner'
 
 require 'rspec'
 
 Mongoid.configure do |config|
-  config.master = Mongo::Connection.new.db('mongoid_retry_test')
-  config.allow_dynamic_fields = false
-  config.persist_in_safe_mode = true
+  if Mongoid::VERSION >= "3"
+    config.connect_to('mongoid_retry_test')
+  else
+    config.master = Mongo::Connection.new.db('mongoid_retry_test')
+    config.allow_dynamic_fields = false
+  end
 end
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
@@ -17,6 +21,6 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 RSpec.configure do |config|
   config.mock_with :rspec
   config.after :each do
-    Mongoid.master.collections.reject { |c| c.name =~ /^system\./ }.each(&:remove)
+    DatabaseCleaner.clean
   end
 end

data/spec/support/models/thing.rb

@@ -6,6 +6,11 @@ class Thing
   field :color
   field :shape
 
-  index :name, unique: true
-  index ([[:color, Mongo::ASCENDING], [:shape, Mongo::DESCENDING]]), unique: true
+  if Mongoid::VERSION < '3'
+    index :name, unique: true
+    index ([[:color, Mongo::ASCENDING], [:shape, Mongo::DESCENDING]]), unique: true
+  else
+    index({name: 1}, {unique: true})
+    index({color: 1, shape: -1}, {unique: true})
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_retry
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,14 +9,14 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-27 00:00:00.000000000 Z
+date: 2013-01-30 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
@@ -24,7 +24,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !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
@@ -74,6 +90,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- gemfiles/mongoid-2
 - lib/mongoid/mongoid_retry.rb
 - lib/mongoid_retry.rb
 - lib/mongoid_retry/version.rb
@@ -93,12 +110,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !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
@@ -109,4 +132,3 @@ test_files:
 - spec/retry_spec.rb
 - spec/spec_helper.rb
 - spec/support/models/thing.rb
-has_rdoc: