em-mongo 0.3.3 → 0.3.4

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/lib/em-mongo/connection.rb

@@ -237,10 +237,6 @@ module EM::Mongo
 
   end
 
-end
-
-module EM::Mongo
-
   class Connection
 
     def initialize(host = DEFAULT_IP, port = DEFAULT_PORT, timeout = nil, opts = {})

data/lib/em-mongo/database.rb

@@ -16,7 +16,7 @@ module EM::Mongo
     end
 
     def collection(name = EM::Mongo::DEFAULT_NS)
-      @collections[@db_name] ||= EM::Mongo::Collection.new(@db_name, name, @em_connection)
+      @collections[name] ||= EM::Mongo::Collection.new(@db_name, name, @em_connection)
     end
 
     def connection

data/lib/em-mongo.rb

@@ -1,3 +1,4 @@
+require "eventmachine"
 begin
   require "bson_ext"
 rescue LoadError

data/spec/integration/connection_spec.rb

@@ -2,7 +2,6 @@ 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
@@ -29,7 +28,7 @@ describe EMMongo::Connection do
   end
 
   it 'should reconnect' do
-    @conn = EMMongo::Connection.new(DEFAULT_IP, DEFAULT_PORT, nil, {:reconnect_in => 0.5})
+    @conn = EMMongo::Connection.new(EM::Mongo::DEFAULT_IP, EM::Mongo::DEFAULT_PORT, nil, {:reconnect_in => 0.5})
     EM.add_timer(0.1) do
       @conn.close
     end

data/spec/integration/database_spec.rb

@@ -21,7 +21,17 @@ describe EMMongo::Database do
       res.should == true
       done
     end
-  end 
-
+  end  
+  
+  it 'should cache collections correctly' do
+    @conn = EM::Mongo::Connection.new
+    @db = @conn.db
+    a = @db.collection('first_collection')
+    b = @db.collection('second_collection')
+    a.should_not == b                      
+    @db.collection('first_collection').should == a
+    @db.collection('second_collection').should == b            
+    done
+  end
 
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - bcg
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-30 00:00:00 -05:00
+date: 2010-12-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency