fastbeans 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 !binary "U0hBMQ==":
-  metadata.gz: 5936875dd05eed4d051e79ade5a96ff780098367
-  data.tar.gz: 393572d7da151951bdf6d454094e3b52f0dfb149
+  metadata.gz: 19bd06c785553f14f9ecbfb281189452dfe6580d
+  data.tar.gz: 55df3beda354d29fbe4a3a1ba1bc539d4161e6c0
 !binary "U0hBNTEy":
-  metadata.gz: 12a76b54d34d4279983c12be6d6b4ac507c0925b6de12a9d840ab32713d1db5714afbd5173a1f187fbf30f5114ce88b9f7ed6070a5abcfa993ca824e07528b01
-  data.tar.gz: f868e81095eca258bbd8c510bbcf45d353774bca61f83ce3d1f89a63616b3f3ee287666e16a33a5d5d06b9496ef71d9d9cf814ffeba2f1e22a939955728566e2
+  metadata.gz: 862bea544dd1bd9e33fca5db3ec105b3bd0672963fbe0451d1cf1b2883ab6c60831d77c8488d2feea4e70e11757116bb257a2e4e718c8bfb43db0475ef0fdbc1
+  data.tar.gz: 1ddb58a6ce2775db33d454c23e1b0ec018a7c8eab3911c7c939d24ba14af56108a9fadac475cbfec1d32e5c57ced6f120f4bd7b34bbe14e133e6fb647e346cf4

data/lib/fastbeans/client.rb

@@ -2,6 +2,7 @@ require 'msgpack'
 require 'rufus-lru'
 require 'connection_pool'
 require 'fastbeans/connection'
+require 'fastbeans/request'
 
 module Fastbeans
   class Client
@@ -31,7 +32,12 @@ module Fastbeans
     def call(*data)
       Fastbeans.benchmark("Calling: #{data.first.inspect}") do
         pool.with do |conn|
-          conn.call(*data)
+          if data.last.is_a?(Hash) and (data.last.keys.to_set & Fastbeans::Request::OPTION_KEYS)
+            opts = data.pop
+          else
+            opts = {}
+          end
+          conn.call(data, opts)
         end
       end
     end

data/lib/fastbeans/connection.rb

@@ -40,10 +40,10 @@ module Fastbeans
       connect!(@host, @port)
     end
 
-    def call(*data)
+    def call(data, opts)
       retries = 0
       begin
-        call_without_retries(data)
+        call_without_retries(data, opts)
       rescue Fastbeans::RemoteConnectionFailed, Fastbeans::ResponseReadTimeout => e
         Fastbeans.debug(e)
         if retries < MAX_RETRIES
@@ -61,8 +61,8 @@ module Fastbeans
       end
     end
 
-    def call_without_retries(data)
-      perform(data)
+    def call_without_retries(data, opts)
+      perform(data, opts)
 
     rescue IOError, Errno::EPIPE, Errno::ECONNREFUSED, Errno::ECONNRESET, MessagePack::MalformedFormatError => e
       disconnect!
@@ -82,8 +82,8 @@ module Fastbeans
       raise
     end
 
-    def perform(data)
-      Request.new(self).perform(data)
+    def perform(data, opts)
+      Request.new(self, opts).perform(data)
     end
   end
 end

data/lib/fastbeans/request.rb

@@ -7,9 +7,11 @@ module Fastbeans
     attr_reader :connection
 
     RESPONSE_READ_TIMEOUT = 120
+    OPTION_KEYS = [:timeout]
 
-    def initialize(connection)
+    def initialize(connection, opts = {})
       @connection = connection
+      @options = {:timeout => RESPONSE_READ_TIMEOUT}.update(opts)
     end
 
     def sign(call_data)
@@ -32,13 +34,13 @@ module Fastbeans
     end
 
     def read_response(sock, call_data)
-      raw_resp = Timeout.timeout(RESPONSE_READ_TIMEOUT, Fastbeans::ResponseReadTimeout) do
+      raw_resp = Timeout.timeout(@options[:timeout], Fastbeans::ResponseReadTimeout) do
         MessagePack.load(sock)
       end
       Fastbeans::Response.new(call_data, raw_resp)
     rescue Fastbeans::ResponseReadTimeout
       @connection.disconnect!
-      raise Fastbeans::ResponseReadTimeout, "Couldn't read response in #{RESPONSE_READ_TIMEOUT} seconds"
+      raise Fastbeans::ResponseReadTimeout, "Couldn't read response in #{@options[:timeout]} seconds"
     end
 
     def perform(call_data)

data/lib/fastbeans/version.rb

@@ -1,3 +1,3 @@
 module Fastbeans
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end

data/test/connection_test.rb

@@ -37,14 +37,14 @@ class ConnectionTest < MiniTest::Unit::TestCase
 
   def test_call_without_retries
     Fastbeans::Request.any_instance.expects(:perform).with(@test_msg).returns(:reply)
-    assert_equal :reply, @conn.call_without_retries(@test_msg)
+    assert_equal :reply, @conn.call_without_retries(@test_msg, {})
   end
 
   def test_exception_during_call
-    @conn.expects(:perform).with(@test_msg).raises(RuntimeError)
+    @conn.expects(:perform).with(@test_msg, {}).raises(RuntimeError)
     @conn.expects(:disconnect!)
     assert_raises RuntimeError do
-      @conn.call_without_retries(@test_msg)
+      @conn.call_without_retries(@test_msg, {})
     end
   end
 
@@ -52,10 +52,10 @@ class ConnectionTest < MiniTest::Unit::TestCase
     ioexcs = [IOError, Errno::EPIPE, MessagePack::MalformedFormatError,
               Errno::ECONNREFUSED, Errno::ECONNRESET]
     ioexcs.each do |exc|
-      @conn.expects(:perform).with(@test_msg).raises(exc)
+      @conn.expects(:perform).with(@test_msg, {}).raises(exc)
       @conn.expects(:disconnect!)
       assert_raises Fastbeans::RemoteConnectionFailed do
-        @conn.call_without_retries(@test_msg)
+        @conn.call_without_retries(@test_msg, {})
       end
     end
   end
@@ -63,17 +63,17 @@ class ConnectionTest < MiniTest::Unit::TestCase
   def test_perform
     req = mock
     req.expects(:perform).with(@test_msg).returns(:result)
-    Fastbeans::Request.expects(:new).with(@conn).returns(req)
-    assert_equal :result, @conn.perform(@test_msg)
+    Fastbeans::Request.expects(:new).with(@conn, {}).returns(req)
+    assert_equal :result, @conn.perform(@test_msg, {})
   end
 
   def test_call_with_retries
     @conn.expects(:call_without_retries).
-        with(@test_msg).times(4).
+        with(@test_msg, {}).times(4).
         raises(Fastbeans::RemoteConnectionFailed)
     @conn.expects(:reconnect!).times(3)
     assert_raises Fastbeans::RemoteConnectionDead do
-      assert_nil @conn.call(*@test_msg)
+      assert_nil @conn.call(@test_msg, {})
     end
   end
 

data/test/test_helper.rb

@@ -9,7 +9,7 @@ require 'fastbeans'
 class MockConnection
   def initialize(*any); end
 
-  def call(*data)
+  def call(data, opts)
     data
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastbeans
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Dima Sabanin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack