multiple_man 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c09e37ab8dfce2a4417485dde54eb56ffabcf4a2
-  data.tar.gz: d74f55213b18cfecf1680e598ad73d1514515b14
+  metadata.gz: 281afe83885726b5605460d6ca767b02533a46bb
+  data.tar.gz: 2c039313e01e5e55085061de80023d835bdfb3d2
 SHA512:
-  metadata.gz: d1905e3f95f14aadb247968fafd0ca155214a527368bd08e8ff79063620528a3271bc256bf82480f17b8bdd9c9cc7d69d3251a6739da0804ab1e3723dd41455c
-  data.tar.gz: cca35db2754128c0068947d0615975de9c3882fb20cc4a5525489d83ecd16e103deeb7ca0bca297d6743c63cd6b698b6ba5da233600ce77a29046b061a6cd74a
+  metadata.gz: f4a0c73c560386a2d8c54b22487f21855946824e58673c171ef8653e03fe4ced85de3b7fc758d6c7e298cc7c8412dcf1f76810ca0448b43aba7aaeceed26ef3c
+  data.tar.gz: 7f66da89814c25bbec40ae3be723071bdd1b56899f9cccecb1672680f92eaab0816398ddf6123fa90d730dbdc146b77c575cba185e3be9cb4b856e9ce458d9af

data/lib/multiple_man/connection.rb

@@ -2,25 +2,26 @@ require 'bunny'
 
 module MultipleMan
   class Connection
-    def self.connect
-      MultipleMan.logger.info "Connecting to #{MultipleMan.configuration.connection}"
-      connection = Bunny.new(MultipleMan.configuration.connection)
-      begin
-        MultipleMan.logger.info "Starting connection"
+    def self.connection
+      @connection ||= begin
+        connection = Bunny.new(MultipleMan.configuration.connection)
+        MultipleMan.logger.info "Connecting to #{MultipleMan.configuration.connection}"
         connection.start
-        yield new(connection) if block_given?
-      ensure
-        MultipleMan.logger.info "Closing connection"
-        connection.close
+        connection
       end
     end
 
-    def initialize(connection)
-      self.connection = connection
+    def self.connect
+      channel = connection.create_channel
+      begin
+        yield new(channel) if block_given?
+      ensure
+        channel.close
+      end
     end
 
-    def channel
-      @channel ||= connection.create_channel
+    def initialize(channel)
+      self.channel = channel
     end
 
     def topic
@@ -33,7 +34,7 @@ module MultipleMan
 
   private
 
-    attr_accessor :connection
+    attr_accessor :channel
 
   end
 end

data/lib/multiple_man/version.rb

@@ -1,3 +1,3 @@
 module MultipleMan
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/spec/connection_spec.rb

@@ -3,13 +3,15 @@ require 'spec_helper'
 describe MultipleMan::Connection do
 
   let(:mock_bunny) { double(Bunny) }
+  let(:mock_channel) { double(Bunny::Channel) }
 
   describe "connect" do
     it "should open and close the connection" do
       mock_bunny.should_receive(:start)
-      mock_bunny.should_receive(:close)
       Bunny.should_receive(:new).and_return(mock_bunny)
-      
+      mock_bunny.should_receive(:create_channel).and_return(mock_channel)
+      mock_channel.should_receive(:close)
+
       described_class.connect
     end
   end

data/spec/model_publisher_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe MultipleMan::ModelPublisher do 
-  let(:channel_stub) { double(Bunny::Channel, topic: topic_stub)}
+  let(:channel_stub) { double(Bunny::Channel, topic: topic_stub, close: nil)}
   let(:topic_stub) { double(Bunny::Exchange, publish: nil) }
 
   before {
@@ -9,7 +9,7 @@ describe MultipleMan::ModelPublisher do
       config.topic_name = "app"
     end
 
-    MultipleMan::Connection.any_instance.stub(:channel).and_return(channel_stub)
+    MultipleMan::Connection.stub(:connection).and_return(double(Bunny, create_channel: channel_stub))
   }
 
   class MockObject

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multiple_man
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Ryan Brunner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-02 00:00:00.000000000 Z
+date: 2014-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler