protobuf-nats 0.6.0.pre1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '0388b13bc49e6bbb528a8749d02b47b220933ac0'
-  data.tar.gz: 250e52352f75557ee911b0afd5095ae8428bdcaf
+  metadata.gz: 2161460631f9da05ed8476799eec44dad8c9cd62
+  data.tar.gz: af9204023684c1aa0f233454de7a1fec2cceac63
 SHA512:
-  metadata.gz: 3fdec8891afa18de68624fa9f476ec2bfcc59b01bdaff3788ffe0979ad77f64d6e3d589c313d16af142688ace7ee6ab17cec670e241e57f798bba160880bd6ea
-  data.tar.gz: e1bb774b5d1971e4704eb423202c1dec9adb1e30158b29acd9d46615a1e8e0fb43b5d64a9c72ff33db7e1369eb1eff4452e4667fde5bef30709f29fc5eb4d76c
+  metadata.gz: 601753df1bf104f0af11ce6259210dbfad8eb508ace11563f52d7a0a5a4c6c67baf411c43316e60e25703eed824f639620b934dc8c27d073f61733f136c032ff
+  data.tar.gz: ed8be857402c974a386fbe5f272a3a00ca12ea3af0504a6648a27688e16ff35785422f6df404b0a12dc4e53d9397b272c223b35277b1c67e324740357da46a9d

data/lib/protobuf/nats/client.rb

@@ -80,11 +80,11 @@ module Protobuf
           case @response_data
           when :ack_timeout
             next if (retries -= 1) > 0
-            raise ::NATS::IO::Timeout
+            raise ::Protobuf::Nats::Errors::RequestTimeout
           when :nack
             interval = nack_backoff_intervals[nack_retry]
             nack_retry += 1
-            raise ::NATS::IO::Timeout if interval.nil?
+            raise ::Protobuf::Nats::Errors::RequestTimeout if interval.nil?
             sleep((interval + nack_backoff_splay)/1000.0)
             next
           end
@@ -138,18 +138,20 @@ module Protobuf
           # Wait for reply
           first_message = nats.next_message(sub, ack_timeout)
           return :ack_timeout if first_message.nil?
-          return :nack if first_message.data == ::Protobuf::Nats::Messages::NACK
+          first_message_data = first_message.data
+          return :nack if first_message_data == ::Protobuf::Nats::Messages::NACK
 
           second_message = nats.next_message(sub, timeout)
-          fail(::NATS::IO::Timeout, subject) if second_message.nil?
+          second_message_data = second_message.nil? ? nil : second_message.data
 
           # Check messages
           response = case ::Protobuf::Nats::Messages::ACK
-                     when first_message.data then second_message.data
-                     when second_message.data then first_message.data
+                     when first_message_data then second_message_data
+                     when second_message_data then first_message_data
+                     else return :ack_timeout
                      end
 
-          fail(::NATS::IO::Timeout, subject) unless response
+          fail(::Protobuf::Nats::Errors::ResponseTimeout, subject) unless response
 
           response
         ensure
@@ -197,9 +199,10 @@ module Protobuf
           response = case ::Protobuf::Nats::Messages::ACK
                      when first_message then second_message
                      when second_message then first_message
+                     else return :ack_timeout
                      end
 
-          fail(::NATS::IO::Timeout, subject) unless response
+          fail(::Protobuf::Nats::Errors::ResponseTimeout, subject) unless response
 
           response
         ensure

data/lib/protobuf/nats/errors.rb

@@ -1,6 +1,15 @@
 module Protobuf
   module Nats
     module Errors
+      class Base < ::StandardError
+      end
+
+      class RequestTimeout < Base
+      end
+
+      class ResponseTimeout < Base
+      end
+
       class MriIOException < ::StandardError
       end
 

data/lib/protobuf/nats/server.rb

@@ -58,7 +58,8 @@ module Protobuf
         if was_enqueued
           nats.publish(reply_id, ::Protobuf::Nats::Messages::ACK)
         else
-          nats.publish(reply_id, ::Protobuf::Nats::Messages::NACK)
+          # TODO: Uncomment once we can roll out NACK messages without a 60 second timeout
+          # nats.publish(reply_id, ::Protobuf::Nats::Messages::NACK)
         end
 
         was_enqueued

data/lib/protobuf/nats/version.rb

@@ -1,5 +1,5 @@
 module Protobuf
   module Nats
-    VERSION = "0.6.0.pre1"
+    VERSION = "0.6.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protobuf-nats
 version: !ruby/object:Gem::Version
-  version: 0.6.0.pre1
+  version: 0.6.0
 platform: ruby
 authors:
 - Brandon Dewitt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-01 00:00:00.000000000 Z
+date: 2017-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protobuf
@@ -166,9 +166,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.2