em-mongo 0.2.13 → 0.2.14

data/lib/em-mongo/connection.rb

@@ -118,9 +118,10 @@ module EM::Mongo
       @retries       = 0
       @responses     = {}
       @is_connected  = false
-      @host          = options[:host] || DEFAULT_IP
-      @port          = options[:port] || DEFAULT_PORT
-      @on_unbind     = options[:unbind_cb] || proc {}
+      @host          = options[:host]        || DEFAULT_IP
+      @port          = options[:port]        || DEFAULT_PORT
+      @on_unbind     = options[:unbind_cb]   || proc {}
+      @reconnect_in  = options[:reconnect_in]|| false
 
       @on_close = proc {
         raise Error, "failure with mongodb server #{@host}:#{@port}"
@@ -130,7 +131,7 @@ module EM::Mongo
     end
 
     def self.connect(host = DEFAULT_IP, port = DEFAULT_PORT, timeout = nil, opts = nil)
-      opt = {:host => host, :port => port, :timeout => timeout}.merge(opts)
+      opt = {:host => host, :port => port, :timeout => timeout, :reconnect_in => false}.merge(opts)
       EM.connect(host, port, self, opt)
     end
 
@@ -214,19 +215,21 @@ module EM::Mongo
 
       set_deferred_status(nil)
 
-      if @retries >= MAX_RETRIES
+      if @reconnect_in
+        EM.add_timer(@reconnect_in) { reconnect(@host, @port) }
+      elsif @on_unbind and @retries >= MAX_RETRIES
         @on_unbind.call
         return
       end
 
       @retries += 1
-      EM.add_timer(5) { reconnect(@host, @port) }
+      
     end
 
     def close
       @on_close = proc { yield if block_given? }
       if @responses.empty?
-        close_connection
+        close_connection_after_writing
       else
         @close_pending = true
       end
@@ -253,6 +256,7 @@ module EM::Mongo
       @em_connection.close
     end
   end
+
   class Connection
     def initialize(host = DEFAULT_IP, port = DEFAULT_PORT, timeout = nil, opts = {})
       @em_connection = EMConnection.connect(host, port, timeout, opts)

data/spec/integration/collection_spec.rb

@@ -0,0 +1,223 @@
+require File.expand_path('spec_helper', File.dirname(__FILE__) + '/../')
+
+describe EMMongo::Collection do
+  include EM::Spec
+
+  it 'should insert an object' do
+   @conn, @coll = connection_and_collection
+
+   obj = @coll .insert('hello' => 'world')
+   obj.keys.should include '_id'
+   obj['_id'].should be_a_kind_of(BSON::ObjectId)
+   done
+  end
+
+  it 'should insert an object with a custom _id' do
+   @conn, @coll = connection_and_collection
+
+   obj = @coll .insert('_id' => 1234, 'hello' => 'world')
+   obj.keys.should include '_id'
+   obj['_id'].should == 1234
+   r = @coll.find({"hello" => "world"},{}) do |res|
+     res.size.should >= 1
+     res[0]['_id'].should == 1234
+     done
+   end
+  end
+
+  it 'should find an object by attribute' do
+   @conn, @coll = connection_and_collection
+    
+   @coll.insert("hello" => 'world')
+   r = @coll.find({"hello" => "world"},{}) do |res|
+     res.size.should >= 1
+     res[0]["hello"].should == "world"
+     done
+   end
+  end
+
+  it 'should find an object by symbol' do
+   @conn, @coll = connection_and_collection
+    
+   @coll.insert('hello' => 'world')
+   r = @coll.find({:hello => "world"},{}) do |res|
+     res.size.should >= 1
+     res[0]["hello"].should == "world"
+     done
+   end
+  end
+
+  it 'should find an object by id' do
+   @conn, @coll = connection_and_collection
+    
+   obj = @coll.insert('hello' => 'world')
+   @coll.find({'_id' => obj['_id']},{}) do |res|
+     res.size.should >= 1
+     res[0]['hello'].should == "world"
+     done
+   end
+  end
+
+  it 'should find all objects' do
+   @conn, @coll = connection_and_collection
+
+   @coll.insert('one' => 'one')
+   @coll.insert('two' => 'two')
+   @coll.find do |res|
+     res.size.should >= 2
+     done
+   end
+  end
+
+  it 'should find large sets of objects' do
+    @conn, @coll = connection_and_collection
+    
+    (0..1500).each { |n| @coll.insert({n.to_s => n.to_s}) }
+    @coll.find do |res|
+      res.size.should == EM::Mongo::DEFAULT_QUERY_DOCS
+      @coll.find({}, {:limit => 1500}) do |res|
+        res.size.should == 1500
+        done
+      end
+    end
+  end
+
+  it 'should update an object' do
+    @conn, @coll = connection_and_collection
+
+    obj = @coll.insert('hello' => 'world')
+    @coll.update({'hello' => 'world'}, {'hello' => 'newworld'})
+    @coll.find({'_id' => obj['_id']},{}) do |res|
+      res[0]['hello'].should == 'newworld'
+      done
+    end
+  end
+
+  it 'should update an object wxith $inc' do
+    @conn, @coll = connection_and_collection
+
+    obj = @coll.insert('hello' => 'world')
+    @coll.update({'hello' => 'world'}, {'$inc' => {'count' => 1}})
+    @coll.find({'_id' => obj['_id']},{}) do |res|
+      res.first['hello'].should == 'world'
+      res.first['count'].should == 1
+      done
+    end
+  end
+
+  it 'should remove an object' do
+    @conn, @coll = connection_and_collection
+
+    obj = @coll.insert('hello' => 'world')
+    @coll.remove('_id' => obj['_id'])
+    @coll.find({'hello' => "world"}) do |res|
+      res.size.should == 0
+      done
+    end
+  end
+
+  it 'should remove all objects' do
+    @conn, @coll = connection_and_collection
+
+    @coll.insert('one' => 'one')
+    @coll.insert('two' => 'two')
+    @coll.remove
+    @coll.find do |res|
+      res.size.should == 0
+      done
+    end
+  end
+
+  it 'should insert a Time' do
+    @conn, @coll = connection_and_collection
+
+    t = Time.now.utc.freeze
+    @coll.insert('date' => t)
+    @coll.find do |res|
+      res[0]['date'].to_s.should == t.to_s
+      done
+    end
+  end
+
+  it 'should insert a complex object' do
+    @conn, @coll = connection_and_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 = @coll.insert(obj)
+    @coll.find({'_id' => obj['_id']}) do |ret|
+      ret.size.should == 1
+      ret[0].each_key do |key|
+        ret[0][key].should == obj[key]
+      end
+      done
+    end
+  end
+
+  it 'should find an object using nested properties' do
+    @conn, @coll = connection_and_collection
+    
+    @coll.insert({
+      'name' => 'Google',
+      'address' => {
+        'cxity' => 'Mountain View',
+        'state' => 'California'}
+    })
+
+    @coll.first('address.cxity' => 'Mountain View') do |res|
+      res['name'].should == 'Google'
+      done
+    end
+  end
+
+  it 'should find objects wxith specific values' do
+    @conn, @coll = connection_and_collection
+
+    number_hash.each do |num, word|
+      @coll.insert({'num' => num, 'word' => word})
+    end
+
+    @coll.find({'num' => {'$in' => [1,3,5]}}) do |res|
+      res.size.should == 3
+      res.map{|r| r['num'] }.sort.should == [1,3,5]
+      done
+    end
+  end
+
+  it 'should find objects greater than something' do
+    @conn, @coll = connection_and_collection
+  
+    number_hash.each do |num, word|
+      @coll.insert('num' => num, 'word' => word)
+    end
+
+    @coll.find({'num' => {'$gt' => 3}}) do |res|
+      res.size.should == 6
+      res.map{|r| r['num'] }.sort.should == [4,5,6,7,8,9]
+      done
+    end
+  end
+
+  it 'should handle multiple pending queries' do
+    @conn, @coll = connection_and_collection
+    
+    id = @coll.insert("foo" => "bar")['_id']
+    received = 0
+
+    10.times do |n|
+      @coll.first("_id" => id) do |res|
+        received += 1
+        done
+      end
+    end
+  end
+
+end

data/spec/integration/connection_spec.rb

@@ -0,0 +1,56 @@
+require File.expand_path('spec_helper', File.dirname(__FILE__) + '/../')
+
+describe EMMongo::Connection do
+  include EM::Spec
+  include EM::Mongo
+
+  it 'should connect' do
+    @conn = EMMongo::Connection.new
+    EM.add_timer(0.1) do
+      @conn.should be_connected
+      done
+    end
+  end
+
+  it 'should close' do
+    @conn = EMMongo::Connection.new
+
+    EM.add_timer(0.1) do
+      @conn.should be_connected
+      @conn.close
+    end
+
+    EM.add_timer(0.2) do
+      EM.next_tick do
+        @conn.should_not be_connected
+        done
+      end
+    end
+  end
+
+  it 'should reconnect' do
+    @conn = EMMongo::Connection.new(DEFAULT_IP, DEFAULT_PORT, nil, {:reconnect_in => 0.5})
+    EM.add_timer(0.1) do
+      @conn.close
+    end
+    EM.add_timer(0.9) do
+      @conn.should be_connected
+      done
+    end
+  end
+
+  it 'should instantiate a Database' do
+    @conn = EMMongo::Connection.new
+
+    db1 = @conn.db
+    db1.should be_kind_of(EM::Mongo::Database)
+
+    db2 = @conn.db('db2')
+    db2.should be_kind_of(EM::Mongo::Database)
+    db2.should_not == db1
+
+    done
+  end
+
+
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 13
-  version: 0.2.13
+  - 14
+  version: 0.2.14
 platform: ruby
 authors: 
 - bcg
@@ -59,9 +59,8 @@ files:
 - lib/em-mongo/collection.rb
 - lib/em-mongo/connection.rb
 - lib/em-mongo.rb
-- spec/collection_spec.rb
-- spec/connection_spec.rb
-- spec/spec_helper.rb
+- spec/integration/collection_spec.rb
+- spec/integration/connection_spec.rb
 has_rdoc: true
 homepage: 
 licenses: []
@@ -95,6 +94,5 @@ signing_key:
 specification_version: 3
 summary: EventMachine driver for MongoDB.
 test_files: 
-- spec/collection_spec.rb
-- spec/connection_spec.rb
-- spec/spec_helper.rb
+- spec/integration/collection_spec.rb
+- spec/integration/connection_spec.rb

data/spec/collection_spec.rb

@@ -1,218 +0,0 @@
-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(BSON::ObjectId)
-      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/connection_spec.rb

@@ -1,48 +0,0 @@
-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

data/spec/spec_helper.rb

@@ -1,43 +0,0 @@
-require File.expand_path('../lib/em-mongo', File.dirname(__FILE__))
-
-require "em-spec/rspec"
-
-module EM
-  module Spec
-    module Mongo
-      extend EM::SpecHelper 
-
-      @@clean_collection_up = nil
-
-      def self.close
-        @@clean_collection_up.call if @@clean_collection_up
-        done
-      end
-    
-      def self.collection
-        self.database do |database|
-          database.collection.remove
-          yield database.collection
-        end
-      end
-
-      def self.database
-        self.connection do |connection|
-          yield connection.db
-        end
-      end
-
-      def self.connection
-        em do
-          connection = EMMongo::Connection.new
-          EM.next_tick do
-            yield connection
-          end
-        end
-      end
-
-    end
-  end
-end
-
-$stdout.sync = true