fleck 0.5.1 → 0.6.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 025ee667a52973215fb6c8fe25fa4e60d16298c7
-  data.tar.gz: 0fff1a88508733c2913a889175b26c1f8623656d
+  metadata.gz: 3ed2d8327cd0b426a6b0cc46ea6cb419c9d13e7b
+  data.tar.gz: 35a37db895a6747cdd10b81727f71c6bbafe7ef1
 SHA512:
-  metadata.gz: 0a2b7f2473088bfd62f9b2501e72e96847f0d01f07126bdea63c3ecd9b6409e0e49684ed0a8bcf802eb54acba49122de4203ee9c4ffdb6b991a5a562a6ac2556
-  data.tar.gz: 19954ecda9a2e3b3d6d5ba2cc45e50ca5e98c4ff7184936b988a72523e403947b75c6e66b24995a585cae18f63cb71eab2ec880f694dfefb328ba7cb966729ea
+  metadata.gz: 6d29b40d7fc239bd4270953332af99b4274dbb164467c2ce02047bf3495bba035d8cf86f26c5e00fa253160d3378d9b27127c35fbc291005f41adb419580cb99
+  data.tar.gz: c70db6dbf8db14d47a937a87092b476e5acc54f812a587698841f38b0e1c7f92162107de715fc8a409377ffd7ad8105df82660371c4899fa2334c6d80801f783

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## develop ##
 
+## v0.6.0 (16 June 2016)
+  - **NEW** __(BREAKING CHANGE)__ Use `"fleck"` exchange for RPC simulation, so that reply queues could be used in a RabbitMQ Federation configuration.
+            Be careful when upgrading `Fleck::Consumer` from version `v0.5.x` or below, because now `Fleck::Consumer` will send responses to a `:direct` exchange
+            named `"fleck"`. If there're `Fleck::Clients` that are at version `v0.5.x` or below, they will not be able to receive the response from consumers of a
+            newer version.
+  - **NEW** Added a filter that prevents from using reserved `Fleck::Consumer` methods as actions.
+  - **NEW** Implemented the feature that allows to start consumer in a blocking way.
+  - **NEW** Added `:prefetch` and `:mandatory` options to `Fleck::Consumer` configuration options.
+
 ## v0.5.1 (20 April 2016)
   - **FIX** Don't expire requests with multiple responses if any response is received. Treat that kind of request as expired if no response has been received
             until the request expiration.

data/examples/blocking_consumer.rb

@@ -0,0 +1,42 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+require 'fleck'
+
+user        = ENV['USER']        || 'guest'
+pass        = ENV['PASS']        || 'guest'
+
+CONCURRENCY = (ENV['CONCURRENCY'] || 2).to_i
+SAMPLES     = (ENV['SAMPLES']     || 10).to_i
+
+Fleck.configure do |config|
+  config.default_user = user
+  config.default_pass = pass
+  config.loglevel     = Logger::DEBUG
+end
+
+connection = Fleck.connection(host: "127.0.0.1", port: 5672, user: user, pass: pass, vhost: "/")
+client = Fleck::Client.new(connection, "blocking.consumer.example.queue")
+
+class MyConsumer < Fleck::Consumer
+  configure queue: 'blocking.consumer.example.queue', autostart: false
+  actions :quit
+
+  initialize do
+    @value = "MY CONSUMER :) #{self.object_id}"
+  end
+
+  def quit
+    logger.debug "Quit message received, but I'm goint to sleep for 2 seconds ..."
+    sleep 2
+    logger.debug "Let's terminate this example!"
+    terminate
+  end
+end
+
+client.request(action: 'quit', timeout: 5, async: true)
+
+MyConsumer.start(block: true)
+
+puts "We did it :)"
+sleep 0.01 # Give some time to Bunny to cancel subscribtions and to close channels and connections

data/lib/fleck/client.rb

@@ -15,9 +15,10 @@ module Fleck
       @mutex              = Mutex.new
 
       @channel     = @connection.create_channel
-      @exchange    = @channel.default_exchange
-      @publisher   = Bunny::Exchange.new(@channel, exchange_type, exchange_name)
+      @exchange    = Bunny::Exchange.new(@channel, :direct, 'fleck')
+      @publisher   = Bunny::Exchange.new(@connection.create_channel, exchange_type, exchange_name)
       @reply_queue = @channel.queue("", exclusive: true, auto_delete: true)
+      @reply_queue.bind(@exchange, routing_key: @reply_queue.name)
 
       handle_returned_messages!
       @concurrency.times { handle_responses! }

data/lib/fleck/consumer.rb

@@ -31,6 +31,7 @@ module Fleck
     end
 
     def self.register_action(action, method_name)
+      raise ArgumentError.new("Cannot use `:#{method_name}` method as an action, because it is reserved for Fleck::Consumer internal stuff!") if Fleck::Consumer.instance_methods.include?(method_name.to_s.to_sym)
       self.actions_map[action.to_s] = method_name.to_s
     end
 
@@ -38,9 +39,9 @@ module Fleck
       self.initialize_block = block
     end
 
-    def self.start
+    def self.start(block: false)
       self.consumers.each do |consumer|
-        consumer.start
+        consumer.start(block: block)
       end
     end
 
@@ -77,6 +78,8 @@ module Fleck
       @__consumer_tag = nil
       @__request      = nil
       @__response     = nil
+      @__lock         = Mutex.new
+      @__lounger      = ConditionVariable.new
 
       @__host          = configs[:host]
       @__port          = configs[:port]
@@ -87,6 +90,8 @@ module Fleck
       @__exchange_name = configs[:exchange_name] || ""
       @__queue_name    = configs[:queue]
       @__autostart     = configs[:autostart]
+      @__prefetch      = (configs[:prefetch]      || 100).to_i
+      @__mandatory     = !!configs[:mandatory]
 
       if self.class.initialize_block
         self.instance_eval(&self.class.initialize_block)
@@ -101,10 +106,11 @@ module Fleck
       end
     end
 
-    def start
+    def start(block: false)
       connect!
       create_channel!
       subscribe!
+      @__lock.synchronize{ @__lounger.wait(@__lock) } if block
     end
 
     def on_message(request, response)
@@ -117,6 +123,7 @@ module Fleck
     end
 
     def terminate
+      @__lock.synchronize { @__lounger.signal }
       pause
       unless channel.nil? || channel.closed?
         channel.close
@@ -202,8 +209,8 @@ module Fleck
 
       logger.debug "Creating a new channel for #{self.class.to_s.color(:yellow)} consumer"
       @__channel  = @__connection.create_channel
-      @__channel.prefetch(1) # prevent from dispatching a new RabbitMQ message, until the previous message is not processed
-      @__publisher = @__channel.default_exchange
+      @__channel.prefetch(@__prefetch) # consume messages in batches
+      @__publisher = Bunny::Exchange.new(@__connection.create_channel, :direct, 'fleck')
       if @__exchange_type == :direct && @__exchange_name == ""
         @__queue = @__channel.queue(@__queue_name, auto_delete: false)
       else
@@ -243,7 +250,7 @@ module Fleck
           if @__channel.closed?
             logger.warn "Channel already closed! The response #{metadata.correlation_id} is going to be dropped."
           else
-            @__publisher.publish(@__response.to_json, routing_key: metadata.reply_to, correlation_id: metadata.correlation_id, mandatory: true)
+            @__publisher.publish(@__response.to_json, routing_key: metadata.reply_to, correlation_id: metadata.correlation_id, mandatory: @__mandatory)
             @__channel.ack(delivery_info.delivery_tag)
           end
         end

data/lib/fleck/version.rb

@@ -1,3 +1,3 @@
 module Fleck
-  VERSION = "0.5.1"
+  VERSION = "0.6.0.rc1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fleck
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0.rc1
 platform: ruby
 authors:
 - Groza Sergiu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,6 +143,7 @@ files:
 - bin/console
 - bin/setup
 - examples/actions.rb
+- examples/blocking_consumer.rb
 - examples/consumer_initialization.rb
 - examples/deprecation.rb
 - examples/example.rb
@@ -176,12 +177,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A Ruby gem for syncronous and asyncronous communication via Message Queue