em-mongo 0.2.8 → 0.2.9

data/lib/em-mongo/connection.rb

@@ -59,7 +59,6 @@ module EM::Mongo
       request_id
     end
 
-
     def insert(collection_name, documents)
       message = BSON::ByteBuffer.new([0, 0, 0, 0])
       BSON::BSON_RUBY.serialize_cstr(message, collection_name)
@@ -139,79 +138,69 @@ module EM::Mongo
       succeed
     end
 
+    def message_received?(buffer)
+      x= remaining_bytes(@buffer)
+      x > STANDARD_HEADER_SIZE && x >= peek_size(@buffer)
+    end
 
-    def message_received?
-      size = @buffer.get_int
-      #@buffer.put_int(size, -1)
-      @buffer.rewind
-
-      @buffer.size >= size-4
+    def remaining_bytes(buffer)
+      buffer.size-buffer.position
+    end
+    
+    def peek_size(buffer)
+      position= buffer.position
+      size= buffer.get_int
+      buffer.position= position
+      size
     end
 
     def receive_data(data)
 
       @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))
-        unless header.size == STANDARD_HEADER_SIZE
-          raise "Short read for DB header: " +
-            "expected #{STANDARD_HEADER_SIZE} bytes, saw #{header.size}"
-        end
-        header.rewind
-        size        = header.get_int
-        request_id  = header.get_int
-        response_to = header.get_int
-        op          = header.get_int
-
-        # Response Header
-        response_header = BSON::ByteBuffer.new
-        response_header.put_array(@buffer.get(RESPONSE_HEADER_SIZE))
-        if response_header.length != RESPONSE_HEADER_SIZE
-          raise "Short read for DB response header; " +
-            "expected #{RESPONSE_HEADER_SIZE} bytes, saw #{response_header.length}"
-        end
-
-        response_header.rewind
-        result_flags     = response_header.get_int
-        cursor_id        = response_header.get_long
-        starting_from    = response_header.get_int
-        number_remaining = response_header.get_int
-
-        # Documents
-        docs = (1..number_remaining).map do |n|
-
-          buf = BSON::ByteBuffer.new
-          buf.put_int(@buffer.get_int)
-
-          buf.rewind
-          size = buf.get_int
-
-          if size > @buffer.size
-            @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)
-        end
+      
+      @buffer.rewind
+      while message_received?(@buffer)
+        response_to, docs= next_response
+        callback = @responses.delete(response_to)
+        callback.call(docs) if callback
+      end
 
+      if @buffer.more?
+        remaining_bytes= @buffer.size-@buffer.position
+        @buffer = BSON::ByteBuffer.new(@buffer.get(remaining_bytes))
+        @buffer.rewind
+      else
         @buffer.clear
-
-        if cb = @responses.delete(response_to)
-          cb.call(docs)
-        end
-        close_connection if @close_pending and @responses.size == 0 
       end
+
+      close_connection if @close_pending && @responses.empty? 
       
     end
-
-    def send_data data
-      super data
+    
+    def next_response()
+      
+      # Header
+      size        = @buffer.get_int
+      request_id  = @buffer.get_int
+      response_to = @buffer.get_int
+      op          = @buffer.get_int
+      #puts "message header #{size} #{request_id} #{response_to} #{op}"
+
+      # Response Header
+      result_flags     = @buffer.get_int
+      cursor_id        = @buffer.get_long
+      starting_from    = @buffer.get_int
+      number_returned  = @buffer.get_int
+      #puts "response header #{result_flags} #{cursor_id} #{starting_from} #{number_returned}"
+
+      # Documents
+      docs = number_returned.times.collect do
+        size= peek_size(@buffer)
+        buf = BSON::ByteBuffer.new(@buffer.get(size))
+        BSON::BSON_CODER.deserialize(buf)
+      end
+      
+      [response_to,docs]
     end
 
     def unbind
@@ -228,14 +217,8 @@ module EM::Mongo
       end
     end
 
-    private
-
-    def log *args
-      puts args
-      puts
-    end
-
   end
+
 end
 
 # Make EM::Mongo look like mongo-ruby-driver

data/lib/em-mongo.rb

@@ -7,7 +7,7 @@ module EM::Mongo
   module Version
     MAJOR = 0
     MINOR = 2
-    TINY  = 8
+    TINY  = 9
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 

data/spec/collection_spec.rb

@@ -4,7 +4,7 @@ describe EMMongo::Collection do
   include EM::SpecHelper
 
   before(:all) do
-    @numbers = { 
+    @numbers = {
       1 => 'one',
       2 => 'two',
       3 => 'three',
@@ -32,7 +32,7 @@ describe EMMongo::Collection do
 
   it 'should find an object by attribute' do
     EM::Spec::Mongo.collection do |collection|
-      collection.insert("hello" => 'world') 
+      collection.insert("hello" => 'world')
       r = collection.find({"hello" => "world"},{}) do |res|
         res.size.should >= 1
         res[0]["hello"].should == "world"
@@ -43,7 +43,7 @@ describe EMMongo::Collection do
 
   it 'should find an object by id' do
     EM::Spec::Mongo.collection do |collection|
-      obj = collection.insert('hello' => 'world') 
+      obj = collection.insert('hello' => 'world')
       collection.find({'_id' => obj['_id']},{}) do |res|
         res.size.should >= 1
         res[0]['hello'].should == "world"
@@ -153,7 +153,7 @@ describe EMMongo::Collection do
         end
         EM::Spec::Mongo.close
       end
-      
+
     end
   end
 
@@ -201,4 +201,19 @@ describe EMMongo::Collection do
     end
   end
 
+  it 'should handle multiple pending queries' do
+    EM::Spec::Mongo.collection do |collection|
+      id = collection.insert("foo" => "bar")['_id']
+      received = 0
+
+      10.times do |n|
+        collection.first("_id" => id) do |res|
+          received += 1
+          EM::Spec::Mongo.close if received == 10
+        end
+      end
+
+    end
+  end
+
 end

data/spec/connection_spec.rb

@@ -7,37 +7,41 @@ describe EMMongo::Connection do
     em do
       connection = EMMongo::Connection.new
       EM.next_tick do
-        connection.connected?.should == true
+        connection.should be_connected
         done
       end
-    end    
+    end
   end
-  
+
   it 'should close' do
     em do
       connection = EMMongo::Connection.new
+
       EM.add_timer(1) do
-        connection.connected?.should == true
+        connection.should be_connected
         connection.close
       end
+
       EM.add_timer(2) do
         EM.next_tick do
-          connection.connected?.should == false
+          connection.should_not be_connected
           done
         end
       end
-    end 
+    end
   end
 
-  it 'should instantiate a Databse' do
+  it 'should instantiate a Database' do
     EM::Spec::Mongo.connection do |connection|
       db1 = connection.db
-      db1.is_a?(EM::Mongo::Database).should == true
+      db1.should be_kind_of(EM::Mongo::Database)
+
       db2 = connection.db('db2')
-      db2.is_a?(EM::Mongo::Database).should == true
+      db2.should be_kind_of(EM::Mongo::Database)
       db2.should_not == db1
+
       EM::Spec::Mongo.close
-    end 
+    end
   end
 
 

data/spec/spec_helper.rb

@@ -40,3 +40,4 @@ module EM
   end
 end
 
+$stdout.sync = true

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 8
-  version: 0.2.8
+  - 9
+  version: 0.2.9
 platform: ruby
 authors: 
 - bcg