protobuf-nats 0.10.1 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e948e5cd9de823115551813b6f0b9179d93183565c568ccdb5c51826f5d14fe
-  data.tar.gz: 4b73bde3e2040519cc4b25e3fcd9b5533d9502ee863025ac310cf029c67e501f
+  metadata.gz: 1c0f99feffeb6c233028cc0f6ef5a3a3193e8e5974e69b31a45ef0779e240d57
+  data.tar.gz: a296bec5b07fb71d713a5e92f3de90b11f19f1f63c929649cbec2f666be7a9b7
 SHA512:
-  metadata.gz: 0d8298eac44ca51dfdf91379d1bc8289d037b56de627ca66fb51960575dcc0819565bf6121d9c4b71652c22178c0c5562d03ecc19d23567f681cf58283c1e3de
-  data.tar.gz: aa4856c2440edfb352d2fd90448e8cb51b078f48f5bd273a4437d274342af74fd3f653392e11d08e20e306ed0791423c6c1bf6da9f1a131c7e3514bea6dc804a
+  metadata.gz: c792b9b7efc00fa9e430e63ac84cf9f36586475a84007a47df426fd42b16da5cb6eaf419ba0badc1e05b61a049378322c2f70d7b9eddc17392bedd58c8702386
+  data.tar.gz: 9438620b728b973db2e5a343052ad033d7cc78bb10c48c0b3c2d676114e8f2af8b2dd94fbfac4d39eed0f17e643b574cd0c86b50ecbd7722e0d5cc29c868d060

data/.travis.yml

@@ -1,8 +1,16 @@
 sudo: false
 language: ruby
+jdk:
+ - openjdk8
 rvm:
   - 2.3.0
+  - 2.7.0
   - jruby-9.1.7.0
+  - jruby-9.2.13.0
 before_install:
-  - gem install bundler -v 1.14.3
+  # Install and start gnatsd
+  - ./scripts/install_gnatsd.sh
+  - $HOME/nats-server/nats-server &
+  # Install deps for project
+  - gem install bundler
   - gem update --system

data/README.md

@@ -154,9 +154,11 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+The java-nats client is temporarily forked to support jruby > 9.2.10.0. The living branch for that is here: https://github.com/film42/java-nats/tree/jruby-compat. This will be removed when we upgrade to the new nats.java client.
+
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/abrandoned/protobuf-nats.
+Bug reports and pull requests are welcome on GitHub at https://github.com/mxenabled/protobuf-nats.
 
 
 ## License

data/lib/protobuf/nats/client.rb

@@ -151,12 +151,12 @@ module Protobuf
           when :ack_timeout
             ::ActiveSupport::Notifications.instrument "client.request_timeout.protobuf-nats"
             next if (retries -= 1) > 0
-            raise ::Protobuf::Nats::Errors::RequestTimeout
+            raise ::Protobuf::Nats::Errors::RequestTimeout, formatted_service_and_method_name
           when :nack
             ::ActiveSupport::Notifications.instrument "client.request_nack.protobuf-nats"
             interval = nack_backoff_intervals[nack_retry]
             nack_retry += 1
-            raise ::Protobuf::Nats::Errors::RequestTimeout if interval.nil?
+            raise ::Protobuf::Nats::Errors::RequestTimeout, formatted_service_and_method_name if interval.nil?
             sleep((interval + nack_backoff_splay)/1000.0)
             next
           end
@@ -186,6 +186,12 @@ module Protobuf
         end
       end
 
+      def formatted_service_and_method_name
+        klass = @options[:service]
+        method_name = @options[:method]
+        "#{klass}##{method_name}"
+      end
+
       # The Java nats client offers better message queueing so we're going to use
       # that over locking ourselves. This split in code isn't great, but we can
       # refactor this later.
@@ -231,7 +237,7 @@ module Protobuf
                          else return :ack_timeout
                          end
 
-              fail(::Protobuf::Nats::Errors::ResponseTimeout, subject) unless response
+              fail(::Protobuf::Nats::Errors::ResponseTimeout, formatted_service_and_method_name) unless response
 
               completed_request = true
               response
@@ -287,7 +293,7 @@ module Protobuf
                      else return :ack_timeout
                      end
 
-          fail(::Protobuf::Nats::Errors::ResponseTimeout, subject) unless response
+          fail(::Protobuf::Nats::Errors::ResponseTimeout, formatted_service_and_method_name) unless response
 
           response
         ensure

data/lib/protobuf/nats/config.rb

@@ -40,7 +40,12 @@ module Protobuf
             config_path = ENV["PROTOBUF_NATS_CONFIG_PATH"] || ::File.join("config", "protobuf_nats.yml")
             absolute_config_path = ::File.expand_path(config_path)
             if ::File.exists?(absolute_config_path)
-              yaml_config = ::YAML.load_file(absolute_config_path)[env]
+              # Psych 4 and newer requires unsafe_load_file in order for aliases to be used
+              yaml_config = if ::YAML.respond_to?(:unsafe_load_file)
+                ::YAML.unsafe_load_file(absolute_config_path)[env]
+              else
+                ::YAML.load_file(absolute_config_path)[env]
+              end
             end
 
             DEFAULTS.each_pair do |key, value|

data/lib/protobuf/nats/errors.rb

@@ -1,13 +1,13 @@
 module Protobuf
   module Nats
     module Errors
-      class Base < ::StandardError
+      class ClientError < ::StandardError
       end
 
-      class RequestTimeout < Base
+      class RequestTimeout < ClientError
       end
 
-      class ResponseTimeout < Base
+      class ResponseTimeout < ClientError
       end
 
       class MriIOException < ::StandardError

data/lib/protobuf/nats/jnats.rb

@@ -5,11 +5,6 @@ require ::File.join(ext_base, "jars/slf4j-simple-1.7.25.jar")
 require ::File.join(ext_base, "jars/gson-2.6.2.jar")
 require ::File.join(ext_base, "jars/jnats-1.1-SNAPSHOT.jar")
 
-# Set field accessors so we can access the member variables directly.
-class Java::IoNatsClient::SubscriptionImpl
-  field_accessor :pMsgs, :pBytes, :delivered
-end
-
 module Protobuf
   module Nats
     class JNats
@@ -190,9 +185,9 @@ module Protobuf
               # We have to update the subscription stats so we're not considered a slow consumer.
               begin
                 sub.lock
-                sub.pMsgs -= 1
-                sub.pBytes -= message.getData.length if message.getData
-                sub.delivered += 1 unless sub.isClosed
+                sub.incrPMsgs(-1)
+                sub.incrPBytes(-message.getData.length) if message.getData
+                sub.incrDelivered(1) unless sub.isClosed
               ensure
                 sub.unlock
               end

data/lib/protobuf/nats/version.rb

@@ -1,5 +1,5 @@
 module Protobuf
   module Nats
-    VERSION = "0.10.1"
+    VERSION = "0.10.4"
   end
 end

data/protobuf-nats.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{ ruby-protobuf client/server for nats }
   spec.description   = %q{ ruby-protobuf client/server for nats }
-  #spec.homepage      = "TODO: Put your gem's website or public repo URL here."
+  spec.homepage      = "https://github.com/mxenabled/protobuf-nats"
   spec.license       = "MIT"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "protobuf", "~> 3.7", ">= 3.7.2"
   spec.add_runtime_dependency "nats-pure", "~> 0.3", "< 0.4"
 
-  spec.add_development_dependency "bundler", "~> 1.14"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "benchmark-ips"

data/scripts/install_gnatsd.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -e
+
+export DEFAULT_NATS_SERVER_VERSION=v2.0.0
+
+export NATS_SERVER_VERSION="${NATS_SERVER_VERSION:=$DEFAULT_NATS_SERVER_VERSION}"
+
+# check to see if nats-server folder is empty
+if [ ! "$(ls -A $HOME/nats-server)" ]; then
+    (
+	mkdir -p $HOME/nats-server
+	cd $HOME/nats-server
+	wget https://github.com/nats-io/nats-server/releases/download/$NATS_SERVER_VERSION/nats-server-$NATS_SERVER_VERSION-linux-amd64.zip -O nats-server.zip
+	unzip nats-server.zip
+	cp nats-server-$NATS_SERVER_VERSION-linux-amd64/nats-server $HOME/nats-server/nats-server
+    )
+else
+  echo 'Using cached directory.';
+fi

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protobuf-nats
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.4
 platform: ruby
 authors:
 - Brandon Dewitt
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-11-12 00:00:00.000000000 Z
+date: 2022-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -82,16 +82,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -184,12 +184,13 @@ files:
 - lib/protobuf/nats/thread_pool.rb
 - lib/protobuf/nats/version.rb
 - protobuf-nats.gemspec
-homepage: 
+- scripts/install_gnatsd.sh
+homepage: https://github.com/mxenabled/protobuf-nats
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -204,9 +205,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.2.28
+signing_key:
 specification_version: 4
 summary: ruby-protobuf client/server for nats
 test_files: []