amq-protocol 1.0.0.pre5 → 1.0.0.pre6

data/.gitignore

@@ -8,3 +8,5 @@ tmp
 Gemfile.lock
 .rbx/*
 .Apple*
+.bundle/*
+bin/*

data/lib/amq/protocol/client.rb

@@ -13,7 +13,6 @@ module AMQ
     PROTOCOL_VERSION = "0.9.1".freeze
     PREAMBLE         = "AMQP\x00\x00\x09\x01".freeze
     DEFAULT_PORT     = 5672
-    TLS_PORT         = 5671
 
     # caching
     EMPTY_STRING = "".freeze
@@ -1468,8 +1467,8 @@ module AMQ
       def self.encode_properties(body_size, properties)
         pieces, flags = [], 0
 
-        properties.each do |key, value|
-          i, f, result = self.send(:"encode_#{key}", value)
+        properties.reject {|key, value| value.nil?}.each do |key, value|
+          i, f, result = self.__send__(:"encode_#{key}", value)
           flags |= f
           pieces[i] = result
         end

data/lib/amq/protocol/table.rb

@@ -84,9 +84,13 @@ module AMQ
                        when TYPE_BOOLEAN
                          v, offset = TableValueDecoder.decode_boolean(data, offset)
                          v
-                       when TYPE_SIGNED_8BIT  then raise NotImplementedError.new
-                       when TYPE_SIGNED_16BIT then raise NotImplementedError.new
-                       when TYPE_SIGNED_64BIT then raise NotImplementedError.new
+                       when TYPE_SIGNED_8BIT  then
+                         raise NotImplementedError.new
+                       when TYPE_SIGNED_16BIT then
+                         raise NotImplementedError.new
+                       when TYPE_SIGNED_64BIT then
+                         v, offset = TableValueDecoder.decode_long(data, offset)
+                         v
                        when TYPE_32BIT_FLOAT then
                          v, offset = TableValueDecoder.decode_32bit_float(data, offset)
                          v

data/lib/amq/protocol/table_value_decoder.rb

@@ -20,6 +20,10 @@ 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
 
@@ -30,41 +34,47 @@ module AMQ
           type, offset = decode_value_type(data, offset)
 
           i = case type
-                 when TYPE_STRING
-                   v, offset = decode_string(data, offset)
-                   v
-                 when TYPE_INTEGER
-                   v, offset = decode_integer(data, offset)
-                   v
-                 when TYPE_DECIMAL
-                   v, offset = decode_big_decimal(data, offset)
-                   v
-                 when TYPE_TIME
-                   v, offset = decode_time(data, offset)
-                   v
-                 when TYPE_HASH
-                   v, offset = decode_hash(data, offset)
-                   v
-                 when TYPE_BOOLEAN
-                   v, offset = decode_boolean(data, offset)
-                   v
-                 when TYPE_SIGNED_8BIT then raise NotImplementedError.new
-                 when TYPE_SIGNED_16BIT then raise NotImplementedError.new
-                 when TYPE_SIGNED_64BIT then raise NotImplementedError.new
-                 when TYPE_32BIT_FLOAT then
-                   v, offset = decode_32bit_float(data, offset)
-                   v
-                 when TYPE_64BIT_FLOAT then
-                   v, offset = decode_64bit_float(data, offset)
-                   v
-                 when TYPE_VOID
-                   nil
-                 when TYPE_ARRAY
-                   v, offset = TableValueDecoder.decode_array(data, offset)
-                   v
-                 else
-                   raise ArgumentError.new("unsupported type: #{type.inspect}")
-                 end
+              when TYPE_STRING
+                v, offset = decode_string(data, offset)
+                v
+              when TYPE_INTEGER
+                v, offset = decode_integer(data, offset)
+                v
+              when TYPE_DECIMAL
+                v, offset = decode_big_decimal(data, offset)
+                v
+              when TYPE_TIME
+                v, offset = decode_time(data, offset)
+                v
+              when TYPE_HASH
+                v, offset = decode_hash(data, offset)
+                v
+              when TYPE_BOOLEAN
+                v, offset = decode_boolean(data, offset)
+                v
+              when TYPE_SIGNED_8BIT then
+                # TODO
+                raise NotImplementedError.new
+              when TYPE_SIGNED_16BIT then
+                # TODO
+                raise NotImplementedError.new
+              when TYPE_SIGNED_64BIT then
+                v, offset = decode_long(data, offset)
+                v
+              when TYPE_32BIT_FLOAT then
+                v, offset = decode_32bit_float(data, offset)
+                v
+              when TYPE_64BIT_FLOAT then
+                v, offset = decode_64bit_float(data, offset)
+                v
+              when TYPE_VOID
+                nil
+              when TYPE_ARRAY
+                v, offset = TableValueDecoder.decode_array(data, offset)
+                v
+              else
+                raise ArgumentError.new("unsupported type in a table value: #{type.inspect}, do not know how to decode!")
+              end
 
           ary << i
         end
@@ -92,6 +102,24 @@ module AMQ
       end # self.decode_integer(data, offset)
 
 
+      if BIG_ENDIAN
+        def self.decode_long(data, offset)
+          v    = data.slice(offset, 8).unpack(Q)
+
+          offset += 8
+          [v, offset]
+        end
+      else
+        def self.decode_long(data, offset)
+          slice = data.slice(offset, 8).bytes.to_a.reverse.map(&:chr).join
+          v     = slice.unpack(Q).first
+
+          offset += 8
+          [v, offset]
+        end
+      end
+
+
       def self.decode_big_decimal(data, offset)
         decimals, raw = data.slice(offset, 5).unpack(PACK_UCHAR_UINT32)
         offset += 5

data/lib/amq/protocol/version.rb

@@ -1,5 +1,5 @@
 module AMQ
   module Protocol
-    VERSION = "1.0.0.pre5"
+    VERSION = "1.0.0.pre6"
   end # Protocol
 end # AMQ

data/protocol.rb.pytemplate

@@ -244,8 +244,8 @@ module AMQ
       def self.encode_properties(body_size, properties)
         pieces, flags = [], 0
 
-        properties.each do |key, value|
-          i, f, result = self.send(:"encode_#{key}", value)
+        properties.reject {|key, value| value.nil?}.each do |key, value|
+          i, f, result = self.__send__(:"encode_#{key}", value)
           flags |= f
           pieces[i] = result
         end

data/spec/amq/protocol/table_spec.rb

@@ -94,6 +94,15 @@ module AMQ
         end
 
 
+        it "is capable of decoding nil table values" do
+          input   = { "nilval" => nil }
+          Table.decode(Table.encode(input)).should == input
+        end
+
+        it "is capable of decoding nil table in nested hash/map values" do
+          input   = { "hash" => {"nil" => nil} }
+          Table.decode(Table.encode(input)).should == input
+        end
 
         it "is capable of decoding string table values" do
           input   = { "stringvalue" => "string" }

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: amq-protocol
 version: !ruby/object:Gem::Version 
-  hash: -4085083884
+  hash: -3271493030
   prerelease: 6
   segments: 
   - 1
   - 0
   - 0
   - pre
-  - 5
-  version: 1.0.0.pre5
+  - 6
+  version: 1.0.0.pre6
 platform: ruby
 authors: 
 - Jakub Stastny
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-26 00:00:00 Z
+date: 2012-07-02 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"
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: amq-protocol
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: AMQP 0.9.1 encoder & decoder.