amqp 0.8.2 → 0.8.3

data/README.md

@@ -1,7 +1,7 @@
 # About Ruby amqp gem #
 
 Ruby amqp gem is a widely used, feature-rich, well-maintained asynchronous AMQP 0.9.1 client with batteries included.
-This library works with Ruby 1.8.7 (*except for p249*, see the FAQ), Ruby 1.9.2, Ruby 1.9.3-preview1, [JRuby](http://jruby.org), [Rubinius](http://rubini.us) as well as [REE](http://www.rubyenterpriseedition.com), and is licensed under the [Ruby License](http://www.ruby-lang.org/en/LICENSE.txt)
+This library works with Ruby 1.8.7 (*except for p249*, see the FAQ), Ruby 1.9.2, Ruby 1.9.3, [JRuby](http://jruby.org), [Rubinius](http://rubini.us) as well as [REE](http://www.rubyenterpriseedition.com), and is licensed under the [Ruby License](http://www.ruby-lang.org/en/LICENSE.txt)
 
 0.8.0.RCs and later versions of amqp gem implement [AMQP 0.9.1](http://bit.ly/amqp-model-explained) (see also [AMQP 0.9.1 spec document](http://bit.ly/hw2ELX)) and support [RabbitMQ extensions to AMQP 0.9.1](http://www.rabbitmq.com/extensions.html).
 

data/amqp.gemspec

@@ -23,8 +23,8 @@ Gem::Specification.new do |s|
 
   # Dependencies
   s.add_dependency "eventmachine"
-  s.add_dependency "amq-client",   "~> 0.8.5"
-  s.add_dependency "amq-protocol", "~> 0.8.3"
+  s.add_dependency "amq-client",   "~> 0.8.6"
+  s.add_dependency "amq-protocol", "~> 0.8.4"
 
   begin
     require "changelog"

data/docs/GettingStarted.textile

@@ -60,6 +60,7 @@ This guide assumes that you have installed one of the following supported Ruby i
 
  * Ruby v1.8.7
  * Ruby v1.9.2
+ * Ruby v1.9.3
  * JRuby (we recommend v1.6)
  * Rubinius v1.2 or higher
  * Ruby Enterprise Edition

data/lib/amqp/integration/rails.rb

@@ -4,12 +4,18 @@ module AMQP
   module Integration
     class Rails
 
-      def self.start(options = {}, &block)
+      def self.start(options_or_uri = {}, &block)
         yaml     = YAML.load_file(File.join(::Rails.root, "config", "amqp.yml"))
         settings = yaml.fetch(::Rails.env, Hash.new).symbolize_keys
 
+        arg      = if options_or_uri.is_a?(Hash)
+                     settings.merge(options_or_uri)[:uri]
+                   else
+                     settings[:uri] || options_or_uri
+                   end
+
         EventMachine.next_tick do
-          AMQP.start(settings.merge(options), &block)
+          AMQP.start(arg, &block)
         end
       end
     end # Rails

data/lib/amqp/version.rb

@@ -6,5 +6,5 @@ module AMQP
   #
   # @see AMQ::Protocol::VERSION
   # @return [String] AMQP gem version
-  VERSION = '0.8.2'
+  VERSION = '0.8.3'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amqp
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 8
-  - 2
-  version: 0.8.2
+  - 3
+  version: 0.8.3
 platform: ruby
 authors: 
 - Aman Gupta
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-28 00:00:00 Z
+date: 2011-11-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
@@ -41,12 +41,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 53
+        hash: 51
         segments: 
         - 0
         - 8
-        - 5
-        version: 0.8.5
+        - 6
+        version: 0.8.6
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -57,12 +57,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 57
+        hash: 55
         segments: 
         - 0
         - 8
-        - 3
-        version: 0.8.3
+        - 4
+        version: 0.8.4
   type: :runtime
   version_requirements: *id003
 description: Widely used, feature-rich asynchronous AMQP 0.9.1 client with batteries included.