bunny_exchanges_manager 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e65427261ca8ffce3f3c5a6f848e5a104ec410cc
-  data.tar.gz: b308f7271cf13be7e4c8c562332cab2a8fd5df23
+  metadata.gz: d0d7437554c91e5213ef1ef3fb04231742f8d6c2
+  data.tar.gz: c6d113785c87550cde168031017a4a9458d6c06c
 SHA512:
-  metadata.gz: cb2c99134815def9738a0abf645466bcc488fa44ee805e70d1ba1f47ad2c9e337f596d42e71b59633dd7365ecd0432cde1712ba0fd3db7f5122336724b7f0f4b
-  data.tar.gz: 5d08b1a43a2530822b5f6723ceee410d6276100840d29229f67d28cab4b8f82d4c1c1945d2329b2cc3f596f89323a7d1697dd3ddaf115f6d5675de8e60d27c35
+  metadata.gz: f68af147380bac85e39d85c97380d6d043b296a59de75179fbcf6eba25c287809e79c0a025af18f50ca55e417dfd9beb8bf276f6a772d0e4125c50aec371ba12
+  data.tar.gz: 6dba6b53bdb6c0c9a682f1100abb55481fe0d63a64234fcf6e2b3daf8eff9ad05cfbadcd84c9147d33492ce77e11603080a5e25bedfa0381b98a0f390d754168

data/.gitignore

@@ -20,3 +20,5 @@ tmp
 *.o
 *.a
 mkmf.log
+/nbproject
+.ruby-gemset

data/README.md

@@ -26,7 +26,7 @@ By default the path to the configuration file is `config/exchanges.yml`, but you
 can provide a specific path with:
 ```ruby
 BunnyExchanges.configure do |config|
-  config.path = "my/custom/path"
+  config.exchanges_path = "my/custom/path"
 end
 ```
 
@@ -55,6 +55,67 @@ To get a configured exchange:
 BunnyExchanges.get(:an_action) # => #<Bunny::Exchange:...>
 ```
 
+Optionally, if you configured many connections, you can specify it like this:
+```ruby
+BunnyExchanges.get(:an_action, connection_name: :another) # => #<Bunny::Exchange:...>
+```
+
+### Connections
+
+The default connection config file path is `config/rabbitmq.yml`, although you
+can provide as much connections as needed with:
+```ruby
+BunnyExchanges.configure do |config|
+  config.connections = { 
+    :default => "config/rabbitmq/default.yml",
+    :another => "config/rabbitmq/another.yml",
+  }
+end
+```
+
+The connection file needs to have the same parameters `Bunny.new` can accept,
+for example:
+
+```yml
+:host: localhost
+:port: 5672
+:user: guest
+:pass: guest
+:vhost: /
+:threaded: true
+:heartbeat: 2
+```
+
+Or it can also have a connection definition for each environment of your app:
+
+```yml
+development:
+  :host: localhost
+  :port: 5672
+  :user: guest
+  :pass: guest
+  :vhost: /
+  :threaded: true
+  :heartbeat: 2
+
+test:
+  :host: localhost
+  :port: 5672
+  :user: guest
+  :pass: guest
+  :vhost: /
+  :threaded: true
+  :heartbeat: 2
+```
+
+In case you want to use this feature, you must provide the environment in an initializer:
+
+```ruby
+BunnyExchanges.configure do |config|
+  config.env = Rails.env
+end
+```
+
 ### Pre-forking servers
 
 There are situations when you need to reconnect to your AMQP server.

data/bunny_exchanges_manager.gemspec

@@ -6,7 +6,7 @@ require 'bunny_exchanges/version'
 Gem::Specification.new do |spec|
   spec.name          = "bunny_exchanges_manager"
   spec.version       = BunnyExchanges::VERSION
-  spec.authors       = ["jcabotc"]
+  spec.authors       = ["jcabotc", "graimon"]
   spec.email         = ["jcabot@gmail.com"]
   spec.summary       = %q{A gem to initialize RabbitMQ exchanges using Bunny on ruby applications}
   spec.homepage      = ""

data/lib/bunny_exchanges.rb

@@ -21,12 +21,12 @@ module BunnyExchanges
   # Delegates `#get` to the current manager.
   # Returns the required exchange.
   #
-  # @param [Symbol, String] the action name
+  # @param [Symbol, Hash] the action name and the connection_name
   # @return [Bunny::Exchange] the required exchange.
   # @raise [BunnyExchanges::UndefinedExchange] when the required example is not defined.
   # @see Tenant.using
-  def self.get action
-    manager.get(action)
+  def self.get action, connection_name: :default
+    manager.get(action, connection_name)
   end
 
   # Removes the current manager and starts a new one with the same configuration.

data/lib/bunny_exchanges/configuration.rb

@@ -11,10 +11,10 @@ module BunnyExchanges
     # @param [String] a path.
     attr_writer :exchanges_path
 
-    # Sets the path of the rabbitmq configuration file.
+    # Sets the hash path of the rabbitmq configuration file.
     #
-    # @param [String] a path.
-    attr_writer :rabbitmq_path
+    # @param [Hash] {:connection_name => "path_to_config.yml"}.
+    attr_writer :connections
 
     # Sets the ENV. If it is set, the rabbitmq configuration
     # for that env is taken, otherwise it gets the rabbitmq config file
@@ -26,7 +26,8 @@ module BunnyExchanges
     # Constructor.
     def initialize
       @exchanges_path = DEFAULT_EXCHANGES_PATH
-      @rabbitmq_path  = DEFAULT_RABBITMQ_PATH
+      @connections    = {default: DEFAULT_RABBITMQ_PATH}
+      @configs = {}
     end
 
     # Loads the configuration YAML file contents.
@@ -39,20 +40,20 @@ module BunnyExchanges
     # Loads the configuration YAML file contents for the environment if given.
     #
     # @return [Hash] the rabbitmq configuration.
-    def rabbitmq
-      @rabbitmq ||= if env
-                      rabbitmq_contents.fetch(env)
-                    else
-                      rabbitmq_contents
-                    end
+    def connection_config connection_name
+      @configs[connection_name] ||= if env
+        rabbitmq_contents(connection_name).fetch(env)
+      else
+        rabbitmq_contents connection_name
+      end
     end
 
   private
 
-    def rabbitmq_contents
-      YAML.load_file(rabbitmq_path)
+    def rabbitmq_contents connection_name
+      YAML.load_file(connections[connection_name])
     end
 
-    attr_reader :env, :exchanges_path, :rabbitmq_path
+    attr_reader :env, :exchanges_path, :connections
   end
 end

data/lib/bunny_exchanges/manager.rb

@@ -12,18 +12,19 @@ module BunnyExchanges
     def initialize config = BunnyExchanges.configuration
       @config    = config
       @exchanges = {}
+      @channels  = {}
     end
 
     # Gets or builds the required exchange.
     #
-    # @param [Symbol] the action name.
+    # @param [Symbol, Symbol] the action name and the connection name
     # @return [Bunny::Exchange] the required bunny exchange.
     # @raise [BunnyExchanges::Manager::UndefinedExchange] when the exchange is not defined.
-    def get action
+    def get action, connection_name
       exchanges[action.to_sym] ||= begin
         name, options = params_for(action)
 
-        channel.exchange(name, options)
+        channel_for(connection_name).exchange(name, options)
       end
     end
 
@@ -48,9 +49,9 @@ module BunnyExchanges
       config.exchanges.fetch(action.to_s) { raise_undefined(action) }
     end
 
-    def channel
-      @channel ||= begin
-        conn = Bunny.new(config.rabbitmq)
+    def channel_for connection_name
+      @channels[connection_name] ||= begin
+        conn = Bunny.new(config.connection_config(connection_name))
         conn.start
 
         conn.create_channel

data/lib/bunny_exchanges/version.rb

@@ -1,3 +1,3 @@
 module BunnyExchanges
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/bunny_exchanges/configuration_spec.rb

@@ -38,7 +38,7 @@ RSpec.describe BunnyExchanges::Configuration do
     end
   end
 
-  describe '#rabbitmq_path= and #rabbitmq' do
+  describe '#connections and #connection_config' do
     let :config_file do
       File.expand_path("../configuration/test_rabbitmq_configuration.yml" ,__FILE__)
     end
@@ -52,9 +52,9 @@ RSpec.describe BunnyExchanges::Configuration do
       end
 
       it 'parses the rabbitmq config from a yaml file' do
-        subject.rabbitmq_path = config_file
+        subject.connections = {default: config_file}
 
-        expect(subject.rabbitmq).to eq expected_rabbitmq
+        expect(subject.connection_config(:default)).to eq expected_rabbitmq
       end
     end
 
@@ -62,10 +62,10 @@ RSpec.describe BunnyExchanges::Configuration do
       let(:expected_rabbitmq) { { "host" => "test_host" } }
 
       it 'parses the rabbitmq config from a yaml file' do
-        subject.rabbitmq_path = config_file
-        subject.env           = "test"
+        subject.connections = {default: config_file}
+        subject.env         = "test"
 
-        expect(subject.rabbitmq).to eq expected_rabbitmq
+        expect(subject.connection_config(:default)).to eq expected_rabbitmq
       end
     end
   end

data/spec/bunny_exchanges/manager_spec.rb

@@ -21,16 +21,18 @@ RSpec.describe BunnyExchanges::Manager do
   end
 
   let :config do
-    double 'config', :exchanges => exchanges_config,
-                     :rabbitmq  => {}
+    double 'config', :exchanges => exchanges_config
   end
 
   subject { described_class.new config }
 
   describe '#get' do
     context 'with a defined exchange' do
+      
       it 'builds and caches the exchange' do
-        exchange = subject.get(:action_1)
+        expect(config).to receive(:connection_config).with(:default).and_return({})
+        
+        exchange = subject.get(:action_1, :default)
 
         expect(exchange).to be_a Bunny::Exchange
 
@@ -40,17 +42,33 @@ RSpec.describe BunnyExchanges::Manager do
         expect(exchange.auto_delete?).to eq true
         expect(exchange.arguments   ).to eq "one" => 1, "two" => "second"
 
-        exchange_again = subject.get(:action_1)
+        exchange_again = subject.get(:action_1, :default)
         expect(exchange.object_id).to eq exchange_again.object_id
       end
     end
 
     context 'with an undefined exchange' do
       it 'raises error' do
-        expect{ subject.get(:action_3) }.
+        expect{ subject.get(:action_3, :default) }.
           to raise_error BunnyExchanges::UndefinedExchange
       end
     end
+    
+    context 'with another connection' do
+      it 'asks for the another connection' do
+        expect(config).to receive(:connection_config).with(:another).and_return({})
+        
+        exchange = subject.get(:action_1, :another)
+
+        expect(exchange).to be_a Bunny::Exchange
+      end
+    end
+  end
+  
+  describe '#get with another connection' do
+    before do
+      expect(config).to receive(:connection_config).with(:default).and_return({})
+    end
   end
 
 end

data/spec/integration/{configure_and_use.rb → configure_and_use_spec.rb}

@@ -5,7 +5,7 @@ RSpec.describe "configure and use" do
   it 'works properly' do
     BunnyExchanges.configure do |config|
       config.exchanges_path = File.expand_path("../test_exchanges_config.yml", __FILE__)
-      config.rabbitmq_path  = File.expand_path("../test_rabbitmq_config.yml", __FILE__)
+      config.connections    = {default: File.expand_path("../test_rabbitmq_config.yml", __FILE__)}
       config.env = "test"
     end
 

metadata

@@ -1,83 +1,84 @@
 --- !ruby/object:Gem::Specification
 name: bunny_exchanges_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - jcabotc
+- graimon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2016-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -87,8 +88,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -102,7 +103,7 @@ files:
 - spec/bunny_exchanges/configuration/test_rabbitmq_configuration.yml
 - spec/bunny_exchanges/configuration_spec.rb
 - spec/bunny_exchanges/manager_spec.rb
-- spec/integration/configure_and_use.rb
+- spec/integration/configure_and_use_spec.rb
 - spec/integration/test_exchanges_config.yml
 - spec/integration/test_rabbitmq_config.yml
 - spec/spec_helper.rb
@@ -116,17 +117,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A gem to initialize RabbitMQ exchanges using Bunny on ruby applications
@@ -135,7 +136,7 @@ test_files:
 - spec/bunny_exchanges/configuration/test_rabbitmq_configuration.yml
 - spec/bunny_exchanges/configuration_spec.rb
 - spec/bunny_exchanges/manager_spec.rb
-- spec/integration/configure_and_use.rb
+- spec/integration/configure_and_use_spec.rb
 - spec/integration/test_exchanges_config.yml
 - spec/integration/test_rabbitmq_config.yml
 - spec/spec_helper.rb