beetle 0.3.0.rc.10 → 0.3.0.rc.13

data/beetle.gemspec

@@ -35,16 +35,16 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("uuid4r",                  [">= 0.1.2"])
   s.add_runtime_dependency("bunny",                   ["= 0.7.8"])
   s.add_runtime_dependency("redis",                   ["= 2.2.2"])
-  s.add_runtime_dependency("hiredis",                 ["= 0.3.2"])
-  s.add_runtime_dependency("amq-client",              ["= 0.8.5"])
-  s.add_runtime_dependency("amq-protocol",            ["= 0.8.3"])
-  s.add_runtime_dependency("amqp",                    ["= 0.8.2"])
+  s.add_runtime_dependency("hiredis",                 ["= 0.4.4"])
+  s.add_runtime_dependency("amq-client",              ["= 0.9.1"])
+  s.add_runtime_dependency("amq-protocol",            ["= 0.9.0"])
+  s.add_runtime_dependency("amqp",                    ["= 0.9.2"])
   s.add_runtime_dependency("activesupport",           [">= 2.3.4"])
   s.add_runtime_dependency("eventmachine_httpserver", [">= 0.2.1"])
   s.add_runtime_dependency("daemons",                 [">= 1.0.10"])
   s.add_development_dependency("rake",                [">= 0.8.7"])
   s.add_development_dependency("mocha",               [">= 0"])
-  s.add_development_dependency("rcov",                [">= 0"])
+  s.add_development_dependency("rcov",                ["~> 0.9.10"])
   s.add_development_dependency("cucumber",            [">= 0.7.2"])
   s.add_development_dependency("daemon_controller",   [">= 0"])
 end

data/examples/simple.rb

@@ -15,7 +15,7 @@ Beetle.config.logger.level = Logger::INFO
 
 # setup client
 client = Beetle::Client.new
-client.register_queue(:test)
+client.register_queue(:test, :arguments => {"x-message-ttl" => 60 * 1000})
 client.register_message(:test)
 
 # purge the test queue

data/lib/beetle/client.rb

@@ -149,9 +149,10 @@ module Beetle
 
     # this is a convenience method to configure exchanges, queues, messages and handlers
     # with a common set of options. allows one to call all register methods without the
-    # register_ prefix. returns self.
+    # register_ prefix. returns self. if the passed in block has no parameters, the block
+    # will be evaluated in the context of the client configurator.
     #
-    # Example:
+    # Example: (block with config argument)
     #  client = Beetle.client.new.configure :exchange => :foobar do |config|
     #    config.queue :q1, :key => "foo"
     #    config.queue :q2, :key => "bar"
@@ -160,8 +161,24 @@ module Beetle
     #    config.handler :q1 { puts "got foo"}
     #    config.handler :q2 { puts "got bar"}
     #  end
-    def configure(options={}) #:yields: config
-      yield Configurator.new(self, options)
+    #
+    # Example: (block without config argument)
+    #  client = Beetle.client.new.configure :exchange => :foobar do
+    #    queue :q1, :key => "foo"
+    #    queue :q2, :key => "bar"
+    #    message :foo
+    #    message :bar
+    #    handler :q1 { puts "got foo"}
+    #    handler :q2 { puts "got bar"}
+    #  end
+    #
+    def configure(options={}, &block)
+      configurator = Configurator.new(self, options)
+      if block.arity == 1
+        yield configurator
+      else
+        configurator.instance_eval &block
+      end
       self
     end
 
@@ -223,18 +240,22 @@ module Beetle
     end
 
     # traces queues without consuming them. useful for debugging message flow.
-    def trace(queue_names=self.queues.keys, &block)
+    def trace(queue_names=self.queues.keys, tracer=nil, &block)
       queues_to_trace = self.queues.slice(*queue_names)
       queues_to_trace.each do |name, opts|
         opts.merge! :durable => false, :auto_delete => true, :amqp_name => queue_name_for_tracing(opts[:amqp_name])
       end
-      register_handler(queue_names) do |msg|
-        puts "-----===== new message =====-----"
-        puts "SERVER: #{msg.server}"
-        puts "HEADER: #{msg.header.inspect}"
-        puts "MSGID: #{msg.msg_id}"
-        puts "DATA: #{msg.data}"
-      end
+      tracer ||=
+        lambda do |msg|
+          puts "-----===== new message =====-----"
+          puts "SERVER: #{msg.server}"
+          puts "HEADER: #{msg.header.attributes[:headers].inspect}"
+          puts "EXCHANGE: #{msg.header.method.exchange}"
+          puts "KEY: #{msg.header.method.routing_key}"
+          puts "MSGID: #{msg.msg_id}"
+          puts "DATA: #{msg.data}"
+        end
+      register_handler(queue_names){|msg| tracer.call msg }
       listen_queues(queue_names, &block)
     end
 

data/lib/beetle/handler.rb

@@ -83,7 +83,7 @@ module Beetle
     # called when handler execution raised an exception and no error callback was
     # specified when the handler instance was created
     def error(exception)
-      logger.error "Beetle: handler execution raised an exception: #{exception}"
+      logger.error "Beetle: handler execution raised an exception: #{exception.class}(#{exception.message})"
     end
 
     # called when message processing has finally failed (i.e., the number of allowed

data/lib/beetle/version.rb

@@ -1,3 +1,3 @@
 module Beetle
-  VERSION = "0.3.0.rc.10"
+  VERSION = "0.3.0.rc.13"
 end

data/lib/beetle.rb

@@ -40,7 +40,7 @@ module Beetle
   # AMQP options for exchange creation
   EXCHANGE_CREATION_KEYS  = [:auto_delete, :durable, :internal, :nowait, :passive]
   # AMQP options for queue creation
-  QUEUE_CREATION_KEYS     = [:passive, :durable, :exclusive, :auto_delete, :no_wait]
+  QUEUE_CREATION_KEYS     = [:passive, :durable, :exclusive, :auto_delete, :no_wait, :arguments]
   # AMQP options for queue bindings
   QUEUE_BINDING_KEYS      = [:key, :no_wait]
   # AMQP options for message publishing

data/test/beetle/client_test.rb

@@ -151,6 +151,16 @@ module Beetle
       @client.configure(options) {|config| assert_equal 42, config}
     end
 
+    test "configure should eval a passed block without arguments in the context of the configurator" do
+      options = {:exchange => :foobar}
+      m = "mock"
+      m.expects(:foo).returns(42)
+      Client::Configurator.expects(:new).with(@client, options).returns(m)
+      value = nil
+      @client.configure(options) { value = foo }
+      assert_equal 42, value
+    end
+
     test "a configurator should forward all known registration methods to the client" do
       options = {:foo => :bar}
       config = Client::Configurator.new(@client, options)
@@ -353,7 +363,7 @@ module Beetle
       client = Client.new
       client.register_queue("test")
       sub = client.send(:subscriber)
-      sub.expects(:register_handler).with(client.queues.keys, {}, nil).yields(stub_everything("message"))
+      sub.expects(:register_handler).with(client.queues.keys, {}, nil).yields(message_stub_for_tracing)
       sub.expects(:listen_queues)
       client.stubs(:puts)
       client.trace
@@ -369,11 +379,19 @@ module Beetle
       client.register_queue("test")
       client.register_queue("irrelevant")
       sub = client.send(:subscriber)
-      sub.expects(:register_handler).with(["test"], {}, nil).yields(stub_everything("message"))
+      sub.expects(:register_handler).with(["test"], {}, nil).yields(message_stub_for_tracing)
       sub.expects(:listen_queues).with(["test"])
       client.stubs(:puts)
       client.trace(["test"])
     end
 
+    def message_stub_for_tracing
+      header_stub = stub_everything("header")
+      header_stub.stubs(:method).returns(stub_everything("method"))
+      header_stub.stubs(:attributes).returns(stub_everything("attributes"))
+      msg_stub = stub_everything("message")
+      msg_stub.stubs(:header).returns(header_stub)
+      msg_stub
+    end
   end
 end

data/test/beetle/handler_test.rb

@@ -80,7 +80,7 @@ module Beetle
     test "default implementation of error and process and failure and completed should not crash" do
       handler = Handler.create(lambda {})
       handler.process
-      handler.error('barfoo')
+      handler.error(StandardError.new('barfoo'))
       handler.failure('razzmatazz')
       handler.completed
     end

data/test/beetle/publisher_test.rb

@@ -224,12 +224,12 @@ module Beetle
     end
 
     test "binding a queue should create it using the config and bind it to the exchange with the name specified" do
-      @client.register_queue("some_queue", :exchange => "some_exchange", :key => "haha.#")
+      @client.register_queue("some_queue", :exchange => "some_exchange", :key => "haha.#", :arguments => {"foo" => "fighter"})
       @pub.expects(:exchange).with("some_exchange").returns(:the_exchange)
       q = mock("queue")
       q.expects(:bind).with(:the_exchange, {:key => "haha.#"})
       m = mock("Bunny")
-      m.expects(:queue).with("some_queue", :durable => true, :passive => false, :auto_delete => false, :exclusive => false).returns(q)
+      m.expects(:queue).with("some_queue", :durable => true, :passive => false, :auto_delete => false, :exclusive => false, :arguments => {"foo" => "fighter"}).returns(q)
       @pub.expects(:bunny).returns(m)
 
       @pub.send(:queue, "some_queue")

data/test/beetle/subscriber_test.rb

@@ -128,12 +128,12 @@ module Beetle
     end
 
     test "binding a queue should create it using the config and bind it to the exchange with the name specified" do
-      @client.register_queue("some_queue", "durable" => true, "exchange" => "some_exchange", "key" => "haha.#")
+      @client.register_queue("some_queue", "durable" => true, "exchange" => "some_exchange", "key" => "haha.#", "arguments" => {"schmu" => 5})
       @sub.expects(:exchange).with("some_exchange").returns(:the_exchange)
       q = mock("queue")
       q.expects(:bind).with(:the_exchange, {:key => "haha.#"})
       m = mock("MQ")
-      m.expects(:queue).with("some_queue", :durable => true, :passive => false, :auto_delete => false, :exclusive => false).returns(q)
+      m.expects(:queue).with("some_queue", :durable => true, :passive => false, :auto_delete => false, :exclusive => false, :arguments => {"schmu" => 5}).returns(q)
       @sub.expects(:channel).returns(m)
 
       @sub.send(:queue, "some_queue")

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: beetle
 version: !ruby/object:Gem::Version 
-  hash: 15424049
-  prerelease: 6
+  hash: 3659109081
+  prerelease: true
   segments: 
   - 0
   - 3
   - 0
   - rc
-  - 10
-  version: 0.3.0.rc.10
+  - 13
+  version: 0.3.0.rc.13
 platform: ruby
 authors: 
 - Stefan Kaes
@@ -21,7 +21,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-31 00:00:00 +01:00
+date: 2012-03-06 00:00:00 +01:00
 default_executable: beetle
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,12 +80,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 7
         segments: 
         - 0
-        - 3
-        - 2
-        version: 0.3.2
+        - 4
+        - 4
+        version: 0.4.4
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -96,12 +96,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 53
+        hash: 57
         segments: 
         - 0
-        - 8
-        - 5
-        version: 0.8.5
+        - 9
+        - 1
+        version: 0.9.1
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -112,12 +112,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 57
+        hash: 59
         segments: 
         - 0
-        - 8
-        - 3
-        version: 0.8.3
+        - 9
+        - 0
+        version: 0.9.0
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -128,12 +128,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 59
+        hash: 63
         segments: 
         - 0
-        - 8
+        - 9
         - 2
-        version: 0.8.2
+        version: 0.9.2
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -220,12 +220,14 @@ dependencies:
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 47
         segments: 
         - 0
-        version: "0"
+        - 9
+        - 10
+        version: 0.9.10
   type: :development
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
@@ -373,7 +375,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: High Availability AMQP Messaging with Redundant Queues