multiple_man 0.5.13 → 0.5.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10e7776ff5f12168fa8984908248adbfc9b5217c
-  data.tar.gz: 13d0b1dc30ebc18767f44c0289130878711291f8
+  metadata.gz: 7f336d9d6a65f813a1bbe25be73d2ed94600f6a3
+  data.tar.gz: 0aa6701beb28ec20efb7422876dee79b8277f8a1
 SHA512:
-  metadata.gz: c6bdb87677e72708e57454f741b437775b564e45ffc7f01d5de40843f0b8516e616007eae9ce3c8976cf3818ed3d8a750d90c6209eef36a3d209c45fc144c9af
-  data.tar.gz: f1518798dd88109dce33f893229171fb9e6bbae538a9097497c6d60cbf3271be17bc623ec621960c50c13fc58de49a0873c520976ae8a04dd58df5d84f2f55db
+  metadata.gz: b83d9ca1083970a7751b41836dfb06168a2b8e0228f801e8e94c9bc95e91f4840c40b8127a24110e3b17295cf496a1279032abedc7f57c30e36b36d6b1928d33
+  data.tar.gz: b94651a2419c3263732b1b75241b1b31a48f494b31c19deec9e59f1e678e8ab709d4d79c93e9c88b334e49eb7e368e0f94a38fbe7f550f3ac78d51cccad45187

data/lib/multiple_man/connection.rb

@@ -4,31 +4,16 @@ require 'active_support/core_ext/module'
 
 module MultipleMan
   class Connection
-    @mutex = Mutex.new
-
-    def self.connection
-      @mutex.synchronize do 
-        # If the server has closed our connection, re-initialize
-        @connection = nil if @connection && @connection.closed?
-
-        @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 = nil
-      connection = self.connection
-      @mutex.synchronize do
-        channel = connection.create_channel
-      end
+      connection = Bunny.new(MultipleMan.configuration.connection)
+      MultipleMan.logger.debug "Connecting to #{MultipleMan.configuration.connection}"
+      connection.start
+      channel = connection.create_channel
       yield new(channel) if block_given?
     ensure
       channel.close if channel && channel.open?
+      connection.close if connection && connection.open?
     end
 
     attr_reader :topic

data/lib/multiple_man/listener.rb

@@ -23,7 +23,9 @@ module MultipleMan
     end
 
     def init_connection
-      channel = MultipleMan::Connection.connection.create_channel(nil, MultipleMan.configuration.worker_concurrency)
+      connection = Bunny.new(MultipleMan.configuration.connection)
+      connection.start
+      channel = connection.create_channel(nil, MultipleMan.configuration.worker_concurrency)
       channel.prefetch(100)
       self.connection = MultipleMan::Connection.new(channel)
     end

data/lib/multiple_man/model_populator.rb

@@ -23,6 +23,8 @@ module MultipleMan
     end
 
     def populate_field(field, value)
+      field = 'source_id' if field == 'id'
+
       setter = "#{field}="
       if record.respond_to?(setter)
         record.send(setter, value)

data/lib/multiple_man/subscribers/base.rb

@@ -7,19 +7,19 @@ module MultipleMan::Subscribers
 
     attr_reader :klass
 
-    def create
+    def create(payload)
       # noop
     end
 
-    def update
+    def update(payload)
       # noop
     end
 
-    def destroy
+    def destroy(payload)
       # noop
     end
 
-    def seed
+    def seed(payload)
       # noop
     end
 

data/lib/multiple_man/subscribers/model_subscriber.rb

@@ -30,7 +30,16 @@ module MultipleMan::Subscribers
     end
 
     def find_conditions(id)
-      id.kind_of?(Hash) ? id : {multiple_man_identifier: id}
+      id.kind_of?(Hash) ? cleanse_id(id) : {multiple_man_identifier: id}
+    end
+
+    def cleanse_id(hash)
+      if hash.keys.length > 1 && hash.keys.include?("id")
+        id = hash.delete("id")
+        hash.merge("source_id" => id)
+      else
+        hash
+      end
     end
 
     attr_writer :klass

data/lib/multiple_man/version.rb

@@ -1,3 +1,3 @@
 module MultipleMan
-  VERSION = "0.5.13"
+  VERSION = "0.5.15"
 end

data/spec/connection_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe MultipleMan::Connection do
 
-  let(:mock_bunny) { double(Bunny) }
+  let(:mock_bunny) { double(Bunny, open?: true, close: nil) }
   let(:mock_channel) { double(Bunny::Channel, close: nil, open?: true, topic: nil) }
 
   describe "connect" do

metadata

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