action_subscriber 2.2.1 → 2.3.0.pre0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36a96b847699c935d154f2673a899e095e04fede
-  data.tar.gz: bd20a0e0c608b28ce2d173710e4572b2443907e2
+  metadata.gz: f487af37045fd05ea5a72d4ccdf49a381fe35959
+  data.tar.gz: 92d840c05ade75979eecc205ce43dea33b0f60d5
 SHA512:
-  metadata.gz: 4b7563f9af9b401d49e072b8d9413aaba49d3180f1da0d88ab3d08e78238ac586a39d49c4cdc6c721c590a817dda0ad3a5ba86e02220f4fac6b31f48744abd6c
-  data.tar.gz: 02e9da7ea0f39bcc4acb78d6e2bfa646d32d87766fba394eb7f8a1b9b7229cb0b12471931044b3b9375e9cbf66b65c6d44aacdc210743769965817d1c0a80bcd
+  metadata.gz: 00e68e86b877228cdf9d05c085ed234c42baa4595570839a50e466b72e6706873011c57e0549888428b4c457b7e5859b7dfa8e32c11dc3d06f58ea59e3674d9a
+  data.tar.gz: 4b1de83156e82701d97202f56dcd30977132e14194c665b702176abe03001d6fa7a408672de4789ee50cfd3799b0ce9592941af8854967c150da528316b69e4e

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.pre0"
 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.pre0
 platform: ruby
 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-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -213,6 +213,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
@@ -271,9 +272,9 @@ 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: []
 rubyforge_project: 
 rubygems_version: 2.4.5