omniauth-facebook 1.4.0 → 1.4.1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-facebook
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-24 00:00:00.000000000 Z
+date: 2012-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,23 +26,39 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  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'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -79,9 +95,9 @@ files:
 - lib/omniauth/facebook/version.rb
 - lib/omniauth/strategies/facebook.rb
 - omniauth-facebook.gemspec
-- spec/omniauth/strategies/facebook_spec.rb
-- spec/spec_helper.rb
-- spec/support/shared_examples.rb
+- test/helper.rb
+- test/support/shared_examples.rb
+- test/test.rb
 homepage: https://github.com/mkdynamic/omniauth-facebook
 licenses: []
 post_install_message: 
@@ -94,20 +110,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1875274478054024285
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1875274478054024285
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.22
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Facebook strategy for OmniAuth
 test_files:
-- spec/omniauth/strategies/facebook_spec.rb
-- spec/spec_helper.rb
-- spec/support/shared_examples.rb
-has_rdoc: 
+- test/helper.rb
+- test/support/shared_examples.rb
+- test/test.rb

data/spec/omniauth/strategies/facebook_spec.rb

@@ -1,507 +0,0 @@
-require 'spec_helper'
-require 'omniauth-facebook'
-require 'openssl'
-require 'base64'
-
-describe OmniAuth::Strategies::Facebook do
-  before :each do
-    @request = double('Request')
-    @request.stub(:params) { {} }
-    @request.stub(:cookies) { {} }
-    @request.stub(:env) { {} }
-
-    @client_id = '123'
-    @client_secret = '53cr3tz'
-  end
-
-  subject do
-    args = [@client_id, @client_secret, @options].compact
-    OmniAuth::Strategies::Facebook.new(nil, *args).tap do |strategy|
-      strategy.stub(:request) { @request }
-    end
-  end
-
-  it_should_behave_like 'an oauth2 strategy'
-
-  describe '#client' do
-    it 'has correct Facebook site' do
-      subject.client.site.should eq('https://graph.facebook.com')
-    end
-
-    it 'has correct authorize url' do
-      subject.client.options[:authorize_url].should eq('/oauth/authorize')
-    end
-
-    it 'has correct token url' do
-      subject.client.options[:token_url].should eq('/oauth/access_token')
-    end
-  end
-
-  describe '#callback_url' do
-    it "returns the default callback url" do
-      url_base = 'http://auth.request.com'
-      @request.stub(:url) { "#{url_base}/some/page" }
-      subject.stub(:script_name) { '' } # as not to depend on Rack env
-      subject.callback_url.should eq("#{url_base}/auth/facebook/callback")
-    end
-
-    it "returns path from callback_path option" do
-      @options = { :callback_path => "/auth/FB/done"}
-      url_base = 'http://auth.request.com'
-      @request.stub(:url) { "#{url_base}/page/path" }
-      subject.stub(:script_name) { '' } # as not to depend on Rack env
-      subject.callback_url.should eq("#{url_base}/auth/FB/done")
-    end
-
-    it "returns url from callback_url option" do
-      url = 'https://auth.myapp.com/auth/fb/callback'
-      @options = { :callback_url => url }
-      subject.callback_url.should eq(url)
-    end
-  end
-
-  describe '#authorize_params' do
-    it 'includes default scope for email' do
-      subject.authorize_params.should be_a(Hash)
-      subject.authorize_params[:scope].should eq('email')
-    end
-
-    it 'includes display parameter from request when present' do
-      @request.stub(:params) { { 'display' => 'touch' } }
-      subject.authorize_params.should be_a(Hash)
-      subject.authorize_params[:display].should eq('touch')
-    end
-
-    it 'includes state parameter from request when present' do
-      @request.stub(:params) { { 'state' => 'some_state' } }
-      subject.authorize_params.should be_a(Hash)
-      subject.authorize_params[:state].should eq('some_state')
-    end
-
-    it 'overrides default scope with parameter passed from request' do
-      @request.stub(:params) { { 'scope' => 'email' } }
-      subject.authorize_params.should be_a(Hash)
-      subject.authorize_params[:scope].should eq('email')
-    end
-  end
-
-  describe '#token_params' do
-    it 'has correct parse strategy' do
-      subject.token_params[:parse].should eq(:query)
-    end
-  end
-
-  describe '#access_token_options' do
-    it 'has correct param name by default' do
-      subject.access_token_options[:param_name].should eq('access_token')
-    end
-
-    it 'has correct header format by default' do
-      subject.access_token_options[:header_format].should eq('OAuth %s')
-    end
-  end
-
-  describe '#uid' do
-    before :each do
-      subject.stub(:raw_info) { { 'id' => '123' } }
-    end
-
-    it 'returns the id from raw_info' do
-      subject.uid.should eq('123')
-    end
-  end
-
-  describe '#info' do
-    context 'when optional data is not present in raw info' do
-      before :each do
-        @raw_info ||= { 'name' => 'Fred Smith' }
-        subject.stub(:raw_info) { @raw_info }
-      end
-
-      it 'has no email key' do
-        subject.info.should_not have_key('email')
-      end
-
-      it 'has no nickname key' do
-        subject.info.should_not have_key('nickname')
-      end
-
-      it 'has no first name key' do
-        subject.info.should_not have_key('first_name')
-      end
-
-      it 'has no last name key' do
-        subject.info.should_not have_key('last_name')
-      end
-
-      it 'has no location key' do
-        subject.info.should_not have_key('location')
-      end
-
-      it 'has no description key' do
-        subject.info.should_not have_key('description')
-      end
-
-      it 'has no urls' do
-        subject.info.should_not have_key('urls')
-      end
-
-      it 'has no verified key' do
-        subject.info.should_not have_key('verified')
-      end
-    end
-
-    context 'when optional data is present in raw info' do
-      before :each do
-        @raw_info ||= { 'name' => 'Fred Smith' }
-        subject.stub(:raw_info) { @raw_info }
-      end
-
-      it 'returns the name' do
-        subject.info['name'].should eq('Fred Smith')
-      end
-
-      it 'returns the email' do
-        @raw_info['email'] = 'fred@smith.com'
-        subject.info['email'].should eq('fred@smith.com')
-      end
-
-      it 'returns the username as nickname' do
-        @raw_info['username'] = 'fredsmith'
-        subject.info['nickname'].should eq('fredsmith')
-      end
-
-      it 'returns the first name' do
-        @raw_info['first_name'] = 'Fred'
-        subject.info['first_name'].should eq('Fred')
-      end
-
-      it 'returns the last name' do
-        @raw_info['last_name'] = 'Smith'
-        subject.info['last_name'].should eq('Smith')
-      end
-
-      it 'returns the location name as location' do
-        @raw_info['location'] = { 'id' => '104022926303756', 'name' => 'Palo Alto, California' }
-        subject.info['location'].should eq('Palo Alto, California')
-      end
-
-      it 'returns bio as description' do
-        @raw_info['bio'] = 'I am great'
-        subject.info['description'].should eq('I am great')
-      end
-
-      it 'returns the square format facebook avatar url' do
-        @raw_info['id'] = '321'
-        subject.info['image'].should eq('http://graph.facebook.com/321/picture?type=square')
-      end
-
-      it 'returns the Facebook link as the Facebook url' do
-        @raw_info['link'] = 'http://www.facebook.com/fredsmith'
-        subject.info['urls'].should be_a(Hash)
-        subject.info['urls']['Facebook'].should eq('http://www.facebook.com/fredsmith')
-      end
-
-      it 'returns website url' do
-        @raw_info['website'] = 'https://my-wonderful-site.com'
-        subject.info['urls'].should be_a(Hash)
-        subject.info['urls']['Website'].should eq('https://my-wonderful-site.com')
-      end
-
-      it 'return both Facebook link and website urls' do
-        @raw_info['link'] = 'http://www.facebook.com/fredsmith'
-        @raw_info['website'] = 'https://my-wonderful-site.com'
-        subject.info['urls'].should be_a(Hash)
-        subject.info['urls']['Facebook'].should eq('http://www.facebook.com/fredsmith')
-        subject.info['urls']['Website'].should eq('https://my-wonderful-site.com')
-      end
-
-      it 'returns the positive verified status' do
-        @raw_info['verified'] = true
-        subject.info['verified'].should be_true
-      end
-
-      it 'returns the negative verified status' do
-        @raw_info['verified'] = false
-        subject.info['verified'].should be_false
-      end
-    end
-
-    it 'returns the secure facebook avatar url when `secure_image_url` option is specified' do
-      @options = { :secure_image_url => true }
-      raw_info = { 'name' => 'Fred Smith', 'id' => '321' }
-      subject.stub(:raw_info) { raw_info }
-      subject.info['image'].should eq('https://graph.facebook.com/321/picture?type=square')
-    end
-
-    it 'returns the image size specified in the `image_size` option' do
-      @options = { :image_size => 'normal' }
-      raw_info = { 'name' => 'Fred Smith', 'id' => '321' }
-      subject.stub(:raw_info) { raw_info }
-      subject.info['image'].should eq('http://graph.facebook.com/321/picture?type=normal')
-    end
-  end
-
-  describe '#raw_info' do
-    before :each do
-      @access_token = double('OAuth2::AccessToken')
-    end
-
-    it 'performs a GET to https://graph.facebook.com/me' do
-      subject.stub(:access_token) { @access_token }
-      @access_token.stub(:get) { double('OAuth2::Response').as_null_object }
-      @access_token.should_receive(:get).with('/me')
-      subject.raw_info
-    end
-
-    it 'returns a Hash' do
-      subject.stub(:access_token) { @access_token }
-      @access_token.stub(:get).with('/me') do
-        raw_response = double('Faraday::Response')
-        raw_response.stub(:body) { '{ "ohai": "thar" }' }
-        raw_response.stub(:status) { 200 }
-        raw_response.stub(:headers) { { 'Content-Type' => 'application/json' } }
-        OAuth2::Response.new(raw_response)
-      end
-      subject.raw_info.should be_a(Hash)
-      subject.raw_info['ohai'].should eq('thar')
-    end
-
-    it 'returns an empty hash when the response is false' do
-      subject.stub(:access_token) { @access_token }
-      @access_token.stub(:get).with('/me') do
-        response = double('OAuth2::Response')
-        response.stub(:parsed => false)
-        response
-      end
-      subject.raw_info.should be_a(Hash)
-    end
-
-    it 'should not include raw_info in extras hash when skip_info is specified' do
-      @options = { :skip_info => true }
-      subject.stub(:raw_info) { { :foo => 'bar' } }
-      subject.extra.should_not have_key('raw_info')
-    end
-  end
-
-  describe '#credentials' do
-    before :each do
-      @access_token = double('OAuth2::AccessToken')
-      @access_token.stub(:token)
-      @access_token.stub(:expires?)
-      @access_token.stub(:expires_at)
-      @access_token.stub(:refresh_token)
-      subject.stub(:access_token) { @access_token }
-    end
-
-    it 'returns a Hash' do
-      subject.credentials.should be_a(Hash)
-    end
-
-    it 'returns the token' do
-      @access_token.stub(:token) { '123' }
-      subject.credentials['token'].should eq('123')
-    end
-
-    it 'returns the expiry status' do
-      @access_token.stub(:expires?) { true }
-      subject.credentials['expires'].should eq(true)
-
-      @access_token.stub(:expires?) { false }
-      subject.credentials['expires'].should eq(false)
-    end
-
-    it 'returns the refresh token and expiry time when expiring' do
-      ten_mins_from_now = (Time.now + 600).to_i
-      @access_token.stub(:expires?) { true }
-      @access_token.stub(:refresh_token) { '321' }
-      @access_token.stub(:expires_at) { ten_mins_from_now }
-      subject.credentials['refresh_token'].should eq('321')
-      subject.credentials['expires_at'].should eq(ten_mins_from_now)
-    end
-
-    it 'does not return the refresh token when it is nil and expiring' do
-      @access_token.stub(:expires?) { true }
-      @access_token.stub(:refresh_token) { nil }
-      subject.credentials['refresh_token'].should be_nil
-      subject.credentials.should_not have_key('refresh_token')
-    end
-
-    it 'does not return the refresh token when not expiring' do
-      @access_token.stub(:expires?) { false }
-      @access_token.stub(:refresh_token) { 'XXX' }
-      subject.credentials['refresh_token'].should be_nil
-      subject.credentials.should_not have_key('refresh_token')
-    end
-  end
-
-  describe '#extra' do
-    before :each do
-      @raw_info = { 'name' => 'Fred Smith' }
-      subject.stub(:raw_info) { @raw_info }
-    end
-
-    it 'returns a Hash' do
-      subject.extra.should be_a(Hash)
-    end
-
-    it 'contains raw info' do
-      subject.extra.should eq({ 'raw_info' => @raw_info })
-    end
-  end
-
-  describe '#signed_request' do
-    context 'cookie/param not present' do
-      it 'is nil' do
-        subject.send(:signed_request).should be_nil
-      end
-    end
-
-    context 'cookie present' do
-      before :each do
-        @payload = {
-          'algorithm' => 'HMAC-SHA256',
-          'code' => 'm4c0d3z',
-          'issued_at' => Time.now.to_i,
-          'user_id' => '123456'
-        }
-
-        @request.stub(:cookies) do
-          { "fbsr_#{@client_id}" => signed_request(@payload, @client_secret) }
-        end
-      end
-
-      it 'parses the access code out from the cookie' do
-        subject.send(:signed_request).should eq(@payload)
-      end
-    end
-
-    context 'param present' do
-      before :each do
-        @payload = {
-          'algorithm' => 'HMAC-SHA256',
-          'oauth_token' => 'XXX',
-          'issued_at' => Time.now.to_i,
-          'user_id' => '123456'
-        }
-
-        @request.stub(:params) do
-          { 'signed_request' => signed_request(@payload, @client_secret) }
-        end
-      end
-
-      it 'parses the access code out from the param' do
-        subject.send(:signed_request).should eq(@payload)
-      end
-    end
-
-    context 'cookie + param present' do
-      before :each do
-        @payload_from_cookie = {
-          'algorithm' => 'HMAC-SHA256',
-          'from' => 'cookie'
-        }
-
-        @request.stub(:cookies) do
-          { "fbsr_#{@client_id}" => signed_request(@payload_from_cookie, @client_secret) }
-        end
-
-        @payload_from_param = {
-          'algorithm' => 'HMAC-SHA256',
-          'from' => 'param'
-        }
-
-        @request.stub(:params) do
-          { 'signed_request' => signed_request(@payload_from_param, @client_secret) }
-        end
-      end
-
-      it 'picks param over cookie' do
-        subject.send(:signed_request).should eq(@payload_from_param)
-      end
-    end
-  end
-
-  describe '#request_phase' do
-    describe 'params contain a signed request with an access token' do
-      before do
-        payload = {
-          'algorithm' => 'HMAC-SHA256',
-          'oauth_token' => 'm4c0d3z'
-        }
-        @raw_signed_request = signed_request(payload, @client_secret)
-        @request.stub(:params) do
-          { "signed_request" => @raw_signed_request }
-        end
-
-        subject.stub(:callback_url) { '/' }
-      end
-
-      it 'redirects to callback passing along signed request' do
-        subject.should_receive(:redirect).with("/?signed_request=#{Rack::Utils.escape(@raw_signed_request)}").once
-        subject.request_phase
-      end
-    end
-  end
-
-  describe '#build_access_token' do
-    describe 'params contain a signed request with an access token' do
-      before do
-        @payload = {
-          'algorithm' => 'HMAC-SHA256',
-          'oauth_token' => 'm4c0d3z',
-          'expires' => Time.now.to_i
-        }
-        @raw_signed_request = signed_request(@payload, @client_secret)
-        @request.stub(:params) do
-          { "signed_request" => @raw_signed_request }
-        end
-
-        subject.stub(:callback_url) { '/' }
-      end
-
-      it 'returns a new access token from the signed request' do
-        result = subject.build_access_token
-        result.should be_an_instance_of(::OAuth2::AccessToken)
-        result.token.should eq(@payload['oauth_token'])
-      end
-
-      it 'returns an access token with the correct expiry time' do
-        result = subject.build_access_token
-        result.expires_at.should eq(@payload['expires'])
-      end
-    end
-
-    describe 'params contain an access token string' do
-      before do
-        @request.stub(:params) do
-          { 'access_token' => 'm4c0d3z' }
-        end
-
-        subject.stub(:callback_url) { '/' }
-      end
-
-      it 'returns a new access token' do
-        result = subject.build_access_token
-        result.should be_an_instance_of(::OAuth2::AccessToken)
-        result.token.should eq('m4c0d3z')
-      end
-    end
-  end
-
-private
-
-  def signed_request(payload, secret)
-    encoded_payload = base64_encode_url(MultiJson.encode(payload))
-    encoded_signature = base64_encode_url(signature(encoded_payload, secret))
-    [encoded_signature, encoded_payload].join('.')
-  end
-
-  def base64_encode_url(value)
-    Base64.encode64(value).tr('+/', '-_').gsub(/\n/, '')
-  end
-
-  def signature(payload, secret, algorithm = OpenSSL::Digest::SHA256.new)
-    OpenSSL::HMAC.digest(algorithm, secret, payload)
-  end
-end