multiple_man 0.5.9 → 0.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45d1f3a68bbb6908b822a5b57a3c176152851b57
-  data.tar.gz: bf316745d372637203f5a976f14e07c50fe9d213
+  metadata.gz: 55f92c313a41df73f660aeb11219df30699b05d2
+  data.tar.gz: 363a8538cf04a8dc30a3092a6ce83cb4f9c81ab4
 SHA512:
-  metadata.gz: caba00db5b03de4f14b6e473e765bfc1096b5dd1a06f60fd84ec31a3692fafbce3aa3893fc75a97582767f4640787a3fff1b82b36d22d4e58c5cfa02af9044b4
-  data.tar.gz: e6b17cff6eb2fc1b90287969218fbf4b228dd59b499a1ed87787149997c6090dd64782af35d6526dd0bc8e3ac27b90822d83f450a8984507f48c0304f431e8e0
+  metadata.gz: b9255e20caedf780c92afc54c206b0bafed00b49dc0e6ba0e4646946344ba80356127e56b91bc911f1eb9f0511a08597b9d64972ccac610aa5d1354028b02b8d
+  data.tar.gz: d3aef199d466696ff5978d7057a4c86b799c6dbc8f2f5384068f5daccea2dc252831c8e213eacf774f85e75f1150d761323a90fbefc9cfa6b7fa937af339a467

data/lib/multiple_man/async_model_publisher.rb

@@ -0,0 +1,30 @@
+module MultipleMan
+  class AsyncModelPublisher < ModelPublisher
+
+    def publish(records, operation=:create)
+      return unless MultipleMan.configuration.enabled
+
+      if records.respond_to?(:pluck)
+        return unless records.any?
+        ids = records.pluck(:id)
+        klass = records.first.class.name
+      else
+        return if records.nil?
+        ids = [records.id]
+        klass = records.class.name
+      end
+
+      ModelPublisherJob.perform_async(klass, ids, options, operation)
+    end
+
+  end
+
+  class ModelPublisherJob
+    include Sidekiq::Worker
+
+    def perform(record_type, ids, options, operation)
+      records = Kernel.const_get(record_type).where(id: ids)
+      ModelPublisher.new(options).publish(records, operation)
+    end
+  end
+end

data/lib/multiple_man/configuration.rb

@@ -7,6 +7,7 @@ module MultipleMan
       self.enabled = true
       self.channel_pool_size = 5
       self.worker_concurrency = 1
+      self.reraise_errors = true
     end
 
     def logger
@@ -18,7 +19,7 @@ module MultipleMan
     end
 
     attr_accessor :topic_name, :app_name, :connection, :enabled, :channel_pool_size, :error_handler, 
-                  :worker_concurrency
+                  :worker_concurrency, :reraise_errors
     attr_writer :logger
   end
 

data/lib/multiple_man/connection.rb

@@ -4,18 +4,36 @@ 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
-      connection = new
-      yield connection if block_given?
+      reconnect unless connection.open?
+
+      channel = connection.create_channel
+      yield new(channel) if block_given?
     ensure
-      connection.close! if connection
+      channel.close if channel
+    end
+
+    def self.reconnect
+      connection.start
     end
 
     attr_reader :topic
 
-    def initialize
-      init_connection!
-      init_channel!
+    def initialize(channel)
+      self.channel = channel
       self.topic = channel.topic(topic_name)
     end
 
@@ -23,25 +41,11 @@ module MultipleMan
       MultipleMan.configuration.topic_name
     end
 
-    def close!
-      channel.close if channel
-      connection.close if connection
-    end
-
     delegate :queue, to: :channel
     
   private
 
-    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_accessor :channel
     attr_writer :topic
 
   end

data/lib/multiple_man/mixins/publisher.rb

@@ -22,7 +22,7 @@ module MultipleMan
       end
 
       def publish(options = {})
-        self.multiple_man_publisher = ModelPublisher.new(options)
+        self.multiple_man_publisher = ModelPublisher.build(options)
       end
     end
   end

data/lib/multiple_man/model_publisher.rb

@@ -1,8 +1,18 @@
+require 'active_support/core_ext'
+
 module MultipleMan
   class ModelPublisher
 
+    def self.build(options = {})
+      if options[:async] == true
+        AsyncModelPublisher.new(options)
+      else
+        new(options)
+      end
+    end
+
     def initialize(options = {})
-      self.options = options
+      self.options = options.with_indifferent_access
     end
 
     def publish(records, operation=:create)

data/lib/multiple_man/routing_key.rb

@@ -19,7 +19,7 @@ module MultipleMan
     attr_accessor :klass
 
     def operation=(value)
-      raise "Operation #{value} is not recognized" unless ALLOWED_OPERATIONS.include?(value)
+      raise "Operation #{value} is not recognized" unless ALLOWED_OPERATIONS.include?(value.to_sym)
       @operation = value
     end
 

data/lib/multiple_man/version.rb

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

data/lib/multiple_man.rb

@@ -10,6 +10,7 @@ module MultipleMan
   require 'multiple_man/subscribers/registry'
   require 'multiple_man/configuration'
   require 'multiple_man/model_publisher'
+  require 'multiple_man/async_model_publisher'
   require 'multiple_man/attribute_extractor'
   require 'multiple_man/connection'
   require 'multiple_man/routing_key'
@@ -34,6 +35,7 @@ module MultipleMan
   def self.error(ex)
     if configuration.error_handler
       configuration.error_handler.call(ex)
+      raise ex if configuration.reraise_errors
     else
       raise ex
     end

data/spec/connection_spec.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multiple_man
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.5.10
 platform: ruby
 authors:
 - Ryan Brunner
@@ -108,6 +108,7 @@ files:
 - README.md
 - Rakefile
 - lib/multiple_man.rb
+- lib/multiple_man/async_model_publisher.rb
 - lib/multiple_man/attribute_extractor.rb
 - lib/multiple_man/configuration.rb
 - lib/multiple_man/connection.rb