action_subscriber 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d27515da32650e518b407839d2faac598925427
-  data.tar.gz: 1166ddde96c48ab57b4a7b7aace1effa50778057
+  metadata.gz: a28cd2294784f1ac8991ef06765c5eb9f5ddc896
+  data.tar.gz: 8d61f891527ea6f8a2a51adbb9abe3a94d4b4b65
 SHA512:
-  metadata.gz: b4f9a39a8e6e67721b54da8afca7974aeeab211adc40411bfd1f82ce4f4ac51a78245b20bbd89f57410d279ee3028c4fb080869346d981ccaac49b1124008ddb
-  data.tar.gz: 78c68d7e6072dffd4c85485c04407d46daaaac6354bcde86632f9914468296eee4ec8884a0bcab7e2fad3315389cd74b412baea8141fd7e74213057e87c23bce
+  metadata.gz: 78958b49c6479bdf1304a07254fddac253eefa71cdd009878c415a6d6f7341f6cf20ec8697c8ecdaf0ae7470256f9fd1fd8e53d64d0c65a2ec8017102b21568c
+  data.tar.gz: 5826fdc4484ce1940f7eeeae4db18ce2887f1d92b851778480a43e7be4bec944a6f3f42eec025bd5842077959fcd696a585c0710f2a9be536563cebc9f514df2

data/bin/action_subscriber

@@ -1,8 +1,11 @@
 #!/usr/bin/env ruby
 
+$ACTION_SUBSCRIBER_SERVER_MODE = true
+
 require 'active_support'
 require 'active_support/core_ext'
 require 'thor'
+require 'action_subscriber'
 
 module ActionSubscriber
   class CLI < ::Thor
@@ -23,12 +26,24 @@ module ActionSubscriber
     BABOUDESC
 
     def start
-      require options[:app]
-
       $0 = "Action Subscriber server #{object_id}"
       ::ActionSubscriber.logger.info "Loading configuration..."
 
       ::ActionSubscriber::Configuration.configure_from_yaml_and_cli(options)
+
+      ::ActionSubscriber.logger.info "Requiring app..."
+
+      require options[:app]
+
+      # We run these outside of lib/action_subscriber.rb because we need to load
+      # our railtie (Rails must be defined) before we can run our load hooks.
+      # When requiring action_subscriber as a client, these will be run
+      # automatically.
+      ::ActionSubscriber.logger.info "Running load hooks..."
+
+      require "action_subscriber/railtie" if defined?(Rails)
+      ::ActiveSupport.run_load_hooks(:action_subscriber, Base)
+
       ::ActionSubscriber.logger.info "Starting server..."
 
       case ::ActionSubscriber.configuration.mode

data/lib/action_subscriber.rb

@@ -114,14 +114,18 @@ module ActionSubscriber
     alias_method :config, :configuration
   end
 
+  # Execution is delayed until after app loads when used with bin/action_subscriber
+  unless $ACTION_SUBSCRIBER_SERVER_MODE
+    ::ActiveSupport.run_load_hooks(:action_subscriber, Base)
+    require "action_subscriber/railtie" if defined?(Rails)
+  end
+
   # Initialize config object
   config
 
   # Intialize async publisher adapter
   ::ActionSubscriber::Publisher::Async.publisher_adapter
 
-  ::ActiveSupport.run_load_hooks(:action_subscriber, Base)
-
   ##
   # Private Implementation
   #
@@ -144,11 +148,8 @@ module ActionSubscriber
     end
   end
   private_class_method :default_routes
-
 end
 
-require "action_subscriber/railtie" if defined?(Rails)
-
 at_exit do
   ::ActionSubscriber::Publisher::Async.publisher_adapter.shutdown!
   ::ActionSubscriber::RabbitConnection.publisher_disconnect!

data/lib/action_subscriber/configuration.rb

@@ -1,3 +1,5 @@
+require "yaml"
+
 module ActionSubscriber
   class Configuration
     attr_accessor :allow_low_priority_methods,
@@ -24,6 +26,8 @@ module ActionSubscriber
                   :times_to_pop,
                   :virtual_host
 
+    CONFIGURATION_MUTEX = ::Mutex.new
+
     DEFAULTS = {
       :allow_low_priority_methods => false,
       :async_publisher => 'memory',
@@ -51,18 +55,25 @@ module ActionSubscriber
     ##
     # Class Methods
     #
-    def self.configure_from_yaml_and_cli(cli_options = {})
-      env = ENV["RAILS_ENV"] || ENV["RACK_ENV"] || ENV["APP_ENV"] || "development"
+    def self.configure_from_yaml_and_cli(cli_options = {}, reload = false)
+      CONFIGURATION_MUTEX.synchronize do
+        @configure_from_yaml_and_cli = nil if reload
+        @configure_from_yaml_and_cli ||= begin
+          env = ENV["RAILS_ENV"] || ENV["RACK_ENV"] || ENV["APP_ENV"] || "development"
 
-      yaml_config = {}
-      absolute_config_path = ::File.expand_path(::File.join("config", "action_subscriber.yml"))
-      if ::File.exists?(absolute_config_path)
-        yaml_config = ::YAML.load_file(absolute_config_path, :safe => true)[env]
-      end
+          yaml_config = {}
+          absolute_config_path = ::File.expand_path(::File.join("config", "action_subscriber.yml"))
+          if ::File.exists?(absolute_config_path)
+            yaml_config = ::YAML.load_file(absolute_config_path)[env]
+          end
 
-      ::ActionSubscriber::Configuration::DEFAULTS.each_pair do |key, value|
-        setting = cli_options[key] || yaml_config[key.to_s]
-        ::ActionSubscriber.config.__send__("#{key}=", setting) if setting
+          ::ActionSubscriber::Configuration::DEFAULTS.each_pair do |key, value|
+            setting = cli_options[key] || yaml_config[key.to_s]
+            ::ActionSubscriber.config.__send__("#{key}=", setting) if setting
+          end
+
+          nil
+        end
       end
     end
 

data/lib/action_subscriber/version.rb

@@ -1,3 +1,3 @@
 module ActionSubscriber
-  VERSION = "2.1.2"
+  VERSION = "2.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_subscriber
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport