rmessage 0.1.0 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 027c26a46e85945a595e17f63f468b7db4bbc5445e62337e72aba85136ebd089
-  data.tar.gz: 5059e66328f264c26c20d42ab152dc4d1486b02f7990a87dec54560f94455def
+  metadata.gz: a49ac884778c35479a6f9bd22cdf223aac6d02ef586d61c41cd16b1278c4be97
+  data.tar.gz: d2d69bc681472e741c9eaec10dab3903c2014488030c8fae76d05908c14b4eb7
 SHA512:
-  metadata.gz: a7a1371e9e285c7f8313478f8ee7ecdce68d90b411922ed321d634781122a375534278439bfa02c175bfd1448212f08008339ada3b73e23306d27554e56cde21
-  data.tar.gz: ffdc5a57b6e9d5a99f9f22536478c45287076cc03a1fa2ac6ce25778f90b8b9e3f3ea316632a7d771c995f6c97e912ab479f4181010c2ee696513b3d415718b7
+  metadata.gz: 9c35501badb73bf98833fb58703167cae86ce0ceccee81e3e416b7f9a76e63f4173f19307e12bacd8c1e4e3eb173f39ce2b6965ab433c8cf97ec44b632d87c5a
+  data.tar.gz: 8dc719f163a85322f28b0cb10674113ab0993e1983429999c71d0f3057a017d47979719a781a9c4962bbe0faddd732376c107cdf42f1bd2e024cd6ba694a800c

data/lib/rmessage/message.rb

@@ -19,15 +19,15 @@ 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)
+    def initialize(opts = {})
       @label = opts[:label] || :UNTITLED
       @signature = opts[:signature] || Druuid.gen
-      @payload = data || opts[:payload]
+      @payload = opts[:payload] || {}
     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
@@ -41,6 +41,7 @@ module RMessage
         @payload ||= parsed['payload']
       else raise TypeError, 'Invalid type for Message#payload'
       end
+      self
     end
 
     # Build a JSON string using data in this message

data/lib/rmessage/publisher.rb

@@ -10,7 +10,8 @@ module RMessage::Publisher
   # @param message [RMessage::Message] the message
   # @param channel [String, Integer, Symbol] the channel
   # @param connection_index [Integer] the index of the connection to Redis within the {RMessage::CONNECTION_POOL}
-  def publish(message, channel: @channel, connection_index: 0)
-    RMessage::CONNECTION_POOL[connection_index].publish(channel, message.build)
+  def publish(message, channel: @channel, connection: nil, connection_index: 0)
+    redis_connection = connection || RMessage::CONNECTION_POOL[connection_index]
+    redis_connection.publish(channel, message.build)
   end
 end

data/lib/rmessage/subscriber.rb

@@ -13,17 +13,18 @@ module RMessage::Subscriber
   # Setup a subscription to a specific Redis channel
   # @param channel [Symbol, String, Integer] the channel
   # @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_index: 0, &_)
-    RMessage::CONNECTION_POOL[connection_index].subscribe(channel) do |event|
+  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 do
-        puts "Subscribed to #{channel}"
+        logger&.info("Subscribed to channel [channel: #{channel}]")
       end
 
-      if auto_parse
-        event.message { |_, message| parse_message(message) }
-      else
-        event.message { |_, message| yield(message) }
+      event.message do |_, message|
+        auto_parse ? yield(parse_message(message)) : yield(message)
+        logger&.info("Received Message: #{message}")
       end
     end
   end
@@ -31,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(message_data).read
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rmessage
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.3
 platform: ruby
 authors:
 - Patrick W.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-11 00:00:00.000000000 Z
+date: 2022-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv