amqp 0.7.1 → 0.7.2

data/spec/integration/queue_declaration_spec.rb

@@ -8,7 +8,7 @@ describe AMQP do
   # Environment
   #
 
-  include AMQP::Spec
+  include EventedSpec::AMQPSpec
 
   default_timeout 5
 
@@ -28,15 +28,15 @@ describe AMQP do
       it "declares a new queue with that name" do
         queue = @channel.queue(name)
         queue.name.should == name
-
-        done
+        queue.delete
+        done(0.2)
       end
 
       it "caches that queue" do
         queue = @channel.queue(name)
         @channel.queue(name).object_id.should == queue.object_id
-
-        done
+        queue.delete
+        done(0.2)
       end
     end # context
 
@@ -44,7 +44,8 @@ describe AMQP do
       it "uses server-assigned queue name" do
         @channel.queue("") do |queue, *args|
           queue.name.should_not be_empty
-          done
+          queue.delete
+          done(0.2)
         end
       end
     end # context
@@ -53,25 +54,26 @@ describe AMQP do
 
 
     context "when passive option is used" do
-      context "and exchange with given name already exists" do
+      context "and queue with given name already exists" do
         it "silently returns" do
           name = "a_new_queue declared at #{Time.now.to_i}"
 
-          original_exchange = @channel.queue(name)
-          exchange          = @channel.queue(name, :passive => true)
+          original_queue = @channel.queue(name)
+          queue          = @channel.queue(name, :passive => true)
 
-          exchange.should == original_exchange
+          queue.should == original_queue
 
-          done
+          queue.delete
+          done(0.3)
         end # it
       end
 
-      context "and exchange with given name DOES NOT exist" do
+      context "and queue with given name DOES NOT exist" do
         it "raises an exception" do
           pending "Not yet supported"
 
           expect {
-            exchange = @channel.queue("queue declared at #{Time.now.to_i}", :passive => true)
+            queue = @channel.queue("queue declared at #{Time.now.to_i}", :passive => true)
           }.to raise_error
 
           done
@@ -84,13 +86,14 @@ describe AMQP do
 
     context "when queue is re-declared with parameters different from original declaration" do
       it "raises an exception" do
-        @channel.queue("previously.declared.durable.queue", :durable => true)
+        queue = @channel.queue("previously.declared.durable.queue", :durable => true)
 
         expect {
           @channel.queue("previously.declared.durable.queue", :durable => false)
         }.to raise_error(AMQP::IncompatibleOptionsError)
 
-        done
+        queue.delete
+        done(0.2)
       end # it
     end # context
   end # describe

data/spec/integration/queue_exclusivity_spec.rb

@@ -8,7 +8,7 @@ describe "Non-exclusive queue" do
   # Environment
   #
 
-  include AMQP::Spec
+  include EventedSpec::AMQPSpec
 
   default_timeout 5
 
@@ -60,9 +60,9 @@ describe "Exclusive queue" do
   # Environment
   #
 
-  include AMQP::Spec
+  include EventedSpec::AMQPSpec
 
-  default_timeout 1
+  default_timeout 3
 
   amqp_before do
     @connection1 = AMQP.connect
@@ -80,16 +80,18 @@ describe "Exclusive queue" do
     channel1 = AMQP::Channel.new(@connection1)
     channel2 = AMQP::Channel.new(@connection2)
 
-    AMQP::Queue.new(channel1, "amqpgem.integration.queues.exclusive", :exclusive => true)
-    sleep 0.1
+    AMQP::Queue.new(channel1, "amqpgem.integration.queues.exclusive", :exclusive => true, :auto_delete => true)
 
-    AMQP::Queue.new(channel2, "amqpgem.integration.queues.exclusive", :exclusive => true)
-    
+    EventMachine.add_timer(1.0) do
+      AMQP::Queue.new(channel2, "amqpgem.integration.queues.exclusive", :exclusive => true, :auto_delete => true)
+    end
 
-    done(0.2) {
-      channel1.should_not be_closed
-      # because it is a channel-level exception
-      channel2.should be_closed
-    }
+    EventMachine.add_timer(1.3) do
+      done(0.5) {
+        channel1.should_not be_closed
+        # because it is a channel-level exception
+        channel2.should be_closed
+      }
+    end
   end
 end

data/spec/integration/reply_queue_communication_spec.rb

@@ -7,7 +7,7 @@ describe "Exclusive server-named queue" do
   # Environment
   #
 
-  include AMQP::Spec
+  include EventedSpec::AMQPSpec
 
   default_timeout 1
 
@@ -57,7 +57,7 @@ describe "Exclusive server-named queue" do
           queue1.unsubscribe
           queue2.unsubscribe
         }
-      end # do      
+      end # do
     end # do
   end # it
 end # describe

data/spec/integration/store_and_forward_spec.rb

@@ -7,8 +7,7 @@ describe "Store-and-forward routing" do
   # Environment
   #
 
-  include AMQP::Spec
-  include AMQP::SpecHelper
+  include EventedSpec::AMQPSpec
 
   em_before { AMQP.cleanup_state }
   em_after  { AMQP.cleanup_state }
@@ -112,7 +111,8 @@ describe "Store-and-forward routing" do
           end # pop
         end # do
 
-        done(0.5) {
+        delayed(0.9) { @queue.delete }
+        done(0.8) {
           number_of_received_messages.should == expected_number_of_messages
         }
       end # it

data/spec/integration/topic_subscription_spec.rb

@@ -7,8 +7,7 @@ describe "Topic-based subscription" do
   # Environment
   #
 
-  include AMQP::Spec
-  include AMQP::SpecHelper
+  include EventedSpec::AMQPSpec
 
   em_before { AMQP.cleanup_state }
   em_after  { AMQP.cleanup_state }

data/spec/integration/workload_distribution_spec.rb

@@ -7,8 +7,7 @@ describe "Workload distribution" do
   # Environment
   #
 
-  include AMQP::Spec
-  include AMQP::SpecHelper
+  include EventedSpec::AMQPSpec
 
   em_before { AMQP.cleanup_state }
   em_after  { AMQP.cleanup_state }

data/spec/spec_helper.rb

@@ -6,8 +6,8 @@ require 'bundler'
 Bundler.setup
 Bundler.require :default, :test
 
-require "amqp-spec"
 require "amqp"
+require "evented-spec"
 
 amqp_config = File.dirname(__FILE__) + '/amqp.yml'
 
@@ -24,7 +24,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 => 5672, :username => "guest", :password => "guest", :vhost => "/"}
 end
 
 #
@@ -78,3 +78,8 @@ def test_method_deliver opts = {}
       AMQP::Protocol::Basic::Deliver.new(
           :consumer_tag => opts[:consumer_tag] || 'test_consumer'))
 end
+
+def delayed(timeout, &block)
+  instance = self
+  EM.add_timer(timeout) { instance.instance_eval(&block) }
+end # delayed

data/spec/unit/amqp/basic_spec.rb

@@ -8,7 +8,7 @@ describe AMQP do
   # Environment
   #
 
-  include AMQP::Spec
+  include EventedSpec::AMQPSpec
 
   default_timeout 5
 

data/spec/unit/amqp/client_spec.rb

@@ -0,0 +1,102 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe AMQP::Client do
+
+  #
+  # Examples
+  #
+
+
+  describe ".parse_connection_uri(connection_string)" do
+    context "when schema is not one of [amqp, amqps]" do
+      it "raises ArgumentError" do
+        expect {
+          described_class.parse_connection_uri("http://dev.rabbitmq.com")
+        }.to raise_error(ArgumentError, /amqp or amqps schema/)
+      end
+    end
+
+
+    it "handles amqp:// URIs w/o path part" do
+      val = described_class.parse_connection_uri("amqp://dev.rabbitmq.com")
+
+      val[:vhost].should be_nil # in this case, default / will be used
+      val[:host].should == "dev.rabbitmq.com"
+      val[:port].should == 5672
+      val[:scheme].should == "amqp"
+      val[:ssl].should be_false
+    end
+
+    it "handles amqps:// URIs w/o path part" do
+      val = described_class.parse_connection_uri("amqps://dev.rabbitmq.com")
+
+      val[:vhost].should be_nil
+      val[:host].should == "dev.rabbitmq.com"
+      val[:port].should == 5671
+      val[:scheme].should == "amqps"
+      val[:ssl].should be_true
+    end
+
+
+    context "when URI ends in a slash" do
+      it "parses vhost as an empty string" do
+        val = described_class.parse_connection_uri("amqp://dev.rabbitmq.com/")
+
+        val[:host].should == "dev.rabbitmq.com"
+        val[:port].should == 5672
+        val[:scheme].should == "amqp"
+        val[:ssl].should be_false
+        val[:vhost].should == ""
+      end
+    end
+
+
+    context "when URI ends in /%2Fvault" do
+      it "parses vhost as /vault" do
+        val = described_class.parse_connection_uri("amqp://dev.rabbitmq.com/%2Fvault")
+
+        val[:host].should == "dev.rabbitmq.com"
+        val[:port].should == 5672
+        val[:scheme].should == "amqp"
+        val[:ssl].should be_false
+        val[:vhost].should == "/vault"
+      end
+    end
+
+
+    context "when URI is amqp://dev.rabbitmq.com/a.path.without.slashes" do
+      it "parses vhost as a.path.without.slashes" do
+        val = described_class.parse_connection_uri("amqp://dev.rabbitmq.com/a.path.without.slashes")
+
+        val[:host].should == "dev.rabbitmq.com"
+        val[:port].should == 5672
+        val[:scheme].should == "amqp"
+        val[:ssl].should be_false
+        val[:vhost].should == "a.path.without.slashes"
+      end
+    end
+
+    context "when URI is amqp://dev.rabbitmq.com/a/path/with/slashes" do
+      it "raises an ArgumentError" do
+        lambda { described_class.parse_connection_uri("amqp://dev.rabbitmq.com/a/path/with/slashes") }.should raise_error(ArgumentError)
+      end
+    end
+
+
+    context "when URI has username:password, for instance, amqp://hedgehog:t0ps3kr3t@hub.megacorp.internal" do
+      it "parses them out" do
+        val = described_class.parse_connection_uri("amqp://hedgehog:t0ps3kr3t@hub.megacorp.internal")
+
+        val[:host].should == "hub.megacorp.internal"
+        val[:port].should == 5672
+        val[:scheme].should == "amqp"
+        val[:ssl].should be_false
+        val[:user].should == "hedgehog"
+        val[:pass].should == "t0ps3kr3t"
+        val[:vhost].should be_nil # in this case, default / will be used
+      end
+    end
+  end
+end

data/spec/unit/amqp/connection_spec.rb

@@ -50,7 +50,7 @@ describe AMQP, 'class object' do
     # Environment
     #
 
-    include AMQP::SpecHelper
+    include EventedSpec::SpecHelper
 
     em_before { AMQP.cleanup_state }
     em_after  { AMQP.cleanup_state }
@@ -65,6 +65,8 @@ describe AMQP, 'class object' do
           @block_fired = true
 
           AMQP.connection.should be_connected
+          AMQP.channel.should_not be_nil
+          AMQP.channel.connection.should == AMQP.connection
         end
         done(0.1) { @block_fired.should be_true }
       end
@@ -89,7 +91,7 @@ describe AMQP, 'class object' do
       #
       #
 
-      include AMQP::Spec
+      include EventedSpec::AMQPSpec
       after           { AMQP.cleanup_state; done }
       default_options AMQP_OPTS
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amqp
 version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 0
   - 7
-  - 1
-  version: 0.7.1
+  - 2
+  version: 0.7.2
 platform: ruby
 authors: 
 - Aman Gupta
@@ -15,8 +15,9 @@ authors:
 - Michael S. Klishin
 autorequire: 
 bindir: bin
-cert_chain: 
-date: 2011-03-18 00:00:00 +03:00
+cert_chain: []
+
+date: 2011-07-18 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,15 +28,13 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 39
+        hash: 3
         segments: 
         - 0
-        - 12
-        - 4
-        version: 0.12.4
+        version: "0"
   type: :runtime
   version_requirements: *id001
-description: An implementation of the AMQP protocol in Ruby/EventMachine for writing clients to the RabbitMQ message broker.
+description: Asynchronous AMQP 0.9.1 client for Ruby. Built on top of Eventmachine.
 email: 
 - michael@novemberain.com
 - stastny@101ideas.cz
@@ -45,6 +44,9 @@ extensions: []
 
 extra_rdoc_files: 
 - README.md
+- doc/_index.html
+- doc/AMQP.html
+- doc/class_list.html
 - doc/EXAMPLE_01_PINGPONG
 - doc/EXAMPLE_02_CLOCK
 - doc/EXAMPLE_03_STOCKS
@@ -52,9 +54,35 @@ extra_rdoc_files:
 - doc/EXAMPLE_05_ACK
 - doc/EXAMPLE_05_POP
 - doc/EXAMPLE_06_HASHTABLE
+- doc/file.08Migration.html
+- doc/file.Bindings.html
+- doc/file.CHANGELOG.html
+- doc/file.Clustering.html
+- doc/file.ConnectingToTheBroker.html
+- doc/file.ConnectionEncryptionWithTLS.html
+- doc/file.DocumentationGuidesIndex.html
+- doc/file.Durability.html
+- doc/file.ErrorHandling.html
+- doc/file.Exchanges.html
+- doc/file.GettingStarted.html
+- doc/file.Queues.html
+- doc/file.RabbitMQVersions.html
+- doc/file.README.html
+- doc/file.Routing.html
+- doc/file.RunningTests.html
+- doc/file.TestingWithEventedSpec.html
+- doc/file.Troubleshooting.html
+- doc/file.VendorSpecificExtensions.html
+- doc/file_list.html
+- doc/frames.html
+- doc/index.html
+- doc/method_list.html
+- doc/MQ.html
+- doc/top-level-namespace.html
 files: 
 - .gitignore
 - .rspec
+- .travis.yml
 - CHANGELOG
 - CONTRIBUTORS
 - Gemfile
@@ -65,7 +93,6 @@ files:
 - amqp.pre.gemspec
 - bin/cleanify.rb
 - bin/irb
-- bin/jenkins.sh
 - bin/set_test_suite_realms_up.sh
 - doc/EXAMPLE_01_PINGPONG
 - doc/EXAMPLE_02_CLOCK
@@ -78,8 +105,11 @@ files:
 - examples/automatic_binding_for_default_direct_exchange.rb
 - examples/callbacks.rb
 - examples/clock.rb
+- examples/default_channel.rb
 - examples/hashtable.rb
+- examples/immediately_bind_a_server_named_queue.rb
 - examples/internal.rb
+- examples/issues/issue_75.rb
 - examples/logger.rb
 - examples/multiclock.rb
 - examples/pingpong.rb
@@ -88,6 +118,7 @@ files:
 - examples/primes.rb
 - examples/simple.rb
 - examples/stocks.rb
+- gemfiles/eventmachine-pre
 - lib/amqp.rb
 - lib/amqp/basic_client.rb
 - lib/amqp/buffer.rb
@@ -130,10 +161,39 @@ files:
 - spec/spec_helper.rb
 - spec/unit/amqp/basic_spec.rb
 - spec/unit/amqp/buffer_spec.rb
+- spec/unit/amqp/client_spec.rb
 - spec/unit/amqp/collection_spec.rb
 - spec/unit/amqp/connection_spec.rb
 - spec/unit/amqp/frame_spec.rb
 - spec/unit/amqp/protocol_spec.rb
+- doc/_index.html
+- doc/AMQP.html
+- doc/class_list.html
+- doc/file.08Migration.html
+- doc/file.Bindings.html
+- doc/file.CHANGELOG.html
+- doc/file.Clustering.html
+- doc/file.ConnectingToTheBroker.html
+- doc/file.ConnectionEncryptionWithTLS.html
+- doc/file.DocumentationGuidesIndex.html
+- doc/file.Durability.html
+- doc/file.ErrorHandling.html
+- doc/file.Exchanges.html
+- doc/file.GettingStarted.html
+- doc/file.Queues.html
+- doc/file.RabbitMQVersions.html
+- doc/file.README.html
+- doc/file.Routing.html
+- doc/file.RunningTests.html
+- doc/file.TestingWithEventedSpec.html
+- doc/file.Troubleshooting.html
+- doc/file.VendorSpecificExtensions.html
+- doc/file_list.html
+- doc/frames.html
+- doc/index.html
+- doc/method_list.html
+- doc/MQ.html
+- doc/top-level-namespace.html
 has_rdoc: true
 homepage: http://github.com/ruby-amqp/amqp
 licenses: []
@@ -164,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: amqp
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: AMQP client implementation in Ruby/EventMachine.