amqp 1.1.0.pre2 → 1.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf6a9a0cb453a3921f7de2457b275a75be95f468
-  data.tar.gz: d8dc60d937d51493248f5813734cef62472504fd
+  metadata.gz: 7625109caea37f9496974e15387dc90e920baa99
+  data.tar.gz: 207ec33c2beaca7afe60f712825b84301fb63d77
 SHA512:
-  metadata.gz: 3cb18aa1e1f532f2c82c32bc9ce6b0075fd43bf37952b2a8ada8f7f0bdfd043df13a5cf156b1c78d7b2d5cbbb6302987c6eeb9275af91d1ff1ba59a2a69b88bb
-  data.tar.gz: d18e7ff42f621a27ea2363adb1ac733fbc53bb6880cee7b0b7b0b88fcbbb8392aec9236499b61a9f4475a20172211a861184eb337843431e1f7ebfb02e932fb2
+  metadata.gz: d1d85451a233fb14c1135629099ec8a1806ebac0ad46dd0c392339862a3936e69b32b50eec4c05f511e77f5bc7fe459d81a62a314e527f992544fb2d99a9d892
+  data.tar.gz: 35eed4d61c06807d19f7a9a08ff26dc34052085d38c5f5402ebd45abe9558a2b0ec9d799f24789e237d8ad11ed0e3657ed5c47859f448219bfa5626be268659e

data/ChangeLog.md

@@ -1,5 +1,11 @@
 ## Changes Between 1.0.0 and 1.1.0
 
+### amq-protocol Update
+
+Minimum `amq-protocol` version is now `1.8.0` which includes
+a bug fix for messages exactly 128 Kb in size.
+
+
 ### AMQ::Client is Removed
 
 `amq-client` has been incorporated into amqp gem. `AMQ::Client` and related

data/amqp.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
 
   # Dependencies
   s.add_dependency "eventmachine"
-  s.add_dependency "amq-protocol", ">= 1.6.0"
+  s.add_dependency "amq-protocol", ">= 1.8.0"
 
   s.rubyforge_project = "amqp"
 end

data/examples/extensions/rabbitmq/connection_blocking.rb

@@ -0,0 +1,48 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+require "bundler"
+Bundler.setup
+
+$:.unshift(File.expand_path("../../../../lib", __FILE__))
+require 'amqp'
+require "amqp/extensions/rabbitmq"
+
+puts "=> Demonstrating connection.blocked"
+puts
+
+# This example requires high memory watermark to be set
+# really low to demonstrate blocking.
+#
+# rabbitmqctl set_vm_memory_high_watermark 0.00000001
+#
+# should do it.
+
+EventMachine.run do
+  connection = AMQP.connect(:host => '127.0.0.1')
+
+  connection.on_blocked do |conn, conn_blocked|
+    puts "Connection blocked, reason: #{conn_blocked.reason}"
+  end
+
+  connection.on_unblocked do |conn, _|
+    puts "Connection unblocked"
+  end
+
+  puts "Connecting to RabbitMQ. Running #{AMQP::VERSION} version of the gem..."
+
+  AMQP::Channel.new(connection) do |ch|
+    x  = ch.default_exchange
+
+    puts "Publishing..."
+    x.publish("z" * 1024 * 1024 * 24)
+  end
+
+  show_stopper = Proc.new {
+    connection.close { EventMachine.stop }
+  }
+
+  EM.add_timer(120, show_stopper)
+  Signal.trap('INT',  show_stopper)
+  Signal.trap('TERM', show_stopper)
+end

data/lib/amqp/exchange.rb

@@ -317,8 +317,7 @@ module AMQP
       @status                  = :unknown
       @default_publish_options = (opts.delete(:default_publish_options) || {
           :routing_key  => @default_routing_key,
-          :mandatory    => false,
-          :immediate    => false
+          :mandatory    => false
         }).freeze
 
       @default_headers = (opts.delete(:default_headers) || {
@@ -503,12 +502,6 @@ module AMQP
     #                                      unroutable message back to the client with basic.return AMQPmethod.
     #                                      If message is not mandatory, the server silently drops the message.
     #
-    # @option options [Boolean] :immediate (false) This flag tells the server how to react if the message cannot be
-    #                                      routed to a queue consumer immediately.  If this flag is set, the
-    #                                      server will return an undeliverable message with a Return method.
-    #                                      If this flag is zero, the server will queue the message, but with
-    #                                      no guarantee that it will ever be consumed.
-    #
     # @option options [Boolean] :persistent (false) When true, this message will be persisted to disk and remain in the queue until
     #                                       it is consumed. When false, the message is only kept in a transient store
     #                                       and will lost in case of server restart.
@@ -539,7 +532,7 @@ module AMQP
       @channel.once_open do
         properties                 = @default_headers.merge(options)
         properties[:delivery_mode] = properties.delete(:persistent) ? 2 : 1
-        basic_publish(payload.to_s, opts[:key] || opts[:routing_key] || @default_routing_key, properties, opts[:mandatory], opts[:immediate])
+        basic_publish(payload.to_s, opts[:key] || opts[:routing_key] || @default_routing_key, properties, opts[:mandatory])
 
         # don't pass block to AMQP::Exchange#publish because it will be executed
         # immediately and we want to do it later. See ruby-amqp/amqp/#67 MK.
@@ -664,9 +657,9 @@ module AMQP
     # @group Publishing Messages
 
     # @api public
-    def basic_publish(payload, routing_key = AMQ::Protocol::EMPTY_STRING, user_headers = {}, mandatory = false, immediate = false, frame_size = nil)
+    def basic_publish(payload, routing_key = AMQ::Protocol::EMPTY_STRING, user_headers = {}, mandatory = false)
       headers = { :priority => 0, :delivery_mode => 2, :content_type => "application/octet-stream" }.merge(user_headers)
-      @connection.send_frameset(AMQ::Protocol::Basic::Publish.encode(@channel.id, payload, headers, @name, routing_key, mandatory, immediate, (frame_size || @connection.frame_max)), @channel)
+      @connection.send_frameset(AMQ::Protocol::Basic::Publish.encode(@channel.id, payload, headers, @name, routing_key, mandatory, false, @connection.frame_max), @channel)
 
       # publisher confirms support. MK.
       @channel.exec_callback(:after_publish)

data/lib/amqp/version.rb

@@ -6,5 +6,5 @@ module AMQP
   #
   # @see AMQ::Protocol::VERSION
   # @return [String] AMQP gem version
-  VERSION = '1.1.0.pre2'
+  VERSION = '1.1.0.rc1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amqp
 version: !ruby/object:Gem::Version
-  version: 1.1.0.pre2
+  version: 1.1.0.rc1
 platform: ruby
 authors:
 - Aman Gupta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-03 00:00:00.000000000 Z
+date: 2013-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.8.0
 description: Widely used, feature-rich asynchronous RabbitMQ client with batteries
   included.
 email:
@@ -140,6 +140,7 @@ files:
 - examples/error_handling/tcp_connection_failure_with_a_callback.rb
 - examples/exchanges/autodeletion_of_exchanges.rb
 - examples/exchanges/declare_an_exchange_without_assignment.rb
+- examples/extensions/rabbitmq/connection_blocking.rb
 - examples/extensions/rabbitmq/per_queue_message_ttl.rb
 - examples/extensions/rabbitmq/publisher_confirmations_with_transient_messages.rb
 - examples/extensions/rabbitmq/using_alternate_exchanges.rb