amq-protocol 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1186376a08e72a7c0638f0722abfe51156a219a3
-  data.tar.gz: ea6f5b0d5e17db93da66d452770e54df709c0e77
+  metadata.gz: 4ed555f9528be0395d8ba9a11a39e193aa347f89
+  data.tar.gz: 345f66cb02153603fb16465bc9edddaf1b2bc63a
 SHA512:
-  metadata.gz: b1a755c018b85afbd991fbd569b32ceb49c329a7f33480c4f080f3cb79b3cd521708ba59e312a83aa3ec4ef441c592ad9348caef39314f5e73e95ea6ad9a9486
-  data.tar.gz: eceb36030d7404ff5530141f4a9c2f337324f85de5c58a08dfdb9c3480411b120b1988771d7949e4dc5238273ff9dd9a2364558084f5b7465fbd03d7e5a7af3e
+  metadata.gz: b5b11714e11f26704f9768d750bb61c4034edac91141d6a1743ad7fbbc6999fc88b2c70acbbbc42f14cdc6bd3eb3a0a3441519bd2922413a03d13a208d101e08
+  data.tar.gz: f50280bc01e330a2b2952585b444ceb5b195855836d572791c727c73b6d295b3037b76fc4ccf042837656a684f23889658114a981a55a33f50a05651d85b8478

data/.travis.yml

@@ -14,3 +14,6 @@ rvm:
 notifications:
   recipients:
     - michael@novemberain.com
+matrix:
+  allow_failures:
+    - rvm: ruby-head

data/lib/amq/protocol/client.rb

@@ -177,7 +177,7 @@ module AMQ
         body.force_encoding("ASCII-8BIT") if RUBY_VERSION.to_f >= 1.9
 
         array = Array.new
-        while body
+        while body && !body.empty?
           payload, body = body[0, limit], body[limit, body.length - limit]
           array << BodyFrame.new(payload, channel)
         end

data/lib/amq/protocol/version.rb

@@ -1,5 +1,5 @@
 module AMQ
   module Protocol
-    VERSION = "1.7.0"
+    VERSION = "1.8.0"
   end # Protocol
 end # AMQ

data/lib/amq/settings.rb

@@ -1,12 +1,10 @@
 # encoding: utf-8
 
 require "amq/protocol/client"
-require "uri"
+require "amq/uri"
 
 module AMQ
     module Settings
-      # @private
-      AMQP_PORTS = {"amqp" => 5672, "amqps" => 5671}.freeze
 
       # @private
       AMQPS = "amqps".freeze
@@ -110,23 +108,7 @@ module AMQ
       #
       # @api public
       def self.parse_amqp_url(connection_string)
-        uri = URI.parse(connection_string)
-        raise ArgumentError.new("Connection URI must use amqp or amqps schema (example: amqp://bus.megacorp.internal:5766), learn more at http://bit.ly/ks8MXK") unless %w{amqp amqps}.include?(uri.scheme)
-
-        opts = {}
-
-        opts[:scheme] = uri.scheme
-        opts[:user]   = URI.unescape(uri.user) if uri.user
-        opts[:pass]   = URI.unescape(uri.password) if uri.password
-        opts[:host]   = uri.host if uri.host
-        opts[:port]   = uri.port || AMQP_PORTS[uri.scheme]
-        opts[:ssl]    = uri.scheme.to_s.downcase =~ /amqps/i
-        if uri.path =~ %r{^/(.*)}
-          raise ArgumentError.new("#{uri} has multiple-segment path; please percent-encode any slashes in the vhost name (e.g. /production => %2Fproduction). Learn more at http://bit.ly/amqp-gem-and-connection-uris") if $1.index('/')
-          opts[:vhost] = URI.unescape($1)
-        end
-
-        opts
+        AMQ::URI.parse(connection_string)
       end
     end
 end

data/lib/amq/uri.rb

@@ -0,0 +1,37 @@
+# encoding: utf-8
+
+require "amq/settings"
+
+require "cgi"
+require "uri"
+
+module AMQ
+  class URI
+    # @private
+    AMQP_PORTS = {"amqp" => 5672, "amqps" => 5671}.freeze
+
+
+    def self.parse(connection_string)
+      uri = ::URI.parse(connection_string)
+      raise ArgumentError.new("Connection URI must use amqp or amqps schema (example: amqp://bus.megacorp.internal:5766), learn more at http://bit.ly/ks8MXK") unless %w{amqp amqps}.include?(uri.scheme)
+
+      opts = {}
+
+      opts[:scheme] = uri.scheme
+      opts[:user]   = ::URI.unescape(uri.user) if uri.user
+      opts[:pass]   = ::URI.unescape(uri.password) if uri.password
+      opts[:host]   = uri.host if uri.host
+      opts[:port]   = uri.port || AMQP_PORTS[uri.scheme]
+      opts[:ssl]    = uri.scheme.to_s.downcase =~ /amqps/i
+      if uri.path =~ %r{^/(.*)}
+        raise ArgumentError.new("#{uri} has multiple-segment path; please percent-encode any slashes in the vhost name (e.g. /production => %2Fproduction). Learn more at http://bit.ly/amqp-gem-and-connection-uris") if $1.index('/')
+        opts[:vhost] = ::URI.unescape($1)
+      end
+
+      opts
+    end
+    def self.parse_amqp_url(s)
+      parse(s)
+    end
+  end
+end

data/spec/amq/protocol/method_spec.rb

@@ -34,6 +34,14 @@ module AMQ
             body_frames.map(&:payload).should == lipsum.split('').each_slice(expected_payload_size).map(&:join)
           end
         end
+
+        context 'when the body fits perfectly in a single frame' do
+          it 'encodes a body into a single BodyFrame' do
+            body_frames = Method.encode_body('*' * 131064, 1, 131072)
+            body_frames.first.payload.should == '*' * 131064
+            body_frames.should have(1).item
+          end
+        end
       end
     end
   end

data/spec/amq/settings_spec.rb

@@ -22,95 +22,4 @@ describe AMQ::Settings do
       settings[:host].should eql("tagadab")
     end
   end
-
-  describe ".parse_amqp_url(connection_string)" do
-    context "when schema is not one of [amqp, amqps]" do
-      it "raises ArgumentError" do
-        expect {
-          described_class.parse_amqp_url("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_amqp_url("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_amqp_url("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_amqp_url("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_amqp_url("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_amqp_url("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_amqp_url("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_amqp_url("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/amq/uri_parsing_spec.rb

@@ -0,0 +1,95 @@
+# encoding: utf-8
+
+require "spec_helper"
+require "amq/uri"
+
+describe AMQ::URI, ".parse" do
+  context "when schema is not one of [amqp, amqps]" do
+    it "raises ArgumentError" do
+      expect {
+        described_class.parse_amqp_url("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_amqp_url("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_amqp_url("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_amqp_url("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_amqp_url("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_amqp_url("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_amqp_url("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_amqp_url("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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amq-protocol
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Jakub Stastny
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2013-09-17 00:00:00.000000000 Z
 dependencies: []
 description: |2
     amq-protocol is an AMQP 0.9.1 serialization library for Ruby. It is not an
@@ -59,6 +59,7 @@ files:
 - lib/amq/protocol/type_constants.rb
 - lib/amq/protocol/version.rb
 - lib/amq/settings.rb
+- lib/amq/uri.rb
 - profiling/pure/body_framing_with_2k_payload.rb
 - spec/amq/bit_set_spec.rb
 - spec/amq/hacks_spec.rb
@@ -79,6 +80,7 @@ files:
 - spec/amq/protocol/value_encoder_spec.rb
 - spec/amq/protocol_spec.rb
 - spec/amq/settings_spec.rb
+- spec/amq/uri_parsing_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/ruby-amqp/amq-protocol
 licenses: