amq-protocol 0.7.0.alpha6 → 0.7.0.alpha7

data/.gitignore

@@ -3,5 +3,6 @@
 tmp
 *.pyc
 /vendor/bundle
+/vendor/amq-*
 /coverage
-Gemfile.lock
+Gemfile.lock

data/.travis.yml

@@ -1,6 +1,7 @@
 script: "bundle exec rspec spec"
 rvm:
   - 1.8.7
+  - 1.8.7-p174
   - 1.9.2
   - jruby
   - rbx

data/CONTRIBUTORS

@@ -1,2 +1,4 @@
-Jakub Šťastný aka Botanicus: 93 (5458 LOC)
-Michael S. Klishin: 26 (792 LOC)
+Jakub Stastny aka Botanicus: 124 commits, 27692 LOC
+Theo: 65 commits, 8068 LOC
+Michael S. Klishin: 86 commits, 2972 LOC
+Mark Abramov: 13 commits, 559 LOC

data/Gemfile

@@ -1,16 +1,30 @@
 # encoding: utf-8
 
-source "http://gemcutter.org"
+# Use local clones if possible.
+# If you want to use your local copy, just symlink it to vendor.
+extend Module.new {
+  def gem(name, options = Hash.new)
+    local_path = File.expand_path("../vendor/#{name}", __FILE__)
+    if File.exist?(local_path)
+      super name, options.merge(:path => local_path).delete_if { |key, _| [:git, :branch].include?(key) }
+    else
+      super name, options
+    end
+  end
+}
+
+source :rubygems
 
 group(:development) do
-  gem "nake",         :platform => :ruby_19
-  gem "contributors", :platform => :ruby_19
+  gem "nake",         :platform => :mri_19
+  gem "contributors", :platform => :mri_19
+  gem "amq-client"
 
   # excludes Windows, Rubinius and JRuby
-  gem "perftools.rb", :platform => :mri
+  gem "perftools.rb", :platform => :mri_18
 end
 
 group(:test) do
   gem "rspec", ">=2.0.0"
-  gem 'simplecov', :platform => :ruby_19
+  gem "simplecov", :platform => :mri_19
 end

data/README.textile

@@ -20,6 +20,12 @@ gem 'amq-protocol', :git => 'https://github.com/ruby-amqp/amq-protocol.git'
 
 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. Nightly Builds
 
 You can always find nightly builds at "gems.101ideas.cz":http://gems.101ideas.cz.

data/codegen.py

@@ -152,4 +152,4 @@ def generateMain(type):
     return main
 
 if __name__ == "__main__":
-    do_main_dict({"client": generateMain("client"), "server": generateMain("server")})
+    do_main_dict({"client": generateMain("client"), "server": generateMain("server"), "all": generateMain("all")})

data/irb.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env bundle exec ruby
 # encoding: binary
 
 # This file is supposed to make inspecting AMQ protocol easier.
@@ -41,16 +41,24 @@ else
     puts "~ Loading original #{irbrc} ..."
     load irbrc
 
-    file = ENV["FILE"] || "client"
-    require_relative "lib/amq/protocol/#{file}.rb"
+    # TODO: Don't generate constants in all.rb multiple
+    # times, then we can remove this craziness with $VERBOSE.
+    old_verbose, $VERBOSE = $VERBOSE, nil
+    begin
+      require_relative "lib/amq/protocol/all.rb"
+    rescue LoadError
+      abort "File lib/amq/protocol/all.rb doesn't exist! You have to generate it using ./tasks.rb generate --targets=all, executed from the root of AMQ Protocol repository."
+    end
+    $VERBOSE = old_verbose
+
     include AMQ::Protocol
 
     begin
-      require "amq/client/io/string"
+      require "amq/client/framing/string/frame"
 
       class AMQ::Protocol::Frame
         def self.decode(string)
-          AMQ::Client::StringAdapter::Frame.decode(string)
+          AMQ::Client::Framing::String::Frame.decode(string)
         end
       end
     rescue LoadError
@@ -70,11 +78,20 @@ else
       end
     end
 
-    require "stringio"
-
     def fd(data)
-      Frame.decode(StringIO.new(data))
+      Frame.decode(data)
     end
+
+    puts <<-EOF
+
+This is an AMQP #{AMQ::Protocol::PROTOCOL_VERSION} console. You can:
+
+  - Decode data via: fd(frame_data).
+  - Encode data using AMQP classes directly:
+      frame = Connection::Open.encode("/")
+      frame.encode
+
+    EOF
   rescue Exception => exception # it just discards all the exceptions!
     abort exception.message + "\n  - " + exception.backtrace.join("\n  - ")
   end

data/lib/amq/protocol/client.rb

@@ -26,9 +26,8 @@ module AMQ
     PACK_UCHAR_UINT32       = "CN".freeze
     PACK_CHAR_UINT16_UINT32 = "cnN".freeze
 
-    PACK_32BIT_FLOAT        = 'f'.freeze
-    PACK_64BIT_FLOAT        = 'd'.freeze
-
+    PACK_32BIT_FLOAT        = "f".freeze
+    PACK_64BIT_FLOAT        = "d".freeze
 
     # @return [Array] Collection of subclasses of AMQ::Protocol::Class.
     def self.classes
@@ -52,7 +51,7 @@ module AMQ
         @_subclasses.select{ |k| defined?(k::VALUE) }
       end # self.subclasses_with_values
 
-      def self.[](code) # TODO: rewrite more effectively
+      def self.[](code)
         if result = subclasses_with_values.detect { |klass| klass::VALUE == code }
           result
         else
@@ -245,19 +244,20 @@ module AMQ
       end
 
       def self.encode_body(body, channel, frame_size)
-        # Spec is broken: Our errata says that it does define
-        # something, but it just doesn"t relate do method and
-        # properties frames. Which makes it, well, suboptimal.
-        # https://dev.rabbitmq.com/wiki/Amqp091Errata#section_11
-        limit = frame_size - 7 - 1
-
-        Array.new.tap do |array|
-          while body
-            payload, body = body[0, limit + 1], body[limit + 1, body.length - limit]
-            # array << [0x03, payload]
-            array << BodyFrame.new(payload, channel)
-          end
+        return [BodyFrame.new(body, channel)] if body.empty?
+
+        # 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]
+          # array << [0x03, payload]
+          array << BodyFrame.new(payload, channel)
         end
+
+        array
       end
 
       # We can return different:

data/lib/amq/protocol/table.rb

@@ -109,7 +109,6 @@ module AMQ
             offset += 5
             value = BigDecimal.new(raw.to_s) * (BigDecimal.new(TEN) ** -decimals)
           when TYPE_TIME
-            # TODO: what is the first unpacked value??? Zone, maybe? It's 0, so it'd make sense.
             timestamp = data.slice(offset, 8).unpack(PACK_UINT32_X2).last
             value = Time.at(timestamp)
             offset += 8

data/lib/amq/protocol/version.rb

@@ -1,5 +1,5 @@
 module AMQ
   module Protocol
-    VERSION = "0.7.0.alpha6"
+    VERSION = "0.7.0.alpha7"
   end # Protocol
 end # AMQ

data/protocol.rb.pytemplate

@@ -3,7 +3,7 @@
 
 # THIS IS AN AUTOGENERATED FILE, DO NOT MODIFY
 # IT DIRECTLY ! FOR CHANGES, PLEASE UPDATE CODEGEN.PY
-# IN THE ROOT DIRECTORY OF THE AMQ-PROTOCOL REPOSITORY.<% import codegen_helpers as helpers %><% import re, codegen %>
+# IN THE ROOT DIRECTORY OF THE AMQ-PROTOCOL REPOSITORY.<% import codegen_helpers as helpers %><% import re, os, codegen %>
 
 require "amq/protocol/table"
 require "amq/protocol/frame"
@@ -27,13 +27,16 @@ module AMQ
     PACK_UCHAR_UINT32       = 'CN'.freeze
     PACK_CHAR_UINT16_UINT32 = 'cnN'.freeze
 
-    # @version 0.0.1
+    PACK_32BIT_FLOAT        = 'f'.freeze
+    PACK_64BIT_FLOAT        = 'd'.freeze
+
+
+
     # @return [Array] Collection of subclasses of AMQ::Protocol::Class.
     def self.classes
       Protocol::Class.classes
     end
 
-    # @version 0.0.1
     # @return [Array] Collection of subclasses of AMQ::Protocol::Method.
     def self.methods
       Protocol::Method.methods
@@ -51,7 +54,7 @@ module AMQ
         @_subclasses.select{ |k| defined?(k::VALUE) }
       end # self.subclasses_with_values
 
-      def self.[](code) # TODO: rewrite more effectively
+      def self.[](code)
         if result = subclasses_with_values.detect { |klass| klass::VALUE == code }
           result
         else
@@ -181,19 +184,20 @@ module AMQ
       end
 
       def self.encode_body(body, channel, frame_size)
-        # Spec is broken: Our errata says that it does define
-        # something, but it just doesn't relate do method and
-        # properties frames. Which makes it, well, suboptimal.
-        # https://dev.rabbitmq.com/wiki/Amqp091Errata#section_11
-        limit = frame_size - 7 - 1
-
-        Array.new.tap do |array|
-          while body
-            payload, body = body[0, limit + 1], body[limit + 1, body.length - limit]
-            # array << [0x03, payload]
-            array << BodyFrame.new(payload, channel)
-          end
+        return [BodyFrame.new(body, channel)] if body.empty?
+
+        # 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]
+          # array << [0x03, payload]
+          array << BodyFrame.new(payload, channel)
         end
+
+        array
       end
 
       # We can return different:
@@ -316,7 +320,7 @@ module AMQ
         @index = ${method.binary()}
         @packed_indexes = [${klass.index}, ${method.index}].pack(PACK_UINT16_X2).freeze
 
-        % if (spec.type == "client" and method.accepted_by("client")) or (spec.type == "server" and method.accepted_by("server")):
+        % 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
@@ -348,7 +352,7 @@ module AMQ
           % endif
         end
 
-        % if (spec.type == "client" and method.accepted_by("server")) or (spec.type == "server" and method.accepted_by("client")):
+        % if (spec.type == "client" and method.accepted_by("server")) or (spec.type == "server" and method.accepted_by("client")) or spec.type == "all":
         # @return
         # ${method.params()}
         % if klass.name == "connection":
@@ -382,6 +386,9 @@ 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/tasks.rb

@@ -1,22 +1,39 @@
-#!/usr/bin/env nake
+#!/usr/bin/env bundle exec nake
 # encoding: utf-8
 
-# load "contributors.nake"
+load "contributors.nake"
 
+# ./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
-    
-    targets = %w{client} # add "server" to generate server code
-    targets.each do |type|
+
+    opts[:targets].each do |type|
+      self.check_validity_of_target(type)
       path = "lib/amq/protocol/#{type}.rb"
-      sh "./codegen.py #{type} #{spec} #{path}"
+      sh "DEVELOPMENT=#{opts[:development]} ./codegen.py #{type} #{spec} #{path}"
       if File.file?(path)
         sh "./post-processing.rb #{path}"
         sh "ruby -c #{path}"

metadata

@@ -1,10 +1,17 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: amq-protocol
-version: !ruby/object:Gem::Version
-  version: 0.7.0.alpha6
+version: !ruby/object:Gem::Version 
+  hash: -3702664414
   prerelease: 6
+  segments: 
+  - 0
+  - 7
+  - 0
+  - alpha
+  - 7
+  version: 0.7.0.alpha7
 platform: ruby
-authors:
+authors: 
 - Jakub Stastny
 - Michael S. Klishin
 - Theo Hultberg
@@ -12,19 +19,21 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-29 00:00:00.000000000Z
+
+date: 2011-06-16 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:
+
+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:
+
+extra_rdoc_files: 
 - README.textile
-files:
+files: 
 - .gitignore
 - .gitmodules
 - .rspec
@@ -38,7 +47,6 @@ files:
 - __init__.py
 - amq-protocol.gemspec
 - amqp_0.9.1_changes.json
-- benchmark.rb
 - codegen.py
 - codegen_helpers.py
 - examples/00_manual_test.rb
@@ -67,26 +75,38 @@ files:
 - tasks.rb
 homepage: http://github.com/ruby-amqp/amq-protocol
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
+
 rubyforge_project: amq-protocol
-rubygems_version: 1.8.4
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: AMQP 0.9.1 encoder & decoder.
 test_files: []
+

data/benchmark.rb

@@ -1,24 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: binary
-
-begin
-  require "amq/spec"
-rescue LoadError
-  abort "You have to install the amqp gem in order to run the benchmark against its AMQP encoder/decoder."
-end
-
-require "benchmark"
-
-Benchmark.bmbm do |bm|
-  bm.report("Raw binary") do
-    # TODO
-  end
-
-  bm.report("AMQP Gem") do
-    # TODO
-  end
-
-  bm.report("AMQ Protocol Gem") do
-    # TODO
-  end
-end