active_publisher 1.3.1-java → 1.4.1.pre-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cced47ad4316952a89dd9f5a4c62a899de6f4b470dc63ac47c4066f2345747b3
-  data.tar.gz: 6e549c23815bc4c825fb102d637d8bd12d05624ed12cba567515b752e2698f4f
+  metadata.gz: 2c69306151dcfdd24e4cb0281329df7f1ed7dba6ebe8e6da6de1a2d20754fed4
+  data.tar.gz: 5e7dca629b90ded137e335bf4a8eb306e39a2511a1899c33f7ca1960281b0ea7
 SHA512:
-  metadata.gz: 61a92219a8cdf29c33fa8ec0bc7453903858cc566858cd8cfb32b0e67c54f0e825f8e7bd25a6b0d5daf00a56bace80b3837ab5be60920ed4802eadbe4a68608d
-  data.tar.gz: 20f1cd2a23581682bf3a466405f246b465486ce4f9fc63a9bb1eed6bd1b66e1e5c70922712d481ddc7ac69ab4081f87a37305719f9e026c437b152e1e548743d
+  metadata.gz: 7cdc8bb2a34d0d420623017b51253c2660ed63d145dbdbd63772b85f77345b42dd8bc159f9c48328ea5be2f0f69e659c5a1a8e28fcc4ec47e30d9d88a627ee33
+  data.tar.gz: ad0dadc1aa2bfbcbb415fe335d9db053340c94ae528b725c39c9cc4f66b84395d9a766466541862c1498d80849344f6a1694c83749c3a9d2ad229f631e2993ea

data/.circleci/config.yml

@@ -49,8 +49,9 @@ workflows:
           matrix:
             parameters:
               ruby-image:
-                - circleci/ruby:2.5
                 - circleci/ruby:2.6
                 - circleci/ruby:2.7
-                - circleci/jruby:9.1
+                - cimg/ruby:3.0
+                - cimg/ruby:3.1
                 - circleci/jruby:9.2
+                - circleci/jruby:9.3

data/active_publisher.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   if ENV['PLATFORM'] == "java" || ::RUBY_PLATFORM == 'java'
     spec.platform = "java"
-    spec.add_dependency 'march_hare', '~> 2.7'
+    spec.add_dependency 'march_hare', '~> 4.4'
   else
     spec.add_dependency 'bunny', '~> 2.1'
   end
@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activesupport', '>= 3.2'
   spec.add_dependency 'concurrent-ruby'
   spec.add_dependency 'multi_op_queue', '>= 0.2.0'
+  spec.add_dependency 'psych', '>= 3.3.2'
 
   spec.add_development_dependency "benchmark-ips"
   spec.add_development_dependency "bundler"

data/lib/active_publisher/async/redis_adapter/redis_multi_pop_queue.rb

@@ -77,9 +77,9 @@ module ActivePublisher
           messages = []
           multi_response = []
           redis_pool.with do |redis|
-            multi_response = redis.multi do
-              redis.lrange(list_key, 0, number - 1)
-              redis.ltrim(list_key, number, -1)
+            multi_response = redis.multi do |pipeline|
+              pipeline.lrange(list_key, 0, number - 1)
+              pipeline.ltrim(list_key, number, -1)
             end
           end
 

data/lib/active_publisher/configuration.rb

@@ -83,11 +83,13 @@ module ActivePublisher
       yaml_config = {}
       absolute_config_path = ::File.expand_path(::File.join("config", "active_publisher.yml"))
       action_subscriber_config_file = ::File.expand_path(::File.join("config", "action_subscriber.yml"))
+
       if ::File.exists?(absolute_config_path)
-        yaml_config = ::YAML.load(::ERB.new(::File.read(absolute_config_path)).result)[env]
+        yaml_config = load_yaml_config_from_file(absolute_config_path)[env]
       elsif ::File.exists?(action_subscriber_config_file)
-        yaml_config = ::YAML.load(::ERB.new(::File.read(action_subscriber_config_file)).result)[env]
+        yaml_config = load_yaml_config_from_file(action_subscriber_config_file)[env]
       end
+
       yaml_config
     end
     private_class_method :attempt_to_load_yaml_file
@@ -101,6 +103,14 @@ module ActivePublisher
     end
     private_class_method :fetch_config_value
 
+    def self.load_yaml_config_from_file(file_path)
+      erb_yaml = ::ERB.new(::File.read(file_path)).result
+      # Defined in Psych 3.2+ and the new canonical way to load trusted documents:
+      # https://github.com/ruby/psych/issues/533#issuecomment-1019363688
+      ::YAML.unsafe_load(erb_yaml)
+    end
+    private_class_method :load_yaml_config_from_file
+
     ##
     # Instance Methods
     #

data/lib/active_publisher/version.rb

@@ -1,3 +1,3 @@
 module ActivePublisher
-  VERSION = "1.3.1"
+  VERSION = "1.4.1.pre"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_publisher
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.1.pre
 platform: java
 authors:
 - Brian Stien
@@ -12,14 +12,14 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-02 00:00:00.000000000 Z
+date: 2022-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '4.4'
   name: march_hare
   prerelease: false
   type: :runtime
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '4.4'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -70,6 +70,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.2
+  name: psych
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.2
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -219,11 +233,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.11
 signing_key:
 specification_version: 4
 summary: Aims to make publishing work across MRI and jRuby painless and add some nice