freddy 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d677aed926ebfba37c90931e9cf1945e68b9b25
-  data.tar.gz: cf670f4b31d6d15434edf9f53876cf447f6a4b5a
+  metadata.gz: bc5a587ccd4505868a43c8444abdbb376d30e124
+  data.tar.gz: f4f09ae1d1f046689e71245b9170cf9154fa0946
 SHA512:
-  metadata.gz: 71e4c1cfe3a93a877fd05f04962c2c63b14e9bf9d5b14bbef0657855e649d30aa90c152c224d059030932e98c5e7b80c7474cf8238eb6425965ed138f9d62837
-  data.tar.gz: 2f84c367f1b5d2bfb6108962343c92ef8dc160479bd79d14b1bdf166ef6f4fa9608a5a71e9299664a9b00b09cab1102f2e1b93c859d383544099ac2c27da1e8b
+  metadata.gz: c9e6c129c97c63e92abdb3449f127fdb3c64dcf6b73a385b3bd3acd57682f8d3ceb30850e3a38a3431cc7bd61408f2177db9f861547beed33ff58e9babc7b4ba
+  data.tar.gz: bdcc1cbb44b821cda0494177c326eab270f254e2c0cb8988bd620f3dbb221967788c2ec58bbe23c87f416fd2f85d4d9724e80d242868fb0c47662cce64a71ec9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    freddy (0.3.3)
+    freddy (0.3.4)
       bunny (= 1.6.3)
       hamster (~> 1.0.1.pre.rc3)
       symbolizer

data/README.md

@@ -49,13 +49,15 @@ response = freddy.deliver_with_response(destination, message, timeout: 4, delete
 ```
 
 #### Errors
-`deliver_with_response` raises an error if an error is returned. This can be handled by rescuing from `Freddy::ErrorResponse` as:
+`deliver_with_response` raises an error if an error is returned. This can be handled by rescuing from `Freddy::InvalidRequestError` and `Freddy::TimeoutError` as:
 ```ruby
 begin
   response = freddy.deliver_with_response 'Q', {}
   # ...
-rescue Freddy::ErrorResponse => e
-  e.response # => { error: 'Timed out waiting for response' }
+rescue Freddy::InvalidRequestError => e
+  e.response # => { error: 'InvalidRequestError', message: 'Some error message' }
+rescue Freddy::TimeoutError => e
+  e.response # => { error: 'RequestTimeout', message: 'Timed out waiting for response' }
 ```
 
 ## Responding to messages

data/freddy.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "freddy"
-  spec.version       = '0.3.3'
+  spec.version       = '0.3.4'
   spec.authors       = ["Urmas Talimaa"]
   spec.email         = ["urmas.talimaa@gmail.com"]
   spec.description   = %q{Messaging API}

data/lib/freddy.rb

@@ -16,6 +16,12 @@ class Freddy
     end
   end
 
+  class InvalidRequestError < ErrorResponse
+  end
+
+  class TimeoutError < ErrorResponse
+  end
+
   FREDDY_TOPIC_EXCHANGE_NAME = 'freddy-topic'.freeze
 
   def self.format_backtrace(backtrace)

data/lib/freddy/request_manager.rb

@@ -35,7 +35,8 @@ class Freddy
       message = "Request #{correlation_id} timed out waiting response from #{request[:destination]} with timeout #{request[:timeout]}"
       @logger.warn message
       Freddy.notify 'RequestTimeout', message, request: correlation_id, destination: request[:destination], timeout: request[:timeout]
-      request[:callback].call({error: 'Timed out waiting for response'}, nil)
+
+      request[:callback].call({error: 'RequestTimeout', message: 'Timed out waiting for response'}, nil)
     end
   end
 end

data/lib/freddy/sync_response_container.rb

@@ -12,8 +12,10 @@ class Freddy
         sleep 0.001 until filled?
       end
 
-      if !@delivery || @delivery.properties[:type] == 'error'
-        raise ErrorResponse.new(@response)
+      if @response[:error] == 'RequestTimeout'
+        raise TimeoutError.new(@response)
+      elsif !@delivery || @delivery.properties[:type] == 'error'
+        raise InvalidRequestError.new(@response)
       else
         @response
       end

data/spec/freddy/freddy_spec.rb

@@ -60,7 +60,7 @@ describe Freddy do
 
       expect {
         freddy.deliver_with_response(destination, payload)
-      }.to raise_error(Freddy::ErrorResponse) {|error|
+      }.to raise_error(Freddy::InvalidRequestError) {|error|
         expect(error.response).to eq(error: 'not today')
       }
     end
@@ -88,7 +88,7 @@ describe Freddy do
 
       expect {
         freddy.deliver_with_response(destination2, payload)
-      }.to raise_error(Freddy::ErrorResponse)
+      }.to raise_error(Freddy::InvalidRequestError)
     end
 
     context 'when queue does not exist' do
@@ -97,7 +97,7 @@ describe Freddy do
           Timeout::timeout(0.5) do
             expect {
               freddy.deliver_with_response(destination, {a: 'b'}, timeout: 3)
-            }.to raise_error(Freddy::ErrorResponse) {|error|
+            }.to raise_error(Freddy::InvalidRequestError) {|error|
               expect(error.response).to eq(error: 'Specified queue does not exist')
             }
           end
@@ -113,8 +113,8 @@ describe Freddy do
 
         expect {
           freddy.deliver_with_response(destination, {a: 'b'}, timeout: 0.1)
-        }.to raise_error(Freddy::ErrorResponse) {|error|
-          expect(error.response).to eq(error: 'Timed out waiting for response')
+        }.to raise_error(Freddy::TimeoutError) {|error|
+          expect(error.response).to eq(error: 'RequestTimeout', message: 'Timed out waiting for response')
         }
       end
 
@@ -126,7 +126,7 @@ describe Freddy do
 
           expect {
             freddy.deliver_with_response(destination, {}, timeout: 0.1)
-          }.to raise_error(Freddy::ErrorResponse)
+          }.to raise_error(Freddy::TimeoutError)
           default_sleep # to ensure everything is properly cleaned
 
           processed_after_timeout = false
@@ -145,7 +145,7 @@ describe Freddy do
 
           expect {
             freddy.deliver_with_response(destination, {}, timeout: 0.1, delete_on_timeout: false)
-          }.to raise_error(Freddy::ErrorResponse)
+          }.to raise_error(Freddy::TimeoutError)
           default_sleep # to ensure everything is properly cleaned
 
           processed_after_timeout = false

data/spec/integration/concurrency_spec.rb

@@ -8,7 +8,7 @@ describe 'Concurrency' do
       begin
         result = freddy.deliver_with_response 'Concurrency2', msg: 'noop'
         msg_handler.success(result)
-      rescue Freddy::ErrorResponse => e
+      rescue Freddy::InvalidRequestError => e
         msg_handler.error(e.response)
       end
     end
@@ -17,7 +17,7 @@ describe 'Concurrency' do
       begin
         result = freddy.deliver_with_response 'Concurrency3', msg: 'noop'
         msg_handler.success(result)
-      rescue Freddy::ErrorResponse => e
+      rescue Freddy::InvalidRequestError => e
         msg_handler.error(e.response)
       end
     end
@@ -29,7 +29,7 @@ describe 'Concurrency' do
     result =
       begin
         freddy.deliver_with_response 'Concurrency1', msg: 'noop'
-      rescue Freddy::ErrorResponse => e
+      rescue Freddy::InvalidRequestError => e
         e.response
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: freddy
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Urmas Talimaa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-07 00:00:00.000000000 Z
+date: 2015-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: API for inter-application messaging supporting acknowledgements and request-response