style changes

riffraff · Apr 13, 2010 · 69e1135 · 69e1135
1 parent a75daa1
commit 69e1135
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/lib/cascaad.rb b/lib/cascaad.rb
@@ -3,8 +3,8 @@
 
 class Array
     def valid_ids_required
-		raise Cascaad::BadRequest if(self.empty?)
+		raise Cascaad::BadRequest if empty?
-		self.each do |id|
+		each do |id|
 			raise Cascaad::BadRequest unless id =~ /[0-9]+/
 		end
     end
@@ -34,13 +34,11 @@ def from(domain)
 			raise BadRequest if @command.empty?
 			raise UnsupportedDomain unless domain == 'twitter.com'
 
-			begin
+			open(api_url_for(domain)) do |response|
-				open(api_url_for(domain)) do |response|
+				JSON.parse(response.read)
-					JSON.parse(response.read)
-				end
-			rescue OpenURI::HTTPError
-				raise Cascaad::BadApiKey
 			end
+			rescue OpenURI::HTTPError
+			raise Cascaad::BadApiKey
 		end
 
 	private