tigre-client 0.3.6 → 0.3.7

data/.gitignore

@@ -3,4 +3,6 @@ pkg/*
 .bundle
 
 test.rb
+fake.xml
+fake.cab
 *.log

data/Gemfile.lock

@@ -1,18 +1,19 @@
 PATH
   remote: .
   specs:
-    tigre-client (0.3.1)
+    tigre-client (0.3.6)
       faraday (~> 0.6.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.4)
+    addressable (2.2.5)
     diff-lcs (1.1.2)
-    faraday (0.6.0)
+    faraday (0.6.1)
       addressable (~> 2.2.4)
       multipart-post (~> 1.1.0)
       rack (< 2, >= 1.1.0)
+    json (1.5.1)
     multipart-post (1.1.0)
     rack (1.2.2)
     rspec (2.5.0)
@@ -28,5 +29,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  json
   rspec
   tigre-client!

data/lib/tigre-client.rb

@@ -6,6 +6,7 @@ require 'tigre-client/common_params'
 require 'tigre-client/occurrence'
 require 'tigre-client/sample'
 require 'tigre-client/url'
+require 'tigre-client/analysis'
 
 module Tigre
   
@@ -22,18 +23,8 @@ module Tigre
         builder.adapter :net_http
       end
     end
-    
-    # TODO: do we need two build_post_put ?  can we just put 
-    #       the multipart in the post_put?
-    def build_post_put_connection
-      @conn = Faraday.new(:url => "#{Tigre.server}") do |builder|
-        # builder.request :multipart
-        builder.request :url_encoded
-        builder.adapter :net_http
-      end
-    end
-    
-    def build_file_post_put_connection
+
+    def build_post_connection
       @conn = Faraday.new(:url => "#{Tigre.server}") do |builder|
         builder.use Faraday::Request::MultipartWithFile
         builder.use Faraday::Request::Multipart
@@ -49,31 +40,34 @@ module Tigre
     end
     
     def post_connection(uri_string, data)
-      build_post_put_connection
+      build_post_connection
       response = Tigre.conn.post do |req|
         req.url Tigre.endpoint + uri_string
         req.headers['API-TOKEN'] = Tigre.token
-        req.body = data
+        req.body                 = data
       end
       [response.status, response.body]
     end
     
-    def post_file_connection(uri_string, data)
-      build_file_post_put_connection
-      response = Tigre.conn.post do |req|
-        req.url Tigre.endpoint + uri_string
-        req.headers['API-TOKEN'] = Tigre.token
-        req.body = data
-      end
-      [response.status, response.body]
-    end
+    # TODO do we need a post_connection and a post_file_connection?
+    # def post_file_connection(uri_string, data)
+    #   build_post_connection
+    #         
+    #   response = Tigre.conn.post do |req|
+    #     req.url Tigre.endpoint + uri_string
+    #     req.headers['API-TOKEN'] = Tigre.token
+    #     req.body                 = data
+    #   end
+    #   [response.status, response.body]
+    # end
     
     def put_connection(uri_string, data)
-      build_post_put_connection
+      build_post_connection
+            
       response = Tigre.conn.put do |req|
         req.url Tigre.endpoint + uri_string
         req.headers['API-TOKEN'] = Tigre.token
-        req.body = data
+        req.body                 = data
       end
       [response.status, response.body]
     end

data/lib/tigre-client/analysis.rb

@@ -0,0 +1,40 @@
+module Tigre
+  class Analysis
+    
+    # required
+    #   analysis_id => String
+    #   params_hash => Hash
+    #     :dbts => Hash {:key1 => value, :key2 => value} where the key is what the name of the 
+    #              attribute is and the value should be a boolean
+    #     :mutex_name_list => String (comma seperated) => I.E 'foo,bar,baz'
+    #     :mutex_name_list => Array => ['foo', 'bar', 'baz']
+    def self.update(analysis_id, params_hash)
+      if analysis_id == '' || params_hash.empty?
+        raise "Missing analysis_id parameter or params_hash is empty"
+      end
+      
+      update_data = {}
+      if params_hash[:mutex_name_list]
+        params_hash[:mutex_name_list] = package_array_list(params_hash[:mutex_name_list])
+      end
+      update_data["metadatas"] = params_hash
+      
+      Tigre.put_connection("/analysis/#{analysis_id}", update_data)
+    end
+    
+    # required
+    #   analysis_id => String
+    #   file_location => String path to the file
+    #   file_type => String, the type of the file
+    def self.add_file(analysis_id, file_location, file_type)
+      if analysis_id == '' || file_location.empty? || file_type.empty?
+        raise "Missing analysis_id, file_location, or file_type parameter"
+      end
+      
+      update_data = {:file => File.new(file_location), :file_type => file_type}
+      
+      Tigre.put_connection("/analysis/#{analysis_id}/upload", update_data)
+    end
+    
+  end
+end

data/lib/tigre-client/common_params.rb

@@ -29,5 +29,10 @@ module Tigre
       end
     end
     
+    def get_logic_param(logic=nil)
+      return 'any' unless logic
+      logic.to_s
+    end
+    
   end
 end

data/lib/tigre-client/sample.rb

@@ -19,7 +19,7 @@ module Tigre
       options[:tags] = package_array_list(options[:tags]) if options[:tags]
       
       post_data = {:file => File.new(file_location), :md5 => md5}
-      Tigre.post_file_connection('/samples', post_data.merge(options))
+      Tigre.post_connection('/samples', post_data.merge(options))
     end
     
     # optional params
@@ -260,7 +260,61 @@ module Tigre
       hash[:digest]  = hash[:digest] || 'md5'
       hash[:samples] = package_array_list(hash[:samples])
       hash[:type]    = 'compressor'
-      Tigre.post_file_connection('/samples_for_compression', hash)
+      Tigre.post_connection('/samples_for_compression', hash)
+    end
+    
+    # required
+    #   digest_hash => Hash
+    #     :digest => String,  The digest type
+    #     :value  => String,  The digest value
+    # optional params
+    #   params_hash => Hash
+    #     :dbts => Hash {:key1 => value, :key2 => value} where the key is what the name of the 
+    #              attribute is and the value should be a boolean
+    #     :mutex_name_list => String (comma seperated) => I.E 'foo,bar,baz'
+    #     :mutex_name_list => Array => ['foo', 'bar', 'baz']
+    def self.add_analysis(digest_hash, params_hash={})
+      unless digest_hash[:digest] && digest_hash[:value]
+        raise 'Missing parameter :digest or :value'
+      end
+      
+      if params_hash
+        update_data = {}
+        if params_hash[:mutex_name_list]
+          params_hash[:mutex_name_list] = package_array_list(params_hash[:mutex_name_list])
+        end
+        
+        update_data["metadatas"] = params_hash
+      end
+
+      Tigre.put_connection("/samples/#{digest_hash[:digest]}/value/#{digest_hash[:value]}/analysis", update_data)
+    end
+    
+    # optional params
+    #   options => Hash
+    #     :after  => Ruby DateTime object OR Integer (epoch time)
+    #     :before => Ruby DateTime object OR Integer (epoch time)
+    def self.count(options={})
+      common_params(options)
+      Tigre.get_connection("/samples/count?after=#{@after}&before=#{@before}")
+    end
+    
+    # required params
+    #   tags => String => I.E 'foo'
+    #   tags => String (comma seperated) => I.E 'foo,bar,baz'
+    #   tags => Array => ['foo', 'bar', 'baz']
+    # optional params
+    #   options => Hash
+    #     :after  => Ruby DateTime object OR Integer (epoch time)
+    #     :before => Ruby DateTime object OR Integer (epoch time)
+    def self.tagged_count(tags, options={})
+      if tags == ''
+        raise "Missing tags parameter"
+      end
+      
+      tags = package_array_list(tags)
+      common_params(options)
+      Tigre.get_connection("/samples/tagged_with?tags=#{tags}&after=#{@after}&before=#{@before}")
     end
     
   end

data/lib/tigre-client/scan.rb

@@ -0,0 +1,5 @@
+module Tigre
+  class Scan
+    
+  end
+end

data/lib/tigre-client/url.rb

@@ -125,15 +125,6 @@ module Tigre
         raise ArguementError, "Missing domain parameter"
       end
 
-      # if options[:after] && options[:after].is_a?(Time)
-      #   options[:after] = options[:after].to_i
-      # end
-      # if options[:before] && options[:before].is_a?(Time)
-      #   options[:before] = options[:before].to_i
-      # end
-      # 
-      # options[:page] ||= 0
-      # options[:per]  ||= 50
       common_params(options)
       Tigre.get_connection("/urls/domains?domain=#{domain}&after=#{@after}&before=#{@before}&page=#{@page}&per=#{@per}")
     end
@@ -155,7 +146,8 @@ module Tigre
       
       tags = package_array_list(tags)
       common_params(options)
-      Tigre.get_connection("/urls/tagged_with?tags=#{tags}&after=#{@after}&before=#{@before}&page=#{@page}&per=#{@per}")
+      logic = get_logic_param(options[:logic])
+      Tigre.get_connection("/urls/tagged_with?tags=#{tags}&logic=#{logic}&after=#{@after}&before=#{@before}&page=#{@page}&per=#{@per}")
     end
     
     # required params
@@ -170,7 +162,7 @@ module Tigre
       end
       
       update_data = {"tag_list" => package_array_list(hash[:tag_list])}
-      Tigre.put_connection("/urls/#{hash[:digest]}/value/#{hash[:value]}/remove_tags", update_data)      
+      Tigre.put_connection("/urls/#{hash[:digest]}/value/#{hash[:value]}/remove_tags", update_data)
     end
     
     # required params
@@ -204,6 +196,60 @@ module Tigre
       Tigre.get_connection("/urls/not_tagged?after=#{@after}&before=#{@before}&page=#{@page}&per=#{@per}")
     end
     
+    # required
+    #   digest_hash => Hash
+    #     :digest => String,  The digest type
+    #     :value  => String,  The digest value
+    # optional params
+    #   params_hash => Hash
+    #     :dbts => Hash {:key1 => value, :key2 => value} where the key is what the name of the 
+    #              attribute is and the value should be a boolean
+    #     :mutex_name_list => String (comma seperated) => I.E 'foo,bar,baz'
+    #     :mutex_name_list => Array => ['foo', 'bar', 'baz']
+    def self.add_analysis(digest_hash, params_hash={})
+      unless digest_hash[:digest] && digest_hash[:value]
+        raise 'Missing parameter :digest or :value'
+      end
+      
+      if params_hash
+        update_data = {}
+        if params_hash[:mutex_name_list]
+          params_hash[:mutex_name_list] = package_array_list(params_hash[:mutex_name_list])
+        end
+        
+        update_data["metadatas"] = params_hash
+      end
+
+      Tigre.put_connection("/urls/#{digest_hash[:digest]}/value/#{digest_hash[:value]}/analysis", update_data)
+    end
+    
+    # optional params
+    #   options => Hash
+    #     :after  => Ruby DateTime object OR Integer (epoch time)
+    #     :before => Ruby DateTime object OR Integer (epoch time)
+    def self.count(options={})
+      common_params(options)
+      Tigre.get_connection("/urls/count?after=#{@after}&before=#{@before}")
+    end
+    
+    # required params
+    #   tags => String => I.E 'foo'
+    #   tags => String (comma seperated) => I.E 'foo,bar,baz'
+    #   tags => Array => ['foo', 'bar', 'baz']
+    # optional params
+    #   options => Hash
+    #     :after  => Ruby DateTime object OR Integer (epoch time)
+    #     :before => Ruby DateTime object OR Integer (epoch time)
+    def self.tagged_count(tags, options={})
+      if tags == ''
+        raise "Missing tags parameter"
+      end
+      
+      tags = package_array_list(tags)
+      common_params(options)
+      Tigre.get_connection("/urls/tagged_with?tags=#{tags}&after=#{@after}&before=#{@before}")
+    end
+    
   end
 
 end

data/lib/tigre-client/version.rb

@@ -1,5 +1,5 @@
 module Tigre
   module Client
-    VERSION = "0.3.6"
+    VERSION = "0.3.7"
   end
 end

data/tigre-client.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.9.2'
   
   s.add_development_dependency "rspec" 
+  s.add_development_dependency "json" 
   
   s.add_dependency('faraday', '~> 0.6.0')
   

metadata

@@ -2,7 +2,7 @@
 name: tigre-client
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors: 
 - Marcio Castilho
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-02 00:00:00 -04:00
+date: 2011-05-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,16 +26,27 @@ dependencies:
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: faraday
+  name: json
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: faraday
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 0.6.0
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 description: Tigre Client API Library
 email: 
 - marcioc@sunbelt-software.com
@@ -53,10 +64,12 @@ files:
 - Gemfile.lock
 - Rakefile
 - lib/tigre-client.rb
+- lib/tigre-client/analysis.rb
 - lib/tigre-client/common_params.rb
 - lib/tigre-client/multipart_with_file.rb
 - lib/tigre-client/occurrence.rb
 - lib/tigre-client/sample.rb
+- lib/tigre-client/scan.rb
 - lib/tigre-client/url.rb
 - lib/tigre-client/version.rb
 - tigre-client.gemspec