mongoo 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/lib/mongoo.rb

@@ -3,7 +3,27 @@ module Mongoo
   ATTRIBUTE_META = {}
 
   class << self
-    attr_accessor :conn, :db_name, :verbose_debug
+    attr_accessor :conn_opts, :db_name, :verbose_debug
+
+    def conn
+      Thread.current[:mongoo] ||= {}
+      Thread.current[:mongoo][:conn] ||= Mongo::Connection.new(*conn_opts)
+    end
+
+    def db
+      Thread.current[:mongoo] ||= {}
+      Thread.current[:mongoo][:db] ||= conn.db(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
+    end
 
     def mode
       :sync

data/lib/mongoo/async.rb

@@ -12,20 +12,55 @@ module Mongoo
 end
 
 module Mongoo
-  def self.mode
-    :async
+  class FakeMutex
+    def initialize
+    end
+
+    def synchronize
+      yield
+    end
+
+    def lock
+      true
+    end
+
+    def locked?
+      false
+    end
+
+    def sleep(timeout=nil)
+      true
+    end
+
+    def try_lock
+      true
+    end
+
+    def unlock
+      true
+    end
   end
 end
 
-module Mongo
-  class Pool
-    Mongoo.suppress_warnings { TCPSocket = ::EventMachine::Synchrony::TCPSocket }
+Mongoo.suppress_warnings do
+  module Mongo
+    class Connection
+      Mutex = Mongoo::FakeMutex
+      TCPSocket = TCPSocket = ::EventMachine::Synchrony::TCPSocket
+    end
+  end
+
+  module Mongo
+    class Pool
+      Mutex = Mongoo::FakeMutex
+      TCPSocket = TCPSocket = ::EventMachine::Synchrony::TCPSocket
+    end
   end
 end
 
-module Mongo
-  class Connection
-    Mongoo.suppress_warnings { TCPSocket = ::EventMachine::Synchrony::TCPSocket }
+module Mongoo
+  def self.mode
+    :async
   end
 end
 

data/lib/mongoo/persistence.rb

@@ -20,45 +20,25 @@ module Mongoo
       def collection_name(val=nil)
         if val
           @collection_name = val
-          @collection = nil
-          @collection_name
         else
           @collection_name ||= self.model_name.tableize
         end
       end
 
       def collection
-        @collection ||= db.collection(collection_name)
+        db.collection(collection_name)
       end
 
       def conn
-        @conn ||= begin
-          Mongoo.conn || raise(Mongoo::ConnNotSet)
-        end
-      end
-
-      def conn=(conn)
-        @conn       = conn
-        @db         = nil
-        @collection = nil
-        @conn
+        Mongoo.conn
       end
 
       def db
-        @db ||= conn.db(db_name)
+        Mongoo.db
       end
 
       def db_name
-        @db_name ||= begin
-          Mongoo.db_name || raise(Mongoo::DbNameNotSet)
-        end
-      end
-
-      def db_name=(db_name)
-        @db_name    = db_name
-        @db         = nil
-        @collection = nil
-        @db_name
+        Mongoo.db_name
       end
 
       def find(query={}, opts={})

data/mongoo.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoo}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Myles"]

data/test/helper.rb

@@ -21,8 +21,8 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'mongoo'
 
-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"
 
 class SearchIndex < Mongoo::Base
   attribute "terms", :type => :array

data/test/test_async.rb

@@ -3,12 +3,13 @@ if ENV["MONGOO_ASYNC"]
 require 'helper'
 require "mongoo/async"
 
+Mongoo.conn_opts = ["localhost", 27017, :pool_size => 5, :timeout => 5]
+Mongoo.db_name   = "mongoo-test"
+
 class TestAsync < Test::Unit::TestCase
 
   def setup
     EM.synchrony do
-      Mongoo.conn    = Mongo::Connection.new("localhost", 27017, :pool_size => 5, :timeout => 5)
-      Mongoo.db_name = "mongoo-test"
 
       [Person, TvShow, SearchIndex].each do |obj|
         obj.drop

metadata

@@ -2,7 +2,7 @@
 name: mongoo
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Ben Myles
@@ -163,7 +163,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2296487200507282446
+      hash: -1209992361420793263
       segments: 
       - 0
       version: "0"