refactored tumblr.py a working oauth

hackathon_starter/hackathon/scripts/tumblr.py

@@ -6,100 +6,138 @@ import re
 from bs4 import BeautifulSoup
 import urlparse
 import oauth2
-
-blog_uri		= "http://api.tumblr.com/v2/blog/"
-user_uri		= "http://api.tumblr.com/v2/user/info"
-request_token_url   = 'http://www.tumblr.com/oauth/request_token'
-authorize_url       = 'http://www.tumblr.com/oauth/authorize'
-access_token_url    = 'http://www.tumblr.com/oauth/access_token'
-
-def simpleoauthurl(consumer_key, consumer_secret):
-	#set consumer
-	consumer = oauth2.Consumer(consumer_key, consumer_secret)
-
-	#getting token
-	client = oauth2.Client(consumer)
-	resp, content = client.request(request_token_url, "GET")
-	if int(resp['status']) != 200:
-		raise Exception("Invalid response %s." % resp['status'])
-
-	#parse content into dictionary
-	request_token = dict(urlparse.parse_qsl(content))
-	oauth_key = request_token['oauth_token']
-	oauth_secret = request_token['oauth_token_secret']
-
-	return authorize_url+"?oauth_token="+oauth_key+"&redirect_uri=http%3A%2F%2Flocalhost%3A8000/hackathon/tumblr"
-
-
-def getUserInfo(oauth_verifier):
-	''' Return user's information. '''
-	return "getUserInfo()"
-
-
-def getBlogInfo(user, consumer_key):
-	''' Return blogger's blog information.  '''
-	blog_info = blog_uri + user +".tumblr.com/info?api_key="+consumer_key
-	req = requests.get(blog_info)
-	jsonlist = json.loads(req.content)
-	
-	meta = jsonlist['meta']
-	response = jsonlist['response']
-	blog = response['blog']
-	blog['updated'] = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(blog['updated']))
-
-	return blog
-
-def getTaggedInfo(tag, consumer_key):
-	''' Return tags related to blog with certain tag. '''
-
-	tagged_uri = "http://api.tumblr.com/v2/tagged?tag="+tag+"&api_key="+consumer_key+"&limit=20"
-	req = requests.get(tagged_uri)
-	jsonlist = json.loads(req.content)
-
-	tags = []
-
+from django.conf import settings
+
+class TumblrOauthClient(object):
+	request_token_url   = 'http://www.tumblr.com/oauth/request_token'
+	authorize_url       = 'http://www.tumblr.com/oauth/authorize'
+	access_token_url    = 'http://www.tumblr.com/oauth/access_token'
+	user_uri			= "http://api.tumblr.com/v2/user/info"
+	blog_uri			= "http://api.tumblr.com/v2/blog/"
 	
-	meta = jsonlist['meta']
-	body = jsonlist['response']
-	for blog in body:
-		for data in blog:
-			if data == "tags":
-				#print blog[data]
-				for i in blog[data]:
-					m = re.match("(.*)(s*)s(t*)t(a*)a(r*)r(b*)b(u*)u(c*)c(k*)k(.*)", i.lower())
-					if not m:
-						tags.append(i)					
-
-	return tags
-
-def getTaggedBlog(tag, consumer_key):
-	''' Return the tagged blogs's captions or post.'''
+	def __init__(self, consumer_key, consumer_secret, oauth_token='', oauth_token_secret='', oauth_verifier='', token=''):
+		self.consumer_key = consumer_key
+		self.cosnumer_secret = consumer_secret
+		self.consumer = oauth2.Consumer(consumer_key, consumer_secret)
+		self.token = token
+		self.oauth_token = oauth_token
+		self.oauth_token_secret = oauth_token_secret
+		self.oauth_verifier = oauth_verifier
+
+	def get_authorize_url(self):
+		client = oauth2.Client(self.consumer)
+		resp, content = client.request(self.request_token_url, "GET")
+
+		if int(resp['status']) != 200:
+			raise Exception("Invalid response %s." % resp['status'])
+
+		#parse content
+		request_token = dict(urlparse.parse_qsl(content))
+		self.oauth_token = request_token['oauth_token']
+		self.oauth_token_secret = request_token['oauth_token_secret']
+
+		#print authorize_url+"?oauth_token="+oauth_key+"&redirect_uri=http%3A%2F%2Flocalhost%3A8000/hackathon/tumblr"
+		return self.authorize_url+"?oauth_token="+self.oauth_token+"&redirect_uri=http%3A%2F%2Flocalhost%3A8000/hackathon/tumblr"
+
+	def get_access_token_url(self, oauth_verifier):
+		#print "verifier"
+		self.oauth_verifier = oauth_verifier
+		token = oauth2.Token(self.oauth_token, self.oauth_token_secret)
+		token.set_verifier(self.oauth_verifier)
+
+		client = oauth2.Client(self.consumer, token)
+		resp, content = client.request(self.access_token_url,"POST")
+
+		#print resp['status']
+
+		access_token = dict(urlparse.parse_qsl(content))
+		#print access_token
+
+		#set verified token
+		self.token = oauth2.Token(access_token['oauth_token'], access_token['oauth_token_secret'])
+		
 	
-	tagged_uri = "http://api.tumblr.com/v2/tagged?tag="+tag+"&api_key="+consumer_key+"&limit=2"
-	req = requests.get(tagged_uri)
-	jsonlist = json.loads(req.content)
-	
-	meta = jsonlist['meta']
-	body = jsonlist['response']
-
-	tagtext = []
-
-	for blog in body:
-		#print "####"
-		for data in blog:
-			#post
-			if data == "body":
-				if blog[data]:
+	def getUserInfo(self):
+		''' Returns users information. '''
+		client = oauth2.Client(self.consumer, self.token)
+		#print client
+		resp, content = client.request(self.user_uri, "POST")
+		if int(resp['status']) != 200:
+			raise Exception("Invalid response %s." % resp['status'])
+
+		#return content in json format
+		jsonlist = json.loads(content)
+		response = jsonlist['response']
+		user_info = response['user']
+		#print user_info
+		return user_info
+
+	def getBlogInfo(self, user):
+		''' Returns blogger's blog information '''
+		blog_info = self.blog_uri + user + ".tumblr.com/info?api_key="+self.consumer_key
+		req = requests.get(blog_info)
+		
+		if int(req.status_code) != 200:
+			raise Exception("Invalid response %s." % resp['status'])
+		
+
+		jsonlist = json.loads(req.content)
+		response = jsonlist['response']
+		blog 	 = response['blog']
+		blog['updated'] = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(blog['updated']))
+
+		return blog
+
+	def getTaggedInfo(self, tag):
+		''' Return tags related to blog with certain tag. '''
+
+		tagged_uri = "http://api.tumblr.com/v2/tagged?tag="+tag+"&api_key="+self.consumer_key+"&limit=20"
+		req = requests.get(tagged_uri)
+		jsonlist = json.loads(req.content)
+
+		tags = []
+
+		meta = jsonlist['meta']
+		body = jsonlist['response']
+		for blog in body:
+			for data in blog:
+				if data == "tags":
 					#print blog[data]
-					soup = BeautifulSoup(blog[data])
-					text = soup.get_text()
-					tagtext.append(text)
-			#an image
-			if data == "caption":
-				if blog[data]:
-					#print blog[data]
-					soup = BeautifulSoup(blog[data])
-					text = soup.get_text()					
-					tagtext.append(text)
-	
-	return tagtext
+					for i in blog[data]:
+						m = re.match("(.*)(s*)s(t*)t(a*)a(r*)r(b*)b(u*)u(c*)c(k*)k(.*)", i.lower())
+						if not m:
+							tags.append(i)					
+
+		return tags	
+
+	def getTaggedBlog(self, tag):
+		''' Return the tagged blogs's captions or post.'''
+		
+		tagged_uri = "http://api.tumblr.com/v2/tagged?tag="+tag+"&api_key="+self.consumer_key+"&limit=20"
+		req = requests.get(tagged_uri)
+		jsonlist = json.loads(req.content)
+		
+		meta = jsonlist['meta']
+		body = jsonlist['response']
+
+		tagtext = []
+
+		for blog in body:
+			#print "####"
+			for data in blog:
+				#post
+				if data == "body":
+					if blog[data]:
+						#print blog[data]
+						soup = BeautifulSoup(blog[data])
+						text = soup.get_text()
+						tagtext.append(text)
+				#an image
+				if data == "caption":
+					if blog[data]:
+						#print blog[data]
+						soup = BeautifulSoup(blog[data])
+						text = soup.get_text()					
+						tagtext.append(text)
+		
+		return tagtext

hackathon_starter/hackathon/views.py

@@ -9,7 +9,7 @@ from scripts.github import *
 from scripts.tumblr import *
 from django.conf import settings
 
-
+getTumblr = TumblrOauthClient(settings.TUMBLR_CONSUMER_KEY, settings.TUMBLR_CONSUMER_SECRET)
 
 def index(request):
     context = {'hello': 'world'}
@@ -19,7 +19,7 @@ def test(request):
     return HttpResponse('meow')
 
 def api_examples(request):
-    obtain_oauth_verifier = simpleoauthurl(settings.TUMBLR_CONSUMER_KEY, settings.TUMBLR_CONSUMER_SECRET)
+    obtain_oauth_verifier = getTumblr.get_authorize_url()#simpleoauthurl(settings.TUMBLR_CONSUMER_KEY, settings.TUMBLR_CONSUMER_SECRET)
     context = {'title': 'API Examples Page', 'tumblr_url': obtain_oauth_verifier}
     return render(request, 'hackathon/api_examples.html', context)
 
@@ -97,15 +97,18 @@ def github(request):
 def tumblr(request):
     ''' Tumblr api calls '''
     #retrieve verifier via url link
-    oauth_verifier = request.GET.getlist('oauth_verifier')
-    #get blogger twitterthecomic's blog information
-    blog = getBlogInfo('twitterthecomic', settings.TUMBLR_CONSUMER_KEY)
-    #get tags that was tagged along starbucks
-    tagged_blog = getTaggedInfo("starbucks", settings.TUMBLR_CONSUMER_KEY)
-    #get blog information tagged with starbucks
-    blogontag = getTaggedBlog("starbucks", settings.TUMBLR_CONSUMER_KEY)
-    context = {'title': "What's up Starbucks?", 'blogData': blog, 'blogTag': tagged_blog, 'blogontag': blogontag}
-    return render(request, 'hackathon/tumblr.html', context)
+    if not request.GET.items():
+        return HttpResponseRedirect('/hackathon/api/')
+    else:
+        getTumblr.get_access_token_url(request.GET.get('oauth_verifier'))
+        #get blogger twitterthecomic's blog information
+        blog = getTumblr.getBlogInfo('twitterthecomic')
+        #get tags that was tagged along starbucks
+        tagged_blog = getTumblr.getTaggedInfo("starbucks")
+        #get blog information tagged with starbucks
+        blogontag = getTumblr.getTaggedBlog("starbucks")
+        context = {'title': "What's up Starbucks?", 'blogData': blog, 'blogTag': tagged_blog, 'blogontag': blogontag}
+        return render(request, 'hackathon/tumblr.html', context)
 
 def linkedin(request):
     userinfo = getUserInfo()