carrot 0.8.1 → 1.0.0

data/README.markdown

@@ -2,11 +2,11 @@
 
 A synchronous amqp client. Based on Aman's amqp client:
 
-[http://github.com/tmm1/amqp/tree/master] (http://github.com/tmm1/amqp/tree/master)
+[http://github.com/tmm1/amqp/tree/master](http://github.com/tmm1/amqp/tree/master)
 
 ## Motivation
 
-This client does not use eventmachine so no background thread necessary. As a result, it is much easier to use from script/console and Passenger. It also solves the problem of buffering messages and ack responses. For more details see [this thread] (http://groups.google.com/group/ruby-amqp/browse_thread/thread/fdae324a0ebb1961/fa185fdce1841b68).
+This client does not use eventmachine so no background thread necessary. As a result, it is much easier to use from script/console and Passenger. It also solves the problem of buffering messages and ack responses. For more details see [this thread](http://groups.google.com/group/ruby-amqp/browse_thread/thread/fdae324a0ebb1961/fa185fdce1841b68).
 
 There is currently no way to prevent buffering using eventmachine. Support for prefetch is still unreliable.
 

data/Rakefile

@@ -1,7 +1,6 @@
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
-require 'rcov/rcovtask'
 
 begin
   require 'jeweler'
@@ -12,7 +11,6 @@ begin
     s.description = "A synchronous version of the ruby amqp client"
     s.summary = "A synchronous version of the ruby amqp client"
     s.authors = ["Amos Elliston"]
-    s.add_development_dependency "rcov"
     s.add_development_dependency "mocha"
   end
   Jeweler::GemcutterTasks.new
@@ -34,10 +32,4 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-Rcov::RcovTask.new do |t|
-  t.libs << ['lib', 'test']
-  t.test_files = FileList['test/**/*_test.rb']
-  t.verbose = true
-end
-
 task :default => :test

data/VERSION.yml

@@ -1,5 +1,5 @@
---- 
-:major: 0
-:minor: 8
-:build: 
-:patch: 1
+---
+:major: 1
+:minor: 0
+:patch: 0
+:build: !!null 

data/carrot.gemspec

@@ -1,68 +1,62 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{carrot}
-  s.version = "0.8.1"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Amos Elliston"]
-  s.date = %q{2010-11-01}
+  s.date = %q{2011-08-03}
   s.description = %q{A synchronous version of the ruby amqp client}
   s.email = %q{amos@geni.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.markdown"
+    "README.markdown"
   ]
   s.files = [
-    ".gitignore",
-     "LICENSE",
-     "README.markdown",
-     "Rakefile",
-     "VERSION.yml",
-     "carrot.gemspec",
-     "lib/amqp/buffer.rb",
-     "lib/amqp/exchange.rb",
-     "lib/amqp/frame.rb",
-     "lib/amqp/header.rb",
-     "lib/amqp/protocol.rb",
-     "lib/amqp/queue.rb",
-     "lib/amqp/server.rb",
-     "lib/amqp/spec.rb",
-     "lib/carrot.rb",
-     "lib/examples/simple_pop.rb",
-     "protocol/amqp-0.8.json",
-     "protocol/amqp-0.8.xml",
-     "protocol/codegen.rb",
-     "protocol/doc.txt",
-     "test/carrot_test.rb",
-     "test/test_helper.rb"
+    "LICENSE",
+    "README.markdown",
+    "Rakefile",
+    "VERSION.yml",
+    "carrot.gemspec",
+    "lib/carrot.rb",
+    "lib/carrot/amqp/buffer.rb",
+    "lib/carrot/amqp/exchange.rb",
+    "lib/carrot/amqp/frame.rb",
+    "lib/carrot/amqp/header.rb",
+    "lib/carrot/amqp/protocol.rb",
+    "lib/carrot/amqp/queue.rb",
+    "lib/carrot/amqp/server.rb",
+    "lib/carrot/amqp/spec.rb",
+    "lib/examples/simple_pop.rb",
+    "protocol/amqp-0.8.json",
+    "protocol/amqp-0.8.xml",
+    "protocol/codegen.rb",
+    "protocol/doc.txt",
+    "test/buffer_test.rb",
+    "test/carrot_test.rb",
+    "test/frame_test.rb",
+    "test/protocol_test.rb",
+    "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/famoseagle/carrot}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{A synchronous version of the ruby amqp client}
-  s.test_files = [
-    "test/carrot_test.rb",
-     "test/test_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
     else
-      s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
   end
 end

data/lib/carrot.rb

@@ -8,14 +8,14 @@ class Carrot
 end
   
 $:.unshift File.expand_path(File.dirname(File.expand_path(__FILE__)))
-require 'amqp/spec'
-require 'amqp/buffer'
-require 'amqp/exchange'
-require 'amqp/frame'
-require 'amqp/header'
-require 'amqp/queue'
-require 'amqp/server'
-require 'amqp/protocol'
+require 'carrot/amqp/spec'
+require 'carrot/amqp/buffer'
+require 'carrot/amqp/exchange'
+require 'carrot/amqp/frame'
+require 'carrot/amqp/header'
+require 'carrot/amqp/queue'
+require 'carrot/amqp/server'
+require 'carrot/amqp/protocol'
 
 class Carrot
   @logging = false

data/lib/{amqp → carrot/amqp}/buffer.rb

@@ -274,128 +274,3 @@ module Carrot::AMQP
     end
   end
 end
-
-if $0 =~ /bacon/ or $0 == __FILE__
-  require 'bacon'
-  include AMQP
-
-  describe Buffer do
-    before do
-      @buf = Buffer.new
-    end
-
-    should 'have contents' do
-      @buf.contents.should == ''
-    end
-
-    should 'initialize with data' do
-      @buf = Buffer.new('abc')
-      @buf.contents.should == 'abc'
-    end
-
-    should 'append raw data' do
-      @buf << 'abc'
-      @buf << 'def'
-      @buf.contents.should == 'abcdef'
-    end
-
-    should 'append other buffers' do
-      @buf << Buffer.new('abc')
-      @buf.data.should == 'abc'
-    end
-
-    should 'have a position' do
-      @buf.pos.should == 0
-    end
-
-    should 'have a length' do
-      @buf.length.should == 0
-      @buf << 'abc'
-      @buf.length.should == 3
-    end
-
-    should 'know the end' do
-      @buf.empty?.should == true
-    end
-
-    should 'read and write data' do
-      @buf._write('abc')
-      @buf.rewind
-      @buf._read(2).should == 'ab'
-      @buf._read(1).should == 'c'
-    end
-
-    should 'raise on overflow' do
-      lambda{ @buf._read(1) }.should.raise Buffer::Overflow
-    end
-
-    should 'raise on invalid types' do
-      lambda{ @buf.read(:junk) }.should.raise Buffer::InvalidType
-      lambda{ @buf.write(:junk, 1) }.should.raise Buffer::InvalidType
-    end
-  
-    { :octet => 0b10101010,
-      :short => 100,
-      :long => 100_000_000,
-      :longlong => 666_555_444_333_222_111,
-      :shortstr => 'hello',
-      :longstr => 'bye'*500,
-      :timestamp => time = Time.at(Time.now.to_i),
-      :table => { :this => 'is', :a => 'hash', :with => {:nested => 123, :and => time, :also => 123.456} },
-      :bit => true
-    }.each do |type, value|
-
-      should "read and write a #{type}" do
-        @buf.write(type, value)
-        @buf.rewind
-        @buf.read(type).should == value
-        @buf.should.be.empty
-      end
-
-    end
-    
-    should 'read and write multiple bits' do
-      bits = [true, false, false, true, true, false, false, true, true, false]
-      @buf.write(:bit, bits)
-      @buf.write(:octet, 100)
-      
-      @buf.rewind
-      
-      bits.map do
-        @buf.read(:bit)
-      end.should == bits
-      @buf.read(:octet).should == 100
-    end
-
-    should 'read and write properties' do
-      properties = ([
-        [:octet, 1],
-        [:shortstr, 'abc'],
-        [:bit, true],
-        [:bit, false],
-        [:shortstr, nil],
-        [:timestamp, nil],
-        [:table, { :a => 'hash' }],
-      ]*5).sort_by{rand}
-      
-      @buf.write(:properties, properties)
-      @buf.rewind
-      @buf.read(:properties, *properties.map{|type,_| type }).should == properties.map{|_,value| value }
-      @buf.should.be.empty
-    end
-
-    should 'do transactional reads with #extract' do
-      @buf.write :octet, 8
-      orig = @buf.to_s
-
-      @buf.rewind
-      @buf.extract do |b|
-        b.read :octet
-        b.read :short
-      end
-
-      @buf.pos.should == 0
-      @buf.data.should == orig
-    end
-  end
-end

data/lib/carrot/amqp/frame.rb

@@ -0,0 +1,62 @@
+module Carrot::AMQP
+  class Frame #:nodoc: all
+    def initialize payload = nil, channel = 0
+      @channel, @payload = channel, payload
+    end
+    attr_accessor :channel, :payload
+
+    def id
+      self.class::ID
+    end
+    
+    def to_binary
+      buf = Buffer.new
+      buf.write :octet, id
+      buf.write :short, channel
+      buf.write :longstr, payload
+      buf.write :octet, FOOTER
+      buf.rewind
+      buf
+    end
+
+    def to_s
+      to_binary.to_s
+    end
+
+    def == frame
+      [ :id, :channel, :payload ].inject(true) do |eql, field|
+        eql and __send__(field) == frame.__send__(field)
+      end
+    end
+    
+    class Invalid < StandardError; end
+    
+    class Method
+      def initialize payload = nil, channel = 0
+        super
+        unless @payload.is_a? Protocol::Class::Method or @payload.nil?
+          @payload = Protocol.parse(@payload)
+        end
+      end
+    end
+
+    class Header
+      def initialize payload = nil, channel = 0
+        super
+        unless @payload.is_a? Protocol::Header or @payload.nil?
+          @payload = Protocol::Header.new(@payload)
+        end
+      end
+    end
+
+    class Body; end
+
+    def self.parse(buf)
+      buf = Buffer.new(buf) unless buf.is_a? Buffer
+      buf.extract do
+        id, channel, payload, footer = buf.read(:octet, :short, :longstr, :octet)
+        Frame.types[id].new(payload, channel) if footer == FOOTER
+      end
+    end
+  end
+end

data/lib/{amqp → carrot/amqp}/protocol.rb

@@ -156,54 +156,3 @@ module Carrot::AMQP
     #:stopdoc:
   end
 end
-
-if $0 =~ /bacon/ or $0 == __FILE__
-  require 'bacon'
-  include AMQP
-
-  describe Protocol do
-    should 'instantiate methods with arguments' do
-      meth = Protocol::Connection::StartOk.new nil, 'PLAIN', nil, 'en_US'
-      meth.locale.should == 'en_US'
-    end
-
-    should 'instantiate methods with named parameters' do
-      meth = Protocol::Connection::StartOk.new :locale => 'en_US',
-                                               :mechanism => 'PLAIN'
-      meth.locale.should == 'en_US'
-    end
-
-    should 'convert methods to binary' do
-      meth = Protocol::Connection::Secure.new :challenge => 'secret'
-      meth.to_binary.should.be.kind_of? Buffer
-
-      meth.to_s.should == [ 10, 20, 6, 'secret' ].pack('nnNa*')
-    end
-
-    should 'convert binary to method' do
-      orig = Protocol::Connection::Secure.new :challenge => 'secret'
-      copy = Protocol.parse orig.to_binary
-      orig.should == copy
-    end
-
-    should 'convert headers to binary' do
-      head = Protocol::Header.new Protocol::Basic,
-                                  size = 5,
-                                  weight = 0,
-                                  :content_type => 'text/json',
-                                  :delivery_mode => 1,
-                                  :priority => 1
-      head.to_s.should == [ 60, weight, 0, size, 0b1001_1000_0000_0000, 9, 'text/json', 1, 1 ].pack('nnNNnCa*CC')
-    end
-
-    should 'convert binary to header' do
-      orig = Protocol::Header.new Protocol::Basic,
-                                  size = 5,
-                                  weight = 0,
-                                  :content_type => 'text/json',
-                                  :delivery_mode => 1,
-                                  :priority => 1
-      Protocol::Header.new(orig.to_binary).should == orig
-    end
-  end
-end

data/lib/{amqp → carrot/amqp}/queue.rb

@@ -1,14 +1,16 @@
 module Carrot::AMQP
   class Queue
     attr_reader   :name, :carrot
-    attr_accessor :delivery_tag
+    attr_accessor :delivery_tag, :opts
 
     def initialize(carrot, name, opts = {})
       @opts   = opts
       @name   = name
       @carrot = carrot
+
+      @opts[:queue] = name
       server.send_frame(
-        Protocol::Queue::Declare.new({ :queue => name, :nowait => true }.merge(opts))
+        Protocol::Queue::Declare.new(@opts.merge(:nowait => true))
       )
     end
 
@@ -50,9 +52,9 @@ module Carrot::AMQP
       status.last
     end
     
-    def status(opts = {}, &blk)
+    def status
       server.send_frame(
-        Protocol::Queue::Declare.new({ :queue => name, :passive => true }.merge(opts))
+        Protocol::Queue::Declare.new(opts)
       )
       method = server.next_method
       return [nil, nil] if method.kind_of?(Protocol::Connection::Close)

data/lib/{amqp → carrot/amqp}/server.rb

@@ -2,6 +2,12 @@ require 'socket'
 require 'thread'
 require 'timeout'
 
+begin
+  require 'openssl'
+rescue LoadError
+  warn "Unable to load SSL extension - you will be unable to make ssl connections."
+end
+
 module Carrot::AMQP
   class Server
     CONNECT_TIMEOUT = 1.0
@@ -23,6 +29,9 @@ module Carrot::AMQP
       @insist = opts[:insist]
       @status = 'NOT CONNECTED'
 
+      @use_ssl    = !!opts[:ssl]
+      @ssl_verify = opts[:ssl_verify] || OpenSSL::SSL::VERIFY_PEER
+
       @multithread = opts[:multithread]      
       start_session
     end
@@ -93,6 +102,23 @@ module Carrot::AMQP
       end
     end
 
+    def start_ssl
+      unless defined?(OpenSSL)
+        raise "SSL Extension not installed"
+      end
+
+      ctx = OpenSSL::SSL::SSLContext.new
+      ctx.verify_mode = @ssl_verify
+
+      @socket = OpenSSL::SSL::SSLSocket.new(@socket, ctx)
+      @socket.sync_close = true
+      @socket.connect
+
+      if ctx.verify_mode != OpenSSL::SSL::VERIFY_NONE
+        @socket.post_connection_check(@host)
+      end
+    end
+
     def socket
       return @socket if @socket and not @socket.closed?
 
@@ -106,6 +132,9 @@ module Carrot::AMQP
         if Socket.constants.include? 'TCP_NODELAY'
           @socket.setsockopt Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1
         end
+
+        start_ssl if @use_ssl
+
         @status   = 'CONNECTED'
       rescue SocketError, SystemCallError, IOError, Timeout::Error => e
         msg = e.message << " - #{@host}:#{@port}"

data/test/buffer_test.rb

@@ -0,0 +1,122 @@
+require 'test_helper'
+require 'carrot/amqp/buffer'
+
+module Carrot::AMQP
+  context 'Buffer' do
+    setup do
+      @buf = Buffer.new
+    end
+
+    test 'have contents' do
+      assert_equal '', @buf.contents
+    end
+
+    test 'initialize with data' do
+      @buf = Buffer.new('abc')
+      assert_equal 'abc', @buf.contents
+    end
+
+    test 'append raw data' do
+      @buf << 'abc'
+      @buf << 'def'
+      assert_equal 'abcdef', @buf.contents
+    end
+
+    test 'append other buffers' do
+      @buf << Buffer.new('abc')
+      assert_equal 'abc', @buf.contents
+    end
+
+    test 'have a position' do
+      assert_equal 0, @buf.pos
+    end
+
+    test 'have a length' do
+      assert_equal 0, @buf.length
+      @buf << 'abc'
+      assert_equal 3, @buf.length
+    end
+
+    test 'know the end' do
+      assert_equal true, @buf.empty?
+    end
+
+    test 'read and write data' do
+      @buf._write('abc')
+      @buf.rewind
+      assert_equal 'ab', @buf._read(2)
+      assert_equal 'c', @buf._read(1)
+    end
+
+    test 'raise on overflow' do
+      assert_raise(Buffer::Overflow) { @buf._read(1) }
+    end
+
+    test 'raise on invalid types' do
+      assert_raise(Buffer::InvalidType) { @buf.read(:junk) }
+      assert_raise(Buffer::InvalidType) { @buf.write(:junk, 1) }
+    end
+
+    { :octet => 0b10101010,
+      :short => 100,
+      :long => 100_000_000,
+      :longlong => 666_555_444_333_222_111,
+      :shortstr => 'hello',
+      :longstr => 'bye'*500,
+      :timestamp => time = Time.at(Time.now.to_i),
+      :table => { :this => 'is', :a => 'hash', :with => {:nested => 123, :and => time, :also => 123.456} },
+      :bit => true
+    }.each do |type, value|
+
+      test "read and write a #{type}" do
+        @buf.write(type, value)
+        @buf.rewind
+        assert_equal value, @buf.read(type)
+        assert_equal true, @buf.empty?
+      end
+
+    end
+
+    test 'read and write multiple bits' do
+      bits = [true, false, false, true, true, false, false, true, true, false]
+      @buf.write(:bit, bits)
+      @buf.write(:octet, 100)
+
+      @buf.rewind
+
+      assert_equal bits, bits.collect{ @buf.read(:bit) }
+      assert_equal 100, @buf.read(:octet)
+    end
+
+    test 'read and write properties' do
+      properties = ([
+                    [:octet, 1],
+                    [:shortstr, 'abc'],
+                    [:bit, true],
+                    [:bit, false],
+                    [:shortstr, nil],
+                    [:timestamp, nil],
+                    [:table, { :a => 'hash' }],
+      ]*5).sort_by{rand}
+
+      @buf.write(:properties, properties)
+      @buf.rewind
+      assert_equal properties.map{|_,value| value }, @buf.read(:properties, *properties.map{|type,_| type })
+      assert_equal true, @buf.empty?
+    end
+
+    test 'do transactional reads with #extract' do
+      @buf.write :octet, 8
+      orig = @buf.to_s
+
+      @buf.rewind
+      @buf.extract do |b|
+        b.read :octet
+        b.read :short
+      end
+
+      assert_equal 0, @buf.pos
+      assert_equal orig, @buf.data
+    end
+  end
+end

data/test/carrot_test.rb

@@ -1,25 +1,23 @@
 require 'test_helper'
 
-class CarrotTest < Test::Unit::TestCase
+context 'test queue' do
   TEST_QUEUE = '_carrot_test'
-
-  test "simple server connection" do
-    c = Carrot.new
+  setup do
+    @carrot = Carrot.new
+    @q      = @carrot.queue(TEST_QUEUE)
+    @q.purge
   end
 
   test "large messages" do
     msg = 'a' * 1024 * 1024
-    q = Carrot.queue(TEST_QUEUE)
-    q.publish(msg)
-    assert_equal msg, q.pop
+    @q.publish(msg)
+    assert_equal msg, @q.pop
   end
 
   test "reset" do
-    c = Carrot.new
-    q = c.queue(TEST_QUEUE)
-    count = q.message_count
-    q.publish('test')
-    c.reset
-    assert_equal count + 1, q.message_count
+    count = @q.message_count
+    @q.publish('test')
+    @carrot.reset
+    assert_equal count + 1, @q.message_count
   end
 end

data/test/frame_test.rb

@@ -0,0 +1,56 @@
+require 'test_helper'
+
+module Carrot::AMQP 
+  context 'Frame' do
+    test 'handle basic frame types' do
+      assert_equal 1, Frame::Method.new.id
+      assert_equal 2, Frame::Header.new.id
+      assert_equal 3, Frame::Body.new.id
+    end
+
+    test 'convert method frames to binary' do
+      meth = Protocol::Connection::Secure.new :challenge => 'secret'
+
+      frame = Frame::Method.new(meth)
+      assert frame.to_binary.kind_of?(Buffer)
+      assert_equal [ 1, 0, meth.to_s.length, meth.to_s, 206 ].pack('CnNa*C'), frame.to_s
+    end
+
+    test 'convert binary to method frames' do
+      orig = Frame::Method.new Protocol::Connection::Secure.new(:challenge => 'secret')
+
+      copy = Frame.parse(orig.to_binary)
+      assert_equal orig, copy
+    end
+
+    test 'ignore partial frames until ready' do
+      frame = Frame::Method.new Protocol::Connection::Secure.new(:challenge => 'secret')
+      data = frame.to_s
+
+      buf = Buffer.new
+      assert_equal nil, Frame.parse(buf)
+      
+      buf << data[0..5]
+      assert_equal nil, Frame.parse(buf)
+      
+      buf << data[6..-1]
+      assert_equal frame, Frame.parse(buf)
+      
+      assert_equal nil, Frame.parse(buf)
+    end
+
+    test 'convert header frames to binary' do
+      head = Protocol::Header.new(Protocol::Basic, :priority => 1)
+      
+      frame = Frame::Header.new(head)
+      assert_equal [ 2, 0, head.to_s.length, head.to_s, 206 ].pack('CnNa*C'), frame.to_s
+    end
+
+    test 'convert binary to header frame' do
+      orig = Frame::Header.new Protocol::Header.new(Protocol::Basic, :priority => 1)
+      
+      copy = Frame.parse(orig.to_binary)
+      assert_equal orig, copy
+    end
+  end
+end

data/test/protocol_test.rb

@@ -0,0 +1,52 @@
+require 'test_helper'
+
+module Carrot::AMQP 
+  context 'Protocol' do
+    test 'instantiate methods with arguments' do
+      meth = Protocol::Connection::StartOk.new(nil, 'PLAIN', nil, 'en_US')
+      assert_equal 'en_US', meth.locale
+    end
+
+    test 'instantiate methods with named parameters' do
+      meth = Protocol::Connection::StartOk.new(:locale => 'en_US', :mechanism => 'PLAIN')
+      assert_equal 'en_US', meth.locale
+    end
+
+    test 'convert methods to binary' do
+      meth = Protocol::Connection::Secure.new(:challenge => 'secret')
+      assert meth.to_binary.kind_of?(Buffer)
+
+      assert_equal  [ 10, 20, 6, 'secret' ].pack('nnNa*'), meth.to_s
+    end
+
+    test 'convert binary to method' do
+      orig = Protocol::Connection::Secure.new(:challenge => 'secret')
+      copy = Protocol.parse orig.to_binary
+      assert_equal copy, orig
+    end
+
+    test 'convert headers to binary' do
+      head = Protocol::Header.new(
+        Protocol::Basic,
+        size = 5,
+        weight = 0,
+        :content_type  => 'text/json',
+        :delivery_mode => 1,
+        :priority      => 1
+      )
+      assert_equal [ 60, weight, 0, size, 0b1001_1000_0000_0000, 9, 'text/json', 1, 1 ].pack('nnNNnCa*CC'), head.to_s
+    end
+
+    test 'convert binary to header' do
+      orig = Protocol::Header.new(
+        Protocol::Basic,
+        size = 5,
+        weight = 0,
+        :content_type  => 'text/json',
+        :delivery_mode => 1,
+        :priority      => 1
+      )
+      assert_equal orig, Protocol::Header.new(orig.to_binary)
+    end
+  end
+end

data/test/test_helper.rb

@@ -1,18 +1,27 @@
-require 'rubygems'
+dir = File.dirname(File.expand_path(__FILE__))
+$LOAD_PATH.unshift dir + '/../lib'
+require 'carrot'
 require 'test/unit'
-#require 'shoulda'
-require 'mocha'
-require File.dirname(__FILE__) + '/../lib/carrot'
-
-class << Test::Unit::TestCase
-  def test(name, &block)
-    test_name = "test_#{name.gsub(/[\s\W]/,'_')}"
-    raise ArgumentError, "#{test_name} is already defined" if self.instance_methods.include? test_name
-    define_method test_name, &block
-  end
+require 'rubygems'
+require 'pp'
 
-  def xtest(name, &block)
-    # no-op, an empty test method is defined to prevent "no tests in testcase" errors when all tests are disabled
-    define_method(:test_disabled) { assert true }
+##
+# test/spec/mini 3
+# http://gist.github.com/25455
+# chris@ozmm.org
+# file:lib/test/spec/mini.rb
+#
+def context(*args, &block)
+  return super unless (name = args.first) && block
+  require 'test/unit'
+  klass = Class.new(defined?(ActiveSupport::TestCase) ? ActiveSupport::TestCase : Test::Unit::TestCase) do
+    def self.test(name, &block) 
+      define_method("test_#{name.gsub(/\W/,'_')}", &block) if block
+    end
+    def self.xtest(*args) end
+    def self.setup(&block) define_method(:setup, &block) end
+    def self.teardown(&block) define_method(:teardown, &block) end
   end
+  (class << klass; self end).send(:define_method, :name) { name.gsub(/\W/,'_') }
+  klass.class_eval &block
 end

metadata

@@ -1,117 +1,93 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: carrot
-version: !ruby/object:Gem::Version 
-  hash: 61
-  prerelease: false
-  segments: 
-  - 0
-  - 8
+version: !ruby/object:Gem::Version
+  version: 1.0.0
+  segments:
   - 1
-  version: 0.8.1
+  - 0
+  - 0
+  prerelease: false
 platform: ruby
-authors: 
+authors:
 - Amos Elliston
-autorequire: 
+autorequire: !!null 
 bindir: bin
 cert_chain: []
-
-date: 2010-11-01 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+date: 2011-08-03 00:00:00.000000000 -07:00
+default_executable: !!null 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mocha
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2152420380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+        segments:
         - 0
-        version: "0"
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *2152420380
 description: A synchronous version of the ruby amqp client
 email: amos@geni.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.markdown
-files: 
-- .gitignore
+files:
 - LICENSE
 - README.markdown
 - Rakefile
 - VERSION.yml
 - carrot.gemspec
-- lib/amqp/buffer.rb
-- lib/amqp/exchange.rb
-- lib/amqp/frame.rb
-- lib/amqp/header.rb
-- lib/amqp/protocol.rb
-- lib/amqp/queue.rb
-- lib/amqp/server.rb
-- lib/amqp/spec.rb
 - lib/carrot.rb
+- lib/carrot/amqp/buffer.rb
+- lib/carrot/amqp/exchange.rb
+- lib/carrot/amqp/frame.rb
+- lib/carrot/amqp/header.rb
+- lib/carrot/amqp/protocol.rb
+- lib/carrot/amqp/queue.rb
+- lib/carrot/amqp/server.rb
+- lib/carrot/amqp/spec.rb
 - lib/examples/simple_pop.rb
 - protocol/amqp-0.8.json
 - protocol/amqp-0.8.xml
 - protocol/codegen.rb
 - protocol/doc.txt
+- test/buffer_test.rb
 - test/carrot_test.rb
+- test/frame_test.rb
+- test/protocol_test.rb
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/famoseagle/carrot
 licenses: []
-
-post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+post_install_message: !!null 
+rdoc_options: []
+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: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
 requirements: []
-
-rubyforge_project: 
+rubyforge_project: !!null 
 rubygems_version: 1.3.7
-signing_key: 
+signing_key: !!null 
 specification_version: 3
 summary: A synchronous version of the ruby amqp client
-test_files: 
-- test/carrot_test.rb
-- test/test_helper.rb
+test_files: []

data/.gitignore

@@ -1,3 +0,0 @@
-*.sw?
-.DS_Store
-coverage

data/lib/amqp/frame.rb

@@ -1,121 +0,0 @@
-module Carrot::AMQP
-  class Frame #:nodoc: all
-    def initialize payload = nil, channel = 0
-      @channel, @payload = channel, payload
-    end
-    attr_accessor :channel, :payload
-
-    def id
-      self.class::ID
-    end
-    
-    def to_binary
-      buf = Buffer.new
-      buf.write :octet, id
-      buf.write :short, channel
-      buf.write :longstr, payload
-      buf.write :octet, FOOTER
-      buf.rewind
-      buf
-    end
-
-    def to_s
-      to_binary.to_s
-    end
-
-    def == frame
-      [ :id, :channel, :payload ].inject(true) do |eql, field|
-        eql and __send__(field) == frame.__send__(field)
-      end
-    end
-    
-    class Invalid < StandardError; end
-    
-    class Method
-      def initialize payload = nil, channel = 0
-        super
-        unless @payload.is_a? Protocol::Class::Method or @payload.nil?
-          @payload = Protocol.parse(@payload)
-        end
-      end
-    end
-
-    class Header
-      def initialize payload = nil, channel = 0
-        super
-        unless @payload.is_a? Protocol::Header or @payload.nil?
-          @payload = Protocol::Header.new(@payload)
-        end
-      end
-    end
-
-    class Body; end
-
-    def self.parse(buf)
-      buf = Buffer.new(buf) unless buf.is_a? Buffer
-      buf.extract do
-        id, channel, payload, footer = buf.read(:octet, :short, :longstr, :octet)
-        Frame.types[id].new(payload, channel) if footer == FOOTER
-      end
-    end
-  end
-end
-
-if $0 =~ /bacon/ or $0 == __FILE__
-  require 'rubygems'
-  require 'bacon'
-  include AMQP
-
-  describe Frame do
-    should 'handle basic frame types' do
-      Frame::Method.new.id.should == 1
-      Frame::Header.new.id.should == 2
-      Frame::Body.new.id.should == 3
-    end
-
-    should 'convert method frames to binary' do
-      meth = Protocol::Connection::Secure.new :challenge => 'secret'
-
-      frame = Frame::Method.new(meth)
-      frame.to_binary.should.be.kind_of? Buffer
-      frame.to_s.should == [ 1, 0, meth.to_s.length, meth.to_s, 206 ].pack('CnNa*C')
-    end
-
-    should 'convert binary to method frames' do
-      orig = Frame::Method.new Protocol::Connection::Secure.new(:challenge => 'secret')
-
-      copy = Frame.parse(orig.to_binary)
-      copy.should == orig
-    end
-
-    should 'ignore partial frames until ready' do
-      frame = Frame::Method.new Protocol::Connection::Secure.new(:challenge => 'secret')
-      data = frame.to_s
-
-      buf = Buffer.new
-      Frame.parse(buf).should == nil
-      
-      buf << data[0..5]
-      Frame.parse(buf).should == nil
-      
-      buf << data[6..-1]
-      Frame.parse(buf).should == frame
-      
-      Frame.parse(buf).should == nil
-    end
-
-    should 'convert header frames to binary' do
-      head = Protocol::Header.new(Protocol::Basic, :priority => 1)
-      
-      frame = Frame::Header.new(head)
-      frame.to_s.should == [ 2, 0, head.to_s.length, head.to_s, 206 ].pack('CnNa*C')
-    end
-
-    should 'convert binary to header frame' do
-      orig = Frame::Header.new Protocol::Header.new(Protocol::Basic, :priority => 1)
-      
-      copy = Frame.parse(orig.to_binary)
-      copy.should == orig
-    end
-  end
-end