em-mongo 0.2.10 → 0.2.11

data/lib/em-mongo/connection.rb

@@ -5,12 +5,14 @@ module EM::Mongo
   DEFAULT_NS         = "ns"
   DEFAULT_QUERY_DOCS = 101
 
-  module EMConnection
-    class Error < Exception; 
+  class EMConnection < EM::Connection
+    MAX_RETRIES = 5
+
+    class Error < Exception;
       class ConnectionNotBound
       end
     end
-    
+
     include EM::Deferrable
 
     RESERVED    = 0
@@ -20,7 +22,7 @@ module EM::Mongo
     OP_INSERT   = 2002
     OP_QUERY    = 2004
     OP_DELETE   = 2006
-    
+
     STANDARD_HEADER_SIZE = 16
     RESPONSE_HEADER_SIZE = 20
 
@@ -50,7 +52,6 @@ module EM::Mongo
     end
 
     def send_command(buffer, request_id, &blk)
-
       callback do
         send_data buffer
       end
@@ -81,7 +82,7 @@ module EM::Mongo
       message.put_int(flags)
 
       message.put_array(BSON::BSON_CODER.serialize(selector, true, true).to_a)
-      message.put_array(BSON::BSON_CODER.serialize(document, false, true).to_a) 
+      message.put_array(BSON::BSON_CODER.serialize(document, false, true).to_a)
 
       req_id = new_request_id
       message.prepend!(message_headers(OP_UPDATE, req_id, message))
@@ -114,11 +115,12 @@ module EM::Mongo
     # EM hooks
     def initialize(options={})
       @request_id    = 0
+      @retries       = 0
       @responses     = {}
       @is_connected  = false
       @host          = options[:host] || DEFAULT_IP
       @port          = options[:port] || DEFAULT_PORT
-      @on_unbind     = options[:unbind_cb] || proc {} 
+      @on_unbind     = options[:unbind_cb] || proc {}
 
       @on_close = proc {
         raise Error, "failure with mongodb server #{@host}:#{@port}"
@@ -127,14 +129,15 @@ module EM::Mongo
       errback { @on_close.call }
     end
 
-    def self.connect(host = DEFAULT_IP, port = DEFAULT_PORT, timeout = nil)
-      opt = {:host => host, :port => port, :timeout => timeout}
+    def self.connect(host = DEFAULT_IP, port = DEFAULT_PORT, timeout = nil, opts = nil)
+      opt = {:host => host, :port => port, :timeout => timeout}.merge(opts)
       EM.connect(host, port, self, opt)
     end
 
     def connection_completed
       @buffer = BSON::ByteBuffer.new
       @is_connected = true
+      @retries = 0
       succeed
     end
 
@@ -146,7 +149,7 @@ module EM::Mongo
     def remaining_bytes(buffer)
       buffer.size-buffer.position
     end
-    
+
     def peek_size(buffer)
       position= buffer.position
       size= buffer.get_int
@@ -157,7 +160,7 @@ module EM::Mongo
     def receive_data(data)
 
       @buffer.append!(BSON::ByteBuffer.new(data.unpack('C*')))
-      
+
       @buffer.rewind
       while message_received?(@buffer)
         response_to, docs= next_response
@@ -173,12 +176,12 @@ module EM::Mongo
         @buffer.clear
       end
 
-      close_connection if @close_pending && @responses.empty? 
-      
+      close_connection if @close_pending && @responses.empty?
+
     end
-    
+
     def next_response()
-      
+
       # Header
       size        = @buffer.get_int
       request_id  = @buffer.get_int
@@ -204,7 +207,20 @@ module EM::Mongo
 
     def unbind
       @is_connected = false
-      @on_unbind.call
+
+      # XXX do we need to fail the responses here?
+      @request_id = 0
+      @responses = {}
+
+      set_deferred_status(nil)
+
+      if @retries >= MAX_RETRIES
+        @on_unbind.call
+        return
+      end
+
+      @retries += 1
+      EM.add_timer(5) { reconnect(@host, @port) }
     end
 
     def close
@@ -238,11 +254,11 @@ module EM::Mongo
     end
   end
   class Connection
-    def initialize(host = DEFAULT_IP, port = DEFAULT_PORT, timeout = nil)
-      @em_connection = EMConnection.connect(host, port, timeout) 
+    def initialize(host = DEFAULT_IP, port = DEFAULT_PORT, timeout = nil, opts = {})
+      @em_connection = EMConnection.connect(host, port, timeout, opts)
       @db = {}
     end
-    
+
     def db(name = DEFAULT_DB)
       @db[name] ||= EM::Mongo::Database.new(name, @em_connection)
     end

data/spec/integration/collection_spec.rb

@@ -0,0 +1,219 @@
+require File.expand_path('spec_helper', File.dirname(__FILE__))
+
+describe EMMongo::Collection do
+  include EM::SpecHelper
+
+  before(:all) do
+    @numbers = {
+      1 => 'one',
+      2 => 'two',
+      3 => 'three',
+      4 => 'four',
+      5 => 'five',
+      6 => 'six',
+      7 => 'seven',
+      8 => 'eight',
+      9 => 'nine'
+    }
+  end
+
+  after(:all) do
+  end
+
+  it 'should insert an object' do
+    EM::Spec::Mongo.collection do |collection|
+      obj = collection.insert('hello' => 'world')
+      obj.keys.should include '_id'
+      obj['_id'].should be_a_kind_of String
+      obj['_id'].length.should == 24
+      EM::Spec::Mongo.close
+    end
+  end
+
+  it 'should find an object by attribute' do
+    EM::Spec::Mongo.collection do |collection|
+      collection.insert("hello" => 'world')
+      r = collection.find({"hello" => "world"},{}) do |res|
+        res.size.should >= 1
+        res[0]["hello"].should == "world"
+        EM::Spec::Mongo.close
+      end
+    end
+  end
+
+  it 'should find an object by id' do
+    EM::Spec::Mongo.collection do |collection|
+      obj = collection.insert('hello' => 'world')
+      collection.find({'_id' => obj['_id']},{}) do |res|
+        res.size.should >= 1
+        res[0]['hello'].should == "world"
+        EM::Spec::Mongo.close
+      end
+    end
+  end
+
+  it 'should find all objects' do
+    EM::Spec::Mongo.collection do |collection|
+      collection.insert('one' => 'one')
+      collection.insert('two' => 'two')
+      collection.find do |res|
+        res.size.should >= 2
+        EM::Spec::Mongo.close
+      end
+    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 update an object with $inc' do
+    EM::Spec::Mongo.collection do |collection|
+      obj = collection.insert('hello' => 'world')
+      collection.update({'hello' => 'world'}, {'$inc' => {'count' => 1}})
+      collection.find({'_id' => obj['_id']},{}) do |res|
+        res.first['hello'].should == 'world'
+        res.first['count'].should == 1
+        EM::Spec::Mongo.close
+      end
+    end
+  end
+
+  it 'should remove an object' do
+    EM::Spec::Mongo.collection do |collection|
+      obj = collection.insert('hello' => 'world')
+      collection.remove('_id' => obj['_id'])
+      collection.find({'hello' => "world"}) do |res|
+        res.size.should == 0
+        EM::Spec::Mongo.close
+      end
+    end
+  end
+
+  it 'should remove all objects' do
+    EM::Spec::Mongo.collection do |collection|
+      collection.insert('one' => 'one')
+      collection.insert('two' => 'two')
+      collection.remove
+      collection.find do |res|
+        res.size.should == 0
+        EM::Spec::Mongo.close
+      end
+    end
+  end
+
+  it 'should insert a Time' do
+    EM::Spec::Mongo.collection do |collection|
+      t = Time.now.utc.freeze
+      collection.insert('date' => t)
+      collection.find do |res|
+        res[0]['date'].to_s.should == t.to_s
+        EM::Spec::Mongo.close
+      end
+    end
+  end
+
+  it 'should insert a complex object' do
+    EM::Spec::Mongo.collection do |collection|
+      obj = {
+        'array' => [1,2,3],
+        'float' => 123.456,
+        'hash' => {'boolean' => true},
+        'nil' => nil,
+        'symbol' => :name,
+        'string' => 'hello world',
+        'time' => Time.now.to_f,
+        'regex' => /abc$/ix
+      }
+      retobj = collection.insert(obj)
+      collection.find({'_id' => obj['_id']}) do |ret|
+        ret.size.should == 1
+        ret[0].each_key do |key|
+          ret[0][key].should == obj[key]
+        end
+        EM::Spec::Mongo.close
+      end
+
+    end
+  end
+
+  it 'should find an object using nested properties' do
+    EM::Spec::Mongo.collection do |collection|
+      collection.insert({
+        'name' => 'Google',
+        'address' => {
+          'city' => 'Mountain View',
+          'state' => 'California'}
+      })
+
+      collection.first('address.city' => 'Mountain View') do |res|
+        res['name'].should == 'Google'
+        EM::Spec::Mongo.close
+      end
+    end
+  end
+
+  it 'should find objects with specific values' do
+    EM::Spec::Mongo.collection do |collection|
+      @numbers.each do |num, word|
+        collection.insert({'num' => num, 'word' => word})
+      end
+
+      collection.find({'num' => {'$in' => [1,3,5]}}) do |res|
+        res.size.should == 3
+        res.map{|r| r['num'] }.sort.should == [1,3,5]
+        EM::Spec::Mongo.close
+      end
+    end
+  end
+
+  it 'should find objects greater than something' do
+    EM::Spec::Mongo.collection do |collection|
+      @numbers.each do |num, word|
+        collection.insert('num' => num, 'word' => word)
+      end
+
+      collection.find({'num' => {'$gt' => 3}}) do |res|
+        res.size.should == 6
+        res.map{|r| r['num'] }.sort.should == [4,5,6,7,8,9]
+        EM::Spec::Mongo.close
+      end
+    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/integration/connection_spec.rb

@@ -0,0 +1,48 @@
+require File.expand_path('spec_helper', File.dirname(__FILE__))
+
+describe EMMongo::Connection do
+  include EM::SpecHelper
+
+  it 'should connect' do
+    em do
+      connection = EMMongo::Connection.new
+      EM.next_tick do
+        connection.should be_connected
+        done
+      end
+    end
+  end
+
+  it 'should close' do
+    em do
+      connection = EMMongo::Connection.new
+
+      EM.add_timer(1) do
+        connection.should be_connected
+        connection.close
+      end
+
+      EM.add_timer(2) do
+        EM.next_tick do
+          connection.should_not be_connected
+          done
+        end
+      end
+    end
+  end
+
+  it 'should instantiate a Database' do
+    EM::Spec::Mongo.connection do |connection|
+      db1 = connection.db
+      db1.should be_kind_of(EM::Mongo::Database)
+
+      db2 = connection.db('db2')
+      db2.should be_kind_of(EM::Mongo::Database)
+      db2.should_not == db1
+
+      EM::Spec::Mongo.close
+    end
+  end
+
+
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 10
-  version: 0.2.10
+  - 11
+  version: 0.2.11
 platform: ruby
 authors: 
 - bcg
@@ -21,6 +21,7 @@ dependencies:
   name: eventmachine
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -35,6 +36,7 @@ dependencies:
   name: bson
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -57,6 +59,11 @@ files:
 - lib/em-mongo/collection.rb
 - lib/em-mongo/connection.rb
 - lib/em-mongo.rb
+- spec/collection_spec.rb
+- spec/connection_spec.rb
+- spec/integration/collection_spec.rb
+- spec/integration/connection_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: 
 licenses: []
@@ -67,6 +74,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -74,6 +82,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -83,11 +92,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: EventMachine driver for MongoDB.
 test_files: 
 - spec/collection_spec.rb
 - spec/connection_spec.rb
+- spec/integration/collection_spec.rb
+- spec/integration/connection_spec.rb
 - spec/spec_helper.rb