cf-message-bus 0.0.4 → 0.2.0

data/lib/cf_message_bus/message_bus.rb

@@ -8,10 +8,11 @@ module CfMessageBus
   class MessageBus
     def initialize(config)
       @logger = config[:logger]
-      @internal_bus = MessageBusFactory.message_bus(config[:uri])
+
+      @internal_bus = MessageBusFactory.message_bus(
+        config[:servers] || config[:uris] || config[:uri])
+
       @subscriptions = {}
-      @internal_bus.on_reconnect { start_internal_bus_recovery }
-      @recovery_callback = lambda {}
     end
 
     def subscribe(subject, options = {}, &block)
@@ -30,10 +31,6 @@ module CfMessageBus
       end
     end
 
-    def recover(&block)
-      @recovery_callback = block
-    end
-
     def request(subject, data = nil, options = {}, &block)
       response_timeout = options.delete(:timeout)
       result_count = options.delete(:result_count)
@@ -50,6 +47,7 @@ module CfMessageBus
           run_handler(block, {timeout: true}, nil, subject, 'timeout')
         end
       end
+
       subscription_id
     end
 
@@ -93,19 +91,6 @@ module CfMessageBus
       end
     end
 
-    def start_internal_bus_recovery
-      EM.defer do
-        @logger.info("Reconnected to internal_bus.")
-
-        @recovery_callback.call
-
-        @subscriptions.each do |subject, options|
-          @logger.info("Resubscribing to #{subject}")
-          subscribe(subject, options[0], &options[1])
-        end
-      end
-    end
-
     def subscribe_on_reactor(subject, options = {}, &blk)
       EM.schedule do
         internal_bus.subscribe(subject, options) do |msg, inbox|
@@ -115,7 +100,7 @@ module CfMessageBus
     end
 
     def process_message(msg, inbox, &block)
-      payload = JSON.parse(msg, symbolize_keys: true)
+      payload = JSON.parse(msg)
       block.yield(payload, inbox)
     rescue => e
       @logger.error "exception parsing json: '#{msg}' '#{e.inspect}'"

data/lib/cf_message_bus/mock_message_bus.rb

@@ -1,10 +1,14 @@
 module CfMessageBus
   class MockMessageBus
+    attr_reader :published_messages, :published_synchronous_messages
+
     def initialize(config = {})
       @logger = config[:logger]
       @subscriptions = Hash.new { |hash, key| hash[key] = [] }
       @requests = {}
+      @synchronous_requests = {}
       @published_messages = []
+      @published_synchronous_messages = []
     end
 
     def subscribe(subject, opts = {}, &blk)
@@ -14,7 +18,7 @@ module CfMessageBus
 
     def publish(subject, message = nil, &callback)
       @subscriptions[subject].each do |subscription|
-        subscription.call(symbolize_keys(message))
+        subscription.call(stringify_keys(message))
       end
 
       @published_messages.push({subject: subject, message: message, callback: callback})
@@ -22,13 +26,15 @@ module CfMessageBus
       callback.call if callback
     end
 
-    def request(subject, data=nil, options={}, &blk)
+    def request(subject, data=nil, _={}, &blk)
       @requests[subject] = blk
       publish(subject, data)
       subject
     end
 
     def synchronous_request(subject, data=nil, options={})
+      @published_synchronous_messages.push(subject: subject, data: data, options: options)
+      stringify_keys(@synchronous_requests[subject])
     end
 
     def unsubscribe(subscription_id)
@@ -44,19 +50,19 @@ module CfMessageBus
       true
     end
 
+    def respond_to_synchronous_request(request_subject, data)
+      @synchronous_requests[request_subject] = data
+    end
+
     def respond_to_request(request_subject, data)
       block = @requests.fetch(request_subject) { lambda { |data| nil } }
-      block.call(symbolize_keys(data))
+      block.call(stringify_keys(data))
     end
 
     def do_recovery
       @recovery.call if @recovery
     end
 
-    def published_messages
-      @published_messages
-    end
-
     def clear_published_messages
       @published_messages.clear
     end
@@ -66,18 +72,29 @@ module CfMessageBus
     end
 
     def has_published_with_message?(subject, message)
-      @published_messages.find { |publication| publication[:subject] == subject && publication[:message] == message }
+      @published_messages.find do |publication|
+        publication[:subject] == subject &&
+          publication[:message] == message
+      end
+    end
+
+    def has_requested_synchronous_messages?(subject, data=nil, options={})
+      @published_synchronous_messages.find do |publication|
+        publication[:subject] == subject &&
+          publication[:data] == data &&
+          publication[:options] == options
+      end
     end
 
     private
 
-    def symbolize_keys(object)
+    def stringify_keys(object)
       case object
       when Array
-        object.map {|k| symbolize_keys(k) }
+        object.map {|k| stringify_keys(k) }
       when Hash
         object.inject({}) do |memo, (key, value)|
-          memo[key.to_sym] = symbolize_keys(value)
+          memo[key.to_s] = stringify_keys(value)
           memo
         end
       else

data/lib/cf_message_bus/version.rb

@@ -1,3 +1,3 @@
 module CfMessageBus
-  VERSION = "0.0.4"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf-message-bus
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-22 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,17 +64,23 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.0.beta.12
+    - - <
       - !ruby/object:Gem::Version
-        version: 0.4.26
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.0.beta.12
+    - - <
       - !ruby/object:Gem::Version
-        version: 0.4.26
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: vcap-concurrency
   requirement: !ruby/object:Gem::Requirement