mongoo 0.2.4 → 0.3.0

data/CHANGELOG

@@ -1,12 +1,16 @@
 == Changelog
 
-=== 0.2.2
+=== 0.3.0
+
+* refactored a bunch of connection and async related stuff. see README
+
+=== 0.2.4
 
 * async mode works again, but now you have to manually require:
 
     require "mongoo/async"
-    Mongoo.conn    = Mongo::Connection.new("localhost", 27017, :pool_size => 5, :timeout => 5)
-    Mongoo.db_name = "mongoo-test"
+    Mongoo.conn_opts = ["localhost", 27017, :pool_size => 5, :timeout => 5]
+    Mongoo.db_name   = "mongoo-test"
 
   see test_async.rb for an example.
 
@@ -21,10 +25,10 @@
 
 * Can no longer set Mongoo.config = {...}
 
-  Set Mongoo.conn and Mongoo.db_name instead (more flexibility):
+  Set Mongoo.conn_opts and Mongoo.db_name instead (more flexibility):
 
-    Mongoo.conn    = Mongo::Connection.new("localhost", 27017, :pool_size => 5, :timeout => 5)
-    Mongoo.db_name = "mongoo-test"
+    Mongoo.conn_opts = ["localhost", 27017, :pool_size => 5, :timeout => 5]
+    Mongoo.db_name   = "mongoo-test"
 
   You can set these on a model level as well:
 

data/Gemfile

@@ -6,15 +6,15 @@ gem "i18n", ">= 0.4.1"
 gem "activesupport", ">= 3.0.3"
 gem "activemodel", ">= 3.0.3"
 
-gem "mongo", ">= 1.3.1"
-
-gem "em-synchrony", ">= 0.2.0"
+gem "mongo", "~> 1.3.1"
+gem "em-synchrony", "~> 0.2.0", :require => false
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
+  gem "ruby-debug19", :require => 'ruby-debug'
   gem "shoulda", ">= 0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.1"
   gem "rcov", ">= 0"
-end
+end

data/README.rdoc

@@ -1,60 +1,17 @@
 = mongoo
 
-== Changelog
-
-=== 0.2.2
-
-* async mode works again, but now you have to manually require:
-
-    require "mongoo/async"
-    Mongoo.conn    = Mongo::Connection.new("localhost", 27017, :pool_size => 5, :timeout => 5)
-    Mongoo.db_name = "mongoo-test"
-
-  see test_async.rb for an example.
-
-=== 0.2.1
-
-* Identity Map now also stores results from find.to_a, find.each and find.next
-
-=== 0.2.0
-
-* Depends on mongo gem >= 1.3.1
-
-
-* Can no longer set Mongoo.config = {...}
-
-  Set Mongoo.conn and Mongoo.db_name instead (more flexibility):
-
-    Mongoo.conn    = Mongo::Connection.new("localhost", 27017, :pool_size => 5, :timeout => 5)
-    Mongoo.db_name = "mongoo-test"
-
-  You can set these on a model level as well:
-
-    Person.conn    = Mongo::Connection.new("localhost", 30000, :pool_size => 5, :timeout => 5)
-    Person.db_name = "mongoo-test"
-
-
-* You can optionally set the collection name on a model now:
-
-    class Person < Mongoo::Base
-      collection_name "spacemen"
-    end
-
-
-* There is a new Identity Map feature available. It will only work when using find_one to
-  find a specific id. You need to manually turn it on:
-
-    Mongoo::IdentityMap.on!
-
-  If using it in a web application like Rails be sure to flush the map after each request:
-
-    Mongoo::IdentityMap.flush!
-
-  The map is scoped to the current thread or fiber. You can also turn the map back off:
-
-    Mongoo::IdentityMap.off!
-
-  Inspired by: http://railstips.org/blog/archives/2010/02/21/mongomapper-07-identity-map/
+== Latest Version: 0.3.0
+
+Usage (normal):
+  require 'mongoo'
+  Mongoo.conn = lambda { Mongo::Connection.new("localhost", 27017, :pool_size => 5, :timeout => 5) }
+  Mongoo.db   = "mongoo-test"
+
+Usage (async/em-synchrony):
+  require 'mongoo'
+  require 'mongoo/async'
+  Mongoo.conn = lambda { Mongo::Connection.new("localhost", 27017, :pool_size => 5, :timeout => 5) }
+  Mongoo.db   = "mongoo-test"
 
 == Contributing to mongoo
 

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.3.0

data/lib/mongoo.rb

@@ -1,38 +1,46 @@
+unless defined?(Mongo)
+  require "mongo"
+end
+
+# Mongoo.conn = lambda { Mongo::Connection.new("localhost", 27017, :pool_size => 5, :timeout => 5) }
+# Mongoo.db   = "mydb"
+# Mongoo.conn => #<Mongo::Connection:0x00000100db8ac0>
+
 module Mongoo
   INDEX_META = {}
   ATTRIBUTE_META = {}
 
   class << self
-    attr_accessor :conn_opts, :db_name, :verbose_debug
+    attr_accessor :verbose_debug
 
-    def conn
-      Thread.current[:mongoo] ||= {}
-      Thread.current[:mongoo][:conn] ||= Mongo::Connection.new(*conn_opts)
+    def conn=(conn_lambda)
+      @conn_lambda = conn_lambda
+      @_conn = nil
+      @_db = nil
+      @conn_lambda
     end
 
-    def db
-      Thread.current[:mongoo] ||= {}
-      Thread.current[:mongoo][:db] ||= conn.db(db_name)
+    def db=(db_name)
+      @db_name = db_name
+      @_db = nil
+      @db_name
     end
 
-    def reset_connection!
-      if Thread.current[:mongoo]
-        Thread.current[:mongoo][:db] = nil
-        if Thread.current[:mongoo][:conn]
-          Thread.current[:mongoo][:conn].close
-          Thread.current[:mongoo][:conn] = nil
-        end
-      end; true
+    def conn
+      @_conn ||= (@conn_lambda && @conn_lambda.call)
+    end
+
+    def db
+      @_db ||= (conn && conn.db(@db_name))
     end
 
-    def mode
-      :sync
+    def async?
+      Mongo.async?
     end
   end
 end
 
 require "forwardable"
-require "mongo"
 
 require "active_support/core_ext"
 require "active_model"

data/lib/mongoo/async.rb

@@ -1,71 +1,151 @@
-require "em-synchrony"
-require "em-synchrony/tcpsocket"
-
-module Mongoo
-  def self.suppress_warnings
-    original_verbosity = $VERBOSE
-    $VERBOSE = nil
-    result = yield
-    $VERBOSE = original_verbosity
-    return result
+unless defined?(Mongo)
+  raise "!! mongoo/async must be loaded AFTER mongo !!"
+end
+
+original_verbosity = $VERBOSE
+$VERBOSE = nil
+
+require 'em-synchrony'
+require 'em-synchrony/tcpsocket'
+require 'em-synchrony/thread'
+
+module Mongo
+
+  class Connection
+    TCPSocket         = ::EventMachine::Synchrony::TCPSocket
+    Mutex             = ::EventMachine::Synchrony::Thread::Mutex
+    ConditionVariable = ::EventMachine::Synchrony::Thread::ConditionVariable
+  end
+
+  def self.async?
+    true
   end
+
 end
 
-module Mongoo
-  class FakeMutex
-    def initialize
-    end
 
-    def synchronize
-      yield
-    end
+module Mongo
+  class EMPool
+    TCPSocket = ::EventMachine::Synchrony::TCPSocket
 
-    def lock
-      true
+    attr_accessor :host, :port, :size, :timeout, :safe, :checked_out
+
+    # Create a new pool of connections.
+    #
+    def initialize(connection, host, port, opts={})
+      @connection  = connection
+
+      @host, @port = host, port
+
+      # Pool size and timeout.
+      @size      = opts[:size] || 1
+      @timeout   = opts[:timeout]   || 5.0
+
+      # Operations to perform on a socket
+      @socket_ops = Hash.new { |h, k| h[k] = [] }
+
+      @all       = []
+      @reserved  = {}   # map of in-progress connections
+      @available = []   # pool of free connections
+      @pending   = []   # pending reservations (FIFO)
+
+      setup_pool!(host, port)
     end
 
-    def locked?
-      false
+    def setup_pool!(host, port)
+      @size.times do |i|
+        sock = checkout_new_socket(host, port)
+        @all << sock
+        @available << sock
+      end
     end
 
-    def sleep(timeout=nil)
-      true
+    def close
+      @all.each do |sock|
+        begin
+          sock.close
+        rescue IOError => ex
+          warn "IOError when attempting to close socket connected to #{@host}:#{@port}: #{ex.inspect}"
+        end
+      end
+      @host = @port = nil
+      @all.clear
+      @reserved.clear
+      @available.clear
+      @pending.clear
     end
 
-    def try_lock
+    # Return a socket to the pool.
+    def checkin(socket)
+      fiber = Fiber.current
+
+      @available.push(@reserved.delete(fiber.object_id))
+      if pending = @pending.shift
+        pending.resume
+      end
       true
     end
 
-    def unlock
-      true
+    # If a user calls DB#authenticate, and several sockets exist,
+    # then we need a way to apply the authentication on each socket.
+    # So we store the apply_authentication method, and this will be
+    # applied right before the next use of each socket.
+    def authenticate_existing
+      @all.each do |socket|
+        @socket_ops[socket] << Proc.new do
+          @connection.apply_saved_authentication(:socket => socket)
+        end
+      end
     end
-  end
-end
 
-Mongoo.suppress_warnings do
-  module Mongo
-    class Connection
-      Mutex = Mongoo::FakeMutex
-      TCPSocket = TCPSocket = ::EventMachine::Synchrony::TCPSocket
+    # Store the logout op for each existing socket to be applied before
+    # the next use of each socket.
+    def logout_existing(db)
+      @all.each do |socket|
+        @socket_ops[socket] << Proc.new do
+          @connection.db(db).issue_logout(:socket => socket)
+        end
+      end
     end
-  end
 
-  module Mongo
-    class Pool
-      Mutex = Mongoo::FakeMutex
-      TCPSocket = TCPSocket = ::EventMachine::Synchrony::TCPSocket
+    # Check out an existing socket or create a new socket if the maximum
+    # pool size has not been exceeded. Otherwise, wait for the next
+    # available socket.
+    def checkout
+      fiber = Fiber.current
+      #puts "[P: #{@pending.size}, A: #{@available.size}, ALL: #{@all.size}]"
+      if socket = @available.pop
+        @reserved[fiber.object_id] = socket
+        socket
+      else
+        Fiber.yield @pending.push fiber
+        checkout
+      end
     end
-  end
-end
 
-module Mongoo
-  def self.mode
-    :async
-  end
-end
+    # Adds a new socket to the pool and checks it out.
+    #
+    # This method is called exclusively from #checkout;
+    # therefore, it runs within a mutex.
+    def checkout_new_socket(host, port)
+      return nil if @all.size >= @size
 
-if ENV["MONGOO_DEBUG"] == "1"
-  puts "* Mongoo Running in Asynchronous Mode"
-  puts "  ==> Mongo::Pool::TCPSocket: #{Mongo::Pool::TCPSocket.to_s}"
-  puts "  ==> Mongo::Connection::TCPSocket: #{Mongo::Pool::TCPSocket.to_s}"
-end
+      begin
+        socket = TCPSocket.new(host, port)
+        socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+      rescue => ex
+        raise ConnectionFailure, "Failed to connect to host #{@host} and port #{@port}: #{ex}"
+      end
+
+      # If any saved authentications exist, we want to apply those
+      # when creating new sockets.
+      @connection.apply_saved_authentication(:socket => socket)
+
+      socket
+    end; protected :checkout_new_socket
+  end # EMPool
+end # Mongo
+
+Mongo::Pool = Mongo::EMPool
+
+$VERBOSE = original_verbosity

data/lib/mongoo/persistence.rb

@@ -25,20 +25,37 @@ module Mongoo
         end
       end
 
-      def collection
-        db.collection(collection_name)
+      def conn=(conn_lambda)
+        @conn_lambda = conn_lambda
+        @_conn = nil
+        @_db = nil
+        @collection = nil
+        @conn_lambda
+      end
+
+      def db=(db_name)
+        @db_name = db_name
+        @_db = nil
+        @collection = nil
+        @db_name
       end
 
       def conn
-        Mongoo.conn
+        @_conn ||= ((@conn_lambda && @conn_lambda.call) || Mongoo.conn)
       end
 
       def db
-        Mongoo.db
+        @_db ||= begin
+          if db_name = (@db_name || (@conn_lambda && Mongoo.db.name))
+            conn.db(db_name)
+          else
+            Mongoo.db
+          end
+        end
       end
 
-      def db_name
-        Mongoo.db_name
+      def collection
+        @collection ||= db.collection(collection_name)
       end
 
       def find(query={}, opts={})

data/mongoo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoo}
-  s.version = "0.2.4"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Myles"]
-  s.date = %q{2011-05-11}
+  s.date = %q{2011-05-13}
   s.description = %q{Simple object mapper for MongoDB}
   s.email = %q{ben.myles@gmail.com}
   s.extra_rdoc_files = [
@@ -48,7 +48,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/benmyles/mongoo}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.rubygems_version = %q{1.6.1}
   s.summary = %q{Object mapper for MongoDB}
   s.test_files = [
     "test/helper.rb",
@@ -66,8 +66,9 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<i18n>, [">= 0.4.1"])
       s.add_runtime_dependency(%q<activesupport>, [">= 3.0.3"])
       s.add_runtime_dependency(%q<activemodel>, [">= 3.0.3"])
-      s.add_runtime_dependency(%q<mongo>, [">= 1.3.1"])
-      s.add_runtime_dependency(%q<em-synchrony>, [">= 0.2.0"])
+      s.add_runtime_dependency(%q<mongo>, ["~> 1.3.1"])
+      s.add_runtime_dependency(%q<em-synchrony>, ["~> 0.2.0"])
+      s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
@@ -76,8 +77,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<i18n>, [">= 0.4.1"])
       s.add_dependency(%q<activesupport>, [">= 3.0.3"])
       s.add_dependency(%q<activemodel>, [">= 3.0.3"])
-      s.add_dependency(%q<mongo>, [">= 1.3.1"])
-      s.add_dependency(%q<em-synchrony>, [">= 0.2.0"])
+      s.add_dependency(%q<mongo>, ["~> 1.3.1"])
+      s.add_dependency(%q<em-synchrony>, ["~> 0.2.0"])
+      s.add_dependency(%q<ruby-debug19>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
@@ -87,8 +89,9 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<i18n>, [">= 0.4.1"])
     s.add_dependency(%q<activesupport>, [">= 3.0.3"])
     s.add_dependency(%q<activemodel>, [">= 3.0.3"])
-    s.add_dependency(%q<mongo>, [">= 1.3.1"])
-    s.add_dependency(%q<em-synchrony>, [">= 0.2.0"])
+    s.add_dependency(%q<mongo>, ["~> 1.3.1"])
+    s.add_dependency(%q<em-synchrony>, ["~> 0.2.0"])
+    s.add_dependency(%q<ruby-debug19>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.1"])

data/test/helper.rb

@@ -2,12 +2,6 @@ require 'rubygems'
 require 'bundler'
 begin
   groups = [:default, :development]
-
-  if ENV["MONGOO_ASYNC"]
-    groups << :async
-  else
-    groups << :sync
-  end
   Bundler.setup(groups)
 rescue Bundler::BundlerError => e
   $stderr.puts e.message
@@ -16,13 +10,14 @@ rescue Bundler::BundlerError => e
 end
 require 'test/unit'
 require 'shoulda'
+require 'ruby-debug'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'mongoo'
 
-Mongoo.conn_opts = ["localhost", 27017, :pool_size => 5, :timeout => 5]
-Mongoo.db_name   = "mongoo-test"
+Mongoo.conn = lambda { Mongo::Connection.new("localhost", 27017, :pool_size => 5, :timeout => 5) }
+Mongoo.db   = "mongoo-test"
 
 class SearchIndex < Mongoo::Base
   attribute "terms", :type => :array

data/test/test_mongoo.rb

@@ -9,6 +9,46 @@ class TestMongoo < Test::Unit::TestCase
     end
   end
 
+  should "be able to use a different db for each model" do
+    assert_equal "mongoo-test", Mongoo.db.name
+    assert_equal "mongoo-test", Person.db.name
+
+    Person.new(name: "mongoo-test").insert!
+    assert_equal 1, Person.count
+    assert_equal "mongoo-test", Person.find.next.name
+
+    Person.db = "mongoo-test-people"
+    assert_equal "mongoo-test-people", Person.db.name
+
+    assert_equal 0, Person.count
+    assert_equal 1, Mongoo.db.collection("people").count
+
+    Person.new(name: "mongoo-test-people").insert!
+    assert_equal 1, Person.count
+    assert_equal "mongoo-test-people", Person.find.next.name
+
+    Person.collection.drop
+    Person.db = nil
+    Person.conn = nil
+
+    assert_equal 1, Person.count
+    assert_equal "mongoo-test", Person.find.next.name
+  end
+
+  should "be able to use a different connection for each model" do
+    assert_equal Person.conn.object_id, Mongoo.conn.object_id
+    assert_equal Person.collection.db.connection.object_id, Mongoo.conn.object_id
+    Person.conn = lambda { Mongo::Connection.new("localhost", 27017, :pool_size => 5, :timeout => 5) }
+    assert_not_equal Person.conn.object_id, Mongoo.conn.object_id
+
+    assert_not_equal Person.collection.db.connection.object_id, Mongoo.conn.object_id
+
+    assert_equal Person.collection.db.connection.object_id, Person.conn.object_id
+    Person.conn = nil
+    assert_equal Person.conn.object_id, Mongoo.conn.object_id
+    assert_equal Person.collection.db.connection.object_id, Mongoo.conn.object_id
+  end
+
   should "set and get attributes" do
     p = Person.new("name" => "Ben")
     assert_equal "Ben", p.g(:name)

metadata

@@ -2,7 +2,7 @@
 name: mongoo
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors: 
 - Ben Myles
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-11 00:00:00 -07:00
+date: 2011-05-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,7 +51,7 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 1.3.1
   type: :runtime
@@ -62,14 +62,14 @@ dependencies:
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: ruby-debug19
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -80,8 +80,19 @@ dependencies:
   prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: shoulda
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -89,10 +100,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -100,10 +111,10 @@ dependencies:
         version: 1.5.1
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -111,7 +122,7 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id010
 description: Simple object mapper for MongoDB
 email: ben.myles@gmail.com
 executables: []
@@ -163,7 +174,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1209992361420793263
+      hash: -3196476684317221338
       segments: 
       - 0
       version: "0"
@@ -176,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Object mapper for MongoDB