ocular 0.1.17 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2b13556c63053b9d7f15e8382b3803295edc3d4
-  data.tar.gz: 8862213d31cabfaee4332bcb33bcacf63601e5d7
+  metadata.gz: dbfcb2c3150071d3ee29a6c4a0d300b97cab206c
+  data.tar.gz: 4140eef91ec116b9a72d48c079dfbd16c63e53d0
 SHA512:
-  metadata.gz: 1be07d88abd000eb2cb6c70b92b9790b33720d8d72554393f8e0f0bc21ac07a43abc8c511b7f807ed98c40a728f46bbc7613a7d0fd73e9994104a59a0089d91d
-  data.tar.gz: bb7edaf144bac5bc7433505b6c05b23e9027f27656c8bbd32a257fff9a319cafc3395947e499831ebdba9a8236b3f1b21ff7bd7a5c020527ad30b14433201c4d
+  metadata.gz: 794a5efa19b04455b2b1030388bd7dc281f61961f805e9db94c785758e0aad2fb8fed2ede3f5d520d6da54245f3a19b7b139a40bbc1bcdcbf3f20e3993943384
+  data.tar.gz: 0fa2f6fd4b8d51c25d190a03f5da1e5872eb60f1f2a68579c552561d8c6f11da49dcd1cfe456a2be93d0fc153df6c1c832b778863afd71831cda6e55dcc2e50c

data/lib/ocular/inputs/cron_input.rb

@@ -29,10 +29,9 @@ class Ocular
                 attr_reader :cron_enabled
 
                 def initialize(settings_factory)
-                    settings = settings_factory.fetch(:cron, {})
+                    settings = settings_factory.get(:inputs).fetch(:cron, {})
                     @cron_enabled = true
 
-                    pp settings
                     if settings[:lock]
                         @cron_enabled = false
                     end

data/lib/ocular/inputs/handlers.rb

@@ -13,7 +13,7 @@ class Ocular
                     return @handlers[klass]
                 end
 
-                @handlers[klass] = klass.new(::Ocular::Settings.get(:inputs))
+                @handlers[klass] = klass.new(::Ocular::Settings)
                 return @handlers[klass]
             end
 

data/lib/ocular/inputs/http_input.rb

@@ -572,7 +572,7 @@ class Ocular
                 end
 
                 def initialize(settings_factory)
-                    settings = settings_factory[:http]
+                    settings = settings_factory.get(:inputs)[:http]
 
                     @routes = {}
                     @settings = DEFAULT_SETTINGS.merge(settings)

data/lib/ocular/inputs/rabbitmq_input.rb

@@ -26,11 +26,12 @@ class Ocular
                 attr_reader :settings
 
                 def initialize(settings_factory)
-                    @settings = settings_factory[:rabbitmq]
+                    @settings = settings_factory.get(:datasources).fetch(:rabbitmq, {})
 
-                    ::Ocular.logger.debug "Starting RabbitMQ input"
+                    url = @settings[:url] || nil
+                    ::Ocular.logger.debug "Starting RabbitMQ input with connection string #{url}"
 
-                    @conn = Bunny.new
+                    @conn = Bunny.new(url)
                     @conn.start
                 end
 

data/lib/ocular/version.rb

@@ -1,3 +1,3 @@
 class Ocular
-    Version = "0.1.17"
+    Version = "0.1.19"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocular
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.19
 platform: ruby
 authors:
 - Juho Mäkinen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rye