em-mongo 0.4.1 → 0.4.2

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/em-mongo/connection.rb

@@ -154,7 +154,7 @@ module EM::Mongo
 
     def receive_data(data)
 
-      @buffer.append!(BSON::ByteBuffer.new(data.unpack('C*')))
+      @buffer.append!(data)
 
       @buffer.rewind
       while message_received?(@buffer)
@@ -165,7 +165,7 @@ module EM::Mongo
 
       if @buffer.more?
         remaining_bytes= @buffer.size-@buffer.position
-        @buffer = BSON::ByteBuffer.new(@buffer.get(remaining_bytes))
+        @buffer = BSON::ByteBuffer.new(@buffer.to_s[@buffer.position,remaining_bytes])
         @buffer.rewind
       else
         @buffer.clear

data/lib/em-mongo/cursor.rb

@@ -299,7 +299,7 @@ module EM::Mongo
     # efficient to retrieve documents as you need them by iterating over the cursor.
     #
     # @return [EM::Mongo::RequestResponse] Calls back with an array of documents.
-    def to_a
+    def defer_as_a
       response = RequestResponse.new
       items = []
       self.each do |doc,err|
@@ -314,6 +314,9 @@ module EM::Mongo
       response
     end
 
+    # XXX to_a is confusing but we will leave it for now
+    alias to_a defer_as_a
+
     # Get the explain plan for this cursor.
     #
     # @return [EM::Mongo::RequestResponse] Calls back with a document containing the explain plan for this cursor.
@@ -534,4 +537,4 @@ module EM::Mongo
       end
     end
   end
-end
+end

data/lib/em-mongo/database.rb

@@ -52,7 +52,7 @@ module EM::Mongo
     # @return [EM::Mongo::RequestResponse]
     def collection_names
       response = RequestResponse.new
-      name_resp = collections_info.to_a
+      name_resp = collections_info.defer_as_a
       name_resp.callback do |docs|
         names = docs.collect{ |doc| doc['name'] || '' }
         names = names.delete_if {|name| name.index(self.name).nil? || name.index('$')}
@@ -200,7 +200,7 @@ module EM::Mongo
     def index_information(collection_name)
       response = RequestResponse.new
       sel  = {:ns => full_collection_name(collection_name)}
-      idx_resp = Cursor.new(self.collection(SYSTEM_INDEX_COLLECTION), :selector => sel).to_a
+      idx_resp = Cursor.new(self.collection(SYSTEM_INDEX_COLLECTION), :selector => sel).defer_as_a
       idx_resp.callback do |indexes|
         info = indexes.inject({}) do |info, index|
           info[index['name']] = index

data/lib/em-mongo/prev.rb

@@ -6,7 +6,7 @@ module EM
       def find(selector={}, opts={}, &blk)
         raise "find requires a block" if not block_given?
 
-        new_find(selector, opts).to_a.callback do |docs|
+        new_find(selector, opts).defer_as_a.callback do |docs|
           blk.call(docs)
         end
       end
@@ -38,7 +38,7 @@ module EM
 
       def find(collection_name, skip, limit, order, query, fields, &blk)
         db_name, col_name = db_and_col_name(collection_name)
-        db(db_name).collection(col_name).find(query, :skip=>skip,:limit=>limit,:order=>order,:fields=>fields).to_a.callback do |docs|
+        db(db_name).collection(col_name).find(query, :skip=>skip,:limit=>limit,:order=>order,:fields=>fields).defer_as_a.callback do |docs|
           yield docs if block_given?
         end
       end
@@ -50,4 +50,4 @@ module EM
 
     end
   end
-end
+end

data/lib/em-mongo/server_response.rb

@@ -21,12 +21,15 @@ module EM::Mongo
       @number_returned  = buffer.get_int
 
       # Documents
-      @docs = (1..number_returned).map do
+      pos = buffer.position
+      @docs = (1..@number_returned).map do
         size= @connection.peek_size(buffer)
-        buf = buffer.get(size)
-        BSON::BSON_CODER.deserialize(buf)
+        doc = BSON::BSON_CODER.deserialize(buffer.to_s[pos,size])
+        pos += size
+        buffer.position = pos
+        doc
       end
     end
 
   end
-end
+end

data/spec/integration/collection_spec.rb

@@ -32,7 +32,7 @@ describe EMMongo::Collection do
       @conn, @coll = connection_and_collection
 
       @coll.insert("hello" => 'world')
-      @coll.find({"hello" => "world"},{}).to_a.callback do |res|
+      @coll.find({"hello" => "world"},{}).defer_as_a.callback do |res|
         res.size.should >= 1
         res[0]["hello"].should == "world"
         done
@@ -54,7 +54,7 @@ describe EMMongo::Collection do
       @conn, @coll = connection_and_collection
 
       @coll.insert('hello' => 'world')
-      @coll.find({:hello => "world"},{}).to_a.callback do |res|
+      @coll.find({:hello => "world"},{}).defer_as_a.callback do |res|
         res.size.should >= 1
         res[0]["hello"].should == "world"
         done
@@ -65,7 +65,7 @@ describe EMMongo::Collection do
       @conn, @coll = connection_and_collection
 
       id = @coll.insert('hello' => 'world')
-      @coll.find({:_id => id},{}).to_a.callback do |res|
+      @coll.find({:_id => id},{}).defer_as_a.callback do |res|
         res.size.should >= 1
         res[0]['hello'].should == "world"
         done
@@ -77,7 +77,7 @@ describe EMMongo::Collection do
 
       @coll.insert('one' => 'one')
       @coll.insert('two' => 'two')
-      @coll.find.to_a.callback do |res|
+      @coll.find.defer_as_a.callback do |res|
         res.size.should >= 2
         done
       end
@@ -90,14 +90,14 @@ describe EMMongo::Collection do
       @coll.insert(:name => 'three', :position => 2)
       @coll.insert(:name => 'two', :position => 1)
 
-      @coll.find({}, {:order => 'position'}).to_a.callback do |res|
+      @coll.find({}, {:order => 'position'}).defer_as_a.callback do |res|
         res[0]["name"].should == 'one'
         res[1]["name"].should == 'two'
         res[2]["name"].should == 'three'
         done
       end
 
-      @coll.find({}, {:order => [:position, :desc]}).to_a.callback do |res|
+      @coll.find({}, {:order => [:position, :desc]}).defer_as_a.callback do |res|
         res[0]["name"].should == 'three'
         res[1]["name"].should == 'two'
         res[2]["name"].should == 'one'
@@ -141,7 +141,7 @@ describe EMMongo::Collection do
         @coll.insert({'num' => num, 'word' => word})
       end
 
-      @coll.find({'num' => {'$in' => [1,3,5]}}).to_a.callback do |res|
+      @coll.find({'num' => {'$in' => [1,3,5]}}).defer_as_a.callback do |res|
         res.size.should == 3
         res.map{|r| r['num'] }.sort.should == [1,3,5]
         done
@@ -155,7 +155,7 @@ describe EMMongo::Collection do
         @coll.insert('num' => num, 'word' => word)
       end
 
-      @coll.find({'num' => {'$gt' => 3}}).to_a.callback do |res|
+      @coll.find({'num' => {'$gt' => 3}}).defer_as_a.callback do |res|
         res.size.should == 6
         res.map{|r| r['num'] }.sort.should == [4,5,6,7,8,9]
         done
@@ -202,7 +202,7 @@ describe EMMongo::Collection do
 
       t = Time.now.utc.freeze
       @coll.insert('date' => t)
-      @coll.find.to_a.callback do |res|
+      @coll.find.defer_as_a.callback do |res|
         res[0]['date'].to_s.should == t.to_s
         done
       end
@@ -222,7 +222,7 @@ describe EMMongo::Collection do
         'regex' => /abc$/ix
       }
       retobj = @coll.insert(obj)
-      @coll.find({:_id => obj[:_id]}).to_a.callback do |ret|
+      @coll.find({:_id => obj[:_id]}).defer_as_a.callback do |ret|
         ret.size.should == 1
         ret[0].each_key do |key|
           next if key == '_id'
@@ -262,7 +262,7 @@ describe EMMongo::Collection do
 
       id = @coll.insert('hello' => 'world')
       @coll.update({'hello' => 'world'}, {'hello' => 'newworld'})
-      @coll.find({:_id => id},{}).to_a.callback do |res|
+      @coll.find({:_id => id},{}).defer_as_a.callback do |res|
         res[0]['hello'].should == 'newworld'
         done
       end
@@ -273,7 +273,7 @@ describe EMMongo::Collection do
 
       id = @coll.insert('hello' => 'world')
       @coll.update({'hello' => 'world'}, {'$inc' => {'count' => 1}})
-      @coll.find({:_id => id},{}).to_a.callback do |res|
+      @coll.find({:_id => id},{}).defer_as_a.callback do |res|
         res.first['hello'].should == 'world'
         res.first['count'].should == 1
         done
@@ -301,7 +301,7 @@ describe EMMongo::Collection do
     it "should insert a record when no id is present" do
       @conn, @coll = connection_and_collection
       id = @coll.save("x" => 1)
-      @coll.find("x" => 1).to_a.callback do |result|
+      @coll.find("x" => 1).defer_as_a.callback do |result|
         result[0]["_id"].should == id
         done
       end
@@ -313,7 +313,7 @@ describe EMMongo::Collection do
       id = @coll.save(doc)
       doc["x"] = 2
       @coll.save(doc).should be_true
-      @coll.find().to_a.callback do |result|
+      @coll.find().defer_as_a.callback do |result|
         result.count.should == 1
         result[0]["x"].should == 2
         done
@@ -342,7 +342,7 @@ describe EMMongo::Collection do
 
       id = @coll.insert('hello' => 'world')
       @coll.remove(:_id => id)
-      @coll.find({'hello' => "world"}).to_a.callback do |res|
+      @coll.find({'hello' => "world"}).defer_as_a.callback do |res|
         res.size.should == 0
         done
       end
@@ -354,7 +354,7 @@ describe EMMongo::Collection do
       @coll.insert('one' => 'one')
       @coll.insert('two' => 'two')
       @coll.remove
-      @coll.find.to_a.callback do |res|
+      @coll.find.defer_as_a.callback do |res|
         res.size.should == 0
         done
       end

data/spec/integration/cursor_spec.rb

@@ -34,7 +34,7 @@ describe EMMongo::Cursor do
       @coll.save(all[-1])
     end
 
-    cursor.limit(5).skip(3).sort("x",1).to_a.callback do |results|
+    cursor.limit(5).skip(3).sort("x",1).defer_as_a.callback do |results|
       all.slice(3...8).each_with_index do |item,idx|
         results[idx]["x"].should == item["x"]
       end
@@ -49,7 +49,7 @@ describe EMMongo::Cursor do
     1501.times do |i|
       @coll.insert(i.to_s => i.to_s)
     end
-    cursor.limit(1500).to_a.callback do |docs|
+    cursor.limit(1500).defer_as_a.callback do |docs|
       docs.length.should == 1500
       done
     end
@@ -80,12 +80,12 @@ describe EMMongo::Cursor do
     100.times do |i|
       @coll.save("x" => 1)
     end
-    cursor.to_a.callback do |r1|
+    cursor.defer_as_a.callback do |r1|
       r1.length.should == 100
-      cursor.to_a.callback do |r2|
+      cursor.defer_as_a.callback do |r2|
         r2.length.should == 0
         cursor.rewind!
-        cursor.to_a.callback do |r3|
+        cursor.defer_as_a.callback do |r3|
           r3.length.should == 100
           done
         end
@@ -101,7 +101,7 @@ describe EMMongo::Cursor do
       1000.times do |i|
         @coll.save("x" => 1)
       end
-      cursor.to_a.callback do |results|
+      cursor.defer_as_a.callback do |results|
         results.length.should == 1000
         done
       end
@@ -290,14 +290,14 @@ describe EMMongo::Cursor do
       end
     end
 
-    describe "to_a" do
+    describe "defer_as_a" do
       it "should return an array of all documents in a query" do
         @conn, @coll = connection_and_collection
         5.times do |i|
           @coll.insert("x" => i)
         end
         cursor = EM::Mongo::Cursor.new(@coll).sort("x",1)
-        cursor.to_a.callback do |docs|
+        cursor.defer_as_a.callback do |docs|
           docs.length.should == 5
           5.times do |i|
             docs[i]["x"].should == i

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: em-mongo
 version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 1
-  version: 0.4.1
+  prerelease: 
+  version: 0.4.2
 platform: ruby
 authors: 
 - bcg
@@ -16,8 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-01 00:00:00 -05:00
-default_executable: 
+date: 2010-12-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
@@ -27,11 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 12
-        - 10
         version: 0.12.10
   type: :runtime
   version_requirements: *id001
@@ -43,30 +32,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 1
-        - 3
         version: 1.1.3
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bson_ext
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 1
-        - 3
-        version: 1.1.3
-  type: :runtime
-  version_requirements: *id003
 description: EventMachine driver for MongoDB.
 email: brenden.grace@gmail.com
 executables: []
@@ -94,7 +62,6 @@ files:
 - spec/integration/cursor_spec.rb
 - spec/integration/database_spec.rb
 - spec/integration/request_response_spec.rb
-has_rdoc: true
 homepage: http://github.com/bcg/em-mongo
 licenses: []
 
@@ -108,23 +75,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: em-mongo
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: An EventMachine driver for MongoDB.