msgr 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8948601f4dd6d56c3d502ec2c9898e7b0d6bd6d7
-  data.tar.gz: 4f4bf4567945427f5296f5d9e38f064ed54b8769
+  metadata.gz: c5dac0bc0219f72492a4b9d740e884ed191e4aa5
+  data.tar.gz: 9342839d6f9b78908999952b29cb826dd958b0cb
 SHA512:
-  metadata.gz: 70a9b7e8ed8a3e94dbb6fde5401954661911450f8ffadf7a19135d682f6088d81565151b5fcfe933bbb7b08392f35126c53aab957a1019ec9535d227fdfa06c9
-  data.tar.gz: d8761f0ec024977fce524b91127f7728a302734ad88dfcaa6a40cd77df1aaf2168ea187007df33d9e9ac436c392a09add8bb709beac203dfe77c54064109c949
+  metadata.gz: 10afa11b46160f7b116db6b2ed99e10262789592bc6bf9e2beda5f646bdede1b8802c19ebc19c998e237b20f59e9a999d9a180246aa3aeb0404fbd8fc1ab3ac5
+  data.tar.gz: cb2b8e805a974aab1c94680982ebfe6bd23a073dc2c74acd554cf1a231c83a049c12f1cca7532de5b4f0b7ff680be7ab4bfc464b9ea678096e0774ad13169ae8

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.4.0
+
+* Improve railtie and autostart code
+
 ## 0.3.0
 
 * Support for forking web servers like unicorn

data/README.md

@@ -95,7 +95,7 @@ common: &common
   autostart: false
 ```
 
-And call inside each worker `Msgr.client.start` - e.g. in an after-fork block
+And call inside each worker `Msgr.start` - e.g. in an after-fork block
 
 
 ## Contributing

data/lib/msgr/client.rb

@@ -109,6 +109,9 @@ module Msgr
     def init
       @bunny = Bunny.new @config
       @pool  = Pool.new Dispatcher, size: @config[:size]
+      if @config[:routing_file]
+        routes.files << @config[:routing_file]
+      end
     end
 
     def launch

data/lib/msgr/railtie.rb

@@ -12,54 +12,69 @@ module Msgr
       config.msgr.rabbitmq_config ||= Rails.root.join *%w(config rabbitmq.yml)
     end
 
-    initializer 'msgr.routes_file' do
-      config.msgr.routes_file ||= Rails.root.join *%w(config msgr.rb)
-    end
-
     # Start msgr
     initializer 'msgr.start' do
       config.after_initialize do |app|
         Msgr.logger = app.config.msgr.logger
         Celluloid.logger = app.config.msgr.logger
 
-        cfile  = app.config.msgr.rabbitmq_config.to_s
-        config = YAML.load ERB.new(File.read(cfile)).result
+        self.class.load app.config.msgr
+      end
+    end
 
-        raise ArgumentError, 'Could not load rabbitmq config: Config must be a Hash' unless config.is_a? Hash
+    class << self
+      def load(rails_config)
+        cfg = parse_config load_config rails_config.rabbitmq_config.to_s
+        return unless cfg # no config given -> does not load Msgr
 
-        if config[Rails.env].is_a?(Hash)
-          cfg = HashWithIndifferentAccess.new config[Rails.env]
+        Msgr.config = cfg
 
-          if cfg[:enabled].nil? || cfg[:enabled] == 'true'
-            if cfg[:uri]
-              client = Msgr::Client.new cfg
-              client.routes.files << app.config.msgr.routes_file
-              client.routes.reload
+        # later loading for e.g. unicorn
+        if Rails.env.development?
+          Msgr.after_load do |client|
+            setup_autoreload client
+          end
+        end
 
-              if Rails.env.development? || config
-                reloader = ActiveSupport::FileUpdateChecker.new client.routes.files do
-                  client.routes.reload
-                  client.reload
-                end
+        Msgr.start if cfg[:autostart]
+      end
 
-                ActionDispatch::Reloader.to_prepare do
-                  reloader.execute_if_updated
-                end
-              end
+      def setup_autoreload(client)
+        reloader = ActiveSupport::FileUpdateChecker.new client.routes.files do
+          client.routes.reload
+          client.reload
+        end
 
-              Msgr.client = client
-              client.start unless cfg[:autostart] and cfg[:autostart] == 'false'
-            else
-              raise ArgumentError, 'Could not load rabbitmq environment config: URI missing.'
-            end
-          end
+        ActionDispatch::Reloader.to_prepare do
+          reloader.execute_if_updated
+        end
+      end
+
+      def parse_config(cfg)
+        unless cfg.is_a? Hash
+          raise ArgumentError, 'Could not load rabbitmq config: Config must be a Hash'
+        end
+        unless cfg[Rails.env].is_a?(Hash)
+          raise ArgumentError, "Could not load rabbitmq config for environment \"#{Rails.env}\": is not a Hash"
+        end
+        cfg = HashWithIndifferentAccess.new cfg[Rails.env]
+        unless cfg[:uri]
+          raise ArgumentError, 'Could not load rabbitmq environment config: URI missing.'
+        end
+        case cfg[:autostart]
+        when true, 'true', 'enabled', nil
+          cfg[:autostart] = true
+        when false, 'false', 'disabled'
+          cfg[:autostart] = false
         else
-          if Rails.env.production?
-            raise ArgumentError, 'Could not load rabbitmq environment config: Not a hash.'
-          else
-            Rails.logger.warn 'Could not load rabbitmq environment config: Not a hash.'
-          end
+          raise ArgumentError, "Invalid value for rabbitmq config autostart: \"#{cfg[:autostart]}\""
         end
+        cfg[:routing_file] ||= Rails.root.join('config/msgr.rb').to_s
+        cfg
+      end
+
+      def load_config(file)
+        YAML.load ERB.new(File.read(file)).result
       end
     end
   end

data/lib/msgr/version.rb

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

data/lib/msgr.rb

@@ -25,9 +25,17 @@ require 'msgr/railtie' if defined? Rails
 module Msgr
 
   class << self
-    attr_accessor :client
+    attr_writer :client, :config
     delegate :publish, to: :client
 
+    def config
+      @config ||= {}
+    end
+
+    def client
+      @client ||= Msgr::Client.new config
+    end
+
     def logger
       if @logger.nil?
         @logger = Logger.new $stdout
@@ -40,5 +48,18 @@ module Msgr
     def logger=(logger)
       @logger = logger
     end
+
+    def after_load(&block)
+      @after_load_callbacks ||= []
+      @after_load_callbacks << block
+    end
+
+    def start
+      client.start
+      (@after_load_callbacks || []).each do |callback|
+        callback.call client
+      end
+      client
+    end
   end
 end

data/spec/integration/msgr/railtie_spec.rb

@@ -9,4 +9,90 @@ describe Msgr::Railtie do
       expect(config).to respond_to :msgr
     end
   end
+
+  describe 'msgr should have load config/msgr.rb' do
+    subject { Msgr.client.routes }
+    its(:files) { should eq [Rails.root.join('config/msgr.rb').to_s] }
+  end
+
+  describe '#parse_config' do
+    let(:settings) { {} }
+    let(:action) { described_class.parse_config settings }
+    subject { action }
+
+    context 'with incorrect settings' do
+      subject { -> { action } }
+      context 'without an hash config' do
+        let(:settings) { '' }
+
+        it { should raise_error 'Could not load rabbitmq config: Config must be a Hash' }
+      end
+
+      context 'without an hash for the current environment' do
+        let(:settings) { {} }
+
+        it { should raise_error 'Could not load rabbitmq config for environment "test": is not a Hash' }
+      end
+
+      context 'with config without url' do
+        let(:settings) { {"test" => { hans: 'otto'}} }
+
+        it { should raise_error 'Could not load rabbitmq environment config: URI missing.' }
+      end
+
+      context 'with invalid autostart value' do
+        let(:settings) { {"test" => { uri: 'hans', autostart: 'unvalid'}} }
+
+        it { should raise_error 'Invalid value for rabbitmq config autostart: "unvalid"'}
+      end
+    end
+
+    context 'without set routes file' do
+      let(:settings) { {"test" => { uri: 'test'}} }
+
+      its([:routing_file]) { should eq Rails.root.join('config/msgr.rb').to_s }
+    end
+
+    context 'with set routes file' do
+      let(:settings) { {"test" => { uri: 'test', 'routing_file' => 'my fancy file' }} }
+
+      its([:routing_file]) { should eq 'my fancy file' }
+    end
+
+    context 'with uri as symbol' do
+      let(:settings) { {"test" => { uri: "hans"}}}
+
+      its([:uri]) { should eq 'hans' }
+    end
+
+    context 'with uri as string' do
+      let(:settings) { {"test" => { 'uri' => "hans"}}}
+
+      its([:uri]) { should eq 'hans' }
+    end
+  end
+
+  describe '#load' do
+    let(:config) do
+      cfg = ActiveSupport::OrderedOptions.new
+      cfg.rabbitmq_config = Rails.root.join *%w(config rabbitmq.yml)
+      cfg
+    end
+
+    context 'with autostart = false' do
+      it 'should not start Msgr' do
+        expect(Msgr).not_to receive(:start)
+        expect(Msgr::Railtie).to receive(:load_config).and_return({ "test" => { uri: 'test', autostart: false} })
+        Msgr::Railtie.load config
+      end
+    end
+
+    context 'without autostart value' do
+      it 'should not start Msgr' do
+        expect(Msgr).to receive(:start)
+        expect(Msgr::Railtie).to receive(:load_config).and_return({ "test" => { uri: 'test' } })
+        Msgr::Railtie.load config
+      end
+    end
+  end
 end

data/spec/msgr/msgr/client_spec.rb

@@ -47,5 +47,12 @@ describe Msgr::Client do
         Msgr::Client.new(uri: 'ampq://localhost', ssl: true, host: 'a.example.org').start
       end
     end
+
+    context 'routes' do
+      let(:params) { [ routing_file: 'config/msgr.rb']}
+      before { client.start }
+      subject { client.routes }
+      its(:files) { should eq ['config/msgr.rb'] }
+    end
   end
 end

data/spec/msgr/msgr_spec.rb

@@ -33,4 +33,12 @@ describe Msgr do
 
     sleep 10
   end
+
+  describe '.after_load' do
+    before { allow_any_instance_of(Msgr::Client).to receive(:launch) }
+
+    it 'should yield the given block when Msgr.start is called' do
+      expect { |cb| Msgr.after_load &cb; Msgr.start }.to yield_with_args
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: msgr
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport