amq-protocol 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa10f585162559fa1b74d9f406725745e96ac46b
-  data.tar.gz: 017657dbecc96437ca9f28887e73df4d76d9df97
+  metadata.gz: 1df146ebd04eb15fc2d776b8dc7727da583ac8ba
+  data.tar.gz: 9ea0a0fadbc0f8d5bf4ae5b4cddb83263c12b51d
 SHA512:
-  metadata.gz: 96631cb9c63b31649c309c1686ff5b26321e847ff0994c2a1bc007d54caa56e3fbe936bca7f56c809b812cd91d34bc94a9d84af582bb3d109a2310e5199d86ca
-  data.tar.gz: e607e0fa90130e7e76847810ac100ba3de2692d20321f1e4e1601cda97bcd0e979aa62350ee1b1bd9a0ed0becac53882f0ce96bca45edec669507623a73c59a4
+  metadata.gz: dab13ac628ff6c896284702903b702549861e575cba274192802779387e7a2a64cd6126cb1d1fd722e3b5220982494419f2a77f249443807343689de6147ab2f
+  data.tar.gz: 1e5d034f65ec0ab257e0db1c30879bf29ac15519cda3fbf1b424417d504f5d70f8e8daac27b73fc566f3bc2d80fa65c5a0ae391a26155fa360c7042f310e3d6a

data/ChangeLog.md

@@ -1,3 +1,13 @@
+## Changes between 1.9.x and 1.10.0
+
+### Signed 16 Bit Integer Decoding
+
+Signed 16 bit integers are now decoded correctly.
+
+Contributed by Benjamin Conlan.
+
+
+
 ## Changes between 1.8.0 and 1.9.0
 
 ### Performance Improvements in AMQ::BitSet

data/lib/amq/protocol/table.rb

@@ -81,8 +81,8 @@ module AMQ
                        when TYPE_BOOLEAN
                          v, offset = TableValueDecoder.decode_boolean(data, offset)
                          v
-                       when TYPE_SIGNED_8BIT  then
-                         v, offset = TableValueDecoder.decode_short_short(data, offset)
+                      when TYPE_BYTE  then
+                         v, offset = TableValueDecoder.decode_byte(data, offset)
                          v
                        when TYPE_SIGNED_16BIT then
                          v, offset = TableValueDecoder.decode_short(data, offset)

data/lib/amq/protocol/table_value_decoder.rb

@@ -50,8 +50,8 @@ module AMQ
               when TYPE_BOOLEAN
                 v, offset = decode_boolean(data, offset)
                 v
-              when TYPE_SIGNED_8BIT then
-                v, offset = decode_short_short(data, offset)
+              when TYPE_BYTE then
+                v, offset = decode_byte(data, offset)
                 v
               when TYPE_SIGNED_16BIT then
                 v, offset = decode_short(data, offset)
@@ -174,12 +174,16 @@ module AMQ
       end # self.decode_hash(data, offset)
 
 
-      def self.decode_short_short(data, offset)
-        v = data.slice(offset, 1).unpack(PACK_INT8).first
-        offset += 1
-        [v, offset]
+      # Decodes/Converts a byte value from the data at the provided offset.
+      #
+      # @param [Array] data - A big-endian ordered array of bytes.
+      # @param [Fixnum] offset - The offset which bytes the byte is consumed.
+      # @return [Array] - The Fixnum value and new offset pair.
+      def self.decode_byte(data, offset)
+        [data.slice(offset, 1).unpack(PACK_CHAR).first, offset += 1]
       end
 
+
       def self.decode_short(data, offset)
         v = AMQ::Hacks.unpack_int16_big_endian(data.slice(offset, 2)).first
         offset += 2

data/lib/amq/protocol/type_constants.rb

@@ -9,7 +9,7 @@ module AMQ
       TYPE_DECIMAL      = 'D'.freeze
       TYPE_HASH         = 'F'.freeze
       TYPE_ARRAY        = 'A'.freeze
-      TYPE_SIGNED_8BIT  = 'b'.freeze
+      TYPE_BYTE         = 'b'.freeze
       TYPE_64BIT_FLOAT  = 'd'.freeze
       TYPE_32BIT_FLOAT  = 'f'.freeze
       TYPE_SIGNED_64BIT = 'l'.freeze

data/lib/amq/protocol/version.rb

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

data/spec/amq/protocol/table_spec.rb

@@ -176,8 +176,8 @@ module AMQ
         end
 
         it 'is capable of decoding 8bit signed integers' do
-          output = TableValueDecoder.decode_short_short("\xC0",0).first
-          output.should == -64
+          output = TableValueDecoder.decode_byte("\xC0",0).first
+          output.should == 192
         end
 
         it 'is capable of decoding 16bit signed integers' do

data/spec/amq/protocol/value_decoder_spec.rb

@@ -67,6 +67,23 @@ module AMQ
         value, offset = described_class.decode_32bit_float(data, 1)
         value.should == 10.0
       end
+
+      context "8bit/byte decoding" do
+        let(:examples) {
+          {
+              0x00 => "\x00",
+              0x01 => "\x01",
+              0x10 => "\x10",
+              255   => "\xFF" # not -1
+          }
+        }
+
+        it "is capable of decoding byte values" do
+          examples.each do |key, value|
+            described_class.decode_byte(value, 0).first.should == key
+          end
+        end
+      end
     end
   end
 end

metadata

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