ione-rpc 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 518c9857895955f9c26c4be3d3be5d21773c7525
-  data.tar.gz: 6b6c39ffa664e4b290bb5c0ebaeab462dd8fbb23
+  metadata.gz: bd2dfbaf504cd8f90db14054c3f1be44a1bf6740
+  data.tar.gz: 4ecca4c71c9d9857c4df03a0caaecf52fb56a973
 SHA512:
-  metadata.gz: d3e6c4d47dda87d60ac7034243d0c946af0117bd8fed3b043d23ecbbbc6cb6817253e3b5199bb5967d38b077d51ed40a4991d04de29e93cd7adbb0e12098427e
-  data.tar.gz: 9f60335dcdb60a2353fcf07684fdd9e9f17715c679253badb1f6415e4e276de67759bfe427392e48266db2216d7a7be3a816dbb2543e6eeb9152e53c702926bb
+  metadata.gz: 005b40b386819c5f9ce87398b6456981b996d7d9a82f03aa13db17f64a18db4de9117474261b7a1c7a2cf30117542db425c00165d8a5f99272441f5413ce5c5a
+  data.tar.gz: 336273d46b03c7cbcd15f59b2c9f3b46ce8da3de9169b583bbb9f867238af9eff73f4dc9cca227f93aa38409ed5342e1c2dd7a413cc05f37937fa712770b6cc8

data/README.md

@@ -10,11 +10,16 @@ Ione RPC is a framework for writing server and client components for your Ruby a
 
 # Installing
 
-There is currently no gem release of Ione RPC, but you can install it from git with Bundler:
+Ione RPC is available from [Rubygems](https://rubygems.org) and can be installed with the `gem` command:
+
+```
+$ gem install ione-rpc
+```
+
+but more commonly you will add it to your `Gemfile`:
 
 ```ruby
-# in Gemfile
-gem 'ione-rpc', github: 'iconara/ione-rpc'
+gem 'ione-rpc'
 ```
 
 # Example
@@ -140,7 +145,7 @@ class TranslationClient < Ione::Rpc::Client
 end
 ```
 
-If you read the part above about how the client randomly selected which server to talk to and though that that wasn't very useful, there's a way to override that, just implement `#choose_connection`:
+If you read the part above about how the client randomly selected which server to talk to and thought that that wasn't very useful, there's a way to override that, just implement `#choose_connection`:
 
 ```ruby
 class TranslationClient < Ione::Rpc::Client

data/lib/ione/rpc/client.rb

@@ -141,15 +141,19 @@ module Ione
       #   client (immediately, this is mostly to be consistent with #add_host)
       def remove_host(hostname, port=nil)
         hostname, port = normalize_address(hostname, port)
+        connection = nil
         @lock.synchronize do
           index = @hosts.index { |h, p, _| h == hostname && p == port }
           if index
             @hosts.delete_at(index)
-            if (connection = @connections.find { |c| c.host == hostname && c.port == port })
-              connection.close
+            if (conn = @connections.find { |c| c.host == hostname && c.port == port })
+              connection = conn
             end
           end
         end
+        if connection
+          connection.close
+        end
         Future.resolved(self)
       end
 

data/lib/ione/rpc/client_peer.rb

@@ -39,7 +39,7 @@ module Ione
         if closed?
           return Ione::Future.failed(Rpc::RequestNotSentError.new('Connection closed'))
         end
-        promise = Ione::Promise.new
+        promise = RequestPromise.new
         channel = nil
         @lock.lock
         begin
@@ -60,12 +60,11 @@ module Ione
           end
         end
         if timeout
-          @scheduler.schedule_timer(timeout).on_value do
-            unless promise.future.completed?
-              error = Rpc::TimeoutError.new('No response received within %ss' % timeout.to_s)
-              promise.fail(error)
-              @timeouts += 1
-            end
+          promise.timeout_future = @scheduler.schedule_timer(timeout)
+          promise.timeout_future.on_value do
+            error = Rpc::TimeoutError.new('No response received within %ss' % timeout.to_s)
+            promise.fail(error)
+            @timeouts += 1
           end
         end
         promise.future
@@ -73,6 +72,10 @@ module Ione
 
       private
 
+      class RequestPromise < Promise
+        attr_accessor :timeout_future
+      end
+
       def handle_message(response, channel)
         promise = nil
         @lock.lock
@@ -85,6 +88,7 @@ module Ione
         end
         if promise && !promise.future.completed?
           promise.fulfill(response)
+          @scheduler.cancel_timer(promise.timeout_future) if promise.timeout_future
         end
         flush_queue
       end

data/lib/ione/rpc/codec.rb

@@ -133,9 +133,9 @@ module Ione
           else
             message = decode_body(state, body)
           end
-          return message, state.channel, true
+          [message, state.channel, true]
         else
-          return state, nil, false
+          [state, nil, false]
         end
       end
 

data/lib/ione/rpc/version.rb

@@ -2,6 +2,6 @@
 
 module Ione
   module Rpc
-    VERSION = '1.0.0'.freeze
+    VERSION = '1.0.1'.freeze
   end
 end

data/spec/ione/rpc/client_peer_spec.rb

@@ -53,6 +53,9 @@ module Ione
           timer_promises << Promise.new
           timer_promises.last.future
         end
+        scheduler.stub(:cancel_timer) do |timer|
+          timer_promises.delete(timer)
+        end
         scheduler.stub(:timer_promises).and_return(timer_promises)
       end
 
@@ -146,6 +149,13 @@ module Ione
           expect { f.value }.to_not raise_error
         end
 
+        it 'cancel the timeout timer when the response is received before the timeout passes' do
+          f = peer.send_message('foo', 2)
+          connection.data_listener.call('bar@000')
+          scheduler.timer_promises.first.fulfill
+          scheduler.should have_received(:cancel_timer).once
+        end
+
         it 'fails the request when the connection is closed' do
           connection.stub(:closed?).and_return(true)
           f = peer.send_message('foo', 2)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ione-rpc
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Theo Hultberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2015-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ione
@@ -17,6 +17,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
 description: A toolkit for building RPC layers using Ione
 email:
 - theo@iconara.net