freddy 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd30720991795db96e70f26190cf3a1b65e92417
-  data.tar.gz: fc188e002812f0d38781bd9971a8dec0f27fab4e
+  metadata.gz: f1b843578b576679503e114c5e6bda050cd980eb
+  data.tar.gz: af256b6384fca7e9ee13fd4d9a5f8b3301a96d0d
 SHA512:
-  metadata.gz: eeb84534acc65e95aa33cfdb4a7619af476cf5355192dacc1b078cde7702f8323b0370bd63036d29fd10a4550fb6c11a68922c93b14e517d2482712001c23f04
-  data.tar.gz: fe31e8cdc06941aa5d3d5bb214802bae19e4d86bf11d40a6381c3eef0f9cfcf8296eaa100d72e2a501f9c8fd001e6ad02ee1b0afcf5f4f62e5c9eaea8a9253ec
+  metadata.gz: 3b3768d47cf8a14f2743ca9e391458cba6968165e6fc29e8f1112f6bd093dff34bb933e76155baa95711fcbc8da4a6b734cf982a094fe63ba50566a06683d196
+  data.tar.gz: 225aca279255a4f0d9643100f48ecc32b817f55b43fb16a120cf7fdf2b32c8b5bd0f649c9c333e0e38c1815de1c7d01b6159588413ce10099a224cf1c9289c9c

data/.gitignore

@@ -1 +1,5 @@
 .bundle/
+Gemfile.lock
+pkg
+.tags
+.tags1

data/.travis.yml

@@ -1,8 +1,10 @@
 language: ruby
 rvm:
   - 2.1.0
+  - jruby-9.0.0.0
 services:
   - rabbitmq
 before_script:
-  - bundle
+  - gem install bundler
+  - bundle install
 script: bundle exec rspec

data/Gemfile

@@ -5,4 +5,4 @@ group :test, :development do
   gem 'pry'
 end
 
-gemspec
+gemspec

data/README.md

@@ -126,11 +126,6 @@ The following operations are supported:
   * stop responding
 ```ruby
 responder_handler.cancel
-```
-
-  * join the current thread to the responder thread
-```ruby
-responder_handler.join
 ```
 
   * delete the destination
@@ -149,11 +144,11 @@ The thread pool is shared between *tap_into* and *respond_to* callbacks and the
 The thread pool size can be configured by passing the configuration option *max_concurrency*.
 
 
-Note that while it is possible to use *deliver_with_response* inside a *respond_to* block, 
+Note that while it is possible to use *deliver_with_response* inside a *respond_to* block,
 it is not possible to use another *respond_to* block inside a different *respond_to* block.
 
 
-Note also that other configuration options for freddy users 
+Note also that other configuration options for freddy users
 such as pool sizes for DB connections need to match or exceed *max_concurrency*
 to avoid running out of resources.
 

data/freddy.gemspec

@@ -3,8 +3,12 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
-  spec.name          = "freddy"
-  spec.version       = '0.4.2'
+  if RUBY_PLATFORM == 'java'
+    spec.name          = "freddy-jruby"
+  else
+    spec.name          = "freddy"
+  end
+  spec.version       = '0.4.3'
   spec.authors       = ["Urmas Talimaa"]
   spec.email         = ["urmas.talimaa@gmail.com"]
   spec.description   = %q{Messaging API}
@@ -16,10 +20,15 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
 
-  spec.add_dependency "bunny", "1.6.3"
+  if RUBY_PLATFORM == 'java'
+    spec.add_dependency 'march_hare', '~> 2.12.0'
+  else
+    spec.add_dependency "bunny", "2.2.0"
+  end
+
   spec.add_dependency "symbolizer"
   spec.add_dependency "hamster", "~> 1.0.1.pre.rc3"
   spec.add_dependency "thread", "~> 0.2"

data/lib/freddy.rb

@@ -1,8 +1,14 @@
-require 'bunny'
+if RUBY_PLATFORM == 'java'
+  require 'march_hare'
+else
+  require 'bunny'
+end
+
 require 'json'
 require 'symbolizer'
 require 'thread/pool'
 
+require_relative 'freddy/adaptive_queue'
 require_relative 'freddy/consumer'
 require_relative 'freddy/producer'
 require_relative 'freddy/request'
@@ -64,18 +70,23 @@ class Freddy
     end
   end
 
-  def self.build(logger = Logger.new(STDOUT), bunny_config)
-    bunny = Bunny.new(bunny_config)
-    bunny.start
+  def self.build(logger = Logger.new(STDOUT), config)
+    if RUBY_PLATFORM == 'java'
+      connection = MarchHare.connect(config)
+    else
+      connection = Bunny.new(config)
+      connection.start
+      connection
+    end
 
-    channel = bunny.create_channel
-    new(channel, logger, bunny_config.fetch(:max_concurrency, 4))
+    new(connection, logger, config.fetch(:max_concurrency, 4))
   end
 
   attr_reader :channel, :consumer, :producer, :request
 
-  def initialize(channel, logger, max_concurrency)
-    @channel  = channel
+  def initialize(connection, logger, max_concurrency)
+    @connection = connection
+    @channel  = connection.create_channel
     @consume_thread_pool = Thread.pool(max_concurrency)
     @consumer = Consumer.new channel, logger, @consume_thread_pool
     @producer = Producer.new channel, logger
@@ -106,4 +117,8 @@ class Freddy
       timeout: timeout, delete_on_timeout: delete_on_timeout
     }
   end
+
+  def close
+    @connection.close
+  end
 end

data/lib/freddy/adaptive_queue.rb

@@ -0,0 +1,34 @@
+class Freddy
+  class AdaptiveQueue
+    def initialize(queue)
+      @queue = queue
+    end
+
+    def subscribe(&block)
+      if hare?
+        @queue.subscribe do |meta, payload|
+          block.call(payload, Delivery.new(meta, meta.routing_key))
+        end
+      else
+        @queue.subscribe do |info, properties, payload|
+          block.call(payload, Delivery.new(properties, info.routing_key))
+        end
+      end
+    end
+
+    def bind(*args)
+      @queue.bind(*args)
+      self
+    end
+
+    def name
+      @queue.name
+    end
+
+    private
+
+    def hare?
+      RUBY_PLATFORM == 'java'
+    end
+  end
+end

data/lib/freddy/consumer.rb

@@ -30,10 +30,10 @@ class Freddy
     end
 
     def tap_into(pattern, &block)
-      queue = @channel.queue("", exclusive: true).bind(@topic_exchange, routing_key: pattern)
-      consumer = queue.subscribe do |delivery_info, properties, payload|
+      queue = create_queue('', exclusive: true).bind(@topic_exchange, routing_key: pattern)
+      consumer = queue.subscribe do |payload, delivery|
         @consume_thread_pool.process do
-          block.call parse_payload(payload), delivery_info.routing_key
+          block.call parse_payload(payload), delivery.routing_key
         end
       end
       @logger.debug "Tapping into messages that match #{pattern}"
@@ -43,11 +43,11 @@ class Freddy
     private
 
     def consume_using_pool(queue, options, pool, &block)
-      consumer = queue.subscribe options do |delivery_info, properties, payload|
+      consumer = queue.subscribe do |payload, delivery|
         pool.process do
           parsed_payload = parse_payload(payload)
-          log_receive_event(queue.name, parsed_payload, properties[:correlation_id])
-          block.call parsed_payload, Delivery.new(delivery_info, properties)
+          log_receive_event(queue.name, parsed_payload, delivery.correlation_id)
+          block.call parsed_payload, delivery
         end
       end
       @logger.debug "Consuming messages on #{queue.name}"
@@ -62,8 +62,8 @@ class Freddy
       end
     end
 
-    def create_queue(destination)
-      @channel.queue(destination)
+    def create_queue(destination, options={})
+      AdaptiveQueue.new(@channel.queue(destination, options))
     end
 
     def log_receive_event(queue_name, payload, correlation_id)

data/lib/freddy/delivery.rb

@@ -1,10 +1,14 @@
 class Freddy
   class Delivery
-    attr_reader :info, :properties
+    attr_reader :metadata, :routing_key
 
-    def initialize(info, properties)
-      @info = info
-      @properties = properties
+    def initialize(metadata, routing_key)
+      @metadata = metadata
+      @routing_key = routing_key
+    end
+
+    def correlation_id
+      @metadata.correlation_id
     end
   end
 end

data/lib/freddy/message_handler.rb

@@ -4,17 +4,16 @@ class Freddy
 
     def initialize(adapter, delivery)
       @adapter = adapter
-      @properties = delivery.properties
-      @destination = @properties[:destination]
-      @correlation_id = @properties[:correlation_id]
+      @metadata = delivery.metadata
+      @correlation_id = @metadata.correlation_id
     end
 
     def success(response = nil)
-      @adapter.success(@properties[:reply_to], response)
+      @adapter.success(@metadata.reply_to, response)
     end
 
     def error(error = {error: "Couldn't process message"})
-      @adapter.error(@properties[:reply_to], error)
+      @adapter.error(@metadata.reply_to, error)
     end
   end
 end

data/lib/freddy/message_handlers.rb

@@ -5,7 +5,8 @@ class Freddy
     end
 
     class StandardMessageHandler
-      def initialize(producer, logger)
+      def initialize(producer, destination, logger)
+        @destination = destination
         @producer = producer
         @logger = logger
       end
@@ -13,9 +14,8 @@ class Freddy
       def handle_message(payload, msg_handler, &block)
         block.call payload, msg_handler
       rescue Exception => e
-        destination = msg_handler.destination
-        @logger.error "Exception occured while processing message from #{destination}: #{Freddy.format_exception(e)}"
-        Freddy.notify_exception(e, destination: destination)
+        @logger.error "Exception occured while processing message from #{Freddy.format_exception(e)}"
+        Freddy.notify_exception(e, destination: @destination)
       end
 
       def success(*)
@@ -28,9 +28,10 @@ class Freddy
     end
 
     class RequestHandler
-      def initialize(producer, logger)
+      def initialize(producer, destination, logger)
         @producer = producer
         @logger = logger
+        @destination = destination
       end
 
       def handle_message(payload, msg_handler, &block)
@@ -44,7 +45,7 @@ class Freddy
         end
       rescue Exception => e
         @logger.error "Exception occured while handling the request with correlation_id #{@correlation_id}: #{Freddy.format_exception(e)}"
-        Freddy.notify_exception(e, destination: msg_handler.destination, correlation_id: @correlation_id)
+        Freddy.notify_exception(e, correlation_id: @correlation_id, destination: @destination)
       end
 
       def success(reply_to, response)

data/lib/freddy/producer.rb

@@ -3,6 +3,8 @@ require 'json'
 
 class Freddy
   class Producer
+    OnReturnNotImplemented = Class.new(NoMethodError)
+
     CONTENT_TYPE = 'application/json'.freeze
 
     def initialize(channel, logger)
@@ -21,8 +23,20 @@ class Freddy
       @exchange.publish json_payload, properties.dup
     end
 
-    def on_return(*args, &block)
-      @exchange.on_return(*args, &block)
+    def on_return(&block)
+      if @exchange.respond_to? :on_return # Bunny
+        @exchange.on_return do |return_info, properties, content|
+          block.call(return_info[:reply_code], properties[:correlation_id])
+        end
+      elsif @channel.respond_to? :on_return # Hare
+        @channel.on_return do |reply_code, _, exchange_name, _, properties|
+          if exchange_name != Freddy::FREDDY_TOPIC_EXCHANGE_NAME
+            block.call(reply_code, properties.correlation_id)
+          end
+        end
+      else
+        raise OnReturnNotImplemented.new "AMQP implementation doesn't implement on_return"
+      end
     end
   end
 end

data/lib/freddy/request.rb

@@ -23,9 +23,9 @@ class Freddy
       @request_map = Hamster.mutable_hash
       @request_manager = RequestManager.new @request_map, @logger
 
-      @producer.on_return do |return_info, properties, content|
-        if return_info[:reply_code] == NO_ROUTE
-          @request_manager.no_route(properties[:correlation_id])
+      @producer.on_return do |reply_code, correlation_id|
+        if reply_code == NO_ROUTE
+          @request_manager.no_route(correlation_id)
         end
       end
 
@@ -68,9 +68,8 @@ class Freddy
 
       ensure_response_queue_exists
       @logger.info "Listening for requests on #{destination}"
-
       responder_handler = @consumer.consume destination do |payload, delivery|
-        handler = MessageHandlers.for_type(delivery.properties[:type]).new(@producer, @logger)
+        handler = MessageHandlers.for_type(delivery.metadata.type).new(@producer, destination, @logger)
 
         msg_handler = MessageHandler.new(handler, delivery)
         handler.handle_message payload, msg_handler, &block
@@ -81,11 +80,11 @@ class Freddy
     private
 
     def create_response_queue
-      @channel.queue("", exclusive: true)
+      AdaptiveQueue.new @channel.queue("", exclusive: true)
     end
 
     def handle_response(payload, delivery)
-      correlation_id = delivery.properties[:correlation_id]
+      correlation_id = delivery.metadata.correlation_id
       request = @request_map[correlation_id]
       if request
         @logger.debug "Got response for request to #{request[:destination]} with correlation_id #{correlation_id}"

data/lib/freddy/responder_handler.rb

@@ -17,14 +17,5 @@ class Freddy
     def destroy_destination
       @consumer.queue.delete
     end
-
-    def join
-      @channel.work_pool.join
-    end
-
-    def shutdown
-      @channel.work_pool.shutdown
-    end
-
   end
 end

data/lib/freddy/sync_response_container.rb

@@ -14,7 +14,7 @@ class Freddy
 
       if @response[:error] == 'RequestTimeout'
         raise TimeoutError.new(@response)
-      elsif !@delivery || @delivery.properties[:type] == 'error'
+      elsif !@delivery || @delivery.metadata.type == 'error'
         raise InvalidRequestError.new(@response)
       else
         @response

data/spec/freddy/consumer_spec.rb

@@ -8,6 +8,8 @@ describe Freddy::Consumer do
 
   let(:consumer) { freddy.consumer }
 
+  after { freddy.close }
+
   it 'raises exception when no consumer is provided' do
     expect { consumer.consume destination }.to raise_error described_class::EmptyConsumer
   end

data/spec/freddy/freddy_spec.rb

@@ -7,6 +7,8 @@ describe Freddy do
   let(:destination2) { random_destination }
   let(:payload)      { {pay: 'load'} }
 
+  after { freddy.close }
+
   def respond_to(&block)
     freddy.respond_to(destination, &block)
   end

data/spec/freddy/message_handler_spec.rb

@@ -4,8 +4,8 @@ describe Freddy::MessageHandler do
   subject(:handler) { described_class.new(adapter, delivery) }
 
   let(:adapter) { double }
-  let(:delivery) { double(properties: properties) }
-  let(:properties) { {reply_to: reply_to} }
+  let(:delivery) { double(metadata: metadata) }
+  let(:metadata) { double(reply_to: reply_to, correlation_id: 'abc') }
 
   let(:reply_to) { double }
 

data/spec/freddy/request_spec.rb

@@ -8,12 +8,14 @@ describe Freddy::Request do
 
   let(:request) { freddy.request }
 
+  after { freddy.close }
+
   it 'raises empty responder exception when responding without callback' do
     expect {@responder = request.respond_to destination }.to raise_error described_class::EmptyResponder
   end
 
   context 'requesting from multiple threads' do
-    let(:nr_of_threads) { 10 }
+    let(:nr_of_threads) { 50 }
 
     before do
       freddy.respond_to 'thread-queue' do |payload, msg_handler|
@@ -22,15 +24,16 @@ describe Freddy::Request do
     end
 
     it 'handles multiple threads' do
-      msg_counter = 0
-      nr_of_threads.times.map do
+      require 'hamster/experimental/mutable_set'
+      msg_counter = Hamster.mutable_set
+      nr_of_threads.times.map do |index|
         Thread.new do
           response = freddy.deliver_with_response 'thread-queue', payload
-          msg_counter += 1
+          msg_counter << index
           expect(response).to eq(payload)
         end
       end.each(&:join)
-      expect(msg_counter).to eq(nr_of_threads)
+      expect(msg_counter.count).to eq(nr_of_threads)
     end
 
   end

data/spec/freddy/responder_handler_spec.rb

@@ -6,6 +6,8 @@ describe Freddy::ResponderHandler do
   let(:destination) { random_destination }
   let(:payload)     { {pay: 'load'} }
 
+  after { freddy.close }
+
   it 'can cancel listening for messages' do
     consumer_handler = freddy.respond_to destination do
       @messages_count ||= 0
@@ -17,17 +19,4 @@ describe Freddy::ResponderHandler do
 
     expect(@messages_count).to eq 1
   end
-
-  it 'can join the thread to the consumer' do
-    consumer_handler = freddy.respond_to destination do
-    end
-    unreachable = true
-    Thread.new do
-      consumer_handler.join
-      unreachable = false
-    end
-    wait_for { unreachable }
-    expect(unreachable).to be(true)
-  end
-
 end

data/spec/integration/concurrency_spec.rb

@@ -5,6 +5,8 @@ describe 'Concurrency' do
   let(:freddy2) { Freddy.build(logger, config) }
   let(:freddy3) { Freddy.build(logger, config) }
 
+  after { [freddy1, freddy2, freddy3].each(&:close) }
+
   it 'supports multiple requests in #respond_to' do
     freddy1.respond_to 'Concurrency1' do |payload, msg_handler|
       begin

data/spec/integration/logging_spec.rb

@@ -10,6 +10,8 @@ describe 'Logging' do
   let(:destination) { random_destination }
   let(:payload)     { {pay: 'load'} }
 
+  after { [freddy1, freddy2].each(&:close) }
+
   before do
     freddy1.respond_to destination do |payload, msg_handler|
       msg_handler.success

data/spec/spec_helper.rb

@@ -1,21 +1,16 @@
 require 'pry'
 require 'securerandom'
 require 'freddy'
+require 'logger'
+
+Thread.abort_on_exception = true
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
   config.order = 'random'
 end
 
-class Freddy::Consumer
-  def create_queue(queue_name)
-    #want to auto_delete queues while testing
-    @channel.queue(queue_name, auto_delete: true)
-  end
-end
-
 def random_destination
   SecureRandom.hex
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: freddy
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Urmas Talimaa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2015-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.3
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.3
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: symbolizer
   requirement: !ruby/object:Gem::Requirement
@@ -108,12 +108,12 @@ files:
 - ".ruby-version"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENCE.txt
 - README.md
 - Rakefile
 - freddy.gemspec
 - lib/freddy.rb
+- lib/freddy/adaptive_queue.rb
 - lib/freddy/consumer.rb
 - lib/freddy/delivery.rb
 - lib/freddy/message_handler.rb

data/Gemfile.lock

@@ -1,54 +0,0 @@
-PATH
-  remote: .
-  specs:
-    freddy (0.4.2)
-      bunny (= 1.6.3)
-      hamster (~> 1.0.1.pre.rc3)
-      symbolizer
-      thread (~> 0.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    amq-protocol (1.9.2)
-    atomic (1.1.99)
-    bunny (1.6.3)
-      amq-protocol (>= 1.9.2)
-    coderay (1.1.0)
-    diff-lcs (1.2.5)
-    hamster (1.0.1.pre.rc3)
-      atomic (~> 1.1)
-    method_source (0.8.2)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rake (10.3.2)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    slop (3.6.0)
-    symbolizer (0.0.1)
-    thread (0.2.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.3)
-  freddy!
-  pry
-  rake
-  rspec
-
-BUNDLED WITH
-   1.10.6