moped 1.5.3 → 2.0.0.beta

data/lib/moped/protocol/reply.rb

@@ -67,8 +67,8 @@ module Moped
       #
       # @since 1.2.10
       def command_failure?
-        result = documents[0]
-        result["ok"] != 1 || error_message(result)
+        result = documents.first
+        (result["ok"] != 1.0 && result["ok"] != true) || error?
       end
 
       # Was the provided cursor id not found on the server?
@@ -83,17 +83,29 @@ module Moped
         flags.include?(:cursor_not_found)
       end
 
+      # Check if the first returned document in the reply is an error result.
+      #
+      # @example Is the first document in the reply an error?
+      #   reply.error?
+      #
+      # @return [ true, false ] If the first document is an error.
+      #
+      # @since 2.0.0
+      def error?
+        result = documents.first
+        result && error_message(result)
+      end
+
       # Did the query fail on the server?
       #
       # @example Did the query fail?
-      #   reply.query_failed?
+      #   reply.query_failure?
       #
       # @return [ true, false ] If the query failed.
       #
       # @since 1.2.0
-      def query_failed?
-        result = documents[0]
-        flags.include?(:query_failure) || (result && (result["err"] || result["errmsg"] || result["$err"]))
+      def query_failure?
+        flags.include?(:query_failure) || error?
       end
 
       # Is the reply an error message that we are not authorized for the query
@@ -144,7 +156,7 @@ module Moped
       def deserialize_documents(buffer)
         documents = []
         count.times do
-          documents << BSON::Document.deserialize(buffer)
+          documents << BSON::Document.from_bson(buffer)
         end
         @documents = documents
       end
@@ -152,7 +164,6 @@ module Moped
       def error_message(result)
         result["err"] || result["errmsg"] || result["$err"]
       end
-
     end
   end
 end

data/lib/moped/protocol/update.rb

@@ -105,6 +105,24 @@ module Moped
                                                                             update.inspect,
                                                                             flags.inspect]
       end
+
+      private
+
+      # Duplicate the attributes in the update that need to be.
+      #
+      # @api private
+      #
+      # @example Clone the update.
+      #   update.clone
+      #
+      # @param [ Update ] The update that was cloned from.
+      #
+      # @since 2.0.0
+      def initialize_copy(_)
+        @selector = selector.dup
+        @update = update.dup
+        @flags = flags.dup
+      end
     end
   end
 end

data/lib/moped/query.rb

@@ -1,3 +1,6 @@
+# encoding: utf-8
+require "moped/cursor"
+
 module Moped
 
   # The +Query+ class encapsulates all of the logic related to building
@@ -112,15 +115,19 @@ module Moped
     #
     # @since 1.0.0
     def first
-      reply = session.context.query(
-        operation.database,
-        operation.collection,
-        operation.selector,
-        fields: operation.fields,
-        flags: operation.flags,
-        skip: operation.skip,
-        limit: -1
-      )
+      reply = read_preference.with_node(cluster) do |node|
+        node.query(
+          operation.database,
+          operation.collection,
+          operation.selector,
+          query_options(
+            fields: operation.fields,
+            flags: operation.flags,
+            skip: operation.skip,
+            limit: -1
+          )
+        )
+      end
       reply.documents.first
     end
     alias :one :first
@@ -252,7 +259,7 @@ module Moped
       command[:fields] = operation.fields if operation.fields
       command[:update] = change unless options[:remove]
 
-      result = session.with(consistency: :strong) do |sess|
+      result = session.with(read: :primary) do |sess|
         sess.command(command)["value"]
       end
 
@@ -269,11 +276,12 @@ module Moped
     #
     # @since 1.0.0
     def remove
-      session.with(consistency: :strong) do |session|
-        session.context.remove(
+      cluster.with_primary do |node|
+        node.remove(
           operation.database,
           operation.collection,
           operation.basic_selector,
+          write_concern,
           flags: [ :remove_first ]
         )
       end
@@ -288,11 +296,12 @@ module Moped
     #
     # @since 1.0.0
     def remove_all
-      session.with(consistency: :strong) do |session|
-        session.context.remove(
+      cluster.with_primary do |node|
+        node.remove(
           operation.database,
           operation.collection,
-          operation.basic_selector
+          operation.basic_selector,
+          write_concern
         )
       end
     end
@@ -369,12 +378,13 @@ module Moped
     #
     # @since 1.0.0
     def update(change, flags = nil)
-      session.with(consistency: :strong) do |session|
-        session.context.update(
+      cluster.with_primary do |node|
+        node.update(
           operation.database,
           operation.collection,
           operation.selector["$query"] || operation.selector,
           change,
+          write_concern,
           flags: flags
         )
       end
@@ -412,6 +422,22 @@ module Moped
       update(change, [ :upsert ])
     end
 
+    def write_concern
+      session.write_concern
+    end
+
+    def read_preference
+      session.read_preference
+    end
+
+    def cluster
+      session.cluster
+    end
+
+    def query_options(options)
+      read_preference.query_options(options)
+    end
+
     private
 
     def initialize_copy(other)

data/lib/moped/read_preference.rb

@@ -0,0 +1,49 @@
+# encoding: utf-8
+require "moped/read_preference/selectable"
+require "moped/read_preference/nearest"
+require "moped/read_preference/primary"
+require "moped/read_preference/primary_preferred"
+require "moped/read_preference/secondary"
+require "moped/read_preference/secondary_preferred"
+
+module Moped
+
+  # Provides behaviour around getting various read preference implementations.
+  #
+  # @since 2.0.0
+  module ReadPreference
+    extend self
+
+    # Hash lookup for the read preference classes based off the symbols
+    # provided in configuration.
+    #
+    # @since 2.0.0
+    PREFERENCES = {
+      nearest: Nearest,
+      primary: Primary,
+      primary_preferred: PrimaryPreferred,
+      secondary: Secondary,
+      secondary_preferred: SecondaryPreferred
+    }.freeze
+
+    # Get a read preference for the provided name. Valid names are:
+    #   - :nearest
+    #   - :primary
+    #   - :primary_preferred
+    #   - :secondary
+    #   - :secondary_preferred
+    #
+    # @example Get the primary read preference.
+    #   Moped::ReadPreference.get(:primary)
+    #
+    # @param [ Symbol ] name The name of the preference.
+    # @param [ Array<Hash> ] tags The tag sets to match the node on.
+    #
+    # @return [ Object ] The appropriate read preference.
+    #
+    # @since 2.0.0
+    def get(name, tags = nil)
+      PREFERENCES.fetch(name.to_sym).new(tags)
+    end
+  end
+end

data/lib/moped/read_preference/nearest.rb

@@ -0,0 +1,55 @@
+# encoding: utf-8
+module Moped
+  module ReadPreference
+
+    # Encapsulates behaviour around a nearest read preference.
+    #
+    # @since 2.0.0
+    class Nearest
+      include Selectable
+
+      # Get the name for the read preference on the server side.
+      #
+      # @example Get the name of the read preference.
+      #   nearest.name
+      #
+      # @return [ Symbol ] :nearest.
+      #
+      # @since 2.0.0
+      def name
+        :nearest
+      end
+
+      # Execute the provided block on the node with the lowest latency,
+      # allowing either primary or secondary.
+      #
+      # @example Read from the nearest node in the cluster.
+      #   preference.with_node(cluster) do |node|
+      #     node.command(ismaster: 1)
+      #   end
+      #
+      # @note If tag sets are provided then selection will need to
+      #   match the provided tags.
+      #
+      # @param [ Cluster ] cluster The cluster of nodes to select from.
+      # @param [ Proc ] block The block to execute on the node.
+      #
+      # @raise [ Errors::ConnectionFailure ] If no node was available in the
+      #   cluster.
+      #
+      # @return [ Object ] The result of the block.
+      #
+      # @since 2.0.0
+      def with_node(cluster, &block)
+        with_retry(cluster) do
+          nearest = cluster.nodes.sort_by(&:latency).first
+          if nearest
+            block.call(nearest)
+          else
+            raise Errors::ConnectionFailure, "No nodes available to select in the cluster"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/moped/read_preference/primary.rb

@@ -0,0 +1,60 @@
+# encoding: utf-8
+module Moped
+  module ReadPreference
+
+    # Encapsulates behaviour around a primary read preference.
+    #
+    # @since 2.0.0
+    class Primary
+      include Selectable
+
+      # Get the name for the read preference on the server side.
+      #
+      # @example Get the name of the read preference.
+      #   primary.name
+      #
+      # @return [ Symbol ] :primary.
+      #
+      # @since 2.0.0
+      def name
+        :primary
+      end
+
+      # Get the provided options as query options for this read preference.
+      #
+      # @example Get the query options.
+      #   preference.query_options({})
+      #
+      # @param [ Hash ] options The existing options for the query.
+      #
+      # @return [ Hash ] The options plus additional query options.
+      #
+      # @since 2.0.0
+      def query_options(options)
+        options
+      end
+
+      # Select a primary node from the cluster. If no primary node is available
+      # then an exception will be raised.
+      #
+      # @example Select a primary node from the cluster.
+      #   preference.with_node(cluster) do |node|
+      #     node.command(ismaster: 1)
+      #   end
+      #
+      # @param [ Cluster ] cluster The cluster of nodes to select from.
+      # @param [ Proc ] block The block to execute on the node.
+      #
+      # @raise [ Errors::ConnectionFailure ] If no primary node was available in the cluster.
+      #
+      # @return [ Object ] The result of the block.
+      #
+      # @since 2.0.0
+      def with_node(cluster, &block)
+        with_retry(cluster) do
+          cluster.with_primary(&block)
+        end
+      end
+    end
+  end
+end

data/lib/moped/read_preference/primary_preferred.rb

@@ -0,0 +1,55 @@
+# encoding: utf-8
+module Moped
+  module ReadPreference
+
+    # Encapsulates behaviour around a primary preferred read preference.
+    #
+    # @since 2.0.0
+    class PrimaryPreferred
+      include Selectable
+
+      # Get the name for the read preference on the server side.
+      #
+      # @example Get the name of the read preference.
+      #   primary_preferred.name
+      #
+      # @return [ Symbol ] :primaryPreferred.
+      #
+      # @since 2.0.0
+      def name
+        :primaryPreferred
+      end
+
+      # Select a primary node from the cluster. If no primary node is available
+      # then attempt to select a secondary. If no secondary is available then
+      # an exception will be raised.
+      #
+      # @example Prefer to with_node a primary node from the cluster.
+      #   preference.with_node(cluster) do |node|
+      #     node.command(ismaster: 1)
+      #   end
+      #
+      # @note If tag sets are provided then secondary with_nodeion will need to
+      #   match the provided tags.
+      #
+      # @param [ Cluster ] cluster The cluster of nodes to select from.
+      # @param [ Proc ] block The block to execute on the node.
+      #
+      # @raise [ Errors::ConnectionFailure ] If no primary or secondary node was
+      #   available in the cluster.
+      #
+      # @return [ Object ] The result of the block.
+      #
+      # @since 2.0.0
+      def with_node(cluster, &block)
+        with_retry(cluster) do
+          begin
+            cluster.with_primary(&block)
+          rescue Errors::ConnectionFailure
+            cluster.with_secondary(&block)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/moped/read_preference/secondary.rb

@@ -0,0 +1,50 @@
+# encoding: utf-8
+module Moped
+  module ReadPreference
+
+    # Encapsulates behaviour around a secondary read preference.
+    #
+    # @since 2.0.0
+    class Secondary
+      include Selectable
+
+      # Get the name for the read preference on the server side.
+      #
+      # @example Get the name of the read preference.
+      #   secondary.name
+      #
+      # @return [ Symbol ] :secondary.
+      #
+      # @since 2.0.0
+      def name
+        :secondary
+      end
+
+      # Select a secondary node from the cluster. If no secondary is available then
+      # an exception will be raised.
+      #
+      # @example Read from a secondary node from the cluster.
+      #   preference.with_node(cluster) do |node|
+      #     node.command(ismaster: 1)
+      #   end
+      #
+      # @note If tag sets are provided then secondary selection will need to
+      #   match the provided tags.
+      #
+      # @param [ Cluster ] cluster The cluster of nodes to select from.
+      # @param [ Proc ] block The block to execute on the node.
+      #
+      # @raise [ Errors::ConnectionFailure ] If no secondary node was available
+      #   in the cluster.
+      #
+      # @return [ Object ] The result of the block.
+      #
+      # @since 2.0.0
+      def with_node(cluster, &block)
+        with_retry(cluster) do
+          cluster.with_secondary(&block)
+        end
+      end
+    end
+  end
+end