amq-protocol 0.9.5 → 1.0.0.pre1

data/lib/amq/protocol/table.rb

@@ -84,13 +84,9 @@ 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
-                         v, offset = TableValueDecoder.decode_long(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 = TableValueDecoder.decode_32bit_float(data, offset)
                          v

data/lib/amq/protocol/table_value_decoder.rb

@@ -20,10 +20,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
 
@@ -34,47 +30,41 @@ 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
-                # 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
+                 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
 
           ary << i
         end
@@ -102,24 +92,6 @@ 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 = "0.9.5"
+    VERSION = "1.0.0.pre1"
   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.reject {|key, value| value.nil?}.each do |key, value|
-          i, f, result = self.__send__(:"encode_#{key}", value)
+        properties.each do |key, value|
+          i, f, result = self.send(:"encode_#{key}", value)
           flags |= f
           pieces[i] = result
         end

data/spec/amq/protocol/exchange_spec.rb

@@ -25,24 +25,10 @@ module AMQ
         end
       end
 
-      describe Declare, "encoded with a symbol name" do
-        describe '.encode' do
-          it 'encodes the parameters into a MethodFrame' do
-            channel = 1
-            exchange = :exchange2
-            type = 'fanout'
-            passive = false
-            durable = false
-            auto_delete = false
-            internal = false
-            nowait = false
-            arguments = nil
-            method_frame = Declare.encode(channel, exchange, type, passive, durable, auto_delete, internal, nowait, arguments)
-            method_frame.payload.should == "\x00(\x00\n\x00\x00\texchange2\x06fanout\x00\x00\x00\x00\x00"
-            method_frame.channel.should == 1
-          end
-        end
-      end
+      # describe DeclareOk do
+      #   describe '.decode' do
+      #   end
+      # end
 
       describe Delete do
         describe '.encode' do

data/spec/amq/protocol/method_spec.rb

@@ -25,11 +25,11 @@ module AMQ
           end
         end
 
-        context 'when the body is too big to fit in a single frame' do
+        context 'when the body is to big to fit in a single frame' do
           it 'encodes a body into a list of BodyFrames that each fit within the frame size' do
             lipsum = 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'
             frame_size = 100
-            expected_payload_size = 92
+            expected_payload_size = 93
             body_frames = Method.encode_body(lipsum, 1, frame_size)
             body_frames.map(&:payload).should == lipsum.split('').each_slice(expected_payload_size).map(&:join)
           end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: amq-protocol
 version: !ruby/object:Gem::Version 
-  hash: 49
-  prerelease: 
+  hash: -2644121904
+  prerelease: 6
   segments: 
+  - 1
   - 0
-  - 9
-  - 5
-  version: 0.9.5
+  - 0
+  - pre
+  - 1
+  version: 1.0.0.pre1
 platform: ruby
 authors: 
 - Jakub Stastny
@@ -18,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-24 00:00:00 Z
+date: 2012-06-22 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"
@@ -94,16 +96,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: amq-protocol
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: AMQP 0.9.1 encoder & decoder.