amq-protocol 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 592546ccd9dcc7fbaa136d8ba3b047cdf981e478
-  data.tar.gz: 269934dfff14063fcf9edc28bab301abadb28945
+  metadata.gz: 46955b1476f90b2f8042cea8cc99da3a7d65113b
+  data.tar.gz: 674e9e912348247303eb1b1f4e73c75ab0548760
 SHA512:
-  metadata.gz: 00fe19339769feb0337e136f05124b0a1d71e70568a3673710285d40016cf5569ac87f41bcae036a837b8cb10c079cd9c95a86f956dddc4d0b9fb10630a8c1ed
-  data.tar.gz: f498ce739314be78b14f5679725a58edf9caa5e266514a3fcfbdd899cba7deedf7a584f06436f42d5023872dea9a32384274a6d59c52141e62cc7ed2c24cf3b8
+  metadata.gz: dd57c461bfaec17595a464815a7e7ccc161570da1debcd2cd737a87184b0135302ba73ab1205ada5eae11cac1d97dc6a09742b651732259eaa064ad89cadd1a3
+  data.tar.gz: 55c686b11f1f28a63353785291807cc09f478deb2f06177c535080653d0540b26da029068dbaf265eda86a05944642fd682eb742756c85c414dca5de5f43fdb4

data/.travis.yml

@@ -1,7 +1,9 @@
 language: ruby
 bundler_args: --without development
+cache: bundler
 script: "bundle exec rspec spec"
 rvm:
+  - 2.3.0
   - 2.2
   - 2.1
   - 2.0

data/ChangeLog.md

@@ -1,3 +1,21 @@
+## Changes between 2.0.0 and 2.1.0
+
+### Ruby Warnings Squashed
+
+Contributed by Akira Matsuda.
+
+GitHub issue: [#62](https://github.com/ruby-amqp/amq-protocol/pull/62)
+
+### Byte Array Decoding
+
+Byte array values in types now can be
+decoded (to the extent Ruby type system
+permits) by this library.
+
+GitHub issue: [#58](https://github.com/ruby-amqp/amq-protocol/issues/58)
+
+
+
 ## Changes between 1.9.x and 2.0.0
 
 2.0.0 has **breaking changes** in header encoding.

data/Gemfile

@@ -10,7 +10,7 @@ group :development do
 end
 
 group :test do
-  gem "rspec"
+  gem "rspec", ">= 3.4.0"
   gem "rspec-its"
   gem "effin_utf8"
 end

data/LICENSE

@@ -1,5 +1,5 @@
 Copyright (c) 2010 – 2011 Jakub Šťastný aka Botanicus
-Copyright (c) 2011 – 2015 Michael S. Klishin <michael@defprotocol.org>
+Copyright (c) 2011 – 2016 Michael S. Klishin <michael@defprotocol.org>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/codegen/protocol.rb.pytemplate

@@ -114,7 +114,7 @@ module AMQ
         body.force_encoding("ASCII-8BIT") if RUBY_VERSION.to_f >= 1.9
 
         array = Array.new
-        while body
+        while body && !body.empty?
           payload, body = body[0, limit], body[limit, body.length - limit]
           array << BodyFrame.new(payload, channel)
         end
@@ -167,7 +167,8 @@ module AMQ
         result = [${klass.index}, 0].pack(PACK_UINT16_X2)
         result += AMQ::Pack.pack_uint64_big_endian(body_size)
         result += [flags].pack(PACK_UINT16)
-        result + pieces.join(EMPTY_STRING)
+        pieces_joined = pieces.join(EMPTY_STRING)
+        result.force_encoding(pieces_joined.encoding) + pieces_joined
       end
 
       # THIS DECODES ONLY FLAGS
@@ -235,7 +236,7 @@ module AMQ
         % if (spec.type == "client" and method.accepted_by("client")) or (spec.type == "server" and method.accepted_by("server") or spec.type == "all"):
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           % for line in helpers.genDecodeMethodDefinition(spec, method):
           ${line}
           % endfor
@@ -285,7 +286,7 @@ module AMQ
           % if "payload" in method.args() or "user_headers" in method.args():
           frames = [MethodFrame.new(buffer, channel)]
           % if "user_headers" in method.args():
-          properties, headers = self.split_headers(user_headers)
+          properties, _headers = self.split_headers(user_headers)
           if properties.nil? or properties.empty?
             raise RuntimeError.new("Properties can not be empty!")
           end

data/lib/amq/int_allocator.rb

@@ -36,12 +36,12 @@ module AMQ
     end # initialize(hi, lo)
 
     # Attempts to allocate next available integer. If allocation succeeds, allocated value is returned.
-    # Otherwise, nil is returned.
+    # Otherwise, -1 is returned.
     #
     # Current implementation of this method is O(n), where n is number of bits in the range available for
     # allocation.
     #
-    # @return [Integer] Allocated integer if allocation succeeded. nil otherwise.
+    # @return [Integer] Allocated integer if allocation succeeded. -1 otherwise.
     def allocate
 
       if n = @free_set.next_clear_bit

data/lib/amq/protocol/client.rb

@@ -204,7 +204,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           version_major = data[offset, 1].unpack(PACK_CHAR).first
           offset += 1
           version_minor = data[offset, 1].unpack(PACK_CHAR).first
@@ -275,7 +275,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           length = data[offset, 4].unpack(PACK_UINT32).first
           offset += 4
           challenge = data[offset, length]
@@ -326,7 +326,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           channel_max = data[offset, 2].unpack(PACK_UINT16).first
           offset += 2
           frame_max = data[offset, 4].unpack(PACK_UINT32).first
@@ -412,7 +412,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           length = data[offset, 1].unpack(PACK_CHAR).first
           offset += 1
           known_hosts = data[offset, length]
@@ -440,7 +440,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           reply_code = data[offset, 2].unpack(PACK_UINT16).first
           offset += 2
           length = data[offset, 1].unpack(PACK_CHAR).first
@@ -489,7 +489,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           self.new()
         end
 
@@ -518,7 +518,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           length = data[offset, 1].unpack(PACK_CHAR).first
           offset += 1
           reason = data[offset, length]
@@ -555,7 +555,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           self.new()
         end
 
@@ -614,7 +614,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           length = data[offset, 4].unpack(PACK_UINT32).first
           offset += 4
           channel_id = data[offset, length]
@@ -642,7 +642,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           bit_buffer = data[offset, 1].unpack(PACK_CHAR).first
           offset += 1
           active = (bit_buffer & (1 << 0)) != 0
@@ -678,7 +678,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           bit_buffer = data[offset, 1].unpack(PACK_CHAR).first
           offset += 1
           active = (bit_buffer & (1 << 0)) != 0
@@ -714,7 +714,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           reply_code = data[offset, 2].unpack(PACK_UINT16).first
           offset += 2
           length = data[offset, 1].unpack(PACK_CHAR).first
@@ -762,7 +762,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           self.new()
         end
 
@@ -832,7 +832,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           self.new()
         end
 
@@ -882,7 +882,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           self.new()
         end
 
@@ -936,7 +936,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           self.new()
         end
 
@@ -990,7 +990,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           self.new()
         end
 
@@ -1052,7 +1052,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           length = data[offset, 1].unpack(PACK_CHAR).first
           offset += 1
           queue = data[offset, length]
@@ -1118,7 +1118,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           self.new()
         end
 
@@ -1167,7 +1167,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           message_count = data[offset, 4].unpack(PACK_UINT32).first
           offset += 4
           self.new(message_count)
@@ -1222,7 +1222,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           message_count = data[offset, 4].unpack(PACK_UINT32).first
           offset += 4
           self.new(message_count)
@@ -1277,7 +1277,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           self.new()
         end
 
@@ -1561,7 +1561,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           self.new()
         end
 
@@ -1616,7 +1616,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           length = data[offset, 1].unpack(PACK_CHAR).first
           offset += 1
           consumer_tag = data[offset, length]
@@ -1644,7 +1644,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           length = data[offset, 1].unpack(PACK_CHAR).first
           offset += 1
           consumer_tag = data[offset, length]
@@ -1687,7 +1687,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           length = data[offset, 1].unpack(PACK_CHAR).first
           offset += 1
           consumer_tag = data[offset, length]
@@ -1733,7 +1733,7 @@ module AMQ
           bit_buffer = bit_buffer | (1 << 1) if immediate
           buffer << [bit_buffer].pack(PACK_CHAR)
           frames = [MethodFrame.new(buffer, channel)]
-          properties, headers = self.split_headers(user_headers)
+          properties, _headers = self.split_headers(user_headers)
           if properties.nil? or properties.empty?
             raise RuntimeError.new("Properties can not be empty!")
           end
@@ -1753,7 +1753,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           reply_code = data[offset, 2].unpack(PACK_UINT16).first
           offset += 2
           length = data[offset, 1].unpack(PACK_CHAR).first
@@ -1794,7 +1794,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           length = data[offset, 1].unpack(PACK_CHAR).first
           offset += 1
           consumer_tag = data[offset, length]
@@ -1866,7 +1866,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           delivery_tag = AMQ::Pack.unpack_uint64_big_endian(data[offset, 8]).first
           offset += 8
           bit_buffer = data[offset, 1].unpack(PACK_CHAR).first
@@ -1909,7 +1909,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           length = data[offset, 1].unpack(PACK_CHAR).first
           offset += 1
           cluster_id = data[offset, length]
@@ -1937,7 +1937,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           delivery_tag = AMQ::Pack.unpack_uint64_big_endian(data[offset, 8]).first
           offset += 8
           bit_buffer = data[offset, 1].unpack(PACK_CHAR).first
@@ -2047,7 +2047,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           self.new()
         end
 
@@ -2069,7 +2069,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           delivery_tag = AMQ::Pack.unpack_uint64_big_endian(data[offset, 8]).first
           offset += 8
           bit_buffer = data[offset, 1].unpack(PACK_CHAR).first
@@ -2140,7 +2140,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           self.new()
         end
 
@@ -2182,7 +2182,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           self.new()
         end
 
@@ -2224,7 +2224,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           self.new()
         end
 
@@ -2254,7 +2254,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           bit_buffer = data[offset, 1].unpack(PACK_CHAR).first
           offset += 1
           nowait = (bit_buffer & (1 << 0)) != 0
@@ -2290,7 +2290,7 @@ module AMQ
 
         # @return
         def self.decode(data)
-          offset = 0
+          offset = offset = 0 # self-assigning offset to eliminate "assigned but unused variable" warning even if offset is not used in this method
           self.new()
         end
 

data/lib/amq/protocol/table.rb

@@ -1,6 +1,5 @@
 # encoding: binary
 
-require "amq/protocol/client"
 require "amq/protocol/type_constants"
 require "amq/protocol/table_value_encoder"
 require "amq/protocol/table_value_decoder"

data/lib/amq/protocol/table_value_decoder.rb

@@ -1,9 +1,7 @@
 # encoding: binary
 
 require "amq/endianness"
-require "amq/protocol/client"
 require "amq/protocol/type_constants"
-require "amq/protocol/table"
 require "amq/protocol/float_32bit"
 
 module AMQ

data/lib/amq/protocol/table_value_encoder.rb

@@ -1,8 +1,6 @@
 # encoding: binary
 
-require "amq/protocol/client"
 require "amq/protocol/type_constants"
-require "amq/protocol/table"
 require "date"
 
 require "amq/protocol/float_32bit"
@@ -31,10 +29,10 @@ module AMQ
           accumulator << [value.bytesize].pack(PACK_UINT32)
           accumulator << value
         when Symbol then
-          v = value.to_s
+          str = value.to_s
           accumulator << TYPE_STRING
-          accumulator << [v.bytesize].pack(PACK_UINT32)
-          accumulator << v
+          accumulator << [str.bytesize].pack(PACK_UINT32)
+          accumulator << str
         when Integer then
           accumulator << TYPE_SIGNED_64BIT
           accumulator << [value].pack(PACK_INT64_BE)

data/lib/amq/protocol/version.rb

@@ -1,5 +1,5 @@
 module AMQ
   module Protocol
-    VERSION = "2.0.1"
+    VERSION = "2.1.0"
   end # Protocol
 end # AMQ

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amq-protocol
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Jakub Stastny
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2017-01-28 00:00:00.000000000 Z
 dependencies: []
 description: |2
     amq-protocol is an AMQP 0.9.1 serialization library for Ruby. It is not a
@@ -102,9 +102,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: amq-protocol
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: AMQP 0.9.1 encoding & decoding library.
 test_files: []
-has_rdoc: