i2x 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ae96c687e670ea870c7ee230796a996d6948450
-  data.tar.gz: cf2653409419ae955fb4b3b5f5c04a18011c28a2
+  metadata.gz: 26fd09f69c0d5d4b13e61b03967aa14cab2a8e6c
+  data.tar.gz: 4815f6636f51e5e36a4e12fcd65b7a5c5b6a753d
 SHA512:
-  metadata.gz: 25fcfd7a5936da1ae93be656b7855409f119e550d5cce7c60dd631b6ba001007d85b092bcd5808bf9c5df856ee2e0fa1f6aee1105f9d2320c20a77fe770565e6
-  data.tar.gz: 3d8f44e8e692b2ede996ed044c1c2f7110cbc817e6a03369fae9b2592dd98782aa2b3cd30791627b43ff89d648ccbe4a9b8e8484e202711ff0dc1ce98e24c588
+  metadata.gz: a498ad01e5da2665f87369cbb4ca689d45cc860cee12d6556eb283f91eb93de62ab098c9f55da2a82e77045fafcf46b78c88fc16e6deea18ce6a1d0af7a0c6dd
+  data.tar.gz: da7c085b0b8fb25b64193d43203b399374ed3af04ea507bdac75c22c1e9c22d1fed4e18b7c8684d81b1ad2caeb7c121733e6820e249fe82de15a4c507ca1b767

data/lib/i2x.rb

@@ -1,3 +1,4 @@
+require 'logger'
 require 'i2x/cashier'
 require 'i2x/helper'
 require 'i2x/detector'
@@ -12,6 +13,10 @@ require 'i2x/client'
 module I2X
 	class Config
 
+		def self.set_log log
+			@@log = log
+		end
+
 		def self.set_host host
 			host << '/' unless host.end_with?('/')
 			@@host = host
@@ -21,6 +26,10 @@ module I2X
 			@@access_token = api_key
 		end
 
+		def self.log
+			@@log
+		end
+
 		def self.host
 			@@host
 		end

data/lib/i2x/agent.rb

@@ -1,8 +1,4 @@
-#require 'detector'
-#require 'csvdetector'
-#require 'jsondetector'
-#require 'xmldetector'
-#require 'sqldetector'
+require 'rest_client'
 
 module I2X
   class Agent 
@@ -49,7 +45,7 @@ module I2X
           @d = I2X::XMLDetector.new(self)
         rescue Exception => e
           @response = {:status => 400, :error => e}
-         p "[i2x] error: #{e}"
+          p "[i2x] error: #{e}"
         end
       when 'json'
         begin
@@ -76,6 +72,8 @@ module I2X
           @d.objects.each do |object|
             @d.detect object
           end
+
+          @checkup[:templates] = @d.templates.uniq
         rescue Exception => e
           p "[i2x] error: #{e}"
         end
@@ -96,7 +94,24 @@ module I2X
       # => Process agent checks.
       #
       def process checkup
-        p checkup
+        begin
+          checkup[:templates].each do |template|
+            p "[i2x][Agent] Processing #{template}"
+            checkup[:payload].each do |payload|
+              puts "\t[i2x][Agent] 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}\""
+              end
+            end
+          end
+        rescue Exception => e
+          p "[i2x][Agent] error: #{e}"
+        end
+        
       end
     end
 

data/lib/i2x/cashier.rb

@@ -1,11 +1,7 @@
 require 'rest_client'
-require 'open-uri'
-
 
 module I2X
   class Cashier
-
-
     public
     
     ##
@@ -23,9 +19,8 @@ module I2X
       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
-        response = {:status => 400}
+        response = {:status => 400, :error => e}
       end
-      p response
       response
     end
   end

data/lib/i2x/client.rb

@@ -1,4 +1,5 @@
 require 'rest_client'
+require 'logger'
 
 module I2X
 	class Client
@@ -6,14 +7,16 @@ module I2X
 		##
 		# => Load configuration properties from client/script code
 		#
-		def initialize config
+		def initialize config, log
 			begin
 				@config = config
-				I2X::Config.set_access_token @config[:server][:api_key]
-				I2X::Config.set_host @config[:server][:host]
-				p '[i2x] loaded configuration'
+				I2X::Config.set_access_token config[:server][:api_key]
+				I2X::Config.set_host config[:server][:host]
+				I2X::Config.set_log log
+
+				I2X::Config.log.info(self.class.name) {'Configuration loaded successfully.'}
 			rescue Exception => e
-				puts "[i2x] Failed to load configuration: #{e}"
+				I2X::Config.log.error(self.class.name) {"Failed to load configuration: #{e}"}
 			end
 			
 		end
@@ -23,11 +26,12 @@ module I2X
 		#
 		def validate
 			begin
-				p '[i2x] launching validation.'
+				I2X::Config.log.info(self.class.name) {'Launching validation.'}
+
 				out = RestClient.post "#{I2X::Config.host}fluxcapacitor/validate_key.json", {:access_token => I2X::Config.access_token}	
 				response = {:status => 100, :response => out.to_str}
 			rescue Exception => e
-				p "[i2x] Failed validation: #{e}"
+				I2X::Config.log.error(self.class.name) {"Failed validation: #{e}"}
 			end
 			response
 		end
@@ -36,13 +40,14 @@ module I2X
 		# => Start processing agents from configuration properties.
 		#
 		def process
+			I2X::Config.log.info(self.class.name) {'Starting agent processing.'}
 			begin
 				@config[:agents].each do |agent|
 					a = I2X::Agent.new agent
 					a.execute
 				end
-			rescue Exception => e
-				p "[i2x] Failed agent processing: #{e}"
+			rescue Exception => e				
+				I2X::Config.log.error(self.class.name) {"Failed agent processing: #{e}"}
 			end
 		end
 	end

data/lib/i2x/csvdetector.rb

@@ -35,7 +35,9 @@ module I2X
         begin
 
           @cache = JSON.parse(@response, {:symbolize_names => true})
-          @templates = @cache[:templates]
+          @cache[:templates].each do |t|
+            @templates.push t
+          end
           # The actual processing
           #
           if @cache[:cache][:status] == 100 then
@@ -55,6 +57,7 @@ module I2X
         rescue Exception => e
           p "[i2x][CSVDetector] processing error: #{e.inspect}"
         end
+        @cache[:templates]
       end
     end
   end

data/lib/i2x/detector.rb

@@ -21,10 +21,9 @@ module I2X
         @payloads = Array.new
         @objects = Array.new
         @help = I2X::Helper.new
-        @templates = {}
         puts "Loaded new detector: #{agent.identifier}"
       rescue Exception => e
-        
+        p "[i2x] error: #{e}"
       end
     end
 
@@ -47,25 +46,25 @@ module I2X
               begin
                 @sr = I2X::CSVSeedReader.new(@agent, seed)
               rescue Exception => e
-                
+                p "[i2x] error: #{e}"
               end
             when 'sql'
               begin
                 @sr = I2X::SQLSeedReader.new(@agent, seed)
               rescue Exception => e
-                
+                p "[i2x] error: #{e}"
               end
             when 'xml'
               begin
                 @sr = I2X::XMLSeedReader.new(@agent, seed)
               rescue Exception => e
-                
+                p "[i2x] error: #{e}"
               end
             when 'json'
               begin
                 @sr = I2X::JSONSeedReader.new(@agent, seed)
               rescue Exception => e
-
+                p "[i2x] error: #{e}"
               end
             end
             begin
@@ -87,7 +86,7 @@ module I2X
           object[:seed] = object[:identifier]
           object[:selectors] = @agent.selectors
           p "\n\tSelectors: #{object[:selectors]}"
-           unless self.content.nil? then
+          unless self.content.nil? then
             object[:content] = self.content
           end
           @objects.push object
@@ -99,7 +98,9 @@ module I2X
 
       begin
         # increase detected events count
-        
+
+
+        @templates = Array.new
         @response = { :payload => @payloads, :templates => @templates, :status => 100}
       rescue Exception => e
         @response = {:status => 404, :message => "[i2x][Detector] failed to process queries, #{e}"}

data/lib/i2x/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i2x
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Pedro Lopes