googl 0.4.3 → 0.5.0

data/README.rdoc

@@ -1,7 +1,11 @@
-= googl
+= googl 
 
 Google URL Shortener API in Ruby
 
+== Continuous Integration
+
+http://travis-ci.org/zigotto/googl.png Travis[http://travis-ci.org/zigotto/googl]
+
 == Basic Usage
 
 === Shorten a long URL
@@ -45,7 +49,60 @@ Go to http://goo.gl to see URL statistics.
 
 === OAuth
 
-  TODO
+Google supports three flows of OAuth 2.0
+
+* The <b>client-side</b> flow for JavaScript applications running in a browser. (TODO)
+* The <b>server-side</b> flow for web applications with servers that can securely store persistent information.
+* The <b>native application</b> flow for desktop and mobile applications.
+
+Today, gem googl support only <b>server-side</b> and <b>native application</b>.
+
+==== Server-side web applications
+
+You'll need to register your application with Google to get a <em>client_id</em> and record the <em>redirect_uri</em> you'd like to use. 
+See the Registering[http://code.google.com/apis/accounts/docs/OAuth2.html#Registering] your app with Google section for details on how to register.
+
+  client = Googl::OAuth2.server("client_id", "client_secret", "redirect_uri")
+
+Redirect your users to
+
+  client.authorize_url
+
+After the user approves access or chooses not to, we'll redirect to the <em>redirect_uri</em> you passed us and append either an authorization code.
+
+  client.request_access_token(params["code"])
+  client.authorized?
+  => true
+
+Now you can get a user's history, shorten url, etc...
+
+  history = client.history
+  history.total_items
+  => 19
+
+  url = Googl.shorten('https://github.com/zigotto/googl')
+  url.short_url
+  => http://goo.gl/DWDfi
+
+==== Native applications
+
+You'll need to register your application with Google to get a <em>client_id</em> and record the special <em>redirect_uri: urn:ietf:wg:oauth:2.0:oob</em>. 
+See the Registering[http://code.google.com/apis/accounts/docs/OAuth2.html#Registering] your app with Google section for details on how to register.
+
+When you use this redirect_uri, instead of redirecting the user's browser to a page on your site with an authorization code, Google will display the authorization code or error response in the title of the page and a text field with instructions for the user to copy and paste it in to your application. Your application can either monitor the window title of a web-view or browser window it launches and close it once the authorization code appears or prompt the user to copy and paste the code.
+
+  client = Googl::OAuth2.native("client_id", "client_secret")
+
+Open a browser or a webview to the OAuth dialog at
+
+  client.authorize_url
+
+In the native app flow, after the user approves access, we'll display the authorization code in the title of the page and in a text input with instructions for the user to copy and paste the code to your application
+
+  code = "copied code"
+  client.request_access_token(code)
+  client.authorized?
+  => true
 
 == Analytics
 

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.5.0

data/googl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{googl}
-  s.version = "0.4.3"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jesus Lopes"]
-  s.date = %q{2011-03-16}
+  s.date = %q{2011-05-01}
   s.description = %q{Small library for Google URL Shortener API}
   s.email = %q{jlopes@zigotto.com.br}
   s.extra_rdoc_files = [
@@ -27,11 +27,13 @@ Gem::Specification.new do |s|
     "lib/googl/base.rb",
     "lib/googl/client_login.rb",
     "lib/googl/expand.rb",
+    "lib/googl/oauth2/native.rb",
+    "lib/googl/oauth2/server.rb",
+    "lib/googl/oauth2/utils.rb",
     "lib/googl/request.rb",
     "lib/googl/ruby_extensions.rb",
     "lib/googl/shorten.rb",
-    "spec/client_spec.rb",
-    "spec/expand_spec.rb",
+    "lib/googl/utils.rb",
     "spec/fixtures/client_login_invalid.json",
     "spec/fixtures/client_login_valid.json",
     "spec/fixtures/expand.json",
@@ -42,25 +44,37 @@ Gem::Specification.new do |s|
     "spec/fixtures/expand_removed.json",
     "spec/fixtures/history.json",
     "spec/fixtures/history_projection_clicks.json",
+    "spec/fixtures/oauth2/native.json",
+    "spec/fixtures/oauth2/native_invalid.json",
+    "spec/fixtures/oauth2/native_token_expires.json",
+    "spec/fixtures/oauth2/server.json",
+    "spec/fixtures/oauth2/server_invalid.json",
+    "spec/fixtures/oauth2/server_token_expires.json",
     "spec/fixtures/shorten.json",
     "spec/fixtures/shorten_authenticated.json",
     "spec/fixtures/shorten_invalid_content_type.json",
-    "spec/request_spec.rb",
+    "spec/googl/client_spec.rb",
+    "spec/googl/expand_spec.rb",
+    "spec/googl/oauth2/native_spec.rb",
+    "spec/googl/oauth2/server_spec.rb",
+    "spec/googl/request_spec.rb",
+    "spec/googl/shorten_spec.rb",
     "spec/shared_examples.rb",
-    "spec/shorten_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/zigotto/googl}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.3}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{Wrapper for Google URL Shortener API}
   s.test_files = [
-    "spec/client_spec.rb",
-    "spec/expand_spec.rb",
-    "spec/request_spec.rb",
+    "spec/googl/client_spec.rb",
+    "spec/googl/expand_spec.rb",
+    "spec/googl/oauth2/native_spec.rb",
+    "spec/googl/oauth2/server_spec.rb",
+    "spec/googl/request_spec.rb",
+    "spec/googl/shorten_spec.rb",
     "spec/shared_examples.rb",
-    "spec/shorten_spec.rb",
     "spec/spec_helper.rb"
   ]
 

data/lib/googl.rb

@@ -2,6 +2,7 @@ require 'httparty'
 require 'ostruct'
 require 'json'
 
+require 'googl/utils'
 require 'googl/base'
 require 'googl/request'
 require 'googl/shorten'
@@ -9,7 +10,12 @@ require 'googl/expand'
 require 'googl/client_login'
 require 'googl/ruby_extensions'
 
+require 'googl/oauth2/utils'
+require 'googl/oauth2/native'
+require 'googl/oauth2/server'
+
 module Googl
+  extend self
 
   # Creates a new short URL
   #
@@ -17,7 +23,7 @@ module Googl
   #   url.short_url
   #   => "http://goo.gl/ump4S"
   #
-  def self.shorten(url=nil)
+  def shorten(url=nil)
     raise ArgumentError.new("URL to shorten is required") if url.blank?
     Googl::Shorten.new(url)
   end
@@ -79,7 +85,7 @@ module Googl
   #
   # For mor details, see http://code.google.com/intl/pt-BR/apis/urlshortener/v1/reference.html#resource_url
   #
-  def self.expand(url=nil, options={})
+  def expand(url=nil, options={})
     raise ArgumentError.new("URL to expand is required") if url.blank?
     options = {:shortUrl => url, :projection => nil}.merge!(options)
     Googl::Expand.new(options)
@@ -95,8 +101,43 @@ module Googl
   #
   # Go to http://goo.gl to see URL statistics.
   #
-  def self.client(email, passwd)
+  def client(email, passwd)
     Googl::ClientLogin.new(email, passwd)
   end
 
+  # OAuth 2.0
+  #
+  # Google supports three flows of OAuth 2.0
+  #
+  # * client-side
+  # * server-side
+  # * native application
+  #
+  # Now, gem googl support only client-side and native application.
+  #
+  module OAuth2
+    extend self
+
+    # OAuth 2.0 for server-side web applications
+    #
+    # The server-side flow for web applications with servers that can securely store persistent information
+    #
+    #   client = Googl::OAuth2.server("client_id", "client_secret", "redirect_uri")
+    #
+    def server(client_id, client_secret, redirect_uri)
+      Googl::OAuth2::Server.new(client_id, client_secret, redirect_uri)
+    end
+
+    # OAuth 2.0 for native applications
+    #
+    # The native application flow for desktop and mobile applications
+    #
+    #   client = Googl::OAuth2.native("client_id", "client_secret")
+    #
+    def native(client_id, client_secret)
+      Googl::OAuth2::Native.new(client_id, client_secret)
+    end
+
+  end
+
 end

data/lib/googl/base.rb

@@ -26,12 +26,6 @@ module Googl
       "#{short_url}.info"
     end
 
-    private
-
-    def modify_headers(item)
-      Googl::Request.headers.merge!(item)
-    end
-
   end
 
 end

data/lib/googl/client_login.rb

@@ -1,9 +1,8 @@
 module Googl
 
-  class ClientLogin < Base
+  class ClientLogin
 
-    API_URL         = "https://www.google.com/accounts/ClientLogin"
-    API_HISTORY_URL = "https://www.googleapis.com/urlshortener/v1/url/history"
+    include Googl::Utils
 
     attr_accessor :code, :items
 
@@ -11,13 +10,13 @@ module Googl
     #
     def initialize(email, passwd)
       modify_headers('Content-Type' => 'application/x-www-form-urlencoded')
-      resp = Googl::Request.post(API_URL, :body => params.merge!('Email' => email, 'Passwd' => passwd))
-      @code = resp.code
+      resp = post(API_CLIENT_LOGIN_URL, :body => params.merge!('Email' => email, 'Passwd' => passwd))
+      self.code = resp.code
       if resp.code == 200
         token = resp.split('=').last.gsub(/\n/, '')
         modify_headers("Authorization" => "GoogleLogin auth=#{token}")
       else
-        raise Exception.new("#{resp.code} #{resp.parsed_response}")
+        raise exception("#{resp.code} #{resp.parsed_response}")
       end
     end
 
@@ -26,7 +25,7 @@ module Googl
     # See Googl.client
     #
     def shorten(url)
-      Googl::Shorten.new(url)
+      Googl.shorten(url)
     end
 
     # Gets a user's history of shortened URLs. (Authenticated)
@@ -46,11 +45,12 @@ module Googl
     #   history = client.history(:projection => :analytics_clicks)
     #
     def history(options={})
-      resp = options.blank? ? Googl::Request.get(API_HISTORY_URL) : Googl::Request.get(API_HISTORY_URL, :query => options)
-      if resp.code == 200
-        @items = resp.parsed_response.to_openstruct
+      resp = options.blank? ? get(Googl::Utils::API_HISTORY_URL) : get(Googl::Utils::API_HISTORY_URL, :query => options)
+      case resp.code
+      when 200
+        self.items = resp.parsed_response.to_openstruct
       else
-        raise Exception.new("#{resp.code} #{resp.parsed_response}")
+        raise exception("#{resp.code} #{resp.parsed_response}")
       end
     end
 

data/lib/googl/expand.rb

@@ -2,9 +2,9 @@ module Googl
 
   class Expand < Base
 
-    API_URL = "https://www.googleapis.com/urlshortener/v1/url"
+    include Googl::Utils
 
-    attr_accessor :long_url, :analytics, :status, :short_url
+    attr_accessor :long_url, :analytics, :status, :short_url, :created
 
     # Expands a short URL or gets creation time and analytics. See Googl.expand
     #
@@ -12,14 +12,15 @@ module Googl
 
       options.delete_if {|key, value| value.nil?}
 
-      resp = Googl::Request.get(API_URL, :query => options)
+      resp = get(API_URL, :query => options)
       if resp.code == 200
-        @long_url   = resp['longUrl']
-        @analytics  = resp['analytics'].to_openstruct if resp.has_key?('analytics')
-        @status     = resp['status']
-        @short_url  = resp['id']
+        self.created    = resp['created'] if resp.has_key?('created')
+        self.long_url   = resp['longUrl']
+        self.analytics  = resp['analytics'].to_openstruct if resp.has_key?('analytics')
+        self.status     = resp['status']
+        self.short_url  = resp['id']
       else
-        raise Exception.new("#{resp.code} #{resp.message}")
+        raise exception("#{resp.code} #{resp.message}")
       end
     end
 

data/lib/googl/oauth2/native.rb

@@ -0,0 +1,25 @@
+module Googl
+  module OAuth2
+
+    class Native
+
+      include Googl::Utils
+      include Googl::OAuth2::Utils
+
+      def initialize(client_id, client_secret)
+        self.client_id     = client_id
+        self.client_secret = client_secret
+      end
+
+      def authorize_url
+        make_authorize_url("urn:ietf:wg:oauth:2.0:oob")
+      end
+
+      def request_access_token(code)
+        request_token(code)
+      end
+
+    end
+
+  end
+end

data/lib/googl/oauth2/server.rb

@@ -0,0 +1,28 @@
+module Googl
+  module OAuth2
+
+    class Server
+
+      include Googl::Utils
+      include Googl::OAuth2::Utils
+
+      attr_accessor :redirect_uri
+
+      def initialize(client_id, client_secret, redirect_uri)
+        self.client_id     = client_id
+        self.client_secret = client_secret
+        self.redirect_uri  = redirect_uri
+      end
+
+      def authorize_url
+        make_authorize_url(redirect_uri)
+      end
+
+      def request_access_token(code)
+        request_token(code, redirect_uri)
+      end
+
+    end
+
+  end
+end

data/lib/googl/oauth2/utils.rb

@@ -0,0 +1,58 @@
+module Googl
+  module OAuth2
+
+    module Utils
+
+      attr_accessor :client_id, :client_secret, :access_token, :refresh_token, :expires_in, :expires_at
+      attr_accessor :items
+
+      def expires?
+        expires_at < Time.now
+      end
+
+      def authorized?
+        !access_token.nil? && !refresh_token.nil? && !expires_in.nil? && !expires_at.nil?
+      end
+
+      # Gets a user's history of shortened URLs.
+      #
+      def history(options={})
+        return unless authorized?
+        resp = options.blank? ? get(Googl::Utils::API_HISTORY_URL) : get(Googl::Utils::API_HISTORY_URL, :query => options)
+        case resp.code
+        when 200
+          self.items = resp.parsed_response.to_openstruct
+        else
+          raise exception("#{resp.code} #{resp.parsed_response}")
+        end
+      end
+
+      private
+
+      def request_token(code, request_uri="urn:ietf:wg:oauth:2.0:oob")
+        params = "code=#{code}&client_id=#{client_id}&client_secret=#{client_secret}&redirect_uri=#{request_uri}&grant_type=authorization_code"
+        modify_headers('Content-Type' => 'application/x-www-form-urlencoded')
+        resp = post("https://accounts.google.com/o/oauth2/token", :body => params)
+        case resp.code
+        when 200
+          modify_headers("Authorization" => "OAuth #{resp["access_token"]}")
+          self.access_token  = resp["access_token"]
+          self.refresh_token = resp["refresh_token"]
+          self.expires_in    = resp["expires_in"]
+          self.expires_at    = Time.now + expires_in if expires_in
+          self
+        when 401
+          raise exception("#{resp.code} #{resp.parsed_response["error"]["message"]}")
+        else
+          raise exception("#{resp.code} #{resp.parsed_response["error"]}")
+        end
+      end
+
+      def make_authorize_url(redirect_uri)
+        "https://accounts.google.com/o/oauth2/auth?client_id=#{client_id}&redirect_uri=#{redirect_uri}&scope=#{Googl::Utils::SCOPE_URL}&response_type=code"
+      end
+
+    end
+
+  end
+end

data/lib/googl/shorten.rb

@@ -2,7 +2,7 @@ module Googl
 
   class Shorten < Base
 
-    API_URL = 'https://www.googleapis.com/urlshortener/v1/url'
+    include Googl::Utils
 
     attr_accessor :short_url, :long_url
 
@@ -11,12 +11,12 @@ module Googl
     def initialize(long_url)
       modify_headers('Content-Type' => 'application/json')
       options = {"longUrl" => long_url}.to_json
-      resp = Googl::Request.post(API_URL, :body => options)
+      resp = post(API_URL, :body => options)
       if resp.code == 200
-        @short_url  = resp['id']
-        @long_url   = resp['longUrl']
+        self.short_url  = resp['id']
+        self.long_url   = resp['longUrl']
       else
-        raise Exception.new(resp.parsed_response)
+        raise exception(resp.parsed_response)
       end
     end
 

data/lib/googl/utils.rb

@@ -0,0 +1,30 @@
+module Googl
+
+  module Utils # :nodoc:
+
+    API_URL              = 'https://www.googleapis.com/urlshortener/v1/url'
+    API_HISTORY_URL      = "https://www.googleapis.com/urlshortener/v1/url/history"
+    API_CLIENT_LOGIN_URL = "https://www.google.com/accounts/ClientLogin"
+    SCOPE_URL            = "https://www.googleapis.com/auth/urlshortener"
+
+    private
+
+    def modify_headers(item)
+      Googl::Request.headers.merge!(item)
+    end
+
+    def post(url, params={})
+      Googl::Request.post(url, params)
+    end
+
+    def get(url, params={})
+      Googl::Request.get(url, params)
+    end
+
+    def exception(msg)
+      Exception.new(msg)
+    end
+
+  end
+
+end

data/spec/fixtures/oauth2/native.json

@@ -0,0 +1,12 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+Date: Thu, 17 Mar 2011 02:45:33 GMT
+Expires: Thu, 17 Mar 2011 02:45:33 GMT
+Cache-Control: private, max-age=0
+X-Content-Type-Options: nosniff
+X-Frame-Options: SAMEORIGIN
+X-XSS-Protection: 1; mode=block
+Server: GSE
+Transfer-Encoding: chunked
+
+{"access_token":"1/YCzoGAYT8XUuOifjNh_KqA","expires_in":3600,"refresh_token":"1/x_31GvgzdgHDMkRep5i8YxFlq76w3yjFu9Dp72Op-pI"}

data/spec/fixtures/oauth2/native_invalid.json

@@ -0,0 +1,12 @@
+HTTP/1.1 400 Bad Request
+Content-Type: application/json
+Date: Thu, 17 Mar 2011 03:05:33 GMT
+Expires: Thu, 17 Mar 2011 03:05:33 GMT
+Cache-Control: private, max-age=0
+X-Content-Type-Options: nosniff
+X-Frame-Options: SAMEORIGIN
+X-XSS-Protection: 1; mode=block
+Server: GSE
+Transfer-Encoding: chunked
+
+{"error":"invalid_token"}

data/spec/fixtures/oauth2/native_token_expires.json

@@ -0,0 +1,27 @@
+HTTP/1.1 401 Unauthorized
+WWW-Authenticate: AuthSub realm="https://gaiastaging.corp.google.com/accounts/AuthSubRequest" allowed-scopes="https://www.googleapis.com/auth/urlshortener"
+Content-Type: application/json; charset=UTF-8
+Date: Fri, 18 Mar 2011 23:32:07 GMT
+Expires: Fri, 18 Mar 2011 23:32:07 GMT
+Cache-Control: private, max-age=0
+X-Content-Type-Options: nosniff
+X-Frame-Options: SAMEORIGIN
+X-XSS-Protection: 1; mode=block
+Server: GSE
+Transfer-Encoding: chunked
+
+{
+ "error": {
+  "errors": [
+   {
+    "domain": "global",
+    "reason": "invalid",
+    "message": "Invalid Credentials",
+    "locationType": "header",
+    "location": "Authorization"
+   }
+  ],
+  "code": 401,
+  "message": "Invalid Credentials"
+ }
+}

data/spec/fixtures/oauth2/server.json

@@ -0,0 +1,12 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+Date: Fri, 18 Mar 2011 02:11:50 GMT
+Expires: Fri, 18 Mar 2011 02:11:50 GMT
+Cache-Control: private, max-age=0
+X-Content-Type-Options: nosniff
+X-Frame-Options: SAMEORIGIN
+X-XSS-Protection: 1; mode=block
+Server: GSE
+Transfer-Encoding: chunked
+
+{"access_token":"1/9eNgoHDXi-1u1fDzZ2wLLGATiaQZnWPB51nTvo8n9Sw","expires_in":3600,"refresh_token":"1/gvmLC5XlU0qRPIBR3mt7OBBfEoTKB6i2T-Gu4dBDupw"}

data/spec/fixtures/oauth2/server_invalid.json

@@ -0,0 +1,12 @@
+HTTP/1.1 400 Bad Request
+Content-Type: application/json
+Date: Fri, 18 Mar 2011 14:12:06 GMT
+Expires: Fri, 18 Mar 2011 14:12:06 GMT
+Cache-Control: private, max-age=0
+X-Content-Type-Options: nosniff
+X-Frame-Options: SAMEORIGIN
+X-XSS-Protection: 1; mode=block
+Server: GSE
+Transfer-Encoding: chunked
+
+{"error":"invalid_token"}

data/spec/fixtures/oauth2/server_token_expires.json

@@ -0,0 +1,27 @@
+HTTP/1.1 401 Unauthorized
+WWW-Authenticate: AuthSub realm="https://gaiastaging.corp.google.com/accounts/AuthSubRequest" allowed-scopes="https://www.googleapis.com/auth/urlshortener"
+Content-Type: application/json; charset=UTF-8
+Date: Sat, 19 Mar 2011 00:00:35 GMT
+Expires: Sat, 19 Mar 2011 00:00:35 GMT
+Cache-Control: private, max-age=0
+X-Content-Type-Options: nosniff
+X-Frame-Options: SAMEORIGIN
+X-XSS-Protection: 1; mode=block
+Server: GSE
+Transfer-Encoding: chunked
+
+{
+ "error": {
+  "errors": [
+   {
+    "domain": "global",
+    "reason": "invalid",
+    "message": "Invalid Credentials",
+    "locationType": "header",
+    "location": "Authorization"
+   }
+  ],
+  "code": 401,
+  "message": "Invalid Credentials"
+ }
+}

data/spec/{expand_spec.rb → googl/expand_spec.rb}

@@ -60,6 +60,15 @@ describe Googl::Expand do
 
           subject { Googl.expand('http://goo.gl/DWDfi', :projection => :full) }
 
+          describe "#created" do
+            let(:element) { subject.created }
+
+            it "should be the time url was shortened" do
+              element.should == Time.iso8601("2011-01-13T03:48:10.309+00:00")
+            end
+
+          end
+
           describe "#all_time" do
             let(:element) { subject.analytics.all_time }
 
@@ -67,7 +76,7 @@ describe Googl::Expand do
             it_should_behave_like 'a period'
 
             it "should rename id to label" do
-              element.countries.first.label.should == "BR" 
+              element.countries.first.label.should == "BR"
             end
           end
 

data/spec/googl/oauth2/native_spec.rb

@@ -0,0 +1,152 @@
+require 'spec_helper'
+
+describe Googl::OAuth2::Native do
+
+  before :each do
+    fake_urls? true
+  end
+
+  subject do
+    Googl::OAuth2.native("185706845724.apps.googleusercontent.com", "DrBLCdCQ3gOybHrj7TPz/B0N")
+  end
+
+  describe "#initialize" do
+
+    it "should assign client_id" do
+      subject.client_id.should == "185706845724.apps.googleusercontent.com"
+    end
+
+    it "should assign client_secret" do
+      subject.client_secret.should == "DrBLCdCQ3gOybHrj7TPz/B0N"
+    end
+
+  end
+
+  describe "#authorize_url" do
+
+    it { subject.should respond_to(:authorize_url) }
+
+    it "should return url for authorize" do
+      subject.authorize_url.should == "https://accounts.google.com/o/oauth2/auth?client_id=185706845724.apps.googleusercontent.com&redirect_uri=urn:ietf:wg:oauth:2.0:oob&scope=https://www.googleapis.com/auth/urlshortener&response_type=code"
+    end
+
+    it "should include the client_id" do
+      subject.authorize_url.should be_include("client_id=185706845724.apps.googleusercontent.com")
+    end
+
+    it "should include the redirect_uri" do
+      subject.authorize_url.should be_include("redirect_uri=urn:ietf:wg:oauth:2.0:oob")
+    end
+
+    it "should include the scope" do
+      subject.authorize_url.should be_include("scope=https://www.googleapis.com/auth/urlshortener")
+    end
+
+    it "should include the response_type" do
+      subject.authorize_url.should be_include("response_type=code")
+    end
+
+  end
+
+  describe "#request_access_token" do
+
+    it { subject.should respond_to(:request_access_token) }
+
+    context "with valid code" do
+
+      let(:native) { subject.request_access_token("4/SuSud6RqPojUXsPpeh-wSVCwnmTQ") }
+
+      it "should return a access_token" do
+        native.access_token.should == "1/YCzoGAYT8XUuOifjNh_KqA"
+      end
+
+      it "should return a refresh_token" do
+        native.refresh_token.should == "1/x_31GvgzdgHDMkRep5i8YxFlq76w3yjFu9Dp72Op-pI"
+      end
+
+      it "should return a expires_in" do
+        native.expires_in.should == 3600
+      end
+
+    end
+
+    context "with invalid code" do
+      it "should raise error" do
+        lambda {  subject.request_access_token("my_invalid_code")  }.should raise_error(/400 invalid_token/)
+      end
+      it "should raise Invalid Credentials on 401 response" do
+        lambda {  subject.request_access_token("4/JvkEhCtr7tv1A60ENmubQT-cosRl")  }.should raise_error(/401 Invalid Credentials/)
+      end
+    end
+
+  end
+
+  describe "#expires_at" do
+
+    before do
+      @now = Time.now
+      Time.stub!(:now).and_return(@now)
+    end
+
+    let(:native) { subject.request_access_token("4/SuSud6RqPojUXsPpeh-wSVCwnmTQ") }
+
+    it "should be a time representation of #expires_in" do
+      native.expires_at.should == (@now + 3600)
+    end
+
+  end
+
+  describe "#expires?" do
+
+    before :each do
+      Time.stub!(:now).and_return(Time.parse("2011-04-23 15:30:00"))
+      subject.request_access_token("4/SuSud6RqPojUXsPpeh-wSVCwnmTQ")
+    end
+
+    it "should be true if access token expires" do
+      Time.stub!(:now).and_return(Time.parse("2011-04-23 18:30:00"))
+      subject.expires?.should be_true
+    end
+
+    it "should be false if access token not expires" do
+      subject.expires?.should be_false
+    end
+
+  end
+
+  describe "#authorized?" do
+    
+    it "should return false if client is not authorized" do
+      subject.authorized?.should be_false
+    end
+
+    let(:native) { subject.request_access_token("4/SuSud6RqPojUXsPpeh-wSVCwnmTQ") }
+
+    it "should return true if client is authorized" do
+      native.authorized?.should be_true
+    end
+
+  end
+
+  context "when gets a user history of shortened" do
+
+    it { subject.should respond_to(:history) }
+
+    it "should not return when client not authorized" do
+      subject.history.should be_nil
+    end
+
+    context "if authorized" do
+
+      let(:native) { subject.request_access_token("4/SuSud6RqPojUXsPpeh-wSVCwnmTQ") }
+      let(:history) { native.history }
+
+      it { history.should respond_to(:total_items) }
+      it { history.should respond_to(:items_per_page) }
+      it { history.should respond_to(:items) }
+
+    end
+
+  end
+
+end

data/spec/googl/oauth2/server_spec.rb

@@ -0,0 +1,156 @@
+require 'spec_helper'
+
+describe Googl::OAuth2::Server do
+
+  before :each do
+    fake_urls? true
+  end
+
+  subject do
+    Googl::OAuth2.server("438834493660.apps.googleusercontent.com", "8i4iJJkFTukWhNpxTU1b2Zhi", "http://gooogl.heroku.com/back")
+  end
+
+  describe "#initialize" do
+    
+    it "should assign client_id" do
+      subject.client_id.should == "438834493660.apps.googleusercontent.com"
+    end
+      
+    it "should assign client_secret" do
+      subject.client_secret.should == "8i4iJJkFTukWhNpxTU1b2Zhi"
+    end
+      
+    it "should assign redirect_uri" do
+      subject.redirect_uri.should == "http://gooogl.heroku.com/back"
+    end
+
+  end
+
+  describe "#authorize_url" do
+
+    it { subject.should respond_to(:authorize_url) }
+
+    it "should return url for authorize" do
+      subject.authorize_url.should == "https://accounts.google.com/o/oauth2/auth?client_id=438834493660.apps.googleusercontent.com&redirect_uri=http://gooogl.heroku.com/back&scope=https://www.googleapis.com/auth/urlshortener&response_type=code"
+    end
+
+    it "should include the client_id" do
+      subject.authorize_url.should be_include("client_id=438834493660.apps.googleusercontent.com")
+    end
+
+    it "should include the redirect_uri" do
+      subject.authorize_url.should be_include("redirect_uri=http://gooogl.heroku.com/back")
+    end
+
+    it "should include the scope" do
+      subject.authorize_url.should be_include("scope=https://www.googleapis.com/auth/urlshortener")
+    end
+
+    it "should include the response_type" do
+      subject.authorize_url.should be_include("response_type=code")
+    end
+
+  end
+
+  describe "#request_access_token" do
+    
+    it { subject.should respond_to(:request_access_token) }
+
+    context "with valid code" do
+
+      let(:server) { subject.request_access_token("4/z43CZpNmqd0IO3dR1Y_ouase13CH") }
+
+      it "should return a access_token" do
+        server.access_token.should == "1/9eNgoHDXi-1u1fDzZ2wLLGATiaQZnWPB51nTvo8n9Sw"
+      end
+
+      it "should return a refresh_token" do
+        server.refresh_token.should == "1/gvmLC5XlU0qRPIBR3mt7OBBfEoTKB6i2T-Gu4dBDupw"
+      end
+
+      it "should return a expires_in" do
+        server.expires_in.should == 3600
+      end
+
+    end
+
+    context "with invalid code" do
+      it "should raise error" do
+        lambda {  subject.request_access_token("my_invalid_code")  }.should raise_error(/400 invalid_token/)
+      end
+      it "should raise Invalid Credentials on 401 response" do
+        lambda {  subject.request_access_token("4/JvkEhCtr7tv1A60ENmubQT-cosRl")  }.should raise_error(/401 Invalid Credentials/)
+      end
+    end
+
+  end
+
+  describe "#expires_at" do
+
+    before do
+      @now = Time.now
+      Time.stub!(:now).and_return(@now)
+    end
+
+    let(:server) { subject.request_access_token("4/z43CZpNmqd0IO3dR1Y_ouase13CH") }
+
+    it "should be a time representation of #expires_in" do
+      server.expires_at.should == (@now + 3600)
+    end
+
+  end
+
+  describe "#expires?" do
+
+    before :each do
+      Time.stub!(:now).and_return(Time.parse("2011-04-23 15:30:00"))
+      subject.request_access_token("4/z43CZpNmqd0IO3dR1Y_ouase13CH")
+    end
+
+    it "should be true if access token expires" do
+      Time.stub!(:now).and_return(Time.parse("2011-04-23 18:30:00"))
+      subject.expires?.should be_true
+    end
+
+    it "should be false if access token not expires" do
+      subject.expires?.should be_false
+    end
+
+  end
+
+  describe "#authorized?" do
+    
+    it "should return false if client is not authorized" do
+      subject.authorized?.should be_false
+    end
+
+    let(:server) { subject.request_access_token("4/z43CZpNmqd0IO3dR1Y_ouase13CH") }
+
+    it "should return true if client is authorized" do
+      server.authorized?.should be_true
+    end
+
+  end
+
+  context "when gets a user history of shortened" do
+
+    it { subject.should respond_to(:history) }
+
+    it "should not return when client not authorized" do
+      subject.history.should be_nil
+    end
+
+    context "if authorized" do
+
+      let(:server) { subject.request_access_token("4/z43CZpNmqd0IO3dR1Y_ouase13CH") }
+      let(:history) { server.history }
+
+      it { history.should respond_to(:total_items) }
+      it { history.should respond_to(:items_per_page) }
+      it { history.should respond_to(:items) }
+
+    end
+
+  end
+
+end

data/spec/spec_helper.rb

@@ -75,7 +75,7 @@ def fake_urls?(status)
            :headers => {'Authorization'=>'GoogleLogin auth=DQAAAK8AAAC9ahL-o7g', 'Content-Type'=>'application/json'}).
            to_return(load_fixture('shorten_authenticated.json'))
 
-    # History
+    # History for ClientLogin
     stub_request(:get, "https://www.googleapis.com/urlshortener/v1/url/history").
       with(:headers => {'Authorization'=>'GoogleLogin auth=DQAAAK8AAAC9ahL-o7g'}).
       to_return(load_fixture('history.json'))
@@ -84,6 +84,53 @@ def fake_urls?(status)
     stub_request(:get, "https://www.googleapis.com/urlshortener/v1/url/history?projection=analytics_clicks").
       with(:headers => {'Authorization'=>'GoogleLogin auth=DQAAAK8AAAC9ahL-o7g'}).
       to_return(load_fixture('history_projection_clicks.json'))
+
+    # OAuth 2.0 for native applications
+    stub_request(:post, "https://accounts.google.com/o/oauth2/token").
+      with(:body => "code=4/SuSud6RqPojUXsPpeh-wSVCwnmTQ&client_id=185706845724.apps.googleusercontent.com&client_secret=DrBLCdCQ3gOybHrj7TPz/B0N&redirect_uri=urn:ietf:wg:oauth:2.0:oob&grant_type=authorization_code", 
+           :headers => {'Content-Type'=>'application/x-www-form-urlencoded'}).
+           to_return(load_fixture('oauth2/native.json'))    
+    
+    # OAuth 2.0 for native applications (invalid token)
+    stub_request(:post, "https://accounts.google.com/o/oauth2/token").
+      with(:body => "code=my_invalid_code&client_id=185706845724.apps.googleusercontent.com&client_secret=DrBLCdCQ3gOybHrj7TPz/B0N&redirect_uri=urn:ietf:wg:oauth:2.0:oob&grant_type=authorization_code", 
+           :headers => {'Content-Type'=>'application/x-www-form-urlencoded'}).
+           to_return(load_fixture('oauth2/native_invalid.json'))
+
+    # OAuth 2.0 for native applications (expired token)
+    stub_request(:post, "https://accounts.google.com/o/oauth2/token").
+      with(:body => "code=4/JvkEhCtr7tv1A60ENmubQT-cosRl&client_id=185706845724.apps.googleusercontent.com&client_secret=DrBLCdCQ3gOybHrj7TPz/B0N&redirect_uri=urn:ietf:wg:oauth:2.0:oob&grant_type=authorization_code", 
+           :headers => {'Content-Type'=>'application/x-www-form-urlencoded'}).
+           to_return(load_fixture('oauth2/native_token_expires.json'))
+
+    # OAuth 2.0 for native applications (history)
+    stub_request(:get, "https://www.googleapis.com/urlshortener/v1/url/history").
+       with(:headers => {'Authorization'=>'OAuth 1/YCzoGAYT8XUuOifjNh_KqA', 'Content-Type'=>'application/x-www-form-urlencoded'}).
+      to_return(load_fixture('history.json'))
+
+    # OAuth 2.0 for server-side web applications
+    stub_request(:post, "https://accounts.google.com/o/oauth2/token").
+      with(:body => "code=4/z43CZpNmqd0IO3dR1Y_ouase13CH&client_id=438834493660.apps.googleusercontent.com&client_secret=8i4iJJkFTukWhNpxTU1b2Zhi&redirect_uri=http://gooogl.heroku.com/back&grant_type=authorization_code", 
+           :headers => {'Content-Type'=>'application/x-www-form-urlencoded'}).
+           to_return(load_fixture('oauth2/server.json'))
+
+    # OAuth 2.0 for server-side web applications (invalid token)
+    stub_request(:post, "https://accounts.google.com/o/oauth2/token").
+      with(:body => "code=my_invalid_code&client_id=438834493660.apps.googleusercontent.com&client_secret=8i4iJJkFTukWhNpxTU1b2Zhi&redirect_uri=http://gooogl.heroku.com/back&grant_type=authorization_code", 
+           :headers => {'Content-Type'=>'application/x-www-form-urlencoded'}).
+           to_return(load_fixture('oauth2/server_invalid.json'))
+
+    # OAuth 2.0 for server-side web applications (expired token)
+    stub_request(:post, "https://accounts.google.com/o/oauth2/token").
+      with(:body => "code=4/JvkEhCtr7tv1A60ENmubQT-cosRl&client_id=438834493660.apps.googleusercontent.com&client_secret=8i4iJJkFTukWhNpxTU1b2Zhi&redirect_uri=http://gooogl.heroku.com/back&grant_type=authorization_code", 
+           :headers => {'Content-Type'=>'application/x-www-form-urlencoded'}).
+           to_return(load_fixture('oauth2/server_token_expires.json'))    
+
+    # OAuth 2.0 for server-side web applications (history)
+    stub_request(:get, "https://www.googleapis.com/urlshortener/v1/url/history").
+      with(:headers => {'Authorization'=>'OAuth 1/9eNgoHDXi-1u1fDzZ2wLLGATiaQZnWPB51nTvo8n9Sw'}).
+      to_return(load_fixture('history.json'))
+
   else
     WebMock.allow_net_connect!
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: googl
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
-  - 3
-  version: 0.4.3
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Jesus Lopes
@@ -15,12 +15,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-16 00:00:00 -03:00
+date: 2011-05-01 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: httparty
   type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -31,12 +33,12 @@ dependencies:
         - 6
         - 1
         version: 0.6.1
-  name: httparty
-  version_requirements: *id001
-  prerelease: false
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: json
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -47,12 +49,12 @@ dependencies:
         - 4
         - 6
         version: 1.4.6
-  name: json
-  version_requirements: *id002
-  prerelease: false
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rspec
   type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,12 +65,12 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  name: rspec
-  version_requirements: *id003
-  prerelease: false
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: bundler
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -79,12 +81,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  name: bundler
-  version_requirements: *id004
-  prerelease: false
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: jeweler
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -95,12 +97,12 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  name: jeweler
-  version_requirements: *id005
-  prerelease: false
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rcov
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -109,12 +111,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rcov
-  version_requirements: *id006
-  prerelease: false
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: webmock
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -125,9 +127,7 @@ dependencies:
         - 6
         - 2
         version: 1.6.2
-  name: webmock
-  version_requirements: *id007
-  prerelease: false
+  requirement: *id007
 description: Small library for Google URL Shortener API
 email: jlopes@zigotto.com.br
 executables: []
@@ -148,11 +148,13 @@ files:
 - lib/googl/base.rb
 - lib/googl/client_login.rb
 - lib/googl/expand.rb
+- lib/googl/oauth2/native.rb
+- lib/googl/oauth2/server.rb
+- lib/googl/oauth2/utils.rb
 - lib/googl/request.rb
 - lib/googl/ruby_extensions.rb
 - lib/googl/shorten.rb
-- spec/client_spec.rb
-- spec/expand_spec.rb
+- lib/googl/utils.rb
 - spec/fixtures/client_login_invalid.json
 - spec/fixtures/client_login_valid.json
 - spec/fixtures/expand.json
@@ -163,12 +165,22 @@ files:
 - spec/fixtures/expand_removed.json
 - spec/fixtures/history.json
 - spec/fixtures/history_projection_clicks.json
+- spec/fixtures/oauth2/native.json
+- spec/fixtures/oauth2/native_invalid.json
+- spec/fixtures/oauth2/native_token_expires.json
+- spec/fixtures/oauth2/server.json
+- spec/fixtures/oauth2/server_invalid.json
+- spec/fixtures/oauth2/server_token_expires.json
 - spec/fixtures/shorten.json
 - spec/fixtures/shorten_authenticated.json
 - spec/fixtures/shorten_invalid_content_type.json
-- spec/request_spec.rb
+- spec/googl/client_spec.rb
+- spec/googl/expand_spec.rb
+- spec/googl/oauth2/native_spec.rb
+- spec/googl/oauth2/server_spec.rb
+- spec/googl/request_spec.rb
+- spec/googl/shorten_spec.rb
 - spec/shared_examples.rb
-- spec/shorten_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/zigotto/googl
@@ -200,14 +212,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Wrapper for Google URL Shortener API
 test_files: 
-- spec/client_spec.rb
-- spec/expand_spec.rb
-- spec/request_spec.rb
+- spec/googl/client_spec.rb
+- spec/googl/expand_spec.rb
+- spec/googl/oauth2/native_spec.rb
+- spec/googl/oauth2/server_spec.rb
+- spec/googl/request_spec.rb
+- spec/googl/shorten_spec.rb
 - spec/shared_examples.rb
-- spec/shorten_spec.rb
 - spec/spec_helper.rb