amqp_logging 0.3.0 → 0.4.0

data/{README.rdoc → Readme.rdoc}

@@ -15,6 +15,10 @@ You can change the configuration when creating the logger object by specifying a
 
 	logger = AMQPLogging::Logger.new(config.log_path, logging_config)
 	config.logger = logger
+	
+With Rails 3 you will need to modify this a bit, as config.log_path no longer has the desired effect:
+
+	config.logger = AMQPLogging::Logger.new(config.paths.log.to_a.first, logging_config)
 
 ==Routing Keys
 

data/lib/amqp_logging.rb

@@ -1,5 +1,10 @@
 require 'bunny'
-require 'active_support'
+
+begin
+  require 'active_support/time' # ActiveSupport 3.x
+rescue LoadError
+  require 'active_support'      # ActiveSupport 2.x
+end
 
 module AMQPLogging
 
@@ -42,6 +47,7 @@ module AMQPLogging
           exchange.publish(msg, :key => routing_key)
         end
       rescue Exception => exception
+        reraise_expectation_errors!
         pause_amqp_logging(exception)
       ensure
         @fallback_logdev.write(msg)
@@ -75,10 +81,19 @@ module AMQPLogging
       end
 
       def bunny
-        @bunny ||= Bunny.new(:host => @configuration[:host])
+        @bunny ||= Bunny.new(:host => configuration[:host])
         @bunny
       end
-  end
 
+      if defined?(Mocha)
+        def reraise_expectation_errors! #:nodoc:
+          raise if $!.is_a?(Mocha::ExpectationError)
+        end
+      else
+        def reraise_expectation_errors! #:nodoc:
+          # noop
+        end
+      end
+  end
 end
 

data/test/amqp_logger_test.rb

@@ -73,23 +73,24 @@ class TheLogDeviceTest < Test::Unit::TestCase
     config = { :queue => "testqueue", :exchange => "testexchange", :host => "testhost", :shift_age => 4, :shift_size => 1338 }
     bunny_stub = stub_everything("bunny_stub")
     Bunny.expects(:new).with(:host => "testhost").returns(bunny_stub)
-    bunny_stub.expects(:exchange).with(config[:exchange], :type => :topic).returns(stub("exchange stub"))
+    bunny_stub.expects(:exchange).with(config[:exchange], :type => :topic).returns(stub("exchange stub", :publish => true))
 
     logger = AMQPLogging::Logger.new(StringIO.new, config)
     logger.debug("foobar")
   end
 
   test "should publish the messages with the default routing key" do
+    message = "some stuff to log"
     exchange = mock()
-    exchange.expects(:publish).with("msg\n", :key => "a_routing_key")
+    exchange.expects(:publish).with(anything, :key => "a_routing_key")
     AMQPLogging::AMQPLogDevice.any_instance.stubs(:exchange).returns(exchange)
-    AMQPLogging::Logger.new(StringIO.new, {:routing_key => "a_routing_key"}).debug("msg")
+    AMQPLogging::Logger.new(StringIO.new, {:routing_key => "a_routing_key"}).debug(message)
   end
 
-  test "should take a proc argument to generate the routing key" do
-    key_generator = lambda {|msg| msg == "a message\n" }
+  test "should take a proc argument which gets the logline passed to generate the routing key" do
+    key_generator = lambda {|msg| !!(msg =~ /a message/) }
     exchange = mock()
-    exchange.expects(:publish).with("a message\n", :key => "true")
+    exchange.expects(:publish).with(anything, :key => "true")
     AMQPLogging::AMQPLogDevice.any_instance.stubs(:exchange).returns(exchange)
     AMQPLogging::Logger.new(StringIO.new, {:routing_key => key_generator}).debug("a message")
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amqp_logging
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Pascal Friederich
@@ -72,14 +72,14 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
+- Readme.rdoc
 files: 
 - lib/amqp_logging.rb
-- README.rdoc
+- Readme.rdoc
 - test/amqp_logger_test.rb
 - test/test_helper.rb
 has_rdoc: true
-homepage: http://github.com/paukul/amqp-logging
+homepage: http://github.com/paukul/amqp_logging
 licenses: []
 
 post_install_message: