msgr 0.12.3 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eac9602dee7cbdefdc6bdd4868cf960cd0c1e8b3
-  data.tar.gz: 86214eaeb5714d13af4dfe81978c28a41b89ce6a
+  metadata.gz: e94aa29e884fd4e1b008efe5076f213243a33677
+  data.tar.gz: c88508a57afd05a6bdce91c847e444a2372eb375
 SHA512:
-  metadata.gz: 069c7a49eb5051cb30c415b812abd0ac9f609d1b7d06ca59982af6f7b28ac389797f87f20eb76ebd9d6d795b7b18ed3d672fbf3180edb61388fb1eaceaeb33df
-  data.tar.gz: d3bd35f6b8d4130ce26689f4f1f657fe340befb1e31e84ec3f5a5c8ad4389725772e1ef96de4dcef31d10de132d3bfeb9f8cb1244bfa3d6224c67cf1518e1684
+  metadata.gz: 73224563fc200eb0774e4c93fe8f15f7c60a4a87af0ee2838f41797d5eca5ab6d4cddb96b0002ec9f73cf9388dec690c1f7c2466f9a98fd3e31d0f4f6911f407
+  data.tar.gz: f0d8baa1b8f99cea91e0d7a4a85b1d716271793234328017f3cfc58e5c63c8ef8d81f1699cfcfb91b6a04f55a1cd894a3ac5c635260d77cce3337e9fbbdc42e0

data/.travis.yml

@@ -1,20 +1,21 @@
+sudo : false
 language: ruby
 bundler_args: --without development
 services:
   - rabbitmq
 rvm:
+  - '2.2'
   - '2.1'
   - '2.0'
-  - '1.9.3'
   - jruby
   - rbx
 gemfile:
+  - gemfiles/Gemfile.rails-4-2
   - gemfiles/Gemfile.rails-4-1
   - gemfiles/Gemfile.rails-4-0
-  - gemfiles/Gemfile.rails-3-2
 env:
-  - BUNNY_VERSION="~> 1.6"
-  - BUNNY_VERSION="~> 1.5.0"
+  - BUNNY_VERSION="~> 2.0"
+  - BUNNY_VERSION="~> 1.5"
   - BUNNY_VERSION="~> 1.4.0"
 matrix:
   allow_failures:

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.13.0
+
+* Use `Rails.application.config_for` if available.
+
 ## 0.12.2
 
 * Do not delete the exchange on stop delete:true - as the exchange is changed

data/gemfiles/{Gemfile.rails-3-2 → Gemfile.rails-4-2}

@@ -3,5 +3,5 @@ source 'https://rubygems.org'
 # Load root Gemfile
 self.instance_eval Bundler.read_file 'Gemfile'
 
-gem 'activesupport', '~> 3.2.0'
+gem 'activesupport', '~> 4.2.0'
 gem 'bunny', ENV['BUNNY_VERSION']

data/lib/msgr/railtie.rb

@@ -8,10 +8,6 @@ module Msgr
       app.config.msgr.logger ||= Rails.logger
     end
 
-    initializer 'msgr.rabbitmq_config' do
-      config.msgr.rabbitmq_config ||= Rails.root.join *%w(config rabbitmq.yml)
-    end
-
     # Start msgr
     initializer 'msgr.start' do
       config.after_initialize do |app|
@@ -23,7 +19,7 @@ module Msgr
 
     class << self
       def load(rails_config)
-        cfg = parse_config load_config rails_config.rabbitmq_config.to_s
+        cfg = parse_config load_config rails_config
         return unless cfg # no config given -> does not load Msgr
 
         Msgr.config = cfg
@@ -69,8 +65,18 @@ module Msgr
         cfg
       end
 
-      def load_config(file)
-        YAML.load ERB.new(File.read(file)).result
+      def load_config(options)
+        if options.rabbitmq_config || !Rails.application.respond_to?(:config_for)
+          load_file options.rabbitmq_config || Rails.root.join(*%w(config rabbitmq.yml))
+        else
+          conf = Rails.application.config_for :rabbitmq
+
+          {Rails.env.to_s => conf}
+        end
+      end
+
+      def load_file(path)
+        YAML.load ERB.new(File.read(path)).result
       end
     end
   end

data/lib/msgr/version.rb

@@ -1,8 +1,8 @@
 module Msgr
   module VERSION
     MAJOR = 0
-    MINOR = 12
-    PATCH = 3
+    MINOR = 13
+    PATCH = 0
     STAGE = nil
     STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.')
 

data/msgr.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'activesupport'
-  spec.add_dependency 'bunny', '~> 1.4'
+  spec.add_dependency 'bunny', '>= 1.4', '< 3.0'
   spec.add_dependency 'multi_json'
 
   spec.add_development_dependency 'bundler', '~> 1.3'

data/spec/integration/msgr/railtie_spec.rb

@@ -101,4 +101,16 @@ describe Msgr::Railtie do
       end
     end
   end
+
+  # describe '#load_config'
+  #   let(:options) { {} }
+
+  #   subject { Msgr::Railtie.load_config options }
+
+  #   if Rails::Application.methods.include(:config_for)
+  #     it 'should use config_for' do
+
+  #     end
+  #   end
+  # end
 end

data/spec/integration/msgr_spec.rb

@@ -1,11 +1,6 @@
 require 'spec_helper'
 
 describe TestController do
-  before do
-    Msgr.logger = nil;
-    Msgr.logger.level = Logger::Severity::DEBUG if Msgr.logger
-  end
-
   it 'should send messages on :index' do
     get '/'
   end

data/spec/integration/spec_helper.rb

@@ -45,4 +45,8 @@ RSpec.configure do |config|
     # Only allow expect syntax
     c.syntax = :expect
   end
+
+  config.before do
+    Msgr.logger = false
+  end
 end

data/spec/msgr/msgr_spec.rb

@@ -15,11 +15,6 @@ class MsgrTestConsumer < Msgr::Consumer
 end
 
 describe Msgr do
-  before do
-    Msgr.logger = nil
-    Msgr.logger.level = Logger::Severity::DEBUG if Msgr.logger
-  end
-
   let(:queue) { Queue.new }
   let(:client) { Msgr::Client.new size: 1, prefix: SecureRandom.hex(2) }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: msgr
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.13.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2015-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -28,16 +28,22 @@ dependencies:
   name: bunny
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -81,9 +87,9 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/Gemfile.rails-3-2
 - gemfiles/Gemfile.rails-4-0
 - gemfiles/Gemfile.rails-4-1
+- gemfiles/Gemfile.rails-4-2
 - lib/msgr.rb
 - lib/msgr/binding.rb
 - lib/msgr/client.rb
@@ -176,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: 'Msgr: Rails-like Messaging Framework'