trim-api 0.0.1 → 0.1

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.1 / 2009-10-23
+
+* Added trim_destination method that returns the destination for a trimmed url
+* Added authentication (currently only required for trim_destination)
+
 === 0.0.1 / 2009-10-18
 
 * Initial release

data/lib/trim-api/trim-api.rb

@@ -1,6 +1,5 @@
 module TrimApi
   
-  VERSION = "0.0.1"
   API_URL = "http://api.tr.im/api/"
   
   class TrimError < StandardError
@@ -13,13 +12,18 @@ module TrimApi
   
   class Trim
     
+    attr_accessor :username
+    attr_accessor :password
+    
     def initialize(options = {})
       @client = HTTPClient.new
+      self.username = options[:username] if options[:username]
+      self.password = options[:password] if options[:password]
     end
     
-    def trim(original_url)
+    def trim(original_url, options = {})
       raise ArgumentError.new(":url to shorten is required") if original_url.nil?
-      response = @client.get_content(create_url(original_url))
+      response = @client.get_content(create_url("trim_url", :url => original_url))
       data = JSON.parse(response)
       unless data["status"]["result"] == "OK"
         raise TrimError.new(data["status"]["code"],data["status"]["message"])
@@ -28,12 +32,24 @@ module TrimApi
       end
     end
     
+    def trim_destination(trimmed_url, options = {})
+      raise ArgumentError.new(":trimmed url is required") if trimmed_url.nil?
+      raise ArgumentError.new(":username and password are required") if (username.nil? || password.nil?)
+      response = @client.get_content(create_url("trim_destination", {:trimpath => trimmed_url, :username => username, :password => password}))
+      data = JSON.parse(response)
+      unless data["status"]["result"] == "OK"
+        raise TrimError.new(data["status"]["code"],data["status"]["message"])
+      else
+        data["destination"]
+      end
+    end
+    
     private
     
-    def create_url(original_url)
-      base_url = "#{API_URL}trim_url.json?"
-      url = "url=#{CGI::escape(original_url)}"
-      base_url + url
+    def create_url(method, options = {})
+      base_url = "#{API_URL}#{method}.json?"
+      options = options.map { |k,v| "%s=%s" % [CGI.escape(k.to_s), CGI.escape(v.to_s)] }.join("&")
+      base_url + options
     end
     
   end

data/lib/trim_api.rb

@@ -5,5 +5,5 @@ require 'CGI'
 require 'trim-api/trim-api.rb'
 
 module TrimApi
-  VERSION = '0.0.1'
+  VERSION = '0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: trim-api
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: "0.1"
 platform: ruby
 authors: 
 - Robin Fisher
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-18 00:00:00 +01:00
+date: 2009-10-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency