action_subscriber 2.1.0.pre1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdfd01dd3dd2055815f165b70bce923d36fe1db7
-  data.tar.gz: 261530f967fe4368afa58295344e1fe40ee70746
+  metadata.gz: c31b26344944773ea0c63f2ba81c2b9d2d9e3c8b
+  data.tar.gz: f8f231f821d5b33937abfff11ce996033d810f88
 SHA512:
-  metadata.gz: 109f19c08d6975bca0af2df1ff70483ef8e3211d235e4c4767cba1d386c78085be51d021357ccc76f1d2f86564fa3a43c3500869ba690e970f5cc06a3032ed9e
-  data.tar.gz: 3646c5fe3efb28a73d98a3a8aa991dfeac31e71d7946b0549dc7e32610c30cd6914241e6775f867828729e3bb15c6fa15ba48be715a1b1a7bc30352acc6e160e
+  metadata.gz: 5f095a28d75908af71ef2bbf5d75638b434663248bef1b728818ff566c5b21cbd411a4dc17bd5ffa89964516636d38ffd506d781df4b53411bf5d3a3769bfa5c
+  data.tar.gz: e20052f487628bd2bd7a4af42c399db06c4257f17b3adaaf3aafeff272f4031816899ef4a30053d871aa9313790b4cf591fbd70445117baed92734785d710d87

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
   ##

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.0"
 end

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.0
 platform: ruby
 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-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -224,6 +224,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
@@ -270,9 +271,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.5