rmessage 0.1.1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01d9e52b3e8082a074ff5d01c477c26ebb1000351b7b852b9e0de5755bc3fb96
-  data.tar.gz: e46587aff7eb07d66d273d5e4540f61bfe1e36c2e5029ee1b60ac5926b91917e
+  metadata.gz: c69292182b658aa175401a67815c59696c47a43f4b27b7987f27fd5f7d509e64
+  data.tar.gz: a89eb21e1f6759e7d283184d18f0cf08c9b15cad06abe0c96b98fd9fc1d3879a
 SHA512:
-  metadata.gz: 31c38a6a34571cede4239c56177f77ad2fe41805499b5adff88b52117c4ba4c1f081d3d7ef6b3e963adf21f096a032c9aed76942423423455481a1f977c61922
-  data.tar.gz: 33001b0b8853432550828937bfca3ad53704d14b2a717bcff091ed857f84704494b4b5499fa264b1b42bf31841c3605e589fbe7e5750f7880c1770078b3fa896
+  metadata.gz: 5d6d75dce9f23ca9b114e44b10c45336e469b9afea34c3187a271ce561ac2d16fd58314f8540fa24be731decc93a3099f82a0c29fb5662a7b9dd04a1d2036e16
+  data.tar.gz: 2b08ff7367d060e9b1878ac2296e6c666089b236d15ea66bf92e61a4f505ac5a785965f239fed313c84efc1ffdc165dbeeded1864ac45bb28aaf7ae261736146

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.
@@ -19,34 +19,35 @@ module RMessage
     # * label [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]
+      @payload = opts[:payload] || 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]
+        @type ||= data[:type]
         @signature ||= data[:signature]
         @payload ||= data[:payload]
       when String
         parsed = Oj.load(data)
-        @label ||= parsed['label']
+        @type ||= parsed['type']
         @signature ||= parsed['signature']
         @payload ||= parsed['payload']
       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

@@ -15,14 +15,16 @@ module RMessage::Subscriber
   # @param auto_parse [Boolean] should messages be parsed automatically?
   # @param connection [Redis] optional argument to provide the redis connection.
   # @param connection_index [Integer] the index of the redis connection in {RMessage::CONNECTION_POOL}
-  def setup_subscription(channel: @channel, auto_parse: false, connection: nil, connection_index: 0, &_)
+  def setup_subscription(channel: @channel, auto_parse: false, logger: nil, connection: nil, connection_index: 0, &_)
     redis_connection = connection || RMessage::CONNECTION_POOL[connection_index]
     redis_connection.subscribe(channel) do |event|
-      event.subscribe { puts "Subscribed to #{channel}" }
-      if auto_parse
-        event.message { |_, message| parse_message(message) }
-      else
-        event.message { |_, message| yield(message) }
+      event.subscribe do
+        logger&.info("Subscribed to channel [channel: #{channel}]")
+      end
+
+      event.message do |_, message|
+        auto_parse ? yield(parse_message(message)) : yield(message)
+        logger&.info("Received Message: #{message}")
       end
     end
   end
@@ -30,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.1
+  version: 0.1.4
 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:
   - - ">="