tigre-client 0.2.8 → 0.2.9

data/lib/tigre-client/occurrence.rb

@@ -2,13 +2,13 @@ module Tigre
   class Occurrence
 
     ##
-    #  DEPRECIATED
+    #  DEPRECATED => Use Tigre::Occurrence.all(hash)
     #
     # return all the occurrences for a given sha256 URL
     # required params
     #   sha256 => String
     def self.for_sha(sha256)
-      Tigre.logger.warn "** DEPRECIATED ** Use Tigre::Occurrence.all(:digest => 'sha256', :value => 'your-sha256')" if Tigre.logger
+      Tigre.logger.warn "** DEPRECATED ** Use Tigre::Occurrence.all(:digest => 'sha256', :value => 'your-sha256')" if Tigre.logger
       
       raise "Missing sha256 parameter" if sha256 == ''
       self.all(:digest => 'sha256', :value => sha256)
@@ -29,15 +29,15 @@ module Tigre
     
     # return an individual occurrence for a given sha256 URL
     # required params
-    #   sha256 => String ** DEPRECIATED **
-    #   occurrence_id => String ** DEPRECIATED **
+    #   sha256 => String ** DEPRECATED **
+    #   occurrence_id => String ** DEPRECATED **
     #   hash => Hash
     #     :digest => String, the digest type you wish to use
     #     :value  => String, the value of the URLs digest you are using
     #     :occurrence_id => String, the ID of the specific occurrence
     def self.get(hash, occurrence_id=nil)
       if hash.is_a?(String)
-        Tigre.logger.warn "** DEPRECIATED PARAMETERS ** Use Tigre::Occurrence.get(:digest => 'sha256', :value => 'your-sha256', :occurrence_id => 'id')" if Tigre.logger
+        Tigre.logger.warn "** DEPRECATED PARAMETERS ** Use Tigre::Occurrence.get(:digest => 'sha256', :value => 'your-sha256', :occurrence_id => 'id')" if Tigre.logger
         hash = {:digest => 'sha256', :value => hash, :occurrence_id => occurrence_id}
       end
       

data/lib/tigre-client/sample.rb

@@ -5,12 +5,23 @@ module Tigre
     #   file_location => String path to the file
     #   md5 => String
     # optional params
-    #   options => Hash (reserved for future use)
+    #   options => Hash 
+    #     :tags => String => I.E 'foo'
+    #     :tags => String (comma seperated) => I.E 'foo,bar,baz'
+    #     :tags => Array => ['foo', 'bar', 'baz']
     def self.post(file_location, md5, options={})
       if file_location == ''|| md5 == ''
         raise ArguementError, "File_location or md5 parameter cannot be empty"
       end
-
+      
+      if options[:tags]
+        if options[:tags].is_a?(Array)
+          options[:tags] = options[:tags].map {|t| t.strip}.join(',') 
+        else
+          options[:tags] = options[:tags].split(',').map {|t| t.strip}.join(',')
+        end
+      end
+      
       post_data = {:file => File.new(file_location), :md5 => md5}
       Tigre.post_file_connection('/samples', post_data.merge(options))
     end
@@ -95,5 +106,26 @@ module Tigre
       Tigre.put_connection("/samples/#{md5}/add_tags", update_data)
     end
 
+    # required params
+    #   hash   => Hash
+    #     :digest => String,  The digest type
+    #     :value  => String,  The digest value
+    #     :tag_list => String (comma seperated) => I.E 'foo,bar,baz'
+    #     :tag_list => Array => ['foo', 'bar', 'baz']
+    def self.remove_tags(hash)
+      unless hash[:digest] && hash[:value] && hash[:tag_list]
+        raise 'Missing parameter :digest or :value or :tag_list'
+      end
+      
+      if hash[:tag_list].is_a?(Array)
+        hash[:tag_list] = hash[:tag_list].map {|t| t.strip}.join(',') 
+      else
+        hash[:tag_list] = hash[:tag_list].split(',').map {|t| t.strip}.join(',')
+      end
+
+      update_data = {"tag_list" => hash[:tag_list]}
+      Tigre.put_connection("/samples/#{hash[:digest]}/value/#{hash[:value]}/remove_tags", update_data)      
+    end
+
   end
 end

data/lib/tigre-client/url.rb

@@ -1,6 +1,26 @@
 module Tigre
   class Url
 
+    def self.common_params(params)
+      @page = params[:page] ||= 0
+      @per  = params[:per]  ||= 50
+      
+      if params[:after]
+        if params[:after].is_a?(Time)
+          @after = params[:after].to_i
+        else
+          @after = params[:after]
+        end
+      end
+      if params[:before] 
+        if params[:before].is_a?(Time)
+          @before = params[:before].to_i
+        else
+          @before = params[:before]
+        end
+      end
+    end
+
     # required params
     #   url => String
     #   options => Hash
@@ -20,8 +40,17 @@ module Tigre
       post_data = {
         "url[original_url]" => url,
         "url[source_name]"  => options[:source_name],
-        "url[shareable]"    => options[:shareable]
+        "url[shareable]"    => options[:shareable],
       }
+      
+      if options[:tags]
+        if options[:tags].is_a?(Array)
+          post_data["url[tags]"] = options[:tags].map {|t| t.strip}.join(',') 
+        else
+          post_data["url[tags]"] = options[:tags].split(',').map {|t| t.strip}.join(',')
+        end
+      end
+      
       Tigre.post_connection('/urls', post_data)
     end
 
@@ -58,13 +87,13 @@ module Tigre
     end
 
     # required params
-    #   sha256 => String ** DEPRECIATED **
+    #   sha256 => String ** DEPRECATED ** => use Tigre::Url.get(:digest => 'sha256', :value => 'your-sha256')
     #   hash   => Hash
     #     :digest => String,  The digest type
     #     :value  => String,  The digest value
     def self.get(hash)
       if hash.is_a?(String)
-        Tigre.logger.warn "** DEPRECIATED PARAMETER ** Use Tigre::Url.get(:digest => 'sha256', :value => 'your-sha256')" if Tigre.logger
+        Tigre.logger.warn "** DEPRECATED PARAMETER ** Use Tigre::Url.get(:digest => 'sha256', :value => 'your-sha256')" if Tigre.logger
         hash = {:digest => 'sha256', :value => hash}
       end
       
@@ -76,13 +105,13 @@ module Tigre
     end
 
     ##
-    #  DEPRECIATED
+    #  DEPRECATED => use Tigre::Url.get(:digest => 'md5', :value => 'your-md5')
     #
     # required params
     #   md5 => String
     def self.get_md5(md5)
       raise ArguementError, "Missing md5 parameter" if md5 == ''
-      Tigre.logger.warn "** DEPRECIATED ** Use Tigre::Url.get(:digest => 'md5', :value => 'your-md5')" if Tigre.logger
+      Tigre.logger.warn "** DEPRECATED ** Use Tigre::Url.get(:digest => 'md5', :value => 'your-md5')" if Tigre.logger
       self.get(:digest => 'md5', :value => md5)
     end
 
@@ -91,9 +120,8 @@ module Tigre
     #     :page => Integer, :default => 0
     #     :per => Integer, :default => 50
     def self.index(options={})
-      options[:page] ||= 0
-      options[:per]  ||= 50
-      Tigre.get_connection("/urls?page=#{options[:page]}&per=#{options[:per]}")
+      self.common_params(options)
+      Tigre.get_connection("/urls?page=#{@page}&per=#{@per}")
     end
 
     # required params
@@ -105,16 +133,9 @@ module Tigre
         raise ArguementError, "Missing proper parameters (:start_date or :end_date required)"
       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
+      self.common_params(options)
 
-      options[:page] ||= 0
-      options[:per]  ||= 50
-      Tigre.get_connection("/urls/daterange?after=#{options[:after]}&before=#{options[:before]}&page=#{options[:page]}&per=#{options[:per]}")
+      Tigre.get_connection("/urls/daterange?after=#{@after}&before=#{@before}&page=#{@page}&per=#{@per}")
     end
 
     # required params
@@ -154,7 +175,7 @@ module Tigre
     #     :per => Integer, :default => 50
     def self.tagged_with(tags, options={})
       if tags == ''
-        raise ArguementError, "Missing tags parameter"
+        raise "Missing tags parameter"
       end
       
       if tags.is_a?(Array)
@@ -163,16 +184,30 @@ module Tigre
         tags = tags.split(',').map {|t| t.strip}.join(',')
       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
+      self.common_params(options)
+      
+      Tigre.get_connection("/urls/tagged_with?tags=#{tags}&after=#{@after}&before=#{@before}&page=#{@page}&per=#{@per}")
+    end
+    
+    # required params
+    #   hash   => Hash
+    #     :digest => String,  The digest type
+    #     :value  => String,  The digest value
+    #     :tag_list => String (comma seperated) => I.E 'foo,bar,baz'
+    #     :tag_list => Array => ['foo', 'bar', 'baz']
+    def self.remove_tags(hash)
+      unless hash[:digest] && hash[:value] && hash[:tag_list]
+        raise 'Missing parameter :digest or :value or :tag_list'
       end
       
-      options[:page] ||= 0
-      options[:per]  ||= 50
-      Tigre.get_connection("/urls/tagged_with?tags=#{tags}&after=#{options[:after]}&before=#{options[:before]}&page=#{options[:page]}&per=#{options[:per]}")
+      if hash[:tag_list].is_a?(Array)
+        hash[:tag_list] = hash[:tag_list].map {|t| t.strip}.join(',') 
+      else
+        hash[:tag_list] = hash[:tag_list].split(',').map {|t| t.strip}.join(',')
+      end
+
+      update_data = {"tag_list" => hash[:tag_list]}
+      Tigre.put_connection("/urls/#{hash[:digest]}/value/#{hash[:value]}/remove_tags", update_data)      
     end
     
   end

data/lib/tigre-client/version.rb

@@ -1,5 +1,5 @@
 module Tigre
   module Client
-    VERSION = "0.2.8"
+    VERSION = "0.2.9"
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: tigre-client
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors: 
 - Marcio Castilho
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-19 00:00:00 -04:00
+date: 2011-04-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency