Implemented fwd4.me service. Few fixes to fon.gs service.

joshthecoder · joshthecoder · commit 98ce28a1c925 · 2009-08-02T13:08:06.000-05:00
diff --git a/README b/README
@@ -21,6 +21,7 @@ Supported URL shortening services for shrinking long urls:
     a.gd
     buk.me
     fon.gs
+    fwd4.me
 
 Shorty can expand any url service by getting the redirect
 location by requesting the tiny url.
diff --git a/TODO b/TODO
@@ -1,3 +1,2 @@
 + burnurl.com
 + chilp.it
-+ fwd4.me
diff --git a/shorty.py b/shorty.py
@@ -406,6 +406,7 @@ def expand(self, tinyurl):
 
 bukme = Bukme()
 
+# fon.gs
 class Fongs(Service):
 
     def shrink(self, bigurl, tag=None):
@@ -433,15 +434,37 @@ def check(self, tag):
         else:
             raise ShortyError(data)
 
-    def expand(self, bigurl):
-        if bigurl[-1] != '/':
-            burl = bigurl + '/'
+    def expand(self, tinyurl):
+        if tinyurl[-1] != '/':
+            turl = tinyurl + '/'
         else:
-            burl = bigurl
-        return Service.expand(self, burl)
+            turl = tinyurl
+        return Service.expand(self, turl)
 
 fongs = Fongs()
 
+# fwd4.me
+class Fwd4me(Service):
+
+    ecodes = {
+        '1': 'Invalid long url',
+        '2': 'Invalid api key',
+        '3': 'Account suspended or revoked',
+        '4': 'Long url is black listed',
+        '5': 'Internal system error'
+    }
+
+    def shrink(self, bigurl):
+        resp = request('http://api.fwd4.me/', {'url': bigurl})
+        data = resp.read()
+        if data.startswith('ERROR:'):
+            ecode = data.lstrip('ERROR:')
+            raise ShortyError(Fwd4me.ecodes.get(ecode, 'Unkown error'))
+        else:
+            return data
+
+fwd4me = Fwd4me()
+
 """Mapping of domain to service class"""
 services = {
     'sandbox': sandbox,
@@ -455,7 +478,8 @@ def expand(self, bigurl):
     'digg.com': digg,
     'a.gd': agd,
     'buk.me': bukme,
-    'fon.gs': fongs
+    'fon.gs': fongs,
+    'fwd4.me': fwd4me
 }
 
 """

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`+ burnurl.com`
`2`	`2`	`+ chilp.it`
`3`		`-+ fwd4.me`