mongo 0.18.1 → 0.18.2

data/lib/mongo/db.rb

@@ -48,7 +48,7 @@ module Mongo
 
     # The Mongo::Connection instance connecting to the MongoDB server.
     attr_reader :connection
-    
+
     # An array of [host, port] pairs.
     attr_reader :nodes
 
@@ -132,7 +132,7 @@ module Mongo
       names.map {|name| name.sub(@name + '.', '')}
     end
 
-    # Retruns an array of Collection instances, one for each collection in this
+    # Retuns an array of Collection instances, one for each collection in this
     # database.
     def collections
       collection_names.map do |collection_name|
@@ -316,7 +316,7 @@ module Mongo
     def create_index(collection_name, field_or_spec, unique=false)
       self.collection(collection_name).create_index(field_or_spec, unique)
     end
-    
+
     # Return +true+ if +doc+ contains an 'ok' field with the value 1.
     def ok?(doc)
       ok = doc['ok']
@@ -334,9 +334,9 @@ module Mongo
       end
 
       cursor = Cursor.new(Collection.new(self, SYSTEM_COMMAND_COLLECTION), :admin => use_admin_db, :limit => -1, :selector => selector, :socket => sock)
-      cursor.next_object
+      cursor.next_document
     end
-    
+
     # Sends a command to the database.
     #
     # :selector (required) :: An OrderedHash, or a standard Hash with just one
@@ -352,12 +352,12 @@ module Mongo
     # any selector containing more than one key must be an OrderedHash.
     def command(selector, admin=false, check_response=false, sock=nil)
       raise MongoArgumentError, "command must be given a selector" unless selector.is_a?(Hash) && !selector.empty?
-      if selector.class.eql?(Hash) && selector.keys.length > 1 
+      if selector.class.eql?(Hash) && selector.keys.length > 1
         raise MongoArgumentError, "DB#command requires an OrderedHash when hash contains multiple keys"
       end
 
-      result = Cursor.new(system_command_collection, :admin => admin, 
-        :limit => -1, :selector => selector, :socket => sock).next_object
+      result = Cursor.new(system_command_collection, :admin => admin,
+        :limit => -1, :selector => selector, :socket => sock).next_document
 
       if check_response && !ok?(result)
         raise OperationFailure, "Database command '#{selector.keys.first}' failed."

data/lib/mongo/errors.rb

@@ -30,16 +30,22 @@ module Mongo
   # Raised when given a string is not valid utf-8 (Ruby 1.8 only).
   class InvalidStringEncoding < MongoRubyError; end
 
+  # Raised when attempting to initialize an invalid ObjectID.
+  class InvalidObjectID < MongoRubyError; end
+
   # Raised on failures in connection to the database server.
   class ConnectionError < MongoRubyError; end
 
   # Raised on failures in connection to the database server.
   class ConnectionTimeoutError < MongoRubyError; end
 
+  # Raised when trying to insert a document that exceeds the 4MB limit.
+  class InvalidDocument < MongoDBError; end
+
   # Raised when a database operation fails.
   class OperationFailure < MongoDBError; end
-  
-  # Raised when a database operation fails.
+
+  # Raised when a connection operation fails.
   class ConnectionFailure < MongoDBError; end
 
   # Raised when a client attempts to perform an invalid operation.

data/lib/mongo/gridfs/chunk.rb

@@ -55,7 +55,6 @@ module GridFS
     def size; @data.size; end
     alias_method :length, :size
 
-    # Erase all data after current position.
     def truncate
       if @data.position < @data.length
         curr_data = @data

data/lib/mongo/gridfs/grid_store.rb

@@ -54,6 +54,9 @@ module GridFS
     # Default is DEFAULT_CONTENT_TYPE
     attr_accessor :content_type
 
+    # Size of file in bytes
+    attr_reader :length
+
     attr_accessor :metadata
 
     attr_reader :files_id
@@ -70,7 +73,7 @@ module GridFS
     class << self
 
       def exist?(db, name, root_collection=DEFAULT_ROOT_COLLECTION)
-        db.collection("#{root_collection}.files").find({'filename' => name}).next_object != nil
+        db.collection("#{root_collection}.files").find({'filename' => name}).next_document != nil
       end
 
       def open(db, name, mode, options={})
@@ -91,12 +94,12 @@ module GridFS
         }
       end
 
-      # List the contains of all GridFS files stored in the given db and
+      # List the contents of all GridFS files stored in the given db and
       # root collection.
       #
       # :db :: the database to use
       #
-      # :root_collection :: the root collection to use
+      # :root_collection :: the root collection to use. If not specified, will use default root collection.
       def list(db, root_collection=DEFAULT_ROOT_COLLECTION)
         db.collection("#{root_collection}.files").find().map { |f|
           f['filename']
@@ -145,7 +148,7 @@ module GridFS
       @db, @filename, @mode = db, name, mode
       @root = options[:root] || DEFAULT_ROOT_COLLECTION
 
-      doc = collection.find({'filename' => @filename}).next_object
+      doc = collection.find({'filename' => @filename}).next_document
       if doc
         @files_id = doc['_id']
         @content_type = doc['contentType']
@@ -242,7 +245,7 @@ module GridFS
       str
     end
 
-    def read(len=nil, buf=nil)
+    def old_read(len=nil, buf=nil)
       buf ||= ''
       byte = self.getc
       while byte != nil && (len == nil || len > 0)
@@ -253,6 +256,14 @@ module GridFS
       buf
     end
 
+    def read(len=nil, buf=nil)
+      if len
+        read_partial(len, buf)
+      else
+        read_all(buf)
+      end
+    end
+
     def readchar
       byte = self.getc
       raise EOFError.new if byte == nil
@@ -331,15 +342,21 @@ module GridFS
       write(obj.to_s)
     end
 
-    # Writes +string+ as bytes and returns the number of bytes written.
     def write(string)
       raise "#@filename not opened for write" unless @mode[0] == ?w
-      count = 0
-      string.each_byte { |byte|
-        self.putc byte
-        count += 1
-      }
-      count
+      to_write = string.length
+      while (to_write > 0) do
+        if @curr_chunk && @curr_chunk.data.position == @chunk_size
+          prev_chunk_number = @curr_chunk.chunk_number
+          @curr_chunk = GridFS::Chunk.new(self, 'n' => prev_chunk_number + 1)
+        end
+        chunk_available = @chunk_size - @curr_chunk.data.position
+        step_size = (to_write > chunk_available) ? chunk_available : to_write
+        @curr_chunk.data.put_array(ByteBuffer.new(string[-to_write,step_size]).to_a)
+        to_write -= step_size
+        @curr_chunk.save
+      end
+      string.length - to_write
     end
 
     # A no-op.
@@ -396,7 +413,7 @@ module GridFS
 
     def tell
       @position
-     end
+    end
 
     #---
     # ================ closing ================
@@ -446,13 +463,39 @@ module GridFS
       h
     end
 
+    def read_partial(len, buf=nil)
+      buf ||= ''
+      byte = self.getc
+      while byte != nil && (len == nil || len > 0)
+        buf << byte.chr
+        len -= 1 if len
+        byte = self.getc if (len == nil || len > 0)
+      end
+      buf
+    end
+
+    def read_all(buf=nil)
+      buf ||= ''
+      while true do
+        if (@curr_chunk.pos > 0)
+          data = @curr_chunk.data.to_s
+          buf += data[@position, data.length]
+        else
+          buf += @curr_chunk.data.to_s
+        end
+        break if @curr_chunk.chunk_number == last_chunk_number
+        @curr_chunk = nth_chunk(@curr_chunk.chunk_number + 1)
+      end
+      buf
+    end
+
     def delete_chunks
       chunk_collection.remove({'files_id' => @files_id}) if @files_id
       @curr_chunk = nil
     end
 
     def nth_chunk(n)
-      mongo_chunk = chunk_collection.find({'files_id' => @files_id, 'n' => n}).next_object
+      mongo_chunk = chunk_collection.find({'files_id' => @files_id, 'n' => n}).next_document
       Chunk.new(self, mongo_chunk || {})
     end
 

data/lib/mongo/types/code.rb

@@ -18,6 +18,7 @@ module Mongo
 
   # JavaScript code to be evaluated by MongoDB
   class Code < String
+
     # Hash mapping identifiers to their values
     attr_accessor :scope
 

data/lib/mongo/types/objectid.rb

@@ -44,7 +44,7 @@ module Mongo
 
     # Adds a primary key to the given document if needed.
     def self.create_pk(doc)
-      doc[:_id] || doc['_id'] ? doc : doc.merge!(:_id => self.new)
+      doc.has_key?(:_id) || doc.has_key?('_id') ? doc : doc.merge!(:_id => self.new)
     end
 
     # +data+ is an array of bytes. If nil, a new id will be generated.
@@ -70,7 +70,7 @@ module Mongo
     # Given a string representation of an ObjectID, return a new ObjectID
     # with that value.
     def self.from_string(str)
-      raise "illegal ObjectID format" unless legal?(str)
+      raise InvalidObjectID, "illegal ObjectID format" unless legal?(str)
       data = []
       12.times do |i|
         data[i] = str[i * 2, 2].to_i(16)
@@ -83,7 +83,7 @@ module Mongo
     # removed. If you are not sure that you need this method you should be
     # using the regular from_string.
     def self.from_string_legacy(str)
-      raise "illegal ObjectID format" unless legal?(str)
+      raise InvalidObjectID, "illegal ObjectID format" unless legal?(str)
       data = []
       BYTE_ORDER.each_with_index { |string_position, data_index|
         data[data_index] = str[string_position * 2, 2].to_i(16)
@@ -132,9 +132,8 @@ module Mongo
 
     private
 
-    begin
-      require 'mongo_ext/cbson'
-    rescue LoadError
+    # We need to define this method only if CBson isn't loaded.
+    unless defined? CBson
       def generate
         oid = ''
 

data/lib/mongo/util/bson_ruby.rb

@@ -72,6 +72,11 @@ class BSON_RUBY
     buf.put_array(to_utf8(val.to_s).unpack("C*") << 0)
   end
 
+  def self.serialize_key(buf, key)
+    raise InvalidDocument, "Key names / regex patterns must not contain the NULL byte" if key.include? "\x00"
+    self.serialize_cstr(buf, key)
+  end
+
   def to_a
     @buf.to_a
   end
@@ -107,6 +112,9 @@ class BSON_RUBY
     obj.each {|k, v| serialize_key_value(k, v, check_keys) unless k == '_id' || k == :_id }
 
     serialize_eoo_element(@buf)
+    if @buf.size > 4 * 1024 * 1024
+      raise InvalidDocument, "Document is too large (#{@buf.size}). BSON documents are limited to 4MB (#{4 * 1024 * 1024})."
+    end
     @buf.put_int(@buf.size, 0)
     self
   end
@@ -362,7 +370,7 @@ class BSON_RUBY
 
   def serialize_null_element(buf, key)
     buf.put(NULL)
-    self.class.serialize_cstr(buf, key)
+    self.class.serialize_key(buf, key)
   end
 
   def serialize_dbref_element(buf, key, val)
@@ -374,7 +382,7 @@ class BSON_RUBY
 
   def serialize_binary_element(buf, key, val)
     buf.put(BINARY)
-    self.class.serialize_cstr(buf, key)
+    self.class.serialize_key(buf, key)
 
     bytes = val.to_a
     num_bytes = bytes.length
@@ -393,13 +401,13 @@ class BSON_RUBY
 
   def serialize_boolean_element(buf, key, val)
     buf.put(BOOLEAN)
-    self.class.serialize_cstr(buf, key)
+    self.class.serialize_key(buf, key)
     buf.put(val ? 1 : 0)
   end
 
   def serialize_date_element(buf, key, val)
     buf.put(DATE)
-    self.class.serialize_cstr(buf, key)
+    self.class.serialize_key(buf, key)
     millisecs = (val.to_f * 1000).to_i
     buf.put_long(millisecs)
   end
@@ -407,7 +415,7 @@ class BSON_RUBY
   def serialize_number_element(buf, key, val, type)
     if type == NUMBER
       buf.put(type)
-      self.class.serialize_cstr(buf, key)
+      self.class.serialize_key(buf, key)
       buf.put_double(val)
     else
       if val > 2**64 / 2 - 1 or val < -2**64 / 2
@@ -415,11 +423,11 @@ class BSON_RUBY
       end
       if val > 2**32 / 2 - 1 or val < -2**32 / 2
         buf.put(NUMBER_LONG)
-        self.class.serialize_cstr(buf, key)
+        self.class.serialize_key(buf, key)
         buf.put_long(val)
       else
         buf.put(type)
-        self.class.serialize_cstr(buf, key)
+        self.class.serialize_key(buf, key)
         buf.put_int(val)
       end
     end
@@ -427,7 +435,7 @@ class BSON_RUBY
 
   def serialize_object_element(buf, key, val, check_keys, opcode=OBJECT)
     buf.put(opcode)
-    self.class.serialize_cstr(buf, key)
+    self.class.serialize_key(buf, key)
     buf.put_array(BSON.new.serialize(val, check_keys).to_a)
   end
 
@@ -441,10 +449,12 @@ class BSON_RUBY
 
   def serialize_regex_element(buf, key, val)
     buf.put(REGEX)
-    self.class.serialize_cstr(buf, key)
+    self.class.serialize_key(buf, key)
 
-    str = val.to_s.sub(/.*?:/, '')[0..-2] # Turn "(?xxx:yyy)" into "yyy"
-    self.class.serialize_cstr(buf, str)
+    str = val.source
+    # We use serialize_key here since regex patterns aren't prefixed with
+    # length (can't contain the NULL byte).
+    self.class.serialize_key(buf, str)
 
     options = val.options
     options_str = ''
@@ -458,14 +468,14 @@ class BSON_RUBY
 
   def serialize_oid_element(buf, key, val)
     buf.put(OID)
-    self.class.serialize_cstr(buf, key)
+    self.class.serialize_key(buf, key)
 
     buf.put_array(val.to_a)
   end
 
   def serialize_string_element(buf, key, val, type)
     buf.put(type)
-    self.class.serialize_cstr(buf, key)
+    self.class.serialize_key(buf, key)
 
     # Make a hole for the length
     len_pos = buf.position
@@ -485,7 +495,7 @@ class BSON_RUBY
 
   def serialize_code_w_scope(buf, key, val)
     buf.put(CODE_W_SCOPE)
-    self.class.serialize_cstr(buf, key)
+    self.class.serialize_key(buf, key)
 
     # Make a hole for the length
     len_pos = buf.position
@@ -544,7 +554,7 @@ class BSON_RUBY
     when Symbol
       SYMBOL
     else
-      raise "Unknown type of object: #{o.class.name}"
+      raise InvalidDocument, "Unknown type of object: #{o.class.name}"
     end
   end
 

data/lib/mongo/util/conversions.rb

@@ -32,11 +32,19 @@ module Mongo #:nodoc:
     # <tt>{ "field1" => 1, "field2" => -1}</tt>
     def array_as_sort_parameters(value)
       order_by = OrderedHash.new
-      value.each do |param|
-        if (param.class.name == "String")
-          order_by[param] = 1
+      if value.first.is_a? Array
+        value.each do |param|
+          if (param.class.name == "String")
+            order_by[param] = 1
+          else
+            order_by[param[0]] = sort_value(param[1]) unless param[1].nil?
+          end
+        end
+      elsif !value.empty?
+        if order_by.size == 1
+          order_by[value.first] = 1
         else
-          order_by[param[0]] = sort_value(param[1]) unless param[1].nil?
+          order_by[value.first] = sort_value(value[1])
         end
       end
       order_by

data/lib/mongo/util/ordered_hash.rb

@@ -111,5 +111,23 @@ class OrderedHash < Hash
       super
       @ordered_keys = []
     end
+
+    def hash
+      code = 17
+      each_pair do |key, value|
+        code = 37 * code + key.hash
+        code = 37 * code + value.hash
+      end
+      code
+    end
+
+    def eql?(o)
+      if o.instance_of? OrderedHash
+        self.hash == o.hash
+      else
+        false
+      end
+    end
+
   end
 end