<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -132,13 +132,11 @@ protected
 
 	# Twitter REST API Method: statuses/update
 	def update_status!(  status , in_reply_to_status_id = nil )
-		begin
-			self.twitagent.update_status!(  status , in_reply_to_status_id )
-		rescue =&gt; err
-			# The user might have rejected this application. Or there was some other error during the request.
-			RAILS_DEFAULT_LOGGER.error &quot;#{err.message} Failed update status&quot;
-			return
-		end
+		self.twitagent.update_status!(  status , in_reply_to_status_id )
+	rescue =&gt; err
+		# The user might have rejected this application. Or there was some other error during the request.
+		RAILS_DEFAULT_LOGGER.error &quot;#{err.message} Failed update status&quot;
+		return
 	end
 
 	# Twitter REST API Method: statuses friends
@@ -161,24 +159,20 @@ protected
 
 	# Twitter REST API Method: statuses mentions
 	def mentions( since_id = nil, max_id = nil , count = nil, page = nil )
-		begin
-			self.twitagent.mentions( since_id, max_id, count, page )
-		rescue =&gt; err
-			RAILS_DEFAULT_LOGGER.error &quot;Failed to get mentions via OAuth for #{current_user.inspect}&quot;
-			flash[:error] = &quot;Twitter API failure (getting mentions)&quot;
-			return
-		end	
+		self.twitagent.mentions( since_id, max_id, count, page )
+	rescue =&gt; err
+		RAILS_DEFAULT_LOGGER.error &quot;Failed to get mentions via OAuth for #{current_user.inspect}&quot;
+		flash[:error] = &quot;Twitter API failure (getting mentions)&quot;
+		return
 	end
 
 	# Twitter REST API Method: direct_messages
 	def direct_messages( since_id = nil, max_id = nil , count = nil, page = nil )
-		begin
-			self.twitagent.direct_messages( since_id, max_id, count, page )
-		rescue =&gt; err
-			RAILS_DEFAULT_LOGGER.error &quot;Failed to get direct_messages via OAuth for #{current_user.inspect}&quot;
-			flash[:error] = &quot;Twitter API failure (getting direct_messages)&quot;
-			return
-		end	
+		self.twitagent.direct_messages( since_id, max_id, count, page )
+	rescue =&gt; err
+		RAILS_DEFAULT_LOGGER.error &quot;Failed to get direct_messages via OAuth for #{current_user.inspect}&quot;
+		flash[:error] = &quot;Twitter API failure (getting direct_messages)&quot;
+		return
 	end
 
 	</diff>
      <filename>lib/oauth_system.rb</filename>
    </modified>
    <modified>
      <diff>@@ -15,14 +15,12 @@ class TwitterOauth
 
 	# initialize the oauth consumer, and also access token if user_token and user_secret provided
     def initialize( user_token = nil, user_secret = nil )
-		#RAILS_DEFAULT_LOGGER.info &quot;TwitterOauth.initialize user_token=#{user_token}, user_secret=#{user_secret}&quot; 
 		@consumer = OAuth::Consumer.new(TWOAUTH_KEY, TWOAUTH_SECRET, { :site=&gt; TWOAUTH_SITE  })
 		@access_token = OAuth::AccessToken.new( @consumer, user_token, user_secret ) if user_token &amp;&amp; user_secret
     end	
 	
 	# returns the consumer
 	def consumer
-		#RAILS_DEFAULT_LOGGER.info &quot;TwitterOauth.consumer&quot; 
 		@consumer
 	end
 	
@@ -37,15 +35,13 @@ class TwitterOauth
 
 	# when the callback has been received, exchange the request token for an access token
 	def exchange_request_for_access_token( request_token,  request_token_secret, oauth_verifier )
-		begin
-			#request_token = self.request_token( request_token, request_token_secret )
-			request_token = OAuth::RequestToken.new(self.consumer, request_token, request_token_secret)
-			#Exchange the request token for an access token. this may get 401 error
-			self.access_token = request_token.get_access_token( :oauth_verifier =&gt; oauth_verifier )
-		rescue =&gt; err
-			puts &quot;Exception in exchange_request_for_access_token: #{err}&quot;
-			raise err
-		end
+		#request_token = self.request_token( request_token, request_token_secret )
+		request_token = OAuth::RequestToken.new(self.consumer, request_token, request_token_secret)
+		#Exchange the request token for an access token. this may get 401 error
+		self.access_token = request_token.get_access_token( :oauth_verifier =&gt; oauth_verifier )
+	rescue =&gt; err
+		puts &quot;Exception in exchange_request_for_access_token: #{err}&quot;
+		raise err
 	end
 
 	# gets a request token to be used for the authorization request to twitter 
@@ -58,38 +54,34 @@ class TwitterOauth
 	
 	# Twitter REST API Method: account verify_credentials
 	def verify_credentials
-		begin
-			response = self.access_token.get('/account/verify_credentials.json')
-			case response
-			when Net::HTTPSuccess
-				credentials=JSON.parse(response.body)
-				raise TwitterOauth::UnexpectedResponse unless credentials.is_a? Hash
-				credentials
-			else
-				raise TwitterOauth::APIError
-			end
-		rescue =&gt; err
-			puts &quot;Exception in verify_credentials: #{err}&quot;
-			raise err
+		response = self.access_token.get('/account/verify_credentials.json')
+		case response
+		when Net::HTTPSuccess
+			credentials=JSON.parse(response.body)
+			raise TwitterOauth::UnexpectedResponse unless credentials.is_a? Hash
+			credentials
+		else
+			raise TwitterOauth::APIError
 		end
+	rescue =&gt; err
+		puts &quot;Exception in verify_credentials: #{err}&quot;
+		raise err
 	end
 
 	# Twitter REST API Method: account rate_limit_status
 	def rate_limit_status
-		begin
-			response = access_token.get('/account/rate_limit_status.json')
-			case response
-			when Net::HTTPSuccess
-				status=JSON.parse(response.body)
-				raise TwitterOauth::UnexpectedResponse unless status.is_a? Hash
-				status
-			else
-				raise TwitterOauth::APIError
-			end
-		rescue =&gt; err
-			puts &quot;Exception in rate_limit_status: #{err}&quot;
-			raise err
+		response = access_token.get('/account/rate_limit_status.json')
+		case response
+		when Net::HTTPSuccess
+			status=JSON.parse(response.body)
+			raise TwitterOauth::UnexpectedResponse unless status.is_a? Hash
+			status
+		else
+			raise TwitterOauth::APIError
 		end
+	rescue =&gt; err
+		puts &quot;Exception in rate_limit_status: #{err}&quot;
+		raise err
 	end	
 	
 	# Twitter REST API Method: statuses friends (page-based implementation)
@@ -224,155 +216,138 @@ class TwitterOauth
 	# Twitter REST API Method: friendships exists
 	# Will return true if user_a follows user_b, otherwise will return false.
 	def friendship_exists?(user_a, user_b)
-		begin
-			return true if user_a == user_b
-			response = access_token.get(&quot;/friendships/exists.json?user_a=#{user_a}&amp;user_b=#{user_b}&quot;)
-			case response
-			when Net::HTTPSuccess
-				response.body == 'true'
-			else
-				raise TwitterOauth::APIError
-			end
-		rescue =&gt; err
-			puts &quot;Exception in friendship_exists?: #{err}&quot;
-			raise err
+		return true if user_a == user_b
+		response = access_token.get(&quot;/friendships/exists.json?user_a=#{user_a}&amp;user_b=#{user_b}&quot;)
+		case response
+		when Net::HTTPSuccess
+			response.body == 'true'
+		else
+			raise TwitterOauth::APIError
 		end
+	rescue =&gt; err
+		puts &quot;Exception in friendship_exists?: #{err}&quot;
+		raise err
 	end
 
 	# Twitter REST API Method: friendships show
 	def friendship_show?(user_a, user_b)
-		begin
-			return true if user_a == user_b
-			response = access_token.get(&quot;/friendships/show.json?user_a=#{user_a}&amp;user_b=#{user_b}&quot;)
-			case response
-			when Net::HTTPSuccess
-				friendship=JSON.parse(response.body)
-			else
-				raise TwitterOauth::APIError
-			end
-		rescue =&gt; err
-			puts &quot;Exception in friendship_show?: #{err}&quot;
-			raise err
+		return true if user_a == user_b
+		response = access_token.get(&quot;/friendships/show.json?user_a=#{user_a}&amp;user_b=#{user_b}&quot;)
+		case response
+		when Net::HTTPSuccess
+			friendship=JSON.parse(response.body)
+		else
+			raise TwitterOauth::APIError
 		end
+	rescue =&gt; err
+		puts &quot;Exception in friendship_show?: #{err}&quot;
+		raise err
 	end
 	
 	# Twitter REST API Method: friendships create
 	def follow!(new_friend)
-		begin
-			#return if current_user.screen_name == new_friend
-			response = access_token.post(&quot;/friendships/create/#{new_friend}.json&quot;)
-			case response
-			when Net::HTTPSuccess
-				friend=JSON.parse(response.body)
-				raise TwitterOauth::UnexpectedResponse unless friend.is_a? Hash
-				friend
-			else
-				raise TwitterOauth::APIError
-			end
-		rescue =&gt; err
-			puts &quot;Exception in follow!: #{err}&quot;
-			raise err
+		response = access_token.post(&quot;/friendships/create/#{new_friend}.json&quot;)
+		case response
+		when Net::HTTPSuccess
+			friend=JSON.parse(response.body)
+			raise TwitterOauth::UnexpectedResponse unless friend.is_a? Hash
+			friend
+		else
+			raise TwitterOauth::APIError
 		end
+	rescue =&gt; err
+		puts &quot;Exception in follow!: #{err}&quot;
+		raise err
 	end
 	
 	# Twitter REST API Method: friendships destroy
 	def unfollow!(unfriend)
-		begin
-			response = access_token.post(&quot;/friendships/destroy/#{unfriend}.json&quot;)
-			case response
-			when Net::HTTPSuccess
-				friend=JSON.parse(response.body)
-				raise TwitterOauth::UnexpectedResponse unless friend.is_a? Hash
-				friend
-			else
-				raise TwitterOauth::APIError
-			end
-		rescue =&gt; err
-			puts &quot;Exception in unfollow!: #{err}&quot;
-			raise err
+		response = access_token.post(&quot;/friendships/destroy/#{unfriend}.json&quot;)
+		case response
+		when Net::HTTPSuccess
+			friend=JSON.parse(response.body)
+			raise TwitterOauth::UnexpectedResponse unless friend.is_a? Hash
+			friend
+		else
+			raise TwitterOauth::APIError
 		end
+	rescue =&gt; err
+		puts &quot;Exception in unfollow!: #{err}&quot;
+		raise err
 	end
 
 	# Twitter REST API Method: direct_messages
 	def direct_messages( since_id = nil, max_id = nil , count = nil, page = nil )
-		begin
-			params = (
-				{ :since_id =&gt; since_id, :max_id =&gt; max_id, :count =&gt; count, :page =&gt; page }.collect { |n| &quot;#{n[0]}=#{n[1]}&quot; if n[1] }
-			).compact.join('&amp;')
-			response = access_token.get('/direct_messages.json' + ( params.empty? ? '' : '?' + params ) )
-			case response
-			when Net::HTTPSuccess
-				messages=JSON.parse(response.body)
-				raise TwitterOauth::UnexpectedResponse unless messages.is_a? Array
-				messages
-			else
-				raise TwitterOauth::APIError
-			end
-		rescue =&gt; err
-			puts &quot;Exception in direct_messages: #{err}&quot;
-			raise err
+		params = (
+			{ :since_id =&gt; since_id, :max_id =&gt; max_id, :count =&gt; count, :page =&gt; page }.collect { |n| &quot;#{n[0]}=#{n[1]}&quot; if n[1] }
+		).compact.join('&amp;')
+		response = access_token.get('/direct_messages.json' + ( params.empty? ? '' : '?' + params ) )
+		case response
+		when Net::HTTPSuccess
+			messages=JSON.parse(response.body)
+			raise TwitterOauth::UnexpectedResponse unless messages.is_a? Array
+			messages
+		else
+			raise TwitterOauth::APIError
 		end
+	rescue =&gt; err
+		puts &quot;Exception in direct_messages: #{err}&quot;
+		raise err
 	end
 
 	# Twitter REST API Method: direct_messages new
 	def send_direct_message!( screen_name, text )
-		begin
-			response = access_token.post('/direct_messages/new.json', { :screen_name =&gt; screen_name, :text =&gt; text })
-			case response
-			when Net::HTTPSuccess
-				message=JSON.parse(response.body)
-				raise TwitterOauth::UnexpectedResponse unless message.is_a? Hash
-				message
-			else
-				raise TwitterOauth::APIError
-			end
-		rescue =&gt; err
-			puts &quot;Exception in send_direct_message!: #{err}&quot;
-			raise err
+		response = access_token.post('/direct_messages/new.json', { :screen_name =&gt; screen_name, :text =&gt; text })
+		case response
+		when Net::HTTPSuccess
+			message=JSON.parse(response.body)
+			raise TwitterOauth::UnexpectedResponse unless message.is_a? Hash
+			message
+		else
+			raise TwitterOauth::APIError
 		end
+	rescue =&gt; err
+		puts &quot;Exception in send_direct_message!: #{err}&quot;
+		raise err
 	end
 
 	# Twitter REST API Method: statuses update
 	def update_status!(  status , in_reply_to_status_id = nil )
-		begin
-			if in_reply_to_status_id
-				response = access_token.post('/statuses/update.json', { :status =&gt; status, :in_reply_to_status_id =&gt; in_reply_to_status_id })
-			else
-				response = access_token.post('/statuses/update.json', { :status =&gt; status })
-			end
-			case response
-			when Net::HTTPSuccess
-				message=JSON.parse(response.body)
-				raise TwitterOauth::UnexpectedResponse unless message.is_a? Hash
-				message
-			else
-				raise TwitterOauth::APIError
-			end
-		rescue =&gt; err
-			puts &quot;Exception in update_status!: #{err}&quot;
-			raise err
+		if in_reply_to_status_id
+			response = access_token.post('/statuses/update.json', { :status =&gt; status, :in_reply_to_status_id =&gt; in_reply_to_status_id })
+		else
+			response = access_token.post('/statuses/update.json', { :status =&gt; status })
+		end
+		case response
+		when Net::HTTPSuccess
+			message=JSON.parse(response.body)
+			raise TwitterOauth::UnexpectedResponse unless message.is_a? Hash
+			message
+		else
+			raise TwitterOauth::APIError
 		end
+	rescue =&gt; err
+		puts &quot;Exception in update_status!: #{err}&quot;
+		raise err
 	end
 
 	# Twitter REST API Method: statuses mentions
 	def mentions( since_id = nil, max_id = nil , count = nil, page = nil )
-		begin
-			params = (
-				{ :since_id =&gt; since_id, :max_id =&gt; max_id, :count =&gt; count, :page =&gt; page }.collect { |n| &quot;#{n[0]}=#{n[1]}&quot; if n[1] }
-			).compact.join('&amp;')
-			response = access_token.get('/statuses/mentions.json' + ( params.empty? ? '' : '?' + params ) )
-			case response
-			when Net::HTTPSuccess
-				messages=JSON.parse(response.body)
-				raise TwitterOauth::UnexpectedResponse unless messages.is_a? Array
-				messages
-			else
-				raise TwitterOauth::APIError
-			end
-		rescue =&gt; err
-			puts &quot;Exception in mentions: #{err}&quot;
-			raise err
+		params = (
+			{ :since_id =&gt; since_id, :max_id =&gt; max_id, :count =&gt; count, :page =&gt; page }.collect { |n| &quot;#{n[0]}=#{n[1]}&quot; if n[1] }
+		).compact.join('&amp;')
+		response = access_token.get('/statuses/mentions.json' + ( params.empty? ? '' : '?' + params ) )
+		case response
+		when Net::HTTPSuccess
+			messages=JSON.parse(response.body)
+			raise TwitterOauth::UnexpectedResponse unless messages.is_a? Array
+			messages
+		else
+			raise TwitterOauth::APIError
 		end
+	rescue =&gt; err
+		puts &quot;Exception in mentions: #{err}&quot;
+		raise err
 	end
 	
 </diff>
      <filename>lib/twitter_oauth.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>40419d2778c24f15d14ce54a1948c4e2ee2fb8cb</id>
    </parent>
  </parents>
  <author>
    <name>tardate</name>
    <email>gallagher.paul@gmail.com</email>
  </author>
  <url>http://github.com/tardate/rails-twitter-oauth-sample/commit/6aa051005a10b935c436f6363947f7018823ca8a</url>
  <id>6aa051005a10b935c436f6363947f7018823ca8a</id>
  <committed-date>2009-10-30T20:58:41-07:00</committed-date>
  <authored-date>2009-10-30T20:58:41-07:00</authored-date>
  <message>remove some cruft: redundant begin/end, disabled debug statements</message>
  <tree>8e013edef2dc3eddf2275ee2839fbf38d64b9e8a</tree>
  <committer>
    <name>tardate</name>
    <email>gallagher.paul@gmail.com</email>
  </committer>
</commit>
