open_auth2 0.0.8 → 0.0.9

data/Rakefile

@@ -46,12 +46,6 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.rspec_opts = ['--backtrace']
 end
 
-desc "Generate SimpleCov test coverage and open in your browser"
-task :coverage do
-  sh "rake spec COVERAGE=true"
-  sh "open coverage/index.html"
-end
-
 desc "Open an irb session preloaded with this library"
 task :irb do
   sh "irb -rubygems -r ./lib/#{name}.rb"

data/Readme.markdown

@@ -1,6 +1,6 @@
-# OpenAuth2 [![Build Status](https://secure.travis-ci.org/sent-hil/OpenAuth2.png?branch=master)][travis]
+# open_auth2 [![Build Status](https://secure.travis-ci.org/sent-hil/open_auth2.png?branch=master)][travis]
 
-[travis]: http://travis-ci.org/sent-hil/OpenAuth2
+[travis]: http://travis-ci.org/sent-hil/open_auth2
 
 OpenAuth2 is a thin OAuth2 wrapper written on top of Faraday in Ruby. The goal is a simple, well documented, easy to use interface for all your OAuth2 needs.
 
@@ -168,11 +168,11 @@ module OpenAuth2
       #
       def options
         {
-        :response_type            => 'code',
-        :access_token_grant_name  => 'authorization_code',
-        :refresh_token_grant_name => 'refresh_token',
-        :refresh_token_name       => :refresh_token,
-        :scope                    => [],
+          :response_type            => 'code',
+          :access_token_grant_name  => 'authorization_code',
+          :refresh_token_grant_name => 'refresh_token',
+          :refresh_token_name       => :refresh_token,
+          :scope                    => [],
         }
       end
 
@@ -181,7 +181,7 @@ module OpenAuth2
       #
       def parse(config, response_body)
         # parse the response body
-        access_token            = response_body.gsub('access_token=', '')
+        access_token = response_body.gsub('access_token=', '')
 
         # update config to reflect new information
         config.access_token     = access_token

data/examples/fb.rb

@@ -1,18 +1,19 @@
 require_relative '../lib/open_auth2'
 
-ClientId = '216091171753850'
-ClientSecret = '56f751bef00d6d21e858566b873ac8f8'
-Code = ''
-AccessToken = ''
+require 'yaml'
+Creds = YAML.load_file('spec/fixtures/creds.yml')
+
+Code        = Creds['Facebook']['Code']
+AccessToken = Creds['Facebook']['AccessToken']
 
 @config = OpenAuth2::Config.new do |c|
   c.provider       = :facebook
-  c.client_id      = ClientId
-  c.client_secret  = ClientSecret
+  c.client_id      = Creds['Facebook']['ClientId']
+  c.client_secret  = Creds['Facebook']['ClientSecret']
   c.code           = Code
   c.access_token   = AccessToken
   c.redirect_uri   = 'http://localhost:9393/'
-  c.scope          = ['manage_pages', 'read_insights']
+  c.scope          = ['publish_stream']
 end
 
 @client = OpenAuth2::Client.new(@config)

data/examples/google.rb

@@ -1,8 +1,9 @@
 require_relative '../lib/open_auth2'
 require 'json'
 
-ClientId     = '948773240950.apps.googleusercontent.com'
-ClientSecret = 'MTkeuqOhFTbfRbd27BcEROTl'
+require 'yaml'
+Creds = YAML.load_file('spec/fixtures/creds.yml')
+
 Code         = nil
 AccessToken  = 'ya29.AHES6ZRL6dKYn5HvssNQvH15KXTc76jCd9KC6Wfsir74whQ'
 RefreshToken = '1/2hTXHN9FULj7v_hVOIoyHn6BpOQS6uDOw-xllInXnTU'
@@ -10,9 +11,9 @@ PostEmail    = 'senthil196@gmail.com'
 
 @config = OpenAuth2::Config.new do |c|
   c.provider       = :google
+  c.client_id      = Creds['Google']['ClientId']
+  c.client_secret  = Creds['Google']['ClientSecret']
   c.code           = Code
-  c.client_id      = ClientId
-  c.client_secret  = ClientSecret
   c.access_token   = AccessToken
   c.refresh_token  = RefreshToken
   c.scope          = ['https://www.googleapis.com/auth/calendar']

data/lib/open_auth2/config.rb

@@ -38,6 +38,8 @@ module OpenAuth2
     #   name - String/Symbol/Constant.
     #
     def provider=(name)
+      return unless name
+
       set_provider_vars(name)
       copy_provider_keys
     end

data/lib/open_auth2/provider/default.rb

@@ -8,11 +8,11 @@ module OpenAuth2
     class Default
       def options
         {
-        :response_type            => 'code',
-        :access_token_grant_name  => 'authorization_code',
-        :refresh_token_grant_name => 'refresh_token',
-        :refresh_token_name       => :refresh_token,
-        :scope                    => [],
+          :response_type            => 'code',
+          :access_token_grant_name  => 'authorization_code',
+          :refresh_token_grant_name => 'refresh_token',
+          :refresh_token_name       => :refresh_token,
+          :scope                    => [],
         }
       end
 

data/lib/open_auth2/provider/facebook.rb

@@ -14,11 +14,13 @@ module OpenAuth2
       end
 
       def parse(config, response_body)
-        access_token            = response_body.gsub('access_token=', '')
-        config.access_token     = access_token
-        config.refresh_token    = access_token
+        resp = response_body.gsub('access_token=', '')
+        resp = resp.split('&expires=')
+
+        config.access_token     = resp[0]
+        config.refresh_token    = resp[0]
         config.token_arrived_at = Time.now
-        config.token_expires_at = "60 days?"
+        config.token_expires_at = (Time.now.to_date+60).to_time
       end
     end
   end

data/lib/open_auth2/provider/google.rb

@@ -3,18 +3,17 @@ module OpenAuth2
     class Google
       def options
         {
-        :authorize_url  => 'https://accounts.google.com',
-        :code_url       => 'https://accounts.google.com',
-        :authorize_path => '/o/oauth2/auth',
-        :redirect_uri   => 'http://localhost:9393/google/callback',
-        :token_path     => '/o/oauth2/token',
-        :endpoint       => 'https://www.googleapis.com'
+          :authorize_url  => 'https://accounts.google.com',
+          :code_url       => 'https://accounts.google.com',
+          :authorize_path => '/o/oauth2/auth',
+          :redirect_uri   => 'http://localhost:9393/google/callback',
+          :token_path     => '/o/oauth2/token',
+          :endpoint       => 'https://www.googleapis.com'
         }
       end
 
       def parse(config, body)
         json                    = JSON.parse(body)
-
         config.access_token     = json['access_token']
         config.token_arrived_at = Time.now
         config.token_expires_at = Time.now+3600

data/lib/open_auth2/token.rb

@@ -59,7 +59,7 @@ module OpenAuth2
     end
 
     def token_expired?
-      token_expires_at > Time.now
+      Time.now > token_expires_at
     rescue
       nil
     end

data/lib/open_auth2/version.rb

@@ -1,3 +1,3 @@
 module OpenAuth2
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

data/lib/open_auth2.rb

@@ -1,3 +1,5 @@
+require 'bundler/setup'
+
 require 'active_support/inflector'
 require 'faraday'
 require 'uri'

data/open_auth2.gemspec

@@ -34,6 +34,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'vcr',     '1.11.3'
   s.add_development_dependency 'fakeweb', '~> 1.3'
   s.add_development_dependency 'timecop', '~> 0.3'
+  s.add_development_dependency 'pry',     '~> 0.9'
+  s.add_development_dependency 'capybara'
 
   # = MANIFEST =
   s.files = %w[
@@ -61,7 +63,7 @@ Gem::Specification.new do |s|
     spec/config_spec.rb
     spec/facebook/client_spec.rb
     spec/facebook/token_spec.rb
-    spec/fixtures/creds.rb
+    spec/fixtures/creds.yml
     spec/fixtures/vcr/fb/access_token.yml
     spec/fixtures/vcr/fb/cocacola.yml
     spec/fixtures/vcr/fb/me.yml
@@ -73,6 +75,7 @@ Gem::Specification.new do |s|
     spec/fixtures/vcr/goog/refresh_token.yml
     spec/google/client_spec.rb
     spec/google/token_spec.rb
+    spec/reset_tokens.rb
     spec/spec_helper.rb
     spec/token_spec.rb
   ]

data/spec/config_spec.rb

@@ -82,6 +82,12 @@ describe OpenAuth2::Config do
         subject.provider = :unknown
       end.to raise_error(OpenAuth2::UnknownProvider)
     end
+
+    it 'does not set provider if arg is nil' do
+      expect do
+        subject.provider = nil
+      end.to_not change{subject.provider}
+    end
   end
 
   let(:overwrite_response_type) do

data/spec/facebook/client_spec.rb

@@ -3,14 +3,7 @@ require 'spec_helper'
 
 describe 'Facebook Client' do
   let(:config) do
-    OpenAuth2::Config.new do |c|
-      c.provider       = :facebook
-      c.client_id      = Creds::Facebook::ClientId
-      c.client_secret  = Creds::Facebook::ClientSecret
-      c.code           = Creds::Facebook::Code
-      c.redirect_uri   = 'http://localhost:9393/'
-      c.scope          = ['offline_access', 'publish_stream']
-    end
+    facebook_config
   end
 
   subject { OpenAuth2::Client.new(config) }
@@ -25,7 +18,7 @@ describe 'Facebook Client' do
 
     it 'makes private request if #access_token' do
       subject.configure do |c|
-        c.access_token = Creds::Facebook::AccessToken
+        c.access_token = Creds['Facebook']['AccessToken']
       end
 
       VCR.use_cassette('fb/me') do
@@ -46,7 +39,7 @@ describe 'Facebook Client' do
 
     it 'makes private GET request' do
       VCR.use_cassette('fb/me') do
-        path = "/me/likes?access_token=#{Creds::Facebook::AccessToken}"
+        path = "/me/likes?access_token=#{Creds['Facebook']['AccessToken']}"
         request = subject.run_request(:verb => :get, :path   => path,
                                       :body => nil , :header => nil)
         request.status.should == 200
@@ -57,7 +50,7 @@ describe 'Facebook Client' do
   context '#post' do
     before do
       subject.configure do |c|
-        c.access_token = Creds::Facebook::AccessToken
+        c.access_token = Creds['Facebook']['AccessToken']
       end
     end
 
@@ -65,15 +58,10 @@ describe 'Facebook Client' do
       "/me/feed?message='From OpenAuth2'"
     end
 
-    let(:body) do
-      "{\"message\":\"From OpenAuth2\"}"
-    end
-
-    xit 'makes request' do
+    it 'makes request' do
       VCR.use_cassette('fb/post') do
         content_type = 'application/json'
         request = subject.post(:path         => post_url,
-                               :body         => body,
                                :content_type => content_type)
         request.status.should == 200
       end

data/spec/facebook/token_spec.rb

@@ -3,14 +3,7 @@ require 'spec_helper'
 
 describe 'Facebook Token' do
   let(:config) do
-    OpenAuth2::Config.new do |c|
-      c.provider       = :facebook
-      c.client_id      = Creds::Facebook::ClientId
-      c.client_secret  = Creds::Facebook::ClientSecret
-      c.code           = Creds::Facebook::Code
-      c.redirect_uri   = 'http://localhost:9393/'
-      c.scope          = ['offline_access', 'publish_stream']
-    end
+    facebook_config
   end
 
   subject do
@@ -19,13 +12,13 @@ describe 'Facebook Token' do
 
   context '#build_code_url' do
     it 'returns url' do
-      url = "https://www.facebook.com/dialog/oauth?response_type=code&client_id=225722397503003&redirect_uri=http%3A%2F%2Flocalhost%3A9393%2F&scope=offline_access%2Cpublish_stream"
+      url = "https://www.facebook.com/dialog/oauth?response_type=code&client_id=369754433115833&redirect_uri=http%3A%2F%2Flocalhost%3A9393%2F&scope=offline_access%2Cpublish_stream"
 
       subject.build_code_url.should == url
     end
 
     it 'accepts params' do
-      url = "https://www.facebook.com/dialog/oauth?response_type=code&client_id=225722397503003&redirect_uri=http%3A%2F%2Flocalhost%3A9393%2F&scope=publish_stream"
+      url = "https://www.facebook.com/dialog/oauth?response_type=code&client_id=369754433115833&redirect_uri=http%3A%2F%2Flocalhost%3A9393%2F&scope=publish_stream"
 
       subject.build_code_url(:scope => 'publish_stream').should == url
     end
@@ -53,26 +46,30 @@ describe 'Facebook Token' do
     end
 
     it 'sets #access_token' do
-      subject.access_token.should == Creds::Facebook::AccessToken
+      subject.access_token.should == Creds['Facebook']['AccessToken']
     end
 
     it 'sets #refresh_token' do
-      subject.refresh_token.should == Creds::Facebook::AccessToken
+      subject.refresh_token.should == Creds['Facebook']['AccessToken']
     end
 
     it 'sets #token_arrived_at' do
       subject.token_arrived_at.should == time
     end
 
+    it 'sets #token_expires_at' do
+      subject.token_expires_at.to_s.should == '2013-02-19 00:00:00 -0500'
+    end
+
     it 'returns nil for #token_expired?' do
-      subject.token_expired?.should == nil
+      subject.token_expired?.should == false
     end
   end
 
   context '#refresh' do
     let(:refresh_token) do
       config.configure do |c|
-        c.refresh_token = Creds::Facebook::AccessToken
+        c.refresh_token = Creds['Facebook']['AccessToken']
       end
 
       VCR.use_cassette('fb/refresh_token') do
@@ -86,7 +83,7 @@ describe 'Facebook Token' do
 
     it 'sets new #access_token' do
       refresh_token
-      subject.access_token.should == Creds::Facebook::AccessToken
+      subject.access_token.should == Creds['Facebook']['AccessToken']
     end
   end
 end

data/spec/fixtures/creds.yml

@@ -0,0 +1,13 @@
+---
+Facebook:
+  ClientId: 369754433115833
+  ClientSecret: 117d2e4932154c8c408d3d170c81c2dc
+  Code: AQDDc5Ul1RBTTlsaWBGyHVN7FBhBvBAzjrr-qEcwSL7qtJizos5JAm9-6fCZo10Uxp3g4yhKcx9xArw-e1M9DzS0spBtlztBq9Aeus3cgM7U9UhmwY4OEim0EmrrhJGzy_LXEIUfaCwR7ds2M2DxkbWY7ZPHkTWbbpImonaq7SwiO43cKot1-UGCInZyaLqjqCzO_IP-M1phQ8zv6LF7ohnS
+  AccessToken: AAAFQSimj1rkBAEEzYjDGNyIag6EZBSwYHl2jXDJlmIdAjc3nlXpkajStjqhPyrSLZBUQ8sfV6H40LktIa1zvAILHZCZBgJgPowtiJ2K9lQZDZD
+Google:
+  ClientId: 77848792642.apps.googleusercontent.com
+  ClientSecret: 8oPMGGpIzZLwaW89pIcx78mB
+  Code: 4/2jmx49tYiahM2MzvM_W75S7Zd92i
+  AccessToken: ya29.AHES6ZRXhZRQLYkdqVoHz9qxzTkNVhElBAQitCdJq816PQ
+  RefreshToken: 1/gUwId5-5ZHpM5G3Qooj67RDQI07zgzlJQwPjErLRzEg
+  NewAccessToken: ya29.AHES6ZR2V9Y9vZnTC4YFHChTetjwML1mDLZRSmiBx-XT9g

data/spec/fixtures/vcr/fb/access_token.yml

@@ -3,7 +3,7 @@
   request: !ruby/struct:VCR::Request
     method: :post
     uri: https://graph.facebook.com:443/oauth/access_token
-    body: 
+    body: client_id=369754433115833&client_secret=117d2e4932154c8c408d3d170c81c2dc&code=AQDGiFQqdI8cQjIDO9ynqQ-TS6srenjl9QgU8cAq_aeMuZ2B2aLx0B2sn57t3HOuhJSVYW4sdq0Wuf6Jg-jkXrY_ooKvhrBiTE5wHo-2tigUBvtnqHByMI2Z1R92CiVkAPMrLSLuNCWAzWH_EDAD6PcxGRjOw2-YNMC0Dls4dZ2FNbw4xmqPa9p2Nmvvjs2krgqhHVCSmUfFY0wZ-jfEfGdH&grant_type=authorization_code&redirect_uri=http%3A%2F%2Flocalhost%3A9393%2F
     headers:
       content-type:
       - application/x-www-form-urlencoded
@@ -25,12 +25,12 @@
       pragma:
       - no-cache
       x-fb-rev:
-      - '514925'
+      - '688120'
       x-fb-debug:
-      - P9I9NADR2jvZfeNcVamI71Cay4CB4KBqBXQYcJ4YYws=
+      - ej1HI0QsiUnSnsYsICzam4rhNvDx4SLPbjuOOZi9ohE=
       date:
-      - Sat, 25 Feb 2012 21:49:01 GMT
+      - Thu, 06 Dec 2012 19:07:26 GMT
       content-length:
-      - '127'
-    body: access_token=AAADNSxdSLhsBALUJwhyMDYVTCV07ZAUyXIGwm2Bb9G5oudfZCYz2TcZB23ZABbFKTShb6JZC0aUVEsNfTMTRrqVWIrVyxNf4pElZAZCUWnd9QZDZD
+      - '140'
+    body: access_token=AAAFQSimj1rkBAEEzYjDGNyIag6EZBSwYHl2jXDJlmIdAjc3nlXpkajStjqhPyrSLZBUQ8sfV6H40LktIa1zvAILHZCZBgJgPowtiJ2K9lQZDZD&expires=5178908
     http_version: '1.1'

data/spec/fixtures/vcr/fb/cocacola.yml

@@ -24,7 +24,7 @@
         dGV4dC9qYXZhc2NyaXB0OyBjaGFyc2V0PVVURi04
       !binary "ZXRhZw==":
       - !binary |-
-        IjRkNDBlYzNhZDNjZjk0NmU2ZTdkYTFkYzM4MjFkZjJjZWI0N2FmYzYi
+        IjY2MzE1NDM5MGUyNTVjZDBiZjdmNzRhMDQzZGY4MDQ3MDMwNzY5Y2Ii
       !binary "ZXhwaXJlcw==":
       - !binary |-
         U2F0LCAwMSBKYW4gMjAwMCAwMDowMDowMCBHTVQ=
@@ -33,36 +33,37 @@
         bm8tY2FjaGU=
       !binary "eC1mYi1yZXY=":
       - !binary |-
-        NTE0OTI1
+        Njg4MTIw
       !binary "Y29udGVudC1lbmNvZGluZw==":
       - !binary |-
         Z3ppcA==
       !binary "eC1mYi1kZWJ1Zw==":
       - !binary |-
-        dzAzV3B1V0tkS1BiT244ZEcxM3dkZEZhMG9kd3R5Y2FvaUI1blUwMVViTT0=
+        S0FEa1hoL203R0xxTGZieFVadEJLNS82VHZKcVFWS2FNMkVPUmVrcGFFOD0=
       !binary "ZGF0ZQ==":
       - !binary |-
-        U2F0LCAyNSBGZWIgMjAxMiAyMjowMjo0MyBHTVQ=
+        VGh1LCAwNiBEZWMgMjAxMiAxOTowNzoyNSBHTVQ=
       !binary "Y29udGVudC1sZW5ndGg=":
       - !binary |-
-        NzIx
+        Nzk4
     body: !binary |-
-      H4sIAAAAAAAAA3VTTY/TMBD9K6NcuGTThrRN2htaBILTSsCtUjVx3MTUsS3b
-      2RAh/jvP7cLuCpFD4tjjeR8z8zNTXXbINut6v6vWTbXeZnlmeJTYvLeC7+6t
-      Zmw5JeLk0+4QozscV8eV8/astCz4Upxb0ZnCyHhcDU/bd3y5C0ZsjqtyWzf7
-      +vQC4lSWTV2Xb6uyPoXiu+sBoJW5vMw+z3NxZiFbay+FsONxJRIdcaOj1UWG
-      7FDtm3Ld7PZ5JjjK3voFKT5Y2x1XrXyUnntE5ZkKJze1WoVBQmz0k8yzWbZB
-      xVeCEuRfkISJq1OQ/smOl/hnO5kuJcvKptkhrpNBeOWisiY55yX4dKQMpfP0
-      fRc1m8g5fZTW9wqLdqH3vqDPdjD0paAHObbSR2ty+ms8zRzorHyIZM9n6ZES
-      G0wJPjKy/lFJHOkzC9u+CfQwsB9ZLAlgVD+U6V8kDIufHM0qDiTYt9Zcec54
-      g8rRHM1rbIcD86ykzsnLXgVE/6ESPXdyZH+5id1XxKZL0FhvScWrhFYmFsHq
-      qyWpMguFiNzXYGTzKqJ46TAOkr4ZVKajLykiFPTpmnif01ecPfO7t6NjA5my
-      Z0Nnz0YMKuBea2NEO/VkHVoglST8J/NrwaPqBxg9S9AOZL3qFW5G+y8nFG+K
-      1yhn3aQZ9BcaIHSEGUk0ekwvNBkFqYF1QV9tx0tOi53gO9gq6H6WAt2PyseJ
-      NW7d7HHsU9Gv2LP1uivQZdzaKaK/Xhvx4WlM6AH9Tio1CMZES5GkpxxA9fAb
-      imSgMNg5mYMPOWmdlvDOjsQ+9fQzHvQ8ShqkdrB05EuyHi9lYMg8oN8gE1gx
-      CUvcNMbz1v4/M41VnDpM111VFU2526N+TYUnxZn+6bDcrotm02w2a4Ts6l9p
-      jM3J2QCNtykVgxQXVCE71E2eRdb46U9XG04iDUF22O6adVX/+g1sWrgEyQQA
-      AA==
+      H4sIAAAAAAAAA3VUTY+jOBD9KyUue6EJCUlIclv1qGd2tIfWfNyQkAEHPDE2
+      a5um2VH/932VZCbT01opAcuUq9579crfI1HZMUSH6Esn6d7W4u7eakEPopaV
+      tSd6FK0k5UlQbbWWdVDWkD3SbEdHPlinpCff2UmZlvCiQdpBSzo625NwdjQN
+      BaSerNMNdeJJUif1IBvqxYkr4qFMsDR1IpDCz1OwjZiTKI7qTtYnZXx0WGZ5
+      HDXS104NDAGA750UAXmUoeVut+X3n0ELE0RM76V1rcKimumdS+ij7Qx9TuhR
+      9pV0wZr4F66T8HRUzgfwOkqHlNgQdAT2IJC1kk/SsQwA+FHUtvrD02MnXC/q
+      mQv06pnJ38TzsxsHmlToqBausuaMc8ITUApTmFso1x7wwdyY5DE52SqP6B9Q
+      ghON7IU7XcjuMxKQFaWx3rBonKaSjMJbyIwoxjyjQch9DkY2p9CumT9yQ74a
+      xTU/c4RP6K9z4n1Mr31wb/tBGNCUrTBoqjB1pzzOVTYEzQXtAHG4Jf5/Mr8m
+      3Ku2g9ATuh48wT4t+ouOv8WE5o3sCAhkh1ELwJ9hIA/jNHyaghv1TKNRoOqF
+      TugL+yZma0J3oFXgfZMavJ+UC6PQOHWRZxCOm34zaPIa7Nn8H+zoJX0atfQH
+      6kIYDsWiWLBxv376O6ltXyz+We0E7MqOaWQDb7IhsaF8OYyVVr7jXeCVcaQx
+      YxcHf498cFLy8CH2XzVcFhqfw9hImH6frPiAaa8bd/ttssyy7CWOgtCYjLY8
+      j29Zs1ejQ77ebrJ9HAGwM6JHiqjmkcboMr5JVh5Nx+5PGtM0gcI1hMmcw5ws
+      O35c06aYRLikhXtw9sHaplj8GArPNJnyOs332yzdZekGW9fqP9VnXsqcfi99
+      vF4zFxl/xarVSWLuNxuYMl9nQGDRMhbtvCjPNZfpcrNKs3y52e43WZay5h4X
+      U/2Kox86G6y/q5Ln5+RY1Y1JjAzForvuC9+ti4XPV+kz/sVim65Wu335Jnm5
+      XK+zVZpv83Vpkm9Di2q4MbwMJXRJX17+A0u3GG1NBQAA
     http_version: !binary |-
       MS4x

data/spec/fixtures/vcr/fb/me.yml

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction
   request: !ruby/struct:VCR::Request
     method: :get
-    uri: https://graph.facebook.com:443/me/likes?access_token=AAADNSxdSLhsBALUJwhyMDYVTCV07ZAUyXIGwm2Bb9G5oudfZCYz2TcZB23ZABbFKTShb6JZC0aUVEsNfTMTRrqVWIrVyxNf4pElZAZCUWnd9QZDZD
+    uri: https://graph.facebook.com:443/me/likes?access_token=AAAFQSimj1rkBAEEzYjDGNyIag6EZBSwYHl2jXDJlmIdAjc3nlXpkajStjqhPyrSLZBUQ8sfV6H40LktIa1zvAILHZCZBgJgPowtiJ2K9lQZDZD
     body: 
     headers:
       accept-encoding:
@@ -19,18 +19,18 @@
       content-type:
       - text/javascript; charset=UTF-8
       etag:
-      - ! '"c60f2e60a5df83da5585ebda43b554fcf98a0486"'
+      - ! '"7363db52a3026cdc124c3fac4cbe7422bfb540c9"'
       expires:
       - Sat, 01 Jan 2000 00:00:00 GMT
       pragma:
       - no-cache
       x-fb-rev:
-      - '514925'
+      - '688120'
       x-fb-debug:
-      - KrTg1q4nx3Apmj1vpbKXn0k7W3EmEsfq0rt2uQLSJ/g=
+      - tx+4BRudPUdklffLDIYB4FQqquI+4SULntIz9XFwlsE=
       date:
-      - Sat, 25 Feb 2012 22:08:52 GMT
+      - Thu, 06 Dec 2012 19:07:25 GMT
       content-length:
-      - '370'
-    body: ! '{"data":[{"name":"EmiBalbuena.com","category":"Personal website","id":"197230593668050","created_time":"2011-10-06T22:00:02+0000"}],"paging":{"next":"https:\/\/graph.facebook.com\/me\/likes?access_token=AAADNSxdSLhsBALUJwhyMDYVTCV07ZAUyXIGwm2Bb9G5oudfZCYz2TcZB23ZABbFKTShb6JZC0aUVEsNfTMTRrqVWIrVyxNf4pElZAZCUWnd9QZDZD&limit=5000&offset=5000&__after_id=197230593668050"}}'
+      - '380'
+    body: ! '{"data":[{"category":"Personal website","name":"EmiBalbuena.com","id":"197230593668050","created_time":"2011-10-06T22:00:02+0000"}],"paging":{"next":"https:\/\/graph.facebook.com\/100002930317357\/likes?access_token=AAAFQSimj1rkBAEEzYjDGNyIag6EZBSwYHl2jXDJlmIdAjc3nlXpkajStjqhPyrSLZBUQ8sfV6H40LktIa1zvAILHZCZBgJgPowtiJ2K9lQZDZD&limit=5000&offset=5000&__after_id=197230593668050"}}'
     http_version: '1.1'

data/spec/fixtures/vcr/fb/post.yml

@@ -2,11 +2,13 @@
 - !ruby/struct:VCR::HTTPInteraction
   request: !ruby/struct:VCR::Request
     method: :post
-    uri: https://graph.facebook.com:443/me/feed?message=%27From%20OpenAuth2%27&access_token=AAADNSxdSLhsBALUJwhyMDYVTCV07ZAUyXIGwm2Bb9G5oudfZCYz2TcZB23ZABbFKTShb6JZC0aUVEsNfTMTRrqVWIrVyxNf4pElZAZCUWnd9QZDZD
+    uri: https://graph.facebook.com:443/me/feed?message=%27From+OpenAuth2%27&access_token=AAAFQSimj1rkBAEEzYjDGNyIag6EZBSwYHl2jXDJlmIdAjc3nlXpkajStjqhPyrSLZBUQ8sfV6H40LktIa1zvAILHZCZBgJgPowtiJ2K9lQZDZD
     body: 
     headers:
       content-type:
       - application/json
+      content-length:
+      - '0'
   response: !ruby/struct:VCR::Response
     status: !ruby/struct:VCR::ResponseStatus
       code: 200
@@ -23,12 +25,12 @@
       pragma:
       - no-cache
       x-fb-rev:
-      - '518267'
+      - '688120'
       x-fb-debug:
-      - 1+GpoD6kWif2JDnTaD/XeITjokumXXb6BbGmwAciEiA=
+      - 5EaMjzPReHxh3EhmzC812yk4xK8NCyEGtP0B61IZ/AE=
       date:
-      - Sat, 03 Mar 2012 01:37:49 GMT
+      - Thu, 06 Dec 2012 19:07:26 GMT
       content-length:
       - '40'
-    body: ! '{"id":"100002930317357_200068986767444"}'
+    body: ! '{"id":"100002930317357_327490434025298"}'
     http_version: '1.1'

data/spec/fixtures/vcr/fb/refresh_token.yml

@@ -3,7 +3,7 @@
   request: !ruby/struct:VCR::Request
     method: :post
     uri: https://graph.facebook.com:443/oauth/access_token
-    body: 
+    body: client_id=369754433115833&client_secret=117d2e4932154c8c408d3d170c81c2dc&grant_type=fb_exchange_token&fb_exchange_token=AAAFQSimj1rkBAEEzYjDGNyIag6EZBSwYHl2jXDJlmIdAjc3nlXpkajStjqhPyrSLZBUQ8sfV6H40LktIa1zvAILHZCZBgJgPowtiJ2K9lQZDZD
     headers:
       content-type:
       - application/x-www-form-urlencoded
@@ -25,12 +25,12 @@
       pragma:
       - no-cache
       x-fb-rev:
-      - '514925'
+      - '688120'
       x-fb-debug:
-      - oAZnBNFMltYkzFalaO5iH4uo5Jcc0fnhK7QFGrcMfvI=
+      - 1FSF+P+Q7JKdczlPGLIFmGK88XtusThF5BENI6qmdiU=
       date:
-      - Sat, 25 Feb 2012 21:56:05 GMT
+      - Thu, 06 Dec 2012 19:07:27 GMT
       content-length:
-      - '127'
-    body: access_token=AAADNSxdSLhsBALUJwhyMDYVTCV07ZAUyXIGwm2Bb9G5oudfZCYz2TcZB23ZABbFKTShb6JZC0aUVEsNfTMTRrqVWIrVyxNf4pElZAZCUWnd9QZDZD
+      - '140'
+    body: access_token=AAAFQSimj1rkBAEEzYjDGNyIag6EZBSwYHl2jXDJlmIdAjc3nlXpkajStjqhPyrSLZBUQ8sfV6H40LktIa1zvAILHZCZBgJgPowtiJ2K9lQZDZD&expires=5178907
     http_version: '1.1'

data/spec/google/client_spec.rb

@@ -3,13 +3,7 @@ require 'spec_helper'
 
 describe 'Google Client' do
   let(:config) do
-    OpenAuth2::Config.new do |c|
-      c.provider       = :google
-      c.access_token   = Creds::Google::AccessToken
-      c.refresh_token  = Creds::Google::RefreshToken
-      c.redirect_uri   = 'http://localhost:9393/google/callback'
-      c.path_prefix    = '/calendar/v3'
-    end
+    google_config
   end
 
   subject { OpenAuth2::Client.new(config) }
@@ -45,7 +39,7 @@ describe 'Google Client' do
 
     it 'POST request via #run_request' do
       header   = {"Content-Type" => "application/json"}
-      full_url = "#{post_url}?access_token=#{Creds::Google::AccessToken}"
+      full_url = "#{post_url}?access_token=#{Creds['Google']['AccessToken']}"
 
       VCR.use_cassette('goog/post') do
         request = subject.run_request(:verb   => :post,

data/spec/google/token_spec.rb

@@ -3,14 +3,7 @@ require 'spec_helper'
 
 describe 'Google Token' do
   let(:config) do
-    OpenAuth2::Config.new do |c|
-      c.provider       = :google
-      c.client_id      = Creds::Google::ClientId
-      c.client_secret  = Creds::Google::ClientSecret
-      c.code           = Creds::Google::Code
-      c.redirect_uri   = 'http://localhost:9393/google/callback'
-      c.scope          = ['https://www.googleapis.com/auth/calendar']
-    end
+    google_config
   end
 
   subject do
@@ -48,11 +41,11 @@ describe 'Google Token' do
     end
 
     it 'sets #access_token' do
-      subject.access_token.should == Creds::Google::AccessToken
+      subject.access_token.should == Creds['Google']['AccessToken']
     end
 
     it 'sets #refresh_token' do
-      subject.refresh_token.should == Creds::Google::RefreshToken
+      subject.refresh_token.should == Creds['Google']['RefreshToken']
     end
 
     it 'sets #token_arrived_at' do
@@ -60,14 +53,14 @@ describe 'Google Token' do
     end
 
     it 'returns false for #token_expired?' do
-      subject.token_expired?.should == true
+      subject.token_expired?.should == false
     end
   end
 
   context '#refresh' do
     let(:refresh_token) do
       config.configure do |c|
-        c.refresh_token = Creds::Google::RefreshToken
+        c.refresh_token = Creds['Google']['RefreshToken']
       end
 
       VCR.use_cassette('goog/refresh_token') do
@@ -81,7 +74,7 @@ describe 'Google Token' do
 
     it 'sets new #access_token' do
       refresh_token
-      subject.access_token.should == Creds::Google::NewAccessToken
+      subject.access_token.should == Creds['Google']['NewAccessToken']
     end
   end
 end

data/spec/reset_tokens.rb

@@ -0,0 +1,51 @@
+if ENV['RESET_TOKENS']
+  require_relative '../lib/open_auth2'
+
+  require 'capybara/rspec'
+  require 'pry'
+
+  require 'yaml'
+  Creds = YAML.load_file('spec/fixtures/creds.yml')
+
+  describe "ResetToken", :js => true do
+    include Capybara::DSL
+
+    it 'Facebook' do
+      config = OpenAuth2::Config.new do |c|
+        c.provider       = :facebook
+        c.client_id      = Creds['Facebook']['ClientId']
+        c.client_secret  = Creds['Facebook']['ClientSecret']
+        c.code           = Creds['Facebook']['Code']
+        c.access_token   = Creds['Facebook']['AccessToken']
+        c.redirect_uri   = 'http://localhost:9393/'
+        c.scope          = ['publish_stream']
+      end
+
+      client = OpenAuth2::Client.new(config)
+      url    = client.build_code_url
+      token  = client.token
+
+      response = visit('https://www.facebook.com/')
+      fill_in :email, :with => ENV['USER']
+      fill_in :pass, :with => ENV['PASS']
+      click_button 'Log In'
+
+      response = visit(url)
+      code = current_url.split('=')[1].split('#')[0]
+
+      config.code = code
+      token.get
+      access_token = config.access_token
+
+      response = visit(url)
+      code = current_url.split('=')[1].split('#')[0]
+
+      Creds['Facebook']['Code'] = code
+      Creds['Facebook']['AccessToken'] = access_token
+
+      File.open('spec/fixtures/creds.yml', 'w') do |f|
+        f.puts(YAML.dump(Creds))
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,13 +1,34 @@
-if ENV['COVERAGE']
-  require 'simplecov'
-  SimpleCov.start
-end
-
 require 'vcr'
 require 'timecop'
-require 'fixtures/creds'
 
 VCR.config do |c|
   c.cassette_library_dir = 'spec/fixtures/vcr'
   c.stub_with :fakeweb
 end
+
+require 'yaml'
+Creds = YAML.load_file('spec/fixtures/creds.yml')
+
+def facebook_config
+  OpenAuth2::Config.new do |c|
+    c.provider       = :facebook
+    c.client_id      = Creds['Facebook']['ClientId']
+    c.client_secret  = Creds['Facebook']['ClientSecret']
+    c.code           = Creds['Facebook']['Code']
+    c.redirect_uri   = 'http://localhost:9393/'
+    c.scope          = ['offline_access', 'publish_stream']
+  end
+end
+
+def google_config
+  OpenAuth2::Config.new do |c|
+    c.provider       = :google
+    c.client_id      = Creds['Google']['ClientId']
+    c.client_secret  = Creds['Google']['ClientSecret']
+    c.access_token   = Creds['Google']['AccessToken']
+    c.refresh_token  = Creds['Google']['RefreshToken']
+    c.redirect_uri   = 'http://localhost:9393/google/callback'
+    c.path_prefix    = '/calendar/v3'
+    c.scope          = ['https://www.googleapis.com/auth/calendar']
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: open_auth2
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-22 00:00:00.000000000 Z
+date: 2012-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -139,6 +139,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: OpenAuth2 is a simple OAuth2 client.
 email:
 - me@sent-hil.com
@@ -170,7 +202,7 @@ files:
 - spec/config_spec.rb
 - spec/facebook/client_spec.rb
 - spec/facebook/token_spec.rb
-- spec/fixtures/creds.rb
+- spec/fixtures/creds.yml
 - spec/fixtures/vcr/fb/access_token.yml
 - spec/fixtures/vcr/fb/cocacola.yml
 - spec/fixtures/vcr/fb/me.yml
@@ -182,6 +214,7 @@ files:
 - spec/fixtures/vcr/goog/refresh_token.yml
 - spec/google/client_spec.rb
 - spec/google/token_spec.rb
+- spec/reset_tokens.rb
 - spec/spec_helper.rb
 - spec/token_spec.rb
 homepage: https://github.com/sent-hil/OpenAuth2
@@ -196,18 +229,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1597151657867498836
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1597151657867498836
 requirements: []
 rubyforge_project: OpenAuth2
 rubygems_version: 1.8.24
@@ -220,7 +247,7 @@ test_files:
 - spec/config_spec.rb
 - spec/facebook/client_spec.rb
 - spec/facebook/token_spec.rb
-- spec/fixtures/creds.rb
+- spec/fixtures/creds.yml
 - spec/fixtures/vcr/fb/access_token.yml
 - spec/fixtures/vcr/fb/cocacola.yml
 - spec/fixtures/vcr/fb/me.yml
@@ -232,5 +259,7 @@ test_files:
 - spec/fixtures/vcr/goog/refresh_token.yml
 - spec/google/client_spec.rb
 - spec/google/token_spec.rb
+- spec/reset_tokens.rb
 - spec/spec_helper.rb
 - spec/token_spec.rb
+has_rdoc: 

data/spec/fixtures/creds.rb

@@ -1,18 +0,0 @@
-module Creds
-  module Facebook
-    ClientId     = '225722397503003'
-    ClientSecret = 'c5ede842aaa3a3f377ca56464acc37fe'
-    Code         = 'AQB2Z6BvTFr9_VhMiP6eVLCIxUb26ym6mjuie4h2rbxGyN3QjMzVB_mozUfTCqJpH4Ta7MeRRxF7-sWQ9wdwR6iic6Mbb5hTtg1bj2nHBo85iCPfel4q-Blf3mp8xv0aKGw6mgYVMBfW1MhJC4qDgKE8pTgi7230Vgthjs7LWKBIcDJtonjUAFldhcKVrPZSx90'
-    AccessToken  = 'AAADNSxdSLhsBALUJwhyMDYVTCV07ZAUyXIGwm2Bb9G5oudfZCYz2TcZB23ZABbFKTShb6JZC0aUVEsNfTMTRrqVWIrVyxNf4pElZAZCUWnd9QZDZD'
-  end
-
-  module Google
-    ClientId       = '77848792642.apps.googleusercontent.com'
-    ClientSecret   = '8oPMGGpIzZLwaW89pIcx78mB'
-    Code           = '4/2jmx49tYiahM2MzvM_W75S7Zd92i'
-    AccessToken    = 'ya29.AHES6ZRXhZRQLYkdqVoHz9qxzTkNVhElBAQitCdJq816PQ'
-    RefreshToken   = '1/gUwId5-5ZHpM5G3Qooj67RDQI07zgzlJQwPjErLRzEg'
-
-    NewAccessToken = 'ya29.AHES6ZR2V9Y9vZnTC4YFHChTetjwML1mDLZRSmiBx-XT9g'
-  end
-end