moped 1.5.3 → 2.0.0.beta

data/lib/moped/{mongo_uri.rb → uri.rb}

@@ -3,18 +3,62 @@ module Moped
 
   # Parses MongoDB uri
   #
-  # @api public
-  class MongoUri
+  # @since 1.3.0
+  class Uri
 
+    # Get the scheme pattern.
+    #
+    # @since 1.3.0
     SCHEME = /(mongodb:\/\/)/
+
+    # The user name pattern.
+    #
+    # @since 1.3.0
     USER = /([-.\w:]+)/
+
+    # The password pattern.
+    #
+    # @since 1.3.0
     PASS = /([^@,]+)/
+
+    # The nodes pattern.
+    #
+    # @since 1.3.0
     NODES = /((([-.\w]+)(?::(\w+))?,?)+)/
+
+    # The database pattern.
+    #
+    # @since 1.3.0
     DATABASE = /(?:\/([-\w]+))?/
+
+    # The options pattern.
+    #
+    # @since 1.3.0
     OPTIONS  = /(?:\?(.+))/
 
+    # The full URI pattern.
+    #
+    # @since 1.3.0
     URI = /#{SCHEME}(#{USER}:#{PASS}@)?#{NODES}#{DATABASE}#{OPTIONS}?/
 
+    # The options that have to do with write concerns.
+    #
+    # @since 2.0.0
+    WRITE_OPTIONS = [ "w", "j", "fsync", "wtimeout" ].freeze
+
+    # The mappings from read preferences in the URI to Moped's.
+    #
+    # @since 2.0.0
+    READ_MAPPINGS = {
+      "nearest" => :nearest,
+      "primary" => :primary,
+      "primarypreferred" => :primary_preferred,
+      "secondary" => :secondary,
+      "secondarypreferred" => :secondary_preferred
+    }.freeze
+
+    # @!attribute match
+    #   @return [ Array ] The uri match.
     attr_reader :match
 
     # Helper to determine if authentication is provided
@@ -75,51 +119,37 @@ module Moped
     #
     # @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
+      scrubbed = string.gsub(/[^:]+@/, '<password>@')
+      raise Errors::InvalidMongoURI, "The provided connection string is not a value URI: #{scrubbed}"
     end
 
     # Get the options provided in the URI.
+    #
     # @example Get the options
     #   uri.options
     #
+    # @note The options provided in the URI string must match the MongoDB
+    #   specification.
+    #
     # @return [ Hash ] Options hash usable by Moped
     #
+    # @see http://docs.mongodb.org/manual/reference/connection-string/#connections-connection-options
+    #
     # @since 1.3.0
     def options
-      options_string, options = @match[10], {database: database}
-
+      options_string, options = match[10], { database: database }
       unless options_string.nil?
         options_string.split(/\&/).each do |option_string|
           key, value = option_string.split(/=/)
-
-          if value == "true"
-            options[key.to_sym] = true
-          elsif value == "false"
-            options[key.to_sym] = false
-          elsif value =~ /[\d]/
-            options[key.to_sym] = value.to_i
+          if WRITE_OPTIONS.include?(key)
+            options[:write] = { key.to_sym => cast(value) }
+          elsif read = READ_MAPPINGS[value.downcase]
+            options[:read] = read
           else
-            options[key.to_sym] = value.to_sym
+            options[key.to_sym] = cast(value)
           end
         end
       end
-
       options
     end
 
@@ -160,7 +190,7 @@ For options, use query string syntax with the option value:
     #
     # @since 1.3.0
     def moped_arguments
-      [hosts, options]
+      [ hosts, options ]
     end
 
     # Get the username provided in the URI.
@@ -174,5 +204,19 @@ For options, use query string syntax with the option value:
     def username
       @username ||= match[3]
     end
+
+    private
+
+    def cast(value)
+      if value == "true"
+        true
+      elsif value == "false"
+        false
+      elsif value =~ /[\d]/
+        value.to_i
+      else
+        value.to_sym
+      end
+    end
   end
 end

data/lib/moped/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Moped
-  VERSION = "1.5.3"
+  VERSION = "2.0.0.beta"
 end

data/lib/moped/write_concern.rb

@@ -0,0 +1,33 @@
+# encoding: utf-8
+require "moped/write_concern/propagate"
+require "moped/write_concern/unverified"
+
+module Moped
+
+  # Provides behaviour on getting the correct write concern for an option.
+  #
+  # @since 2.0.0
+  module WriteConcern
+    extend self
+
+    # Get the corresponding write concern for the provided value. If the value
+    # is unverified we get that concern, otherwise we get propagate.
+    #
+    # @example Get the appropriate write concern.
+    #   Moped::WriteConcern.get(w: 3)
+    #
+    # @param [ Symbol, String, Hash ] The value to use to get the concern.
+    #
+    # @return [ Unverified, Propagate ] The appropriate write concern.
+    #
+    # @since 2.0.0
+    def get(value)
+      propagate = value[:w] || value["w"]
+      if propagate == 0 || propagate == -1
+        Unverified.new
+      else
+        Propagate.new(value)
+      end
+    end
+  end
+end

data/lib/moped/write_concern/propagate.rb

@@ -0,0 +1,38 @@
+# encoding: utf-8
+module Moped
+  module WriteConcern
+
+    # Propagating write concerns piggyback a getlasterror command to any write
+    # operation with the necessary options.
+    #
+    # @since 2.0.0
+    class Propagate
+
+      # @!attribute operation
+      #   @return [ Hash ] The gle operation.
+      attr_reader :operation
+
+      # Initialize the propagating write concern.
+      #
+      # @example Instantiate the write concern.
+      #   Moped::WriteConcern::Propagate.new(w: 3)
+      #
+      # @param [ Hash ] operation The operation to execute.
+      #
+      # @since 2.0.0
+      def initialize(options)
+        @operation = { getlasterror: 1 }.merge!(normalize(options))
+      end
+
+      private
+
+      def normalize(options)
+        opts = {}
+        options.each do |key, value|
+          opts[key] = value.is_a?(Symbol) ? value.to_s : value
+        end
+        opts
+      end
+    end
+  end
+end

data/lib/moped/write_concern/unverified.rb

@@ -0,0 +1,28 @@
+# encoding: utf-8
+module Moped
+  module WriteConcern
+
+    # Unverified write concerns are fire and forget.
+    #
+    # @since 2.0.0
+    class Unverified
+
+      # Constant for a noop getlasterror command.
+      #
+      # @since 2.0.0
+      NOOP = nil
+
+      # Get the gle command associated with this write concern.
+      #
+      # @example Get the gle operation.
+      #   unverified.operation
+      #
+      # @return [ nil ] nil, since unverified writes perform no gle.
+      #
+      # @since 2.0.0
+      def operation
+        NOOP
+      end
+    end
+  end
+end

metadata

@@ -1,63 +1,86 @@
 --- !ruby/object:Gem::Specification
 name: moped
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 2.0.0.beta
 platform: ruby
 authors:
+- Durran Jordan
 - Bernerd Schaefer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-06 00:00:00.000000000 Z
-dependencies: []
+date: 2013-09-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bson
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0.rc2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0.rc2
+- !ruby/object:Gem::Dependency
+  name: optionable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 description: A MongoDB driver for Ruby.
 email:
-- bj.schaefer@gmail.com
+- durran@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG.md
-- LICENSE
-- README.md
-- lib/moped.rb
-- lib/moped/bson.rb
-- lib/moped/bson/binary.rb
-- lib/moped/bson/code.rb
-- lib/moped/bson/document.rb
-- lib/moped/bson/extensions.rb
-- lib/moped/bson/extensions/array.rb
-- lib/moped/bson/extensions/boolean.rb
-- lib/moped/bson/extensions/false_class.rb
-- lib/moped/bson/extensions/float.rb
-- lib/moped/bson/extensions/hash.rb
-- lib/moped/bson/extensions/integer.rb
-- lib/moped/bson/extensions/nil_class.rb
-- lib/moped/bson/extensions/object.rb
-- lib/moped/bson/extensions/regexp.rb
-- lib/moped/bson/extensions/string.rb
-- lib/moped/bson/extensions/symbol.rb
-- lib/moped/bson/extensions/time.rb
-- lib/moped/bson/extensions/true_class.rb
-- lib/moped/bson/max_key.rb
-- lib/moped/bson/min_key.rb
-- lib/moped/bson/object_id.rb
-- lib/moped/bson/timestamp.rb
-- lib/moped/bson/types.rb
+- lib/moped/address.rb
+- lib/moped/authenticatable.rb
 - lib/moped/cluster.rb
 - lib/moped/collection.rb
+- lib/moped/connection/manager.rb
+- lib/moped/connection/pool.rb
+- lib/moped/connection/queue.rb
+- lib/moped/connection/reaper.rb
+- lib/moped/connection/socket/connectable.rb
+- lib/moped/connection/socket/ssl.rb
+- lib/moped/connection/socket/tcp.rb
+- lib/moped/connection/socket.rb
+- lib/moped/connection/sockets.rb
 - lib/moped/connection.rb
 - lib/moped/cursor.rb
 - lib/moped/database.rb
 - lib/moped/errors.rb
+- lib/moped/executable.rb
+- lib/moped/failover/disconnect.rb
+- lib/moped/failover/ignore.rb
+- lib/moped/failover/reconfigure.rb
+- lib/moped/failover/retry.rb
+- lib/moped/failover.rb
 - lib/moped/indexes.rb
-- lib/moped/logging.rb
-- lib/moped/mongo_uri.rb
+- lib/moped/instrumentable/log.rb
+- lib/moped/instrumentable/noop.rb
+- lib/moped/instrumentable.rb
+- lib/moped/loggable.rb
 - lib/moped/node.rb
-- lib/moped/protocol.rb
+- lib/moped/operation/read.rb
+- lib/moped/operation/write.rb
+- lib/moped/operation.rb
 - lib/moped/protocol/command.rb
-- lib/moped/protocol/commands.rb
 - lib/moped/protocol/commands/authenticate.rb
+- lib/moped/protocol/commands.rb
 - lib/moped/protocol/delete.rb
 - lib/moped/protocol/get_more.rb
 - lib/moped/protocol/insert.rb
@@ -66,14 +89,26 @@ files:
 - lib/moped/protocol/query.rb
 - lib/moped/protocol/reply.rb
 - lib/moped/protocol/update.rb
+- lib/moped/protocol.rb
 - lib/moped/query.rb
+- lib/moped/read_preference/nearest.rb
+- lib/moped/read_preference/primary.rb
+- lib/moped/read_preference/primary_preferred.rb
+- lib/moped/read_preference/secondary.rb
+- lib/moped/read_preference/secondary_preferred.rb
+- lib/moped/read_preference/selectable.rb
+- lib/moped/read_preference.rb
+- lib/moped/readable.rb
 - lib/moped/session.rb
-- lib/moped/session/context.rb
-- lib/moped/sockets/connectable.rb
-- lib/moped/sockets/ssl.rb
-- lib/moped/sockets/tcp.rb
-- lib/moped/threaded.rb
+- lib/moped/uri.rb
 - lib/moped/version.rb
+- lib/moped/write_concern/propagate.rb
+- lib/moped/write_concern/unverified.rb
+- lib/moped/write_concern.rb
+- lib/moped.rb
+- CHANGELOG.md
+- LICENSE
+- README.md
 homepage: http://mongoid.org/en/moped
 licenses: []
 metadata: {}
@@ -83,17 +118,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: A MongoDB driver for Ruby.

data/lib/moped/bson.rb

@@ -1,45 +0,0 @@
-# encoding: utf-8
-require "moped/bson/extensions"
-require "moped/bson/binary"
-require "moped/bson/code"
-require "moped/bson/object_id"
-require "moped/bson/max_key"
-require "moped/bson/min_key"
-require "moped/bson/timestamp"
-require "moped/bson/document"
-require "moped/bson/types"
-
-module Moped
-
-  # The module for Moped's BSON implementation.
-  module BSON
-
-    EOD = NULL_BYTE = "\u0000".freeze
-
-    INT32_PACK = 'l'.freeze
-    INT64_PACK = 'q'.freeze
-    FLOAT_PACK = 'E'.freeze
-
-    START_LENGTH = [0].pack(INT32_PACK).freeze
-
-    BINARY_ENCODING = Encoding.find("binary")
-    UTF8_ENCODING   = Encoding.find("utf-8")
-
-    class << self
-
-      # Create a new object id from the provided string.
-      #
-      # @example Create a new object id.
-      #   Moped::BSON::ObjectId("4faf83c7dbf89b7b29000001")
-      #
-      # @param [ String ] string The string to use.
-      #
-      # @return [ ObjectId ] The object id.
-      #
-      # @since 1.0.0
-      def ObjectId(string)
-        ObjectId.from_string(string)
-      end
-    end
-  end
-end