em-mongo 0.2.4 → 0.2.6

data/lib/em-mongo/collection.rb

@@ -31,6 +31,11 @@ module EM::Mongo
       obj
     end
 
+    def update(selector, updater, opts={})
+      @connection.update(@name, selector, updater, opts)
+      true
+    end
+
     def remove(obj = {})
       @connection.delete(@name, obj)
       true

data/lib/em-mongo/connection.rb

@@ -1,8 +1,9 @@
 module EM::Mongo
-  DEFAULT_IP   = "127.0.0.1"
-  DEFAULT_PORT = 27017
-  DEFAULT_DB   = "db"
-  DEFAULT_NS   = "ns"
+  DEFAULT_IP         = "127.0.0.1"
+  DEFAULT_PORT       = 27017
+  DEFAULT_DB         = "db"
+  DEFAULT_NS         = "ns"
+  DEFAULT_QUERY_DOCS = 101
 
   module EMConnection
     class Error < Exception; 
@@ -33,12 +34,6 @@ module EM::Mongo
       @is_connected
     end
 
-    # XXX RMongo interface
-    def collection(db = DEFAULT_DB, ns = DEFAULT_NS)
-      raise "Not connected" if not connected?
-      EM::Mongo::Collection.new(db, ns, self)
-    end
-
     def new_request_id
       @request_id += 1
     end
@@ -77,6 +72,23 @@ module EM::Mongo
       send_command(message.to_s, req_id)
     end
 
+    def update(collection_name, selector, document, options)
+      message = BSON::ByteBuffer.new([0, 0, 0, 0])
+      BSON::BSON_RUBY.serialize_cstr(message, collection_name)
+
+      flags  = 0
+      flags += 1 if options[:upsert]
+      flags += 2 if options[:multi]
+      message.put_int(flags)
+
+      message.put_array(BSON::BSON_CODER.serialize(selector, false, true).to_a)
+      message.put_array(BSON::BSON_CODER.serialize(document, true, true).to_a) 
+
+      req_id = new_request_id
+      message.prepend!(message_headers(OP_UPDATE, req_id, message))
+      send_command(message.to_s, req_id)
+    end
+
     def delete(collection_name, selector)
       message = BSON::ByteBuffer.new([0, 0, 0, 0])
       BSON::BSON_RUBY.serialize_cstr(message, collection_name)
@@ -102,20 +114,21 @@ module EM::Mongo
 
     # EM hooks
     def initialize(options={})
-      @request_id = 0
-      @responses = {}
-      @is_connected = false
-      @host = options[:host] || DEFAULT_IP
-      @port = options[:port] || DEFAULT_PORT
+      @request_id    = 0
+      @responses     = {}
+      @is_connected  = false
+      @host          = options[:host] || DEFAULT_IP
+      @port          = options[:port] || DEFAULT_PORT
+      @on_unbind     = options[:unbind_cb] || proc {} 
 
       @on_close = proc {
-        raise Error, "could not connect to server #{@host}:#{@port}"
+        raise Error, "failure with mongodb server #{@host}:#{@port}"
       }
       timeout options[:timeout] if options[:timeout]
-      errback{ @on_close.call }
+      errback { @on_close.call }
     end
 
-    def self.connect(host = DEFAULT_IP, port = DEFAUL_PORT, timeout = nil)
+    def self.connect(host = DEFAULT_IP, port = DEFAULT_PORT, timeout = nil)
       opt = {:host => host, :port => port, :timeout => timeout}
       EM.connect(host, port, self, opt)
     end
@@ -123,26 +136,28 @@ module EM::Mongo
     def connection_completed
       @buffer = BSON::ByteBuffer.new
       @is_connected = true
-      @on_close = proc{
-      }
       succeed
     end
 
 
     def message_received?
       size = @buffer.get_int
+      #@buffer.put_int(size, -1)
       @buffer.rewind
-      @buffer.size >= size-4 ? true : false
+
+      if @buffer.size >= size-4
+        true
+      else 
+        false
+      end
     end
 
     def receive_data(data)
 
-      @buffer.put_array(data.unpack('C*'))
-      @buffer.rewind
+      @buffer.append!(BSON::ByteBuffer.new(data.unpack('C*')))
       return if @buffer.size < STANDARD_HEADER_SIZE
 
       if message_received?
-
         # Header
         header = BSON::ByteBuffer.new
         header.put_array(@buffer.get(STANDARD_HEADER_SIZE))
@@ -181,12 +196,12 @@ module EM::Mongo
 
           if size > @buffer.size
             @buffer = ''
-            raise "Buffer Overflow: Failed to parse buffer"
+            raise "Buffer Overflow: Failed to parse document buffer: size: #{size}, expected: #{@buffer.size}"
           end
           buf.put_array(@buffer.get(size-4), 4)
 
           buf.rewind
-          BSON::BSON_CODER.deserialize(buf)
+          BSON::BSON_RUBY.deserialize(buf)
         end
 
         @buffer.clear
@@ -200,19 +215,16 @@ module EM::Mongo
     end
 
     def send_data data
-      log "send_data:#{data.size}"#, data
       super data
     end
 
     def unbind
-      log "unbind"
       @is_connected = false
-      @on_close.call unless $!
+      @on_unbind.call
     end
 
     def close
-      log "close"
-      @on_close = proc{ yield if block_given? }
+      @on_close = proc { yield if block_given? }
       if @responses.empty?
         close_connection
       else
@@ -223,8 +235,7 @@ module EM::Mongo
     private
 
     def log *args
-      return
-      pp args
+      puts args
       puts
     end
 
@@ -252,15 +263,10 @@ module EM::Mongo
     def initialize(host = DEFAULT_IP, port = DEFAULT_PORT, timeout = nil)
       @em_connection = EMConnection.connect(host, port, timeout) 
       @db = {}
-      self
     end
     
     def db(name = DEFAULT_DB)
-      @db[name] = EM::Mongo::Database.new(name, @em_connection)
-    end
-
-    def collection(db = DEFAULT_DB, ns = DEFAULT_NS)
-      @em_connection.collection(db, ns)
+      @db[name] ||= EM::Mongo::Database.new(name, @em_connection)
     end
 
     def close

data/lib/em-mongo.rb

@@ -2,13 +2,12 @@
 require "eventmachine"
 begin; require "bson_ext"; rescue LoadError; require "bson"; end
 
-
 module EM::Mongo
 
   module Version
     MAJOR = 0
     MINOR = 2
-    TINY  = 4
+    TINY  = 6
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 

data/spec/collection_spec.rb

@@ -63,6 +63,31 @@ describe EMMongo::Collection do
     end
   end
 
+  it 'should find large sets of objects' do
+    EM::Spec::Mongo.collection do |collection|
+      (0..1500).each { |n| collection.insert({n.to_s => n.to_s}) }
+      collection.find do |res|
+        res.size.should == EM::Mongo::DEFAULT_QUERY_DOCS
+        collection.find({}, {:limit => 1500}) do |res|
+          res.size.should == 1500
+          EM::Spec::Mongo.close
+        end
+      end
+    end
+  end
+
+  it 'should update an object' do
+    EM::Spec::Mongo.collection do |collection|
+      obj = collection.insert('hello' => 'world')
+      collection.update({'hello' => 'world'}, {'hello' => 'newworld'})
+      collection.find({'_id' => obj['_id']},{}) do |res|
+        res[0]['hello'].should == 'newworld'
+        EM::Spec::Mongo.close
+      end
+    end
+  end
+
+
   it 'should remove an object' do
     EM::Spec::Mongo.collection do |collection|
       obj = collection.insert('hello' => 'world')

data/spec/connection_spec.rb

@@ -16,11 +16,11 @@ describe EMMongo::Connection do
   it 'should close' do
     em do
       connection = EMMongo::Connection.new
-      EM.next_tick do
+      EM.add_timer(1) do
         connection.connected?.should == true
         connection.close
       end
-      EM.add_timer(1) do
+      EM.add_timer(2) do
         EM.next_tick do
           connection.connected?.should == false
           done
@@ -29,14 +29,6 @@ describe EMMongo::Connection do
     end 
   end
 
-  # Support the old RMongo interface for now
-  it 'should instantiate a Collection' do
-    EM::Spec::Mongo.connection do |connection|
-      connection.collection.is_a?(EM::Mongo::Collection).should == true
-      EM::Spec::Mongo.close
-    end 
-  end
-
   it 'should instantiate a Databse' do
     EM::Spec::Mongo.connection do |connection|
       db1 = connection.db

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - bcg