moped 1.2.6 → 1.2.7

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Overview
 
+## 1.2.7
+
+### Resolved Issues
+
+* \#87 `Moped::BSON::ObjectId.legal?` now returns true for object ids.
+
+* \#85 Allow `===` comparisons with object ids to check for equality of the
+  underlying string. (Bob Aman)
+
+* \#84 Query hints are no longer wiped on explain.
+
+* \#60/\#80 Moped now gracefully handles replica set reconfig and crashes of the
+  primary and secondary. By default, the node list will be refreshed every
+  second and the operation will be retried up to 30 times. This is configurable
+  by setting the `:max_retries` and `:retry_interval` options on the session.
+
+        Moped::Session.new(
+          [ "node1:27017", "node2:27017" ],
+          retry_interval: 0.5, max_retries: 45
+        )
+
 ## 1.2.6
 
 ### Resolved Issues

data/lib/moped/bson/object_id.rb

@@ -17,7 +17,7 @@ module Moped
         end
 
         def legal?(str)
-          /\A\h{24}\Z/ === str
+          /\A\h{24}\Z/ === str.to_s
         end
 
         def from_data(data)
@@ -27,6 +27,11 @@ module Moped
         end
       end
 
+      def ===(other)
+        return to_str === other.to_str if other.respond_to?(:to_str)
+        super
+      end
+
       def data
         # If @data is defined, then we know we've been loaded in some
         # non-standard way, so we attempt to repair the data.
@@ -51,6 +56,7 @@ module Moped
       def to_s
         data.unpack("H*")[0]
       end
+      alias :to_str :to_s
 
       def inspect
         to_s.inspect

data/lib/moped/cluster.rb

@@ -4,8 +4,9 @@ module Moped
   # node, a replica set, or a mongos server.
   class Cluster
 
+    # @attribute [r] options The cluster options.
     # @attribute [r] seeds The seeds the cluster was initialized with.
-    attr_reader :seeds
+    attr_reader :options, :seeds
 
     # Get the authentication details for the cluster.
     #
@@ -30,6 +31,57 @@ module Moped
       nodes.each { |node| node.disconnect } and true
     end
 
+    # Get the interval at which a node should be flagged as down before
+    # retrying.
+    #
+    # @example Get the down interval, in seconds.
+    #   cluster.down_interval
+    #
+    # @return [ Integer ] The down interval.
+    #
+    # @since 1.2.7
+    def down_interval
+      options[:down_interval]
+    end
+
+    # Get the number of times an operation should be retried before raising an
+    # error.
+    #
+    # @example Get the maximum retries.
+    #   cluster.max_retries
+    #
+    # @return [ Integer ] The max retries.
+    #
+    # @since 1.2.7
+    def max_retries
+      options[:max_retries]
+    end
+
+    # Get the interval in which the node list should be refreshed.
+    #
+    # @example Get the refresh interval, in seconds.
+    #   cluster.refresh_interval
+    #
+    # @return [ Integer ] The refresh interval.
+    #
+    # @since 1.2.7
+    def refresh_interval
+      options[:refresh_interval]
+    end
+
+    # Get the operation retry interval - the time to wait before retrying a
+    # single operation.
+    #
+    # @example Get the retry interval, in seconds.
+    #   cluster.retry_interval
+    #
+    # @return [ Integer ] The retry interval.
+    #
+    # @since 1.2.7
+    def retry_interval
+      options[:retry_interval]
+    end
+
     # Initialize the new cluster.
     #
     # @example Initialize the cluster.
@@ -46,7 +98,9 @@ module Moped
     def initialize(hosts, options)
       @options = {
         down_interval: 30,
-        refresh_interval: 300
+        max_retries: 30,
+        refresh_interval: 300,
+        retry_interval: 1
       }.merge(options)
 
       @seeds = hosts
@@ -65,8 +119,8 @@ module Moped
     # @since 1.0.0
     def nodes
       current_time = Time.new
-      down_boundary = current_time - @options[:down_interval]
-      refresh_boundary = current_time - @options[:refresh_interval]
+      down_boundary = current_time - down_interval
+      refresh_boundary = current_time - refresh_interval
 
       # Find the nodes that were down but are ready to be refreshed, or those
       # with stale connection information.
@@ -135,15 +189,14 @@ module Moped
     #     # ...
     #   end
     #
-    # @param [ true, false ] retry_on_failure Whether to retry if an error was
-    #   raised.
+    # @param [ Integer ] retries The number of times to retry.
     #
     # @raises [ ConnectionFailure ] When no primary node can be found
     #
     # @return [ Object ] The result of the yield.
     #
     # @since 1.0.0
-    def with_primary(retry_on_failure = true, &block)
+    def with_primary(retries = max_retries, &block)
       if node = nodes.find(&:primary?)
         begin
           node.ensure_primary do
@@ -155,10 +208,11 @@ module Moped
         end
       end
 
-      if retry_on_failure
+      if retries > 0
         # We couldn't find a primary node, so refresh the list and try again.
+        sleep(retry_interval)
         refresh
-        with_primary(false, &block)
+        with_primary(retries - 1, &block)
       else
         raise(
           Errors::ConnectionFailure,
@@ -175,15 +229,14 @@ module Moped
     #     # ...
     #   end
     #
-    # @param [ true, false ] retry_on_failure Whether to retry if an error was
-    #   raised.
+    # @param [ Integer ] retries The number of times to retry.
     #
     # @raises [ ConnectionFailure ] When no primary node can be found
     #
     # @return [ Object ] The result of the yield.
     #
     # @since 1.0.0
-    def with_secondary(retry_on_failure = true, &block)
+    def with_secondary(retries = max_retries, &block)
       available_nodes = nodes.shuffle!.partition(&:secondary?).flatten
 
       while node = available_nodes.shift
@@ -195,11 +248,12 @@ module Moped
         end
       end
 
-      if retry_on_failure
+      if retries > 0
         # We couldn't find a secondary or primary node, so refresh the list and
         # try again.
+        sleep(retry_interval)
         refresh
-        with_secondary(false, &block)
+        with_secondary(retries - 1, &block)
       else
         raise(
           Errors::ConnectionFailure,

data/lib/moped/connection.rb

@@ -235,7 +235,7 @@ module Moped
         yield
       rescue Timeout::Error
         raise Errors::ConnectionFailure, "Timed out connection to Mongo on #{host}:#{port}"
-      rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+      rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::EPIPE
         raise Errors::ConnectionFailure, "Could not connect to Mongo on #{host}:#{port}"
       rescue Errno::ECONNRESET
         raise Errors::ConnectionFailure, "Connection reset to Mongo on #{host}:#{port}"

data/lib/moped/query.rb

@@ -89,12 +89,15 @@ module Moped
     #
     # @since 1.0.0
     def explain
+      hint, sort = operation.selector["$hint"], operation.selector["$orderby"]
       operation.selector = {
         "$query" => selector,
-        "$orderby" => operation.selector.fetch("$orderby", {}),
         "$explain" => true,
         "$limit" => operation.selector.fetch("$limit", 1).abs * -1
-      } and each { |doc| return doc }
+      }
+      operation.selector["$orderby"] = sort if sort
+      operation.selector["$hint"] = hint if hint
+      each { |doc| return doc }
     end
 
     # Get the first matching document.

data/lib/moped/session.rb

@@ -177,6 +177,10 @@ module Moped
     #   specified safety level e.g., "fsync: true", or "w: 2, wtimeout: 5".
     # @option options [ Symbol, String ] :database The database to use.
     # @option options [ :strong, :eventual ] :consistency (:eventual).
+    # @option options [ Integer ] :max_retries The maximum number of attempts
+    #   to retry an operation. (30)
+    # @option options [ Integer ] :retry_interval The time in seconds to retry
+    #   connections to a secondary or primary after a failure. (1)
     #
     # @since 1.0.0
     def initialize(seeds, options = {})

data/lib/moped/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moped
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2012-10-06 00:00:00.000000000 Z
 dependencies: []
 description: A MongoDB driver for Ruby.
 email:
@@ -85,7 +85,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 452106332214392784
+      hash: -1523010636318133543
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 452106332214392784
+      hash: -1523010636318133543
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24