action_subscriber 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c31b26344944773ea0c63f2ba81c2b9d2d9e3c8b
-  data.tar.gz: f8f231f821d5b33937abfff11ce996033d810f88
+  metadata.gz: 9575343e64c1b2390a894e3da791c3622d609a6a
+  data.tar.gz: 50b81796945c52e733b4ad3024bf9022986deda7
 SHA512:
-  metadata.gz: 5f095a28d75908af71ef2bbf5d75638b434663248bef1b728818ff566c5b21cbd411a4dc17bd5ffa89964516636d38ffd506d781df4b53411bf5d3a3769bfa5c
-  data.tar.gz: e20052f487628bd2bd7a4af42c399db06c4257f17b3adaaf3aafeff272f4031816899ef4a30053d871aa9313790b4cf591fbd70445117baed92734785d710d87
+  metadata.gz: fed4d194dd8ff1ecac1be9e89002578eb19d1e7628ee5ae63e3bd1941739cc783b482706be318652b4cbcd6755edb3ff7012d519eca6f9ea57f673b65d1eca93
+  data.tar.gz: 65de4790022a1b705f13a9a94a175c6dd53b0d85c4cfce1b274ad3657fad25f247e7c59d3b27b78cf551884f1e566ecfdbe14d4d09c0cd82e7f2a40e38d3287a

data/lib/action_subscriber.rb

@@ -60,8 +60,12 @@ module ActionSubscriber
   end
 
   def self.draw_routes(&block)
-    routes = Router.draw_routes(&block)
-    @route_set = RouteSet.new(routes)
+    fail "No block provided to ActionSubscriber.draw_routes" unless block_given?
+
+    # We need to delay the execution of this block because ActionSubscriber is
+    # not configured at this point if we're calling from within the required app.
+    @route_set = nil
+    @draw_routes_block = block
   end
 
   def self.logger
@@ -122,8 +126,13 @@ module ActionSubscriber
   #
   def self.route_set
     @route_set ||= begin
-      logger.warn "DEPRECATION WARNING: We are inferring your routes by looking at your subscribers. This behavior is deprecated and will be removed in version 2.0. Please see the routing guide at https://github.com/mxenabled/action_subscriber/blob/master/routing.md"
-      RouteSet.new(self.send(:default_routes))
+      if @draw_routes_block
+        routes = Router.draw_routes(&@draw_routes_block)
+        RouteSet.new(routes)
+      else
+        logger.warn "DEPRECATION WARNING: We are inferring your routes by looking at your subscribers. This behavior is deprecated and will be removed in version 2.0. Please see the routing guide at https://github.com/mxenabled/action_subscriber/blob/master/routing.md"
+        RouteSet.new(self.send(:default_routes))
+      end
     end
   end
   private_class_method :route_set

data/lib/action_subscriber/version.rb

@@ -1,3 +1,3 @@
 module ActionSubscriber
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

data/spec/integration/inferred_routes_spec.rb

@@ -33,6 +33,13 @@ describe "A Subscriber With Inferred Routes", :integration => true do
 
   # This is the deprecated behavior we want to keep until version 2.0
   context "no explicit routes" do
+    before do
+      # TEST HACK: Bust any memoized routes.
+      ::ActionSubscriber.instance_variable_set(:@route_set, nil)
+      ::ActionSubscriber.instance_variable_set(:@draw_routes_block, nil)
+      ::ActionSubscriber.setup_queues!
+    end
+
     it "registers the routes and sets up the queues" do
       ::ActionSubscriber.auto_subscribe!
       ::ActionSubscriber::Publisher.publish("kyle.inference.yo", "YO", "events")

metadata

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