mongodb-mongo 0.12 → 0.13

data/lib/mongo/message/get_more_message.rb

@@ -17,21 +17,16 @@
 require 'mongo/message/message'
 require 'mongo/message/opcodes'
 
-module XGen
-  module Mongo
-    module Driver
+module Mongo
 
-      class GetMoreMessage < Message
+  class GetMoreMessage < Message
 
-        def initialize(db_name, collection_name, cursor)
-          super(OP_GET_MORE)
-          write_int(0)
-          write_string("#{db_name}.#{collection_name}")
-          write_int(0)              # num to return; leave it up to the db for now
-          write_long(cursor)
-        end
-      end
+    def initialize(db_name, collection_name, cursor)
+      super(OP_GET_MORE)
+      write_int(0)
+      write_string("#{db_name}.#{collection_name}")
+      write_int(0)              # num to return; leave it up to the db for now
+      write_long(cursor)
     end
   end
 end
-

data/lib/mongo/message/insert_message.rb

@@ -17,19 +17,15 @@
 require 'mongo/message/message'
 require 'mongo/message/opcodes'
 
-module XGen
-  module Mongo
-    module Driver
+module Mongo
 
-      class InsertMessage < Message
+  class InsertMessage < Message
 
-        def initialize(db_name, collection_name, check_keys=true, *objs)
-          super(OP_INSERT)
-          write_int(0)
-          write_string("#{db_name}.#{collection_name}")
-          objs.each { |o| write_doc(o, check_keys) }
-        end
-      end
+    def initialize(db_name, collection_name, check_keys=true, *objs)
+      super(OP_INSERT)
+      write_int(0)
+      write_string("#{db_name}.#{collection_name}")
+      objs.each { |o| write_doc(o, check_keys) }
     end
   end
 end

data/lib/mongo/message/kill_cursors_message.rb

@@ -17,20 +17,15 @@
 require 'mongo/message/message'
 require 'mongo/message/opcodes'
 
-module XGen
-  module Mongo
-    module Driver
+module Mongo
 
-      class KillCursorsMessage < Message
+  class KillCursorsMessage < Message
 
-        def initialize(*cursors)
-          super(OP_KILL_CURSORS)
-          write_int(0)
-          write_int(cursors.length)
-          cursors.each { |c| write_long c }
-        end
-      end
+    def initialize(*cursors)
+      super(OP_KILL_CURSORS)
+      write_int(0)
+      write_int(cursors.length)
+      cursors.each { |c| write_long c }
     end
   end
 end
-

data/lib/mongo/message/message.rb

@@ -17,68 +17,64 @@
 require 'mongo/util/bson'
 require 'mongo/util/byte_buffer'
 
-module XGen
-  module Mongo
-    module Driver
-
-      class Message
-
-        HEADER_SIZE = 16        # size, id, response_to, opcode
-
-        @@class_req_id = 0
-
-        attr_reader :buf        # for testing
-
-        def initialize(op)
-          @op = op
-          @message_length = HEADER_SIZE
-          @data_length = 0
-          @request_id = (@@class_req_id += 1)
-          @response_id = 0
-          @buf = ByteBuffer.new
-
-          @buf.put_int(16)      # holder for length
-          @buf.put_int(@request_id)
-          @buf.put_int(0)       # response_to
-          @buf.put_int(op)
-        end
-
-        def write_int(i)
-          @buf.put_int(i)
-          update_message_length
-        end
-
-        def write_long(i)
-          @buf.put_long(i)
-          update_message_length
-        end
-
-        def write_string(s)
-          BSON.serialize_cstr(@buf, s)
-          update_message_length
-        end
-
-        def write_doc(hash, check_keys=false)
-          @buf.put_array(BSON.new.serialize(hash, check_keys).to_a)
-          update_message_length
-        end
-
-        def to_a
-          @buf.to_a
-        end
-
-        def dump
-          @buf.dump
-        end
-
-        # Do not call. Private, but kept public for testing.
-        def update_message_length
-          pos = @buf.position
-          @buf.put_int(@buf.size, 0)
-          @buf.position = pos
-        end
-
-      end
+module Mongo
+
+  class Message
+
+    HEADER_SIZE = 16        # size, id, response_to, opcode
+
+    @@class_req_id = 0
+
+    attr_reader :buf        # for testing
+
+    def initialize(op)
+      @op = op
+      @message_length = HEADER_SIZE
+      @data_length = 0
+      @request_id = (@@class_req_id += 1)
+      @response_id = 0
+      @buf = ByteBuffer.new
+
+      @buf.put_int(16)      # holder for length
+      @buf.put_int(@request_id)
+      @buf.put_int(0)       # response_to
+      @buf.put_int(op)
     end
+
+    def write_int(i)
+      @buf.put_int(i)
+      update_message_length
+    end
+
+    def write_long(i)
+      @buf.put_long(i)
+      update_message_length
+    end
+
+    def write_string(s)
+      BSON.serialize_cstr(@buf, s)
+      update_message_length
+    end
+
+    def write_doc(hash, check_keys=false)
+      @buf.put_array(BSON.new.serialize(hash, check_keys).to_a)
+      update_message_length
+    end
+
+    def to_a
+      @buf.to_a
+    end
+
+    def dump
+      @buf.dump
+    end
+
+    # Do not call. Private, but kept public for testing.
+    def update_message_length
+      pos = @buf.position
+      @buf.put_int(@buf.size, 0)
+      @buf.position = pos
+    end
+
   end
 end

data/lib/mongo/message/message_header.rb

@@ -16,35 +16,30 @@
 
 require 'mongo/util/byte_buffer'
 
-module XGen
-  module Mongo
-    module Driver
+module Mongo
 
-      class MessageHeader
+  class MessageHeader
 
-        HEADER_SIZE = 16
+    HEADER_SIZE = 16
 
-        def initialize()
-          @buf = ByteBuffer.new
-        end
+    def initialize()
+      @buf = ByteBuffer.new
+    end
 
-        def read_header(db)
-          @buf.rewind
-          @buf.put_array(db.receive_full(HEADER_SIZE).unpack("C*"))
-          raise "Short read for DB response header: expected #{HEADER_SIZE} bytes, saw #{@buf.size}" unless @buf.size == HEADER_SIZE
-          @buf.rewind
-          @size = @buf.get_int
-          @request_id = @buf.get_int
-          @response_to = @buf.get_int
-          @op = @buf.get_int
-          self
-        end
+    def read_header(db)
+      @buf.rewind
+      @buf.put_array(db.receive_full(HEADER_SIZE).unpack("C*"))
+      raise "Short read for DB response header: expected #{HEADER_SIZE} bytes, saw #{@buf.size}" unless @buf.size == HEADER_SIZE
+      @buf.rewind
+      @size = @buf.get_int
+      @request_id = @buf.get_int
+      @response_to = @buf.get_int
+      @op = @buf.get_int
+      self
+    end
 
-        def dump
-          @buf.dump
-        end
-      end
+    def dump
+      @buf.dump
     end
   end
 end
-

data/lib/mongo/message/msg_message.rb

@@ -17,17 +17,13 @@
 require 'mongo/message/message'
 require 'mongo/message/opcodes'
 
-module XGen
-  module Mongo
-    module Driver
+module Mongo
 
-      class MsgMessage < Message
+  class MsgMessage < Message
 
-        def initialize(msg)
-          super(OP_MSG)
-          write_string(msg)
-        end
-      end
+    def initialize(msg)
+      super(OP_MSG)
+      write_string(msg)
     end
   end
 end

data/lib/mongo/message/opcodes.rb

@@ -14,19 +14,14 @@
 # limitations under the License.
 # ++
 
-module XGen
-  module Mongo
-    module Driver
-      OP_REPLY = 1              # reply. responseTo is set.
-      OP_MSG = 1000             # generic msg command followed by a string
-      OP_UPDATE = 2001          # update object
-      OP_INSERT = 2002
-      # GET_BY_OID = 2003
-      OP_QUERY = 2004
-      OP_GET_MORE = 2005
-      OP_DELETE = 2006
-      OP_KILL_CURSORS = 2007
-    end
-  end
+module Mongo
+  OP_REPLY = 1              # reply. responseTo is set.
+  OP_MSG = 1000             # generic msg command followed by a string
+  OP_UPDATE = 2001          # update object
+  OP_INSERT = 2002
+  # GET_BY_OID = 2003
+  OP_QUERY = 2004
+  OP_GET_MORE = 2005
+  OP_DELETE = 2006
+  OP_KILL_CURSORS = 2007
 end
-

data/lib/mongo/message/query_message.rb

@@ -18,60 +18,56 @@ require 'mongo/message/message'
 require 'mongo/message/opcodes'
 require 'mongo/util/ordered_hash'
 
-module XGen
-  module Mongo
-    module Driver
+module Mongo
 
-      class QueryMessage < Message
+  class QueryMessage < Message
 
-        attr_reader :query
+    attr_reader :query
 
-        def initialize(db_name, collection_name, query)
-          super(OP_QUERY)
-          @query = query
-          write_int(0)
-          write_string("#{db_name}.#{collection_name}")
-          write_int(query.number_to_skip)
-          write_int(-query.number_to_return) # Negative means hard limit
-          sel = query.selector
-          if query.contains_special_fields
-            sel = OrderedHash.new
-            sel['query'] = query.selector
-            if query.order_by && query.order_by.length > 0
-              sel['orderby'] = case query.order_by
+    def initialize(db_name, collection_name, query)
+      super(OP_QUERY)
+      @query = query
+      write_int(0)
+      write_string("#{db_name}.#{collection_name}")
+      write_int(query.number_to_skip)
+      write_int(-query.number_to_return) # Negative means hard limit
+      sel = query.selector
+      if query.contains_special_fields
+        sel = OrderedHash.new
+        sel['query'] = query.selector
+        if query.order_by && query.order_by.length > 0
+          sel['orderby'] = case query.order_by
+                           when String
+                             {query.order_by => 1}
+                           when Array
+                             h = OrderedHash.new
+                             query.order_by.each { |ob|
+                               case ob
                                when String
-                                 {query.order_by => 1}
-                               when Array
-                                 h = OrderedHash.new
-                                 query.order_by.each { |ob|
-                                   case ob
-                                   when String
-                                     h[ob] = 1
-                                   when Hash # should have one entry; will handle all
-                                     ob.each { |k,v| h[k] = v }
-                                   else
-                                     raise "illegal query order_by value #{query.order_by.inspect}"
-                                   end
-                                 }
-                                 h
-                               when Hash # Should be an ordered hash, but this message doesn't care
-                                 query.order_by
+                                 h[ob] = 1
+                               when Hash # should have one entry; will handle all
+                                 ob.each { |k,v| h[k] = v }
                                else
-                                 raise "illegal order_by: is a #{query.order_by.class.name}, must be String, Array, Hash, or OrderedHash"
+                                 raise "illegal query order_by value #{query.order_by.inspect}"
                                end
-            end
-            sel['$hint'] = query.hint if query.hint && query.hint.length > 0
-            sel['$explain'] = true if query.explain
-            sel['$snapshot'] = true if query.snapshot
-          end
-          write_doc(sel)
-          write_doc(query.fields) if query.fields
-        end
-
-        def first_key(key)
-          @first_key = key
+                             }
+                             h
+                           when Hash # Should be an ordered hash, but this message doesn't care
+                             query.order_by
+                           else
+                             raise "illegal order_by: is a #{query.order_by.class.name}, must be String, Array, Hash, or OrderedHash"
+                           end
         end
+        sel['$hint'] = query.hint if query.hint && query.hint.length > 0
+        sel['$explain'] = true if query.explain
+        sel['$snapshot'] = true if query.snapshot
       end
+      write_doc(sel)
+      write_doc(query.fields) if query.fields
+    end
+
+    def first_key(key)
+      @first_key = key
     end
   end
 end

data/lib/mongo/message/remove_message.rb

@@ -17,20 +17,16 @@
 require 'mongo/message/message'
 require 'mongo/message/opcodes'
 
-module XGen
-  module Mongo
-    module Driver
+module Mongo
 
-      class RemoveMessage < Message
+  class RemoveMessage < Message
 
-        def initialize(db_name, collection_name, sel)
-          super(OP_DELETE)
-          write_int(0)
-          write_string("#{db_name}.#{collection_name}")
-          write_int(0)              # flags?
-          write_doc(sel)
-        end
-      end
+    def initialize(db_name, collection_name, sel)
+      super(OP_DELETE)
+      write_int(0)
+      write_string("#{db_name}.#{collection_name}")
+      write_int(0)              # flags?
+      write_doc(sel)
     end
   end
 end