moped 1.2.0 → 1.2.1

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Overview
 
+## 1.3.0 (branch: master)
+
+### New Features
+
+## 1.2.2 (branch: 1.2.0-stable)
+
+### Resolved Issues
+
+## 1.2.1
+
+### Resolved Issues
+
+* \#63 `Database#collection_names` now returns collections with "system" in
+  the name that aren't core MongoDB system collections. (Hans Hasselberg)
+
+* \#62 Ensure `Connection#alive?` returns false if I/O errors occur. (lowang)
+
+* \#59 Use the current database, not admin, for `getLastError` commands.
+  (Christopher Winslett)
+
+* \#57 Ensure collection name is a string for all operations.
+
+* \#50 Fixed connection issues when connection is disconnected mid call.
+  (Jonathan Hyman)
+
 ## 1.2.0
 
 ### New Features

data/lib/moped/collection.rb

@@ -66,7 +66,7 @@ module Moped
     #
     # @since 1.0.0
     def initialize(database, name)
-      @database, @name = database, name
+      @database, @name = database, name.to_s
     end
 
     # Insert one or more documents into the collection.

data/lib/moped/connection.rb

@@ -6,7 +6,6 @@ module Moped
   #
   # @api private
   class Connection
-
     # Is the connection alive?
     #
     # @example Is the connection alive?
@@ -19,20 +18,16 @@ module Moped
       connected? ? @sock.alive? : false
     end
 
-    # Connect to the server.
-    #
-    # @example Connect to the server.
-    #   connection.connect("127.0.0.1", 27017, 30)
+    # Connect to the server defined by @host, @port without timeout @timeout.
     #
-    # @param [ String ] host The host to connect to.
-    # @param [ Integer ] post The server port.
-    # @param [ Integer ] timeout The connection timeout.
+    # @example Open the connection
+    #   connection.connect
     #
     # @return [ TCPSocket ] The socket.
     #
     # @since 1.0.0
-    def connect(host, port, timeout)
-      @sock = TCPSocket.connect host, port, timeout
+    def connect
+      create_connection
     end
 
     # Is the connection connected?
@@ -65,12 +60,18 @@ module Moped
     # Initialize the connection.
     #
     # @example Initialize the connection.
-    #   Connection.new
+    #   Connection.new("localhost", 27017, 5)
     #
+    # @param [ String ] host The host to connect to.
+    # @param [ Integer ] post The server port.
+    # @param [ Integer ] timeout The connection timeout.
     # @since 1.0.0
-    def initialize
+    def initialize(host, port, timeout)
       @sock = nil
       @request_id = 0
+      @host = host
+      @port = port
+      @timeout = timeout
     end
 
     # Read from the connection.
@@ -82,26 +83,31 @@ module Moped
     #
     # @since 1.0.0
     def read
-      reply = Protocol::Reply.allocate
-      reply.length,
-        reply.request_id,
-        reply.response_to,
-        reply.op_code,
-        reply.flags,
-        reply.cursor_id,
-        reply.offset,
-        reply.count = @sock.read(36).unpack('l<5q<l<2')
-
-      if reply.count == 0
-        reply.documents = []
-      else
-        buffer = StringIO.new(@sock.read(reply.length - 36))
-
-        reply.documents = reply.count.times.map do
-          BSON::Document.deserialize(buffer)
+      with_connection do |socket|
+        reply = Protocol::Reply.allocate
+        response = socket.read(36).unpack('l<5q<l<2')
+        reply.length,
+            reply.request_id,
+            reply.response_to,
+            reply.op_code,
+            reply.flags,
+            reply.cursor_id,
+            reply.offset,
+            reply.count = response
+
+        if reply.count == 0
+          reply.documents = []
+        else
+          sock_read = socket.read(reply.length - 36)
+
+          buffer = StringIO.new(sock_read)
+
+          reply.documents = reply.count.times.map do
+            BSON::Document.deserialize(buffer)
+          end
         end
+        reply
       end
-      reply
     end
 
     # Get the replies to the database operation.
@@ -136,7 +142,31 @@ module Moped
         operation.request_id = (@request_id += 1)
         operation.serialize(buf)
       end
-      @sock.write(buf)
+      with_connection do |socket|
+        socket.write(buf)
+      end
+    end
+
+    private
+
+    def create_connection
+      @sock = TCPSocket.connect @host, @port, @timeout
+    end
+
+    # Yields a connected socket to the calling back. It will attempt to reconnect
+    # the socket if it is not connected.
+    #
+    # @example Write to the connection.
+    #   with_connection do |socket|
+    #     socket.write(buf)
+    #   end
+    #
+    # @return The yielded block
+    #
+    # @since 1.3.0
+    def with_connection
+      create_connection if @sock.nil? || !@sock.alive?
+      yield @sock
     end
 
     # This is a wrapper around a tcp socket.

data/lib/moped/database.rb

@@ -54,7 +54,7 @@ module Moped
     #
     # @since 1.0.0
     def collection_names
-      namespaces = Collection.new(self, "system.namespaces").find(name: { "$not" => /system|\$/ })
+      namespaces = Collection.new(self, "system.namespaces").find(name: { "$not" => /#{name}\.system|\$/ })
       namespaces.map do |doc|
         _name = doc["name"]
         _name[name.length + 1, _name.length]

data/lib/moped/node.rb

@@ -471,7 +471,7 @@ module Moped
     end
 
     def connection
-      @connection ||= Connection.new
+      @connection ||= Connection.new(ip_address, port, timeout)
     end
 
     def connected?
@@ -493,7 +493,7 @@ module Moped
     # Raises Moped::ConnectionError if the connection times out.
     # Raises Moped::ConnectionError if the server is unavailable.
     def connect
-      connection.connect ip_address, port, timeout
+      connection.connect
       @down_at = nil
     end
 

data/lib/moped/session/context.rb

@@ -57,7 +57,7 @@ module Moped
           if safe?
             node.pipeline do
               node.insert(database, collection, documents, options)
-              node.command("admin", { getlasterror: 1 }.merge(safety))
+              node.command(database, { getlasterror: 1 }.merge(safety))
             end
           else
             node.insert(database, collection, documents, options)
@@ -70,7 +70,7 @@ module Moped
           if safe?
             node.pipeline do
               node.update(database, collection, selector, change, options)
-              node.command("admin", { getlasterror: 1 }.merge(safety))
+              node.command(database, { getlasterror: 1 }.merge(safety))
             end
           else
             node.update(database, collection, selector, change, options)
@@ -83,7 +83,7 @@ module Moped
           if safe?
             node.pipeline do
               node.remove(database, collection, selector, options)
-              node.command("admin", { getlasterror: 1 }.merge(safety))
+              node.command(database, { getlasterror: 1 }.merge(safety))
             end
           else
             node.remove(database, collection, selector, options)

data/lib/moped/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moped
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-29 00:00:00.000000000 Z
+date: 2012-08-27 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: 338711224338156996
+      hash: -3114748466186243780
 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: 338711224338156996
+      hash: -3114748466186243780
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24