googleurlshortener 0.0.1 → 0.0.2

data/googleurlshortener.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = Googleurlshortener::VERSION
   s.authors     = ["Martin Kraft"]
   s.email       = ["martinkraft@gmail.com"]
-  s.homepage    = ""
+  s.homepage    = "https://github.com/mkraft/GoogleUrlShortener"
   s.summary     = %q{Shorten and expand URL's with Google's shortener API.}
   s.description = %q{Shorten a long URL, get click analylitcs about it, and re-expand it again using Google's URL shortening API.}
 

data/lib/googleurlshortener.rb

@@ -9,6 +9,7 @@ module Googleurlshortener
 
     def shorten(long_url)
       uri = URI("https://www.googleapis.com/urlshortener/v1/url")
+      body = ""
       Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
         request = Net::HTTP::Post.new uri.request_uri
         if defined? @auth_token && @auth_token != "" && @auth_token != nil
@@ -16,19 +17,29 @@ module Googleurlshortener
         end
         request["Content-Type"] = "application/json"
         response = http.request(request, "{\"longUrl\": \"#{long_url}\"}")
-        @body = response.body
+        body = response.body
       end
-      return JSON.parse(@body)["id"]
+      return JSON.parse(body)["id"]
     end
 
     def expand(short_url)
-      uri = URI("https://www.googleapis.com/urlshortener/v1/url?shortUrl=#{short_url}")
-      request = Net::HTTP::Get.new(uri.request_uri)
-      response = Net::HTTP.start(uri.hostname, uri.port, :use_ssl => uri.scheme == 'https') {|http|
-        http.request(request)
-      }
-      return JSON.parse(response.body)["longUrl"]
+      json = get_json_response("https://www.googleapis.com/urlshortener/v1/url?shortUrl=#{short_url}")
+      return json["longUrl"]
     end
+    
+    private
+    
+      def get_json_response(url)
+        uri = URI(url)
+        request = Net::HTTP::Get.new(uri.request_uri)
+        if self.class.name == "Googleurlshortener::Authenticated"
+          request['Authorization'] = @auth_token
+        end
+        response = Net::HTTP.start(uri.hostname, uri.port, :use_ssl => uri.scheme == 'https') {|http|
+          http.request(request)
+        }
+        return JSON.parse(response.body)
+      end
   
   end
   
@@ -39,27 +50,22 @@ module Googleurlshortener
     end
 
     def analytics(short_url)
-      uri = URI("https://www.googleapis.com/urlshortener/v1/url?shortUrl=#{short_url}&projection=FULL")
-      request = Net::HTTP::Get.new(uri.request_uri)
-      request['Authorization'] = @auth_token
-      response = Net::HTTP.start(uri.hostname, uri.port, :use_ssl => uri.scheme == 'https') {|http|
-        http.request(request)
-      }
-      return JSON.parse(response.body)
+      return get_json_response("https://www.googleapis.com/urlshortener/v1/url?shortUrl=#{short_url}&projection=FULL")
     end
     
     private
 
       def get_authentication_token(email, password)
         uri = URI("https://www.google.com/accounts/ClientLogin")
+        body = ""
         Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
           request = Net::HTTP::Post.new uri.request_uri
           data = "accountType=HOSTED_OR_GOOGLE&Email=#{email}&Passwd=#{password}&service=lh2&source=someapp1"
           response = http.request(request, data)
-          @body = response.body
+          body = response.body
         end
-        start_index = @body.index('Auth=')
-        slice_of_auth_to_end = @body[start_index..-1]
+        start_index = body.index('Auth=')
+        slice_of_auth_to_end = body[start_index..-1]
         end_index = slice_of_auth_to_end.index("\n")
         auth_string = slice_of_auth_to_end[0...end_index]
         auth_token = "GoogleLogin #{auth_string}"

data/lib/googleurlshortener/version.rb

@@ -1,3 +1,3 @@
 module Googleurlshortener
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: googleurlshortener
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -27,7 +27,7 @@ files:
 - lib/googleurlshortener.rb
 - lib/googleurlshortener/version.rb
 - test/test_url_shortener.rb
-homepage: ''
+homepage: https://github.com/mkraft/GoogleUrlShortener
 licenses: []
 post_install_message: 
 rdoc_options: []