i2x 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26fd09f69c0d5d4b13e61b03967aa14cab2a8e6c
-  data.tar.gz: 4815f6636f51e5e36a4e12fcd65b7a5c5b6a753d
+  metadata.gz: e5ed362050b735157e6bfa215d3fbdeba96332df
+  data.tar.gz: 626512055732e79ff3bbf57b50cff7ab116d6361
 SHA512:
-  metadata.gz: a498ad01e5da2665f87369cbb4ca689d45cc860cee12d6556eb283f91eb93de62ab098c9f55da2a82e77045fafcf46b78c88fc16e6deea18ce6a1d0af7a0c6dd
-  data.tar.gz: da7c085b0b8fb25b64193d43203b399374ed3af04ea507bdac75c22c1e9c22d1fed4e18b7c8684d81b1ad2caeb7c121733e6820e249fe82de15a4c507ca1b767
+  metadata.gz: 4cf8ef528e1cb50fc7bb8bb0dcb71504c67458e1bfeae36a17b80ae31415a220c1cc9d548dffd02a7e6d459958ddfedbace57b8c9d13179135bcd03f8a382ab0
+  data.tar.gz: df2c439bf52eaedbb3ed67f270db3a57ba7ff76e799bef51aeec3fabe3e4fd688f42d4ca74681a6468b0279be0bc699e1f8d2a51e80b9791076416cf588e15e9

data/lib/i2x/agent.rb

@@ -12,8 +12,9 @@ module I2X
         @cache = agent[:payload][:cache]
         @seeds = agent[:seeds]
         @selectors = agent[:payload][:selectors]
+        I2X::Config.log.debug(self.class.name) {"Agent #{@identifier} initialized"}
       rescue Exception => e
-        p "[i2x] unable to initialize agent. #{e}"
+        I2X::Config.log.error(self.class.name) {"Unable to initialize agent. #{e}"}
       end
 
     end
@@ -31,28 +32,28 @@ module I2X
           @d = I2X::SQLDetector.new(self)
         rescue Exception => e
           @response = {:status => 400, :error => e}
-          p "[i2x] error: #{e}"
+          I2X::Config.log.error(self.class.name) {"#{e}"}
         end
       when 'csv'
         begin
           @d = I2X::CSVDetector.new(self)
         rescue Exception => e
           @response = {:status => 400, :error => e}
-          p "[i2x] error: #{e}"
+          I2X::Config.log.error(self.class.name) {"#{e}"}
         end
       when 'xml'
         begin
           @d = I2X::XMLDetector.new(self)
         rescue Exception => e
           @response = {:status => 400, :error => e}
-          p "[i2x] error: #{e}"
+          I2X::Config.log.error(self.class.name) {"#{e}"}
         end
       when 'json'
         begin
           @d = I2X::JSONDetector.new(self)
         rescue Exception => e
           @response = {:status => 400, :error => e}
-          p "[i2x] error: #{e}"
+          I2X::Config.log.error(self.class.name) {"#{e}"}
         end
       end
 
@@ -64,7 +65,7 @@ module I2X
           end
           @checkup = @d.checkup
         rescue Exception => e
-          p "[i2x] error: #{e}"
+          I2X::Config.log.error(self.class.name) {"Checkup error: #{e}"}
         end
 
         # Start detection
@@ -75,7 +76,7 @@ module I2X
 
           @checkup[:templates] = @d.templates.uniq
         rescue Exception => e
-          p "[i2x] error: #{e}"
+          I2X::Config.log.error(self.class.name) {"Detection error: #{e}"}
         end
 
         begin
@@ -83,7 +84,7 @@ module I2X
             process @checkup
           end
         rescue Exception => e
-          p "[i2x] error: #{e}"
+          I2X::Config.log.error(self.class.name) {"Process error: #{e}"}
         end
         response = {:status => @checkup[:status], :message => "[i2x][Checkup][execute] All OK."}     
       end
@@ -96,20 +97,20 @@ module I2X
       def process checkup
         begin
           checkup[:templates].each do |template|
-            p "[i2x][Agent] Processing #{template}"
+            I2X::Config.log.info(self.class.name) {"Delivering to #{template} template."}
             checkup[:payload].each do |payload|
-              puts "\t[i2x][Agent] Processing #{payload}"
+              I2X::Config.log.debug(self.class.name) {"Processing #{payload}."}
               response = RestClient.post "#{I2X::Config.host}postman/deliver/#{template}.js", payload
               case response.code
               when 200
 
               else
-                puts "[i2x][Agent] unable to deliver \"#{payload}\" to \"#{template}\""
+                I2X::Config.log.warn(self.class.name) {"unable to deliver \"#{payload}\" to \"#{template}\""}
               end
             end
           end
         rescue Exception => e
-          p "[i2x][Agent] error: #{e}"
+          I2X::Config.log.error(self.class.name) {"Processing error: #{e}"}
         end
         
       end

data/lib/i2x/cashier.rb

@@ -15,10 +15,11 @@ module I2X
     # - *seed*: seed data (if available)
     #
     def self.verify cache, agent, payload, seed
-      #puts "[i2x][Cashier] verifying\n\taccess token: #{I2X::Config.access_token}\n\thost: #{I2X::Config.host}\n\tcache: #{cache}\n\tagent: #{agent}\n\tpayload: #{payload}\n\tseed: #{seed}"
+      I2X::Config.log.info(self.class.name) {"Verifying\n\taccess token: #{I2X::Config.access_token}\n\thost: #{I2X::Config.host}\n\tcache: #{cache}\n\tagent: #{agent}\n\tpayload: #{payload}\tseed: #{seed}"}
       begin
         response = RestClient.post "#{I2X::Config.host}fluxcapacitor/verify.json", {:access_token => I2X::Config.access_token, :agent => agent[:identifier], :cache => cache, :payload => payload, :seed => seed}
       rescue Exception => e
+        I2X::Config.log.error(self.class.name) {"#{e}"}
         response = {:status => 400, :error => e}
       end
       response

data/lib/i2x/client.rb

@@ -1,5 +1,4 @@
 require 'rest_client'
-require 'logger'
 
 module I2X
 	class Client
@@ -10,9 +9,9 @@ module I2X
 		def initialize config, log
 			begin
 				@config = config
-				I2X::Config.set_access_token config[:server][:api_key]
-				I2X::Config.set_host config[:server][:host]
-				I2X::Config.set_log log
+				I2X::Config.token = config[:server][:api_key]
+				I2X::Config.host = (config[:server][:host].end_with?('/') ? config[:server][:host] : config[:server][:host] << '/')
+				I2X::Config.log = log
 
 				I2X::Config.log.info(self.class.name) {'Configuration loaded successfully.'}
 			rescue Exception => e

data/lib/i2x/csvdetector.rb

@@ -16,33 +16,32 @@ module I2X
     #
     def detect object
 
-      p "[i2x][CSV] Testing #{object[:uri]}"
+      I2X::Config.log.debug(self.class.name) {"Monitoring #{object[:uri]}"}
       CSV.new(open(object[:uri]), :headers => :first_row).each do |row|
         begin
           unless object[:cache].nil? then
-            p "[i2x][CSV] with cache, verifying"
-            @response = Cashier.verify row[object[:cache].to_i], object, row, object[:seed]
-            
+            @response = Cashier.verify row[object[:cache].to_i], object, row, object[:seed]            
           else
-            p "[i2x][CSV] no cache, verifying"
-            @cache = Cashier.verify row[0], object, row, object[:seed]
-            
+            @response = Cashier.verify row[0], object, row, object[:seed]
           end
         rescue Exception => e
-          p "[i2x][CSVDetector] loading error: #{e.inspect}"
+          I2X::Config.log.error(self.class.name) {"Loading error: #{e}"}
         end
 
         begin
 
+          # Process i2xcache response
           @cache = JSON.parse(@response, {:symbolize_names => true})
-          @cache[:templates].each do |t|
-            @templates.push t
+          unless @cache[:templates].nil? then
+            @cache[:templates].each do |t|
+              @templates.push t
+            end
           end
           # The actual processing
           #
           if @cache[:cache][:status] == 100 then
-
-            # add row data to payload from selectors (key => key, value => column name)
+            I2X::Config.log.info(self.class.name) {"Not on cache, generating payload"}
+            
             payload = Hash.new
             
             object[:selectors].each do |selector|
@@ -55,7 +54,7 @@ module I2X
           end
 
         rescue Exception => e
-          p "[i2x][CSVDetector] processing error: #{e.inspect}"
+          I2X::Config.log.error(self.class.name) {"Processing error: #{e}"}
         end
         @cache[:templates]
       end

data/lib/i2x/detector.rb

@@ -21,9 +21,9 @@ module I2X
         @payloads = Array.new
         @objects = Array.new
         @help = I2X::Helper.new
-        puts "Loaded new detector: #{agent.identifier}"
+        I2X::Config.log.info(self.class.name) {"Started new #{agent.identifier} detector"}
       rescue Exception => e
-        p "[i2x] error: #{e}"
+        I2X::Config.log.error(self.class.name) {"#{e}"}
       end
     end
 
@@ -46,25 +46,25 @@ module I2X
               begin
                 @sr = I2X::CSVSeedReader.new(@agent, seed)
               rescue Exception => e
-                p "[i2x] error: #{e}"
+                I2X::Config.log.error(self.class.name) {"#{e}"}
               end
             when 'sql'
               begin
                 @sr = I2X::SQLSeedReader.new(@agent, seed)
               rescue Exception => e
-                p "[i2x] error: #{e}"
+                I2X::Config.log.error(self.class.name) {"#{e}"}
               end
             when 'xml'
               begin
                 @sr = I2X::XMLSeedReader.new(@agent, seed)
               rescue Exception => e
-                p "[i2x] error: #{e}"
+                I2X::Config.log.error(self.class.name) {"#{e}"}
               end
             when 'json'
               begin
                 @sr = I2X::JSONSeedReader.new(@agent, seed)
               rescue Exception => e
-                p "[i2x] error: #{e}"
+                I2X::Config.log.error(self.class.name) {"#{e}"}
               end
             end
             begin
@@ -73,7 +73,7 @@ module I2X
                 @objects.push read
               end
             rescue Exception => e
-              p "[i2x] error: #{e}"
+              I2X::Config.log.error(self.class.name) {"#{e}"}
             end
           end
 
@@ -85,7 +85,6 @@ module I2X
           object[:cache] = @agent.cache
           object[:seed] = object[:identifier]
           object[:selectors] = @agent.selectors
-          p "\n\tSelectors: #{object[:selectors]}"
           unless self.content.nil? then
             object[:content] = self.content
           end
@@ -93,7 +92,7 @@ module I2X
         end
       rescue Exception => e
         @response = {:status => 404, :message => "[i2x][Detector] failed to load doc, #{e}"}
-        p "[i2x] error: #{e}"
+        I2X::Config.log.error(self.class.name) {"#{e}"}
       end
 
       begin
@@ -104,7 +103,7 @@ module I2X
         @response = { :payload => @payloads, :templates => @templates, :status => 100}
       rescue Exception => e
         @response = {:status => 404, :message => "[i2x][Detector] failed to process queries, #{e}"}
-        p "[i2x] error: #{e}"
+        I2X::Config.log.error(self.class.name) {"#{e}"}
       end
       @response
     end

data/lib/i2x/jsondetector.rb

@@ -1,14 +1,7 @@
-#require 'helper'
 require 'open-uri'
 require 'jsonpath'
 require 'rest_client'
-require 'csv'
 require 'json'
-#require 'seedreader'
-#require 'csvseedreader'
-#require 'sqlseedreader'
-#require 'xmlseedreader'
-#require 'jsonseedreader'
 
 module I2X
 
@@ -24,6 +17,8 @@ module I2X
     # == Detect the changes
     #
     def detect object
+      I2X::Config.log.info(self.class.name) {"Monitoring #{object[:uri]}"} unless object[:uri].nil?
+
       begin
         if object[:uri] == '' then
           @doc = object[:content]
@@ -33,17 +28,25 @@ module I2X
         end
         JsonPath.on(@doc,object[:query]).each do |element|
           JsonPath.on(element, object[:cache]).each do |c|
-            @cache = Cashier.verify c, object, c, object[:seed]
+            @response = Cashier.verify c, object, c, object[:seed]
+          end
+
+           # Process i2x cache response
+           @cache = JSON.parse(@response, {:symbolize_names => true})
+           unless @cache[:templates].nil? then
+            @cache[:templates].each do |t|
+              @templates.push t
+            end
           end
 
           ##
           # If not on cache, add to payload for processing
           #
           if @cache[:status] == 100 then
-
+            I2X::Config.log.info(self.class.name) {"Not on cache, generating payload"}
             # add row data to payload from selectors (key => key, value => column name)
             payload = Hash.new
-            JSON.parse(object[:selectors]).each do |selector|
+            object[:selectors].each do |selector|
               selector.each do |k,v|
                 JsonPath.on(element, v).each do |el|
                   payload[k] = el
@@ -56,9 +59,9 @@ module I2X
 
         end
       rescue Exception => e
-        
+        I2X::Config.log.error(self.class.name) {"Loading error: #{e}"}
       end
-
+      @cache[:templates]
     end
   end
 end

data/lib/i2x/sqldetector.rb

@@ -15,23 +15,31 @@ module I2X
     # == Detect the changes
     #
     def detect object
-      puts "Detecting SQL to #{object[:identifier]}"
+      I2X::Config.log.debug(self.class.name) {"Monitoring #{object[:host]}"}
       begin
         @client = Mysql2::Client.new(:host => object[:host], :username => object[:username] , :password => object[:password] , :database => object[:database])
         @client.query(@agent[:payload][:query]).each(:symbolize_keys => false) do |row|
           unless object[:cache].nil? then
-            @cache = Cashier.verify row[object[:cache]], object, row, object[:seed]
+            @response = Cashier.verify row[object[:cache]], object, row, object[:seed]
           else
-            @cache = Cashier.verify row["id"], object, row, object[:seed]
+            @response = Cashier.verify row["id"], object, row, object[:seed]
+          end
+
+          # Process i2x cache response
+          @cache = JSON.parse(@response, {:symbolize_names => true})
+          unless @cache[:templates].nil? then
+            @cache[:templates].each do |t|
+              @templates.push t
+            end
           end
 
           # The actual processing
           #
           if @cache[:status] == 100 then
-
+           I2X::Config.log.info(self.class.name) {"Not on cache, generating payload"}
             # add row data to payload from selectors (key => key, value => column name)
             payload = Hash.new
-            JSON.parse(object[:selectors]).each do |selector|
+            object[:selectors].each do |selector|
               selector.each do |k,v|
                 payload[k] = row[v]
               end
@@ -41,8 +49,9 @@ module I2X
           end
         end
       rescue Exception => e
-        
+        I2X::Config.log.error(self.class.name) {"Processing error: #{e}"}
       end
+      @cache[:templates]
     end
   end
 end

data/lib/i2x/version.rb

@@ -1,3 +1,3 @@
 module I2X
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/i2x/xmldetector.rb

@@ -1,8 +1,4 @@
-#require 'helper'
-#require 'cashier'
 require 'open-uri'
-#require 'raven'
-#require 'slog'
 
 module I2X
 
@@ -17,6 +13,7 @@ module I2X
     # == Detect the changes
     #
     def detect object
+      I2X::Config.log.info(self.class.name) {"Monitoring #{object[:uri]}"} unless object[:uri].nil?
       begin
         if object[:uri] == '' then
           @doc = Nokogiri::XML(object[:content])
@@ -26,17 +23,25 @@ module I2X
         @doc.remove_namespaces!
         @doc.xpath(object[:query]).each do |element|
           element.xpath(object[:cache]).each do |c|
-            @cache = Cashier.verify c.content, object, c.content, object[:seed]
+            @response = Cashier.verify c.content, object, c.content, object[:seed]
+          end
+
+          # Process i2x cache response
+          @cache = JSON.parse(@response, {:symbolize_names => true})
+          unless @cache[:templates].nil? then
+            @cache[:templates].each do |t|
+              @templates.push t
+            end
           end
 
           ##
           # If not on cache, add to payload for processing
           #
           if @cache[:status] == 100 then
-
+            I2X::Config.log.info(self.class.name) {"Not on cache, generating payload"}
             # add row data to payload from selectors (key => key, value => column name)
             payload = Hash.new
-            JSON.parse(object[:selectors]).each do |selector|
+            object[:selectors].each do |selector|
 
               selector.each do |k,v|
                 element.xpath(v).each do |el|
@@ -51,7 +56,7 @@ module I2X
         end
       end
     rescue Exception => e
-      
+      I2X::Config.log.error(self.class.name) {"Processing error: #{e}"}
     end
   end
 end

data/lib/i2x.rb

@@ -13,6 +13,10 @@ require 'i2x/client'
 module I2X
 	class Config
 
+		class << self
+			attr_accessor :log, :host, :access_token
+		end
+
 		def self.set_log log
 			@@log = log
 		end
@@ -25,17 +29,5 @@ module I2X
 		def self.set_access_token api_key
 			@@access_token = api_key
 		end
-
-		def self.log
-			@@log
-		end
-
-		def self.host
-			@@host
-		end
-
-		def self.access_token
-			@@access_token
-		end
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i2x
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Pedro Lopes
@@ -97,7 +97,6 @@ files:
 - lib/i2x.rb
 - lib/i2x/agent.rb
 - lib/i2x/cashier.rb
-- lib/i2x/checkup.rb
 - lib/i2x/client.rb
 - lib/i2x/csvdetector.rb
 - lib/i2x/csvseedreader.rb

data/lib/i2x/checkup.rb

@@ -1,37 +0,0 @@
-module I2X
-  class Checkup
-
-    ##
-    # = Perform the actual check execution
-    #
-    # + *agent*: the agent to verify
-    #
-    def execute agent
-      begin
-        @response = agent.execute
-      rescue Exception => e
-       
-        @response = {:status => 400, :error => e}
-      end       
-    end
-    
-
-    ##
-    # = Initiate real-time (poll) check
-    #
-    # + *schedule*: the scheduling being checked
-    def check schedule
-      Integration.all.each do |integration|
-        @agents = integration.agents.where( :schedule => schedule).where("last_check_at < CURRENT_TIMESTAMP - INTERVAL 5 MINUTE")
-        @agents.each do |agent|
-          begin
-            self.execute agent
-          rescue Exception => e
-           
-          end
-        end
-      end
-    end
-
-  end
-end