action_subscriber 2.2.1-java → 2.3.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: deac02550ec88de73c135a293afb4c1d924e65b8
-  data.tar.gz: 4ef2de28672b6fdb39a9fc1e380b4bf185469a38
+  metadata.gz: 6be4d0f602e06698805dfc7eec7c37bd5332fb63
+  data.tar.gz: 75dc85204e6f4c42a65908e51d497417fdbed219
 SHA512:
-  metadata.gz: 371863f4e158857e0a1ab8de4349e728246257a14a176e99a2652bcae32f0964536381f390aeace7946c0b57ac549f405de8347126288e57d9ce84ca1337b8e5
-  data.tar.gz: 926fe3984fd7cb85e4c67a4a4b334ef34214ad979e56fc7996b0d14d593be92753c0c1a3c52c5b7fd3eb71104bc8c23e3920d1b5cf9ebcc56f4c23f3ce55cad2
+  metadata.gz: 2356716b4e7e2c6356232ae05efb400d4e60acdc2fbeb2ec0690fbd77b21383440736b16f0dd15d2229ed276fb17344f5ab2368e7184dda4bbabb5afb2c05175
+  data.tar.gz: aef2c06b7b620103a501a35dd80ef48669738833c1b27cb229515ef214111ce36617018307a6e7a903ac1f0ab205b95b041565c0a4ff1b490518f7e3f9a142aa

data/bin/action_subscriber

@@ -1,11 +1,7 @@
 #!/usr/bin/env ruby
 
-$ACTION_SUBSCRIBER_SERVER_MODE = true
-
-require 'active_support'
-require 'active_support/core_ext'
-require 'thor'
-require 'action_subscriber'
+require "action_subscriber/preload"
+require "thor"
 
 module ActionSubscriber
   class CLI < ::Thor
@@ -35,17 +31,11 @@ module ActionSubscriber
 
       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..."
 
+      # Require action_subscriber if the application did not.
+      require "action_subscriber"
+
       case ::ActionSubscriber.configuration.mode
       when /pop/i then
         ::ActionSubscriber::Babou.auto_pop!

data/lib/action_subscriber.rb

@@ -11,10 +11,13 @@ require "thread"
 
 require "action_subscriber/version"
 
+# Preload will load configuration and logging. These are the things
+# that the bin stub need to initialize the configuration before load
+# hooks are run when the app loads.
+require "action_subscriber/preload"
+
 require "action_subscriber/default_routing"
 require "action_subscriber/dsl"
-require "action_subscriber/configuration"
-require "action_subscriber/logging"
 require "action_subscriber/message_retry"
 require "action_subscriber/middleware"
 require "action_subscriber/rabbit_connection"
@@ -29,7 +32,6 @@ require "action_subscriber/route_set"
 require "action_subscriber/router"
 require "action_subscriber/threadpool"
 require "action_subscriber/base"
-require "action_subscriber/uri"
 
 module ActionSubscriber
   ##
@@ -51,10 +53,6 @@ module ActionSubscriber
     route_set.auto_subscribe!
   end
 
-  def self.configuration
-    @configuration ||= ::ActionSubscriber::Configuration.new
-  end
-
   def self.configure
     yield(configuration) if block_given?
   end
@@ -68,10 +66,6 @@ module ActionSubscriber
     @draw_routes_block = block
   end
 
-  def self.logger
-    ::ActionSubscriber::Logging.logger
-  end
-
   def self.print_subscriptions
     logger.info configuration.inspect
     route_set.routes.group_by(&:subscriber).each do |subscriber, routes|
@@ -107,21 +101,9 @@ module ActionSubscriber
     route_set.cancel_consumers!
   end
 
-  ##
-  # Class aliases
-  #
-  class << self
-    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
+  require "action_subscriber/railtie" if defined?(Rails)
+  ::ActiveSupport.run_load_hooks(:action_subscriber, Base)
 
   # Intialize async publisher adapter
   ::ActionSubscriber::Publisher::Async.publisher_adapter

data/lib/action_subscriber/configuration.rb

@@ -1,4 +1,5 @@
 require "yaml"
+require "action_subscriber/uri"
 
 module ActionSubscriber
   class Configuration

data/lib/action_subscriber/preload.rb

@@ -0,0 +1,29 @@
+require "active_support"
+require "active_support/core_ext"
+require "middleware"
+
+require "action_subscriber/configuration"
+require "action_subscriber/logging"
+
+module ActionSubscriber
+  ##
+  # Public Class Methods
+  #
+  def self.logger
+    ::ActionSubscriber::Logging.logger
+  end
+
+  def self.configuration
+    @configuration ||= ::ActionSubscriber::Configuration.new
+  end
+
+  ##
+  # Class aliases
+  #
+  class << self
+    alias_method :config, :configuration
+  end
+
+  # Initialize config object
+  config
+end

data/lib/action_subscriber/version.rb

@@ -1,3 +1,3 @@
 module ActionSubscriber
-  VERSION = "2.2.1"
+  VERSION = "2.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_subscriber
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: java
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -212,6 +212,7 @@ files:
 - lib/action_subscriber/middleware/error_handler.rb
 - lib/action_subscriber/middleware/router.rb
 - lib/action_subscriber/middleware/runner.rb
+- lib/action_subscriber/preload.rb
 - lib/action_subscriber/publisher.rb
 - lib/action_subscriber/publisher/async.rb
 - lib/action_subscriber/publisher/async/in_memory_adapter.rb