freddy 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1b843578b576679503e114c5e6bda050cd980eb
-  data.tar.gz: af256b6384fca7e9ee13fd4d9a5f8b3301a96d0d
+  metadata.gz: 2ecb2f4ec6c6f60c98794bf27eb96435bf6ff6c5
+  data.tar.gz: c9e9d05eb2b43589c85d38610778b861498c6446
 SHA512:
-  metadata.gz: 3b3768d47cf8a14f2743ca9e391458cba6968165e6fc29e8f1112f6bd093dff34bb933e76155baa95711fcbc8da4a6b734cf982a094fe63ba50566a06683d196
-  data.tar.gz: 225aca279255a4f0d9643100f48ecc32b817f55b43fb16a120cf7fdf2b32c8b5bd0f649c9c333e0e38c1815de1c7d01b6159588413ce10099a224cf1c9289c9c
+  metadata.gz: bf8de81be9694937033dc1fba0013319093c96fc09a07792f6185b9164a5ebcb6bd399d82eb031efdcdd949015fa8e14735e1ac96e161e3cc2fb4edd8d67a53b
+  data.tar.gz: 6547d13beb561b67f21967299a4d6c9f9a67768cccf1f1b15da13a5d042933f171c8ab043df17dc846785229816ebadb45dab0f0b8162ebf18933cd15de970b3

data/README.md

@@ -12,6 +12,12 @@ logger = Logger.new(STDOUT)
 freddy = Freddy.build(logger, host: 'localhost', port: 5672, user: 'guest', pass: 'guest')
 ```
 
+## Supported message queues
+
+These message queues have been tested and are working with Freddy. Other queues can be added easily:
+
+* [RabbitMQ](https://www.rabbitmq.com/)
+
 ## Delivering messages
 
 ### Simple delivery

data/freddy.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   else
     spec.name          = "freddy"
   end
-  spec.version       = '0.4.3'
+  spec.version       = '0.4.4'
   spec.authors       = ["Urmas Talimaa"]
   spec.email         = ["urmas.talimaa@gmail.com"]
   spec.description   = %q{Messaging API}
@@ -25,11 +25,12 @@ Gem::Specification.new do |spec|
 
   if RUBY_PLATFORM == 'java'
     spec.add_dependency 'march_hare', '~> 2.12.0'
+    spec.add_dependency 'symbolizer'
   else
     spec.add_dependency "bunny", "2.2.0"
+    spec.add_dependency "oj", "~> 2.13"
   end
 
-  spec.add_dependency "symbolizer"
   spec.add_dependency "hamster", "~> 1.0.1.pre.rc3"
   spec.add_dependency "thread", "~> 0.2"
 end

data/lib/freddy/consumer.rb

@@ -33,7 +33,7 @@ class Freddy
       queue = create_queue('', exclusive: true).bind(@topic_exchange, routing_key: pattern)
       consumer = queue.subscribe do |payload, delivery|
         @consume_thread_pool.process do
-          block.call parse_payload(payload), delivery.routing_key
+          block.call Payload.parse(payload), delivery.routing_key
         end
       end
       @logger.debug "Tapping into messages that match #{pattern}"
@@ -45,7 +45,7 @@ class Freddy
     def consume_using_pool(queue, options, pool, &block)
       consumer = queue.subscribe do |payload, delivery|
         pool.process do
-          parsed_payload = parse_payload(payload)
+          parsed_payload = Payload.parse(payload)
           log_receive_event(queue.name, parsed_payload, delivery.correlation_id)
           block.call parsed_payload, delivery
         end
@@ -54,14 +54,6 @@ class Freddy
       ResponderHandler.new consumer, @channel
     end
 
-    def parse_payload(payload)
-      if payload == 'null'
-        {}
-      else
-        Symbolizer.symbolize(JSON(payload))
-      end
-    end
-
     def create_queue(destination, options={})
       AdaptiveQueue.new(@channel.queue(destination, options))
     end

data/lib/freddy/payload.rb

@@ -0,0 +1,46 @@
+begin
+  require 'oj'
+rescue LoadError
+  require 'symbolizer'
+  require 'json'
+end
+
+class Freddy
+  class Payload
+    def self.parse(payload)
+      return {} if payload == 'null'
+
+      json_handler.parse(payload)
+    end
+
+    def self.dump(payload)
+      json_handler.dump(payload)
+    end
+
+    def self.json_handler
+      @_json_handler ||= defined?(Oj) ? OjAdapter : JsonAdapter
+    end
+
+    class OjAdapter
+      def self.parse(payload)
+        Oj.load(payload, symbol_keys: true)
+      end
+
+      def self.dump(payload)
+        Oj.dump(payload, mode: :compat)
+      end
+    end
+
+    class JsonAdapter
+      def self.parse(payload)
+        # MRI has :symbolize_keys, but JRuby does not. Not adding it at the
+        # moment.
+        Symbolizer.symbolize(JSON.parse(payload))
+      end
+
+      def self.dump(payload)
+        JSON.dump(payload)
+      end
+    end
+  end
+end

data/lib/freddy/producer.rb

@@ -17,7 +17,7 @@ class Freddy
       @logger.debug "Producing message #{payload.inspect} to #{destination}"
 
       properties = properties.merge(routing_key: destination, content_type: CONTENT_TYPE)
-      json_payload = payload.to_json
+      json_payload = Payload.dump(payload)
 
       @topic_exchange.publish json_payload, properties.dup
       @exchange.publish json_payload, properties.dup

data/lib/freddy.rb

@@ -5,13 +5,13 @@ else
 end
 
 require 'json'
-require 'symbolizer'
 require 'thread/pool'
 
 require_relative 'freddy/adaptive_queue'
 require_relative 'freddy/consumer'
 require_relative 'freddy/producer'
 require_relative 'freddy/request'
+require_relative 'freddy/payload'
 
 class Freddy
   class ErrorResponse < StandardError

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: freddy
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Urmas Talimaa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-14 00:00:00.000000000 Z
+date: 2015-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.2.0
 - !ruby/object:Gem::Dependency
-  name: symbolizer
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.13'
 - !ruby/object:Gem::Dependency
   name: hamster
   requirement: !ruby/object:Gem::Requirement
@@ -118,6 +118,7 @@ files:
 - lib/freddy/delivery.rb
 - lib/freddy/message_handler.rb
 - lib/freddy/message_handlers.rb
+- lib/freddy/payload.rb
 - lib/freddy/producer.rb
 - lib/freddy/request.rb
 - lib/freddy/request_manager.rb