natsy 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a037edf2d9a4b510d45ac57b9a891ccaf5c8b14a82ad359b5ef24974f119342f
-  data.tar.gz: 7351f54131880e05d0ddf5955a8bc48af0635abf53de8fcd13a06f8ef9587e72
+  metadata.gz: f5f7c3cffa8ab383960e32e70a795804170393d4d98ffcd6e54b437a4d07a48d
+  data.tar.gz: 6759b66239fc91b067b765013d77be9e25b182c240b1a9d02d5f145c8ed2254b
 SHA512:
-  metadata.gz: 071a63d868fbd6441c0b33f459c643d0d23f471c63317274dc5ae45ddf896fd69cee84701da5c1cd8ccb86ff1b8cc90e8c9cc9f98ced72508b48879a93e8b572
-  data.tar.gz: 13345e7ab11e6f770310d27d8dbd2cffa64b0e27dd04b63096bce5827562361b261b81f7e762c328f7a01d6d971399cb8f0c39d61efd370d69fc7aee9a3cd031
+  metadata.gz: 564f92f38f7cc36eea88fcad6a32ca464a51f55fe6af72cac63b86dfc54610fa9f55a7281440acb235041c3145bf18390e0206988e499e6983a4f7dab1f85014
+  data.tar.gz: 4f3cb62d940a2622f1787310ea59062124373b862430356f925804632cfc1380b06cda2263fef2fc50ea53a682fd5a52b60a0d012b3833205760d6247ecc16ca

data/.github/workflows/main.yml

@@ -18,6 +18,14 @@ jobs:
 
     runs-on: ubuntu-latest
 
+    services:
+      nats:
+        image: nats:latest
+        ports:
+          - 4222:4222
+          - 8222:8222
+          - 6222:6222
+
     strategy:
       matrix:
         ruby-version:

data/.rubocop.yml

@@ -33,6 +33,13 @@ Metrics/AbcSize:
     - '*.gemspec'
 
 Metrics/BlockLength:
+  Max: 50
+  Exclude:
+    - 'spec/**/*_spec.rb'
+    - '*.gemspec'
+
+Metrics/CyclomaticComplexity:
+  Max: 15
   Exclude:
     - 'spec/**/*_spec.rb'
     - '*.gemspec'
@@ -67,6 +74,12 @@ Metrics/ModuleLength:
     - 'spec/**/*_spec.rb'
     - '*.gemspec'
 
+Metrics/PerceivedComplexity:
+  Max: 15
+  Exclude:
+    - 'spec/**/*_spec.rb'
+    - '*.gemspec'
+
 # Rspec
 
 RSpec/ExampleLength:

data/README.md

@@ -44,6 +44,8 @@ This gem also requires a NATS server to be installed and running before use. See
 
 ## Usage
 
+<a id="starting-the-nats-server-section">
+
 ### Starting the NATS server
 
 You'll need to start a NATS server before running your Ruby application. If you installed it via Docker, you might start it like so:
@@ -267,7 +269,7 @@ bin/console
 
 ### Run the tests
 
-To run the RSpec test suites, run:
+To run the RSpec test suites, first [start the NATS server](#starting-the-nats-server-section). Then, run the tests:
 
 ```bash
 bundle exec rake spec

data/lib/natsy/client.rb

@@ -145,29 +145,39 @@ module Natsy
 
         started!
 
-        self.current_thread = Thread.new do
+        thread = Thread.new do
           Thread.handle_interrupt(StandardError => :never) do
             Thread.handle_interrupt(StandardError => :immediate) { listen }
           rescue NATS::ConnectError => e
             log("Could not connect to NATS server:", level: :error)
             log(e.full_message, level: :error, indent: 2)
             Thread.current.exit
-          rescue NewSubscriptionsError => e
+          rescue NewSubscriptionsError => _e
             log("New subscriptions! Restarting...", level: :info)
             restart!
-            raise e # TODO: there has to be a better way
+            Thread.current.exit
+            # raise e # TODO: there has to be a better way
           rescue StandardError => e
             log("Encountered an error:", level: :error)
             log(e.full_message, level: :error, indent: 2)
             restart!
-            raise e
+            Thread.current.exit
+            # raise e
           end
         end
+
+        threads << thread
       end
 
       private
 
-      attr_accessor :current_thread
+      def threads
+        @threads ||= []
+      end
+
+      def current_thread
+        threads.last
+      end
 
       def log(text, level: :info, indent: 0)
         return unless logger
@@ -179,10 +189,12 @@ module Natsy
         text_lines.each do |line|
           logger.send(level, "[#{timestamp}] Natsy | #{indentation}#{line}")
         end
+
+        nil
       end
 
       def kill!
-        current_thread.kill if current_thread && current_thread.alive?
+        threads.each { |thread| thread.kill if thread.alive? }
       end
 
       def stop!
@@ -200,6 +212,7 @@ module Natsy
       def restart!
         log("Restarting NATS", level: :warn)
         stop!
+        kill!
         start!
       end
 
@@ -242,9 +255,14 @@ module Natsy
             queue_desc = " in queue '#{replier[:queue]}'" if replier[:queue]
             log("Subscribing to subject '#{replier[:subject]}'#{queue_desc}", level: :debug)
 
-            NATS.subscribe(replier[:subject], queue: replier[:queue]) do |message, inbox, subject|
+            NATS.subscribe(replier[:subject], queue: replier[:queue]) do |message, reply_subject, subject|
               parsed_message = JSON.parse(message)
-              id, data, pattern = parsed_message.values_at("id", "data", "pattern")
+
+              id, data, pattern = if parsed_message.is_a?(Hash)
+                parsed_message.values_at("id", "data", "pattern")
+              else
+                [nil, parsed_message, nil]
+              end
 
               log("Received a message!")
               message_desc = <<~LOG_MESSAGE
@@ -252,15 +270,17 @@ module Natsy
                 pattern: #{pattern || '(none)'}
                 subject: #{subject || '(none)'}
                 data:    #{data.to_json}
-                inbox:   #{inbox || '(none)'}
+                inbox:   #{reply_subject || '(none)'}
+                queue:   #{replier[:queue] || '(none)'}
               LOG_MESSAGE
               log(message_desc, indent: 2)
 
-              response_data = replier[:handler].call(data)
+              raw_response = replier[:handler].call(data)
 
-              log("Responding with '#{response_data}'")
+              log("Responding with '#{raw_response}'")
 
-              NATS.publish(inbox, response_data.to_json, queue: replier[:queue])
+              response = raw_response.is_a?(String) ? raw_response : raw_response.to_json
+              NATS.publish(reply_subject, response) if Utils.present?(reply_subject)
             end
           end
         end

data/lib/natsy/version.rb

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

data/natsy.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 2.2"
+  spec.add_development_dependency "pry"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rubocop", "~> 1.10"
@@ -35,7 +36,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop-rake", "~> 0.5"
   spec.add_development_dependency "rubocop-rspec", "~> 2.2"
   spec.add_development_dependency "solargraph"
-  spec.add_development_dependency "pry"
 
   spec.add_runtime_dependency "nats", "~> 0.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: natsy
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Keegan Leitz
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +136,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: nats
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +178,7 @@ homepage: https://github.com/openbay/natsy
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://www.rubydoc.info/gems/natsy/0.3.0
+  documentation_uri: https://www.rubydoc.info/gems/natsy/0.3.1
 post_install_message: 
 rdoc_options: []
 require_paths: