nats-pure 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f963530316a2132bf59b1408a2d4e8393db94d429787c3d16c0317f8ff2fd555
-  data.tar.gz: 69f369b23184f5cdf53fd886019708cbe9559d69a30d9aa7e0ca6e6e80d37f56
+  metadata.gz: 6a89824c45aafc2a28dbdfe35762fb3172c9210a54097456e8480630910cb741
+  data.tar.gz: b2f99e1fee310ffc0a689f3bb956133ad694230bed23a6c9ad987c4634db6008
 SHA512:
-  metadata.gz: 550f13d0ed5e3bbd3203a681c86aa0fce2d6d459bbe61f06722908fcac72922369d650eec270d5222b28ed335fd5b0acdbbd3ba8134ffe1d9de49bc82774afdd
-  data.tar.gz: ff2d22028e5af8d49ec88cd5018f485a054c3f638d2b0118bea4c7beb0f2fbb98277a0dac84c61673da3858a045b725a5ef1c02d68464c9a7fb4c4e44e24f4c3
+  metadata.gz: 4b2c9b1b010e7701fbafa7e161d1dd915ee24830d72df6ef5455ad87a8d07e2493442c3986121d5556f19e91a2f55ec837938831da61917c7974187b7e8fcea1
+  data.tar.gz: a914e41f74342ab9010f0728351fb1ac37992f71cd60b35448b1542b4818d12580a2792db9fd3ad63a00a08b0acaceff44c1c39f6f6acb7e0e764d40a26afd08

data/README.md

@@ -2,7 +2,7 @@
 
 A thread safe [Ruby](http://ruby-lang.org) client for the [NATS messaging system](https://nats.io) written in pure Ruby.
 
-[![License Apache 2.0](https://img.shields.io/badge/License-Apache2-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)[![Build Status](https://travis-ci.org/nats-io/nats-pure.rb.svg)](http://travis-ci.org/nats-io/nats-pure.rb)[![Gem Version](https://d25lcipzij17d.cloudfront.net/badge.svg?id=rb&type=5&v=2.3.0)](https://rubygems.org/gems/nats-pure/versions/2.3.0)
+[![License Apache 2.0](https://img.shields.io/badge/License-Apache2-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)[![Build Status](https://travis-ci.org/nats-io/nats-pure.rb.svg)](http://travis-ci.org/nats-io/nats-pure.rb)[![Gem Version](https://d25lcipzij17d.cloudfront.net/badge.svg?id=rb&type=5&v=2.4.0)](https://rubygems.org/gems/nats-pure/versions/2.4.0)
 
 ## Getting Started
 

data/lib/nats/client.rb

@@ -12,4 +12,5 @@
 # limitations under the License.
 #
 require 'nats/io/client'
+require 'nats/io/rails' if defined?(Rails::Engine)
 require 'nats/nuid'

data/lib/nats/io/client.rb

@@ -18,7 +18,6 @@ require_relative 'errors'
 require_relative 'msg'
 require_relative 'subscription'
 require_relative 'jetstream'
-require_relative "rails" if defined?(::Rails::Engine)
 
 require 'nats/nuid'
 require 'thread'
@@ -1825,7 +1824,7 @@ module NATS
 
         # Host and Port
         uri_object.hostname ||= "localhost"
-        uri_object.port ||= DEFAULT_PORT.fetch(uri.scheme.to_sym, DEFAULT_PORT[:nats])
+        uri_object.port ||= DEFAULT_PORT.fetch(uri_object.scheme.to_sym, DEFAULT_PORT[:nats])
 
         uri_object
       end

data/lib/nats/io/jetstream/api.rb

@@ -119,6 +119,9 @@ module NATS
                                   :num_replicas,
                                   # Force memory storage
                                   :mem_storage,
+
+                                  # NATS v2.10 features
+                                  :metadata, :filter_subjects, :max_bytes,
                                   keyword_init: true) do
         def initialize(opts={})
           # Filter unrecognized fields just in case.
@@ -192,6 +195,7 @@ module NATS
         :republish,
         :allow_direct,
         :mirror_direct,
+        :metadata,
         keyword_init: true) do
         def initialize(opts={})
           # Filter unrecognized fields just in case.

data/lib/nats/io/jetstream/manager.rb

@@ -106,18 +106,37 @@ module NATS
                  else
                    config
                  end
-
+        config[:name] ||= config[:durable_name]
         req_subject = case
                       when config[:name]
-                        # NOTE: Only supported after nats-server v2.9.0
+                        ###############################################################################
+                        #                                                                             #
+                        #  Using names is the supported way of creating consumers (NATS +v2.9.0.      #
+                        #                                                                             #
+                        ###############################################################################
                         if config[:filter_subject] && config[:filter_subject] != ">"
                           "#{@prefix}.CONSUMER.CREATE.#{stream}.#{config[:name]}.#{config[:filter_subject]}"
                         else
+                         ##############################################################################
+                         #                                                                            #
+                         # Endpoint to support creating ANY consumer with multi-filters (NATS +v2.10) #
+                         #                                                                            #
+                         ##############################################################################
                           "#{@prefix}.CONSUMER.CREATE.#{stream}.#{config[:name]}"
                         end
                       when config[:durable_name]
+                        ###############################################################################
+                        #                                                                             #
+                        # Endpoint to support creating DURABLES before NATS v2.9.0.                   #
+                        #                                                                             #
+                        ###############################################################################
                         "#{@prefix}.CONSUMER.DURABLE.CREATE.#{stream}.#{config[:durable_name]}"
                       else
+                        ###############################################################################
+                        #                                                                             #
+                        # Endpoint to support creating EPHEMERALS before NATS v2.9.0.                 #
+                        #                                                                             #
+                        ###############################################################################
                         "#{@prefix}.CONSUMER.CREATE.#{stream}"
                       end
 

data/lib/nats/io/jetstream.rb

@@ -105,16 +105,50 @@ module NATS
 
     # subscribe binds or creates a push subscription to a JetStream pull consumer.
     #
-    # @param subject [String] Subject from which the messages will be fetched.
+    # @param subject [String, Array] Subject(s) from which the messages will be fetched.
     # @param params [Hash] Options to customize the PushSubscription.
     # @option params [String] :stream Name of the Stream to which the consumer belongs.
     # @option params [String] :consumer Name of the Consumer to which the PushSubscription will be bound.
+    # @option params [String] :name Name of the Consumer to which the PushSubscription will be bound.
     # @option params [String] :durable Consumer durable name from where the messages will be fetched.
     # @option params [Hash] :config Configuration for the consumer.
     # @return [NATS::JetStream::PushSubscription]
     def subscribe(subject, params={}, &cb)
       params[:consumer] ||= params[:durable]
-      stream = params[:stream].nil? ? find_stream_name_by_subject(subject) : params[:stream]
+      params[:consumer] ||= params[:name]
+      multi_filter = case 
+                     when (subject.is_a?(Array) and subject.size == 1)
+                       subject = subject.first
+                       false
+                     when (subject.is_a?(Array) and subject.size > 1)
+                       true
+                     end
+
+      # 
+      stream = if params[:stream].nil?
+                 if multi_filter
+                   # Use the first subject to try to find the stream.
+                   streams = subject.map do |s|
+                    begin
+                      find_stream_name_by_subject(s)
+                    rescue NATS::JetStream::Error::NotFound
+                      raise NATS::JetStream::Error.new("nats: could not find stream matching filter subject '#{s}'")
+                    end
+                   end
+
+                   # Ensure that the filter subjects are not ambiguous.
+                   streams.uniq!
+                   if streams.count > 1
+                     raise NATS::JetStream::Error.new("nats: multiple streams matched filter subjects: #{streams}")
+                   end
+
+                   streams.first
+                 else
+                   find_stream_name_by_subject(subject)
+                 end
+               else
+                 params[:stream]
+               end
 
       queue = params[:queue]
       durable = params[:durable]
@@ -183,7 +217,11 @@ module NATS
         config.deliver_subject = deliver
 
         # Auto created consumers use the filter subject.
-        config.filter_subject = subject
+        if multi_filter
+          config[:filter_subjects] ||= subject
+        else
+          config[:filter_subject] ||= subject
+        end
 
         # Heartbeats / FlowControl
         config.flow_control = flow_control
@@ -219,25 +257,57 @@ module NATS
 
     # pull_subscribe binds or creates a subscription to a JetStream pull consumer.
     #
-    # @param subject [String] Subject from which the messages will be fetched.
+    # @param subject [String, Array] Subject or subjects from which the messages will be fetched.
     # @param durable [String] Consumer durable name from where the messages will be fetched.
     # @param params [Hash] Options to customize the PullSubscription.
     # @option params [String] :stream Name of the Stream to which the consumer belongs.
     # @option params [String] :consumer Name of the Consumer to which the PullSubscription will be bound.
+    # @option params [String] :name Name of the Consumer to which the PullSubscription will be bound.
     # @option params [Hash] :config Configuration for the consumer.
     # @return [NATS::JetStream::PullSubscription]
     def pull_subscribe(subject, durable, params={})
-      if durable.empty? && !params[:consumer]
+      if (!durable or durable.empty?) && !(params[:consumer] or params[:name])
         raise JetStream::Error::InvalidDurableName.new("nats: invalid durable name")
       end
+      multi_filter = case 
+                     when (subject.is_a?(Array) and subject.size == 1)
+                       subject = subject.first
+                       false
+                     when (subject.is_a?(Array) and subject.size > 1)
+                       true
+                     end
+
       params[:consumer] ||= durable
-      stream = params[:stream].nil? ? find_stream_name_by_subject(subject) : params[:stream]
+      params[:consumer] ||= params[:name]
+      stream = if params[:stream].nil?
+                 if multi_filter
+                   # Use the first subject to try to find the stream.
+                   streams = subject.map do |s|
+                    begin
+                      find_stream_name_by_subject(s)
+                    rescue NATS::JetStream::Error::NotFound
+                      raise NATS::JetStream::Error.new("nats: could not find stream matching filter subject '#{s}'")
+                    end
+                   end
+
+                   # Ensure that the filter subjects are not ambiguous.
+                   streams.uniq!
+                   if streams.count > 1
+                     raise NATS::JetStream::Error.new("nats: multiple streams matched filter subjects: #{streams}")
+                   end
 
+                   streams.first
+                 else
+                   find_stream_name_by_subject(subject)
+                 end
+               else
+                 params[:stream]
+               end
       begin
         consumer_info(stream, params[:consumer])
       rescue NATS::JetStream::Error::NotFound => e
         # If attempting to bind, then this is a hard error.
-        raise e if params[:stream]
+        raise e if params[:stream] and !multi_filter
 
         config = if not params[:config]
                    JetStream::API::ConsumerConfig.new
@@ -248,6 +318,11 @@ module NATS
                  end
         config[:durable_name] = durable
         config[:ack_policy] ||= JS::Config::AckExplicit
+        if multi_filter
+          config[:filter_subjects] ||= subject
+        else
+          config[:filter_subject] ||= subject
+        end
         add_consumer(stream, config)
       end
 

data/lib/nats/io/version.rb

@@ -15,7 +15,7 @@
 module NATS
   module IO
     # VERSION is the version of the client announced on CONNECT to the server.
-    VERSION = "2.3.0".freeze
+    VERSION = "2.4.0".freeze
 
     # LANG is the lang runtime of the client announced on CONNECT to the server.
     LANG = "#{RUBY_ENGINE}#{RUBY_VERSION}".freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nats-pure
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Waldemar Quevedo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-09 00:00:00.000000000 Z
+date: 2023-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby