multiple_man 0.5.4 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7f3ae4586ac85cd7d1137f02cb17c1aa699d544
-  data.tar.gz: 39fa794bba96809a3018738c7b899df2b20b17a1
+  metadata.gz: 74e44faf7da3f696f3be2d903a0f98edc74f9e78
+  data.tar.gz: 2e38d9f0254ec62714bda7e0d1054048c2e18d34
 SHA512:
-  metadata.gz: 8346e9fa5130b1ceb3476e1e43394f39dc11e4ae37058caae87fe35f111aa3655d59e459678562ad043e606bdfc0a9280cd2c5a7e68146625c28f6eebc754523
-  data.tar.gz: a638ac410b4ad19f70d0a559458c7d065c81c3271351101eefbd50f08453f44c53945ab6fb80003b0780cc024b62fd71750b09940f5d27833e21d0bbd63757e1
+  metadata.gz: fcfc3ba3affb5f65c7ba5e570ca6cc097c658e11fdb566d5feb1c2adde844acdd23e366336097c0ef0ae81576a60112432a55b19e42827aef76fc5a15c0ec9b0
+  data.tar.gz: 6c97e8e20ac7eed431e52cdf582504f6bf13a555087b9cecaed73862ddc609524712ed61a6a48d5b3a73be8179a08475dad6f8a9d8eb452c6a0add2e8e0cc407

data/lib/multiple_man/connection.rb

@@ -42,10 +42,4 @@ module MultipleMan
     attr_accessor :channel
 
   end
-
-  class ListenerConnection < Connection
-    def self.channel_pool
-      @channel_pool ||= ConnectionPool.new(size: 25, timeout: 5) { connection.create_channel(nil, MultipleMan.configuration.worker_concurrency) }
-    end
-  end
 end

data/lib/multiple_man/listener.rb

@@ -38,17 +38,21 @@ module MultipleMan
       begin
         subscription.send(operation(delivery_info), JSON.parse(payload).with_indifferent_access)
       rescue Exception => ex
-        MultipleMan.logger.error "   Error - #{ex.message}\n\n#{ex.backtrace}"
-        MultipleMan.error(ex)
-
-        # Requeue the message
-        queue.channel.nack(delivery_info.delivery_tag, false, true)
+        handle_error(ex, delivery_info)
       else
         MultipleMan.logger.debug "   Successfully processed!"
         queue.channel.acknowledge(delivery_info.delivery_tag, false)
       end
     end
 
+    def handle_error(ex, delivery_info)
+      MultipleMan.logger.error "   Error - #{ex.message}\n\n#{ex.backtrace}"
+      MultipleMan.error(ex)
+
+      # Requeue the message
+      queue.channel.nack(delivery_info.delivery_tag, false, true)
+    end
+
     def operation(delivery_info)
       delivery_info.routing_key.split(".").last
     end

data/lib/multiple_man/mixins/publisher.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext'
+
 module MultipleMan
   module Publisher
     def Publisher.included(base)
@@ -5,6 +7,8 @@ module MultipleMan
       base.after_commit(on: :create) { |r| r.multiple_man_publish(:create) }
       base.after_commit(on: :update) { |r| r.multiple_man_publish(:update) }
       base.after_commit(on: :destroy) { |r| r.multiple_man_publish(:destroy) }
+
+      base.class_attribute :multiple_man_publisher
     end
 
     def multiple_man_publish(operation=:create)
@@ -17,8 +21,6 @@ module MultipleMan
         multiple_man_publisher.publish(self, operation) 
       end
 
-      attr_accessor :multiple_man_publisher
-
       def publish(options = {})
         self.multiple_man_publisher = ModelPublisher.new(options)
       end

data/lib/multiple_man/model_populator.rb

@@ -6,7 +6,8 @@ module MultipleMan
       self.fields = fields
     end
 
-    def populate(data)
+    def populate(payload)
+      data = payload[:id].merge(payload[:data])
       fields_for(data).each do |field|
         populate_field(field, data[field])
       end

data/lib/multiple_man/subscribers/model_subscriber.rb

@@ -9,8 +9,9 @@ module MultipleMan::Subscribers
     attr_accessor :options
 
     def create(payload)
-      model = find_model(payload[:id])
-      MultipleMan::ModelPopulator.new(model, options[:fields]).populate(payload[:data])
+      id = payload[:id]
+      model = find_model(id)
+      MultipleMan::ModelPopulator.new(model, options[:fields]).populate(id: find_conditions(id), data: payload[:data])
       model.save!
     end
 

data/lib/multiple_man/tasks/worker.rake

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

data/lib/multiple_man/version.rb

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

data/spec/model_populator_spec.rb

@@ -2,13 +2,17 @@ require 'spec_helper'
 
 describe MultipleMan::ModelPopulator do 
   class MockModel
-    attr_accessor :a, :b
+    attr_accessor :a, :b, :multiple_man_identifier
   end
 
   describe "populate" do
     let(:model) { MockModel.new }
     let(:data) { { a: 1, b: 2 } }
-    subject { described_class.new(model, fields).populate(data) }
+    let(:id) { { multiple_man_identifier: 'app_1' }}
+    let(:fields) { nil }
+    subject { described_class.new(model, fields).populate(id: id, data: data) }
+
+    its(:multiple_man_identifier) { should == 'app_1' }
 
     context "with fields defined" do
       let(:fields) { [:a] }

data/spec/subscribers/model_subscriber_spec.rb

@@ -11,10 +11,10 @@ describe MultipleMan::Subscribers::ModelSubscriber do
       MockClass.stub(:where).and_return([mock_object])
       mock_populator = double(MultipleMan::ModelPopulator)
       MultipleMan::ModelPopulator.should_receive(:new).and_return(mock_populator)
-      mock_populator.should_receive(:populate).with({a: 1, b: 2})
+      mock_populator.should_receive(:populate).with(id: {id:5}, data: {a: 1, b: 2})
       mock_object.should_receive(:save!)
 
-      described_class.new(MockClass, {}).create({id: 5, data:{a: 1, b: 2}})
+      described_class.new(MockClass, {}).create({id: {id: 5}, data:{a: 1, b: 2}})
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multiple_man
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.6
 platform: ruby
 authors:
 - Ryan Brunner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler