moped 1.0.0.rc → 1.0.0

data/lib/moped/bson/extensions/symbol.rb

@@ -5,30 +5,28 @@ module Moped
       module Symbol
         module ClassMethods
           def __bson_load__(io)
-            io.read(*io.read(4).unpack(INT32_PACK)).chop!.force_encoding('utf-8').intern
+            io.read(*io.read(4).unpack(INT32_PACK)).from_utf8_binary.chop!.intern
           end
         end
 
         def __bson_dump__(io, key)
           io << Types::SYMBOL
-          io << key
-          io << NULL_BYTE
-
-          begin
-            data = to_s.encode('utf-8')
-          rescue EncodingError
-            data = to_s.dup
-            data.force_encoding('utf-8')
-
-            raise unless data.valid_encoding?
-          end
+          io << key.to_bson_cstring
 
-          data.force_encoding('binary')
+          data = to_utf8_binary
 
-          io << [data.bytesize+1].pack(INT32_PACK)
+          io << [ data.bytesize + 1 ].pack(INT32_PACK)
           io << data
           io << NULL_BYTE
         end
+
+        def to_bson_cstring
+          to_s.to_bson_cstring
+        end
+
+        def to_utf8_binary
+          to_s.to_utf8_binary
+        end
       end
     end
   end

data/lib/moped/bson/extensions/time.rb

@@ -5,15 +5,15 @@ module Moped
       module Time
         module ClassMethods
           def __bson_load__(io)
-            at(io.read(8).unpack(INT64_PACK)[0]/1000.0)
+            seconds, fragment = io.read(8).unpack(INT64_PACK)[0].divmod 1000
+            at(seconds, fragment * 1000).utc
           end
         end
 
         def __bson_dump__(io, key)
           io << Types::TIME
-          io << key
-          io << NULL_BYTE
-          io << [to_f * 1000].pack(INT64_PACK)
+          io << key.to_bson_cstring
+          io << [(to_i * 1000) + (usec / 1000)].pack(INT64_PACK)
         end
       end
     end

data/lib/moped/bson/extensions/true_class.rb

@@ -5,10 +5,13 @@ module Moped
       module TrueClass
         def __bson_dump__(io, key)
           io << Types::BOOLEAN
-          io << key
-          io << NULL_BYTE
+          io << key.to_bson_cstring
           io << Types::TRUE
         end
+
+        def __safe_options__
+          { safe: true }
+        end
       end
     end
   end

data/lib/moped/bson/max_key.rb

@@ -12,8 +12,7 @@ module Moped
 
         def __bson_dump__(io, key)
           io << Types::MAX_KEY
-          io << key
-          io << NULL_BYTE
+          io << key.to_bson_cstring
         end
       end
     end

data/lib/moped/bson/min_key.rb

@@ -12,8 +12,7 @@ module Moped
 
         def __bson_dump__(io, key)
           io << Types::MIN_KEY
-          io << key
-          io << NULL_BYTE
+          io << key.to_bson_cstring
         end
       end
     end

data/lib/moped/bson/object_id.rb

@@ -26,13 +26,17 @@ module Moped
 
         def from_data(data)
           id = allocate
-          id.instance_variable_set :@data, data
+          id.send(:data=, data)
           id
         end
       end
 
       def data
-        @data ||= @@generator.next
+        # If @data is defined, then we know we've been loaded in some
+        # non-standard way, so we attempt to repair the data.
+        repair! @data if defined? @data
+
+        @raw_data ||= @@generator.next
       end
 
       def ==(other)
@@ -48,6 +52,10 @@ module Moped
         @@string_format % data.unpack("C12")
       end
 
+      def to_json(*args)
+        "{\"$oid\": \"#{to_s}\"}"
+      end
+
       # Return the UTC time at which this ObjectId was generated. This may
       # be used instread of a created_at timestamp since this information
       # is always encoded in the object id.
@@ -63,8 +71,7 @@ module Moped
 
       def __bson_dump__(io, key)
         io << Types::OBJECT_ID
-        io << key
-        io << NULL_BYTE
+        io << key.to_bson_cstring
         io << data
       end
 
@@ -99,6 +106,39 @@ module Moped
       end
 
       @@generator = Generator.new
+
+      # @private
+      def marshal_dump
+        data
+      end
+
+      # @private
+      def marshal_load(data)
+        self.data = data
+      end
+
+      private
+
+      # Attempts to repair ObjectId data marshalled in previous formats.
+      #
+      # The first check covers an ObjectId generated by the mongo-ruby-driver.
+      #
+      # The second check covers an ObjectId generated by moped before a custom
+      # marshal strategy was added.
+      def repair!(data)
+        if data.is_a?(Array) && data.size == 12
+          self.data = data.pack("C*")
+        elsif data.is_a?(String) && data.size == 12
+          self.data = data
+        else
+          raise TypeError, "Could not convert #{data.inspect} into an ObjectId"
+        end
+      end
+
+      # Private interface for setting the internal data for an object id.
+      def data=(data)
+        @raw_data = data
+      end
     end
   end
 end

data/lib/moped/bson/types.rb

@@ -7,7 +7,7 @@ module Moped
         def self.__bson_load__(io)
           io.read 4 # swallow the length
 
-          code = io.read(*io.read(4).unpack(INT32_PACK)).chop!.force_encoding('utf-8')
+          code = io.read(*io.read(4).unpack(INT32_PACK)).from_utf8_binary.chop!
           scope = BSON::Document.deserialize(io)
 
           Code.new code, scope

data/lib/moped/cluster.rb

@@ -44,7 +44,7 @@ module Moped
 
     # Returns the list of available nodes, refreshing 1) any nodes which were
     # down and ready to be checked again and 2) any nodes whose information is
-    # out of date.
+    # out of date. Arbiter nodes are not returned.
     #
     # @example Get the available nodes.
     #   cluster.nodes
@@ -53,18 +53,22 @@ 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]
+
       # Find the nodes that were down but are ready to be refreshed, or those
       # with stale connection information.
       needs_refresh, available = @nodes.partition do |node|
-        (node.down? && node.down_at < (Time.new - @options[:down_interval])) ||
-          node.needs_refresh?(Time.new - @options[:refresh_interval])
+        (node.down? && node.down_at < down_boundary) || node.needs_refresh?(refresh_boundary)
       end
 
       # Refresh those nodes.
       available.concat refresh(needs_refresh)
 
-      # Now return all the nodes that are available.
-      available.reject(&:down?)
+      # Now return all the nodes that are available and participating in the
+      # replica set.
+      available.reject { |node| node.down? || node.arbiter? }
     end
 
     # Refreshes information for each of the nodes provided. The node list
@@ -193,6 +197,10 @@ module Moped
       end
     end
 
+    def inspect
+      "<#{self.class.name} nodes=#{@nodes.inspect}>"
+    end
+
     private
 
     def initialize_copy(_)

data/lib/moped/collection.rb

@@ -22,7 +22,11 @@ module Moped
     #
     # @since 1.0.0
     def drop
-      database.command(drop: name)
+      begin
+        database.command(drop: name)
+      rescue Moped::Errors::OperationFailure => e
+        false
+      end
     end
 
     # Build a query for this collection.

data/lib/moped/connection.rb

@@ -116,7 +116,7 @@ module Moped
     # @since 1.0.0
     def receive_replies(operations)
       operations.map do |operation|
-        read if operation.is_a?(Protocol::Query) || operation.is_a?(Protocol::GetMore)
+        operation.receive_replies(self)
       end
     end
 
@@ -189,9 +189,9 @@ module Moped
         # @since 1.0.0
         def connect(host, port, timeout)
           Timeout::timeout(timeout) do
-            new(host, port).tap do |sock|
-              sock.set_encoding('binary')
-            end
+            sock = new(host, port)
+            sock.set_encoding('binary')
+            sock
           end
         end
       end

data/lib/moped/database.rb

@@ -18,6 +18,64 @@ module Moped
     # @attribute [r] session The session.
     attr_reader :name, :session
 
+    # Get a collection by the provided name.
+    #
+    # @example Get a collection.
+    #   session[:users]
+    #
+    # @param [ Symbol, String ] collection The collection name.
+    #
+    # @return [ Collection ] An instance of the collection.
+    #
+    # @since 1.0.0
+    def [](collection)
+      Collection.new(self, collection)
+    end
+
+    # Get all non-system collections from the database.
+    #
+    # @example Get all the collections.
+    #   database.collections
+    #
+    # @return [ Array<Collection> ] All the collections.
+    #
+    # @since 1.0.0
+    def collections
+      collection_names.map{|name| Collection.new(self, name)}
+    end
+
+    # Get all non-system collection names from the database, this excludes
+    # indexes.
+    #
+    # @example Get all the collection names.
+    #   database.collection_names
+    #
+    # @return [ Array<String> ] The names of all collections.
+    #
+    # @since 1.0.0
+    def collection_names
+      namespaces = Collection.new(self, "system.namespaces").find(name: { "$not" => /system|\$/ })
+      namespaces.map do |doc|
+        _name = doc["name"]
+        _name[name.length + 1, _name.length]
+      end
+    end
+
+    # Run +command+ on the database.
+    #
+    # @example Run a command.
+    #   db.command(ismaster: 1)
+    #   # => { "master" => true, hosts: [] }
+    #
+    # @param [ Hash ] command The command to run.
+    #
+    # @return [ Hash ] the result of the command.
+    #
+    # @since 1.0.0
+    def command(command)
+      session.context.command name, command
+    end
+
     # Drop the database.
     #
     # @example Drop the database.
@@ -67,34 +125,5 @@ module Moped
     def logout
       session.context.logout(name)
     end
-
-    # Run +command+ on the database.
-    #
-    # @example Run a command.
-    #   db.command(ismaster: 1)
-    #   # => { "master" => true, hosts: [] }
-    #
-    # @param [ Hash ] command The command to run.
-    #
-    # @return [ Hash ] the result of the command.
-    #
-    # @since 1.0.0
-    def command(command)
-      session.context.command name, command
-    end
-
-    # Get a collection by the provided name.
-    #
-    # @example Get a collection.
-    #   session[:users]
-    #
-    # @param [ Symbol, String ] collection The collection name.
-    #
-    # @return [ Collection ] An instance of the collection.
-    #
-    # @since 1.0.0
-    def [](collection)
-      Collection.new(self, collection)
-    end
   end
 end

data/lib/moped/logging.rb

@@ -37,9 +37,9 @@ module Moped
     #
     # @since 1.0.0
     def default_logger
-      Logger.new(STDOUT).tap do |logger|
-        logger.level = Logger::INFO
-      end
+      logger = Logger.new(STDOUT)
+      logger.level = Logger::INFO
+      logger
     end
 
     # Set the logger.

data/lib/moped/node.rb

@@ -186,7 +186,7 @@ module Moped
     #
     # @since 1.0.0
     def hash
-      [ ip_address, port ].hash
+      resolved_address.hash
     end
 
     # Creat the new node.
@@ -288,6 +288,30 @@ module Moped
       @primary
     end
 
+    # Is the node an arbiter?
+    #
+    # @example Is the node an arbiter?
+    #   node.arbiter?
+    #
+    # @return [ true, false ] If the node is an arbiter.
+    #
+    # @since 1.0.0
+    def arbiter?
+      @arbiter
+    end
+
+    # Is the node passive?
+    #
+    # @example Is the node passive?
+    #   node.passive?
+    #
+    # @return [ true, false ] If the node is passive.
+    #
+    # @since 1.0.0
+    def passive?
+      @passive
+    end
+
     # Execute a query on the node.
     #
     # @example Execute a query.
@@ -343,6 +367,8 @@ module Moped
 
       @peers = peers.map { |peer| Node.new(peer) }
       @primary, @secondary = primary, secondary
+      @arbiter = info["arbiterOnly"]
+      @passive = info["passive"]
 
       if !primary && Threaded.executing?(:ensure_primary)
         raise Errors::ReplicaSetReconfigured, "#{inspect} is no longer the primary node."
@@ -396,6 +422,11 @@ module Moped
       process(Protocol::Update.new(database, collection, selector, change, options))
     end
 
+    def inspect
+      "<#{self.class.name} resolved_address=#{@resolved_address.inspect}>"
+    end
+
+
     private
 
     def auth
@@ -459,8 +490,6 @@ module Moped
     def connect
       connection.connect ip_address, port, timeout
       @down_at = nil
-
-      refresh
     rescue Timeout::Error
       raise Errors::ConnectionFailure, "Timed out connection to Mongo on #{address}"
     rescue Errno::ECONNREFUSED
@@ -502,13 +531,13 @@ module Moped
       instrument_start = (logger = Moped.logger) && logger.debug? && Time.new
       yield
     ensure
-      log_operations(logger, operations, Time.new - instrument_start) if instrument_start && !$!
+      log_operations(logger, operations, Time.new - instrument_start) if instrument_start
     end
 
     def log_operations(logger, ops, duration)
-      prefix  = "  MOPED: #{address} "
+      prefix  = "  MOPED: #{resolved_address} "
       indent  = " "*prefix.length
-      runtime = (" (%.1fms)" % duration)
+      runtime = (" (%.4fms)" % duration)
 
       if ops.length == 1
         logger.debug prefix + ops.first.log_inspect + runtime