tigre-client 0.2.0 → 0.2.1

data/Gemfile.lock

@@ -1,14 +1,22 @@
 PATH
   remote: .
   specs:
-    tigre-client (0.1.1)
+    tigre-client (0.1.2)
       curb (~> 0.7.12)
+      faraday (~> 0.6.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    curb (0.7.14)
+    addressable (2.2.4)
+    curb (0.7.15)
     diff-lcs (1.1.2)
+    faraday (0.6.0)
+      addressable (~> 2.2.4)
+      multipart-post (~> 1.1.0)
+      rack (< 2, >= 1.1.0)
+    multipart-post (1.1.0)
+    rack (1.2.2)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)

data/lib/tigre-client/multipart_with_file.rb

@@ -0,0 +1,30 @@
+require 'faraday'
+
+module Faraday
+  # @private
+  class Request::MultipartWithFile < Faraday::Middleware
+    def call(env)
+      if env[:body].is_a?(Hash)
+                
+        env[:body].each do |key, value|
+          if value.is_a?(File)
+            env[:body][key] = Faraday::UploadIO.new(value, mime_type(value), value.path)
+          end
+        end
+      end
+
+      @app.call(env)
+    end
+
+    private
+
+    def mime_type(file)
+      case file.path
+        when /\.jpe?g/i then 'image/jpeg'
+        when /\.gif$/i then 'image/gif'
+        when /\.png$/i then 'image/png'
+        else 'application/octet-stream'
+      end
+    end
+  end
+end

data/lib/tigre-client/occurrence.rb

@@ -5,17 +5,8 @@ module Tigre
     # required params
     #   sha256 - String
     def self.for_sha(sha256)
-      
-      if sha256 == ''
-        raise ArguementError, "Missing sha256 parameter"
-      end
-
-      c = Curl::Easy.new("#{Tigre.endpoint}/urls/#{sha256}/occurrences")
-      c.multipart_form_post  = false
-      c.headers["API-TOKEN"] = Tigre.token
-
-      c.perform
-      return [c.response_code, c.body_str]
+      raise ArguementError, "Missing sha256 parameter" if sha256 == ''
+      Tigre.get_connection("/urls/#{sha256}/occurrences")
     end
     
     # return an individual occurrence for a given sha256 URL
@@ -23,16 +14,8 @@ module Tigre
     #   sha256 - String
     #   occurrence_id - String
     def self.get(sha256, occurrence_id)
-      if sha256 == '' || occurrence_id == ''
-        raise ArguementError, "Missing sha256 or occurrence_id parameter"
-      end
-
-      c = Curl::Easy.new("#{Tigre.endpoint}/urls/#{sha256}/occurrences/#{occurrence_id}")
-      c.multipart_form_post  = false
-      c.headers["API-TOKEN"] = Tigre.token
-
-      c.perform
-      return [c.response_code, c.body_str]
+      raise ArguementError, "Missing sha256 or occurrence_id parameter" if (sha256 == '' || occurrence_id == '')
+      Tigre.get_connection("/urls/#{sha256}/occurrences/#{occurrence_id}")
     end
     
   end

data/lib/tigre-client/sample.rb

@@ -12,43 +12,27 @@ module Tigre
         raise ArguementError, "File_location or md5 parameter cannot be empty"
       end
 
-      c = Curl::Easy.new("#{Tigre.endpoint}/samples")
-      c.multipart_form_post  = true
-      c.headers["API-TOKEN"] = Tigre.token
-
-      post_data = options.map {|k, v| Curl::PostField.content(k, v.to_s)}
-      post_data << Curl::PostField.file("file", file_location)
-      post_data << Curl::PostField.content("md5", md5)
-
-      c.http_post(*post_data)
-      return [c.response_code, c.body_str]
+      post_data = {:file => File.new(file_location), :md5 => md5}
+      Tigre.post_file_connection('/samples', post_data.merge(options))
     end
     
     # required params
     #   md5 - String
     def self.md5(md5)
-      c = Curl::Easy.new("#{Tigre.endpoint}/samples/md5/#{md5}")
-      c.headers["API-TOKEN"] = Tigre.token
-      c.perform
-      return [c.response_code, c.body_str]
+      Tigre.get_connection("/samples/md5/#{md5}")
     end
     
     # required params
     #   sha1 - String
     def self.sha1(sha1)
-      c = Curl::Easy.new("#{Tigre.endpoint}/samples/sha1/#{sha1}")
-      c.headers["API-TOKEN"] = Tigre.token
-      c.perform
-      return [c.response_code, c.body_str]
+      Tigre.get_connection("/samples/sha1/#{sha1}")
     end
     
     # required params
     #   sha256 - String
     def self.sha256(sha256)
-      c = Curl::Easy.new("#{Tigre.endpoint}/samples/sha256/#{sha256}")
-      c.headers["API-TOKEN"] = Tigre.token
-      c.perform
-      return [c.response_code, c.body_str]
+      Tigre.get_connection("/samples/sha256/#{sha256}")
     end
+    
   end
 end

data/lib/tigre-client/url.rb

@@ -9,30 +9,34 @@ module Tigre
     #   options - Hash
     #     :shareable - Boolean, :default => false
     def self.post(url, options={})
-
       if url == ''
         raise ArguementError, "Missing url parameter"
       end
-
       unless options[:source_name]
         raise ArguementError, "Missing source_name parameter"
       end
 
       # prepare post data
-      fields_hash = {
+      post_data = {
         "url[original_url]" => url,
         "url[source_name]"  => options[:source_name],
         "url[shareable]"    => options[:shareable]
       }
-      post_data = fields_hash.map { |k, v| Curl::PostField.content(k, v.to_s) }
-
-      c = Curl::Easy.new("#{Tigre.endpoint}/urls")
-      c.multipart_form_post = false
-      c.headers["API-TOKEN"] = Tigre.token
+      Tigre.post_connection('/urls', post_data)
+    end
 
-      c.http_post(post_data)
+    # required
+    #   sha256 - String
+    #   options - Hash
+    #     :source_name - String
+    def self.update(sha256, params_hash)
+      if sha256 == ''
+        raise ArguementError, "Missing url parameter"
+      end
 
-      return [c.response_code, c.body_str]
+      update_data = params_hash.map { |k, v| {"url[#{k.to_s}]" => v.to_s} }
+      
+      Tigre.put_connection("/urls/#{sha256}", update_data )
     end
 
     # required params
@@ -41,36 +45,28 @@ module Tigre
       if sha256 == ''
         raise ArguementError, "Missing sha256 parameter"
       end
-
-      c = Curl::Easy.new("#{Tigre.endpoint}/urls/#{sha256}")
-      c.headers["API-TOKEN"] = Tigre.token
-      c.perform
-      return [c.response_code, c.body_str]
+      Tigre.get_connection("/urls/#{sha256}")
     end
-    
+
     # required params
     #   sha256 - String
     def self.get_md5(md5)
       if md5 == ''
         raise ArguementError, "Missing md5 parameter"
       end
-
-      c = Curl::Easy.new("#{Tigre.endpoint}/urls/md5/#{md5}")
-      c.headers["API-TOKEN"] = Tigre.token
-      c.perform
-      return [c.response_code, c.body_str]
+      Tigre.get_connection("/urls/md5/#{md5}")
     end
-    
+
+    # optional params
+    #   options - Hash
+    #     :page - Integer, :default => 0
+    #     :per - Integer, :default => 50
     def self.index(options={})
       options[:page] ||= 0
       options[:per]  ||= 50
-      
-      c = Curl::Easy.new("#{Tigre.endpoint}/urls?page=#{options[:page]}&per=#{options[:per]}")
-      c.headers["API-TOKEN"] = Tigre.token
-      c.perform
-      return [c.response_code, c.body_str]
+      Tigre.get_connection("/urls?page=#{options[:page]}&per=#{options[:per]}")
     end
-    
+
     # required params
     #   options - Hash
     #     :after  => Ruby DateTime object OR Integer (epoch time)
@@ -89,11 +85,7 @@ module Tigre
 
       options[:page] ||= 0
       options[:per]  ||= 50
-
-      c = Curl::Easy.new("#{Tigre.endpoint}/urls/daterange?after=#{options[:after]}&before=#{options[:before]}&page=#{options[:page]}&per=#{options[:per]}")
-      c.headers["API-TOKEN"] = Tigre.token
-      c.perform
-      return [c.response_code, c.body_str]
+      Tigre.get_connection("/urls/daterange?after=#{options[:after]}&before=#{options[:before]}&page=#{options[:page]}&per=#{options[:per]}")
     end
 
     # required params
@@ -116,13 +108,8 @@ module Tigre
 
       options[:page] ||= 0
       options[:per]  ||= 50
-
-      c = Curl::Easy.new("#{Tigre.endpoint}/urls/domains?domain=#{domain}&after=#{options[:after]}&before=#{options[:before]}&page=#{options[:page]}&per=#{options[:per]}")
-      c.headers["API-TOKEN"] = Tigre.token
-      c.perform
-      return [c.response_code, c.body_str]
+      Tigre.get_connection("/urls/domains?domain=#{domain}&after=#{options[:after]}&before=#{options[:before]}&page=#{options[:page]}&per=#{options[:per]}")
     end
-
   end
 
 end

data/lib/tigre-client/version.rb

@@ -1,5 +1,5 @@
 module Tigre
   module Client
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/lib/tigre-client.rb

@@ -1,4 +1,8 @@
 require 'curb'
+require 'faraday'
+
+require 'tigre-client/multipart_with_file'
+
 require 'tigre-client/occurrence'
 require 'tigre-client/sample'
 require 'tigre-client/url'
@@ -6,12 +10,74 @@ require 'tigre-client/url'
 module Tigre
   
   class << self
-    attr_accessor :token, :endpoint
+    attr_accessor :token, :server, :endpoint, :conn
     
     def configure
       yield self
       true
     end
+    
+    def build_get_connection
+      @conn = Faraday.new(:url => "#{Tigre.server}") do |builder|
+        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
+      @conn = Faraday.new(:url => "#{Tigre.server}") do |builder|
+        builder.use Faraday::Request::MultipartWithFile
+        builder.use Faraday::Request::Multipart
+        builder.use Faraday::Request::UrlEncoded
+        builder.adapter :net_http
+      end
+    end
+    
+    def get_connection(uri_string)
+      build_get_connection
+      response = Tigre.conn.get(Tigre.endpoint + uri_string, 'API-TOKEN' => Tigre.token)
+      [response.status, response.body]
+    end
+    
+    def post_connection(uri_string, data)
+      build_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
+    
+    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
+    
+    def put_connection(uri_string, data)
+      build_post_put_connection
+      response = Tigre.conn.put do |req|
+        req.url Tigre.endpoint + uri_string
+        req.headers['API-TOKEN'] = Tigre.token
+        req.body = data
+      end
+      [response.status, response.body]
+    end
+    
   end
   
 end

data/tigre-client.gemspec

@@ -24,4 +24,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec" 
   
   s.add_dependency('curb', '~> 0.7.12')
+  s.add_dependency('faraday', '~> 0.6.0')
+  
 end

metadata

@@ -2,7 +2,7 @@
 name: tigre-client
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Marcio Castilho
@@ -36,6 +36,17 @@ dependencies:
         version: 0.7.12
   type: :runtime
   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: *id003
 description: Tigre Client API Library
 email: 
 - marcioc@sunbelt-software.com
@@ -53,6 +64,7 @@ files:
 - Gemfile.lock
 - Rakefile
 - lib/tigre-client.rb
+- lib/tigre-client/multipart_with_file.rb
 - lib/tigre-client/occurrence.rb
 - lib/tigre-client/sample.rb
 - lib/tigre-client/url.rb