mongoo 0.2.1 → 0.2.2

data/CHANGELOG

@@ -1,5 +1,15 @@
 == 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

data/README.rdoc

@@ -2,6 +2,20 @@
 
 == 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

data/Rakefile

@@ -33,6 +33,12 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
+Rake::TestTask.new(:test_async) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_async*.rb'
+  test.verbose = true
+end
+
 require 'rcov/rcovtask'
 Rcov::RcovTask.new do |test|
   test.libs << 'test'

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/mongoo.rb

@@ -4,14 +4,16 @@ module Mongoo
 
   class << self
     attr_accessor :conn, :db_name, :verbose_debug
+
+    def mode
+      :sync
+    end
   end
 end
 
 require "forwardable"
 require "mongo"
 
-require "mongoo/async"
-
 require "active_support/core_ext"
 require "active_model"
 

data/lib/mongoo/async.rb

@@ -1,41 +1,36 @@
-if ENV["MONGOO_ASYNC"] == "1" || (ENV["MONGOO_SYNC"] != "1" && (defined?(EM) && EM.reactor_running?))
-  require "em-synchrony"
-  require "em-synchrony/tcpsocket"
-  module Mongo
-    class Connection
-      EMTCPSocket = ::EventMachine::Synchrony::TCPSocket
+require "em-synchrony"
+require "em-synchrony/tcpsocket"
 
-      def check_is_master(node)
-        begin
-          host, port = *node
-          socket = EMTCPSocket.new(host, port)
-          socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
-
-          config = self['admin'].command({:ismaster => 1}, :socket => socket)
-        rescue OperationFailure, SocketError, SystemCallError, IOError => ex
-          close
-        ensure
-          socket.close if socket
-        end
+module Mongoo
+  def self.suppress_warnings
+    original_verbosity = $VERBOSE
+    $VERBOSE = nil
+    result = yield
+    $VERBOSE = original_verbosity
+    return result
+  end
+end
 
-        config
-      end
-    end
+module Mongoo
+  def self.mode
+    :async
   end
+end
 
-  module Mongoo
-    def self.mode
-      :async
-    end
+module Mongo
+  class Pool
+    Mongoo.suppress_warnings { TCPSocket = ::EventMachine::Synchrony::TCPSocket }
   end
+end
 
-  puts "* Mongoo Running in Asynchronous Mode" if ENV["MONGOO_DEBUG"] == "1"
-else
-  module Mongoo
-    def self.mode
-      :sync
-    end
+module Mongo
+  class Connection
+    Mongoo.suppress_warnings { TCPSocket = ::EventMachine::Synchrony::TCPSocket }
   end
-  
-  puts "* Mongoo Running in Synchronous Mode" if ENV["MONGOO_DEBUG"] == "1"
-end
+end
+
+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

data/mongoo.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoo}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Myles"]
@@ -52,6 +52,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "test/helper.rb",
     "test/test_activemodel.rb",
+    "test/test_async.rb",
     "test/test_identity_map.rb",
     "test/test_mongohash.rb",
     "test/test_mongoo.rb"

data/test/helper.rb

@@ -2,7 +2,8 @@ require 'rubygems'
 require 'bundler'
 begin
   groups = [:default, :development]
-  if defined?(EM) && EM.reactor_running?
+
+  if ENV["MONGOO_ASYNC"]
     groups << :async
   else
     groups << :sync
@@ -20,7 +21,6 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'mongoo'
 
-#Mongoo.config = {host: "127.0.0.1", port: 27017, db: 'mongoo-test'}
 Mongoo.conn    = Mongo::Connection.new("localhost", 27017, :pool_size => 5, :timeout => 5)
 Mongoo.db_name = "mongoo-test"
 
@@ -65,4 +65,4 @@ class TvShow < Mongoo::Base
 end
 
 class Test::Unit::TestCase
-end
+end

data/test/test_async.rb

@@ -0,0 +1,41 @@
+if ENV["MONGOO_ASYNC"]
+
+require 'helper'
+require "mongoo/async"
+
+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
+        obj.create_indexes
+      end
+      EventMachine.stop
+    end
+  end
+
+  should "set and get attributes" do
+    EM.synchrony do
+      p = Person.new("name" => "Ben")
+      assert_equal "Ben", p.g(:name)
+      assert_equal "Ben", p.get(:name)
+      assert_equal "Ben", p.get_attribute(:name)
+      p.set("location.city", "San Francisco")
+      assert_equal "San Francisco", p.get("location.city")
+      p.sets({"location.demographics.crime_rate" => :high, "location.demographics.education_quality" => :low})
+      assert_equal({"name"=>"Ben",
+       "location.demographics.crime_rate"=>:high}, p.gets(%w(name location.demographics.crime_rate)))
+      assert_raise(Mongoo::UnknownAttributeError) { p.set("idontexist", "foo") }
+      assert_raise(Mongoo::UnknownAttributeError) { p.get("idontexist") }
+      assert_raise(NoMethodError) { p.idontexist }
+      assert_raise(NoMethodError) { p.idontexist = "val" }
+      EventMachine.stop
+    end
+  end
+end
+
+end

metadata

@@ -2,7 +2,7 @@
 name: mongoo
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Ben Myles
@@ -148,6 +148,7 @@ files:
 - test/test_identity_map.rb
 - test/test_mongohash.rb
 - test/test_mongoo.rb
+- test/test_async.rb
 has_rdoc: true
 homepage: http://github.com/benmyles/mongoo
 licenses: 
@@ -162,7 +163,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2078280549170362626
+      hash: -1642084642686495680
       segments: 
       - 0
       version: "0"
@@ -182,6 +183,7 @@ summary: Object mapper for MongoDB
 test_files: 
 - test/helper.rb
 - test/test_activemodel.rb
+- test/test_async.rb
 - test/test_identity_map.rb
 - test/test_mongohash.rb
 - test/test_mongoo.rb