fleck 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 459b048a5d3ec2ee5c6035829059fcb394978d67
-  data.tar.gz: 675b6149f083da223220ede2da5df5201200a5a8
+  metadata.gz: 3844f5f141564257d45c59386c82683d9adc62ec
+  data.tar.gz: d5fec104b21c27ebd65b439a66ac702617324d93
 SHA512:
-  metadata.gz: 0aad519394a954fa98c57b1434a405ebba4fb449b87b081f2c8823d0d2ac7fad6e60ea632159e52d7451cfdeb22374d38b16a4f4ca6a925ebff8f9c5b3448963
-  data.tar.gz: 892197f7f42232fc10695ef13060fee5ccc0c9233731590ef278172953f2df7245adac06208073397eece063509648fecc441c9e2bee4af9f13c17cc28c64330
+  metadata.gz: bd36645f66fea70b5347acbb86673eee29ac8a3e89e02ad43dcc0c9d5d585efbe38f5d3ebb175ae5f4075aa94779387c4e17dfc8839f0e6029642aa8a95b10c7
+  data.tar.gz: e107b55e67021305429092c26c69d62f5c7af55f011763ab5dbf7950d80bb627d8d826fe2303218e5c543879f81aefc1ce75eac313f7f46b701f006a6104aef2

data/README.md

@@ -55,7 +55,7 @@ ASYNC   = false                       # a flag to indicate if the request is asy
 
 connection = Fleck.connection(host: '127.0.0.1', port: 5672, user: 'guest', pass: 'guest', vhost: '/')
 client = Fleck::Client.new(connection, QUEUE)
-response = client.request(HEADERS, PARAMS, ASYNC)
+response = client.request(headers: HEADERS, params: PARAMS, async: ASYNC)
 
 response.status  # => returns the status code of the response
 response.headers # => returns the headers Hash of the response
@@ -63,13 +63,20 @@ response.body    # => returns the body of the response
 response.errors  # => returns the Array of errors
 ```
 
+All the options of the requests are optional. The available options for request are:
+  - `headers:` - (default: `{}`) - allows to set headers for the request
+  - `params`   - (default: `{}`) - allows to set the parameters of the request
+  - `async`    - (default: `false`) - indicates if the request should be executed asynchronously
+  - `timeout`  - (default: `nil`) - when set, indicates the request timeout in seconds after which the request will be canceled
+  - `queue`    - (default: `<client queue>`) - allows to specify a different queue where to enqueue the request
+
 #### Request with block
 
 You might want to process the response of asynchronous requests when the response is ready. In that case you could pass a block to the request,
 so that the block is called when the response is completed:
 
 ```ruby
-client.request({}, {param1: 'myparam'}, true) do |request, response|
+client.request(headers: {}, params: {param1: 'myparam'}, async: true) do |request, response|
   if response.status == 200
     puts "#{response.status} #{response.body}"
   else
@@ -78,6 +85,7 @@ client.request({}, {param1: 'myparam'}, true) do |request, response|
 end
 ```
 
+
 ### Fleck::Consumer
 
 To use `Fleck::Consumer` all you need is to inherit it by an another class:

data/lib/fleck/client/request.rb

@@ -51,5 +51,11 @@ module Fleck
       @ended_at = Time.now.to_f
       logger.debug "Done in #{((@ended_at - @started_at).round(5) * 1000).round(2)} ms"
     end
+
+    def cancel!
+      logger.warn "Request canceled!"
+      self.response = Fleck::Client::Response.new(Oj.dump({status: 503, errors: ['Service Unavailable'], body: nil} , mode: :compat))
+      complete!
+    end
   end
 end

data/lib/fleck/client.rb

@@ -11,7 +11,7 @@ module Fleck
       @reply_queue = @channel.queue("", exclusive: true)
       @requests    = ThreadSafe::Hash.new
 
-      @reply_queue.subscribe do |delivery_info, metadata, payload|
+      @subscription = @reply_queue.subscribe do |delivery_info, metadata, payload|
         begin
           logger.debug "Response received: #{payload}"
           request = @requests[metadata[:correlation_id]]
@@ -32,22 +32,37 @@ module Fleck
       end
     end
 
-    def request(headers = {}, payload = {}, async = false, &block)
-      request = Fleck::Client::Request.new(@exchange, @queue_name, @reply_queue.name, headers, payload, &block)
+    def request(headers: {}, params: {}, async: false, timeout: nil, queue: @queue_name, &block)
+      request = Fleck::Client::Request.new(@exchange, queue, @reply_queue.name, headers, params, &block)
       @requests[request.id] = request
-      request.send!(async)
+      if timeout && !async
+        begin
+          Timeout.timeout(timeout.to_f) do
+            request.send!(false)
+          end
+        rescue Timeout::Error => e
+          logger.warn "Failed to get any response in #{timeout} seconds for request #{request.id.to_s.color(:red)}! The request will be canceled."
+          request.cancel!
+          @requests.delete request.id
+        end
+      else
+        request.send!(async)
+      end
 
       return request.response
     end
 
     def terminate
+      logger.info "Unsubscribing from #{@reply_queue.name}"
       @requests.each do |id, request|
         begin
-          request.complete!
+          request.cancel!
         rescue => e
           logger.error e.inspect + "\n" + e.backtrace.join("\n")
         end
       end
+      @requests.clear
+      @subscription.cancel
     end
   end
 end

data/lib/fleck/version.rb

@@ -1,3 +1,3 @@
 module Fleck
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/lib/fleck.rb

@@ -17,10 +17,6 @@ module Fleck
   @consumers   = ThreadSafe::Array.new
   @connections = ThreadSafe::Hash.new
 
-  at_exit do
-    Fleck.terminate
-  end
-
   def self.configure
     yield @config if block_given?
     @config

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fleck
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Groza Sergiu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-17 00:00:00.000000000 Z
+date: 2016-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler