amq-protocol 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6414473e47857ea1786e17fc043ccb0a7de1c51e
-  data.tar.gz: 7e20dca497dd7b785a62fbf4f1edd8efde84ffda
+  metadata.gz: 592546ccd9dcc7fbaa136d8ba3b047cdf981e478
+  data.tar.gz: 269934dfff14063fcf9edc28bab301abadb28945
 SHA512:
-  metadata.gz: bc68b493add7ea27adf4451631bd1137377e6f979feb43e834f48b8ab019688fdad5f726893bb1de9dbbc4a29948f47d4e7fcbd1607b3fea123f594e267fbd29
-  data.tar.gz: ca3c1f251925c4bbee125e5b7556579129d00557847b79e797fb780f863bb18ff839f2f773e4e8aa339261f1ade985fdfb27402721dce4f15ca2ddc8cdb77bc3
+  metadata.gz: 00fe19339769feb0337e136f05124b0a1d71e70568a3673710285d40016cf5569ac87f41bcae036a837b8cb10c079cd9c95a86f956dddc4d0b9fb10630a8c1ed
+  data.tar.gz: f498ce739314be78b14f5679725a58edf9caa5e266514a3fcfbdd899cba7deedf7a584f06436f42d5023872dea9a32384274a6d59c52141e62cc7ed2c24cf3b8

data/README.md

@@ -10,8 +10,7 @@ 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+.
+amq-protocol `2.0.0` and later only supports Ruby 2.0+.
 
 
 ## Installation

data/lib/amq/protocol/client.rb

@@ -1437,7 +1437,8 @@ module AMQ
         result = [60, 0].pack(PACK_UINT16_X2)
         result += AMQ::Pack.pack_uint64_big_endian(body_size)
         result += [flags].pack(PACK_UINT16)
-        result + pieces.join(EMPTY_STRING)
+        pieces_joined = pieces.join(EMPTY_STRING)
+        result.force_encoding(pieces_joined.encoding) + pieces_joined
       end
 
       # THIS DECODES ONLY FLAGS

data/lib/amq/protocol/table.rb

@@ -41,11 +41,11 @@ module AMQ
             buffer << TYPE_HASH
             buffer << self.encode(value)
           else
-            buffer << TableValueEncoder.encode(value)
+            buffer << TableValueEncoder.encode(value).force_encoding(buffer.encoding)
           end
         end
 
-        [buffer.bytesize].pack(PACK_UINT32) + buffer
+        [buffer.bytesize].pack(PACK_UINT32).force_encoding(buffer.encoding) + buffer
       end
 
 
@@ -66,6 +66,12 @@ module AMQ
                        when TYPE_STRING
                          v, offset = TableValueDecoder.decode_string(data, offset)
                          v
+                       when TYPE_BYTE_ARRAY
+                         # Ruby doesn't have a direct counterpart to
+                         # ByteBuffer or byte[], so using a string feels
+                         # more appropriate than an array of fixnums
+                         v, offset = TableValueDecoder.decode_string(data, offset)
+                         v
                        when TYPE_INTEGER
                          v, offset = TableValueDecoder.decode_integer(data, offset)
                          v

data/lib/amq/protocol/table_value_decoder.rb

@@ -35,6 +35,12 @@ module AMQ
               when TYPE_STRING
                 v, offset = decode_string(data, offset)
                 v
+              when TYPE_BYTE_ARRAY
+                # Ruby doesn't have a direct counterpart to
+                # ByteBuffer or byte[], so using a string feels
+                # more appropriate than an array of fixnums
+                v, offset = decode_string(data, offset)
+                v
               when TYPE_INTEGER
                 v, offset = decode_integer(data, offset)
                 v

data/lib/amq/protocol/version.rb

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

data/spec/amq/protocol/table_spec.rb

@@ -93,6 +93,12 @@ module AMQ
         it "is capable of decoding string table values" do
           input   = { "stringvalue" => "string" }
           expect(Table.decode(Table.encode(input))).to eq(input)
+
+          expect(Table.decode("\x00\x00\x00\x17\vstringvalueS\x00\x00\x00\x06string")).to eq(input)
+        end
+
+        it "is capable of decoding byte array table values (as Ruby strings)" do
+          expect(Table.decode("\x00\x00\x00\x17\vstringvaluex\x00\x00\x00\x06string")).to eq({"stringvalue" => "string"})
         end
 
         it "is capable of decoding string table values with UTF-8 characters" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amq-protocol
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Jakub Stastny
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-15 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies: []
 description: |2
     amq-protocol is an AMQP 0.9.1 serialization library for Ruby. It is not a