twingly-amqp 3.2.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6136b61a3e79388ec44fb18c00a84790e6e3e7e8
-  data.tar.gz: b502929e7500e8166ce6abb3c57fdefd41d5a9f9
+  metadata.gz: b73b12f7ad3443cc1515288abad101ab00b0f987
+  data.tar.gz: b6394cd5f3b16025d196f4c67e579f59bf01867c
 SHA512:
-  metadata.gz: b99173aaf652c7a92d5e421da16a4ce0f3800667bedb9f2420f237cbf5adc44c9bbeb3ae94b56289eecb0569ae93eaf91f60deb28c4feb840bcaf1c7cc5f4fe4
-  data.tar.gz: 77077154d065800cdb69276dfe2732782ac5d1d33bb01177d421ffa9464f58ae70deb3cf3f88b610965532d3ebfc35bcbfc95a59ed2861a9bf70d334358144e7
+  metadata.gz: a3a921f4a6a8f95184d00a08a33e7947aff1b9996619417f5f689553c7137026833b2a47ee301b1fd65ebe270582f3522f2c0c5aa498931276e2fe882952543b
+  data.tar.gz: 4221dee81f1da5e7237098506dbfeed96d5d5925908651c1becef5983ebada7d6e34d914df7234a579b4da19b0d672bb6d49b4ae629bc0979cb8790e95d8ad0b

data/README.md

@@ -28,14 +28,23 @@ Environment variables:
 
 ### Customize options
 
-If you don't have the RabbitMQ hosts in your ENV you can set them with `Twingly::AMQP::Connection.options=` before you create an instance of `Subscription` or `Ping`.
+If you don't have the RabbitMQ hosts, user or password in your ENV you can set them with `Twingly::AMQP::Connection.options=` before you create an instance of `Subscription` or `Ping`.
+
+*Options set in `Connection.options=` take precedence over the options defined in `ENV`.*
+
+All options are sent to `Bunny.new`, see the [documentation][ruby-bunny] for all available options.
 
 ```ruby
 Twingly::AMQP::Connection.options = {
-  hosts: "localhost",
+  hosts: %w(localhost),
+  user: "a-user",
+  pass: "1234",
+  # ...
 }
 ```
 
+[ruby-bunny]: http://rubybunny.info/articles/connecting.html
+
 ### Subscribe to a queue
 
 ```ruby

data/lib/twingly/amqp/session.rb

@@ -1,10 +1,10 @@
 module Twingly
   module AMQP
     class Session
-      attr_reader :connection, :hosts
+      attr_reader :connection, :options
 
-      def initialize(hosts: nil)
-        @hosts      = hosts || hosts_from_env
+      def initialize(options = {})
+        @options    = options
         @connection = create_connection
       end
 
@@ -14,19 +14,26 @@ module Twingly
         if ruby_env == "development"
           connection = Bunny.new
         else
-          connection_options = {
-            hosts: hosts,
-            user: ENV.fetch("AMQP_USERNAME"),
-            pass: ENV.fetch("AMQP_PASSWORD"),
-            recover_from_connection_close: true,
-            tls: tls?,
-          }
           connection = Bunny.new(connection_options)
         end
         connection.start
         connection
       end
 
+      def connection_options
+        options[:user]  ||= user_from_env
+        options[:pass]  ||= password_from_env
+        options[:hosts] ||= hosts_from_env
+
+        default_connection_options.merge(options)
+      end
+
+      def default_connection_options
+        {
+          tls: tls?,
+        }
+      end
+
       def ruby_env
         ENV.fetch("RUBY_ENV")
       end
@@ -35,6 +42,14 @@ module Twingly
         ENV.has_key?("AMQP_TLS")
       end
 
+      def user_from_env
+        ENV.fetch("AMQP_USERNAME")
+      end
+
+      def password_from_env
+        ENV.fetch("AMQP_PASSWORD")
+      end
+
       def hosts_from_env
         # Matches env keys like `RABBITMQ_01_HOST`
         environment_keys_with_host = ENV.keys.select { |key| key =~ /^rabbitmq_\d+_host$/i }

data/lib/twingly/amqp/version.rb

@@ -1,5 +1,5 @@
 module Twingly
   module Amqp
-    VERSION = "3.2.1"
+    VERSION = "3.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twingly-amqp
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0
 platform: ruby
 authors:
 - Twingly AB
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement