ElmerFudd 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f3b594d1565a291ef8f3ea7fd8974e7f5881710
-  data.tar.gz: 4437ba2cf870d5a76cbee31dec91dcdc1e5541d0
+  metadata.gz: 5c77507d5550d32879e421a33c9c667eceed1bb5
+  data.tar.gz: 7016a77b2fd57fd16f022fd27867e2d68543f93c
 SHA512:
-  metadata.gz: 8487db7dbd04a30b7cda67f0a923cf7f2edd1d1cfbc810409a33412bb6fbb9b999050abf791232a3716ec4fbc2aa8915acfcdcb5d63cc4c6838f507541879a6f
-  data.tar.gz: 21f18bace52a65eaca2f72adc4b901b15f2c6d469fdb1879bcf0be1b1f7afcffc8282393d445c68ea3634276b57b1e0c7e6db02444d3b88409c24effea85b94a
+  metadata.gz: e5e12979ea5778ac402d96698f5d5b73b116fabfc6c840a6ada53efdd2bfd8fed60283abd24a2de0d6c48b2516c897e1d360f93bf581c53cc05dea2a762298a2
+  data.tar.gz: 7cfede537d36e38d866ca688d8c987327ccaf5765bf859e2078e68f69a732e5af8f7b5d7faa0282c3d9bfe7bd018522522852412e239ae533ec7efb123bf0ae7

data/lib/ElmerFudd.rb

@@ -4,6 +4,8 @@ require 'thread'
 require 'json'
 
 module ElmerFudd
+  DEFAULT_CONTENT_TYPE = Bunny::Channel::DEFAULT_CONTENT_TYPE
+
   require 'ElmerFudd/publisher'
   require 'ElmerFudd/json_publisher'
 

data/lib/ElmerFudd/direct_handler.rb

@@ -2,12 +2,15 @@ module ElmerFudd
   class DirectHandler
     include Filter
     attr_reader :route
+    attr_accessor :call_reply_content_type
 
     def initialize(route, callback, filters, options)
       @route = route
       @callback = callback
       @filters = filters
       @durable = options.fetch(:durable)
+      @call_reply_content_type = ElmerFudd::DEFAULT_CONTENT_TYPE
+      initialize_filters
     end
 
     def queue(env)
@@ -38,6 +41,11 @@ module ElmerFudd
 
     private
 
+    def initialize_filters
+      @filters.select { |filter| filter.respond_to?(:setup) }.
+        each { |filter| filter.setup(self) }
+    end
+
     def filters_names
       @filters.map { |f| f.respond_to?(:name) ? f.name : f.class.name }
     end

data/lib/ElmerFudd/json_filter.rb

@@ -1,6 +1,11 @@
 module ElmerFudd
   class JsonFilter
     extend Filter
+
+    def self.setup(handler)
+      handler.call_reply_content_type = 'application/json'
+    end
+
     def self.call(env, message, filters)
       message.payload = JSON.parse(message.payload)
       {result: call_next(env, message, filters)}.to_json

data/lib/ElmerFudd/json_publisher.rb

@@ -1,15 +1,17 @@
 module ElmerFudd
   class JsonPublisher < Publisher
-    def notify(topic_exchange, routing_key, payload)
-      super(topic_exchange, routing_key, payload.to_json)
+    CONTENT_TYPE = 'application/json'
+
+    def notify(topic_exchange, routing_key, payload, content_type: CONTENT_TYPE)
+      super(topic_exchange, routing_key, payload.to_json, content_type: content_type)
     end
 
-    def cast(queue_name, payload)
-      super(queue_name, payload.to_json)
+    def cast(queue_name, payload, content_type: CONTENT_TYPE)
+      super(queue_name, payload.to_json, content_type: content_type)
     end
 
-    def call(queue_name, payload, **kwargs)
-      JSON.parse(super(queue_name, payload.to_json, **kwargs))
+    def call(queue_name, payload, content_type: CONTENT_TYPE, **kwargs)
+      JSON.parse(super(queue_name, payload.to_json, content_type: content_type, **kwargs))
     end
   end
 end

data/lib/ElmerFudd/publisher.rb

@@ -35,7 +35,7 @@ module ElmerFudd
       end
     end
 
-    def notify(topic_exchange, routing_key, payload)
+    def notify(topic_exchange, routing_key, payload, content_type: ElmerFudd::DEFAULT_CONTENT_TYPE)
       @exchange.with do |exchange|
         @logger.debug "ElmerFudd: NOTIFY - topic_exchange: #{topic_exchange}, routing_key: #{routing_key}, payload: #{payload}"
         exchange.topic(topic_exchange).publish payload.to_s, routing_key: routing_key
@@ -43,7 +43,7 @@ module ElmerFudd
       nil
     end
 
-    def cast(queue_name, payload)
+    def cast(queue_name, payload, content_type: ElmerFudd::DEFAULT_CONTENT_TYPE)
       @exchange.with do |exchange|
         @logger.debug "ElmerFudd: CAST - queue_name: #{queue_name}, payload: #{payload}"
         exchange.direct.publish(payload.to_s, routing_key: queue_name)
@@ -51,7 +51,7 @@ module ElmerFudd
       nil
     end
 
-    def call(queue_name, payload, timeout: 10)
+    def call(queue_name, payload, timeout: 10, content_type: ElmerFudd::DEFAULT_CONTENT_TYPE)
       @exchange.with do |exchange|
         begin
           @logger.debug "ElmerFudd: CALL - queue_name: #{queue_name}, payload: #{payload}, timeout: #{timeout}"
@@ -69,7 +69,9 @@ module ElmerFudd
               end
             end
 
-            exchange.direct.publish(payload.to_s, routing_key: queue_name, reply_to: exchange.rpc_reply_queue.name,
+            exchange.direct.publish(payload.to_s,
+                                    content_type: content_type,
+                                    routing_key: queue_name, reply_to: exchange.rpc_reply_queue.name,
                                     correlation_id: correlation_id)
 
             mutex.synchronize { resource.wait(mutex) unless response }

data/lib/ElmerFudd/rpc_handler.rb

@@ -7,7 +7,9 @@ module ElmerFudd
     end
 
     def reply(env, original_message, response)
-      exchange(env).publish(response.to_s, routing_key: original_message.properties.reply_to,
+      exchange(env).publish(response.to_s,
+                            content_type: call_reply_content_type,
+                            routing_key: original_message.properties.reply_to,
                             correlation_id: original_message.properties.correlation_id)
     end
   end

data/lib/ElmerFudd/version.rb

@@ -1,3 +1,3 @@
 module ElmerFudd
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ElmerFudd
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Andrzej Sliwa
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny