goshortener 1.2.1 → 1.2.2

data/lib/goshortener.rb

@@ -2,14 +2,13 @@ require "rubygems"
 require "rest_client"
 require "json"
 
+class InvalidUrlError < Exception; end
 
 class GoShortener
 
   #initialize with/without api key
   def initialize(api_key="")
-    unless api_key == ""
-      @api_key = api_key
-    end
+    @api_key = api_key unless api_key == ""
     @base_url = "https://www.googleapis.com/urlshortener/v1/url"
   end
 
@@ -18,19 +17,16 @@ class GoShortener
     if long_url.is_a?(String)
       request_json = {'longUrl' => long_url}.to_json
       request_url = @api_key ? (@base_url + "?key=#{@api_key}") : @base_url
-
       begin
         response = RestClient.post request_url, request_json, :accept => :json, :content_type => :json
-      rescue
-        raise "Please provide a valid url string"
+      rescue 
+        raise InvalidUrlError, "Please provide a valid URL"
       end
-
     else
-      raise "Please provide a valid url string"
+      raise "Please provide a url String"
     end
     response = JSON.parse response
-    short_url = response["id"]
-    return short_url
+    response["id"]
   end
 
   #Given a short URL, Returns the true long url using http://goo.gl service
@@ -38,19 +34,16 @@ class GoShortener
     if short_url.is_a?(String)
       request_params = {:shortUrl => short_url}
       request_params.merge!(:key => @api_key) if @api_key
-
       begin
         response = RestClient.get @base_url, :params => request_params
       rescue
-        raise "Please provide a valid goo.gl short url to lengthen"
+        raise InvalidUrlError, "Please provide a valid URL"
       end
-
     else
-      raise "Please provide a valid goo.gl short url to lengthen"
+      raise "Please provide a valid http://goo.gl url String"
     end
     response = JSON.parse response
-    long_url = response["longUrl"]
-    return long_url
+    response["longUrl"]
   end
 
 end 

metadata

@@ -2,7 +2,7 @@
 name: goshortener
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors: 
 - lakshmanan