mongo 0.19.1 → 0.19.2

data/lib/mongo/connection.rb

@@ -276,19 +276,33 @@ module Mongo
       self[name].command(:dropDatabase => 1)
     end
 
-    # Copy the database +from+ on the local server to +to+ on the specified +host+.
-    # +host+ defaults to 'localhost' if no value is provided.
+    # Copy the database +from+ to +to+ on localhost. The +from+ database is
+    # assumed to be on localhost, but an alternate host can be specified.
     #
     # @param [String] from name of the database to copy from.
     # @param [String] to name of the database to copy to.
     # @param [String] from_host host of the 'from' database.
-    def copy_database(from, to, from_host="localhost")
+    # @param [String] username username for authentication against from_db (>=1.3.x).
+    # @param [String] password password for authentication against from_db (>=1.3.x).
+    def copy_database(from, to, from_host="localhost", username=nil, password=nil)
       oh = OrderedHash.new
       oh[:copydb]   = 1
       oh[:fromhost] = from_host
       oh[:fromdb]   = from
       oh[:todb]     = to
-      self["admin"].command(oh, false, true)
+      if username || password
+        unless username && password
+          raise MongoArgumentError, "Both username and password must be supplied for authentication."
+        end
+        nonce_cmd = OrderedHash.new
+        nonce_cmd[:copydbgetnonce] = 1
+        nonce_cmd[:fromhost] = from_host
+        result = self["admin"].command(nonce_cmd, true, true)
+        oh[:nonce] = result["nonce"]
+        oh[:username] = username
+        oh[:key] = Mongo::Support.auth_key(username, password, oh[:nonce])
+      end
+      self["admin"].command(oh, true, true)
     end
 
     # Increment and return the next available request id.

data/lib/mongo/cursor.rb

@@ -78,6 +78,13 @@ module Mongo
       doc
     end
 
+    # Determine whether this cursor has any remaining results.
+    #
+    # @return [Boolean]
+    def has_next?
+      num_remaining > 0
+    end
+
     # Get the size of the result set for this query.
     #
     # @return [Integer] the number of objects in the result set for this query. Does
@@ -169,7 +176,7 @@ module Mongo
     #   end
     def each
       num_returned = 0
-      while more? && (@limit <= 0 || num_returned < @limit)
+      while has_next? && (@limit <= 0 || num_returned < @limit)
         yield next_document
         num_returned += 1
       end
@@ -188,7 +195,7 @@ module Mongo
       raise InvalidOperation, "can't call Cursor#to_a on a used cursor" if @query_run
       rows = []
       num_returned = 0
-      while more? && (@limit <= 0 || num_returned < @limit)
+      while has_next? && (@limit <= 0 || num_returned < @limit)
         rows << next_document
         num_returned += 1
       end
@@ -223,7 +230,7 @@ module Mongo
         message = ByteBuffer.new([0, 0, 0, 0])
         message.put_int(1)
         message.put_long(@cursor_id)
-        @connection.send_message(Mongo::Constants::OP_KILL_CURSORS, message, "cursor.close()")
+        @connection.send_message(Mongo::Constants::OP_KILL_CURSORS, message, "cursor.close")
       end
       @cursor_id = 0
       @closed    = true
@@ -305,13 +312,6 @@ module Mongo
       @cache.length
     end
 
-    # Internal method, not for general use. Return +true+ if there are
-    # more records to retrieve. This method does not check @limit;
-    # Cursor#each is responsible for doing that.
-    def more?
-      num_remaining > 0
-    end
-
     def refill_via_get_more
       return if send_initial_query || @cursor_id.zero?
       message = ByteBuffer.new([0, 0, 0, 0])
@@ -362,8 +362,9 @@ module Mongo
     end
 
     def query_log_message
-      "#{@admin ? 'admin' : @db.name}.#{@collection.name}.find(#{@selector.inspect}, #{@fields ? @fields.inspect : '{}'})" +
-      "#{@skip != 0 ? ('.skip(' + @skip.to_s + ')') : ''}#{@limit != 0 ? ('.limit(' + @limit.to_s + ')') : ''}"
+      "#{@admin ? 'admin' : @db.name}['#{@collection.name}'].find(#{@selector.inspect}, #{@fields ? @fields.inspect : '{}'})" +
+      "#{@skip != 0 ? ('.skip(' + @skip.to_s + ')') : ''}#{@limit != 0 ? ('.limit(' + @limit.to_s + ')') : ''}" +
+      "#{@order ? ('.sort(' + @order.inspect + ')') : ''}"
     end
 
     def selector_with_special_query_fields

data/lib/mongo/db.rb

@@ -16,7 +16,6 @@
 
 require 'socket'
 require 'timeout'
-require 'digest/md5'
 require 'thread'
 
 module Mongo
@@ -65,7 +64,7 @@ module Mongo
     #
     # @core databases constructor_details
     def initialize(db_name, connection, options={})
-      @name       = validate_db_name(db_name)
+      @name       = Mongo::Support.validate_db_name(db_name)
       @connection = connection
       @strict     = options[:strict]
       @pk_factory = options[:pk]
@@ -94,7 +93,7 @@ module Mongo
       auth['authenticate'] = 1
       auth['user'] = username
       auth['nonce'] = nonce
-      auth['key'] = Digest::MD5.hexdigest("#{nonce}#{username}#{hash_password(username, password)}")
+      auth['key'] = Mongo::Support.auth_key(username, password, nonce)
       if ok?(command(auth))
         if save_auth
           @connection.add_auth(@name, username, password)
@@ -115,7 +114,7 @@ module Mongo
     def add_user(username, password)
       users = self[SYSTEM_USER_COLLECTION]
       user  = users.find_one({:user => username}) || {:user => username}
-      user['pwd'] = hash_password(username, password)
+      user['pwd'] = Mongo::Support.hash_password(username, password)
       users.save(user)
       return user
     end
@@ -379,11 +378,11 @@ module Mongo
     # @return [Hash] keys are index names and the values are lists of [key, direction] pairs
     #   defining the index.
     def index_information(collection_name)
-      sel = {:ns => full_collection_name(collection_name)}
+      sel  = {:ns => full_collection_name(collection_name)}
       info = {}
-      Cursor.new(Collection.new(self, SYSTEM_INDEX_COLLECTION), :selector => sel).each { |index|
-        info[index['name']] = index['key'].map {|k| k}
-      }
+      Cursor.new(Collection.new(self, SYSTEM_INDEX_COLLECTION), :selector => sel).each do |index|
+        info[index['name']] = index
+      end
       info
     end
 
@@ -416,8 +415,9 @@ module Mongo
     # Note: DB commands must start with the "command" key. For this reason,
     # any selector containing more than one key must be an OrderedHash.
     #
-    # It may be of interest hat a command in MongoDB is technically a kind of query 
-    # that occurs on the system command collection ($cmd).
+    # Note also that a command in MongoDB is just a kind of query
+    # that occurs on the system command collection ($cmd). Examine this method's implementation
+    # to see how it works.
     #
     # @param [OrderedHash, Hash] selector an OrderedHash, or a standard Hash with just one
     # key, specifying the command to be performed.
@@ -443,7 +443,7 @@ module Mongo
         :limit => -1, :selector => selector, :socket => sock).next_document
 
       if check_response && !ok?(result)
-        raise OperationFailure, "Database command '#{selector.keys.first}' failed."
+        raise OperationFailure, "Database command '#{selector.keys.first}' failed: #{result.inspect}"
       else
         result
       end
@@ -545,26 +545,8 @@ module Mongo
 
     private
 
-    def hash_password(username, plaintext)
-      Digest::MD5.hexdigest("#{username}:mongo:#{plaintext}")
-    end
-
     def system_command_collection
       Collection.new(self, SYSTEM_COMMAND_COLLECTION)
     end
-
-    def validate_db_name(db_name)
-      unless [String, Symbol].include?(db_name.class)
-        raise TypeError, "db_name must be a string or symbol"
-      end
-
-      [" ", ".", "$", "/", "\\"].each do |invalid_char|
-        if db_name.include? invalid_char
-          raise InvalidName, "database names cannot contain the character '#{invalid_char}'"
-        end
-      end
-      raise InvalidName, "database name cannot be the empty string" if db_name.empty?
-      db_name
-    end
   end
 end

data/lib/mongo/gridfs/grid.rb

@@ -78,7 +78,7 @@ module Mongo
     # @return [Boolean]
     def delete(id)
       @files.remove({"_id" => id})
-      @chunks.remove({"_id" => id})
+      @chunks.remove({"files_id" => id})
     end
 
     private

data/lib/mongo/gridfs/grid_io.rb

@@ -78,6 +78,7 @@ module Mongo
     # @return [String]
     #   the data in the file
     def read(length=nil)
+      return '' if @file_length.zero?
       if length == 0
         return ''
       elsif length.nil? && @file_position.zero?
@@ -165,6 +166,9 @@ module Mongo
     # @return [True]
     def close
       if @mode[0] == ?w
+        if @current_chunk['n'].zero? && @chunk_position.zero?
+          warn "Warning: Storing a file with zero length."
+        end
         @upload_date = Time.now.utc
         @files.insert(to_mongo_object)
       end

data/lib/mongo/util/core_ext.rb

@@ -0,0 +1,37 @@
+# --
+# Copyright (C) 2008-2010 10gen Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ++
+
+#:nodoc:
+class Object
+
+  #:nodoc:
+  def returning(value)
+    yield value
+    value
+  end
+
+end
+
+#:nodoc:
+class Hash
+
+  #:nodoc:
+  def assert_valid_keys(*valid_keys)
+    unknown_keys = keys - [valid_keys].flatten
+    raise(Mongo::MongoArgumentError, "Unknown key(s): #{unknown_keys.join(", ")}") unless unknown_keys.empty?
+  end
+
+end

data/lib/mongo/util/support.rb

@@ -14,13 +14,46 @@
 # limitations under the License.
 # ++
 
-#:nodoc:
-class Object
+require 'digest/md5'
 
-  #:nodoc:
-  def returning(value)
-    yield value
-    value
-  end
+module Mongo
+  module Support
+    extend self
+
+    # Generate an MD5 for authentication.
+    #
+    # @param [String] username
+    # @param [String] password
+    # @param [String] nonce
+    #
+    # @return [String] a key for db authentication.
+    def auth_key(username, password, nonce)
+      Digest::MD5.hexdigest("#{nonce}#{username}#{hash_password(username, password)}")
+    end
+
+    # Return a hashed password for auth.
+    #
+    # @param [String] username
+    # @param [String] plaintext
+    #
+    # @return [String]
+    def hash_password(username, plaintext)
+      Digest::MD5.hexdigest("#{username}:mongo:#{plaintext}")
+    end
 
+
+    def validate_db_name(db_name)
+      unless [String, Symbol].include?(db_name.class)
+        raise TypeError, "db_name must be a string or symbol"
+      end
+
+      [" ", ".", "$", "/", "\\"].each do |invalid_char|
+        if db_name.include? invalid_char
+          raise InvalidName, "database names cannot contain the character '#{invalid_char}'"
+        end
+      end
+      raise InvalidName, "database name cannot be the empty string" if db_name.empty?
+      db_name
+    end
+  end
 end

data/test/auxillary/1.4_features.rb

@@ -0,0 +1,166 @@
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'mongo'
+require 'test/unit'
+require 'test/test_helper'
+
+# Demonstrate features in MongoDB 1.4
+class Features14Test < Test::Unit::TestCase
+
+  context "MongoDB 1.4" do
+    setup do
+      @con = Mongo::Connection.new
+      @db  = @con['mongo-ruby-test']
+      @col = @db['new-features']
+    end
+
+    teardown do
+      @col.drop
+    end
+
+    context "new query operators: " do
+
+      context "$elemMatch: " do
+        setup do
+          @col.save({:user => 'bob', :updates => [{:date => Time.now.utc, :body => 'skiing', :n => 1},
+                                                  {:date => Time.now.utc, :body => 'biking', :n => 2}]})
+
+          @col.save({:user => 'joe', :updates => [{:date => Time.now.utc, :body => 'skiing', :n => 2},
+                                                  {:date => Time.now.utc, :body => 'biking', :n => 10}]})
+        end
+
+        should "match a document with a matching object element in an array" do
+          doc = @col.find_one({"updates" => {"$elemMatch" => {"body" => "skiing", "n" => 2}}})
+          assert_equal 'joe', doc['user']
+        end
+
+        should "$elemMatch with a conditional operator" do
+          doc1 = @col.find_one({"updates" => {"$elemMatch" => {"body" => "biking", "n" => {"$gt" => 5}}}})
+          assert_equal 'joe', doc1['user']
+        end
+
+        should "note the difference between $elemMatch and a traditional match" do
+          doc = @col.find({"updates.body" => "skiing", "updates.n" => 2}).to_a
+          assert_equal 2, doc.size
+        end
+      end
+
+      context "$all with regexes" do
+        setup do
+          @col.save({:n => 1, :a => 'whale'})
+          @col.save({:n => 2, :a => 'snake'})
+        end
+
+        should "match multiple regexes" do
+          doc = @col.find({:a => {'$all' => [/ha/, /le/]}}).to_a
+          assert_equal 1, doc.size
+          assert_equal 1, doc.first['n']
+        end
+
+        should "not match if not every regex matches" do
+          doc = @col.find({:a => {'$all' => [/ha/, /sn/]}}).to_a
+          assert_equal 0, doc.size
+        end
+      end
+
+      context "the $not operator" do
+        setup do
+          @col.save({:a => ['x']})
+          @col.save({:a => ['x', 'y']})
+          @col.save({:a => ['x', 'y', 'z']})
+        end
+
+        should "negate a standard operator" do
+          results = @col.find({:a => {'$not' => {'$size' => 2}}}).to_a
+          assert_equal 2, results.size
+          results = results.map {|r| r['a']}
+          assert_equal ['x'], results.sort.first
+          assert_equal ['x', 'y', 'z'], results.sort.last
+        end
+      end
+    end
+
+    context "new update operators: " do
+
+      context "$addToSet (pushing a unique value)" do
+        setup do
+          @col.save({:username => 'bob', :interests => ['skiing', 'guitar']})
+        end
+
+        should "add an item to a set uniquely ($addToSet)" do
+          @col.update({:username => 'bob'}, {'$addToSet' => {'interests' => 'skiing'}})
+          @col.update({:username => 'bob'}, {'$addToSet' => {'interests' => 'kayaking'}})
+          document = @col.find_one({:username => 'bob'})
+          assert_equal ['guitar', 'kayaking', 'skiing'], document['interests'].sort
+        end
+
+        should "add an array of items uniquely ($addToSet with $each)" do
+          @col.update({:username => 'bob'}, {'$addToSet' => {'interests' => {'$each' => ['skiing', 'kayaking', 'biking']}}})
+          document = @col.find_one({:username => 'bob'})
+          assert_equal ['biking', 'guitar', 'kayaking', 'skiing'], document['interests'].sort
+        end
+      end
+
+      context "the positional operator ($)" do
+        setup do
+          @id1 = @col.insert({:text => 'hello',
+                             :comments => [{'by'   => 'bob',
+                                            'text' => 'lol!'},
+                                           {'by'   => 'susie',
+                                            'text' => 'bye bye!'}]})
+          @id2 = @col.insert({:text => 'goodbye',
+                            :comments => [{'by'   => 'bob',
+                                           'text' => 'au revoir'},
+                                          {'by'   => 'susie',
+                                           'text' => 'bye bye!'}]})
+        end
+
+        should "update a matching array item" do
+          @col.update({"_id" => @id1, "comments.by" => 'bob'}, {'$set' => {'comments.$.text' => 'lmao!'}}, :multi => true)
+          result = @col.find_one({"_id" => @id1})
+          assert_equal 'lmao!', result['comments'][0]['text']
+        end
+      end
+    end
+
+    context "Geoindexing" do
+      setup do
+        @places = @db['places']
+        @places.create_index([['loc', Mongo::GEO2D]])
+
+        @empire_state = ([40.748371, -73.985031])
+        @jfk = ([40.643711, -73.790009])
+
+        @places.insert({'name' => 'Empire State Building', 'loc' => ([40.748371, -73.985031])})
+        @places.insert({'name' => 'Flatiron Building', 'loc' => ([40.741581, -73.987549])})
+        @places.insert({'name' => 'Grand Central', 'loc' => ([40.751678, -73.976562])})
+        @places.insert({'name' => 'Columbia University', 'loc' => ([40.808922, -73.961617])})
+        @places.insert({'name' => 'NYSE', 'loc' => ([40.71455, -74.007124])})
+        @places.insert({'name' => 'JFK', 'loc' => ([40.643711, -73.790009])})
+      end
+
+      teardown do
+        @places.drop
+      end
+
+      should "find the nearest addresses" do
+        results = @places.find({'loc' => {'$near' => @empire_state}}).limit(2).to_a
+        assert_equal 2, results.size
+        assert_equal 'Empire State Building', results[0]['name']
+        assert_equal 'Flatiron Building', results[1]['name']
+      end
+
+      should "use geoNear command to return distances from a point" do
+        cmd = OrderedHash.new
+        cmd['geoNear'] = 'places'
+        cmd['near']    = @empire_state
+        cmd['num']     = 6
+        r = @db.command(cmd)
+
+        assert_equal 6, r['results'].length
+        r['results'].each do |result|
+          puts result.inspect
+        end
+      end
+    end
+  end
+end