msgr 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71ef2eda13a664e9afb9af7ca995ef2b1f47a4bb
-  data.tar.gz: 0c5acbbdccb82657f36347ccc0c4e47c8fc50207
+  metadata.gz: cd577dc14c3fb4e5bfc6786ba513a5f5902a15de
+  data.tar.gz: e4e5782f2e8cad01a34cb542b9c70bf1a0366dae
 SHA512:
-  metadata.gz: ff8f5b6f5d9ac58e403a43aed0c4488b24742acfb674acf669f7524b6d9257ac8bb515b9a92bc31f45e772cf7b3eb114b1ccf7fa767e9fd592f524ddde83ed57
-  data.tar.gz: 0b4e3c3272fd2c954085ac7b3cad5d5d2174bcba7b6cbced32bb20280df0a1b84e8b16cc39e05b610bc6533e71a272d619f3a3fc78b03e61c6d21c7e9acfa1d7
+  metadata.gz: aef657496482095e8dc3d24d65803a36b190f7c48104d998433b41f057a5dbc508905b39f54a92cf12fa77eb85e269e5ae45b46c5e1163cdbfcd0ac9616b15a7
+  data.tar.gz: 88e1331b089dfa0e9e90dd7f24493ac8e4f2f151edb9865116bb68f2e114b24fc6dc9e8cee10df877203212b6f9e4cfd97f9c4a26c9fe7c0c969edf507233b52

data/lib/msgr/binding.rb

@@ -17,7 +17,7 @@ module Msgr
         queue.bind connection.exchange, routing_key: key
       end
 
-      @subscription = queue.subscribe(ack: true) do |*args|
+      @subscription = queue.subscribe(manual_ack: true) do |*args|
         begin
           dispatcher.call Message.new(connection, *args, route)
         rescue => err

data/lib/msgr/client.rb

@@ -74,7 +74,7 @@ module Msgr
     def publish(payload, opts = {})
       mutex.synchronize do
         check_process!
-        connection.publish payload, opts
+        sync_publish payload, opts
       end
     end
 
@@ -94,6 +94,22 @@ module Msgr
     end
 
     private
+
+    def sync_publish(payload, opts)
+      begin
+        payload = MultiJson.dump(payload)
+        opts[:content_type] ||= 'application/json'
+      rescue
+        opts[:content_type] ||= 'application/text'
+      end
+
+      sync_publish_message payload.to_s, opts
+    end
+
+    def sync_publish_message(message, opts)
+      connection.publish message, opts
+    end
+
     def mutex
       @mutex
     end

data/lib/msgr/connection.rb

@@ -20,15 +20,10 @@ module Msgr
       bindings.any?
     end
 
-    def publish(payload, opts = {})
+    def publish(message, opts = {})
       opts[:routing_key] = opts.delete(:to) if opts[:to]
 
-      begin
-        payload = MultiJson.dump(payload)
-        exchange.publish payload, opts.merge(persistent: true, content_type: 'application/json')
-      rescue => error
-        exchange.publish payload.to_s, opts.merge(persistent: true, content_type: 'application/text')
-      end
+      exchange.publish message.to_s, opts.merge(persistent: true)
 
       log(:debug) { "Published message to #{opts[:routing_key]}" }
     end
@@ -42,7 +37,11 @@ module Msgr
     end
 
     def channel
-      @channel ||= connection.create_channel
+      @channel ||= begin
+        channel = connection.create_channel
+        channel.prefetch 1
+        channel
+      end
     end
 
     def release

data/lib/msgr/dispatcher.rb

@@ -1,4 +1,4 @@
-require 'concurrent/cached_thread_pool'
+require 'concurrent'
 
 module Msgr
 

data/lib/msgr/version.rb

@@ -2,7 +2,7 @@ module Msgr
   module VERSION
     MAJOR = 0
     MINOR = 11
-    PATCH = 0
+    PATCH = 1
     STAGE = nil
     STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.')
 

data/msgr.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'activesupport'
-  spec.add_dependency 'bunny', '~> 1.0'
-  spec.add_dependency 'concurrent-ruby', '~> 0.5.0'
+  spec.add_dependency 'bunny', '~> 1.5'
+  spec.add_dependency 'concurrent-ruby', '~> 0.7.0'
   spec.add_dependency 'multi_json'
 
   spec.add_development_dependency 'bundler', '~> 1.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: msgr
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement