mongoo 0.4.3 → 0.4.4

data/Gemfile

@@ -7,7 +7,6 @@ gem "activesupport", ">= 3.0.3"
 gem "activemodel", ">= 3.0.3"
 
 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.

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/mongoo.gemspec

@@ -26,7 +26,6 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/mongoo.rb",
-    "lib/mongoo/async.rb",
     "lib/mongoo/attribute_proxy.rb",
     "lib/mongoo/attribute_sanitizer.rb",
     "lib/mongoo/base.rb",
@@ -40,7 +39,6 @@ Gem::Specification.new do |s|
     "mongoo.gemspec",
     "test/helper.rb",
     "test/test_activemodel.rb",
-    "test/test_async.rb",
     "test/test_identity_map.rb",
     "test/test_mongohash.rb",
     "test/test_mongoo.rb",
@@ -54,7 +52,6 @@ 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",
@@ -69,7 +66,6 @@ Gem::Specification.new do |s|
       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_development_dependency(%q<ruby-debug19>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -82,7 +78,6 @@ Gem::Specification.new do |s|
       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<ruby-debug19>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -96,7 +91,6 @@ Gem::Specification.new do |s|
     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<ruby-debug19>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])

metadata

@@ -2,7 +2,7 @@
 name: mongoo
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors: 
 - Ben Myles
@@ -57,20 +57,9 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: em-synchrony
-  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: ruby-debug19
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -78,10 +67,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -89,10 +78,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -100,10 +89,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -111,10 +100,10 @@ dependencies:
         version: 1.5.1
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -122,10 +111,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id010
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: perftools.rb
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -133,10 +122,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id011
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: bson_ext
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -144,7 +133,7 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *id012
+  version_requirements: *id011
 description: Simple object mapper for MongoDB
 email: ben.myles@gmail.com
 executables: []
@@ -164,7 +153,6 @@ files:
 - Rakefile
 - VERSION
 - lib/mongoo.rb
-- lib/mongoo/async.rb
 - lib/mongoo/attribute_proxy.rb
 - lib/mongoo/attribute_sanitizer.rb
 - lib/mongoo/base.rb
@@ -178,7 +166,6 @@ files:
 - mongoo.gemspec
 - test/helper.rb
 - test/test_activemodel.rb
-- test/test_async.rb
 - test/test_identity_map.rb
 - test/test_mongohash.rb
 - test/test_mongoo.rb
@@ -197,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3510321131763489211
+      hash: 2962169118481187052
       segments: 
       - 0
       version: "0"
@@ -217,7 +204,6 @@ 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

data/lib/mongoo/async.rb

@@ -1,154 +0,0 @@
-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 Mongo
-  class EMPool
-    TCPSocket = ::EventMachine::Synchrony::TCPSocket
-
-    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 setup_pool!(host, port)
-      true
-      # @size.times do |i|
-      #   sock = checkout_new_socket(host, port)
-      #   @all << sock
-      #   @available << sock
-      # end
-    end
-
-    def close
-      true
-      # @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
-
-    # Return a socket to the pool.
-    def checkin(socket)
-      socket.close
-      # fiber = Fiber.current
-      # @available.push(@reserved.delete(fiber.object_id))
-      # if pending = @pending.shift
-      #   pending.resume
-      # end
-      true
-    end
-
-    # 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
-      true
-      # @all.each do |socket|
-      #   @socket_ops[socket] << Proc.new do
-      #     @connection.apply_saved_authentication(:socket => socket)
-      #   end
-      # end
-    end
-
-    # Store the logout op for each existing socket to be applied before
-    # the next use of each socket.
-    def logout_existing(db)
-      true
-      # @all.each do |socket|
-      #   @socket_ops[socket] << Proc.new do
-      #     @connection.db(db).issue_logout(:socket => socket)
-      #   end
-      # end
-    end
-
-    # 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
-      checkout_new_socket(@host, @port)
-      # 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
-
-    # 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
-      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/test/test_async.rb

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