mimi-messaging 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81b174d0230b57feade2b45ddf7ba624bcaae33e
-  data.tar.gz: 810f82256c0e7b94e7c6f5df9b2f66b87bd640fb
+  metadata.gz: 54a536d257b3a394b605e80e1b24167e5912f785
+  data.tar.gz: 03374246a36903692068863563ec7a111cd18b8b
 SHA512:
-  metadata.gz: 326f345bb63e01400930c1127f2fecc27769bc3c3ce43e04c96abedcafc054c74b25c459acc1079a6e20249dd1b3614c67d8410be9e0b0e05dd77beb7f57aef2
-  data.tar.gz: 124ad7375b0465e09cbe7b23c184ff484572d0bab3f4f85e6c4da9750026d2b7ae62ff03d2078a2ece20d6d3ff8e0e7fc1b91d95a16c1fe118adbd420e336ae4
+  metadata.gz: '0295bb31beb00e6370340e4db43bab2a145e9d463d514bcdf1eba944a171edb614133afc7384a9e1e3010b832c4ff4b547ae9a27e307efb19d4abe3acee0782d'
+  data.tar.gz: 5e3a7f512fc58d688551c9601c26b863872dfeafaf860554796f2493ba30234045c591520c453fa973cae529069516cc19653553cf369eca7f31bc7c5ac29395

data/lib/mimi/messaging/message.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Mimi
+  module Messaging
+    #
+    # A Message is a Hash and additional headers structure.
+    #
+    class Message < Hash
+      attr_reader :headers
+
+      # Creates a Message out of Hash or another Message.
+      #
+      # @param message_or_hash [Hash,Message]
+      # @param headers [Hash,nil] additional headers to attach to the message
+      #
+      def initialize(message_or_hash, headers = nil)
+        unless message_or_hash.is_a?(Hash) # or a Message
+          raise ArgumentError, "Message or Hash is expected as argument"
+        end
+
+        # copy attributes
+        message_or_hash.each { |k, v| self[k] = v.dup }
+
+        # copy headers
+        headers ||= {}
+        if message_or_hash.is_a?(Mimi::Messaging::Message)
+          @headers = message_or_hash.headers.merge(headers)
+        else
+          @headers = headers
+        end
+      end
+    end # class Message
+  end # module Messaging
+end # module Mimi

data/lib/mimi/messaging/version.rb

@@ -2,6 +2,6 @@
 
 module Mimi
   module Messaging
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/lib/mimi/messaging.rb

@@ -4,6 +4,7 @@ require "mimi/core"
 require_relative "messaging/adapters"
 require_relative "messaging/errors"
 require_relative "messaging/json_serializer"
+require_relative "messaging/message"
 require_relative "messaging/version"
 
 module Mimi
@@ -185,10 +186,10 @@ module Mimi
     #
     def self.command(target, message = {}, opts = {})
       raise ArgumentError, "Invalid target argument" unless TARGET_REGEX.match(target)
-      raise ArgumentError, "Invalid message, Hash is expected" unless message.is_a?(Hash)
+      raise ArgumentError, "Invalid message, Hash or Message is expected" unless message.is_a?(Hash)
       raise Error, "Failed to send command, adapter is not started" unless started?(:adapter)
 
-      adapter.command(target, message, opts)
+      adapter.command(target, Mimi::Messaging::Message.new(message), opts)
     end
 
     # Executes the query to the given target and returns response
@@ -196,17 +197,17 @@ module Mimi
     # Raises Timeout::Error if the response from the target was not received in time.
     #
     # @param target [String] "<queue>/<method>"
-    # @param message [Hash]
+    # @param message [Hash,Mimi::Messaging::Message]
     # @param opts [Hash] additional options, e.g. :timeout
     #
     # @return [Hash]
     #
     def self.query(target, message = {}, opts = {})
       raise ArgumentError, "Invalid target argument" unless TARGET_REGEX.match(target)
-      raise ArgumentError, "Invalid message, Hash is expected" unless message.is_a?(Hash)
+      raise ArgumentError, "Invalid message, Hash or Message is expected" unless message.is_a?(Hash)
       raise Error, "Failed to send query, adapter is not started" unless started?(:adapter)
 
-      adapter.query(target, message, opts)
+      adapter.query(target, Mimi::Messaging::Message.new(message), opts)
     end
 
     # Broadcasts the event with the given target
@@ -217,10 +218,10 @@ module Mimi
     #
     def self.event(target, message = {}, opts = {})
       raise ArgumentError, "Invalid target argument" unless TARGET_REGEX.match(target)
-      raise ArgumentError, "Invalid message, Hash is expected" unless message.is_a?(Hash)
+      raise ArgumentError, "Invalid message, Hash or Message is expected" unless message.is_a?(Hash)
       raise Error, "Failed to broadcast event, adapter is not started" unless started?(:adapter)
 
-      adapter.event(target, message, opts)
+      adapter.event(target, Mimi::Messaging::Message.new(message), opts)
     end
 
     # Registers the request (command/query) processor.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mimi-messaging
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Alex Kukushkin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-06 00:00:00.000000000 Z
+date: 2019-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mimi-core
@@ -122,6 +122,7 @@ files:
 - lib/mimi/messaging/adapters/test.rb
 - lib/mimi/messaging/errors.rb
 - lib/mimi/messaging/json_serializer.rb
+- lib/mimi/messaging/message.rb
 - lib/mimi/messaging/version.rb
 - mimi-messaging.gemspec
 homepage: https://github.com/kukushkin/mimi-messaging