shorturl 0.8.6 → 0.8.7

data/ChangeLog

@@ -1,20 +1,28 @@
+0.8.7:
+    - Added support for ur1.ca (thanks to raneksi)
+    - Added support for bit.ly (thanks to raneksi)
+    - Fixed support for snipurl.com (thanks to raneksi)
+    - Fixed support for shortify (thanks to raneksi)
+    - Fixed support for moourl.com (thanks to raneksi)
+    - Removed support for makeashorterlink.com (thanks to raneksi)
+
 0.8.4:
     - Fixed support for RubyURL.com
     - Added support for urlTea.com
     - Added support for moourl.com
-    
+
 0.7.0:
     - Added shortify.com, 0rz.net
     - Modified unit tests
     - Started using CVS on RubyForge
-	
+
 0.6.0:
     - Changed the method for getting the URL for ln-s.net to use their
       API.  So basically, this means the new additional argument attribute
       in the Service class is now useless, because no service uses it.  I've
       removed it along with the Hash#to_html_args method.
     - Added d62.net, shiturl.com, littlink.com and clipurl.com
-	
+
 0.5.0:
     - Added two services: fyad.org and ln-s.net (thanks to Daniel
       Dipaolo)
@@ -39,10 +47,10 @@
 0.2.1:
     - Added makeashorterlink.com and skinnylink.com
     - Refactored get_short_url
-	
+
 0.2.0:
     - Added shorl.com, snipurl.com and metamark.net
-	
+
 0.1.0:
     - Refactored the tinyurl and rubyurl methods
     - URI.extract to get URLs instead of regular expressions
@@ -50,6 +58,6 @@
       of a network error
     - More thorough unit tests
     - Made tinyurl, rubyurl and get_short_url private class methods
-	
+
 0.0.1:
     - Initial release

data/lib/shorturl.rb

@@ -7,11 +7,14 @@ require "net/http"
 require "cgi"
 require "uri"
 
+class ServiceNotAvailable < Exception
+end
+
 class InvalidService < Exception
 end
 
 class Service
-  attr_accessor :port, :code, :method, :action, :field, :block
+  attr_accessor :port, :code, :method, :action, :field, :block, :response_block
 
   # Intialize the service with a hostname (required parameter) and you
   # can override the default values for the HTTP port, expected HTTP
@@ -25,7 +28,6 @@ class Service
     @method = :post
     @action = "/"
     @field = "url"
-    @block = lambda { |body| }
 
     if block_given?
       yield self
@@ -37,13 +39,15 @@ class Service
   def call(url)
     Net::HTTP.start(@hostname, @port) { |http|
       response = case @method
-                 when :post: http.post(@action, "#{@field}=#{url}")
+                 when :post: http.post(@action, "#{@field}=#{CGI.escape(url)}")
                  when :get: http.get("#{@action}?#{@field}=#{CGI.escape(url)}")
                  end
       if response.code == @code.to_s
-        @block.call(response.read_body)
+        @response_block ? @response_block.call(response) : @block.call(response.read_body)
       end
     }
+  rescue Errno::ECONNRESET => e
+    raise ServiceNotAvailable, e.to_s, e.backtrace
   end
 end
 
@@ -71,13 +75,15 @@ class ShortURL
       s.block = lambda { |body| URI.extract(body)[2] }
     },
 
+    # SnipURL offers a restful HTTP API but it cannot be used without
+    # registration.
     :snipurl => Service.new("snipurl.com") { |s|
-      s.action = "/index.php"
-      s.field = "link"
-      s.block = lambda { |body|
-        line = body.split("\n").grep(/txt/)[0]
-        short_url = URI.extract(line)[1][0..-2] # Remove trailing '
-      }
+      s.action = "/site/index"
+      s.field = "url"
+
+      # As with other services, this is far from elegant and might break
+      # any time. Might just be better to do some HTML parsing instead.
+      s.block = lambda { |body| URI.extract(body).grep(/http:\/\/snipurl.com/)[0] }
     },
 
     :metamark => Service.new("metamark.net") { |s|
@@ -86,27 +92,6 @@ class ShortURL
       s.block = lambda { |body| URI.extract(body).grep(/xrl.us/)[0] }
     },
 
-    :makeashorterlink => Service.new("makeashorterlink.com") { |s|
-      s.action = "/index.php"
-      s.block = lambda { |body| URI.extract(body).grep(/makeashorterlink/)[0] }
-    },
-
-    :skinnylink => Service.new("skinnylink.com") { |s|
-      s.block = lambda { |body| URI.extract(body).grep(/skinnylink/)[0] }
-    },
-
-    :linktrim => Service.new("linktrim.com") { |s|
-      s.method = :get
-      s.action = "/lt/generate"
-      s.block = lambda { |body| URI.extract(body).grep(/\/linktrim/)[1] }
-    },
-
-    :shorterlink => Service.new("shorterlink.com") { |s|
-      s.method = :get
-      s.action = "/add_url.html"
-      s.block = lambda { |body| URI.extract(body).grep(/shorterlink/)[0] }
-    },
-
     :minilink => Service.new("minilink.org") { |s|
       s.method = :get
       s.block = lambda { |body| URI.extract(body)[-1] }
@@ -118,40 +103,16 @@ class ShortURL
       s.block = lambda { |body| URI.extract(body)[0] }
     },
 
-    :fyad => Service.new("fyad.org") { |s|
-      s.method = :get
-      s.block = lambda { |body| URI.extract(body).grep(/fyad.org/)[2] }
-    },
-
-    :d62 => Service.new("d62.net") { |s|
-      s.method = :get
-      s.block = lambda { |body| URI.extract(body)[0] }
-    },
-
     :shiturl => Service.new("shiturl.com") { |s|
       s.method = :get
       s.action = "/make.php"
       s.block = lambda { |body| URI.extract(body).grep(/shiturl/)[0] }
     },
 
-    :littlink => Service.new("littlink.com") { |s|
-      s.block = lambda { |body| URI.extract(body).grep(/littlink/)[0] }
-    },
-
-    :clipurl => Service.new("clipurl.com") { |s|
-      s.action = "/create.asp"
-      s.block = lambda { |body| URI.extract(body).grep(/clipurl/)[0] }
-    },
-
-    :shortify => Service.new("shortify.com") { |s|
+    :shortify => Service.new("shortify.wikinote.com") { |s|
       s.method = :get
       s.action = "/shorten.php"
-      s.block = lambda { |body| URI.extract(body).grep(/shortify/)[0] }
-    },
-
-    :orz => Service.new("0rz.net") { |s|
-      s.action = "/create.php"
-      s.block = lambda { |body| URI.extract(body).grep(/0rz/)[0] }
+      s.block = lambda { |body| URI.extract(body).grep(/shortify/)[-1] }
     },
     
     :moourl => Service.new("moourl.com") { |s|      
@@ -159,14 +120,70 @@ class ShortURL
       s.action = "/create/"
       s.method = :get      
       s.field = "source"
-      s.block = lambda { |body| body.gsub('Location/woot/?moo=','http://moourl.com/') } 
+      s.response_block = lambda { |res| "http://moourl.com/" + res["location"].match(/\?moo=/).post_match }
     },
-    
-    :urltea => Service.new("urltea.com") { |s| 
+
+    :bitly => Service.new("bit.ly") { |s|
       s.method = :get
-      s.action = "/create/"
-      s.block = lambda { |body| URI.extract(body).grep(/urltea/)[6] }       
+      s.action = "/index.php"
+      s.field  = "url"
+      s.block  = lambda { |body|
+        body.match(%r{<input id="shortened-url" value="(.*)" />}).captures[0]
+      }
+    },
+
+    :ur1 => Service.new("ur1.ca") { |s|
+      s.method = :post
+      s.action = "/"
+      s.field  = "longurl"
+      s.block  = lambda { |body| URI.extract(body).grep(/ur1/)[0] }
     }
+
+    # :skinnylink => Service.new("skinnylink.com") { |s|
+    #   s.block = lambda { |body| URI.extract(body).grep(/skinnylink/)[0] }
+    # },
+
+    # :linktrim => Service.new("linktrim.com") { |s|
+    #   s.method = :get
+    #   s.action = "/lt/generate"
+    #   s.block = lambda { |body| URI.extract(body).grep(/\/linktrim/)[1] }
+    # },
+
+    # :shorterlink => Service.new("shorterlink.com") { |s|
+    #   s.method = :get
+    #   s.action = "/add_url.html"
+    #   s.block = lambda { |body| URI.extract(body).grep(/shorterlink/)[0] }
+    # },
+
+    # :fyad => Service.new("fyad.org") { |s|
+    #   s.method = :get
+    #   s.block = lambda { |body| URI.extract(body).grep(/fyad.org/)[2] }
+    # },
+
+    # :d62 => Service.new("d62.net") { |s|
+    #   s.method = :get
+    #   s.block = lambda { |body| URI.extract(body)[0] }
+    # },
+
+    # :littlink => Service.new("littlink.com") { |s|
+    #   s.block = lambda { |body| URI.extract(body).grep(/littlink/)[0] }
+    # },
+
+    # :clipurl => Service.new("clipurl.com") { |s|
+    #   s.action = "/create.asp"
+    #   s.block = lambda { |body| URI.extract(body).grep(/clipurl/)[0] }
+    # },
+
+    # :orz => Service.new("0rz.net") { |s|
+    #   s.action = "/create.php"
+    #   s.block = lambda { |body| URI.extract(body).grep(/0rz/)[0] }
+    # },
+
+    # :urltea => Service.new("urltea.com") { |s|
+    #   s.method = :get
+    #   s.action = "/create/"
+    #   s.block = lambda { |body| URI.extract(body).grep(/urltea/)[6] }
+    # }
   }
 
   # Array containing symbols representing all the implemented URL

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shorturl
 version: !ruby/object:Gem::Version 
-  version: 0.8.6
+  version: 0.8.7
 platform: ruby
 authors: 
 - Robby Russell
@@ -86,6 +86,6 @@ rubyforge_project:
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Shortens URLs using services such as RubyURL, urlTea, and TinyURL
+summary: Shortens URLs using services such as RubyURL, urlTea, bit.ly, moourl.com, and TinyURL
 test_files: 
 - test/ts_all.rb