action_subscriber 2.1.0.pre1-java → 2.1.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 254451e6fe8eb984ed79993e74eddcc8fd9a4655
-  data.tar.gz: 2e3982f910a1be30c14afba9d472e09116ad2fad
+  metadata.gz: 0bb53b1d4649ffe66409823cf35a69ffc3c2f773
+  data.tar.gz: 807b0206c26e9033012b6872e3291db06820d26d
 SHA512:
-  metadata.gz: 783d6e2b6118dd76b2b9c14563be0170f02836ac17141c814e27e9a8aa76cff468b8c9acd7d18d75209454b873ed55976288026825fa9202d4b29efc36b129ef
-  data.tar.gz: 0fc3c71d86835904e83bad717a5c54e85699ecaddc1ca46ccfec05c77256ae9c6849c2488a52fa0bfe690e5887a94a4cc17d388195f61d5ed0a027151b8e7fc0
+  metadata.gz: 2fa2f6df1b924d98b696bea64acfbfb592dee42abfe5a17cfe2012e30ae619aeee8fce1d1d43a59d11c015f8f7153010aa5800a9219e2cb1067a47a3db6171e0
+  data.tar.gz: a92dc35e85dc2e7bceef7d01ee9b0a463659f8360a773df06556c28078e28d6ed671f91991dc4e365fe0e6c712ddfbff06af7ec6786e4c89c7d11ebdfbc2bf3a

data/lib/action_subscriber.rb

@@ -29,6 +29,7 @@ require "action_subscriber/route_set"
 require "action_subscriber/router"
 require "action_subscriber/threadpool"
 require "action_subscriber/base"
+require "action_subscriber/uri"
 
 module ActionSubscriber
   ##
@@ -59,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
@@ -121,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/configuration.rb

@@ -12,14 +12,17 @@ module ActionSubscriber
                   :host,
                   :hosts,
                   :mode,
+                  :password,
                   :pop_interval,
                   :port,
                   :prefetch,
                   :publisher_confirms,
                   :seconds_to_wait_for_graceful_shutdown,
+                  :username,
                   :threadpool_size,
                   :timeout,
-                  :times_to_pop
+                  :times_to_pop,
+                  :virtual_host
 
     DEFAULTS = {
       :allow_low_priority_methods => false,
@@ -39,7 +42,10 @@ module ActionSubscriber
       :seconds_to_wait_for_graceful_shutdown => 30,
       :threadpool_size => 8,
       :timeout => 1,
-      :times_to_pop => 8
+      :times_to_pop => 8,
+      :username => "guest",
+      :password => "guest",
+      :virtual_host => "/"
     }
 
     ##
@@ -89,6 +95,13 @@ module ActionSubscriber
       self.decoder.merge!(decoders)
     end
 
+    def connection_string=(url)
+      settings = ::ActionSubscriber::URI.parse_amqp_url(url)
+      settings.each do |key, value|
+        send("#{key}=", value)
+      end
+    end
+
     def hosts
       return @hosts if @hosts.size > 0
       [ host ]

data/lib/action_subscriber/rabbit_connection.rb

@@ -62,10 +62,13 @@ module ActionSubscriber
 
     def self.connection_options
       {
+        :continuation_timeout          => ::ActionSubscriber.configuration.timeout * 1_000.0, #convert sec to ms
         :heartbeat                     => ::ActionSubscriber.configuration.heartbeat,
         :hosts                         => ::ActionSubscriber.configuration.hosts,
+        :pass                          => ::ActionSubscriber.configuration.password,
         :port                          => ::ActionSubscriber.configuration.port,
-        :continuation_timeout          => ::ActionSubscriber.configuration.timeout * 1_000.0, #convert sec to ms
+        :user                          => ::ActionSubscriber.configuration.username,
+        :vhost                         => ::ActionSubscriber.configuration.virtual_host,
         :automatically_recover         => true,
         :network_recovery_interval     => NETWORK_RECOVERY_INTERVAL,
         :recover_from_connection_close => true,

data/lib/action_subscriber/uri.rb

@@ -0,0 +1,28 @@
+# Taken and adapted from https://github.com/ruby-amqp/amq-protocol/blob/master/lib/amq/uri.rb
+require "cgi"
+require "uri"
+
+module ActionSubscriber
+  class URI
+    AMQP_PORTS = {"amqp" => 5672, "amqps" => 5671}.freeze
+
+    def self.parse_amqp_url(connection_string)
+      uri = ::URI.parse(connection_string)
+      raise ArgumentError.new("Connection URI must use amqp or amqps schema (example: amqp://bus.megacorp.internal:5766), learn more at http://bit.ly/ks8MXK") unless %w{amqp amqps}.include?(uri.scheme)
+
+      opts = {}
+
+      opts[:username]   = ::CGI::unescape(uri.user) if uri.user
+      opts[:password]   = ::CGI::unescape(uri.password) if uri.password
+      opts[:host]   = uri.host if uri.host
+      opts[:port]   = uri.port || AMQP_PORTS[uri.scheme]
+
+      if uri.path =~ %r{^/(.*)}
+        raise ArgumentError.new("#{uri} has multiple-segment path; please percent-encode any slashes in the vhost name (e.g. /production => %2Fproduction). Learn more at http://bit.ly/amqp-gem-and-connection-uris") if $1.index('/')
+        opts[:virtual_host] = ::CGI::unescape($1)
+      end
+
+      opts
+    end
+  end
+end

data/lib/action_subscriber/version.rb

@@ -1,3 +1,3 @@
 module ActionSubscriber
-  VERSION = "2.1.0.pre1"
+  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")

data/spec/lib/action_subscriber/configuration_spec.rb

@@ -5,6 +5,7 @@ describe ::ActionSubscriber::Configuration do
     specify { expect(subject.async_publisher_drop_messages_when_queue_full).to eq(false) }
     specify { expect(subject.async_publisher_max_queue_size).to eq(1_000_000) }
     specify { expect(subject.async_publisher_supervisor_interval).to eq(200) }
+    specify { expect(subject.default_exchange).to eq("events") }
     specify { expect(subject.heartbeat).to eq(5) }
     specify { expect(subject.host).to eq("localhost") }
     specify { expect(subject.mode).to eq('subscribe') }
@@ -37,4 +38,15 @@ describe ::ActionSubscriber::Configuration do
       }.to raise_error(/The foo decoder was given with arity of 2/)
     end
   end
+
+  describe "connection_string" do
+    it "explodes the connection string into the corresponding settings" do
+      subject.connection_string = "amqp://user:pass@host:100/vhost"
+      expect(subject.username).to eq("user")
+      expect(subject.password).to eq("pass")
+      expect(subject.host).to eq("host")
+      expect(subject.port).to eq(100)
+      expect(subject.virtual_host).to eq("vhost")
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_subscriber
 version: !ruby/object:Gem::Version
-  version: 2.1.0.pre1
+  version: 2.1.1
 platform: java
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-02-04 00:00:00.000000000 Z
+date: 2016-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -223,6 +223,7 @@ files:
 - lib/action_subscriber/rspec.rb
 - lib/action_subscriber/subscribable.rb
 - lib/action_subscriber/threadpool.rb
+- lib/action_subscriber/uri.rb
 - lib/action_subscriber/version.rb
 - routing.md
 - spec/integration/around_filters_spec.rb
@@ -269,9 +270,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project:
 rubygems_version: 2.4.8