msgr 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b23217108455c5fa7ffc2234c8794e95b42ea10b
-  data.tar.gz: 5209c89733bc064d09a4ca7a706a2abdaf49ce17
+  metadata.gz: 215a101ca6344455fab1e0f317255ade10db36ba
+  data.tar.gz: 4b385815fa5c1c614e0455c38b8804561a4ad5df
 SHA512:
-  metadata.gz: 260954767ff2fa347eeae118ac9ba9e7e75e5da624ef98b408e560a81822f1831c532fc6f6428b783e13c70d67c6bebc248ba0d8974fe97822a4396a8e97b5f8
-  data.tar.gz: 996f1024666f2f3232fe92b9ca047f0425e94020405b2e4e0aff9002fb412e319ded02ea3d59cb71e2d10748d3ce7d9c6d9dc1ef8bb0c4cc6c8751e9337c5881
+  metadata.gz: 17ae46bee690a9f5f5b661d444f0937e0cc60431274dc72f681992f67a97497012735929b6c9167764b7ed90ade36b234e1165e00bcfb45666aec78127edadac
+  data.tar.gz: 107d3c4a8bb486f8239f078b4c20371a22719d139f7433e34c959e9ffbfec8ef9ebb070946264b38640ff93a1e519476dc5c1f567910a936fbb0d615113e0fcd

data/Gemfile

@@ -26,7 +26,6 @@ end
 
 platform :rbx do
   gem 'rubysl'
-  gem 'rubysl-json'
   gem 'rubinius-coverage'
   gem 'racc'
 end

data/lib/msgr/railtie.rb

@@ -25,26 +25,41 @@ module Msgr
         cfile  = app.config.msgr.rabbitmq_config.to_s
         config = YAML.load ERB.new(File.read(cfile)).result
 
-        raise ArgumentError, 'Could not load rabbitmq config.' unless config.is_a? Hash
-        raise ArgumentError, 'Could not load rabbitmq environment config ' unless config[Rails.env]
+        raise ArgumentError, 'Could not load rabbitmq config: Config must be a Hash' unless config.is_a? Hash
 
-        client = Msgr::Client.new config[Rails.env]
-        client.routes.files << app.config.msgr.routes_file
-        client.routes.reload
+        if config[Rails.env].is_a?(Hash)
+          cfg = HashWithIndifferentAccess.new config[Rails.env]
 
-        if Rails.env.development?
-          reloader = ActiveSupport::FileUpdateChecker.new client.routes.files do
-            client.routes.reload
-            client.reload
-          end
+          if cfg[:enabled].nil? || cfg[:enabled] == 'true'
+            if cfg[:uri]
+              client = Msgr::Client.new
+              client.routes.files << app.config.msgr.routes_file
+              client.routes.reload
+
+              if Rails.env.development? || config
+                reloader = ActiveSupport::FileUpdateChecker.new client.routes.files do
+                  client.routes.reload
+                  client.reload
+                end
+
+                ActionDispatch::Reloader.to_prepare do
+                  reloader.execute_if_updated
+                end
+              end
 
-          ActionDispatch::Reloader.to_prepare do
-            reloader.execute_if_updated
+              Msgr.client = client
+              client.start
+            else
+              raise ArgumentError, 'Could not load rabbitmq environment config: URI missing.'
+            end
+          end
+        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
         end
-
-        Msgr.client = client
-        client.start
       end
     end
   end

data/lib/msgr/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: msgr
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport