lapine 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccc8f9935974ce4c4981bc4d43da3f08cdf2c8b2
-  data.tar.gz: a296e0395e2c43aaf6369a47c921176c2862442e
+  metadata.gz: 6ee36980b342bf290005bfe32c3645b60637fd29
+  data.tar.gz: 4c45b563a43f1ba82017801c257304779bc87a10
 SHA512:
-  metadata.gz: f2992302c858ec6589bc6b5147cd85b332bb6eb83a4ba9ee7df10be251711fbb7bc9e9d4e6d292b33b3a97bc6c7123054553ee3866adbc33de6c17d71f602c39
-  data.tar.gz: 61271187c14a82e828f3031c0063d8f0ecd237ac1d7dff4cb1ed5ba223dff3d9713fe3cc0c4b66ec1c8e421b6c3aba434af3afd255d5bbac3d54d3a61002f163
+  metadata.gz: d6b9b11710eef507aff965297bd94d35fbbaec1ea61d6c49068762c47c362d901b2fdca982217510acc6dcff18ddd140ea1a156f05fe77d7dc2cfdd6d472ae92
+  data.tar.gz: 77230701216a54be3410548a282c67e1aa05a33a085001aef88f9d98fb8df26dfd1a24ec505e1b9072be27fa39c096fe1d8195df865a7963097cba2f9d4a00be

data/README.md

@@ -2,7 +2,8 @@ Lapine
 ======
 
 Speak to RabbitMQ. This gem serves as a wrapper for publishing messages
-to RabbitMQ via the Bunny gem.
+to RabbitMQ via the Bunny gem, and for consuming messages using the AMQP
+gem.
 
 
 ## Configuration
@@ -31,9 +32,9 @@ Lapine.add_exchange 'efrafa',
   type: 'topic'              # required
 ```
 
-## Usage
+## Publisher Usage
 
-Define a class that configures which `exchange` is uses. This class
+Define a class that configures which `exchange` is used. This class
 must define `#to_hash`
 
 ```ruby
@@ -72,6 +73,12 @@ Note that the `#initialize` method and the contents of `#to_hash`
 are arbitrary.
 
 
+## Consumer Usage
+
+Please see the Lapine wiki for documentation on defining and configuring
+consumers.
+
+
 ## But... WHY
 
 * This should be dead simple, but everything else was either too

data/lib/lapine/consumer/config.rb

@@ -50,6 +50,11 @@ module Lapine
         long: '--password PASSWORD',
         description: 'RabbitMQ password (default guest)'
 
+      option :transient,
+        long: '--transient',
+        description: 'Auto-delete queues when workers stop',
+        default: false
+
       option :debug,
         long: '--debug',
         description: 'More verbose (and possibly non-threadsafe) log statements',
@@ -89,6 +94,10 @@ module Lapine
         yaml_config['topics']
       end
 
+      def transient?
+        config[:transient]
+      end
+
       def connection_properties
         {
           host: '127.0.0.1',

data/lib/lapine/consumer/connection.rb

@@ -11,6 +11,10 @@ module Lapine
         @channel = AMQP::Channel.new(connection)
         @exchange = AMQP::Exchange.new(channel, :topic, topic, durable: true)
       end
+
+      def close!
+        @connection.close if @connection.connected?
+      end
     end
   end
 end

data/lib/lapine/consumer/runner.rb

@@ -23,9 +23,10 @@ module Lapine
         Consumer::Environment.new(config).load!
         logger.info 'starting Lapine::Consumer'
 
+        @queue_properties = queue_properties
         EventMachine.run do
           topology.each_binding do |q, conn, routing_key, classes|
-            queue = conn.channel.queue(q).bind(conn.exchange, routing_key: routing_key)
+            queue = conn.channel.queue(q, @queue_properties).bind(conn.exchange, routing_key: routing_key)
             queue.subscribe(ack: true) do |metadata, payload|
               classes.each do |clazz|
                 Lapine::Consumer::Dispatcher.new(clazz, payload, metadata, logger).dispatch
@@ -60,6 +61,12 @@ module Lapine
         @logger ||= config.logfile ? Logger.new(config.logfile) : Logger.new(STDOUT)
       end
 
+      def queue_properties
+        {}.tap do |props|
+          props.merge!(auto_delete: true) if config.transient?
+        end
+      end
+
       def handle_signals!
         Signal.trap('INT') { EventMachine.stop }
         Signal.trap('TERM') { EventMachine.stop }

data/lib/lapine/consumer/topology.rb

@@ -23,6 +23,13 @@ module Lapine
         end
       end
 
+      def close!
+        return unless @cons
+        @cons.values.each do |conn|
+          conn.close!
+        end
+      end
+
       private
 
       def get_conn(name)

data/lib/lapine/version.rb

@@ -1,3 +1,3 @@
 module Lapine
-  VERSION = '0.2.0'
+  VERSION = '0.2.2'
 end

data/spec/lib/lapine/consumer/config_spec.rb

@@ -29,7 +29,7 @@ RSpec.describe Lapine::Consumer::Config do
       end
 
       context 'with connection info in file' do
-        let(:config_from_file) { { 'connection' => { 'host' => '1.1.1.1' } } }
+        let(:config_from_file) { {'connection' => {'host' => '1.1.1.1'}} }
 
         it 'uses the config file info' do
           expect(connection_properties[:host]).to eq('1.1.1.1')
@@ -38,7 +38,7 @@ RSpec.describe Lapine::Consumer::Config do
 
       context 'with command line arg' do
         let(:argv) { %w(--host 2.2.2.2 -c /path/to/config.yml) }
-        let(:config_from_file) { { 'connection' => { 'host' => '1.1.1.1' } } }
+        let(:config_from_file) { {'connection' => {'host' => '1.1.1.1'}} }
 
         it 'prefers the cli' do
           expect(connection_properties[:host]).to eq('2.2.2.2')
@@ -52,7 +52,7 @@ RSpec.describe Lapine::Consumer::Config do
       end
 
       context 'with connection info in file' do
-        let(:config_from_file) { { 'connection' => { 'port' => 5673 } } }
+        let(:config_from_file) { {'connection' => {'port' => 5673}} }
 
         it 'uses the config file info' do
           expect(connection_properties[:port]).to eq(5673)
@@ -61,7 +61,7 @@ RSpec.describe Lapine::Consumer::Config do
 
       context 'with command line arg' do
         let(:argv) { %w(--port 5674 -c /path/to/config.yml) }
-        let(:config_from_file) { { 'connection' => { 'port' => 5673 } } }
+        let(:config_from_file) { {'connection' => {'port' => 5673}} }
 
         it 'prefers the cli' do
           expect(connection_properties[:port]).to eq(5674)
@@ -75,7 +75,7 @@ RSpec.describe Lapine::Consumer::Config do
       end
 
       context 'with connection info in file' do
-        let(:config_from_file) { { 'connection' => { 'ssl' => true } } }
+        let(:config_from_file) { {'connection' => {'ssl' => true}} }
 
         it 'uses the config file info' do
           expect(connection_properties[:ssl]).to be(true)
@@ -84,7 +84,7 @@ RSpec.describe Lapine::Consumer::Config do
 
       context 'with command line arg' do
         let(:argv) { %w(--ssl -c /path/to/config.yml) }
-        let(:config_from_file) { { 'connection' => { 'ssl' => false } } }
+        let(:config_from_file) { {'connection' => {'ssl' => false}} }
 
         it 'prefers the cli' do
           expect(connection_properties[:ssl]).to be(true)
@@ -98,7 +98,7 @@ RSpec.describe Lapine::Consumer::Config do
       end
 
       context 'with connection info in file' do
-        let(:config_from_file) { { 'connection' => { 'vhost' => '/blah' } } }
+        let(:config_from_file) { {'connection' => {'vhost' => '/blah'}} }
 
         it 'uses the config file info' do
           expect(connection_properties[:vhost]).to eq('/blah')
@@ -107,7 +107,7 @@ RSpec.describe Lapine::Consumer::Config do
 
       context 'with command line arg' do
         let(:argv) { %w(--vhost /argh -c /path/to/config.yml) }
-        let(:config_from_file) { { 'connection' => { 'vhost' => '/blah' } } }
+        let(:config_from_file) { {'connection' => {'vhost' => '/blah'}} }
 
         it 'prefers the cli' do
           expect(connection_properties[:vhost]).to eq('/argh')
@@ -121,7 +121,7 @@ RSpec.describe Lapine::Consumer::Config do
       end
 
       context 'with connection info in file' do
-        let(:config_from_file) { { 'connection' => { 'username' => 'Hrairoo' } } }
+        let(:config_from_file) { {'connection' => {'username' => 'Hrairoo'}} }
 
         it 'uses the config file info' do
           expect(connection_properties[:username]).to eq('Hrairoo')
@@ -130,7 +130,7 @@ RSpec.describe Lapine::Consumer::Config do
 
       context 'with command line arg' do
         let(:argv) { %w(--username Thlayli -c /path/to/config.yml) }
-        let(:config_from_file) { { 'connection' => { 'username' => 'Hrairoo' } } }
+        let(:config_from_file) { {'connection' => {'username' => 'Hrairoo'}} }
 
         it 'prefers the cli' do
           expect(connection_properties[:username]).to eq('Thlayli')
@@ -144,7 +144,7 @@ RSpec.describe Lapine::Consumer::Config do
       end
 
       context 'with connection info in file' do
-        let(:config_from_file) { { 'connection' => { 'password' => 'flayrah' } } }
+        let(:config_from_file) { {'connection' => {'password' => 'flayrah'}} }
 
         it 'uses the config file info' do
           expect(connection_properties[:password]).to eq('flayrah')
@@ -153,7 +153,7 @@ RSpec.describe Lapine::Consumer::Config do
 
       context 'with command line arg' do
         let(:argv) { %w(--password pfeffa -c /path/to/config.yml) }
-        let(:config_from_file) { { 'connection' => { 'password' => 'flayrah' } } }
+        let(:config_from_file) { {'connection' => {'password' => 'flayrah'}} }
 
         it 'prefers the cli' do
           expect(connection_properties[:password]).to eq('pfeffa')
@@ -161,4 +161,18 @@ RSpec.describe Lapine::Consumer::Config do
       end
     end
   end
+
+  describe '#transient?' do
+    it 'is false by default' do
+      expect(config.transient?).to be false
+    end
+
+    context 'with --transient' do
+      let(:argv) { %w(--transient -c /path/to/config.yml) }
+
+      it 'is true' do
+        expect(config.transient?).to be true
+      end
+    end
+  end
 end

data/spec/lib/lapine/consumer/dispatcher_spec.rb

@@ -46,7 +46,7 @@ RSpec.describe Lapine::Consumer::Dispatcher do
       context 'with invalid json' do
         let(:json) { 'oh boy I am not actually JSON' }
 
-        it 'notifies new relic with the raw payload' do
+        it 'notifies the error handler with the raw payload' do
           dispatcher.dispatch
           expect(caught_errors).to include([an_instance_of(Oj::ParseError), json])
         end
@@ -55,7 +55,7 @@ RSpec.describe Lapine::Consumer::Dispatcher do
       context 'with any other error' do
         before { allow(dispatcher).to receive(:do_dispatch).and_raise(ArgumentError) }
 
-        it 'notifies new relic with the parsed json' do
+        it 'notifies error handler with the parsed json' do
           dispatcher.dispatch
           expect(caught_errors).to include([an_instance_of(ArgumentError), hash])
         end

data/spec/lib/lapine/consumer/runner_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe Lapine::Consumer::Runner do
   let(:queues) do
     [
       {
-        'q' => 'testing.test',
+        'q' => '',
         'topic' => 'testing.topic',
         'routing_key' => 'testing.update',
         'handlers' =>
@@ -34,7 +34,8 @@ RSpec.describe Lapine::Consumer::Runner do
     require: [],
     queues: queues,
     topics: ['testing.topic'],
-    debug?: true) }
+    debug?: true,
+    transient?: true) }
   let(:connection_properties) { {host: '127.0.0.1', port: 5672, ssl: false, vhost: '/', username: 'guest', password: 'guest'} }
   let(:message) { Oj.dump({'pay' => 'load'}) }
 
@@ -49,10 +50,12 @@ RSpec.describe Lapine::Consumer::Runner do
       expect(FakerHandler).to receive(:handle_lapine_payload).twice
       em do
         subject.run
-        conn = Lapine::Consumer::Connection.new(config, 'testing.topic')
-        conn.exchange.publish(message, routing_key: 'testing.update')
-        conn.exchange.publish(message, routing_key: 'testing.update')
-        EventMachine.add_timer(2.0) { done }
+        EventMachine.add_timer(0.5) {
+          conn = Lapine::Consumer::Connection.new(config, 'testing.topic')
+          conn.exchange.publish(message, routing_key: 'testing.update')
+          conn.exchange.publish(message, routing_key: 'testing.update')
+        }
+        EventMachine.add_timer(1.0) { done }
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lapine
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Eric Saxby
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2014-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp