amqp 0.7.0.pre → 0.7.0

data/lib/mq/rpc.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 class MQ
   # Basic RPC (remote procedure call) facility.
   #
@@ -40,7 +42,7 @@ class MQ
     # there is a valid destination. Failure to do so will just enqueue
     # marshalled messages that are never consumed.
     #
-    def initialize mq, queue, obj = nil
+    def initialize(mq, queue, obj = nil)
       @mq = mq
       @mq.rpcs[queue] ||= self
 
@@ -54,7 +56,7 @@ class MQ
                  obj
                end
 
-        @mq.queue(queue).subscribe(:ack=>true){ |info, request|
+        @mq.queue(queue).subscribe(:ack => true) { |info, request|
           method, *args = ::Marshal.load(request)
           ret = @obj.__send__(method, *args)
 
@@ -67,7 +69,7 @@ class MQ
       else
         @callbacks ||= {}
         # XXX implement and use queue(nil)
-        @queue = @mq.queue(@name = "random identifier #{::Kernel.rand(999_999_999_999)}", :auto_delete => true).subscribe{|info, msg|
+        @queue = @mq.queue(@name = "random identifier #{::Kernel.rand(999_999_999_999)}", :auto_delete => true).subscribe { |info, msg|
           if blk = @callbacks.delete(info.message_id)
             blk.call ::Marshal.load(msg)
           end
@@ -90,7 +92,7 @@ class MQ
     #    ....
     #  end
     #
-    def method_missing meth, *args, &blk
+    def method_missing(meth, *args, &blk)
       # XXX use uuids instead
       message_id = "random message id #{::Kernel.rand(999_999_999_999)}"
       @callbacks[message_id] = blk if blk

data/protocol/codegen.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'rubygems'
 require 'json'
 
@@ -40,21 +42,21 @@ puts ERB.new(%q[
         end
       end
 
-      <%- s['constants'].select{|c| (1..8).include? c['value'] }.each do |c| -%>
-      class <%= c['name'].gsub(/^FRAME-/,'').split('-').map{|w| w.downcase.capitalize}.join.ljust(9) -%> < Frame( <%= c['value'] -%> ); end
+      <%- s['constants'].select { |c| (1..8).include? c['value'] }.each do |c| -%>
+      class <%= c['name'].gsub(/^FRAME-/, '').split('-').map { |w| w.downcase.capitalize}.join.ljust(9) -%> < Frame( <%= c['value'] -%> ); end
       <%- end -%>
 
-      FOOTER = <%= frame_end = s['constants'].find{|c| c['name'] == 'FRAME-END' }['value'] %>
+      FOOTER = <%= frame_end = s['constants'].find { |c| c['name'] == 'FRAME-END' }['value'] %>
     end
 
     RESPONSES = {
-      <%- s['constants'].select{|c| c['value'] != frame_end and (200..500).include? c['value'] }.each do |c| -%>
-      <%= c['value'] %> => :<%= c['name'].tr('-', '_').gsub(/^FRAME_/,'').upcase -%>,
+      <%- s['constants'].select { |c| c['value'] != frame_end and (200..500).include? c['value'] }.each do |c| -%>
+      <%= c['value'] %> => :<%= c['name'].tr('-', '_').gsub(/^FRAME_/, '').upcase -%>,
       <%- end -%>
     }
 
     FIELDS = [
-      <%- s['domains'].select{|d| d.first == d.last }.each do |d| -%>
+      <%- s['domains'].select { |d| d.first == d.last }.each do |d| -%>
       :<%= d.first -%>,
       <%- end -%>
     ]
@@ -70,7 +72,7 @@ puts ERB.new(%q[
               end
             ]
           end
-          
+
           def properties() @properties ||= [] end
 
           def id()   self::ID end
@@ -87,10 +89,10 @@ puts ERB.new(%q[
                 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
@@ -101,9 +103,9 @@ puts ERB.new(%q[
             end
           end
         end
-      
+
         def self.methods() @methods ||= {} end
-      
+
         def self.Method(id, name)
           @_base_methods ||= {}
           @_base_methods[id] ||= ::Class.new(Method) do
@@ -136,7 +138,7 @@ puts ERB.new(%q[
       end
     end
   end
-    
+
   module AMQP
     module Protocol
       <%- s['classes'].each do |c| -%>
@@ -146,20 +148,20 @@ puts ERB.new(%q[
       <%- s['classes'].each do |c| -%>
       class <%= c['name'].capitalize %>
         <%- c['properties'].each do |p| -%>
-        <%= p['type'].ljust(10) %> :<%= p['name'].tr('-','_') %>
+        <%= p['type'].ljust(10) %> :<%= p['name'].tr('-', '_') %>
         <%- end if c['properties'] -%>
 
         <%- c['methods'].each do |m| -%>
-        class <%= m['name'].capitalize.gsub(/-(.)/){ "#{$1.upcase}"}.ljust(12) %> < Method( <%= m['id'].to_s.rjust(3) %>, :<%= m['name'].tr('- ','_').ljust(14) %> ); end
+        class <%= m['name'].capitalize.gsub(/-(.)/) { "#{$1.upcase}"}.ljust(12) %> < Method( <%= m['id'].to_s.rjust(3) %>, :<%= m['name'].tr('- ', '_').ljust(14) %> ); end
         <%- end -%>
 
         <%- c['methods'].each do |m| -%>
-        class <%= m['name'].capitalize.gsub(/-(.)/){ "#{$1.upcase}"} %>
+        class <%= m['name'].capitalize.gsub(/-(.)/) { "#{$1.upcase}"} %>
           <%- m['arguments'].each do |a| -%>
           <%- if a['domain'] -%>
-          <%= s['domains'].find{|k,v| k == a['domain']}.last.ljust(10) %> :<%= a['name'].tr('- ','_') %>
+          <%= s['domains'].find { |k, v| k == a['domain']}.last.ljust(10) %> :<%= a['name'].tr('- ', '_') %>
           <%- else -%>
-          <%= a['type'].ljust(10) %> :<%= a['name'].tr('- ','_') %>
+          <%= a['type'].ljust(10) %> :<%= a['name'].tr('- ', '_') %>
           <%- end -%>
           <%- end if m['arguments'] -%>
         end
@@ -170,4 +172,4 @@ puts ERB.new(%q[
       <%- end -%>
     end
   end
-].gsub!(/^  /,''), nil, '>-%').result(binding)
+].gsub!(/^  /, ''), nil, '>-%').result(binding)

data/research/api.rb

@@ -1,17 +1,19 @@
+# encoding: utf-8
+
 $:.unshift File.dirname(__FILE__) + '/../lib'
 require 'rubygems'
 require 'amqp'
 
 # AMQP.start do |amqp|
 #   amqp.channel!(1)
-# 
+#
 #   q = amqp.queue.declare(:queue => 'test',
 #                          :exclusive => false,
 #                          :auto_delete => true)
-# 
+#
 #   q.bind(:exchange => '',
 #          :routing_key => 'test_route')
-# 
+#
 #   amqp.basic.consume(:queue => q,
 #                      :no_local => false,
 #                      :no_ack => true) { |header, body|
@@ -23,7 +25,7 @@ AMQP.start do |amqp|
   amqp.exchange('my_exchange', :topic) do |e|
     e.publish(routing_key, data, :header => 'blah')
   end
-  
+
   amqp.queue('my_queue').subscribe do |header, body|
     p ['got', header, body]
   end
@@ -40,49 +42,11 @@ mq.topic('test').publish('some data', :key => 'stock.usd.*')
 
 # amq.queue('user1').bind(amq.topic('conversation.1'))
 
-mq.queue('abc').get{}
-mq.queue('abc').peek{}
-mq.queue('abc').subscribe{ |body|
-  
+mq.queue('abc').get {}
+mq.queue('abc').peek {}
+mq.queue('abc').subscribe { |body|
+
 }
 
 mq.queue('abc').bind(:exchange => mq.topic, :routing_key => 'abc', :nowait => true, :arguments => {})
 
-if $0 =~ /bacon/ or __FILE__ == $0
-  require 'bacon'
-
-  describe MQ do
-    before do
-      @mq = MQ.new
-    end
-
-    should 'have a channel' do
-      @mq.channel.should.be.kind_of? Fixnum
-      @mq.channel.should == 1
-    end
-
-    should 'give each thread a message queue' do
-      class MQ
-        @@cur_channel = 0
-      end
-      MQ.channel.should == 1
-      Thread.new{ MQ.channel }.value.should == 2
-      Thread.new{ MQ.channel }.value.should == 3
-    end
-
-    should 'create direct exchanges' do
-      @mq.direct.name.should == 'amq.direct'
-      @mq.direct(nil).name.should =~ /^\d+$/
-      @mq.direct('name').name.should == 'name'
-    end
-
-    should 'create fanout and topic exchanges' do
-      @mq.fanout.name.should == 'amq.fanout'
-      @mq.topic.name.should == 'amq.topic'
-    end
-
-    should 'create queues' do
-      q = @mq.queue('test')
-    end
-  end
-end

data/research/primes-forked.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 $:.unshift File.dirname(__FILE__) + '/../lib'
 require 'mq'
 
@@ -7,8 +9,8 @@ def EM.fork &blk
   raise if reactor_running?
 
   unless @forks
-    at_exit{
-      @forks.each{ |pid| Process.kill('KILL', pid) }
+    at_exit {
+      @forks.each { |pid| Process.kill('KILL', pid) }
     }
   end
 
@@ -17,7 +19,7 @@ def EM.fork &blk
   end
 end
 
-def log *args
+def log(*args)
   p args
 end
 
@@ -28,7 +30,7 @@ end
   workers = ARGV[0] ? (Integer(ARGV[0]) rescue 2) : 2
 
   workers.times do
-    EM.fork{
+    EM.fork {
       log "prime checker", Process.pid, :started
 
       class Fixnum
@@ -37,7 +39,7 @@ end
         end
       end
 
-      MQ.queue('prime checker').subscribe{ |info, num|
+      MQ.queue('prime checker').subscribe { |info, num|
         log "prime checker #{Process.pid}", :prime?, num
         if Integer(num).prime?
           MQ.queue(info.reply_to).publish(num, :reply_to => Process.pid)
@@ -48,8 +50,8 @@ end
 
 # controller
 
-  EM.run{
-    MQ.queue('prime collector').subscribe{ |info, prime|
+  EM.run {
+    MQ.queue('prime collector').subscribe { |info, prime|
       log 'prime collector', :received, prime, :from, info.reply_to
       (@primes ||= []) << Integer(prime)
       EM.stop_event_loop if prime == '499'

data/research/primes-processes.rb

@@ -1,11 +1,13 @@
+# encoding: utf-8
+
 $:.unshift File.dirname(__FILE__) + '/../lib'
 require 'mq'
 
 MAX = 500
 
-EM.run{
+EM.run {
 
-  def log *args
+  def log(*args)
     p args
   end
 
@@ -21,7 +23,7 @@ EM.run{
       end
     end
 
-    MQ.queue('prime checker').subscribe{ |info, num|
+    MQ.queue('prime checker').subscribe { |info, num|
       log "prime checker #{Process.pid}", :prime?, num
       if Integer(num).prime?
         MQ.queue(info.reply_to).publish(num, :reply_to => Process.pid)
@@ -31,7 +33,7 @@ EM.run{
 
   elsif ARGV[0] == 'controller'
 
-    MQ.queue('prime collector').subscribe{ |info, prime|
+    MQ.queue('prime collector').subscribe { |info, prime|
       log 'prime collector', :received, prime, :from, info.reply_to
       (@primes ||= []) << Integer(prime)
     }
@@ -65,71 +67,71 @@ EM.run{
 
 __END__
 
-["prime checker", :started, {:pid=>1958}]
-["prime checker", :started, {:pid=>1957}]
-["prime checker", :started, {:pid=>1956}]
-["prime checker", :prime?, "1", {:pid=>1958}]
-["prime checker", :prime?, "2", {:pid=>1957}]
-["prime collector", :received, "2", {:from_pid=>"1957"}]
-["prime checker", :prime?, "3", {:pid=>1956}]
-["prime collector", :received, "3", {:from_pid=>"1956"}]
-["prime checker", :prime?, "4", {:pid=>1958}]
-["prime checker", :prime?, "5", {:pid=>1957}]
-["prime collector", :received, "5", {:from_pid=>"1957"}]
-["prime checker", :prime?, "6", {:pid=>1956}]
-["prime checker", :prime?, "7", {:pid=>1958}]
-["prime collector", :received, "7", {:from_pid=>"1958"}]
-["prime checker", :prime?, "8", {:pid=>1957}]
-["prime checker", :prime?, "9", {:pid=>1956}]
-["prime checker", :prime?, "10", {:pid=>1958}]
-["prime checker", :prime?, "11", {:pid=>1957}]
-["prime collector", :received, "11", {:from_pid=>"1957"}]
-["prime checker", :prime?, "12", {:pid=>1956}]
-["prime checker", :prime?, "13", {:pid=>1958}]
-["prime collector", :received, "13", {:from_pid=>"1958"}]
-["prime checker", :prime?, "14", {:pid=>1957}]
-["prime checker", :prime?, "15", {:pid=>1956}]
-["prime checker", :prime?, "16", {:pid=>1958}]
-["prime checker", :prime?, "17", {:pid=>1957}]
-["prime collector", :received, "17", {:from_pid=>"1957"}]
-["prime checker", :prime?, "18", {:pid=>1956}]
-["prime checker", :prime?, "19", {:pid=>1958}]
-["prime collector", :received, "19", {:from_pid=>"1958"}]
-["prime checker", :prime?, "20", {:pid=>1957}]
-["prime checker", :prime?, "21", {:pid=>1956}]
-["prime checker", :prime?, "22", {:pid=>1958}]
-["prime checker", :prime?, "23", {:pid=>1957}]
-["prime collector", :received, "23", {:from_pid=>"1957"}]
-["prime checker", :prime?, "24", {:pid=>1956}]
-["prime checker", :prime?, "25", {:pid=>1958}]
-["prime checker", :prime?, "26", {:pid=>1957}]
-["prime checker", :prime?, "27", {:pid=>1956}]
-["prime checker", :prime?, "28", {:pid=>1958}]
-["prime checker", :prime?, "29", {:pid=>1957}]
-["prime collector", :received, "29", {:from_pid=>"1957"}]
-["prime checker", :prime?, "30", {:pid=>1956}]
-["prime checker", :prime?, "31", {:pid=>1958}]
-["prime collector", :received, "31", {:from_pid=>"1958"}]
-["prime checker", :prime?, "32", {:pid=>1957}]
-["prime checker", :prime?, "33", {:pid=>1956}]
-["prime checker", :prime?, "34", {:pid=>1958}]
-["prime checker", :prime?, "35", {:pid=>1957}]
-["prime checker", :prime?, "36", {:pid=>1956}]
-["prime checker", :prime?, "37", {:pid=>1958}]
-["prime collector", :received, "37", {:from_pid=>"1958"}]
-["prime checker", :prime?, "38", {:pid=>1957}]
-["prime checker", :prime?, "39", {:pid=>1956}]
-["prime checker", :prime?, "40", {:pid=>1958}]
-["prime checker", :prime?, "41", {:pid=>1957}]
-["prime collector", :received, "41", {:from_pid=>"1957"}]
-["prime checker", :prime?, "42", {:pid=>1956}]
-["prime checker", :prime?, "43", {:pid=>1958}]
-["prime collector", :received, "43", {:from_pid=>"1958"}]
-["prime checker", :prime?, "44", {:pid=>1957}]
-["prime checker", :prime?, "45", {:pid=>1956}]
-["prime checker", :prime?, "46", {:pid=>1958}]
-["prime checker", :prime?, "47", {:pid=>1957}]
-["prime collector", :received, "47", {:from_pid=>"1957"}]
-["prime checker", :prime?, "48", {:pid=>1956}]
-["prime checker", :prime?, "49", {:pid=>1958}]
-["prime checker", :prime?, "50", {:pid=>1957}]
+["prime checker", :started, {:pid => 1958}]
+["prime checker", :started, {:pid => 1957}]
+["prime checker", :started, {:pid => 1956}]
+["prime checker", :prime?, "1", {:pid => 1958}]
+["prime checker", :prime?, "2", {:pid => 1957}]
+["prime collector", :received, "2", {:from_pid => "1957"}]
+["prime checker", :prime?, "3", {:pid => 1956}]
+["prime collector", :received, "3", {:from_pid => "1956"}]
+["prime checker", :prime?, "4", {:pid => 1958}]
+["prime checker", :prime?, "5", {:pid => 1957}]
+["prime collector", :received, "5", {:from_pid => "1957"}]
+["prime checker", :prime?, "6", {:pid => 1956}]
+["prime checker", :prime?, "7", {:pid => 1958}]
+["prime collector", :received, "7", {:from_pid => "1958"}]
+["prime checker", :prime?, "8", {:pid => 1957}]
+["prime checker", :prime?, "9", {:pid => 1956}]
+["prime checker", :prime?, "10", {:pid => 1958}]
+["prime checker", :prime?, "11", {:pid => 1957}]
+["prime collector", :received, "11", {:from_pid => "1957"}]
+["prime checker", :prime?, "12", {:pid => 1956}]
+["prime checker", :prime?, "13", {:pid => 1958}]
+["prime collector", :received, "13", {:from_pid => "1958"}]
+["prime checker", :prime?, "14", {:pid => 1957}]
+["prime checker", :prime?, "15", {:pid => 1956}]
+["prime checker", :prime?, "16", {:pid => 1958}]
+["prime checker", :prime?, "17", {:pid => 1957}]
+["prime collector", :received, "17", {:from_pid => "1957"}]
+["prime checker", :prime?, "18", {:pid => 1956}]
+["prime checker", :prime?, "19", {:pid => 1958}]
+["prime collector", :received, "19", {:from_pid => "1958"}]
+["prime checker", :prime?, "20", {:pid => 1957}]
+["prime checker", :prime?, "21", {:pid => 1956}]
+["prime checker", :prime?, "22", {:pid => 1958}]
+["prime checker", :prime?, "23", {:pid => 1957}]
+["prime collector", :received, "23", {:from_pid => "1957"}]
+["prime checker", :prime?, "24", {:pid => 1956}]
+["prime checker", :prime?, "25", {:pid => 1958}]
+["prime checker", :prime?, "26", {:pid => 1957}]
+["prime checker", :prime?, "27", {:pid => 1956}]
+["prime checker", :prime?, "28", {:pid => 1958}]
+["prime checker", :prime?, "29", {:pid => 1957}]
+["prime collector", :received, "29", {:from_pid => "1957"}]
+["prime checker", :prime?, "30", {:pid => 1956}]
+["prime checker", :prime?, "31", {:pid => 1958}]
+["prime collector", :received, "31", {:from_pid => "1958"}]
+["prime checker", :prime?, "32", {:pid => 1957}]
+["prime checker", :prime?, "33", {:pid => 1956}]
+["prime checker", :prime?, "34", {:pid => 1958}]
+["prime checker", :prime?, "35", {:pid => 1957}]
+["prime checker", :prime?, "36", {:pid => 1956}]
+["prime checker", :prime?, "37", {:pid => 1958}]
+["prime collector", :received, "37", {:from_pid => "1958"}]
+["prime checker", :prime?, "38", {:pid => 1957}]
+["prime checker", :prime?, "39", {:pid => 1956}]
+["prime checker", :prime?, "40", {:pid => 1958}]
+["prime checker", :prime?, "41", {:pid => 1957}]
+["prime collector", :received, "41", {:from_pid => "1957"}]
+["prime checker", :prime?, "42", {:pid => 1956}]
+["prime checker", :prime?, "43", {:pid => 1958}]
+["prime collector", :received, "43", {:from_pid => "1958"}]
+["prime checker", :prime?, "44", {:pid => 1957}]
+["prime checker", :prime?, "45", {:pid => 1956}]
+["prime checker", :prime?, "46", {:pid => 1958}]
+["prime checker", :prime?, "47", {:pid => 1957}]
+["prime collector", :received, "47", {:from_pid => "1957"}]
+["prime checker", :prime?, "48", {:pid => 1956}]
+["prime checker", :prime?, "49", {:pid => 1958}]
+["prime checker", :prime?, "50", {:pid => 1957}]