natsy 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6bc9668d49b9d899ccff640de76b89dfdd2063e44d08d8189a1fcce934e2d70
-  data.tar.gz: 3a7b7f59a818778db5a8fd48c5b34d26842a900e8b340a3be1d8541569c671bf
+  metadata.gz: ece7795e8d0829b951bc59e8be816af7b48d8be4c30ddbb7cc6d30a802439ce6
+  data.tar.gz: 9cd71c604e80e6b2caddec98d159a3bc27487bbd3c295ca779e9d88b7df26968
 SHA512:
-  metadata.gz: 2c4f742f409308fae258a8c0de19c4072757855073b1ccab1114b5e818bd29c53bdd269aa330942457c2c737ee798f2b1b6606c678055babc815d576fbb9dd78
-  data.tar.gz: 9b879994fe87e9a4430accf0a837a03989cdd50b18388e13877541203f91d47f394af8fd64f43e49a4fd34196dee4ca0e1af2bd9035b2e4061419a419115a123
+  metadata.gz: 9b9339a4ab42f14e494f6283a50bdfb32465a81c361dc488d636d14d79f62be52e2448a9ebd1f756e8e9dc77be5f001231a87bfa1e3e1535c37b9a7c634a8784
+  data.tar.gz: 60dcb7f42d58fa4f6a42795ebd7ead07e74e58282564139f360f14da37cdc76e749e55af036bfcff79589bbd002a6f8cb02cb9e3da35e92c72a83b53911d465c

data/.rubocop.yml

@@ -26,7 +26,7 @@ Layout/FirstArrayElementIndentation:
 # Metrics
 
 Metrics/AbcSize:
-  Max: 30
+  Max: 35
   CountRepeatedAttributes: false
   Exclude:
     - 'spec/**/*_spec.rb'
@@ -62,6 +62,9 @@ Metrics/MethodLength:
     - array
     - hash
     - heredoc
+  Exclude:
+    - 'spec/**/*_spec.rb'
+    - '*.gemspec'
 
 Metrics/ModuleLength:
   Max: 150
@@ -75,7 +78,7 @@ Metrics/ModuleLength:
     - '*.gemspec'
 
 Metrics/PerceivedComplexity:
-  Max: 15
+  Max: 20
   Exclude:
     - 'spec/**/*_spec.rb'
     - '*.gemspec'

data/README.md

@@ -5,14 +5,14 @@ The `natsy` gem allows you to listen for (and reply to) NATS messages asynchrono
 ## TODO
 
 - [x] docs
-- [ ] tests
+- [x] tests
 - [x] "controller"-style classes for reply organization
 - [x] runtime subscription additions
 - [x] multiple queues
-- [ ] `on_error` handler so you can send a response (what's standard?)
-- [ ] config options for URL/host/port/etc.
+- [x] config options for URL/host/port/etc.
 - [ ] config for restart behavior (default is to restart listening on any `StandardError`)
-- [ ] consider using child processes instead of threads
+- [ ] `on_error` handler so you can send a response (what's standard?)
+- [ ] support lifecycle callbacks (like `on_connect`, `on_disconnect`, etc.) provided by the `nats` gem
 
 ## Installation
 
@@ -240,7 +240,7 @@ Natsy::Client.start!
 
 Create controller classes which inherit from `Natsy::Controller` in order to give your message listeners some structure.
 
-Use the `::default_queue` macro to set a default queue string. If omitted, the controller will fall back on the global default queue assigned to `Natsy::Config::default_queue` (as described [here](#default-queue-section)). If no default queue is set in either the controller or globally, then the default queue will be blank. Set the default queue to `nil` in a controller to override the global default queue and explicitly make the default queue blank for that controller.
+Use the `::default_queue` macro to set a default queue string. If omitted, the controller will fall back on the global default queue assigned to `Natsy::Config::default_queue` (as described [here](#default-queue-section)). If no default queue is set in either the controller or globally, then the default queue will be blank. Set the default queue to `nil` in a controller to fall back to the global default queue.
 
 Use the `::subject` macro to create a block for listening to that subject segment. Nested calls to `::subject` will append each subsequent subject/pattern string to the last (joined by a periods). There is no limit to the level of nesting.
 
@@ -276,9 +276,13 @@ class HelloController < Natsy::Controller
   end
 
   subject "hows" do
-    subject "*" do
+    # The queue at this point is "foobar"
+    subject "*", queue: "barbaz" do # Override the default queue at any point
+      # The queue at this point is "barbaz" (!)
       subject "doing" do
-        response do |data, subject|
+        # The queue at this point is "barbaz"
+        response queue: "bazbam" do |data, subject|
+          # The queue at this point is "bazbam" (!)
           # The subject at this point is "hows.<wildcard>.doing" (i.e., the
           # subjects "hows.jack.doing" and "hows.jill.doing" will both match)
           sender_name = data["name"]
@@ -352,6 +356,12 @@ rake spec
 bundle exec rubocop
 ```
 
+...or (if your Ruby setup has good defaults) just this:
+
+```bash
+rubocop
+```
+
 ### Create a release
 
 Bump the `Natsy::VERSION` value in `lib/natsy/version.rb`, commit, and then run:

data/lib/natsy/client.rb

@@ -126,6 +126,14 @@ module Natsy
         threads << thread
       end
 
+      # **USE WITH CAUTION:** This method (+::reset!+) clears all subscriptions,
+      # stops listening (if started), and kills any active threads.
+      def reset!
+        replies.clear
+        stop!
+        kill!
+      end
+
       private
 
       def threads
@@ -203,7 +211,11 @@ module Natsy
             log("Subscribing to subject '#{replier[:subject]}'#{queue_desc}", level: :debug)
 
             NATS.subscribe(replier[:subject], queue: replier[:queue]) do |message, reply_subject, subject|
-              parsed_message = JSON.parse(message)
+              parsed_message = begin
+                JSON.parse(message)
+              rescue StandardError
+                message
+              end
 
               id, data, pattern = if parsed_message.is_a?(Hash)
                 parsed_message.values_at("id", "data", "pattern")
@@ -211,18 +223,21 @@ module Natsy
                 [nil, parsed_message, nil]
               end
 
+              message_data = id && data && pattern ? data : parsed_message
+
               log("Received a message!")
               message_desc = <<~LOG_MESSAGE
                 id:      #{id || '(none)'}
                 pattern: #{pattern || '(none)'}
                 subject: #{subject || '(none)'}
-                data:    #{data.to_json}
+                data:    #{message_data.to_json}
                 inbox:   #{reply_subject || '(none)'}
                 queue:   #{replier[:queue] || '(none)'}
+                message: #{message}
               LOG_MESSAGE
               log(message_desc, indent: 2)
 
-              raw_response = replier[:handler].call(data)
+              raw_response = replier[:handler].call(message_data, subject)
 
               log("Responding with '#{raw_response}'")
 

data/lib/natsy/controller.rb

@@ -27,9 +27,8 @@ module Natsy
       # If omitted, the controller will fall back on the global default queue
       # assigned with +Natsy::Config::set+. If no default queue is set in either
       # the controller or globally, then the default queue will be blank. Set
-      # the default queue to +nil+ in a controller to override the global
-      # default queue and explicitly make the default queue blank for that
-      # controller.
+      # the default queue to +nil+ in a controller to fall back to the global
+      # default queue.
       #
       def default_queue(some_queue = NO_QUEUE_GIVEN)
         # +NO_QUEUE_GIVEN+ is a special symbol (rather than +nil+) so that the

data/lib/natsy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Natsy
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: natsy
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Keegan Leitz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-17 00:00:00.000000000 Z
+date: 2021-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -161,7 +161,6 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -179,7 +178,7 @@ homepage: https://github.com/openbay/natsy
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://www.rubydoc.info/gems/natsy/0.4.0
+  documentation_uri: https://www.rubydoc.info/gems/natsy/0.4.1
 post_install_message: 
 rdoc_options: []
 require_paths:

data/CHANGELOG.md

@@ -1,5 +0,0 @@
-## [Unreleased]
-
-## [0.1.0] - 2021-05-10
-
-- Initial release