omniauth-facebook 1.0.0.rc1 → 1.0.0.rc2

data/README.md

@@ -1,8 +1,16 @@
 # OmniAuth Facebook  [![Build Status](http://travis-ci.org/mkdynamic/omniauth-facebook.png?branch=master)](http://travis-ci.org/mkdynamic/omniauth-facebook)
 
-**Note:** This gem is designed to work with the unreleased OmniAuth 1.0 library. It will not be officially released on RubyGems.org until OmniAuth 1.0 is released.
+This gem contains the Facebook strategy for OmniAuth 1.0.
 
-This gem contains the Facebook strategy for OmniAuth.
+## Installing
+
+Add to your `Gemfile`:
+
+```ruby
+gem 'omniauth-facebook', '~> 1.0.0.rc1'
+```
+
+Then `bundle install`.
 
 ## Supported Flows
 

data/example/config.ru

@@ -21,7 +21,7 @@ end
 use Rack::Session::Cookie
 
 use OmniAuth::Builder do
-  provider :facebook, ENV['APP_ID'], ENV['APP_SECRET'], :scope => 'email,read_stream'
+  provider :facebook, ENV['APP_ID'], ENV['APP_SECRET'], :scope => 'email,read_stream', :authorize_params => { :display => 'popup' }
 end
 
 run App.new

data/lib/omniauth/facebook/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Facebook
-    VERSION = "1.0.0.rc1"
+    VERSION = "1.0.0.rc2"
   end
 end

data/lib/omniauth/strategies/facebook.rb

@@ -3,6 +3,8 @@ require 'omniauth/strategies/oauth2'
 module OmniAuth
   module Strategies
     class Facebook < OmniAuth::Strategies::OAuth2
+      DEFAULT_SCOPE = 'email,offline_access'
+      
       option :client_options, {
         :site => 'https://graph.facebook.com',
         :token_url => '/oauth/access_token'
@@ -63,6 +65,13 @@ module OmniAuth
         options.access_token_options.inject({}) { |h,(k,v)| h[k.to_sym] = v; h }
       end
       
+      def authorize_params
+        super.tap do |params|
+          params.merge!(:display => request.params['display']) if request.params['display']
+          params[:scope] ||= DEFAULT_SCOPE
+        end
+      end
+      
       private
       
       def prune!(hash)

data/omniauth-facebook.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'omniauth-oauth2', '~> 1.0.0.rc2'
+  s.add_runtime_dependency 'omniauth-oauth2', '~> 1.0.0'
 
   s.add_development_dependency 'rspec', '~> 2.7.0'
   s.add_development_dependency 'rake'

data/spec/omniauth/strategies/facebook_spec.rb

@@ -2,8 +2,15 @@ require 'spec_helper'
 require 'omniauth-facebook'
 
 describe OmniAuth::Strategies::Facebook do
+  before :each do
+    @request = double('Request')
+    @request.stub(:params) { {} }
+  end
+  
   subject do
-    OmniAuth::Strategies::Facebook.new(nil, @options || {})
+    OmniAuth::Strategies::Facebook.new(nil, @options || {}).tap do |strategy|
+      strategy.stub(:request) { @request }
+    end
   end
 
   it_should_behave_like 'an oauth2 strategy'
@@ -23,8 +30,15 @@ describe OmniAuth::Strategies::Facebook do
   end
 
   describe '#authorize_params' do
-    it 'is empty by default' do
-      subject.authorize_params.should be_empty
+    it 'includes default scope for email and offline access' do
+      subject.authorize_params.should be_a(Hash)
+      subject.authorize_params[:scope].should eq('email,offline_access')
+    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
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-facebook
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-29 00:00:00.000000000Z
+date: 2011-11-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
-  requirement: &2153016200 !ruby/object:Gem::Requirement
+  requirement: &70323804271400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc2
+        version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153016200
+  version_requirements: *70323804271400
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153015460 !ruby/object:Gem::Requirement
+  requirement: &70323804270900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2153015460
+  version_requirements: *70323804270900
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153014400 !ruby/object:Gem::Requirement
+  requirement: &70323804270520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153014400
+  version_requirements: *70323804270520
 description: 
 email:
 - mark@mkdynamic.co.uk
@@ -94,4 +94,3 @@ test_files:
 - spec/omniauth/strategies/facebook_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples.rb
-has_rdoc: