amqp 0.7.0.pre → 0.7.0

data/lib/amqp/frame.rb

@@ -1,10 +1,12 @@
+# encoding: utf-8
+
 require File.expand_path('../spec', __FILE__)
 require File.expand_path('../buffer', __FILE__)
 require File.expand_path('../protocol', __FILE__)
 
 module AMQP
   class Frame #:nodoc: all
-    def initialize payload = nil, channel = 0
+    def initialize(payload = nil, channel = 0)
       @channel, @payload = channel, payload
     end
     attr_accessor :channel, :payload
@@ -12,7 +14,7 @@ module AMQP
     def id
       self.class::ID
     end
-    
+
     def to_binary
       buf = Buffer.new
       buf.write :octet, id
@@ -32,11 +34,11 @@ module AMQP
         eql and __send__(field) == frame.__send__(field)
       end
     end
-    
+
     class Invalid < StandardError; end
-    
+
     class Method
-      def initialize payload = nil, channel = 0
+      def initialize(payload = nil, channel = 0)
         super
         unless @payload.is_a? Protocol::Class::Method or @payload.nil?
           @payload = Protocol.parse(@payload)
@@ -45,7 +47,7 @@ module AMQP
     end
 
     class Header
-      def initialize payload = nil, channel = 0
+      def initialize(payload = nil, channel = 0)
         super
         unless @payload.is_a? Protocol::Header or @payload.nil?
           @payload = Protocol::Header.new(@payload)
@@ -64,61 +66,3 @@ module AMQP
     end
   end
 end
-
-if $0 =~ /bacon/ or $0 == __FILE__
-  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

data/lib/amqp/protocol.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.expand_path('../spec', __FILE__)
 require File.expand_path('../buffer', __FILE__)
 
@@ -5,12 +7,12 @@ module AMQP
   module Protocol
     #:stopdoc:
     class Class::Method
-      def initialize *args
+      def initialize(*args)
         opts = args.pop if args.last.is_a? Hash
         opts ||= {}
-        
+
         @debug = 1 # XXX hack, p(obj) == '' if no instance vars are set
-        
+
         if args.size == 1 and args.first.is_a? Buffer
           buf = args.shift
         else
@@ -55,19 +57,19 @@ module AMQP
 
         buf
       end
-      
+
       def to_s
         to_binary.to_s
       end
-      
-      def to_frame channel = 0
+
+      def to_frame(channel = 0)
         Frame::Method.new(self, channel)
       end
     end
 
     #:startdoc:
     #
-    # Contains a properties hash that holds some potentially interesting 
+    # Contains a properties hash that holds some potentially interesting
     # information.
     # * :delivery_mode
     # 1 equals transient.
@@ -89,12 +91,12 @@ module AMQP
     # A monotonically increasing integer. This number should not be trusted
     # as a sequence number. There is no guarantee it won't get reset.
     class Header
-      def initialize *args
+      def initialize(*args)
         opts = args.pop if args.last.is_a? Hash
         opts ||= {}
-        
+
         first = args.shift
-        
+
         if first.is_a? ::Class and first.ancestors.include? Protocol::Class
           @klass = first
           @size = args.shift || 0
@@ -104,21 +106,21 @@ module AMQP
         elsif first.is_a? Buffer or first.is_a? String
           buf = first
           buf = Buffer.new(buf) unless buf.is_a? Buffer
-          
+
           @klass = Protocol.classes[buf.read(:short)]
           @weight = buf.read(:short)
           @size = buf.read(:longlong)
 
-          props = buf.read(:properties, *klass.properties.map{|type,_| type })
-          @properties = Hash[*klass.properties.map{|_,name| name }.zip(props).reject{|k,v| v.nil? }.flatten]
+          props = buf.read(:properties, *klass.properties.map { |type, _| type })
+          @properties = Hash[*klass.properties.map { |_, name| name }.zip(props).reject { |k, v| v.nil? }.flatten]
 
         else
           raise ArgumentError, 'Invalid argument'
         end
-        
+
       end
       attr_accessor :klass, :size, :weight, :properties
-      
+
       def to_binary
         buf = Buffer.new
         buf.write :short, klass.id
@@ -130,12 +132,12 @@ module AMQP
         buf.rewind
         buf
       end
-      
+
       def to_s
         to_binary.to_s
       end
 
-      def to_frame channel = 0
+      def to_frame(channel = 0)
         Frame::Header.new(self, channel)
       end
 
@@ -145,8 +147,8 @@ module AMQP
         end
       end
 
-      def method_missing meth, *args, &blk
-        @properties.has_key?(meth) || @klass.properties.find{|_,name| name == meth } ? @properties[meth] :
+      def method_missing(meth, *args, &blk)
+        @properties.has_key?(meth) || @klass.properties.find { |_, name| name == meth } ? @properties[meth] :
                                                                                        super
       end
     end
@@ -159,54 +161,3 @@ module 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/server.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.expand_path('../frame', __FILE__)
 
 module AMQP
@@ -8,17 +10,17 @@ module AMQP
       @started = false
     end
 
-    def receive_data data
+    def receive_data(data)
       @buf << data
 
       unless @started
         if @buf.size >= 8
-          if @buf.slice!(0,8) == "AMQP\001\001\b\000"
+          if @buf.slice!(0, 8) == "AMQP\001\001\b\000"
             send Protocol::Connection::Start.new(
               8,
               0,
               {
-                :information => 'Licensed under the Ruby license. See http://github.com/tmm1/amqp',
+                :information => 'Licensed under the Ruby license. See http://github.com/ruby-amqp/amqp',
                 :copyright => 'Copyright (c) 2008-2009 Aman Gupta',
                 :platform => 'Ruby/EventMachine',
                 :version => '0.6.1',
@@ -42,7 +44,7 @@ module AMQP
       end
     end
 
-    def process_frame frame
+    def process_frame(frame)
       channel = frame.channel
 
       case method = frame.payload
@@ -67,7 +69,7 @@ module AMQP
       end
     end
 
-    def send data, opts = {}
+    def send(data, opts = {})
       channel = opts[:channel] ||= 0
       data = data.to_frame(channel) unless data.is_a? Frame
       data.channel = channel
@@ -81,8 +83,8 @@ module AMQP
     end
 
     private
-  
-    def log *args
+
+    def log(*args)
       require 'pp'
       pp args
       puts
@@ -93,7 +95,7 @@ end
 if __FILE__ == $0
   require 'rubygems'
   require 'eventmachine'
-  EM.run{
+  EM.run {
     AMQP::Server.start
   }
-end
+end

data/lib/amqp/spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 
 #:stopdoc:
 # this file was autogenerated on Thu Jul 09 15:17:33 -0700 2009
@@ -76,7 +78,7 @@ module AMQP
             end
           ]
         end
-        
+
         def properties() @properties ||= [] end
 
         def id()   self::ID end
@@ -93,10 +95,10 @@ module AMQP
               end
             ]
           end
-          
+
           def arguments() @arguments ||= [] end
 
-          def section() Protocol.const_get(self.to_s[/Protocol::(.+?)::/,1]) end
+          def section() Protocol.const_get(self.to_s[/Protocol::(.+?)::/, 1]) end
           def id()      self::ID end
           def name()    self::NAME end
         end
@@ -107,9 +109,9 @@ module AMQP
           end
         end
       end
-    
+
       def self.methods() @methods ||= {} end
-    
+
       def self.Method(id, name)
         @_base_methods ||= {}
         @_base_methods[id] ||= ::Class.new(Method) do
@@ -142,7 +144,7 @@ module AMQP
     end
   end
 end
-  
+
 module AMQP
   module Protocol
     class Connection   < Class(  10, :connection   ); end

data/lib/amqp/version.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module AMQP
   VERSION = '0.7.0'
 end

data/lib/ext/blankslate.rb

@@ -1,7 +1,9 @@
+# encoding: utf-8
+
 unless defined?(BlankSlate)
   class BlankSlate < BasicObject; end if defined?(BasicObject)
 
   class BlankSlate #:nodoc:
     instance_methods.each { |m| undef_method m unless m =~ /^__/ }
   end
-end
+end

data/lib/ext/em.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 begin
   require 'eventmachine'
 rescue LoadError

data/lib/ext/emfork.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 EMFORK = $0 == __FILE__
 
 if EMFORK
@@ -11,21 +13,21 @@ require 'eventmachine'
 # helper to fork off EM reactors
 def EM.fork num = 1, &blk
   unless @forks
-    trap('CHLD'){
+    trap('CHLD') {
       pid = Process.wait
       p [:pid, pid, :died] if EMFORK
       block = @forks.delete(pid)
       EM.fork(1, &block)
     }
 
-    trap('EXIT'){
+    trap('EXIT') {
       p [:pid, Process.pid, :exit] if EMFORK
-      @forks.keys.each{ |pid|
+      @forks.keys.each { |pid|
         p [:pid, Process.pid, :killing, pid] if EMFORK
         Process.kill('USR1', pid)
       }
     }
-    
+
     @forks = {}
   end
 
@@ -33,9 +35,9 @@ def EM.fork num = 1, &blk
     pid = EM.fork_reactor do
       p [:pid, Process.pid, :started] if EMFORK
 
-      trap('USR1'){ EM.stop_event_loop }
-      trap('CHLD'){}
-      trap('EXIT'){}
+      trap('USR1') { EM.stop_event_loop }
+      trap('CHLD') {}
+      trap('EXIT') {}
 
       blk.call
     end
@@ -52,12 +54,12 @@ end
 if EMFORK
   p 'starting reactor'
 
-  trap('INT'){ EM.stop_event_loop }
+  trap('INT') { EM.stop_event_loop }
 
-  EM.run{
+  EM.run {
     p [:parent, Process.pid]
 
-    EM.fork(2){
+    EM.fork(2) {
       EM.add_periodic_timer(1) do
         p [:fork, Process.pid, :ping]
       end
@@ -66,4 +68,4 @@ if EMFORK
   }
 
   p 'reactor stopped'
-end
+end