amq-protocol 1.1.0 → 1.2.0

data/.gitignore

@@ -9,4 +9,5 @@ Gemfile.lock
 .rbx/*
 .Apple*
 .bundle/*
-bin/*
+bin/*
+*.bundle

data/codegen/protocol.rb.pytemplate

@@ -188,9 +188,17 @@ module AMQ
       def self.encode_body(body, channel, frame_size)
         return [] if body.empty?
 
-        # See https://dev.rabbitmq.com/wiki/Amqp091Errata#section_11
+        # 8 = 1 + 2 + 4 + 1
+        # 1 byte of frame type
+        # 2 bytes of channel number
+        # 4 bytes of frame payload length
+        # 1 byte of payload trailer FRAME_END byte
         limit        = frame_size - 8
 
+        # Otherwise String#slice on 1.9 will operate with code points,
+        # and we need bytes. MK.
+        body.force_encoding("ASCII-8BIT") if RUBY_VERSION.to_f >= 1.9
+
         array = Array.new
         while body
           payload, body = body[0, limit], body[limit, body.length - limit]

data/lib/amq/protocol/client.rb

@@ -31,6 +31,9 @@ module AMQ
     PACK_32BIT_FLOAT        = 'f'.freeze
     PACK_64BIT_FLOAT        = 'd'.freeze
 
+    PACK_SIGNED_8BIT        = 'c'.freeze
+    PACK_SIGNED_16BIT       = 's'.freeze
+
 
 
     # @return [Array] Collection of subclasses of AMQ::Protocol::Class.
@@ -251,13 +254,20 @@ module AMQ
       def self.encode_body(body, channel, frame_size)
         return [] if body.empty?
 
-        # See https://dev.rabbitmq.com/wiki/Amqp091Errata#section_11
+        # 8 = 1 + 2 + 4 + 1
+        # 1 byte of frame type
+        # 2 bytes of channel number
+        # 4 bytes of frame payload length
+        # 1 byte of payload trailer FRAME_END byte
         limit        = frame_size - 8
 
+        # Otherwise String#slice on 1.9 will operate with code points,
+        # and we need bytes. MK.
+        body.force_encoding("ASCII-8BIT") if RUBY_VERSION.to_f >= 1.9
+
         array = Array.new
         while body
           payload, body = body[0, limit], body[limit, body.length - limit]
-          # array << [0x03, payload]
           array << BodyFrame.new(payload, channel)
         end
 
@@ -1785,7 +1795,9 @@ module AMQ
           end
           properties_payload = Basic.encode_properties(payload.bytesize, properties)
           frames << HeaderFrame.new(properties_payload, channel)
-          frames + self.encode_body(payload, channel, frame_size)
+          frames += self.encode_body(payload, channel, frame_size)
+
+          frames
         end
 
       end

data/lib/amq/protocol/table.rb

@@ -85,9 +85,11 @@ module AMQ
                          v, offset = TableValueDecoder.decode_boolean(data, offset)
                          v
                        when TYPE_SIGNED_8BIT  then
-                         raise NotImplementedError.new
+                         v, offset = TableValueDecoder.decode_short_short(data, offset)
+                         v
                        when TYPE_SIGNED_16BIT then
-                         raise NotImplementedError.new
+                         v, offset = TableValueDecoder.decode_short(data, offset)
+                         v
                        when TYPE_SIGNED_64BIT then
                          v, offset = TableValueDecoder.decode_long(data, offset)
                          v

data/lib/amq/protocol/table_value_decoder.rb

@@ -21,7 +21,7 @@ module AMQ
       #
 
       BIG_ENDIAN = ([1].pack("s") == "\x00\x01")
-      Q = "Q".freeze
+      Q = "q".freeze
 
 
       def self.decode_array(data, initial_offset)
@@ -53,11 +53,11 @@ module AMQ
                 v, offset = decode_boolean(data, offset)
                 v
               when TYPE_SIGNED_8BIT then
-                # TODO
-                raise NotImplementedError.new
+                v, offset = decode_short_short(data, offset)
+                v
               when TYPE_SIGNED_16BIT then
-                # TODO
-                raise NotImplementedError.new
+                v, offset = decode_short(data, offset)
+                v
               when TYPE_SIGNED_64BIT then
                 v, offset = decode_long(data, offset)
                 v
@@ -174,6 +174,19 @@ module AMQ
 
         [v, offset]
       end # self.decode_hash(data, offset)
+
+
+      def self.decode_short_short(data, offset)
+        v = data.slice(offset, 1).unpack(PACK_SIGNED_8BIT).first
+        offset += 1
+        [v, offset]
+      end
+
+      def self.decode_short(data, offset)
+        v = data.slice(offset, 2).unpack(PACK_SIGNED_16BIT).first
+        offset += 2
+        [v, offset]
+      end
     end # TableValueDecoder
   end # Protocol
 end # AMQ

data/lib/amq/protocol/type_constants.rb

@@ -9,7 +9,7 @@ module AMQ
       TYPE_TIME         = 'T'.freeze
       TYPE_DECIMAL      = 'D'.freeze
       TYPE_BOOLEAN      = 't'.freeze
-      TYPE_SIGNED_8BIT  = 'b'.freeze
+      TYPE_SIGNED_8BIT  = 'c'.freeze
       TYPE_SIGNED_16BIT = 's'.freeze
       TYPE_SIGNED_64BIT = 'l'.freeze
       TYPE_32BIT_FLOAT  = 'f'.freeze

data/lib/amq/protocol/version.rb

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

data/spec/amq/protocol/table_spec.rb

@@ -171,8 +171,15 @@ module AMQ
           Table.decode(Table.encode(input)).should == input
         end
 
+        it 'is capable of decoding 8bit signed integers' do
+          output = TableValueDecoder.decode_short_short("\xC0",0).first
+          output.should == -64
+        end
 
-
+        it 'is capable of decoding 16bit signed integers' do
+          output = TableValueDecoder.decode_short("\b\xC0",0).first
+          output.should == -16376
+        end
 
         it "is capable of decoding tables" do
           input   = {

metadata

@@ -1,106 +1,107 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: amq-protocol
-version: !ruby/object:Gem::Version
-  version: 1.1.0
-  prerelease:
+version: !ruby/object:Gem::Version 
+  prerelease: 
+  version: 1.2.0
 platform: ruby
-authors:
-- Jakub Stastny
-- Michael S. Klishin
-- Theo Hultberg
-- Mark Abramov
-autorequire:
+authors: 
+  - Jakub Stastny
+  - Michael S. Klishin
+  - Theo Hultberg
+  - Mark Abramov
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-21 00:00:00.000000000 Z
+
+date: 2013-02-12 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"
-email:
-- !binary |-
-  bWljaGFlbEBub3ZlbWJlcmFpbi5jb20=
-- !binary |-
-  c3Rhc3RueUAxMDFpZGVhcy5jeg==
+
+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"
+email: 
+  - michael@novemberain.com
+  - stastny@101ideas.cz
 executables: []
+
 extensions: []
-extra_rdoc_files:
-- README.md
-files:
-- .gitignore
-- .gitmodules
-- .rspec
-- .travis.yml
-- ChangeLog.md
-- Gemfile
-- LICENSE
-- PROFILING.md
-- README.md
-- amq-protocol.gemspec
-- codegen/__init__.py
-- codegen/amqp_0.9.1_changes.json
-- codegen/codegen.py
-- codegen/codegen_helpers.py
-- codegen/protocol.rb.pytemplate
-- generate.rb
-- lib/amq/bit_set.rb
-- lib/amq/hacks.rb
-- lib/amq/int_allocator.rb
-- lib/amq/protocol.rb
-- lib/amq/protocol/client.rb
-- lib/amq/protocol/frame.rb
-- lib/amq/protocol/table.rb
-- lib/amq/protocol/table_value_decoder.rb
-- lib/amq/protocol/table_value_encoder.rb
-- lib/amq/protocol/type_constants.rb
-- lib/amq/protocol/version.rb
-- lib/amq/settings.rb
-- spec/amq/bit_set_spec.rb
-- spec/amq/hacks_spec.rb
-- spec/amq/int_allocator_spec.rb
-- spec/amq/protocol/basic_spec.rb
-- spec/amq/protocol/blank_body_encoding_spec.rb
-- spec/amq/protocol/channel_spec.rb
-- spec/amq/protocol/confirm_spec.rb
-- spec/amq/protocol/connection_spec.rb
-- spec/amq/protocol/constants_spec.rb
-- spec/amq/protocol/exchange_spec.rb
-- spec/amq/protocol/frame_spec.rb
-- spec/amq/protocol/method_spec.rb
-- spec/amq/protocol/queue_spec.rb
-- spec/amq/protocol/table_spec.rb
-- spec/amq/protocol/tx_spec.rb
-- spec/amq/protocol/value_decoder_spec.rb
-- spec/amq/protocol/value_encoder_spec.rb
-- spec/amq/protocol_spec.rb
-- spec/amq/settings_spec.rb
-- spec/spec_helper.rb
+
+extra_rdoc_files: 
+  - README.md
+files: 
+  - .gitignore
+  - .gitmodules
+  - .rspec
+  - .travis.yml
+  - ChangeLog.md
+  - Gemfile
+  - LICENSE
+  - PROFILING.md
+  - README.md
+  - amq-protocol.gemspec
+  - codegen/__init__.py
+  - codegen/amqp_0.9.1_changes.json
+  - codegen/codegen.py
+  - codegen/codegen_helpers.py
+  - codegen/protocol.rb.pytemplate
+  - generate.rb
+  - lib/amq/bit_set.rb
+  - lib/amq/hacks.rb
+  - lib/amq/int_allocator.rb
+  - lib/amq/protocol.rb
+  - lib/amq/protocol/client.rb
+  - lib/amq/protocol/frame.rb
+  - lib/amq/protocol/table.rb
+  - lib/amq/protocol/table_value_decoder.rb
+  - lib/amq/protocol/table_value_encoder.rb
+  - lib/amq/protocol/type_constants.rb
+  - lib/amq/protocol/version.rb
+  - lib/amq/settings.rb
+  - spec/amq/bit_set_spec.rb
+  - spec/amq/hacks_spec.rb
+  - spec/amq/int_allocator_spec.rb
+  - spec/amq/protocol/basic_spec.rb
+  - spec/amq/protocol/blank_body_encoding_spec.rb
+  - spec/amq/protocol/channel_spec.rb
+  - spec/amq/protocol/confirm_spec.rb
+  - spec/amq/protocol/connection_spec.rb
+  - spec/amq/protocol/constants_spec.rb
+  - spec/amq/protocol/exchange_spec.rb
+  - spec/amq/protocol/frame_spec.rb
+  - spec/amq/protocol/method_spec.rb
+  - spec/amq/protocol/queue_spec.rb
+  - spec/amq/protocol/table_spec.rb
+  - spec/amq/protocol/tx_spec.rb
+  - spec/amq/protocol/value_decoder_spec.rb
+  - spec/amq/protocol/value_encoder_spec.rb
+  - spec/amq/protocol_spec.rb
+  - spec/amq/settings_spec.rb
+  - spec/spec_helper.rb
 homepage: http://github.com/ruby-amqp/amq-protocol
-licenses:
-- MIT
-post_install_message:
+licenses: 
+  - MIT
+post_install_message: 
 rdoc_options: []
-require_paths:
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
+
+require_paths: 
+  - lib
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
+
 rubyforge_project: amq-protocol
 rubygems_version: 1.8.24
-signing_key:
+signing_key: 
 specification_version: 3
 summary: AMQP 0.9.1 encoder & decoder.
 test_files: []
-has_rdoc:
+
+has_rdoc: