rmessage 0.1.3 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a49ac884778c35479a6f9bd22cdf223aac6d02ef586d61c41cd16b1278c4be97
-  data.tar.gz: d2d69bc681472e741c9eaec10dab3903c2014488030c8fae76d05908c14b4eb7
+  metadata.gz: 8e4de78b3d594d8614aaf2b4e9e79a5ebde9e7cb5bc0f67910f14fc864f096fc
+  data.tar.gz: 71fd9575ea9aa282c285975df97157d1722fb83c507eac03f3922e3864140bc4
 SHA512:
-  metadata.gz: 9c35501badb73bf98833fb58703167cae86ce0ceccee81e3e416b7f9a76e63f4173f19307e12bacd8c1e4e3eb173f39ce2b6965ab433c8cf97ec44b632d87c5a
-  data.tar.gz: 8dc719f163a85322f28b0cb10674113ab0993e1983429999c71d0f3057a017d47979719a781a9c4962bbe0faddd732376c107cdf42f1bd2e024cd6ba694a800c
+  metadata.gz: 140827cd81a1b0ab14d021b190b74184317cf48e8c06e8e28fe8ddca6c440fbc4f92926aaa59478f65c0fb15f2004fb11c87688024c8c9bba002668fa647a45b
+  data.tar.gz: 31fb24d8197fd9bdede42fa4be861c5c6dbd2d9fd04b133db0014998e06ca6036842181fe370903fc1a06228fae9dacbd6c74ea913a9938db63100a1eaa52835

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,14 +15,14 @@ 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
     def initialize(opts = {})
-      @label = opts[:label] || :UNTITLED
-      @signature = opts[:signature] || Druuid.gen
-      @payload = opts[:payload] || {}
+      @type = opts[:type] || opts['type'] || :UNTITLED
+      @signature = opts[:signature] || opts['signature']
+      read(opts)
     end
 
     # Read and parse data. Defaults to the Message#payload.
@@ -31,14 +31,14 @@ module RMessage
     def read(data = @payload)
       case data
       when Hash
-        @label ||= data[:label]
+        @type = data[:type]
         @signature ||= data[:signature]
-        @payload ||= data[:payload]
+        @payload = data[:payload] || data
       when String
         parsed = Oj.load(data)
-        @label ||= parsed['label']
+        @type = parsed['type']
         @signature ||= parsed['signature']
-        @payload ||= parsed['payload']
+        @payload = parsed['payload'] || parsed
       else raise TypeError, 'Invalid type for Message#payload'
       end
       self
@@ -47,7 +47,7 @@ module RMessage
     # 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

@@ -32,7 +32,7 @@ module RMessage::Subscriber
   private
 
   def parse_message(message_data)
-    RMessage::Message.new(message_data).read
+    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.3
+  version: 0.1.6
 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:
   - - ">="