moped 1.1.6 → 1.2.0

data/CHANGELOG.md

@@ -1,6 +1,25 @@
 # Overview
 
-## 1.1.6 (branch: 1.1.0-stable)
+## 1.2.0
+
+### New Features
+
+* mongoid/mongoid\#2251 Allow `continue_on_error` option to be provided to
+  inserts.
+
+* mongoid/mongoid\#2210 Added `Session#disconnect` which will disconnect all
+  nodes in the cluster from their respective database servers. Useful for cases
+  where a large number of database connections are being created on separate
+  threads and need to be explicitly closed after their work is completed.
+
+* \#33 Added `Session#databases` and `Session#database_names` as a convenience
+  for getting all database information for the server.
+
+        session = Moped::Session.new([ "localhost:27017" ])
+        session.database_names #=> [ "moped_test" ]
+        session.databases #=> { "databases" => [{ "name" => "moped_test" }]}
+
+## 1.1.6
 
 ### Resolved Issues
 
@@ -10,8 +29,6 @@
 * \#41 `ObjectId.from_time` now only includes the timestamp, no machine or
   process information.
 
-### Resolved Issues
-
 ## 1.1.5
 
 ### Resolved Issues
@@ -28,6 +45,8 @@
 
 ## 1.1.2
 
+### Resolved Issues
+
 * \#37 Use `TCP_NODELAY` for socket options. (Nicolas Viennot)
 
 ## 1.1.1
@@ -47,6 +66,8 @@
 
 ## 1.0.1
 
+* mongoid/mongoid\#2175 Fixed sorting by object ids.
+
 * \#28 `BSON::Binary` and `BSON::ObjectId` now have readable `to_s` and
   `inspect` methods. (Ara Howard)
 

data/README.md

@@ -9,6 +9,7 @@ Project Tracking
 
 * [Mongoid Google Group](http://groups.google.com/group/mongoid)
 * [Moped Website and Documentation](http://mongoid.org/en/moped/)
+* [Moped Code Climate](https://codeclimate.com/github/mongoid/moped)
 
 Compatibility
 -------------

data/lib/moped/cluster.rb

@@ -19,6 +19,17 @@ module Moped
       @auth ||= {}
     end
 
+    # Disconnects all nodes in the cluster. This should only be used in cases
+    # where you know you're not going to use the cluster on the thread anymore
+    # and need to force the connections to close.
+    #
+    # @return [ true ] True if the disconnect succeeded.
+    #
+    # @since 1.2.0
+    def disconnect
+      nodes.each { |node| node.disconnect } and true
+    end
+
     # Initialize the new cluster.
     #
     # @example Initialize the cluster.

data/lib/moped/collection.rb

@@ -78,14 +78,17 @@ module Moped
     #   db[:people].insert([{name: "John"}, {name: "Joe"}])
     #
     # @param [ Hash, Array<Hash> ] documents The document(s) to insert.
+    # @param [ Array ] flags The flags, valid values are :continue_on_error.
+    #
+    # @option options [Array] :continue_on_error Whether to continue on error.
     #
     # @return [ nil ] nil.
     #
     # @since 1.0.0
-    def insert(documents)
+    def insert(documents, flags = nil)
       documents = [documents] unless documents.is_a?(Array)
       database.session.with(consistency: :strong) do |session|
-        session.context.insert(database.name, name, documents)
+        session.context.insert(database.name, name, documents, flags: flags || [])
       end
     end
   end

data/lib/moped/connection.rb

@@ -141,6 +141,7 @@ module Moped
 
     # This is a wrapper around a tcp socket.
     class TCPSocket < ::TCPSocket
+      attr_reader :host, :port
 
       # Is the socket connection alive?
       #
@@ -158,6 +159,31 @@ module Moped
         end
       end
 
+      # Initialize the new TCPSocket.
+      #
+      # @example Initialize the socket.
+      #   TCPSocket.new("127.0.0.1", 27017)
+      #
+      # @param [ String ] host The host.
+      # @param [ Integer ] port The port.
+      #
+      # @since 1.2.0
+      def initialize(host, port, *args)
+        @host, @port = host, port
+        handle_socket_errors { super }
+      end
+
+      # Read from the TCP socket.
+      #
+      # @param [ Integer ] length The length to read.
+      #
+      # @return [ Object ] The data.
+      #
+      # @since 1.2.0
+      def read(length)
+        handle_socket_errors { super }
+      end
+
       # Write to the socket.
       #
       # @example Write to the socket.
@@ -170,7 +196,19 @@ module Moped
       # @since 1.0.0
       def write(*args)
         raise Errors::ConnectionFailure, "Socket connection was closed by remote host" unless alive?
-        super
+        handle_socket_errors { super }
+      end
+
+      private
+
+      def handle_socket_errors
+        yield
+      rescue Timeout::Error
+        raise Errors::ConnectionFailure, "Timed out connection to Mongo on #{host}:#{port}"
+      rescue Errno::ECONNREFUSED
+        raise Errors::ConnectionFailure, "Could not connect to Mongo on #{host}:#{port}"
+      rescue Errno::ECONNRESET
+        raise Errors::ConnectionFailure, "Connection reset to Mongo on #{host}:#{port}"
       end
 
       class << self

data/lib/moped/node.rb

@@ -76,6 +76,16 @@ module Moped
       end
     end
 
+    # Force the node to disconnect from the server.
+    #
+    # @return [ nil ] nil.
+    #
+    # @since 1.2.0
+    def disconnect
+      auth.clear
+      connection.disconnect
+    end
+
     # Is the node down?
     #
     # @example Is the node down?
@@ -224,8 +234,8 @@ module Moped
     # @return [ Message ] The result of the operation.
     #
     # @since 1.0.0
-    def insert(database, collection, documents)
-      process(Protocol::Insert.new(database, collection, documents))
+    def insert(database, collection, documents, options = {})
+      process(Protocol::Insert.new(database, collection, documents, options))
     end
 
     # Kill all provided cursors on the node.
@@ -464,11 +474,6 @@ module Moped
       @connection ||= Connection.new
     end
 
-    def disconnect
-      auth.clear
-      connection.disconnect
-    end
-
     def connected?
       connection.connected?
     end
@@ -490,12 +495,6 @@ module Moped
     def connect
       connection.connect ip_address, port, timeout
       @down_at = nil
-    rescue Timeout::Error
-      raise Errors::ConnectionFailure, "Timed out connection to Mongo on #{address}"
-    rescue Errno::ECONNREFUSED
-      raise Errors::ConnectionFailure, "Could not connect to Mongo on #{address}"
-    rescue Errno::ECONNRESET
-      raise Errors::ConnectionFailure, "Connection reset to Mongo on #{address}"
     end
 
     def process(operation, &callback)

data/lib/moped/session.rb

@@ -78,6 +78,47 @@ module Moped
       current_database.command(op)
     end
 
+    # Get a list of all the database names for the session.
+    #
+    # @example Get all the database names.
+    #   session.database_names
+    #
+    # @note This requires admin access on your server.
+    #
+    # @return [ Array<String>] All the database names.
+    #
+    # @since 1.2.0
+    def database_names
+      databases["databases"].map { |database| database["name"] }
+    end
+
+    # Get information on all databases for the session. This includes the name,
+    # size on disk, and if it is empty or not.
+    #
+    # @example Get all the database information.
+    #   session.databases
+    #
+    # @note This requires admin access on your server.
+    #
+    # @return [ Hash ] The hash of database information, under the "databases"
+    #   key.
+    #
+    # @since 1.2.0
+    def databases
+      with(database: :admin).command(listDatabases: 1)
+    end
+
+    # Disconnects all nodes in the session's cluster. This should only be used
+    # in cases # where you know you're not going to use the cluster on the
+    # thread anymore and need to force the connections to close.
+    #
+    # @return [ true ] True if the disconnect succeeded.
+    #
+    # @since 1.2.0
+    def disconnect
+      cluster.disconnect
+    end
+
     # Drop the current database.
     #
     # @param (see Moped::Database#drop)

data/lib/moped/session/context.rb

@@ -52,15 +52,15 @@ module Moped
         end
       end
 
-      def insert(database, collection, documents)
+      def insert(database, collection, documents, options = {})
         with_node do |node|
           if safe?
             node.pipeline do
-              node.insert(database, collection, documents)
+              node.insert(database, collection, documents, options)
               node.command("admin", { getlasterror: 1 }.merge(safety))
             end
           else
-            node.insert(database, collection, documents)
+            node.insert(database, collection, documents, options)
           end
         end
       end

data/lib/moped/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moped
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -85,7 +85,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -760618037812365492
+      hash: 338711224338156996
 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: -760618037812365492
+      hash: 338711224338156996
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24