adding support to multi shortening domains

Author: Claudio

bitly.py

@@ -23,7 +23,6 @@
 import urlparse
 import string
 
-BITLY_BASE_URL = "http://api.bit.ly/"
 BITLY_API_VERSION = "2.0.1"
 
 VERBS_PARAM = { 
@@ -49,11 +48,24 @@ class BitlyTimeoutError(BitlyError):
 
 
 class Api(object):
+
+    ALLOWED_API_DOMAINS = {
+        'bit.ly': 'http://api.bit.ly/',
+        'j.mp': 'http://api.j.mp/',
+    }
+
+    domain = 'bit.ly'
+    
+    def get_api_domain(self):
+        return self.ALLOWED_API_DOMAINS[self.domain]
+        
     """ API class for bit.ly """
-    def __init__(self, login, apikey):
+    def __init__(self, login, apikey, domain=None):
         self.login = login
         self.apikey = apikey
         self._urllib = urllib2
+        if domain is not None:
+            self.domain = domain
 
     def shorten(self, longURLs, params={}):
         """ 
@@ -145,7 +157,7 @@ def _getURL(self, verb, paramVal, more_params={}):
                 params.append(( verbParam, val ))
 
         encoded_params = urllib.urlencode(params)
-        return "%s%s?%s" % (BITLY_BASE_URL, verb, encoded_params)
+        return "%s%s?%s" % (self.get_api_domain(), verb, encoded_params)
 
     def _fetchUrl(self, url):
         '''Fetch a URL

test/test_shortening_urls.py

@@ -26,11 +26,11 @@ def should_have_an_API_authenticated_by_my_credentials(api):
 
 def should_shorten_an_url_consistently_when_a_single_string_url_is_provided(api):
     url_to_be_shortened = 'http://globoesporte.globo.com/motor/formula-1/noticia/2010/10/apos-maus-resultados-ferrari-reforca-apoio-massa-no-fim-da-temporada.html'
-    expected_url = 'http://bit.ly/9n93fw'
+    expected_hash = '/9n93fw'
 
     shortened_url = api.shorten(longURLs=url_to_be_shortened)
 
-    assert shortened_url == expected_url, 'The shortened version of %s url should\'ve been %s but was %s' % (url_to_be_shortened, expected_url, shortened_url)
+    assert shortened_url.endswith(expected_hash) , 'The shortened version of %s url should\'ve ended with %s but was %s' % (url_to_be_shortened, expected_url, shortened_url)
 
 def should_shorten_many_urls_consistently_when_a_list_of_urls_is_provided(api):
     urls_to_be_shortened = [ 'http://globoesporte.globo.com/motor/formula-1/noticia/2010/10/apos-maus-resultados-ferrari-reforca-apoio-massa-no-fim-da-temporada.html'
@@ -153,3 +153,9 @@ def verifying_that_any_other_exceptions_are_reraised_but_timeout_exceptions(api)
         mox.VerifyAll()
     finally:
         mox.UnsetStubs()
+
+def test_i_can_use_the_freaking_jmp_domain_instead():
+    api = bitly.Api(login='jcfigueiredo', apikey='R_1cf5dc0fa14c2df34261fb620bd256aa', domain='j.mp')
+    
+    yield should_have_an_API_authenticated_by_my_credentials, api
+    yield should_shorten_an_url_consistently_when_a_single_string_url_is_provided, api