multiple_man 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14b664ec408ce39903e299ff4be21513e3925014
-  data.tar.gz: 00b8579e4aeaa8e8697e5fa963646aef68757377
+  metadata.gz: 45d1f3a68bbb6908b822a5b57a3c176152851b57
+  data.tar.gz: bf316745d372637203f5a976f14e07c50fe9d213
 SHA512:
-  metadata.gz: acaec63c148e65ea63833d342fe28f1de23c80d07074dbf413531860fd9fda3ff4a334a6500c23cd2181fd908abbc9c78c03af475f67e5e0e734d491c7c7149f
-  data.tar.gz: f5620fc66f82bcb0708b8a564b472d1ac5ba98aa1742e0502b6e02b37629f3809dbe862f5809fa54945321fc03e87d0e54376f98bd18b8c9c6e814a981fe018a
+  metadata.gz: caba00db5b03de4f14b6e473e765bfc1096b5dd1a06f60fd84ec31a3692fafbce3aa3893fc75a97582767f4640787a3fff1b82b36d22d4e58c5cfa02af9044b4
+  data.tar.gz: e6b17cff6eb2fc1b90287969218fbf4b228dd59b499a1ed87787149997c6090dd64782af35d6526dd0bc8e3ac27b90822d83f450a8984507f48c0304f431e8e0

data/lib/multiple_man/connection.rb

@@ -4,30 +4,18 @@ require 'active_support/core_ext/module'
 
 module MultipleMan
   class Connection
-    @mutex = Mutex.new
-
-    def self.connection
-      @mutex.synchronize do 
-        @connection ||= begin
-          connection = Bunny.new(MultipleMan.configuration.connection)
-          MultipleMan.logger.debug "Connecting to #{MultipleMan.configuration.connection}"
-          connection.start
-          connection
-        end
-      end
-    end
-
     def self.connect
-      channel = connection.create_channel
-      yield new(channel) if block_given?
+      connection = new
+      yield connection if block_given?
     ensure
-      channel.close if channel
+      connection.close! if connection
     end
 
     attr_reader :topic
 
-    def initialize(channel)
-      self.channel = channel
+    def initialize
+      init_connection!
+      init_channel!
       self.topic = channel.topic(topic_name)
     end
 
@@ -35,11 +23,25 @@ module MultipleMan
       MultipleMan.configuration.topic_name
     end
 
+    def close!
+      channel.close if channel
+      connection.close if connection
+    end
+
     delegate :queue, to: :channel
     
   private
 
-    attr_accessor :channel
+    def init_connection!
+      self.connection = Bunny.new(MultipleMan.configuration.connection)
+      connection.start
+    end
+
+    def init_channel!
+      self.channel = connection.create_channel
+    end
+
+    attr_accessor :channel, :connection
     attr_writer :topic
 
   end

data/lib/multiple_man/version.rb

@@ -1,3 +1,3 @@
 module MultipleMan
-  VERSION = "0.5.8"
+  VERSION = "0.5.9"
 end

data/spec/connection_spec.rb

@@ -3,19 +3,21 @@ require 'spec_helper'
 describe MultipleMan::Connection do
 
   let(:mock_bunny) { double(Bunny) }
-  let(:mock_channel) { double(Bunny::Channel, close: nil) }
+  let(:mock_channel) { double(Bunny::Channel, topic: nil) }
 
   describe "connect" do
     it "should open a connection and a channel" do
       mock_bunny.should_receive(:start)
       Bunny.should_receive(:new).and_return(mock_bunny)
       mock_bunny.should_receive(:create_channel).once.and_return(mock_channel)
+      mock_bunny.should_receive(:close)
+      mock_channel.should_receive(:close)
 
       described_class.connect { }
     end
   end
 
-  subject { described_class.new(mock_channel) }
+  subject { described_class.new }
 
   its(:topic_name) { should == MultipleMan.configuration.topic_name }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multiple_man
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors:
 - Ryan Brunner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-12 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler