amq-protocol 0.9.0 → 0.9.1

data/lib/amq/protocol/version.rb

@@ -1,5 +1,5 @@
 module AMQ
   module Protocol
-    VERSION = "0.9.0"
+    VERSION = "0.9.1"
   end # Protocol
 end # AMQ

data/post-processing.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby -i
+#!/usr/bin/env ruby
 # encoding: utf-8
 
 # helpers

data/protocol.rb.pytemplate

@@ -188,11 +188,10 @@ module AMQ
 
         # See https://dev.rabbitmq.com/wiki/Amqp091Errata#section_11
         limit        = frame_size - 8
-        limit_plus_1 = limit + 1
 
         array = Array.new
         while body
-          payload, body = body[0, limit_plus_1], body[limit_plus_1, body.length - limit]
+          payload, body = body[0, limit], body[limit, body.length - limit]
           # array << [0x03, payload]
           array << BodyFrame.new(payload, channel)
         end
@@ -386,9 +385,6 @@ module AMQ
           frames + self.encode_body(payload, channel, frame_size)
           % endif
           % else:
-          % if os.getenv("DEVELOPMENT"):
-          STDERR.puts("~ [\e[31m#{channel}\e[m] \e[32m${klass.name}.${method.name}\e[m(${", ".join([method + "=#{" + method + ".inspect}" for method in method.not_ignored_args()])})") if $DEBUG
-          % endif
           MethodFrame.new(buffer, channel)
           % endif
         end

data/spec/amq/protocol/basic_spec.rb

@@ -138,6 +138,14 @@ module AMQ
             method_frame.channel.should == 1
           end
         end
+        
+        describe '.decode' do
+          subject do
+            CancelOk.decode("\x03foo\x01")            
+          end
+
+          its(:consumer_tag) { should == 'foo' }
+        end
       end
 
       describe CancelOk do

data/spec/amq/protocol/method_spec.rb

@@ -25,11 +25,11 @@ module AMQ
           end
         end
 
-        context 'when the body is to big to fit in a single frame' do
+        context 'when the body is too 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 = 93
+            expected_payload_size = 92
             body_frames = Method.encode_body(lipsum, 1, frame_size)
             body_frames.map(&:payload).should == lipsum.split('').each_slice(expected_payload_size).map(&:join)
           end

data/spec/spec_helper.rb

@@ -16,6 +16,8 @@ $: << File.expand_path('../../lib', __FILE__)
 
 require "amq/protocol"
 
+puts "Running on #{RUBY_VERSION}"
+
 module RubyVersionsSUpport
   def one_point_eight?
     RUBY_VERSION =~ /^1.8/

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amq-protocol
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Jakub Stastny
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-11 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"
@@ -30,7 +30,7 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.textile
+- README.md
 files: 
 - .gitignore
 - .gitmodules
@@ -39,12 +39,13 @@ files:
 - Gemfile
 - LICENSE
 - PROFILING.md
-- README.textile
+- README.md
 - __init__.py
 - amq-protocol.gemspec
 - amqp_0.9.1_changes.json
 - codegen.py
 - codegen_helpers.py
+- generate.rb
 - irb.rb
 - lib/amq/hacks.rb
 - lib/amq/protocol.rb
@@ -73,10 +74,9 @@ files:
 - spec/amq/protocol/value_encoder_spec.rb
 - spec/amq/protocol_spec.rb
 - spec/spec_helper.rb
-- tasks.rb
 homepage: http://github.com/ruby-amqp/amq-protocol
-licenses: []
-
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: []
 
@@ -103,9 +103,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: amq-protocol
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: AMQP 0.9.1 encoder & decoder.
 test_files: []
 
+has_rdoc: 

data/README.textile

@@ -1,50 +0,0 @@
-h1. About amq-protocol.
-
-amq-protocol is an AMQP 0.9.1 serialization library for Ruby. It is not an
-AMQP client: amq-protocol only handles serialization and deserialization.
-If you want to write your own AMQP client, this gem can help you with that.
-
-h2. How does amq-protocol relate to amqp gem, amq-client and libraries like bunny?
-
-See "this page about AMQP gems family":https://github.com/ruby-amqp/amq-client/blob/master/README.textile
-
-
-h2. Installation
-
-If you use Bundler and want to use the very latest version, add this to your Gemfile:
-
-<pre>
-gem 'amq-protocol', :git => 'https://github.com/ruby-amqp/amq-protocol.git'
-</pre>
-
-
-h2. Development
-
-h3. Inspection
-
-If you need to see what AMQP methods are encoded, just regenerate the protocol file using @./tasks.rb generate --development@ and then set @$DEBUG@ to @true@ for which parts of code you want to see the debug statements.
-
-!http://static.101ideas.cz/amqp-debug.png!
-
-h3. Contributing
-
-If you want to change some code, don't edit @lib/amq/protocol/client.rb@ —
-that file is generated from @protocol.rb.pytemplate@
-which is a template file used by @codegen.py@. You can re-generate by running
-<pre>nake ./tasks.rb generate</pre>
-Please note that nake gem only runs on Ruby 1.9.2.
-
-
-## Maintainer Information
-
-amq-protocol is maintained by [Michael Klishin](https://github.com/michaelklishin).
-
-
-h2. Links
-
-* "API Documentation":http://rdoc.info/github/ruby-amqp/amq-protocol/master/frames
-* "Examples":https://github.com/ruby-amqp/amq-protocol/tree/master/examples/
-* "Jabber room for contributors":xmpp://amqp-dev@conf.netlab.cz
-* "Ruby AMQP mailing list":http://groups.google.com/group/ruby-amqp
-* "Issue tracker":http://github.com/ruby-amqp/amq-protocol/issues
-* "Continous integration server":http://travis-ci.org/#!/ruby-amqp/amq-protocol

data/tasks.rb

@@ -1,43 +0,0 @@
-#!/usr/bin/env bundle exec nake
-# encoding: utf-8
-
-# ./tasks.rb generate
-# ./tasks.rb generate --targets=all,
-# ./tasks.rb generate --targets=client,server
-# ./tasks.rb generate --development
-Task.new(:generate) do |task|
-  task.description = "Generate lib/amq/protocol/client.rb"
-
-  def self.valid_choices
-    ["client", "server", "all"]
-  end
-
-  def self.check_validity_of_target(target)
-    unless self.valid_choices.include?(target)
-      abort "Target can be one #{valid_choices.inspect}, not #{target.inspect}"
-    end
-  end
-
-  task.define do |opts, spec = nil|
-    opts[:targets] ||= ["client"]
-
-    if spec.nil?
-      spec = "vendor/rabbitmq-codegen/amqp-rabbitmq-0.9.1.json"
-      unless File.exist?(spec)
-        sh "git submodule update --init"
-      end
-    end
-
-    opts[:targets].each do |type|
-      self.check_validity_of_target(type)
-      path = "lib/amq/protocol/#{type}.rb"
-      sh "DEVELOPMENT=#{opts[:development]} ./codegen.py #{type} #{spec} #{path}"
-      if File.file?(path)
-        sh "./post-processing.rb #{path}"
-        sh "ruby -c #{path}"
-      end
-    end
-  end
-end
-
-Task.tasks.default = Task[:generate] # FIXME: it doesn't work now