ocular 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b75a01c08fb7b6a2ff960807a32756141e464168
-  data.tar.gz: 37aaefaa23b2948b71e08ab2d9b1b3a869ddb68a
+  metadata.gz: 89e4559ff9d5af112b1d8112311d72658732f4a0
+  data.tar.gz: ad7aefaf93159266fdbe1977bed667c24cd82529
 SHA512:
-  metadata.gz: e88d5e11511d01257c91a8437435ef910c530b2fa18e8d4e2d60e26a5d444b4e567ccf1d59ba04b82ae490e39e5c95526ca17a1dff194b3dd6842854c5a38eff
-  data.tar.gz: cc915062ae0f0eac29ff93a3d9ea96b7ca1e9f25cfea0b757cc303fea89b126fae9703c9d5f718634ef596af7c4d2deae7f9fb2220b48e5272e2082626baf345
+  metadata.gz: 2c89e2f89937f1e1aac4036872e8262db351ef4cfbfb08035e511591756fed79b00ca985ca2886e7cc646ee903850a7624c560c6f1909837af23e0af5113c1e5
+  data.tar.gz: 8fa4c75d13e95ffd823778f7454d2ab4fc390a2e8048360b4c72b3323d6d325252bbd4a3d16bfcbb7f21da1f1e042a9ad1ef3d02836100229404f9f06231feb5

data/bin/ocular

@@ -95,12 +95,20 @@ ssh:
   - /home/user/.ssh/id_dsa
   user: ubuntu
 
-inputs:
-  http:
-    port: 8083
+datasources:
   etcd:
     host: etc
     port: 4001
+  mysql:
+    host: localhost
+    password: xyz
+    username: ocular
+    database: ocular
+
+inputs:
+  http:
+    port: 8083
+
 
 "
   exit -1

data/lib/ocular/event/eventfactory.rb

@@ -3,6 +3,7 @@ require 'ocular/event/eventbase.rb'
 require 'ocular/inputs/http_input.rb'
 require 'ocular/inputs/cron_input.rb'
 require 'ocular/inputs/trigger_input.rb'
+require 'ocular/inputs/rabbitmq_input.rb'
 
 class Ocular
     module Event
@@ -30,6 +31,7 @@ class Ocular
             include Ocular::Inputs::HTTP::ErrorDSL
             include Ocular::Inputs::Cron::DSL
             include Ocular::Inputs::Trigger::DSL
+            include Ocular::Inputs::RabbitMQ::DSL
 
             def fork(value)
                 @do_fork = value

data/lib/ocular/inputs/http_input.rb

@@ -32,6 +32,12 @@ class Ocular
                     handler = handlers.get(::Ocular::Inputs::HTTP::Input)
                     handler.add_delete(script_name, path, opts, self, &block)
                 end
+
+                def onOPTIONS(path, opts = {}, &block)
+                    handler = handlers.get(::Ocular::Inputs::HTTP::Input)
+                    handler.add_options(script_name, path, opts, self, &block)
+                end
+
             end
 
             module ErrorDSL
@@ -282,7 +288,12 @@ class Ocular
                 def add_delete(script_name, path, options, proxy, &block)
                     name = generate_uri_from_names(script_name, path)
                     route('DELETE', name, options, proxy, &block)
-                end                
+                end
+
+                def add_options(script_name, path, options, proxy, &block)
+                    name = generate_uri_from_names(script_name, path)
+                    route('OPTIONS', name, options, proxy, &block)
+                end
 
                 def build_signature(pattern, keys, &block)
                     return [pattern, keys, block]

data/lib/ocular/inputs/rabbitmq_input.rb

@@ -0,0 +1,87 @@
+
+require 'ocular/inputs/base.rb'
+require 'ocular/dsl/dsl.rb'
+require 'ocular/dsl/runcontext.rb'
+require 'rufus/scheduler'
+
+class Ocular
+    module Inputs
+
+        module RabbitMQ
+
+            module DSL
+
+                #add_event_help "cron.in(rule)", "Schedule event to be executed in 'rule'. eg: '1m'"
+                def rabbitmq()
+                    handler = handlers.get(::Ocular::Inputs::RabbitMQ::Input)
+                    return Input::DSLProxy.new(self, handler, logger)
+                end
+
+            end
+
+            class Input < ::Ocular::Inputs::Base
+
+                attr_reader :routes
+                attr_reader :conn
+
+                def initialize(settings_factory)
+                    settings = settings_factory[:rabbitmq]
+
+                    ::Ocular.logger.debug "Starting RabbitMQ input"
+
+                    @conn = Bunny.new
+                    conn.start
+
+                    ch = conn.create_channel
+                    q  = ch.queue("bunny.examples.hello_world", :auto_delete => true)
+                    x  = ch.default_exchange
+
+                end
+
+                def start()
+
+                end
+
+                def stop()
+                    @scheduler.shutdown
+                end
+
+                class RabbitMQRunContext < ::Ocular::DSL::RunContext
+                    attr_accessor :delivery_info, :metadata, :payload
+
+                    def initialize()
+                        super(Ocular::Logging::ConsoleLogger.new)
+                    end
+                end
+
+
+                class DSLProxy                    
+                    def initialize(proxy, handler, logger)
+                        @proxy = proxy
+                        @handler = handler
+                        @logger = logger
+                    end
+
+                    def subscribe(topic, &block)
+                        eventbase = Ocular::DSL::EventBase.new(@proxy, &block)
+                        ::Ocular.logger.debug "rabbitmq.subscribe to# #{topic} for block #{block}"
+
+                        q.subscribe(topic) do |delivery_info, metadata, payload|
+                            context = RabbitMQRunContext.new(@logger)
+                            context.log_cause("rabbitmq.subscribe(#{topic})")
+                            context.delivery_info = delivery_info
+                            context.metadata = metadata
+                            context.payload = payload
+                            eventbase.exec(context)
+                        end
+
+                        @proxy.events[id] = eventbase
+
+                        return id
+                    end
+                end
+
+            end
+        end
+    end
+end

data/lib/ocular/ocular.rb

@@ -24,6 +24,7 @@ require 'ocular/dsl/runcontext'
 require 'ocular/inputs/handlers'
 require 'ocular/inputs/base'
 require 'ocular/inputs/http_input'
+require 'ocular/inputs/rabbitmq_input'
 require 'ocular/daemon'
 
 

data/lib/ocular/version.rb

@@ -1,3 +1,3 @@
 class Ocular
-    Version = "0.1.14"
+    Version = "0.1.15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocular
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Juho Mäkinen
@@ -150,6 +150,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.4.3
+- !ruby/object:Gem::Dependency
+  name: bunny
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.3.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -198,6 +212,7 @@ files:
 - lib/ocular/inputs/cron_input.rb
 - lib/ocular/inputs/handlers.rb
 - lib/ocular/inputs/http_input.rb
+- lib/ocular/inputs/rabbitmq_input.rb
 - lib/ocular/inputs/trigger_input.rb
 - lib/ocular/logging/console_logger.rb
 - lib/ocular/logging/kafka_logger.rb