tigre-client 0.4.1 → 0.5.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tigre-client (0.4.0)
+    tigre-client (0.4.1)
       faraday (~> 0.6.0)
       right_aws (~> 2.1.0)
 

data/lib/tigre-client/analysis.rb

@@ -44,8 +44,52 @@ module Tigre
         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("/analyses/#{analysis_id}/upload", update_data)
+      if Tigre.s3_analysis_enabled?
+        Tigre.logger.info 'Uploading file directly to S3' if Tigre.logger
+        bucket = S3Bucket.new(Tigre.s3_analysis_bucket)
+        bucket.send_file(file_location, "analysis/#{id.to_s}/#{file[:filename]}")
+        
+        f = File.new(file, 'r')
+        update_data = {:file_hash => {'name' => File.basename(f), 
+                                      'size' => File.size(f), 
+                                      'file_type' => file_type}}
+        Tigre.put_connection("/analyses/#{analysis_id}", update_data)
+      else
+        update_data = {:file => File.new(file_location), :file_type => file_type}
+        Tigre.put_connection("/analyses/#{analysis_id}/upload", update_data)
+      end
+    end
+    
+    # required
+    #   mutex_name_list => String (comma seperated) => I.E 'foo,bar,baz'
+    #   mutex_name_list => Array => ['foo', 'bar', 'baz']
+    def self.get_urls_with_mutex(mutex_name_list)
+      raise 'Missing mutex_name_list' if mutex_name_list == ''
+      Tigre.get_connection("/analyses/urls/mutex_name?mutex_name_list=#{package_array_list(mutex_name_list)}")
+    end
+    
+    # required
+    #   mutex_name_list => String (comma seperated) => I.E 'foo,bar,baz'
+    #   mutex_name_list => Array => ['foo', 'bar', 'baz']
+    def self.get_samples_with_mutex(mutex_name_list)
+      raise 'Missing mutex_name_list' if mutex_name_list == ''
+      Tigre.get_connection("/analyses/samples/mutex_name?mutex_name_list=#{package_array_list(mutex_name_list)}")
+    end
+    
+    # required
+    #   dbts_name_list => Hash => I.E {'key1' => 1, 'key2 => 0}
+    def self.get_urls_with_dbts(dbts_name_list)
+      raise 'Missing dbts_name_list' if dbts_name_list == ''
+      search = {:dbts_name_list => dbts_name_list}
+      Tigre.put_connection("/analyses/urls/dbts_name", search)
+    end
+    
+    # required
+    #   dbts_name_list => Hash => I.E {'key1' => 1, 'key2 => 0}
+    def self.get_samples_with_dbts(dbts_name_list)
+      raise 'Missing dbts_name_list' if dbts_name_list == ''
+      search = {:dbts_name_list => dbts_name_list}
+      Tigre.put_connection("/analyses/samples/dbts_name", search)
     end
     
   end

data/lib/tigre-client/common/analysis_components.rb

@@ -32,7 +32,7 @@ module Tigre
     #   hash   => Hash
     #     :digest => String,  The digest type
     #     :value  => String,  The digest value
-    def self.get_analyses(hash)
+    def get_analyses(hash)
       unless hash[:digest] && hash[:value]
         raise 'Missing parameter :digest or :value'
       end

data/lib/tigre-client/s3_bucket.rb

@@ -0,0 +1,13 @@
+class S3Bucket
+  
+  def initialize(bucket)
+    @s3     = RightAws::S3.new(Tigre::FogConfig::AWS_KEY, Tigre::FogConfig::AWS_SECRET)
+    @bucket = @s3.bucket(bucket)
+  end
+  
+  def send_file(file, file_name=nil)
+    file_name ||= file[:filename]
+    @bucket.put(file_name, IO.binread(file[:tempfile]))
+  end
+  
+end

data/lib/tigre-client/url.rb

@@ -31,7 +31,9 @@ module Tigre
 
       Tigre.post_connection('/urls', post_data)
     end
-
+    
+    # required params
+    #   urls => Array of hashes {:original_url => url, :source => source, :shareable => shareable}
     def self.post_many(urls=[])
       raise "Missing URLS parameter" if urls == []
       raise 'Too many!! Limit urls to 100 plesae!' if urls.size > 100
@@ -111,7 +113,6 @@ module Tigre
       # end
 
       Tigre.logger.warn "** DEPRECATED ** Use Tigre::Url.index(options) " if Tigre.logger
-      
       self.index(options)
       # common_params(options)
       # 

data/lib/tigre-client/version.rb

@@ -1,5 +1,5 @@
 module Tigre
   module Client
-    VERSION = "0.4.1"
+    VERSION = "0.5.0"
   end
 end

data/lib/tigre-client.rb

@@ -18,7 +18,8 @@ require 'tigre-client/url'
 module Tigre
 
   class << self
-    attr_accessor :token, :server, :endpoint, :conn, :logger, :s3_key, :s3_secret, :s3_bucket
+    attr_accessor :token, :server, :endpoint, :conn, :logger
+    attr_accessor :s3_key, :s3_secret, :s3_bucket, :s3_analysis_bucket
 
     def configure
       yield self
@@ -29,6 +30,10 @@ module Tigre
       !Tigre.s3_key.nil? && !Tigre.s3_secret.nil? && !Tigre.s3_bucket.nil?
     end
 
+    def s3_analysis_enabled?
+      !Tigre.s3_key.nil? && !Tigre.s3_secret.nil? && !Tigre.s3_analysis_bucket.nil?
+    end
+
     def build_get_connection
       @conn = Faraday.new(:url => "#{Tigre.server}") do |builder|
         builder.adapter :net_http

metadata

@@ -2,7 +2,7 @@
 name: tigre-client
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors: 
 - Marcio Castilho
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-10 00:00:00 -04:00
+date: 2011-05-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -93,6 +93,7 @@ files:
 - lib/tigre-client/common/tag_components.rb
 - lib/tigre-client/multipart_with_file.rb
 - lib/tigre-client/occurrence.rb
+- lib/tigre-client/s3_bucket.rb
 - lib/tigre-client/sample.rb
 - lib/tigre-client/scan.rb
 - lib/tigre-client/url.rb