moped 1.3.0 → 1.3.1

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Overview
 
+## 1.3.1
+
+### Resolved Issues
+
+* \#118 Give better error when invalid URI is provided. (Chris Winslett)
+
+* \#116 Handle all cases of replica set step down or reconfiguring.
+  (Chris Winslett)
+
+* Change the default retries to 20 and the retry interval to 0.25 seconds.
+  (Old was 30/1)
+
 ## 1.3.0
 
 ### New Features

data/lib/moped/cluster.rb

@@ -103,9 +103,9 @@ module Moped
 
       @options = {
         down_interval: 30,
-        max_retries: 30,
+        max_retries: 20,
         refresh_interval: 300,
-        retry_interval: 1
+        retry_interval: 0.25
       }.merge(options)
     end
 

data/lib/moped/errors.rb

@@ -11,6 +11,9 @@ module Moped
     # Raised when a database name is invalid.
     class InvalidDatabaseName < StandardError; end
 
+    # Raised when a Mongo URI is invalid.
+    class InvalidMongoURI < StandardError; end
+
     # Raised when providing an invalid string from an object id.
     class InvalidObjectId < StandardError
 

data/lib/moped/mongo_uri.rb

@@ -63,6 +63,35 @@ module Moped
     # @since 1.3.0
     def initialize(string)
       @match = string.match(URI)
+      invalid_uri!(string) unless @match
+    end
+
+    # Raise a human readable error when improper URI provided
+    #
+    # @example Raise error and provide guidance on invalid URI
+    #   MongoUri.invalid!(uri)
+    #
+    # @param [ String ] Invalid string
+    #
+    # @since 1.3.1
+    def invalid_uri!(string)
+      msg = %{
+The given connection string is invalid:
+  #{string.gsub(/[^:]+@/, '<password>@')}
+
+MongoDB connection strings must be of the format:
+  mongodb://host:port/database
+
+For authentication, include username and password before host:
+  mongodb://username:password@host:port/database
+
+For Replica Sets, include multiple host:port entries:
+  mongodb://host:port,host2:port2/database
+
+For options, use query string syntax with the option value:
+  mongodb://host:port/database?safe=true&max_retries=30&timeout=5
+      }
+      raise Errors::InvalidMongoURI, msg
     end
 
     # Get the options provided in the URI.

data/lib/moped/node.rb

@@ -140,8 +140,9 @@ module Moped
         raise
       rescue Errors::OperationFailure => e
         # We might have a replica set change with:
-        # "failed with error 10054: "not master"
-        if e.details['code'] == 10054
+        # MongoDB uses 3 different error codes for "not master", [10054, 10056, 10058]
+        # thus it is easier to capture the "err"
+        if e.details["err"] == "not master" 
           raise Errors::ReplicaSetReconfigured
         end
         raise

data/lib/moped/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Moped
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moped
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-18 00:00:00.000000000 Z
+date: 2012-12-02 00:00:00.000000000 Z
 dependencies: []
 description: A MongoDB driver for Ruby.
 email:
@@ -89,7 +89,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2772381747018055837
+      hash: 3571351846230510378
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2772381747018055837
+      hash: 3571351846230510378
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24