action_subscriber 5.2.3-java → 5.3.1.pre-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70428c30ef852da7b3e5678f2e9bbf43dbaaac46a0280a865e9aa314efb43fc3
-  data.tar.gz: 67d69b8f403eba527f180e9c0ea7d5eb49faabfe2adc91f8e42c192d4600e97c
+  metadata.gz: f05428bb77b503d9f6e17bcee140832d1e7ca4cab0aa5e503410689415bd1b64
+  data.tar.gz: a483aea4897bcbde90a8040e1f7f1a9928791dc9ee74d2e1099ab3a6c1001e24
 SHA512:
-  metadata.gz: 1eb8b21638811db8325eb6ccf27091aef00d9394324b2e46c41ce2ef2dfa3ac90be2a4b4e448afc8d910e0325e37e033b5fa071cb1545fdae28fb5e264dc2527
-  data.tar.gz: c3895c215507a1e61712ef071cf96ce4dfaca092df3172d044c3a97933970dd317260bac8c9aef791efb52f58cbdc027521fee07365a2254b8d08dd049ea6f53
+  metadata.gz: 9e4f1104ea659038dc1a2dbfdbec86af4f92b240ae46480979c43b9edbdfd072315ca7195fdf656e622656323e84fbe8e561e788e4cad7d09572078dc04688b9
+  data.tar.gz: 30c99d861320c2790573f48bd80a49f07342b00f4968fe576c417526287adcc8e3465cee6d3b5d9633743f44f92fe474c623b117cf540fc8d2ac818c67922b00

data/.circleci/config.yml

@@ -0,0 +1,61 @@
+# Inspired by: http://mikebian.co/running-tests-against-multiple-ruby-versions-using-circleci/
+
+version: 2.1
+
+orbs:
+  ruby: circleci/ruby@1.1
+
+
+  # If you want to work on `action_subscriber` you will need to have a rabbitmq instance running locally on port 5672 with a management plugin enabled on port 15672. Usually the easiest way to accomplish this is to use docker and run the command:
+
+  # ```
+
+jobs:
+  test:
+    parallelism: 1
+    parameters:
+      ruby-image:
+        type: string
+    docker:
+      - image: << parameters.ruby-image >>
+      - image: rabbitmq:3.6.6-management
+
+    steps:
+      - checkout
+      - run:
+          name: install dockerize
+          command: wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && sudo tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
+          environment:
+            DOCKERIZE_VERSION: v0.3.0
+      # - run:
+      #     name: Wait for rabbitmq
+      #     command: dockerize -wait tcp://localhost:5672 -timeout 1m
+      - run:
+          name: Install bundler
+          command: gem install bundler
+      - run:
+          name: Which bundler?
+          command: bundle -v
+      - run:
+          name: bundle install
+          command: bundle install
+      - run:
+          name: rspec
+          command: bundle exec rspec
+
+# strangely, there seems to be very little documentation about exactly how martix builds work.
+# By defining a param inside your job definition, Circle CI will automatically spawn a job for
+# unique param value passed via `matrix`. Neat!
+# https://circleci.com/blog/circleci-matrix-jobs/
+workflows:
+  build_and_test:
+    jobs:
+      - test:
+          matrix:
+            parameters:
+              ruby-image:
+                - circleci/ruby:2.5
+                - circleci/ruby:2.6
+                - circleci/ruby:2.7
+                - circleci/jruby:9.2
+                - circleci/jruby:9.3

data/action_subscriber.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'action_subscriber/version'
+require "action_subscriber/version"
 
 Gem::Specification.new do |spec|
   spec.name                  = "action_subscriber"
@@ -18,17 +18,18 @@ Gem::Specification.new do |spec|
   spec.test_files            = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths         = ["lib"]
 
-  spec.add_dependency 'activesupport', '>= 3.2'
+  spec.add_dependency "activesupport", ">= 3.2"
 
-  if ENV['PLATFORM'] == "java" || ::RUBY_PLATFORM == 'java'
+  if ENV["PLATFORM"] == "java" || ::RUBY_PLATFORM == "java"
     spec.platform = "java"
-    spec.add_dependency 'march_hare', '>= 2.7.0'
+    spec.add_dependency "march_hare", "~> 4.4"
   else
-    spec.add_dependency 'bunny', '>= 1.5.0'
+    spec.add_dependency "bunny", ">= 1.5.0"
   end
-  spec.add_dependency 'concurrent-ruby'
-  spec.add_dependency 'middleware'
-  spec.add_dependency 'thor'
+  spec.add_dependency "concurrent-ruby"
+  spec.add_dependency "middleware"
+  spec.add_dependency "psych", ">= 3.3.2"
+  spec.add_dependency "thor"
 
   spec.add_development_dependency "active_publisher", "~> 0.1.5"
   spec.add_development_dependency "activerecord", ">= 3.2"

data/lib/action_subscriber/babou.rb

@@ -1,3 +1,5 @@
+require "active_support/notifications"
+
 module ActionSubscriber
   module Babou
     ##
@@ -10,7 +12,7 @@ module ActionSubscriber
       ::ActionSubscriber.print_subscriptions
       ::ActionSubscriber.start_subscribers!
       logger.info "Action Subscriber connected"
-
+      ::ActiveSupport::Notifications.instrument("action_subscriber:server_started")
       while true
         sleep 1.0 #just hang around waiting for messages
         break if shutting_down?
@@ -21,6 +23,7 @@ module ActionSubscriber
       logger.info "Shutting down"
       ::ActionSubscriber::RabbitConnection.subscriber_disconnect!
       logger.info "Shutdown complete"
+      ::ActiveSupport::Notifications.instrument("action_subscriber:server_stopped")
       exit(0)
     end
 

data/lib/action_subscriber/configuration.rb

@@ -69,11 +69,9 @@ module ActionSubscriber
           absolute_config_path = ::File.expand_path(::File.join("config", "action_subscriber.yml"))
           if ::File.exists?(absolute_config_path)
             erb = ::ERB.new(::File.read(absolute_config_path)).result
-            if defined?(SafeYAML)
-              yaml_config = ::YAML.load(erb, :safe => true)[env]
-            else
-              yaml_config = ::YAML.load(erb)[env]
-            end
+            # Defined in Psych 3.2+ and the new canonical way to load trusted documents:
+            # https://github.com/ruby/psych/issues/533#issuecomment-1019363688
+            yaml_config = ::YAML.unsafe_load(erb)[env]
           end
 
           ::ActionSubscriber::Configuration::DEFAULTS.each_pair do |key, value|

data/lib/action_subscriber/version.rb

@@ -1,3 +1,3 @@
 module ActionSubscriber
-  VERSION = "5.2.3"
+  VERSION = "5.3.1.pre"
 end

data/lib/action_subscriber.rb

@@ -87,6 +87,18 @@ module ActionSubscriber
     route_set.wait_to_finish_with_timeout(timeout)
   end
 
+  def self.after_server_start(&block)
+    ::ActiveSupport::Notifications.subscribe("action_subscriber:server_started") do |*args|
+      block.call(*args)
+    end
+  end
+
+  def self.after_server_stop(&block)
+    ::ActiveSupport::Notifications.subscribe("action_subscriber:server_stopped") do |*args|
+      block.call(*args)
+    end
+  end
+
   # Execution is delayed until after app loads when used with bin/action_subscriber
   require "action_subscriber/railtie" if defined?(Rails)
   ::ActiveSupport.run_load_hooks(:action_subscriber, Base)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_subscriber
 version: !ruby/object:Gem::Version
-  version: 5.2.3
+  version: 5.3.1.pre
 platform: java
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-05 00:00:00.000000000 Z
+date: 2022-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -31,17 +31,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '4.4'
   name: march_hare
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '4.4'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -70,6 +70,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '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:
@@ -209,6 +223,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -295,11 +310,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.28
+rubygems_version: 3.3.11
 signing_key:
 specification_version: 4
 summary: ActionSubscriber is a DSL that allows a rails app to consume messages from