amqp 1.0.0.pre2 → 1.0.0

data/spec/integration/queue_redeclaration_with_incompatible_attributes_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe AMQP do
+describe "AMQP queue redeclaration with different attributes" do
 
   #
   # Environment
@@ -17,7 +17,7 @@ describe AMQP do
   # Examples
   #
 
-  context "when queue is redeclared with different attributes" do
+  context "when :durable value is different" do
     let(:name)              { "amqp-gem.nondurable.queue" }
     let(:options)           {
       { :durable => false, :exclusive => true, :auto_delete => true, :arguments => {}, :passive => false }
@@ -25,35 +25,48 @@ describe AMQP do
     let(:different_options) {
       { :durable => true, :exclusive => true, :auto_delete => true, :arguments => {}, :passive => false}
     }
-    let(:irrelevant_different_options) {
-      { :durable => false, :exclusive => true, :auto_delete => true, :arguments => {}, :passive => false, :header => {:random => 'stuff' } }
-    }
 
 
     it "should raise AMQP::IncompatibleOptionsError for incompatable options" do
       channel = AMQP::Channel.new
-      channel.on_error do |ch, close|
-        @callback_fired = true
+      channel.on_error do |ch, channel_close|
+        @error_code = channel_close.reply_code
       end
 
       channel.queue(name, options)
       expect {
         channel.queue(name, different_options)
       }.to raise_error(AMQP::IncompatibleOptionsError)
-      done
+
+      done(0.5) {
+        @error_code.should == 406
+      }
     end
+  end
+
+  context "when :headers are different" do
+    let(:name)              { "amqp-gem.nondurable.queue" }
+    let(:options)           {
+      { :durable => false, :exclusive => true, :auto_delete => true, :arguments => {}, :passive => false }
+    }
+    let(:different_options) {
+      { :durable => false, :exclusive => true, :auto_delete => true, :arguments => {}, :passive => false, :header => {:random => 'stuff' } }
+    }
 
     it "should not raise AMQP::IncompatibleOptionsError for irrelevant options" do
       channel = AMQP::Channel.new
-      channel.on_error do |ch, close|
-        @callback_fired = true
+      channel.on_error do |ch, channel_close|
+        @error_code = channel_close.reply_code
       end
 
       channel.queue(name, options)
       expect {
-        channel.queue(name, irrelevant_different_options)
+        channel.queue(name, different_options)
       }.to_not raise_error(AMQP::IncompatibleOptionsError)
-      done
+
+      done(0.5) {
+        @error_code.should == 406
+      }
     end
   end
 end # describe AMQP

data/spec/integration/regressions/concurrent_publishing_on_the_same_channel_spec.rb

@@ -73,7 +73,7 @@ if mri?
         20.times do
           Thread.new do
             messages.each do |message|
-              exchange.publish(message, :routing_key => queue.name, :immediate => true, :mandatory => true)
+              exchange.publish(message, :routing_key => queue.name, :mandatory => true)
             end
           end
         end

data/spec/integration/remove_individual_binding_spec.rb

@@ -0,0 +1,51 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe "An individual binding" do
+
+  #
+  # Environment
+  #
+
+  include EventedSpec::AMQPSpec
+
+  default_timeout 3
+
+  amqp_before do
+    @channel   = AMQP::Channel.new
+    @channel.should be_open
+    @channel.on_error do |ch, close|
+      raise "Channel-level error!: #{close.inspect}"
+    end
+  end
+
+
+  default_options AMQP_OPTS
+
+
+  it "can be deleted by specifying routing key" do
+    flag1 = false
+    flag2 = false
+
+    x  = @channel.direct("amqpgem.examples.imaging")
+
+    q = @channel.queue("", :exclusive => true)
+    q.bind(x, :routing_key => "resize").bind(x, :routing_key => "watermark").subscribe do |meta, payload|
+      flag1 = (meta.routing_key == "watermark")
+      flag2 = (meta.routing_key == "resize")
+    end
+
+    EventMachine.add_timer(0.5) do
+      q.unbind(x, :routing_key => "resize") do
+        x.publish("some data", :routing_key => "resize")
+        x.publish("some data", :routing_key => "watermark")
+      end
+
+      done(1.0) {
+        flag1.should be_true
+        flag2.should be_false
+      }
+    end
+  end
+end

data/spec/integration/reply_queue_communication_spec.rb

@@ -53,8 +53,7 @@ describe "Exclusive server-named queue" do
                           :reply_to    => queue2.name,
                           :app_id      => "Client",
                           :timestamp   => request_timestamp,
-                          :mandatory   => true,
-                          :immediate   => true)
+                          :mandatory   => true)
 
         done(0.2) {
           queue1.unsubscribe

data/spec/integration/store_and_forward_spec.rb

@@ -53,19 +53,16 @@ describe "Store-and-forward routing" do
         @queue.subscribe(:ack => false) do |payload|
           payload.should_not be_nil
           number_of_received_messages += 1
-          if RUBY_VERSION =~ /^1.9/
-            payload.force_encoding("UTF-8").should == dispatched_data
-          else
-            payload.should == dispatched_data
-          end
+          payload.should == dispatched_data
         end # subscribe
 
-        expected_number_of_messages.times do
-          @exchange.publish(dispatched_data, :routing_key => @queue_name)
+        delayed(0.3) do
+          expected_number_of_messages.times do
+            @exchange.publish(dispatched_data, :routing_key => @queue_name)
+          end
         end
 
-        # 6 seconds are for Rubinius, it is surprisingly slow on this workload
-        done(6.0) {
+        done(4.0) {
           number_of_received_messages.should == expected_number_of_messages
           @queue.unsubscribe
         }

data/spec/integration/topic_subscription_spec.rb

@@ -66,9 +66,9 @@ describe "Topic-based subscription" do
       # publish some messages none of our queues should be receiving
       3.times do
         @exchange.publish(626 + rand(1000)/400.0, :key => "nasdaq.goog")
-      end # do
+      end
 
-      done(0.4) {
+      done(0.5) {
         received_messages.should == expected_messages
         @aapl_queue.unsubscribe
         @amzn_queue.unsubscribe
@@ -117,7 +117,7 @@ describe "Topic-based subscription" do
       @exchange.publish("Blatche, Wall lead Wizards over Jazz 108-101", :key => "sports.nba.jazz")
       @exchange.publish("Deron Williams Receives NBA Cares Community Assist Award", :key => "sports.nba.jazz")
 
-      done(0.2) {
+      done(0.6) {
         received_messages.should == expected_messages
 
         @nba_queue.unsubscribe
@@ -151,6 +151,7 @@ describe "Topic-based subscription" do
         @celtics_queue.name => 3
       }
 
+
       @sports_queue.bind(@exchange, :key => "sports.#").subscribe do |payload|
         received_messages[@sports_queue.name] += 1
       end
@@ -180,7 +181,7 @@ describe "Topic-based subscription" do
       @exchange.publish("Philadelphia's Daniel Briere has been named as an All-Star replacement for Jarome Iginla.", :key => "sports.nhl.allstargame")
       @exchange.publish("Devils blank Sid- and Malkin-less Penguins 2-0", :key => "sports.nhl.penguins")
 
-      done(0.2) {
+      done(0.5) {
         received_messages.should == expected_messages
 
         @sports_queue.unsubscribe

data/spec/spec_helper.rb

@@ -15,6 +15,12 @@ puts "Using Ruby #{RUBY_VERSION}, amq-client #{AMQ::Client::VERSION} and amq-pro
 
 amqp_config = File.dirname(__FILE__) + '/amqp.yml'
 
+port = if ENV["TRACER"]
+         5673
+       else
+         5672
+       end
+
 if File.exists? amqp_config
   class Hash
     def symbolize_keys
@@ -28,7 +34,7 @@ if File.exists? amqp_config
   end
   AMQP_OPTS = YAML::load_file(amqp_config).symbolize_keys[:test]
 else
-  AMQP_OPTS = {:host => 'localhost', :port => 5672}
+  AMQP_OPTS = {:host => 'localhost', :port => port}
 end
 
 # puts "AMQP_OPTS = #{AMQP_OPTS.inspect}"
@@ -82,4 +88,4 @@ module PlatformDetection
   def rubinius?
     defined?(RUBY_ENGINE) && (RUBY_ENGINE == 'rbx')
   end
-end
+end

data/spec/unit/amqp/connection_spec.rb

@@ -28,7 +28,9 @@ describe AMQP, 'class object' do
       :logging   => false,
       :ssl       => false,
       :broker    => nil,
-      :frame_max => 131072
+      :frame_max => 131072,
+      :heartbeat => 0,
+      :auth_mechanism => "PLAIN"
     }
   end
 

metadata

@@ -1,109 +1,101 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: amqp
-version: !ruby/object:Gem::Version 
-  hash: -1633158744
-  prerelease: 6
-  segments: 
-  - 1
-  - 0
-  - 0
-  - pre
-  - 2
-  version: 1.0.0.pre2
+version: !ruby/object:Gem::Version
+  version: 1.0.0
+  prerelease:
 platform: ruby
-authors: 
+authors:
 - Aman Gupta
 - Jakub Stastny aka botanicus
 - Michael S. Klishin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2012-07-03 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: eventmachine
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: amq-client
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: -1633158744
-        segments: 
-        - 1
-        - 0
-        - 0
-        - pre
-        - 2
-        version: 1.0.0.pre2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    none: false
+  prerelease: false
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: amq-protocol
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: -1633158752
-        segments: 
-        - 1
-        - 0
-        - 0
-        - pre
-        - 6
-        version: 1.0.0.pre6
+  prerelease: false
   type: :runtime
-  version_requirements: *id003
-description: Widely used, feature-rich asynchronous AMQP 0.9.1 client with batteries included.
-email: 
-- michael@novemberain.com
-- stastny@101ideas.cz
+description: Widely used, feature-rich asynchronous AMQP RabbitMQ client with batteries included.
+email:
+- !binary |-
+  bWljaGFlbEBub3ZlbWJlcmFpbi5jb20=
+- !binary |-
+  c3Rhc3RueUAxMDFpZGVhcy5jeg==
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
+- docs/08Migration.textile
+- docs/AMQP091ModelExplained.textile
+- docs/Bindings.textile
+- docs/Clustering.textile
+- docs/ConnectingToTheBroker.textile
+- docs/ConnectionEncryptionWithTLS.textile
+- docs/DocumentationGuidesIndex.textile
 - docs/Durability.textile
+- docs/ErrorHandling.textile
 - docs/Exchanges.textile
+- docs/GettingStarted.textile
 - docs/PatternsAndUseCases.textile
-- docs/ConnectingToTheBroker.textile
-- docs/ConnectionEncryptionWithTLS.textile
+- docs/Queues.textile
+- docs/RabbitMQVersions.textile
 - docs/RunningTests.textile
-- docs/DocumentationGuidesIndex.textile
+- docs/TestingWithEventedSpec.textile
 - docs/Troubleshooting.textile
-- docs/RabbitMQVersions.textile
-- docs/Queues.textile
-- docs/08Migration.textile
 - docs/VendorSpecificExtensions.textile
-- docs/AMQP091ModelExplained.textile
-- docs/Bindings.textile
-- docs/GettingStarted.textile
-- docs/ErrorHandling.textile
-- docs/Clustering.textile
-- docs/TestingWithEventedSpec.textile
-files: 
-- .gitignore
-- .rspec
-- .travis.yml
-- .yardopts
+files:
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- ".yardopts"
 - CHANGELOG
 - Gemfile
 - README.md
@@ -291,7 +283,6 @@ files:
 - spec/integration/fanout_exchange_routing_spec.rb
 - spec/integration/headers_exchange_routing_spec.rb
 - spec/integration/hello_world_spec.rb
-- spec/integration/immediate_messages_spec.rb
 - spec/integration/mandatory_messages_spec.rb
 - spec/integration/message_acknowledgement_spec.rb
 - spec/integration/message_metadata_access_spec.rb
@@ -307,6 +298,7 @@ files:
 - spec/integration/regressions/concurrent_publishing_on_the_same_channel_spec.rb
 - spec/integration/regressions/empty_message_body_spec.rb
 - spec/integration/regressions/issue66_spec.rb
+- spec/integration/remove_individual_binding_spec.rb
 - spec/integration/reply_queue_communication_spec.rb
 - spec/integration/store_and_forward_spec.rb
 - spec/integration/stress/publishing_of_messages_with_incrementing_sizes_spec.rb
@@ -319,41 +311,33 @@ files:
 - spec/unit/amqp/client_spec.rb
 - spec/unit/amqp/connection_spec.rb
 - spec/unit/amqp/int_allocator_spec.rb
-homepage: http://github.com/ruby-amqp/amqp
-licenses: 
+homepage: http://rubyamqp.info
+licenses:
 - Ruby
-post_install_message: "[\e[32mVersion 1.0.0\e[0m] [API] All public API bits deprecated in 0.8.0 are COMPLETELY REMOVED\n"
-rdoc_options: 
-- --include=examples --main README.md
-require_paths: 
+post_install_message:
+rdoc_options:
+- "--include=examples --main README.md"
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
   none: false
-  requirements: 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
 requirements: []
-
 rubyforge_project: amqp
 rubygems_version: 1.8.24
-signing_key: 
+signing_key:
 specification_version: 3
-summary: Widely used, feature-rich asynchronous AMQP 0.9.1 client with batteries included
+summary: Widely used, feature-rich asynchronous RabbitMQ client with batteries included
 test_files: []
-
-has_rdoc: 
+has_rdoc: