rmessage 0.1.2 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f771b5b481689023a94dec959210999ef38cd0e043b7d32b60f2cf66e45f7f6c
-  data.tar.gz: b05c425ee17726307234565fc174c07485b551fe7560db3a8df33a93f82a34f8
+  metadata.gz: 79600cc96aeee7a3ab6fc3f3f70e0993846069948749a7357042883b500ab6d1
+  data.tar.gz: 95d2eb5e92f60a90b3d9f2a476f09c47ab169f011a975a02b01239abc5ec313a
 SHA512:
-  metadata.gz: 29a45abc74618f7c559da04ca0728fbc5979c211510185f311acf6178621e32bdd984d1e8d93c317c263a953aef00726c40c7dab6837959144d786af7fe7d383
-  data.tar.gz: ffd9e32788dcf26e1647f9846ee9122f1b83e497b69e5c81abc996ce2c431db49449848415aacf20e8c763cf6793f54fdaed6287928f51afa7b058410ee64cfe
+  metadata.gz: 84fbd03fdc2203f20e0c8ac2f076e20db5434c606ce6d7e0c4260d1917ffa40e9036a0a3b77ed08cb1cad0af513cd722689129b6b4e62a30566fcc0cc76a7cf8
+  data.tar.gz: a8c91c22cdc8c12c5537aaf7e2afb0addd282fa5c67af4db68b3354bcac13bb5c304eb2bfa36d88ab86e5d9ebb8b08b5643d86eee5a1905011eff9a2b83dd145

data/lib/rmessage/message.rb

@@ -2,9 +2,9 @@ module RMessage
   # A Message encapsulates a JSON payload that is sent to or received from Redis.
   class Message
 
-    # @!attribute [r] label
+    # @!attribute [r] type
     # @return [Symbol, String] the label.
-    attr :label
+    attr :type
 
     # @!attribute [r] signature
     # @return [Integer, String] the signature.
@@ -15,38 +15,39 @@ module RMessage
     attr :payload
 
     # Constructs a new Message
-    # @param opts [Hash] message options
-    # * label [Symbol, String] the Message label
+    # @param opts [Hash, String] message options
+    # * type [Symbol, String] the Message label
     # * signature [Integer, String] the Message signature
     # * payload [Hash, String] the Message data
-    # @param data [Hash, String] message data
-    def initialize(opts = {}, data = nil)
-      @label = opts[:label] || :UNTITLED
+    def initialize(opts = {})
+      @type = opts[:type] || :UNTITLED
       @signature = opts[:signature] || Druuid.gen
-      @payload = data || opts[:payload]
+      read(opts)
     end
 
     # Read and parse data. Defaults to the Message#payload.
     # @param data [Hash, String] the data.
+    # @return [RMessage::Message]
     def read(data = @payload)
       case data
       when Hash
-        @label ||= data[:label]
-        @signature ||= data[:signature]
-        @payload ||= data[:payload]
+        @type = data[:type]
+        @signature = data[:signature]
+        @payload ||= data[:payload] || data
       when String
         parsed = Oj.load(data)
-        @label ||= parsed['label']
-        @signature ||= parsed['signature']
-        @payload ||= parsed['payload']
+        @type = parsed['type']
+        @signature = parsed['signature']
+        @payload ||= parsed['payload'] || parsed
       else raise TypeError, 'Invalid type for Message#payload'
       end
+      self
     end
 
     # Build a JSON string using data in this message
     # @param data [Hash, String] the payload.
     def build(data = @payload)
-      Oj.dump({ 'label' => @label, 'signature' => @signature, 'payload' => data })
+      Oj.dump({ 'type' => @type, 'signature' => @signature, 'payload' => data })
     end
   end
 end

data/lib/rmessage/subscriber.rb

@@ -23,7 +23,7 @@ module RMessage::Subscriber
       end
 
       event.message do |_, message|
-        auto_parse ? parse_message(message) : yield(message)
+        auto_parse ? yield(parse_message(message)) : yield(message)
         logger&.info("Received Message: #{message}")
       end
     end
@@ -32,9 +32,7 @@ module RMessage::Subscriber
   private
 
   def parse_message(message_data)
-    msg = RMessage::Message.new(message_data)
-    msg.read
-    @events[msg.label].new(msg)
+    RMessage::Message.new.read(message_data)
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmessage
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.5
 platform: ruby
 authors:
 - Patrick W.
@@ -109,6 +109,7 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
+- lib/rmessage
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="