amq-protocol 1.9.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1df146ebd04eb15fc2d776b8dc7727da583ac8ba
-  data.tar.gz: 9ea0a0fadbc0f8d5bf4ae5b4cddb83263c12b51d
+  metadata.gz: 6414473e47857ea1786e17fc043ccb0a7de1c51e
+  data.tar.gz: 7e20dca497dd7b785a62fbf4f1edd8efde84ffda
 SHA512:
-  metadata.gz: dab13ac628ff6c896284702903b702549861e575cba274192802779387e7a2a64cd6126cb1d1fd722e3b5220982494419f2a77f249443807343689de6147ab2f
-  data.tar.gz: 1e5d034f65ec0ab257e0db1c30879bf29ac15519cda3fbf1b424417d504f5d70f8e8daac27b73fc566f3bc2d80fa65c5a0ae391a26155fa360c7042f310e3d6a
+  metadata.gz: bc68b493add7ea27adf4451631bd1137377e6f979feb43e834f48b8ab019688fdad5f726893bb1de9dbbc4a29948f47d4e7fcbd1607b3fea123f594e267fbd29
+  data.tar.gz: ca3c1f251925c4bbee125e5b7556579129d00557847b79e797fb780f863bb18ff839f2f773e4e8aa339261f1ade985fdfb27402721dce4f15ca2ddc8cdb77bc3

data/.travis.yml

@@ -2,12 +2,10 @@ language: ruby
 bundler_args: --without development
 script: "bundle exec rspec spec"
 rvm:
+  - 2.2
+  - 2.1
   - 2.0
-  - 1.9.3
-  - jruby
-  - 1.9.2
   - ruby-head
-  - 1.8.7
 notifications:
   recipients:
     - michael@rabbitmq.com

data/ChangeLog.md

@@ -1,9 +1,23 @@
-## Changes between 1.9.x and 1.10.0
+## Changes between 1.9.x and 2.0.0
+
+2.0.0 has **breaking changes** in header encoding.
+
+### Signed Integer Encoding in Headers
+
+Integer values in headers are now encoded as signed 64-bit
+(was unsigned 32-bit previously, unintentionally).
+
+This is a breaking change: consuming messages with integers in headers
+published with older versions of this library will break!
 
 ### Signed 16 Bit Integer Decoding
 
 Signed 16 bit integers are now decoded correctly.
 
+### Signed 8 Bit Integer Decoding
+
+Signed 8 bit integers are now decoded correctly.
+
 Contributed by Benjamin Conlan.
 
 

data/Gemfile

@@ -4,12 +4,13 @@ source "https://rubygems.org"
 
 group :development do
   # excludes Windows, Rubinius and JRuby
-  gem "ruby-prof", :platform => :mri
+  gem "ruby-prof", :platforms => [:mri_19, :mri_20, :mri_21]
 
   gem "rake"
 end
 
 group :test do
-  gem "rspec", ">= 2.13.0"
+  gem "rspec"
+  gem "rspec-its"
   gem "effin_utf8"
 end

data/LICENSE

@@ -1,5 +1,5 @@
 Copyright (c) 2010 – 2011 Jakub Šťastný aka Botanicus
-Copyright (c) 2011 – 2012 Michael S. Klishin <michael@defprotocol.org>
+Copyright (c) 2011 – 2015 Michael S. Klishin <michael@defprotocol.org>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -7,6 +7,13 @@ If you want to write your own AMQP client, this gem will handle all the serializ
 needs for you, including RabbitMQ extensions to AMQP 0.9.1.
 
 
+## Supported Ruby Versions
+
+amq-protocol `1.9.2` was the last version to support Ruby 1.8 and 1.9.
+
+amq-protocol `2.0.0` and later will only support Ruby 2.0+.
+
+
 ## Installation
 
     gem install amq-protocol
@@ -56,7 +63,3 @@ Any questions you may have should be sent to the [Ruby AMQP mailing list](http:/
 ## License
 
 MIT (see LICENSE in the repository root).
-
-
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/ruby-amqp/amq-protocol/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
-

data/amq-protocol.gemspec

@@ -10,14 +10,14 @@ Gem::Specification.new do |s|
   s.version = AMQ::Protocol::VERSION
   s.authors = ["Jakub Stastny", "Michael S. Klishin", "Theo Hultberg", "Mark Abramov"]
   s.homepage = "http://github.com/ruby-amqp/amq-protocol"
-  s.summary = "AMQP 0.9.1 encoder & decoder."
+  s.summary = "AMQP 0.9.1 encoding & decoding library."
   s.description = <<-DESC
-  amq-protocol is an AMQP 0.9.1 serialization library for Ruby. It is not an
-  AMQP client: amq-protocol only handles serialization and deserialization.
-  If you want to write your own AMQP client, this gem can help you with that.
+  amq-protocol is an AMQP 0.9.1 serialization library for Ruby. It is not a
+  client: the library only handles serialization and deserialization.
   DESC
-  s.email = ["bWljaGFlbEBub3ZlbWJlcmFpbi5jb20=\n", "c3Rhc3RueUAxMDFpZGVhcy5jeg==\n"].map { |i| Base64.decode64(i) }
+  s.email = ["michael.s.klishin@gmail.com"]
   s.licenses    = ["MIT"]
+  s.required_ruby_version = Gem::Requirement.new(">= 2.0")
 
   # files
   s.files = `git ls-files`.split("\n").reject { |file| file =~ /^vendor\// }
@@ -25,7 +25,5 @@ Gem::Specification.new do |s|
 
   s.extra_rdoc_files = ["README.md"] + Dir.glob("doc/*")
 
-
-  # RubyForge
   s.rubyforge_project = "amq-protocol"
 end

data/lib/amq/protocol/constants.rb

@@ -13,6 +13,7 @@ module AMQ
     PACK_UINT32             = 'N'.freeze
     PACK_UINT32_X2          = 'N2'.freeze
     PACK_INT64              = 'q'.freeze
+    PACK_INT64_BE           = 'q>'.freeze
     PACK_UCHAR_UINT32       = 'CN'.freeze
     PACK_CHAR_UINT16_UINT32 = 'cnN'.freeze
 

data/lib/amq/protocol/table_value_encoder.rb

@@ -36,8 +36,8 @@ module AMQ
           accumulator << [v.bytesize].pack(PACK_UINT32)
           accumulator << v
         when Integer then
-          accumulator << TYPE_INTEGER
-          accumulator << [value].pack(PACK_UINT32)
+          accumulator << TYPE_SIGNED_64BIT
+          accumulator << [value].pack(PACK_INT64_BE)
         when AMQ::Protocol::Float32Bit then
           accumulator << TYPE_32BIT_FLOAT
           accumulator << [value.value].pack(PACK_32BIT_FLOAT)
@@ -49,7 +49,7 @@ module AMQ
           accumulator << (value ? BOOLEAN_TRUE : BOOLEAN_FALSE)
         when Time then
           accumulator << TYPE_TIME
-          accumulator << [value.to_i].pack(PACK_INT64).reverse # FIXME: there has to be a more efficient way
+          accumulator << [value.to_i].pack(PACK_INT64_BE)
         when nil then
           accumulator << TYPE_VOID
         when Array then
@@ -91,7 +91,7 @@ module AMQ
         when String then
           acc += (value.bytesize + 4)
         when Integer then
-          acc += 4
+          acc += 8
         when Float then
           acc += 8
         when Time, DateTime then

data/lib/amq/protocol/version.rb

@@ -1,5 +1,5 @@
 module AMQ
   module Protocol
-    VERSION = "1.9.2"
+    VERSION = "2.0.0"
   end # Protocol
 end # AMQ

data/lib/amq/uri.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require "amq/settings"
-
 require "cgi"
 require "uri"
 
@@ -18,14 +16,14 @@ module AMQ
       opts = {}
 
       opts[:scheme] = uri.scheme
-      opts[:user]   = ::URI.unescape(uri.user) if uri.user
-      opts[:pass]   = ::URI.unescape(uri.password) if uri.password
+      opts[:user]   = ::CGI::unescape(uri.user) if uri.user
+      opts[:pass]   = ::CGI::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)
+        opts[:vhost] = ::CGI::unescape($1)
       end
 
       opts

data/spec/amq/bit_set_spec.rb

@@ -23,7 +23,7 @@ describe AMQ::BitSet do
     it "has no bits set at the start" do
       bs = AMQ::BitSet.new(128)
       0.upto(127) do |i|
-        bs[i].should == false
+        expect(bs[i]).to be_falsey
       end
     end # it
   end # describe
@@ -33,15 +33,15 @@ describe AMQ::BitSet do
       described_class.new(nbits)
     end
     it "returns 0 when the word is between 0 and 63" do
-      subject.word_index(0).should == 0
-      subject.word_index(63).should == 0
+      expect(subject.word_index(0)).to eq(0)
+      expect(subject.word_index(63)).to eq(0)
     end # it
     it "returns 1 when the word is between 64 and 127" do
-      subject.word_index(64).should == 1
-      subject.word_index(127).should == 1
+      expect(subject.word_index(64)).to be(1)
+      expect(subject.word_index(127)).to be(1)
     end # it
     it "returns 2 when the word is between 128 and another number" do
-      subject.word_index(128).should == 2
+      expect(subject.word_index(128)).to be(2)
     end # it
   end # describe
 
@@ -54,7 +54,7 @@ describe AMQ::BitSet do
       end
 
       it "returns true" do
-        subject.get(3).should be_true
+        expect(subject.get(3)).to be_truthy
       end # it
     end # describe
 
@@ -64,7 +64,7 @@ describe AMQ::BitSet do
       end
 
       it "returns false" do
-        subject.get(5).should be_false
+        expect(subject.get(5)).to be_falsey
       end # it
     end # describe
 
@@ -74,10 +74,10 @@ describe AMQ::BitSet do
       end
 
       it "should raise IndexError for negative index" do
-        lambda { subject.get(-1) }.should raise_error(IndexError)
+        expect { subject.get(-1) }.to raise_error(IndexError)
       end # it
       it "should raise IndexError for index >= number of bits" do
-        lambda { subject.get(nbits) }.should raise_error(IndexError)
+        expect { subject.get(nbits) }.to raise_error(IndexError)
       end # it
     end # describe
   end # describe
@@ -91,9 +91,9 @@ describe AMQ::BitSet do
 
       it "has no effect" do
         subject.set(3)
-        subject.get(3).should be_true
+        expect(subject.get(3)).to be_truthy
         subject.set(3)
-        subject[3].should be_true
+        expect(subject[3]).to be_truthy
       end # it
     end # describe
 
@@ -104,13 +104,13 @@ describe AMQ::BitSet do
 
       it "sets that bit" do
         subject.set(3)
-        subject.get(3).should be_true
+        expect(subject.get(3)).to be_truthy
 
         subject.set(33)
-        subject.get(33).should be_true
+        expect(subject.get(33)).to be_truthy
 
         subject.set(3387)
-        subject.get(3387).should be_true
+        expect(subject.get(3387)).to be_truthy
       end # it
     end # describe
 
@@ -120,10 +120,10 @@ describe AMQ::BitSet do
       end
 
       it "should raise IndexError for negative index" do
-        lambda { subject.set(-1) }.should raise_error(IndexError)
+        expect { subject.set(-1) }.to raise_error(IndexError)
       end # it
       it "should raise IndexError for index >= number of bits" do
-        lambda { subject.set(nbits) }.should raise_error(IndexError)
+        expect { subject.set(nbits) }.to raise_error(IndexError)
       end # it
     end # describe
   end # describe
@@ -137,9 +137,9 @@ describe AMQ::BitSet do
 
       it "unsets that bit" do
         subject.set(3)
-        subject.get(3).should be_true
+        expect(subject.get(3)).to be_truthy
         subject.unset(3)
-        subject.get(3).should be_false
+        expect(subject.get(3)).to be_falsey
       end # it
     end # describe
 
@@ -150,9 +150,9 @@ describe AMQ::BitSet do
       end
 
       it "has no effect" do
-        subject.get(3).should be_false
+        expect(subject.get(3)).to be_falsey
         subject.unset(3)
-        subject.get(3).should be_false
+        expect(subject.get(3)).to be_falsey
       end # it
     end # describe
 
@@ -162,10 +162,10 @@ describe AMQ::BitSet do
       end
 
       it "should raise IndexError for negative index" do
-        lambda { subject.unset(-1) }.should raise_error(IndexError)
+        expect { subject.unset(-1) }.to raise_error(IndexError)
       end # it
       it "should raise IndexError for index >= number of bits" do
-        lambda { subject.unset(nbits) }.should raise_error(IndexError)
+        expect { subject.unset(nbits) }.to raise_error(IndexError)
       end # it
     end # describe
   end # describe
@@ -179,25 +179,25 @@ describe AMQ::BitSet do
 
     it "clears all bits" do
       subject.set(3)
-      subject.get(3).should be_true
+      expect(subject.get(3)).to be_truthy
 
       subject.set(7668)
-      subject.get(7668).should be_true
+      expect(subject.get(7668)).to be_truthy
 
       subject.clear
 
-      subject.get(3).should be_false
-      subject.get(7668).should be_false
+      expect(subject.get(3)).to be_falsey
+      expect(subject.get(7668)).to be_falsey
     end # it
   end # describe
 
   describe "#number_of_trailing_ones" do
     it "calculates them" do
-      described_class.number_of_trailing_ones(0).should == 0
-      described_class.number_of_trailing_ones(1).should == 1
-      described_class.number_of_trailing_ones(2).should == 0
-      described_class.number_of_trailing_ones(3).should == 2
-      described_class.number_of_trailing_ones(4).should == 0
+      expect(described_class.number_of_trailing_ones(0)).to eq(0)
+      expect(described_class.number_of_trailing_ones(1)).to eq(1)
+      expect(described_class.number_of_trailing_ones(2)).to eq(0)
+      expect(described_class.number_of_trailing_ones(3)).to eq(2)
+      expect(described_class.number_of_trailing_ones(4)).to eq(0)
     end # it
   end # describe
 
@@ -206,27 +206,27 @@ describe AMQ::BitSet do
       described_class.new(255)
     end
     it "returns sequential values when none have been returned" do
-      subject.next_clear_bit.should == 0
+      expect(subject.next_clear_bit).to eq(0)
       subject.set(0)
-      subject.next_clear_bit.should == 1
+      expect(subject.next_clear_bit).to eq(1)
       subject.set(1)
-      subject.next_clear_bit.should == 2
+      expect(subject.next_clear_bit).to eq(2)
       subject.unset(1)
-      subject.next_clear_bit.should == 1
+      expect(subject.next_clear_bit).to eq(1)
     end # it
 
     it "returns the same number as long as nothing is set" do
-      subject.next_clear_bit.should == 0
-      subject.next_clear_bit.should == 0
+      expect(subject.next_clear_bit).to eq(0)
+      expect(subject.next_clear_bit).to eq(0)
     end # it
 
     it "handles more than 128 bits" do
       0.upto(254) do |i|
         subject.set(i)
-        subject.next_clear_bit.should == i + 1
+        expect(subject.next_clear_bit).to eq(i + 1)
       end
       subject.unset(254)
-      subject.get(254).should be_false
+      expect(subject.get(254)).to be_falsey
     end # it
   end # describe
 end

data/spec/amq/int_allocator_spec.rb

@@ -23,20 +23,20 @@ describe AMQ::IntAllocator do
 
   describe "#number_of_bits" do
     it "returns number of bits available for allocation" do
-      subject.number_of_bits.should == 4
+      expect(subject.number_of_bits).to eq(4)
     end
   end
 
 
   describe "#hi" do
     it "returns upper bound of the allocation range" do
-      subject.hi.should == 5
+      expect(subject.hi).to eq(5)
     end
   end
 
   describe "#lo" do
     it "returns lower bound of the allocation range" do
-      subject.lo.should == 1
+      expect(subject.lo).to eq(1)
     end
   end
 
@@ -44,12 +44,12 @@ describe AMQ::IntAllocator do
   describe "#allocate" do
     context "when integer in the range is available" do
       it "returns allocated integer" do
-        subject.allocate.should == 1
-        subject.allocate.should == 2
-        subject.allocate.should == 3
-        subject.allocate.should == 4
+        expect(subject.allocate).to eq(1)
+        expect(subject.allocate).to eq(2)
+        expect(subject.allocate).to eq(3)
+        expect(subject.allocate).to eq(4)
 
-        subject.allocate.should == -1
+        expect(subject.allocate).to eq(-1)
       end
     end
 
@@ -57,10 +57,10 @@ describe AMQ::IntAllocator do
       it "returns -1" do
         4.times { subject.allocate }
 
-        subject.allocate.should == -1
-        subject.allocate.should == -1
-        subject.allocate.should == -1
-        subject.allocate.should == -1
+        expect(subject.allocate).to eq(-1)
+        expect(subject.allocate).to eq(-1)
+        expect(subject.allocate).to eq(-1)
+        expect(subject.allocate).to eq(-1)
       end
     end
   end
@@ -70,24 +70,24 @@ describe AMQ::IntAllocator do
     context "when the integer WAS allocated" do
       it "returns frees that integer" do
         4.times { subject.allocate }
-        subject.allocate.should == -1
+        expect(subject.allocate).to eq(-1)
 
         subject.free(1)
-        subject.allocate.should == 1
-        subject.allocate.should == -1
+        expect(subject.allocate).to eq(1)
+        expect(subject.allocate).to eq(-1)
         subject.free(2)
-        subject.allocate.should == 2
-        subject.allocate.should == -1
+        expect(subject.allocate).to eq(2)
+        expect(subject.allocate).to eq(-1)
         subject.free(3)
-        subject.allocate.should == 3
-        subject.allocate.should == -1
+        expect(subject.allocate).to eq(3)
+        expect(subject.allocate).to eq(-1)
       end
     end
 
     context "when the integer WAS NOT allocated" do
       it "has no effect" do
         32.times { subject.free(1) }
-        subject.allocate.should == 1
+        expect(subject.allocate).to eq(1)
       end
     end
   end
@@ -98,9 +98,9 @@ describe AMQ::IntAllocator do
       it "returns true" do
         3.times { subject.allocate }
 
-        subject.allocated?(1).should be_true
-        subject.allocated?(2).should be_true
-        subject.allocated?(3).should be_true
+        expect(subject.allocated?(1)).to be_truthy
+        expect(subject.allocated?(2)).to be_truthy
+        expect(subject.allocated?(3)).to be_truthy
       end
     end
 
@@ -108,8 +108,8 @@ describe AMQ::IntAllocator do
       it "returns false" do
         2.times { subject.allocate }
 
-        subject.allocated?(3).should be_false
-        subject.allocated?(4).should be_false
+        expect(subject.allocated?(3)).to be_falsey
+        expect(subject.allocated?(4)).to be_falsey
       end
     end
   end