amq-protocol 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ac3c4778d62f3a7f84cd1132c77de339a2e97c3
-  data.tar.gz: 205cf9a34ea9addcfe2458e1dfcc9b6fe8a6c81c
+  metadata.gz: aa10f585162559fa1b74d9f406725745e96ac46b
+  data.tar.gz: 017657dbecc96437ca9f28887e73df4d76d9df97
 SHA512:
-  metadata.gz: ed02a18089fc8e1f633716981a1d995cf5ad6eb8663bdfb794effc32351dea6d97b56cbcea01a413f65d1ace0a56f1853bbe0bcce10072587c9439eb60d748d2
-  data.tar.gz: 0c2344d1e5919666c6b38934fe3f38817f117f117ed8606b6090c96e7e43c6e8afa556bbf4bf9e2e082e7bea75518ac5090f9d48d869525edb532fc67a95856e
+  metadata.gz: 96631cb9c63b31649c309c1686ff5b26321e847ff0994c2a1bc007d54caa56e3fbe936bca7f56c809b812cd91d34bc94a9d84af582bb3d109a2310e5199d86ca
+  data.tar.gz: e607e0fa90130e7e76847810ac100ba3de2692d20321f1e4e1601cda97bcd0e979aa62350ee1b1bd9a0ed0becac53882f0ce96bca45edec669507623a73c59a4

data/.gitignore

@@ -3,6 +3,8 @@
 /.ruby-version
 tmp
 *.pyc
+*.iml
+.idea
 /vendor/bundle
 /vendor/amq-*
 /coverage
@@ -13,3 +15,4 @@ Gemfile.lock
 bin/*
 *.bundle
 Makefile
+profiling/dumps/*

data/.travis.yml

@@ -4,9 +4,8 @@ script: "bundle exec rspec spec"
 rvm:
   - 2.0
   - 1.9.3
-  - jruby-19mode
+  - jruby
   - 1.9.2
-  - rbx-2.2.0
   - ruby-head
   - 1.8.7
 notifications:

data/README.md

@@ -56,3 +56,7 @@ Any questions you may have should be sent to the [Ruby AMQP mailing list](http:/
 ## License
 
 MIT (see LICENSE in the repository root).
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/ruby-amqp/amq-protocol/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

data/lib/amq/pack.rb

@@ -7,7 +7,8 @@ module AMQ
   # compatible with Ruby 1.8+.
   module Pack
     UINT64 = "Q".freeze
-    INT16  = "c".freeze
+    UINT16_BE  = "n".freeze
+    INT16 = "c".freeze
 
     if Endianness.big_endian?
       def self.pack_uint64_big_endian(long_long)
@@ -42,8 +43,8 @@ module AMQ
       end
 
       def self.unpack_int16_big_endian(data)
-        data = data.bytes.to_a.reverse.map(&:chr).join
-        data.unpack(INT16)
+        value = data.bytes.to_a.map(&:chr).join.unpack(UINT16_BE)[0]
+        [(value & ~(1 << 15)) - (value & (1 << 15))]
       end
     end
   end

data/lib/amq/protocol/version.rb

@@ -1,5 +1,5 @@
 module AMQ
   module Protocol
-    VERSION = "1.9.0"
+    VERSION = "1.9.1"
   end # Protocol
 end # AMQ

data/profiling/README.md

@@ -0,0 +1,9 @@
+# Profiling Scripts
+
+This directory contains profiling scripts. Currently they use [stackprof](https://github.com/tmm1/stackprof) which
+requires Ruby 2.1+ (preview2 or later).
+
+## Running the Profiler
+
+    ruby profiling/stackprof/body_framing_with_2k_payload.rb
+    stackprof profiling/dumps/body_framing_with_2k_payload.dump --text

data/profiling/{pure → stackprof}/body_framing_with_2k_payload.rb

@@ -17,16 +17,17 @@ n = 250_000
 puts "Doing a warmup run..."
 15_000.times { AMQ::Protocol::Method.encode_body("ab" * 1024, 1, FRAME_SIZE) }
 
-require 'ruby-prof'
+require 'stackprof'
 
 # preallocate
 ary = Array.new(n) { "ab" * 1024 }
 
 puts "Doing main run..."
-result = RubyProf.profile do
+result = StackProf.run(mode: :wall) do
   n.times { |i| AMQ::Protocol::Method.encode_body(ary[i], 1, FRAME_SIZE) }
 end
 
-printer = RubyProf::FlatPrinter.new(result)
-printer.print(STDOUT, {})
+File.open('./profiling/dumps/body_framing_with_2k_payload.dump', "w+") do |f|
+  f.write Marshal.dump(result)
+end
 

data/spec/amq/{hacks_spec.rb → pack_spec.rb}

@@ -4,7 +4,23 @@ require File.expand_path('../../spec_helper', __FILE__)
 
 
 module AMQ
-  describe Hacks do
+  describe Pack do
+    context "16-bit big-endian packing / unpacking" do
+      let(:examples_16bit) {
+        {
+            0x068D => "\x06\x8D" # 1677
+        }
+      }
+
+      it "unpacks signed integers from a string to a number" do
+        examples_16bit.each do |key, value|
+          described_class.unpack_int16_big_endian(value)[0].should == key
+        end
+      end
+    end
+
+
+
     context "64-bit big-endian packing / unpacking" do
       let(:examples) {
         {

data/spec/amq/protocol/table_spec.rb

@@ -181,8 +181,8 @@ module AMQ
         end
 
         it 'is capable of decoding 16bit signed integers' do
-          output = TableValueDecoder.decode_short("\b\xC0",0).first
-          output.should == -64
+          output = TableValueDecoder.decode_short("\x06\x8D", 0).first
+          output.should == 1677
         end
 
         it "is capable of decoding tables" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amq-protocol
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Jakub Stastny
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-21 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies: []
 description: |2
     amq-protocol is an AMQP 0.9.1 serialization library for Ruby. It is not an
@@ -61,10 +61,11 @@ files:
 - lib/amq/protocol/version.rb
 - lib/amq/settings.rb
 - lib/amq/uri.rb
-- profiling/pure/body_framing_with_2k_payload.rb
+- profiling/README.md
+- profiling/stackprof/body_framing_with_2k_payload.rb
 - spec/amq/bit_set_spec.rb
-- spec/amq/hacks_spec.rb
 - spec/amq/int_allocator_spec.rb
+- spec/amq/pack_spec.rb
 - spec/amq/protocol/basic_spec.rb
 - spec/amq/protocol/blank_body_encoding_spec.rb
 - spec/amq/protocol/channel_spec.rb
@@ -103,8 +104,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: amq-protocol
-rubygems_version: 2.1.6
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: AMQP 0.9.1 encoder & decoder.
 test_files: []
+has_rdoc: