monga 0.0.4 → 0.0.5

data/lib/monga/clients/single_instance_client.rb

@@ -35,9 +35,14 @@ module Monga::Clients
     # it will send foce_status! to all clients while timout happend
     # or while preferred status will be returned
     def force_status!
-      conn = aquire_connection
-      conn.is_master? do |status|
-        @status = status
+      if connected?
+        conn = aquire_connection
+        conn.is_master? do |status|
+          @status = status
+          yield(@status) if block_given?
+        end
+      else
+        @status = nil
         yield(@status) if block_given?
       end
     end

data/lib/monga/connection.rb

@@ -2,7 +2,7 @@ module Monga
   class Connection
     extend Forwardable
 
-    def_delegators :@connection, :connected?, :responses, :send_command, :is_master?, :port
+    def_delegators :@connection, :connected?, :responses, :send_command, :is_master?, :port, :primary?
 
     attr_reader :type
 

data/lib/monga/connections/buffer.rb

@@ -14,17 +14,17 @@ module Monga::Connections
     def append(data)
       @buffer << data
       @buffer_size = @buffer.bytesize
-      job
+      parse
       @buffer
     end
 
-    def job
-      parse_meta if @position == 0
-      parse_doc if @position > 0
+    def parse
+      parse_meta  if @position == 0
+      parse_doc  if @position > 0
     end
 
     def parse_meta
-      return if @buffer_size < 36
+      return  if @buffer_size < 36
       @response = []
       @response << ::BinUtils.get_int32_le(@buffer, @position)
       @response << ::BinUtils.get_int32_le(@buffer, @position += 4)
@@ -41,21 +41,15 @@ module Monga::Connections
 
     def parse_doc
       while true
-        if @number_returned == 0
-          done
-          break
-        end
-        break if @buffer_size < @position + 4
+        break  if done
+        break  if @buffer_size < @position + 4
         doc_length = ::BinUtils.get_int32_le(@buffer, @position)
-        break if @buffer_size < @position + doc_length
+        break  if @buffer_size < @position + doc_length
+
         doc = @buffer[@position, doc_length]
         @response[-1] << CBson.deserialize(doc)
         @position += doc_length
         @number_returned -= 1
-        if @number_returned == 0
-          done
-          break
-        end
       end
     end
 
@@ -66,6 +60,7 @@ module Monga::Connections
     end
 
     def done
+      return false  if @number_returned > 0
       @responses << @response
       @response = nil
       if @buffer_size == @position

data/lib/monga/connections/em_connection.rb

@@ -105,7 +105,7 @@ module Monga::Connections
       req = Monga::Protocol::Query.new(self, "admin", "$cmd", query: {"isMaster" => 1}, limit: 1)
       command = req.command
       request_id = req.request_id
-      @responses[request_id] = proc do |data|
+      blk = proc do |data|
         err, resp = req.parse_response(data)
         if Exception === err
           @primary = false
@@ -115,6 +115,7 @@ module Monga::Connections
           yield @primary ? :primary : :secondary
         end
       end
+      @responses[request_id] = blk
       send_data command
     end
   end

data/lib/monga/connections/em_proxy_connection.rb

@@ -6,7 +6,7 @@ module Monga::Connections
   # Importaint to say, that requests will be stored in this object only for `timeout` period.
   class EMProxyConnection
     # Pause while searching server in seconds
-    WAIT = 0.1
+    WAIT = 0.05
     
     def initialize(client)
       @client = client
@@ -14,13 +14,13 @@ module Monga::Connections
       @requests = {}
     end
 
-    # If timeout is defined then collect request and start timout.
-    # If timout is not defined or zero then return exception.
+    # If timeout is defined then collect request and start timeout.
+    # If timeout is not defined or zero then return exception.
     def send_command(msg, request_id = nil, &cb)
       if @timeout && @timeout > 0 
         @requests[request_id] = [msg, cb] if cb
-        set_timeout
-        find_server!
+        set_timeout unless @pending_timeout
+        find_server! unless @pending_server
       else
         error = Monga::Exceptions::Disconnected.new "Can't find appropriate server (all disconnected)"
         cb.call(error) if cb
@@ -29,48 +29,50 @@ module Monga::Connections
 
     # If timeout happend send exception to all collected requests.
     def set_timeout
-      unless @pending_timeout
-        @pending_timeout = true
-        EM.add_timer(@timeout) do
-          @pending_timeout = false
-          @requests.keys.each do |request_id|
-            msg, cb = @requests.delete request_id
-            error = Monga::Exceptions::Disconnected.new "Can't find appropriate server (all disconnected)"
-            cb.call(error)
-          end
-        end
+      @pending_timeout = EM::Timer.new(@timeout) do
+        @timeout_happend = true
+      end
+    end
+
+    def timeout_happend
+      @timeout_happend = false
+      @pending_timeout = false
+      @pending_server = false
+      @requests.keys.each do |request_id|
+        msg, cb = @requests.delete request_id
+        error = Monga::Exceptions::Disconnected.new "Can't find appropriate server (all disconnected)"
+        cb.call(error) if cb
       end
     end
 
     # Find server unless server is found
-    def find_server!
-      if !@pending_server && @pending_timeout
-        @pending_server = true
-        _count = 0
-        @client.clients.each do |client|
-          client.force_status! do |status|
-            if status == :primary && [:primary, :primary_preferred, :secondary_preferred].include?(@client.read_pref)
-              @pending_server = false
-              server_found!
-            elsif status == :secondary && [:secondary, :primary_preferred, :secondary_preferred].include?(@client.read_pref)
-              @pending_server = false
-              server_found!
-            else
-              EM.add_timer(WAIT) do
-                EM.next_tick do
-                  @pending_server = false if (_count +=1) == @client.clients.size
-                  find_server!
-                end
-              end
+    def find_server!(i = 0)
+      @pending_server = true
+      if @pending_timeout && !@timeout_happend
+        size = @client.clients.size
+        client = @client.clients[i%size]
+        client.force_status! do |status|
+          if status == :primary && [:primary, :primary_preferred, :secondary_preferred].include?(@client.read_pref)
+            server_found!
+          elsif status == :secondary && [:secondary, :primary_preferred, :secondary_preferred].include?(@client.read_pref)
+            server_found!
+          else
+            EM::Timer.new(WAIT) do
+              find_server!(i+1)
             end
           end
         end
+      else
+        timeout_happend
       end
     end
 
     # YEEEHA! Send all collected requests back to client
     def server_found!
-      @pending_timeout = false
+      @pending_server = false
+      @pending_timeout.cancel if @pending_timeout
+      @pending_timeout = nil
+      @timeout_happend = false
       @requests.keys.each do |request_id|
         msg, blk = @requests.delete request_id
         @client.aquire_connection.send_command(msg, request_id, &blk)

data/lib/monga/connections/fibered_proxy_connection.rb

@@ -2,14 +2,14 @@ module Monga::Connections
   class FiberedProxyConnection < EMProxyConnection
     def send_command(msg, request_id = nil, &cb)
       if @timeout && @timeout > 0
-        @requests[request_id] = [msg, @fib]
         @fib = Fiber.current
+        @requests[request_id] = [msg, @fib]
         set_timeout
         find_server!
         res = Fiber.yield
-        @requests.delete(request_id)
         raise res if Exception === res
-        @client.aquire_connection.send_command(msg, request_id, &cb)
+        conn = @client.aquire_connection
+        conn.send_command(msg, request_id, &cb)
       else
         error = Monga::Exceptions::Disconnected.new "Can't find appropriate server (all disconnected)"
         cb.call(error) if cb
@@ -17,7 +17,13 @@ module Monga::Connections
     end
 
     def server_found!
-      @fib.resume
+      @pending_server = false
+      @pending_timeout.cancel if @pending_timeout
+      @pending_timeout = nil
+      @requests.keys.each do |req_id|
+        msg, fib = @requests.delete req_id
+        fib.call
+      end
     end
   end
 end

data/lib/monga/connections/kgio_connection.rb

@@ -1,5 +1,5 @@
 require 'kgio'
-require 'io/nonblock'
+require 'io/nonblock' # ha?
 module Monga::Connections
   class KGIOConnection
     def self.connect(host, port, timeout)
@@ -13,16 +13,22 @@ module Monga::Connections
     end
 
     def connected?
+      socket unless @connected
       @connected
     end
 
     def socket
       @socket ||= begin
         sock = Kgio::TCPSocket.new(@host, @port)
-        sock.kgio_autopush = true
+        sock.kgio_autopush = true unless RUBY_PLATFORM['darwin']
+        # check connection
+        sock.kgio_write ""
+        # Macos doesn't support autopush
         @connected = true
         sock
       end
+    rescue => e
+      nil
     end
 
     # Fake answer, as far as we are blocking
@@ -31,6 +37,7 @@ module Monga::Connections
     end
 
     def send_command(msg, request_id=nil, &cb)
+      raise Errno::ECONNREFUSED, "Connection Refused" unless socket
       socket.kgio_write msg.to_s
       if cb
         read_socket

data/lib/monga/connections/proxy_connection.rb

@@ -3,7 +3,7 @@ require 'timeout'
 module Monga::Connections
   class ProxyConnection
     # Pause while searching server in seconds
-    WAIT = 0.1
+    WAIT = 0.3
     
     def initialize(client)
       @client = client
@@ -32,6 +32,8 @@ module Monga::Connections
           sleep(WAIT)
         end
       end
+    rescue Timeout::Error => e
+      raise Monga::Exceptions::Disconnected.new "Can't find appropriate server (all disconnected)"
     end
 
     # Find server unless server is found

data/lib/monga/cursor.rb

@@ -248,7 +248,7 @@ module Monga
     def each_batch
       begin
         batch, more = next_batch
-        yield batch
+        yield batch if more || batch
       end while more
     end
 
@@ -268,7 +268,7 @@ module Monga
     def each_doc
       begin
         doc, more = next_doc
-        yield doc
+        yield doc if more || doc
       end while more
     end
     alias :each_document :each_doc

data/monga.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "monga"
-  spec.version       = "0.0.4"
+  spec.version       = "0.0.5"
   spec.authors       = ["Petr Yanovich"]
   spec.email         = ["fl00r@yandex.ru"]
   spec.description   = %q{MongoDB Ruby Evented Driver on EventMachine}

data/spec/helpers/mongodb.rb

@@ -61,7 +61,8 @@ module Fake
     end
 
     def primary
-      @si.rs.primary == @si if @si.rs
+      pr = @si.rs.primary == @si if @si.rs
+      pr
     end
 
     def receive_data(data)
@@ -82,12 +83,13 @@ module Fake
   # Single instance binded on one port.
   # Could be stopped or started.
   class SingleInstance
-    attr_reader :rs
+    attr_reader :rs, :port
     attr_accessor :server
 
     def initialize(port, rs=nil)
       @rs = rs
       @port = port
+      EM.add_shutdown_hook{ @connected = false }
     end
 
     def start

data/spec/monga/block/replica_set_client_spec.rb

@@ -4,12 +4,12 @@ describe Monga::Clients::ReplicaSetClient do
   before do
     @thread = Thread.new do
       EM.run do
-        @replset = Fake::ReplicaSet.new([29000, 29100, 29200])
+        @replset = Fake::ReplicaSet.new([39000, 39100, 39200])
         @replset.start_all
       end
     end
     sleep 0.1
-    @client = Monga::Client.new servers: ['127.0.0.1:29000', '127.0.0.1:29100', '127.0.0.1:29200'], type: :block, timeout: 1
+    @client = Monga::Client.new servers: ['127.0.0.1:39000', '127.0.0.1:39100', '127.0.0.1:39200'], type: :block, timeout: 1
     @collection = @client["dbTest"]["myCollection"]
   end
 
@@ -25,8 +25,8 @@ describe Monga::Clients::ReplicaSetClient do
     @collection.safe_insert(name: "Peter")
     @replset.primary.stop
     proc{ @collection.safe_insert(name: "Peter") }.must_raise Monga::Exceptions::Disconnected
-    proc{ @collection.safe_insert(name: "Peter") }.must_raise Timeout::Error
-    proc{ @collection.safe_insert(name: "Peter") }.must_raise Timeout::Error
+    proc{ @collection.safe_insert(name: "Peter") }.must_raise Monga::Exceptions::Disconnected
+    proc{ @collection.safe_insert(name: "Peter") }.must_raise Monga::Exceptions::Disconnected
     @replset.primary.start
     sleep(0.1)
     @collection.safe_insert(name: "Madonna")
@@ -50,9 +50,10 @@ describe Monga::Clients::ReplicaSetClient do
     @collection.safe_insert(name: "Peter")
     @replset.primary.stop
     proc{ @collection.safe_insert(name: "Peter") }.must_raise Monga::Exceptions::Disconnected
-    proc{ @collection.safe_insert(name: "Peter") }.must_raise Timeout::Error
-    proc{ @collection.safe_insert(name: "Peter") }.must_raise Timeout::Error
+    proc{ @collection.safe_insert(name: "Peter") }.must_raise Monga::Exceptions::Disconnected
+    proc{ @collection.safe_insert(name: "Peter") }.must_raise Monga::Exceptions::Disconnected
     @replset.vote
+    sleep 0.1
     @collection.safe_insert(name: "Madonna")
   end
 end

data/spec/monga/em/replica_set_client_spec.rb

@@ -3,8 +3,9 @@ require 'spec_helper'
 describe Monga::Clients::ReplicaSetClient do
   before do
     EM.run do
-      @replset = Fake::ReplicaSet.new([29000, 29100, 29200])
-      @client = Monga::Client.new servers: ['127.0.0.1:29000', '127.0.0.1:29100', '127.0.0.1:29200'], type: :em, timeout: 1
+      @replset = Fake::ReplicaSet.new([39000, 39100, 39200])
+      @replset.start_all
+      @client = Monga::Client.new servers: ['127.0.0.1:39000', '127.0.0.1:39100', '127.0.0.1:39200'], type: :em, timeout: 1
       @collection = @client["dbTest"]["myCollection"]
       EM.stop
     end

data/spec/monga/em/single_instance_client_spec.rb

@@ -3,9 +3,9 @@ require 'spec_helper'
 describe Monga::Clients::SingleInstanceClient do
   before do
     EM.synchrony do
-      @client = Monga::Client.new port: 29000, type: :em
+      @client = Monga::Client.new port: 39000, type: :em
       @collection = @client["dbTest"]["myCollection"]
-      @instance = Fake::SingleInstance.new(29000)
+      @instance = Fake::SingleInstance.new(39000)
       EM.stop
     end
   end

data/spec/monga/sync/database_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Monga::Database do
   before do
     EM.synchrony do
-      @client = Monga::Client.new
+      @client = Monga::Client.new type: :sync
       @db = @client["dbTest"]
       @collection = @db["testCollection"]
       @collection.safe_remove

data/spec/monga/sync/replica_set_client_spec.rb

@@ -3,8 +3,9 @@ require 'spec_helper'
 describe Monga::Clients::ReplicaSetClient do
   before do
     EM.synchrony do
-      @replset = Fake::ReplicaSet.new([29000, 29100, 29200])
-      @client = Monga::Client.new servers: ['127.0.0.1:29000', '127.0.0.1:29100', '127.0.0.1:29200'], type: :sync, timeout: 1
+      @replset = Fake::ReplicaSet.new([19000, 19100, 19200])
+      @replset.start_all
+      @client = Monga::Client.new servers: ['127.0.0.1:19000', '127.0.0.1:19100', '127.0.0.1:19200'], type: :sync, timeout: 1
       @collection = @client["dbTest"]["myCollection"]
       EM.stop
     end
@@ -17,7 +18,7 @@ describe Monga::Clients::ReplicaSetClient do
       @replset.primary.stop
       proc{ @collection.safe_insert(name: "Peter") }.must_raise Monga::Exceptions::Disconnected
       proc{ @collection.safe_insert(name: "Peter") }.must_raise Monga::Exceptions::Disconnected
-      EM.add_timer(0.5) do
+      EM.add_timer(0.1) do
         @replset.primary.start
       end
       @collection.safe_insert(name: "Peter")

data/spec/monga/sync/single_instance_client_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 describe Monga::Clients::SingleInstanceClient do
   before do
     EM.synchrony do
-      @instance = Fake::SingleInstance.new(29000)
-      @client = Monga::Client.new port: 29000, type: :sync
+      @instance = Fake::SingleInstance.new(39000)
+      @client = Monga::Client.new port: 39000, type: :sync
       @collection = @client["dbTest"]["myCollection"]
       EM.stop
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: monga
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -194,7 +194,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      hash: 3881917270092852844
+      hash: 100645476183189099
       version: '0'
       segments:
       - 0
@@ -203,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      hash: 3881917270092852844
+      hash: 100645476183189099
       version: '0'
       segments:
       - 0