monga 0.0.5 → 0.0.6

data/lib/monga/clients/replica_set_client.rb

@@ -14,7 +14,7 @@ module Monga::Clients
 
       servers = opts.delete :servers
       @clients = servers.map do |server|
-        c = case server
+        case server
         when Hash
           Monga::Clients::SingleInstanceClient.new(opts.merge(server))
         when String
@@ -22,8 +22,6 @@ module Monga::Clients
           o = { host: h, port: p.to_i }
           Monga::Clients::SingleInstanceClient.new(opts.merge(o))
         end
-        c.force_status!
-        c
       end
 
       @proxy_connection = Monga::Connection.proxy_connection_class(opts[:type], self)

data/lib/monga/clients/single_instance_client.rb

@@ -42,7 +42,6 @@ module Monga::Clients
           yield(@status) if block_given?
         end
       else
-        @status = nil
         yield(@status) if block_given?
       end
     end

data/lib/monga/connections/buffer.rb

@@ -19,8 +19,10 @@ module Monga::Connections
     end
 
     def parse
-      parse_meta  if @position == 0
-      parse_doc  if @position > 0
+      begin
+        more = parse_meta  if @position == 0
+        parse_doc  if @position > 0
+      end while more && @position == 0
     end
 
     def parse_meta

data/lib/monga/connections/em_connection.rb

@@ -25,7 +25,7 @@ module Monga::Connections
       callback do
         send_data msg
       end
-      @responses[request_id] = cb if cb
+      @responses[request_id] = cb  if cb
     end
 
     def receive_data(data)
@@ -33,7 +33,7 @@ module Monga::Connections
       @buffer.each do |message|
         request_id = message[2]
         cb = @responses.delete request_id
-        cb.call(message) if cb
+        cb.call(message)  if cb
       end
     end
 
@@ -68,7 +68,7 @@ module Monga::Connections
     end
 
     def connected?
-      reconnect unless @reactor_running
+      reconnect unless @connected
       @connected || false
     end
 

data/lib/monga/connections/em_proxy_connection.rb

@@ -14,6 +14,10 @@ module Monga::Connections
       @requests = {}
     end
 
+    def type
+      :em
+    end
+
     # 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)
@@ -22,7 +26,7 @@ module Monga::Connections
         set_timeout unless @pending_timeout
         find_server! unless @pending_server
       else
-        error = Monga::Exceptions::Disconnected.new "Can't find appropriate server (all disconnected)"
+        error = Monga::Exceptions::Disconnected.new "Can't find appropriate server (all disconnected) without timeout"
         cb.call(error) if cb
       end
     end
@@ -36,6 +40,7 @@ module Monga::Connections
 
     def timeout_happend
       @timeout_happend = false
+      @pending_timeout.cancel  if @pending_timeout
       @pending_timeout = false
       @pending_server = false
       @requests.keys.each do |request_id|

data/lib/monga/connections/fibered_proxy_connection.rb

@@ -1,5 +1,10 @@
 module Monga::Connections
   class FiberedProxyConnection < EMProxyConnection
+
+    def type
+      :sync
+    end
+    
     def send_command(msg, request_id = nil, &cb)
       if @timeout && @timeout > 0
         @fib = Fiber.current

data/lib/monga/connections/proxy_connection.rb

@@ -4,6 +4,10 @@ module Monga::Connections
   class ProxyConnection
     # Pause while searching server in seconds
     WAIT = 0.3
+
+    def type
+      :block
+    end
     
     def initialize(client)
       @client = client

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.5"
+  spec.version       = "0.0.6"
   spec.authors       = ["Petr Yanovich"]
   spec.email         = ["fl00r@yandex.ru"]
   spec.description   = %q{MongoDB Ruby Evented Driver on EventMachine}

data/spec/helpers/mongodb.rb

@@ -61,8 +61,7 @@ module Fake
     end
 
     def primary
-      pr = @si.rs.primary == @si if @si.rs
-      pr
+      @si.rs.primary == @si  if @si.rs
     end
 
     def receive_data(data)
@@ -93,12 +92,12 @@ module Fake
     end
 
     def start
-      @sign = EM.start_server('127.0.0.1', @port, Fake::Node, self) unless @connected
+      @sign = EM.start_server('127.0.0.1', @port, Fake::Node, self)  unless @connected
       @connected = true
     end
 
     def stop
-      @server.close_connection
+      @server.close_connection  if @server
       EM.stop_server @sign
       @connected = false
     end
@@ -123,6 +122,7 @@ module Fake
 
     def vote
       @primary = @instances.select{|inst| inst.connected? }.sample
+      @primary
     end
 
     def primary

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: monga
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-26 00:00:00.000000000 Z
+date: 2013-04-29 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: 100645476183189099
+      hash: -3962526029351115610
       version: '0'
       segments:
       - 0
@@ -203,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      hash: 100645476183189099
+      hash: -3962526029351115610
       version: '0'
       segments:
       - 0