mongo_ha 1.11.3 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89d04c7e0d88bf50ad147143668ea57972f1eab1
-  data.tar.gz: cc5df8018e365e95f47d9694c4b1783a6ef80819
+  metadata.gz: ad71f9ce35d35356156317b4b046a7de1b67540f
+  data.tar.gz: e6f9363d0ce50cd150f6bf5c47d54dc0de558973
 SHA512:
-  metadata.gz: 08cb5c187dc5c37da6fe7bb2c2513cade426a570a6f51928ca3dd443764c9536f8bf957dfeea8c74a56ec8deda079a7d347b70a49efdfdafafba6bcd5ab15ff8
-  data.tar.gz: eec6f0d8fb69f83171674dd769034f04826f5f6eb691618315ebecc41b2e65c54462fbced2871570fd77a018fe37b7345ccf0c1f3f383f6ea3be6207dcc9a9b3
+  metadata.gz: ac614677db69523d94534597f73a861c4806e9deb01a58af3f4bdb24805d74aa32676f717aabc5e5ccbd44380557bd1f54b32c5842a60c40adf60bd2e073a8ec
+  data.tar.gz: 7336be2ce42a935d22ef7f79a4478db128a127a3e100e5a4c9da2a607facca9ec0140f6f6d1039813d7c5f1704ddaaac64f788e02fe997e40608d16f08157f09

data/README.md

@@ -26,13 +26,12 @@ servers with reconnect attempts.
 Retries are initially performed quickly in case it is a brief network issue
 and then backs off to give the replica-set time to elect a new master.
 
-Currently Only Supports Ruby Mongo driver v1.11.x. Submit an issue if other versions
-need support too.
+Supports Ruby Mongo driver V1.x.x
 
 `mongo_ha` transparently supports `MongoMapper` since it uses the mongo ruby driver
 that is patched by loading this gem. Earlier versions of Mongoid will also benefit
-from `mongo_ha`, the latest version of Mongoid uses Moped that should be avoided and is
-due to be replaced.
+from `mongo_ha`, the latest version of Mongoid uses Moped that should be avoided
+since it is due to be replaced by the Ruby Mongo driver V2 when it is released.
 
 Mongo Router processes will often return a connection failure on their side
 as an OperationFailure. This code will also retry automatically when the router

data/lib/mongo_ha/version.rb

@@ -1,3 +1,3 @@
 module MongoHA #:nodoc
-  VERSION = "1.11.3"
+  VERSION = "1.12.0"
 end

data/lib/mongo_ha.rb

@@ -1,15 +1,10 @@
 require 'mongo'
 require 'mongo_ha/version'
 require 'mongo_ha/mongo_client'
-require 'mongo_ha/networking'
 
 # Add in retry methods
 Mongo::MongoClient.send(:include, MongoHA::MongoClient::InstanceMethods)
 
-# Ensure connection is checked back into the pool when exceptions are thrown
-#   The following line is no longer required with Mongo V1.12 and above
-Mongo::Networking.send(:include, MongoHA::Networking::InstanceMethods)
-
 # Wrap critical Mongo methods with retry_on_connection_failure
 {
   Mongo::Collection                => [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongo_ha
 version: !ruby/object:Gem::Version
-  version: 1.11.3
+  version: 1.12.0
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
+date: 2015-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: '1.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: '1.12'
 description: Automatic reconnects and recovery when replica-set changes, or connections
   are lost, with transparent recovery
 email:
@@ -36,7 +36,6 @@ files:
 - Rakefile
 - lib/mongo_ha.rb
 - lib/mongo_ha/mongo_client.rb
-- lib/mongo_ha/networking.rb
 - lib/mongo_ha/version.rb
 homepage: https://github.com/reidmorrison/mongo_ha
 licenses:

data/lib/mongo_ha/networking.rb

@@ -1,58 +0,0 @@
-module MongoHA
-  module Networking
-    module InstanceMethods
-      def self.included(base)
-        base.class_eval do
-          # Fix problem where a Timeout exception is not checking the socket back into the pool
-          #   Based on code from Gem V1.11.1, not needed with V1.12 or above
-          #   Only change is the ensure block
-          def send_message_with_gle(operation, message, db_name, log_message=nil, write_concern=false)
-            docs = num_received = cursor_id = ''
-            add_message_headers(message, operation)
-
-            last_error_message = build_get_last_error_message(db_name, write_concern)
-            last_error_id = add_message_headers(last_error_message, Mongo::Constants::OP_QUERY)
-
-            packed_message = message.append!(last_error_message).to_s
-            sock = nil
-            begin
-              sock = checkout_writer
-              send_message_on_socket(packed_message, sock)
-              docs, num_received, cursor_id = receive(sock, last_error_id)
-#              Removed checkin
-#              checkin(sock)
-            rescue Mongo::ConnectionFailure, Mongo::OperationFailure, Mongo::OperationTimeout => ex
-#              Removed checkin
-#              checkin(sock)
-              raise ex
-            rescue SystemStackError, NoMemoryError, SystemCallError => ex
-              close
-              raise ex
-#           Added ensure block to always check sock back in
-            ensure
-              checkin(sock) if sock
-            end
-
-            if num_received == 1
-              error = docs[0]['err'] || docs[0]['errmsg']
-              if error && error.include?("not master")
-                close
-                raise Mongo::ConnectionFailure.new(docs[0]['code'].to_s + ': ' + error, docs[0]['code'], docs[0])
-              elsif (!error.nil? && note = docs[0]['jnote'] || docs[0]['wnote']) # assignment
-                code = docs[0]['code'] || Mongo::ErrorCode::BAD_VALUE # as of server version 2.5.5
-                raise Mongo::WriteConcernError.new(code.to_s + ': ' + note, code, docs[0])
-              elsif error
-                code = docs[0]['code'] || Mongo::ErrorCode::UNKNOWN_ERROR
-                error = "wtimeout" if error == "timeout"
-                raise Mongo::WriteConcernError.new(code.to_s + ': ' + error, code, docs[0]) if error == "wtimeout"
-                raise Mongo::OperationFailure.new(code.to_s + ': ' + error, code, docs[0])
-              end
-            end
-
-            docs[0]
-          end
-        end
-      end
-    end
-  end
-end