amq-protocol 0.7.0.alpha7 → 0.7.0.beta1

data/.travis.yml

@@ -1,8 +1,15 @@
+# https://github.com/travis-ci/travis-ci/wiki/.travis.yml-options
+bundler_args: --without development
 script: "bundle exec rspec spec"
 rvm:
   - 1.8.7
-  - 1.8.7-p174
   - 1.9.2
   - jruby
   - rbx
-  - ree
+  - ree
+  - 1.8.7-p174
+notifications:
+  recipients:
+    - jakub@rabbitmq.com
+    - michaelklishin@me.com
+    - markizko@gmail.com

data/Gemfile

@@ -17,8 +17,6 @@ source :rubygems
 
 group(:development) do
   gem "nake",         :platform => :mri_19
-  gem "contributors", :platform => :mri_19
-  gem "amq-client"
 
   # excludes Windows, Rubinius and JRuby
   gem "perftools.rb", :platform => :mri_18

data/lib/amq/protocol/table.rb

@@ -29,6 +29,10 @@ module AMQ
       TYPE_BYTE_ARRAY = 'x'.freeze
       TEN = '10'.freeze
 
+      BOOLEAN_TRUE  = "\x01".freeze
+      BOOLEAN_FALSE = "\x00".freeze
+
+
       def self.encode(table)
         buffer = String.new
         table ||= {}
@@ -47,10 +51,9 @@ module AMQ
           when Float then
             buffer << TYPE_64BIT_FLOAT
             buffer << [value].pack(PACK_64BIT_FLOAT)
-          when TrueClass, FalseClass then
-            value = value ? 1 : 0
-            buffer << TYPE_INTEGER
-            buffer << [value].pack(PACK_UINT32)
+          when true, false then
+            buffer << TYPE_BOOLEAN
+            buffer << (value ? BOOLEAN_TRUE : BOOLEAN_FALSE)
           when Hash then
             buffer << TYPE_HASH # TODO: encoding support
             buffer << self.encode(value)
@@ -95,6 +98,7 @@ module AMQ
           offset += key_length
           type = data.slice(offset, 1)
           offset += 1
+
           case type
           when TYPE_STRING
             length = data.slice(offset, 4).unpack(PACK_UINT32).first
@@ -119,8 +123,9 @@ module AMQ
           when TYPE_BOOLEAN
             value  = data.slice(offset, 2)
             integer = value.unpack(PACK_CHAR).first # 0 or 1
-            value = integer == 1
+            value = (integer == 1)
             offset += 1
+            value
           when TYPE_SIGNED_8BIT then raise NotImplementedError.new
           when TYPE_SIGNED_16BIT then raise NotImplementedError.new
           when TYPE_SIGNED_64BIT then raise NotImplementedError.new

data/lib/amq/protocol/version.rb

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

data/spec/amq/protocol/table_spec.rb

@@ -48,12 +48,20 @@ module AMQ
           Table.encode(nil).should eql(encoded_value)
         end
 
-        it "should return \"\x00\x00\x00\n\x04testI\x00\x00\x00\x01\" for { :test => true }" do
-          Table.encode(:test => true).should eql("\x00\x00\x00\n\x04testI\x00\x00\x00\x01")
+        it "should return \x00\x00\x00\a\x04testt\x01 for { :test => true }" do
+          Table.encode(:test => true).should eql("\x00\x00\x00\a\x04testt\x01")
         end
 
-        it "should return \"\x00\x00\x00\n\x04testI\x00\x00\x00\x01\" for { :coordinates => { :latitude  => 59.35, :longitude => 18.066667 } }" do
-          Table.encode(:coordinates => { :latitude  => 59.35, :longitude => 18.066667 }).should eql("\000\000\0006\vcoordinatesF\000\000\000%\blatituded\315\314\314\314\314\254M@\tlongituded\361\270\250\026\021\0212@")
+        it "should return \x00\x00\x00\a\x04testt\x00 for { :test => false }" do
+          Table.encode(:test => false).should eql("\x00\x00\x00\a\x04testt\x00")
+        end
+
+        it "should return \"\x00\x00\x00\n\x04testI\x00\x00\x00\x01\" for { :coordinates => { :latitude  => 59.35 } }" do
+          Table.encode(:coordinates => { :latitude  => 59.35 }).should eql("\000\000\000#\vcoordinatesF\000\000\000\022\blatituded\315\314\314\314\314\254M@")
+        end
+
+        it "should return \"\x00\x00\x00\n\x04testI\x00\x00\x00\x01\" for { :coordinates => { :longitude => 18.066667 } }" do
+          Table.encode(:coordinates => { :longitude => 18.066667 }).should eql("\000\000\000$\vcoordinatesF\000\000\000\023\tlongituded\361\270\250\026\021\0212@")
         end
 
         DATA.each do |data, encoded|
@@ -72,8 +80,34 @@ module AMQ
           it "is capable of decoding what it encodes" do
             Table.decode(Table.encode(data)).should == data
           end
+        end # DATA.each
+
+
+        it "is capable of decoding booleans" do
+          input1   = { "boolval" => true }
+          Table.decode(Table.encode(input1)).should == input1
+
+
+          input2   = { "boolval" => false }
+          Table.decode(Table.encode(input2)).should == input2
         end
-      end
+
+
+
+        it "is capable of decoding tables" do
+          input   = {
+            "boolval"      => true,
+            "intval"       => 1,
+            "strval"       => "Test",
+            "timestampval" => Time.parse("2011-07-14 01:17:46 +0400"),
+            "floatval"     => 3.14,
+            "longval"      => 912598613,
+            "hashval"      => { "protocol" => "AMQP091" }
+          }
+          Table.decode(Table.encode(input)).should == input
+        end
+
+      end # describe
     end
   end
 end

metadata

@@ -1,17 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: amq-protocol
-version: !ruby/object:Gem::Version 
-  hash: -3702664414
+version: !ruby/object:Gem::Version
+  version: 0.7.0.beta1
   prerelease: 6
-  segments: 
-  - 0
-  - 7
-  - 0
-  - alpha
-  - 7
-  version: 0.7.0.alpha7
 platform: ruby
-authors: 
+authors:
 - Jakub Stastny
 - Michael S. Klishin
 - Theo Hultberg
@@ -19,26 +12,23 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-16 00:00:00 Z
+date: 2011-07-13 00:00:00.000000000Z
 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
 - .travis.yml
-- CONTRIBUTORS
 - Gemfile
 - LICENSE
 - PROFILING.md
@@ -49,7 +39,6 @@ files:
 - amqp_0.9.1_changes.json
 - codegen.py
 - codegen_helpers.py
-- examples/00_manual_test.rb
 - irb.rb
 - lib/amq/hacks.rb
 - lib/amq/protocol.rb
@@ -75,38 +64,26 @@ 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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: amq-protocol
-rubygems_version: 1.8.5
+rubygems_version: 1.8.4
 signing_key: 
 specification_version: 3
 summary: AMQP 0.9.1 encoder & decoder.
 test_files: []
-

data/CONTRIBUTORS

@@ -1,4 +0,0 @@
-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/examples/00_manual_test.rb

@@ -1,139 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
-
-# Usage:
-#   ./examples/00_manual_test.rb
-#   ./examples/00_manual_test.rb 5673
-
-require "socket"
-require_relative "../lib/amq/protocol/client.rb"
-
-include AMQ::Protocol
-
-# Stolen from amq-client:
-class AMQ::Protocol::Frame
-  def self.decode(io)
-    header = io.read(7)
-    type, channel, size = self.decode_header(header)
-    data = io.read(size + 1)
-    payload, frame_end = data[0..-2], data[-1]
-
-    if frame_end != FINAL_OCTET
-      raise "Frame has to end with #{FINAL_OCTET.inspect}!"
-    end
-
-    self.new(type, payload, channel)
-  end
-end
-
-# NOTE: this doesn't work with "localhost", I don't know why:
-socket   = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
-sockaddr = Socket.pack_sockaddr_in((ARGV.first || 5672).to_i, "127.0.0.1")
-
-# helpers
-def socket.encode(klass, *args)
-  STDERR.puts "#{klass}.encode(#{args.inspect[1..-2]})"
-  result = klass.encode(*args)
-  STDERR.puts "=> #{result}"
-  if result.is_a?(Frame)
-    self.write(result.encode)
-  else
-    data = result.inject("") do |buffer, frame|
-      self.write(frame.encode) ###
-      buffer += frame.encode
-    end
-    # self.write(data)
-  end
-end
-
-def socket.decode
-  frame = Frame.decode(self)
-  STDERR.puts "Frame.decode(#{self.inspect})"
-  STDERR.puts "=> #{frame.inspect}"
-  STDERR.puts "frame.decode_payload"
-  STDERR.puts "=> #{res = frame.decode_payload}\n\n"
-  return res
-end
-
-begin
-  socket.connect(sockaddr)
-rescue Errno::ECONNREFUSED
-  abort "Don't forget to start an AMQP broker first!"
-end
-
-begin
-  # AMQP preamble
-  puts "Sending AMQP preamble (#{AMQ::Protocol::PREAMBLE.inspect})\n\n"
-  socket.write AMQ::Protocol::PREAMBLE
-
-  # Connection.Start/Connection.Start-Ok
-  connection_start_response = socket.decode
-  socket.encode Connection::StartOk, {client: "AMQ Protocol"}, "PLAIN", "\0guest\0guest", "en_GB"
-
-  # Connection.Tune/Connection.Tune-Ok
-  connection_tune_response = socket.decode
-  channel_max = connection_tune_response.channel_max
-  frame_max   = connection_tune_response.frame_max
-  heartbeat   = connection_tune_response.heartbeat
-  socket.encode Connection::TuneOk, channel_max, frame_max, heartbeat
-  puts "Max agreed frame size: #{frame_max}"
-
-  # Connection.Open/Connection.Open-Ok
-  socket.encode Connection::Open, "/"
-  connection_open_ok_response = socket.decode
-
-  begin
-    # Channel.Open/Channel.Open-Ok
-    socket.encode Channel::Open, 1, ""
-    channel_open_ok_response = socket.decode
-
-    begin
-      # Exchange.Declare/Exchange.Declare-Ok
-      socket.encode Exchange::Declare, 1, "tasks", "fanout", false, false, false, false, false, {}
-      exchange_declare_ok_response = socket.decode
-
-      # Queue.Declare/Queue.Declare-Ok
-      socket.encode Queue::Declare, 1, "", false, false, false, false, false, {}
-      queue_declare_ok_response = socket.decode
-
-      puts "Queue name: #{queue_declare_ok_response.queue.inspect}"
-
-      # Queue.Bind/Queue.Bind-Ok
-      socket.encode Queue::Bind, 1, queue_declare_ok_response.queue, "tasks", "", false, {}
-      queue_bind_ok_response = socket.decode
-
-      # Basic.Consume
-      socket.encode Basic::Consume, 1, queue_declare_ok_response.queue, "", false, false, false, false, Hash.new
-
-      # Basic.Publish
-      socket.encode Basic::Publish, 1, "this is a payload", {content_type: "text/plain"}, "tasks", "", false, false, frame_max
-
-      # Basic.Consume-Ok
-      basic_consume_ok_response = socket.decode
-      puts "Consumed successfully, consumer tag: #{basic_consume_ok_response.consumer_tag}"
-
-      # Basic.Deliver
-      basic_deliver        = socket.decode
-      basic_deliver_header = socket.decode # header frame: {}
-      basic_deliver_body   = socket.decode # body frame: "this is a payload"
-      puts "[Received] headers: #{basic_deliver_header.inspect}, payload: #{basic_deliver_body.inspect}"
-    ensure
-      # Channel.Close/Channel.Close-Ok
-      socket.encode Channel::Close, 1, 200, "bye", 0, 0
-      channel_close_ok_response = socket.decode
-    end
-  ensure
-    # Connection.Close/Connection.Close-Ok
-    socket.encode Connection::Close, 200, "", 0, 0
-    close_ok_response = socket.decode
-  end
-rescue Exception => exception
-  STDERR.puts "\n\e[1;31m[#{exception.class}] #{exception.message}\e[0m"
-  exception.backtrace.each do |line|
-    line = "\e[0;36m#{line}\e[0m" if line.match(Regexp::quote(File.basename(__FILE__)))
-    STDERR.puts "  - " + line
-  end
-  exit 1 # Yes, this works with the ensure block, even though the rescue block run first. Magic.
-ensure
-  socket.close
-end