multiple_man 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74e44faf7da3f696f3be2d903a0f98edc74f9e78
-  data.tar.gz: 2e38d9f0254ec62714bda7e0d1054048c2e18d34
+  metadata.gz: 91862d63ba5ac6bd05ea7724c6e3b85130596c24
+  data.tar.gz: eda76e877da86d653c274aaa50a7671d951a9411
 SHA512:
-  metadata.gz: fcfc3ba3affb5f65c7ba5e570ca6cc097c658e11fdb566d5feb1c2adde844acdd23e366336097c0ef0ae81576a60112432a55b19e42827aef76fc5a15c0ec9b0
-  data.tar.gz: 6c97e8e20ac7eed431e52cdf582504f6bf13a555087b9cecaed73862ddc609524712ed61a6a48d5b3a73be8179a08475dad6f8a9d8eb452c6a0add2e8e0cc407
+  metadata.gz: 0d202cbbfed76fd925469f740818ae2b3b5f9db5665fa7191ef61ad7a1289760729a28ba27545a022fee80a32171593ccac2b0c3ffd570ddd86190af50c602d8
+  data.tar.gz: ad2c2de8477150928208923a824f8c278edb872f32bdf3b6d28eb9da4a6d6d23c555a0a11de7053a19ed3be00f2884c1f6d8925dc83a8a41aaf7505a767f87c7

data/lib/multiple_man.rb

@@ -1,7 +1,7 @@
 require "multiple_man/version"
 
 module MultipleMan
-  require 'multiple_man/railtie' if defined?(Rake)
+  require 'multiple_man/railtie' if defined?(Rails)
 
   require 'multiple_man/mixins/publisher'
   require 'multiple_man/mixins/subscriber'

data/lib/multiple_man/connection.rb

@@ -13,14 +13,11 @@ module MultipleMan
       end
     end
 
-    def self.channel_pool
-      @channel_pool ||= ConnectionPool.new(size: 25, timeout: 5) { connection.create_channel }
-    end
-
     def self.connect
-      channel_pool.with do |channel|
-        yield new(channel) if block_given?
-      end
+      channel = connection.create_channel
+      yield new(channel) if block_given?
+    ensure
+      channel.close
     end
 
     def initialize(channel)

data/lib/multiple_man/listener.rb

@@ -5,28 +5,33 @@ module MultipleMan
   class Listener
 
     class << self
-      def start(connection)
+      def start
         MultipleMan.logger.debug "Starting listeners."
-        self.connection = connection
         MultipleMan.logger.debug Subscribers::Registry.subscriptions.to_json
 
         Subscribers::Registry.subscriptions.each do |subscription|
           new(subscription).listen
         end
       end
-
-      attr_accessor :connection
     end
 
     delegate :queue_name, to: :subscription
 
     def initialize(subscription)
       self.subscription = subscription
+      self.init_connection
+    end
+
+    def init_connection
+      channel = MultipleMan::Connection.connection.create_channel(nil, MultipleMan.configuration.worker_concurrency)
+      channel.prefetch(100)
+      self.connection = MultipleMan::Connection.new(channel)
     end
 
-    attr_accessor :subscription
+    attr_accessor :subscription, :connection
 
     def listen
+      
       MultipleMan.logger.info "Listening for #{subscription.klass} with routing key #{routing_key}."
       queue.bind(connection.topic, routing_key: routing_key).subscribe(ack: true) do |delivery_info, meta_data, payload|
         process_message(delivery_info, payload)
@@ -65,11 +70,5 @@ module MultipleMan
       subscription.routing_key
     end
 
-  private
-
-    def connection
-      self.class.connection
-    end
-
   end
 end

data/lib/multiple_man/tasks/worker.rake

@@ -12,11 +12,7 @@ namespace :multiple_man do
   def run_listener(listener)
     Rails.application.eager_load!
 
-    channel = MultipleMan::Connection.connection.create_channel(nil, MultipleMan.configuration.worker_concurrency)
-    channel.prefetch(100)
-    connection = MultipleMan::Connection.new(channel)
-
-    listener.start(connection)
+    listener.start
 
     while(true)
       sleep 10

data/lib/multiple_man/version.rb

@@ -1,3 +1,3 @@
 module MultipleMan
-  VERSION = "0.5.6"
+  VERSION = "0.5.7"
 end

data/multiple_man.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", '~> 10.1.0'
   spec.add_development_dependency "rspec", '~> 2.14.1'
-  spec.add_runtime_dependency     "bunny", '>= 1.0'
+  spec.add_runtime_dependency     "bunny", '>= 1.2'
   spec.add_runtime_dependency     "activesupport", '>= 3.0'
   spec.add_runtime_dependency     "connection_pool", ">= 1.2"
 end

data/spec/connection_spec.rb

@@ -3,19 +3,19 @@ require 'spec_helper'
 describe MultipleMan::Connection do
 
   let(:mock_bunny) { double(Bunny) }
-  let(:mock_channel) { double(Bunny::Channel) }
+  let(:mock_channel) { double(Bunny::Channel, close: 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).any_number_of_times
+      mock_bunny.should_receive(:create_channel).once.and_return(mock_channel)
 
-      described_class.connect
+      described_class.connect { }
     end
   end
 
-  subject { described_class.new(mock_bunny) }
+  subject { described_class.new(mock_channel) }
 
   its(:topic_name) { should == MultipleMan.configuration.topic_name }
 

data/spec/listener_spec.rb

@@ -4,6 +4,8 @@ describe MultipleMan::Listener do
   class MockClass1; end
   class MockClass2; end
 
+  before { MultipleMan::Connection.stub(:connection).and_return(double(Bunny).as_null_object)}
+
   describe "start" do
     it "should listen to each subscription" do
       MultipleMan::Subscribers::Registry.stub(:subscriptions).and_return([
@@ -18,7 +20,7 @@ describe MultipleMan::Listener do
       # ease of stubbing.
       mock_listener.should_receive(:listen).twice
 
-      MultipleMan::Listener.start(double(Bunny))
+      MultipleMan::Listener.start
     end
   end
 
@@ -27,7 +29,7 @@ describe MultipleMan::Listener do
     let(:queue_stub) { double(Bunny::Queue, bind: bind_stub) }
     let(:bind_stub) { double(:bind, subscribe: nil)}
 
-    before { MultipleMan::Listener.stub(:connection).and_return(connection_stub) }
+    before { MultipleMan::Connection.stub(:new).and_return(connection_stub) }
 
     it "should listen to the right topic, and for all updates to a model" do
       listener = MultipleMan::Listener.new(double(MultipleMan::Subscribers::ModelSubscriber, klass: MockClass1, routing_key: "MockClass1.#", queue_name: "MockClass1"))
@@ -38,7 +40,7 @@ describe MultipleMan::Listener do
 
   specify "process_message should send the correct data" do
     connection_stub = double(MultipleMan::Connection).as_null_object
-    MultipleMan::Listener.stub(:connection).and_return(connection_stub)
+    MultipleMan::Connection.stub(:new).and_return(connection_stub)
     subscriber = double(MultipleMan::Subscribers::ModelSubscriber, klass: MockClass1, routing_key: "MockClass1.#").as_null_object
     listener = MultipleMan::Listener.new(subscriber)
 
@@ -49,7 +51,7 @@ describe MultipleMan::Listener do
 
   it "should nack on failure" do
     connection_stub = double(MultipleMan::Connection).as_null_object
-    MultipleMan::Listener.stub(:connection).and_return(connection_stub)
+    MultipleMan::Connection.stub(:new).and_return(connection_stub)
     subscriber = double(MultipleMan::Subscribers::ModelSubscriber, klass: MockClass1, routing_key: "MockClass1.#").as_null_object
     listener = MultipleMan::Listener.new(subscriber)
 

data/spec/seeder_listener_spec.rb

@@ -3,11 +3,12 @@ require 'spec_helper'
 describe MultipleMan::SeederListener do
   class MockClass1; end
 
+  before { MultipleMan::Connection.stub(:connection).and_return(double(Bunny).as_null_object)}
   let(:connection_stub) { double(MultipleMan::Connection, queue: queue_stub, topic: 'app') }
   let(:queue_stub) { double(Bunny::Queue, bind: bind_stub) }
   let(:bind_stub) { double(:bind, subscribe: nil)}
 
-  before { MultipleMan::Listener.stub(:connection).and_return(connection_stub) }
+  before { MultipleMan::Connection.stub(:new).and_return(connection_stub) }
 
   it 'listens to seed events' do
     listener = described_class.new(double(MultipleMan::Subscribers::ModelSubscriber,

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: multiple_man
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - Ryan Brunner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
 description: MultipleMan syncs changes to ActiveRecord models via AMQP
@@ -101,8 +101,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -152,17 +152,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: MultipleMan syncs changes to ActiveRecord models via AMQP