amq-protocol 1.2.0 → 1.3.0

data/codegen/codegen_helpers.py

@@ -16,9 +16,9 @@ def genSingleEncode(spec, cValue, unresolved_domain):
     elif type == 'long':
         buffer.append("buffer << [%s].pack(PACK_UINT32)" % (cValue,))
     elif type == 'longlong':
-        buffer.append("buffer << AMQ::Hacks.pack_64_big_endian(%s)" % (cValue,))
+        buffer.append("buffer << AMQ::Hacks.pack_uint64_big_endian(%s)" % (cValue,))
     elif type == 'timestamp':
-        buffer.append("buffer << AMQ::Hacks.pack_64_big_endian(%s)" % (cValue,))
+        buffer.append("buffer << AMQ::Hacks.pack_uint64_big_endian(%s)" % (cValue,))
     elif type == 'bit':
         raise "Can't encode bit in genSingleEncode"
     elif type == 'table':
@@ -58,7 +58,7 @@ def genSingleDecode(spec, field):
         buffer.append("%s = data[offset, 4].unpack(PACK_UINT32).first" % (cLvalue,))
         buffer.append("offset += 4")
     elif type == 'longlong':
-        buffer.append("%s = AMQ::Hacks.unpack_64_big_endian(data[offset, 8]).first" % (cLvalue,))
+        buffer.append("%s = AMQ::Hacks.unpack_uint64_big_endian(data[offset, 8]).first" % (cLvalue,))
         buffer.append("offset += 8")
     elif type == 'timestamp':
         buffer.append("%s = data[offset, 8].unpack(PACK_UINT32_X2).first" % (cLvalue,))
@@ -91,13 +91,13 @@ def genSingleSimpleDecode(spec, field):
     elif type == 'longstr':
         buffer.append("data.to_s")
     elif type == 'octet':
-        buffer.append("data.unpack(PACK_CHAR).first")
+        buffer.append("data.unpack(PACK_INT8).first")
     elif type == 'short':
         buffer.append("data.unpack(PACK_UINT16).first")
     elif type == 'long':
         buffer.append("data.unpack(PACK_UINT32).first")
     elif type == 'longlong':
-        buffer.append("AMQ::Hacks.unpack_64_big_endian(data).first")
+        buffer.append("AMQ::Hacks.unpack_uint64_big_endian(data).first")
     elif type == 'timestamp':
         buffer.append("Time.at(data.unpack(PACK_UINT32_X2).last)")
     elif type == 'bit':

data/codegen/protocol.rb.pytemplate

@@ -20,6 +20,7 @@ module AMQ
     # caching
     EMPTY_STRING = "".freeze
 
+    PACK_INT8               = 'c'.freeze
     PACK_CHAR               = 'C'.freeze
     PACK_UINT16             = 'n'.freeze
     PACK_UINT16_X2          = 'n2'.freeze
@@ -30,7 +31,7 @@ module AMQ
     PACK_CHAR_UINT16_UINT32 = 'cnN'.freeze
 
     PACK_32BIT_FLOAT        = 'f'.freeze
-    PACK_64BIT_FLOAT        = 'd'.freeze
+    PACK_64BIT_FLOAT        = 'G'.freeze
 
 
 
@@ -262,7 +263,7 @@ module AMQ
 
         # result = [${klass.index}, 0, body_size, flags].pack('n2Qn')
         result = [${klass.index}, 0].pack(PACK_UINT16_X2)
-        result += AMQ::Hacks.pack_64_big_endian(body_size)
+        result += AMQ::Hacks.pack_uint64_big_endian(body_size)
         result += [flags].pack(PACK_UINT16)
         result + pieces.join(EMPTY_STRING)
       end
@@ -392,7 +393,8 @@ module AMQ
           frames << HeaderFrame.new(properties_payload, channel)
           % endif
           % if "payload" in method.args():
-          frames + self.encode_body(payload, channel, frame_size)
+          frames += self.encode_body(payload, channel, frame_size)
+          frames
           % endif
           % else:
           MethodFrame.new(buffer, channel)

data/lib/amq/endianness.rb

@@ -0,0 +1,15 @@
+module AMQ
+  module Endianness
+    BIG_ENDIAN = ([1].pack("s") == "\x00\x01")
+
+    def big_endian?
+      BIG_ENDIAN
+    end
+
+    def little_endian?
+      !BIG_ENDIAN
+    end
+
+    extend self
+  end
+end

data/lib/amq/hacks.rb

@@ -1,33 +1,53 @@
 # encoding: binary
 
+require 'amq/endianness'
+
 # Ruby doesn't support pack to/unpack from
 # 64bit string in network byte order.
 module AMQ
   module Hacks
-    BIG_ENDIAN = ([1].pack("s") == "\x00\x01")
-    Q = "Q".freeze
+    UINT64 = "Q".freeze
+    INT16  = "c".freeze
+
+    if Endianness.big_endian?
+      def self.pack_uint64_big_endian(long_long)
+        [long_long].pack(UINT64)
+      end
 
-    if BIG_ENDIAN
-      def self.pack_64_big_endian(long_long)
-        [long_long].pack(Q)
+      def self.unpack_uint64_big_endian(data)
+        data.unpack(UINT64)
       end
 
-      def self.unpack_64_big_endian(data)
-        data.unpack(Q)
+      def self.pack_int16_big_endian(short)
+        [long_long].pack(INT16)
+      end
+
+      def self.unpack_int16_big_endian(data)
+        data.unpack(INT16)
       end
     else
-      def self.pack_64_big_endian(long_long)
-        result = [long_long].pack(Q)
+      def self.pack_uint64_big_endian(long_long)
+        result = [long_long].pack(UINT64)
+        result.bytes.to_a.reverse.map(&:chr).join
+      end
+
+      def self.unpack_uint64_big_endian(data)
+        data = data.bytes.to_a.reverse.map(&:chr).join
+        data.unpack(UINT64)
+      end
+
+      def self.pack_int16_big_endian(short)
+        result = [long_long].pack(INT16)
         result.bytes.to_a.reverse.map(&:chr).join
       end
 
-      def self.unpack_64_big_endian(data)
+      def self.unpack_int16_big_endian(data)
         data = data.bytes.to_a.reverse.map(&:chr).join
-        data.unpack(Q)
+        data.unpack(INT16)
       end
     end
   end
 end
 
-# AMQ::Hacks.pack_64_big_endian(17)
-# AMQ::Hacks.unpack_64_big_endian("\x00\x00\x00\x00\x00\x00\x00\x11")
+# AMQ::Hacks.pack_uint64_big_endian(17)
+# AMQ::Hacks.unpack_uint64_big_endian("\x00\x00\x00\x00\x00\x00\x00\x11")

data/lib/amq/protocol/client.rb

@@ -19,6 +19,7 @@ module AMQ
     # caching
     EMPTY_STRING = "".freeze
 
+    PACK_INT8               = 'c'.freeze
     PACK_CHAR               = 'C'.freeze
     PACK_UINT16             = 'n'.freeze
     PACK_UINT16_X2          = 'n2'.freeze
@@ -29,10 +30,7 @@ module AMQ
     PACK_CHAR_UINT16_UINT32 = 'cnN'.freeze
 
     PACK_32BIT_FLOAT        = 'f'.freeze
-    PACK_64BIT_FLOAT        = 'd'.freeze
-
-    PACK_SIGNED_8BIT        = 'c'.freeze
-    PACK_SIGNED_16BIT       = 's'.freeze
+    PACK_64BIT_FLOAT        = 'G'.freeze
 
 
 
@@ -268,6 +266,7 @@ module AMQ
         array = Array.new
         while body
           payload, body = body[0, limit], body[limit, body.length - limit]
+          # array << [0x03, payload]
           array << BodyFrame.new(payload, channel)
         end
 
@@ -1438,7 +1437,7 @@ module AMQ
       # 1 << 6
       def self.encode_timestamp(value)
         buffer = ''
-        buffer << AMQ::Hacks.pack_64_big_endian(value)
+        buffer << AMQ::Hacks.pack_uint64_big_endian(value)
         [9, 0x0040, buffer]
       end
 
@@ -1487,7 +1486,7 @@ module AMQ
 
         # result = [60, 0, body_size, flags].pack('n2Qn')
         result = [60, 0].pack(PACK_UINT16_X2)
-        result += AMQ::Hacks.pack_64_big_endian(body_size)
+        result += AMQ::Hacks.pack_uint64_big_endian(body_size)
         result += [flags].pack(PACK_UINT16)
         result + pieces.join(EMPTY_STRING)
       end
@@ -1796,7 +1795,6 @@ module AMQ
           properties_payload = Basic.encode_properties(payload.bytesize, properties)
           frames << HeaderFrame.new(properties_payload, channel)
           frames += self.encode_body(payload, channel, frame_size)
-
           frames
         end
 
@@ -1856,7 +1854,7 @@ module AMQ
           offset += 1
           consumer_tag = data[offset, length]
           offset += length
-          delivery_tag = AMQ::Hacks.unpack_64_big_endian(data[offset, 8]).first
+          delivery_tag = AMQ::Hacks.unpack_uint64_big_endian(data[offset, 8]).first
           offset += 8
           bit_buffer = data[offset, 1].unpack(PACK_CHAR).first
           offset += 1
@@ -1925,7 +1923,7 @@ module AMQ
         # @return
         def self.decode(data)
           offset = 0
-          delivery_tag = AMQ::Hacks.unpack_64_big_endian(data[offset, 8]).first
+          delivery_tag = AMQ::Hacks.unpack_uint64_big_endian(data[offset, 8]).first
           offset += 8
           bit_buffer = data[offset, 1].unpack(PACK_CHAR).first
           offset += 1
@@ -1996,7 +1994,7 @@ module AMQ
         # @return
         def self.decode(data)
           offset = 0
-          delivery_tag = AMQ::Hacks.unpack_64_big_endian(data[offset, 8]).first
+          delivery_tag = AMQ::Hacks.unpack_uint64_big_endian(data[offset, 8]).first
           offset += 8
           bit_buffer = data[offset, 1].unpack(PACK_CHAR).first
           offset += 1
@@ -2019,7 +2017,7 @@ module AMQ
         def self.encode(channel, delivery_tag, multiple)
           buffer = ''
           buffer << @packed_indexes
-          buffer << AMQ::Hacks.pack_64_big_endian(delivery_tag)
+          buffer << AMQ::Hacks.pack_uint64_big_endian(delivery_tag)
           bit_buffer = 0
           bit_buffer = bit_buffer | (1 << 0) if multiple
           buffer << [bit_buffer].pack(PACK_CHAR)
@@ -2044,7 +2042,7 @@ module AMQ
         def self.encode(channel, delivery_tag, requeue)
           buffer = ''
           buffer << @packed_indexes
-          buffer << AMQ::Hacks.pack_64_big_endian(delivery_tag)
+          buffer << AMQ::Hacks.pack_uint64_big_endian(delivery_tag)
           bit_buffer = 0
           bit_buffer = bit_buffer | (1 << 0) if requeue
           buffer << [bit_buffer].pack(PACK_CHAR)
@@ -2132,7 +2130,7 @@ module AMQ
         # @return
         def self.decode(data)
           offset = 0
-          delivery_tag = AMQ::Hacks.unpack_64_big_endian(data[offset, 8]).first
+          delivery_tag = AMQ::Hacks.unpack_uint64_big_endian(data[offset, 8]).first
           offset += 8
           bit_buffer = data[offset, 1].unpack(PACK_CHAR).first
           offset += 1
@@ -2157,7 +2155,7 @@ module AMQ
         def self.encode(channel, delivery_tag, multiple, requeue)
           buffer = ''
           buffer << @packed_indexes
-          buffer << AMQ::Hacks.pack_64_big_endian(delivery_tag)
+          buffer << AMQ::Hacks.pack_uint64_big_endian(delivery_tag)
           bit_buffer = 0
           bit_buffer = bit_buffer | (1 << 0) if multiple
           bit_buffer = bit_buffer | (1 << 1) if requeue

data/lib/amq/protocol/frame.rb

@@ -161,7 +161,7 @@ This functionality is part of the https://github.com/ruby-amqp/amq-client librar
                                # the total size of the content body, that is, the sum of the body sizes for the
                                # following content body frames. Zero indicates that there are no content body frames.
                                # So this is NOT related to this very header frame!
-                               @body_size         = AMQ::Hacks.unpack_64_big_endian(@payload[4..11]).first
+                               @body_size         = AMQ::Hacks.unpack_uint64_big_endian(@payload[4..11]).first
                                @data              = @payload[12..-1]
                                @properties        = Basic.decode_properties(@data)
                              end

data/lib/amq/protocol/table_value_decoder.rb

@@ -1,5 +1,6 @@
 # encoding: binary
 
+require "amq/endianness"
 require "amq/protocol/client"
 require "amq/protocol/type_constants"
 require "amq/protocol/table"
@@ -20,10 +21,6 @@ module AMQ
       # API
       #
 
-      BIG_ENDIAN = ([1].pack("s") == "\x00\x01")
-      Q = "q".freeze
-
-
       def self.decode_array(data, initial_offset)
         array_length = data.slice(initial_offset, 4).unpack(PACK_UINT32).first
 
@@ -102,9 +99,9 @@ module AMQ
       end # self.decode_integer(data, offset)
 
 
-      if BIG_ENDIAN
+      if AMQ::Endianness.big_endian?
         def self.decode_long(data, offset)
-          v    = data.slice(offset, 8).unpack(Q)
+          v    = data.slice(offset, 8).unpack(PACK_INT64)
 
           offset += 8
           [v, offset]
@@ -112,7 +109,7 @@ module AMQ
       else
         def self.decode_long(data, offset)
           slice = data.slice(offset, 8).bytes.to_a.reverse.map(&:chr).join
-          v     = slice.unpack(Q).first
+          v     = slice.unpack(PACK_INT64).first
 
           offset += 8
           [v, offset]
@@ -177,13 +174,13 @@ module AMQ
 
 
       def self.decode_short_short(data, offset)
-        v = data.slice(offset, 1).unpack(PACK_SIGNED_8BIT).first
+        v = data.slice(offset, 1).unpack(PACK_INT8).first
         offset += 1
         [v, offset]
       end
 
       def self.decode_short(data, offset)
-        v = data.slice(offset, 2).unpack(PACK_SIGNED_16BIT).first
+        v = AMQ::Hacks.unpack_int16_big_endian(data.slice(offset, 2)).first
         offset += 2
         [v, offset]
       end

data/lib/amq/protocol/type_constants.rb

@@ -5,18 +5,18 @@ module AMQ
     module TypeConstants
       TYPE_STRING       = 'S'.freeze
       TYPE_INTEGER      = 'I'.freeze
-      TYPE_HASH         = 'F'.freeze
       TYPE_TIME         = 'T'.freeze
       TYPE_DECIMAL      = 'D'.freeze
-      TYPE_BOOLEAN      = 't'.freeze
-      TYPE_SIGNED_8BIT  = 'c'.freeze
-      TYPE_SIGNED_16BIT = 's'.freeze
-      TYPE_SIGNED_64BIT = 'l'.freeze
-      TYPE_32BIT_FLOAT  = 'f'.freeze
+      TYPE_HASH         = 'F'.freeze
+      TYPE_ARRAY        = 'A'.freeze
+      TYPE_SIGNED_8BIT  = 'b'.freeze
       TYPE_64BIT_FLOAT  = 'd'.freeze
-      TYPE_VOID         = 'V'.freeze
+      TYPE_32BIT_FLOAT  = 'f'.freeze
+      TYPE_SIGNED_64BIT = 'l'.freeze
+      TYPE_SIGNED_16BIT = 's'.freeze
+      TYPE_BOOLEAN      = 't'.freeze
       TYPE_BYTE_ARRAY   = 'x'.freeze
-      TYPE_ARRAY        = 'A'.freeze
+      TYPE_VOID         = 'V'.freeze
       TEN               = '10'.freeze
 
       BOOLEAN_TRUE  = "\x01".freeze

data/lib/amq/protocol/version.rb

@@ -1,5 +1,5 @@
 module AMQ
   module Protocol
-    VERSION = "1.2.0"
+    VERSION = "1.3.0"
   end # Protocol
 end # AMQ

data/spec/amq/hacks_spec.rb

@@ -21,40 +21,40 @@ module AMQ
 
       it "packs integers into big-endian string" do
         examples.each do |key, value|
-          described_class.pack_64_big_endian(key).should == value
+          described_class.pack_uint64_big_endian(key).should == value
         end
       end
 
       it "should unpack string representation into integer" do
         examples.each do |key, value|
-          described_class.unpack_64_big_endian(value)[0].should == key
+          described_class.unpack_uint64_big_endian(value)[0].should == key
         end
       end
-      
+
       if RUBY_VERSION < '1.9'
         describe "with utf encoding" do
           before do
             $KCODE = 'u'
           end
-          
-          after do 
+
+          after do
             $KCODE = 'NONE'
           end
-          
+
           it "packs integers into big-endian string" do
             examples.each do |key, value|
-              described_class.pack_64_big_endian(key).should == value
+              described_class.pack_uint64_big_endian(key).should == value
             end
           end
 
           it "should unpack string representation into integer" do
             examples.each do |key, value|
-              described_class.unpack_64_big_endian(value)[0].should == key
+              described_class.unpack_uint64_big_endian(value)[0].should == key
             end
           end
         end
       end
-      
+
     end
   end
-end
+end

data/spec/amq/protocol/table_spec.rb

@@ -18,7 +18,7 @@ module AMQ
         {
           {}                       => "\000\000\000\000",
           {"test" => 1}            => "\000\000\000\n\004testI\000\000\000\001",
-          {"float" => 1.87}        => "\000\000\000\017\005floatd\354Q\270\036\205\353\375?",
+          {"float" => 1.87}        => "\000\000\000\017\005floatd?\375\353\205\036\270Q\354",
           {"test" => "string"}     => "\000\000\000\020\004testS\000\000\000\006string",
           {"test" => {}}           => "\000\000\000\n\004testF\000\000\000\000",
           {"test" => bigdecimal_1} => "\000\000\000\v\004testD\000\000\000\000\001",
@@ -29,7 +29,7 @@ module AMQ
         {
           {}                       => "\x00\x00\x00\x00",
           {"test" => 1}            => "\x00\x00\x00\n\x04testI\x00\x00\x00\x01",
-          {"float" => 1.92}        => "\x00\x00\x00\x0F\x05floatd\xB8\x1E\x85\xEBQ\xB8\xFE?",
+          {"float" => 1.92}        => "\x00\x00\x00\x0F\x05floatd?\xFE\xB8Q\xEB\x85\x1E\xB8",
           {"test" => "string"}     => "\x00\x00\x00\x10\x04testS\x00\x00\x00\x06string",
           {"test" => {}}           => "\x00\x00\x00\n\x04testF\x00\x00\x00\x00",
           {"test" => bigdecimal_1} => "\x00\x00\x00\v\x04testD\x00\x00\x00\x00\x01",
@@ -49,20 +49,20 @@ module AMQ
           Table.encode(nil).should eql(encoded_value)
         end
 
-        it "should return \x00\x00\x00\a\x04testt\x01 for { :test => true }" do
+        it "should serialize { :test => true }" do
           Table.encode(:test => true).should eql("\x00\x00\x00\a\x04testt\x01")
         end
 
-        it "should return \x00\x00\x00\a\x04testt\x00 for { :test => false }" do
+        it "should serialize { :test => false }" do
           Table.encode(:test => false).should eql("\x00\x00\x00\a\x04testt\x00")
         end
 
-        it "should return \"\x00\x00\x00\n\x04testI\x00\x00\x00\x01\" for { :coordinates => { :latitude  => 59.35 } }" do
-          Table.encode(:coordinates => { :latitude  => 59.35 }).should eql("\000\000\000#\vcoordinatesF\000\000\000\022\blatituded\315\314\314\314\314\254M@")
+        it "should serialize { :coordinates => { :latitude  => 59.35 } }" do
+          Table.encode(:coordinates => { :latitude  => 59.35 }).should eql("\x00\x00\x00#\vcoordinatesF\x00\x00\x00\x12\blatituded@M\xAC\xCC\xCC\xCC\xCC\xCD")
         end
 
-        it "should return \"\x00\x00\x00\n\x04testI\x00\x00\x00\x01\" for { :coordinates => { :longitude => 18.066667 } }" do
-          Table.encode(:coordinates => { :longitude => 18.066667 }).should eql("\000\000\000$\vcoordinatesF\000\000\000\023\tlongituded\361\270\250\026\021\0212@")
+        it "should serialize { :coordinates => { :longitude => 18.066667 } }" do
+          Table.encode(:coordinates => { :longitude => 18.066667 }).should eql("\x00\x00\x00$\vcoordinatesF\x00\x00\x00\x13\tlongituded@2\x11\x11\x16\xA8\xB8\xF1")
         end
 
         DATA.each do |data, encoded|
@@ -109,6 +109,10 @@ module AMQ
           Table.decode(Table.encode(input)).should == input
         end
 
+        it "is capable of decoding string table values with UTF-8 characters" do
+          input   = { "строка" => "значение" }
+          Table.decode(Table.encode(input)).should == input
+        end
 
 
         it "is capable of decoding integer table values" do
@@ -178,7 +182,7 @@ module AMQ
 
         it 'is capable of decoding 16bit signed integers' do
           output = TableValueDecoder.decode_short("\b\xC0",0).first
-          output.should == -16376
+          output.should == -64
         end
 
         it "is capable of decoding tables" do

data/spec/spec_helper.rb

@@ -3,9 +3,11 @@
 require 'bundler/setup'
 require 'rspec'
 
+require "effin_utf8"
+
 begin
   require 'simplecov'
-  
+
   SimpleCov.start do
     add_filter '/spec/'
   end

metadata

@@ -2,7 +2,7 @@
 name: amq-protocol
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
   - Jakub Stastny
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-12 00:00:00 Z
+date: 2013-04-10 00:00:00 Z
 dependencies: []
 
 description: "  amq-protocol is an AMQP 0.9.1 serialization library for Ruby. It is not an\n  AMQP client: amq-protocol only handles serialization and deserialization.\n  If you want to write your own AMQP client, this gem can help you with that.\n"
@@ -44,6 +44,7 @@ files:
   - codegen/protocol.rb.pytemplate
   - generate.rb
   - lib/amq/bit_set.rb
+  - lib/amq/endianness.rb
   - lib/amq/hacks.rb
   - lib/amq/int_allocator.rb
   - lib/amq/protocol.rb
@@ -104,4 +105,3 @@ specification_version: 3
 summary: AMQP 0.9.1 encoder & decoder.
 test_files: []
 
-has_rdoc: