hot_bunnies 1.5.0-java → 2.0.0.pre1-java

data/lib/hot_bunnies.rb

@@ -4,99 +4,13 @@ require 'java'
 require 'ext/commons-io'
 require 'ext/rabbitmq-client'
 
+require 'hot_bunnies/version'
+require 'hot_bunnies/exceptions'
+require 'hot_bunnies/session'
 
 module HotBunnies
-  java_import 'com.rabbitmq.client.ConnectionFactory'
-  java_import 'com.rabbitmq.client.Connection'
-  java_import 'com.rabbitmq.client.Channel'
-  java_import 'com.rabbitmq.client.DefaultConsumer'
-  java_import 'com.rabbitmq.client.AMQP'
-
-  def self.connect(options={})
-    cf = ConnectionFactory.new
-
-    cf.uri                = options[:uri]          if options[:uri]
-    cf.host               = hostname_from(options) if include_host?(options)
-    cf.port               = options[:port]         if options[:port]
-    cf.virtual_host       = vhost_from(options)    if include_vhost?(options)
-    cf.connection_timeout = timeout_from(options)  if include_timeout?(options)
-    cf.username           = username_from(options) if include_username?(options)
-    cf.password           = password_from(options) if include_password?(options)
-
-    cf.requested_heartbeat = heartbeat_from(options)          if include_heartbeat?(options)
-    cf.connection_timeout  = connection_timeout_from(options) if include_connection_timeout?(options)
-
-    tls = (options[:ssl] || options[:tls])
-    case tls
-    when true then
-      cf.use_ssl_protocol
-    when String then
-      if options[:trust_manager]
-        cf.use_ssl_protocol(tls, options[:trust_manager])
-      else
-        cf.use_ssl_protocol(tls)
-      end
-    end
-
-    cf.new_connection
-  end
-
-  protected
-
-  def self.hostname_from(options)
-    options[:host] || options[:hostname] || ConnectionFactory.DEFAULT_HOST
-  end
-
-  def self.include_host?(options)
-    !!(options[:host] || options[:hostname])
-  end
-
-  def self.vhost_from(options)
-    options[:virtual_host] || options[:vhost] || ConnectionFactory.DEFAULT_VHOST
-  end
-
-  def self.include_vhost?(options)
-    !!(options[:virtual_host] || options[:vhost])
-  end
-
-  def self.timeout_from(options)
-    options[:connection_timeout] || options[:timeout]
-  end
-
-  def self.include_timeout?(options)
-    !!(options[:connection_timeout] || options[:timeout])
-  end
-
-  def self.username_from(options)
-    options[:username] || options[:user] || ConnectionFactory.DEFAULT_USER
-  end
-
-  def self.heartbeat_from(options)
-    options[:heartbeat_interval] || options[:requested_heartbeat] || ConnectionFactory.DEFAULT_HEARTBEAT
-  end
-
-  def self.connection_timeout_from(options)
-    options[:connection_timeout_interval] || options[:connection_timeout] || ConnectionFactory.DEFAULT_CONNECTION_TIMEOUT
-  end
-
-  def self.include_username?(options)
-    !!(options[:username] || options[:user])
-  end
-
-  def self.password_from(options)
-    options[:password] || options[:pass] || ConnectionFactory.DEFAULT_PASS
-  end
-
-  def self.include_password?(options)
-    !!(options[:password] || options[:pass])
-  end
-
-  def self.include_heartbeat?(options)
-    !!(options[:heartbeat_interval] || options[:requested_heartbeat] || options[:heartbeat])
-  end
-
-  def self.include_connection_timeout?(options)
-    !!(options[:connection_timeout_interval] || options[:connection_timeout])
+  def self.connect(*args)
+    Session.connect(*args)
   end
 end
 

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: hot_bunnies
 version: !ruby/object:Gem::Version
-  version: 1.5.0
-  prerelease:
+  version: 2.0.0.pre1
+  prerelease: 6
 platform: java
 authors:
 - Theo Hultberg
@@ -10,50 +10,28 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies: []
-description: A object oriented interface to RabbitMQ that uses the Java driver under the hood
+description: RabbitMQ client for JRuby built around the official RabbitMQ Java client
 email:
 - theo@burtcorp.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rvmrc"
-- ".travis.yml"
-- ChangeLog.md
-- Gemfile
-- LICENSE
-- README.md
-- Rakefile
-- examples/blocking_subscription.rb
-- examples/non_blocking_subscription.rb
-- examples/non_blocking_subscription_with_executor.rb
-- hot_bunnies.gemspec
 - lib/ext/commons-io.jar
 - lib/ext/rabbitmq-client.jar
 - lib/hot_bunnies.rb
 - lib/hot_bunnies/channel.rb
+- lib/hot_bunnies/consumers.rb
+- lib/hot_bunnies/exceptions.rb
 - lib/hot_bunnies/exchange.rb
+- lib/hot_bunnies/juc.rb
+- lib/hot_bunnies/metadata.rb
 - lib/hot_bunnies/queue.rb
+- lib/hot_bunnies/session.rb
 - lib/hot_bunnies/version.rb
-- spec/integration/alternate_exchanges_spec.rb
-- spec/integration/basic_consume_spec.rb
-- spec/integration/connection_spec.rb
-- spec/integration/error_handling_by_consumers_spec.rb
-- spec/integration/exchange_bind_spec.rb
-- spec/integration/exchange_declare_spec.rb
-- spec/integration/message_metadata_access_spec.rb
-- spec/integration/publisher_confirmations_spec.rb
-- spec/integration/queue_bind_spec.rb
-- spec/integration/queue_declare_spec.rb
-- spec/integration/queue_delete_spec.rb
-- spec/integration/queue_purge_spec.rb
-- spec/integration/queue_unbind_spec.rb
-- spec/integration/sender_selected_distribution_spec.rb
-- spec/spec_helper.rb
-homepage: http://github.com/iconara/hot_bunnies
+homepage: http://github.com/ruby-amqp/hot_bunnies
 licenses: []
 post_install_message:
 rdoc_options: []
@@ -61,22 +39,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
+      version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>'
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
+      version: 1.3.1
   none: false
 requirements: []
 rubyforge_project: hot_bunnies
 rubygems_version: 1.8.24
 signing_key:
 specification_version: 3
-summary: Ruby wrapper for the RabbitMQ Java driver
+summary: RabbitMQ client for JRuby built around the official RabbitMQ Java client
 test_files: []

data/.gitignore

@@ -1,7 +0,0 @@
-*.gem
-.bundle
-Gemfile.lock
-pkg/*
-.DS_Store
-.rvmrc
-bin/*

data/.rvmrc

@@ -1 +0,0 @@
-rvm --create use jruby@hot_bunnies

data/.travis.yml

@@ -1,12 +0,0 @@
-language: ruby
-script: "bundle exec rspec -c spec"
-rvm:
-  - jruby-18mode
-  - jruby-19mode
-  - jruby-head
-notifications:
-  recipients:
-    - michaelklishin@me.com
-
-services:
-  - rabbitmq

data/ChangeLog.md

@@ -1,46 +0,0 @@
-# Changes Between 1.5.0 and 1.6.0
-
-No changes yet.
-
-
-# Changes Between 1.4.0 and 1.5.0
-
-## RabbitMQ Java Client Upgrade
-
-Hot Bunnies now uses RabbitMQ Java client 3.0.x.
-
-
-
-# Changes Between 1.3.0 and 1.4.0
-
-## RabbitMQ Java Client Upgrade
-
-Hot Bunnies now uses RabbitMQ Java client 2.8.7.
-
-
-## TLS Support
-
-`HotBunnies.connect` now supports a new `:tls` option:
-
-``` ruby
-HotBunnies.connect(:tls => true)
-
-HotBunnies.connect(:tls => "SSLv3")
-HotBunnies.connect(:tls => "SSLv2")
-
-HotBunnies.connect(:tls => "SSLv3", :trust_manager => custom_trust_manager)
-```
-
-
-## Consumer Back Pressure Improvements
-
-  * The async consumer will not attempt to add tasks when its executor is shutting down.
-
-  * The blocking consumer got a buffer size option that makes it create a bounded blocking queue instead of an unbounded.
-
-
-## Consumer Improvements
-
-`HotBunnies::Queue#subscribe` is now more resilient to exceptions and uses a new
-executor task for each delivery. When a consumer is cancelled, any remaining messages
-will be delivered instead of being ignored.

data/Gemfile

@@ -1,10 +0,0 @@
-source :rubygems
-
-gemspec
-
-gem 'jruby-openssl'
-gem 'rake'
-
-group :test do
-  gem "rspec", ">= 2.6.0"
-end

data/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2011 Theo Hultberg
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,58 +0,0 @@
-# What is Hot Bunnies
-
-Hot Bunnies is an idiomatic, fast and well-maintained (J)Ruby DSL on top of the [RabbitMQ Java client](http://www.rabbitmq.com/api-guide.html). It strives to combine
-strong parts of the Java client with over 3 years of [Ruby amqp gem](https://github.com/ruby-amqp/amqp) development experience.
-
-## Why Hot Bunnies
-
- * Concurrency support on the JVM is excellent, with many tools & approaches available. Lets make use of it.
- * RabbitMQ Java client is rock solid and supports every RabbitMQ feature. Very nice.
- * It is screaming fast thanks to all the heavy duty being done in the pretty efficient & lightweight Java code.
- * It uses synchronous APIs where it makes sense and asynchronous APIs where it makes sense. Some other [Ruby RabbitMQ clients](https://github.com/ruby-amqp)
-   only use one or the other.
- * [amqp gem](https://github.com/ruby-amqp/amqp) has certain amount of baggage it cannot drop because of backwards compatibility concerns. Hot Bunnies is a
-   clean room design, much more open to radical new ideas.
- * Someone just *had* to come up with a library called Hot Bunnies. Are your bunnies hot?
-
-
-## What Hot Bunnies is not
-
-Hot Bunnies is not
-
- * A replacement for the RabbitMQ Java client
- * An attempt to re-create 100% of the amqp gem API on top of the Java client
- * A "work queue" like Resque
- * A cure for cancer
-
-
-## Installation, Dependency
-
-### With Rubygems
-
-    gem install hot_bunnies
-
-### With Bundler
-
-    gem "hot_bunnies", "~> 1.4.0"
-
-
-## Change Log
-
-See ChangeLog.md.
-
-
-## Continuous Integration
-
-[![Continuous Integration status](https://secure.travis-ci.org/ruby-amqp/hot_bunnies.png)](http://travis-ci.org/ruby-amqp/hot_bunnies)
-
-CI is hosted by [travis-ci.org](http://travis-ci.org)
-
-
-## License
-
-MIT, see LICENSE in the repository root
-
-
-## Copyright
-
-Theo Hultberg, Michael Klishin, 2011-2012.

data/Rakefile

@@ -1,6 +0,0 @@
-# encoding: utf-8
-
-require 'bundler'
-
-
-Bundler::GemHelper.install_tasks

data/examples/blocking_subscription.rb

@@ -1,36 +0,0 @@
-$: << 'lib'
-
-require 'hot_bunnies'
-
-
-connection = HotBunnies.connect(:host => 'localhost')
-channel = connection.create_channel
-channel.prefetch = 10
-
-exchange = channel.exchange('test', :type => :direct)
-
-queue = channel.queue('hello.world')
-queue.bind(exchange, :routing_key => 'xyz')
-queue.purge
-
-100.times do |i|
-  exchange.publish("hello world! #{i}", :routing_key => 'xyz')
-end
-
-exchange.publish("POISON!", :routing_key => 'xyz')
-
-subscription = queue.subscribe(:ack => true)
-subscription.each(:blocking => true) do |headers, msg|
-  puts msg
-  headers.ack
-  if msg == "POISON!"
-    :cancel
-  end
-end
-
-puts "ALL DONE!"
-
-at_exit do
-  channel.close
-  connection.close
-end

data/examples/non_blocking_subscription.rb

@@ -1,32 +0,0 @@
-$: << 'lib'
-
-require 'hot_bunnies'
-
-
-connection = HotBunnies.connect(:host => 'localhost')
-channel = connection.create_channel
-channel.prefetch = 10
-
-exchange = channel.exchange('test', :type => :direct)
-
-queue = channel.queue('hello.world')
-queue.bind(exchange, :routing_key => 'xyz')
-queue.purge
-
-subscription = queue.subscribe(:ack => true, :blocking => false) do |headers, msg|
-  puts msg
-  headers.ack
-end
-
-100.times do |i|
-  exchange.publish("hello world! #{i}", :routing_key => 'xyz')
-end
-
-subscription.cancel
-
-puts "ALMOST ALL DONE!"
-
-at_exit do
-  channel.close
-  connection.close
-end

data/examples/non_blocking_subscription_with_executor.rb

@@ -1,38 +0,0 @@
-$: << 'lib'
-
-require 'hot_bunnies'
-
-import java.util.concurrent.Executors
-
-
-connection = HotBunnies.connect(:host => 'localhost')
-channel = connection.create_channel
-channel.prefetch = 10
-
-exchange = channel.exchange('test', :type => :direct)
-
-queue = channel.queue('hello.world')
-queue.bind(exchange, :routing_key => 'xyz')
-queue.purge
-
-thread_pool = Executors.new_fixed_thread_pool(3)
-
-subscription = queue.subscribe(:ack => true)
-subscription.each(:blocking => false, :executor => thread_pool) do |headers, msg|
-  puts msg
-  headers.ack
-end
-
-100.times do |i|
-  exchange.publish("hello world! #{i}", :routing_key => 'xyz')
-end
-
-thread_pool.shutdown_now
-subscription.cancel
-
-puts "ALMOST ALL DONE!"
-
-at_exit do
-  channel.close
-  connection.close
-end

data/hot_bunnies.gemspec

@@ -1,24 +0,0 @@
-# encoding: utf-8
-
-$: << File.expand_path('../lib', __FILE__)
-
-require 'hot_bunnies/version'
-
-
-Gem::Specification.new do |s|
-  s.name        = 'hot_bunnies'
-  s.version     = HotBunnies::VERSION
-  s.platform    = 'java'
-  s.authors     = ['Theo Hultberg', 'Michael S. Klishin']
-  s.email       = ['theo@burtcorp.com']
-  s.homepage    = 'http://github.com/iconara/hot_bunnies'
-  s.summary     = %q{Ruby wrapper for the RabbitMQ Java driver}
-  s.description = %q{A object oriented interface to RabbitMQ that uses the Java driver under the hood}
-
-  s.rubyforge_project = 'hot_bunnies'
-
-  s.files         = `git ls-files`.split("\n")
-# s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-# s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = %w(lib)
-end

data/spec/integration/alternate_exchanges_spec.rb

@@ -1,36 +0,0 @@
-require "spec_helper"
-
-describe "Any exchange" do
-
-  #
-  # Environment
-  #
-
-  let(:connection) { HotBunnies.connect }
-  let(:channel)    { connection.create_channel }
-
-  after :each do
-    channel.close
-    connection.close
-  end
-
-
-  #
-  # Examples
-  #
-
-  it "can have an alternate exchange (a RabbitMQ-specific extension to AMQP 0.9.1)" do
-    queue = channel.queue("", :auto_delete => true)
-
-    fe    = channel.exchange("hot_bunnies.extensions.alternate_xchanges.fanout1")
-    de    = channel.exchange("hot_bunnies.extensions.alternate_xchanges.direct1", :arguments => {
-                               "alternate-exchange" => fe.name
-                             })
-
-    queue.bind(fe)
-    de.publish("1010", :routing_key => "", :mandatory => true)
-
-    mc, _ = queue.status
-    mc.should == 1
-  end
-end

data/spec/integration/basic_consume_spec.rb

@@ -1,128 +0,0 @@
-require "spec_helper"
-
-
-describe 'A consumer of a queue' do
-  let(:connection) { HotBunnies.connect }
-  let(:channel)    { connection.create_channel }
-
-  after :each do
-    channel.close
-    connection.close
-  end
-
-  it 'receives messages until cancelled' do
-    exchange = connection.create_channel.default_exchange
-    queue = connection.create_channel.queue("", :auto_delete => true)
-    subscription = queue.subscribe
-
-    messages = []
-    consumer_exited = false
-
-    consumer_thread = Thread.new do
-      subscription.each do |headers, message|
-        messages << message
-        sleep 0.1
-      end
-      consumer_exited = true
-    end
-
-    publisher_thread = Thread.new do
-      20.times do
-        exchange.publish('hello world', :routing_key => queue.name)
-        sleep 0.01
-      end
-    end
-
-    sleep 0.2
-
-    subscription.cancel
-
-    consumer_thread.join
-    publisher_thread.join
-
-    messages.should_not be_empty
-    consumer_exited.should be_true
-  end
-end
-
-describe "Multiple non-exclusive consumers per queue" do
-  let(:connection) { HotBunnies.connect }
-  let(:channel)    { connection.create_channel }
-
-  after :each do
-    channel.close
-    connection.close
-  end
-
-  context "on the same channel (so prefetch levels won't affect message distribution)" do
-    it "have messages distributed to them in the round robin manner" do
-      n                = 100
-      mailbox1         = []
-      mailbox2         = []
-      mailbox3         = []
-
-      all_received     = java.util.concurrent.CountDownLatch.new(n)
-      consumer_channel = connection.create_channel
-
-      queue            = channel.queue("", :auto_delete => true)
-
-      consumer1        = queue.subscribe(:blocking => false) do |metadata, payload|
-        mailbox1 << payload
-        all_received.count_down
-      end
-      consumer2        = queue.subscribe(:blocking => false) do |metadata, payload|
-        mailbox2 << payload
-        all_received.count_down
-      end
-      consumer3        = queue.subscribe(:blocking => false) do |metadata, payload|
-        mailbox3 << payload
-        all_received.count_down
-      end
-
-
-      sleep 2.0 # let consumers in other threads start.
-      n.times do |i|
-        channel.default_exchange.publish("Message #{i}", :routing_key => queue.name)
-      end
-
-      all_received.await
-
-      mailbox1.size.should >= 33
-      mailbox2.size.should >= 33
-      mailbox3.size.should >= 33
-
-      consumer1.shutdown!
-      consumer2.shutdown!
-      consumer3.shutdown!
-    end
-  end
-end
-
-
-describe "Queue consumer" do
-  let(:connection) { HotBunnies.connect }
-  let(:channel)    { connection.create_channel }
-
-  after :each do
-    channel.close
-    connection.close
-  end
-
-  it "provides predicates" do
-    queue        = channel.queue("", :auto_delete => true)
-
-    subscription = queue.subscribe(:blocking => false) { |_, _| nil }
-
-    # consumer tag will be sent by the broker, so this happens
-    # asynchronously and we can either add callbacks/use latches or
-    # just wait. MK.
-    sleep(1.0)
-    subscription.should be_active
-
-    subscription.cancel
-    sleep(1.0)
-    subscription.should_not be_active
-
-    subscription.shutdown!
-  end
-end