active_publisher 1.3.2 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f52f284362383d67ea86b1fd21a9bfa855e32bea6ad77c7c482fc47ece6ef09
-  data.tar.gz: 4b09f1fd7b793fbca7012a4f6d01c9797029529a69c7e8482c18c3af3cfeb51f
+  metadata.gz: 781d1bdcfca49e57f1f7d392942c0f031c58d94f14431dfb5530022c2d1fb596
+  data.tar.gz: 97541a6edec56ef68d06a8da22f0e374048d962bcade58d95b5b6df9ed35e73b
 SHA512:
-  metadata.gz: 3ab3dfaa3727a5e56c639aacdc12158c30fad925ea112701f48c7c9d4dcfab0028fb5c799841e8d9920ba78d83e42edb0b89fc22f4cc3f6fcdb77093937c77b0
-  data.tar.gz: d4a514867fea7d76fae78aff4b083bd1044aee9e775f4e57d4d72ea12429201b0089033eca3b8cf7d6544d0c5c5b027735f6e178580575f26d75bd1426429ea2
+  metadata.gz: df1c522dee1409ebd82fb51e12a2dffc62a4c5f6f4c283a11de5653e81f004f42581f5078d9b569174fdeb2e2747469101b9c7370fee565e7044d59720eedb14
+  data.tar.gz: 9f663471dc16c7a5f273a670a149a36d20e8a4c6404d5d05d840d407ec5e56a0162574915be2c2e2c6498cfcc5e283e9997e8d76a1327cccc791174e5abae8f0

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/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.2"
+  VERSION = "1.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_publisher
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.1
 platform: ruby
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-03 00:00:00.000000000 Z
+date: 2022-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -70,6 +70,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.2
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
@@ -223,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.3.12
 signing_key:
 specification_version: 4
 summary: Aims to make publishing work across MRI and jRuby painless and add some nice