contour 0.9.2 → 0.9.3

data/app/views/contour/passwords/new.html.erb

@@ -1,10 +1,10 @@
 <% @title = 'Forgot your password?' %>
 
-<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
+<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
   <%= devise_error_messages! %>
   <fieldset style="width:235px">
     <legend><%= @title %></legend>
-    
+
     <div class="field">
       <%= f.label :email %><br />
       <%= f.text_field :email %>
@@ -12,7 +12,7 @@
   </fieldset>
   <div class="actions">
     <% form_name = "new_#{resource.class.name.underscore}" %>
-    <%= link_to_function image_tag('contour/tick.png', :alt => '') + "Send me reset password instructions", "$('##{form_name}').submit();", :class => "button positive" %>
+    <%= link_to_function image_tag('contour/tick.png', alt: '') + "Send me reset password instructions", "$('##{form_name}').submit();", class: "button positive" %>
     <div style="clear:both"></div><br />
     <%= link_to "Login here!", new_session_path(resource_name) %> or <%= link_to "Register here!", new_registration_path(resource_name) %>
   </div>

data/app/views/contour/registrations/edit.html.erb

@@ -1,6 +1,6 @@
 <h2>Edit <%= resource_name.to_s.humanize %></h2>
 
-<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
+<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
   <%= devise_error_messages! %>
 
   <p><%= f.label :email %><br />
@@ -20,6 +20,6 @@
 
 <h3>Cancel my account</h3>
 
-<p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.</p>
+<p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), confirm: "Are you sure?", method: :delete %>.</p>
 
 <%= link_to "Back", :back %>

data/app/views/contour/registrations/new.html.erb

@@ -1,17 +1,17 @@
 <% @title = 'Register' %>
 
-<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
+<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
   <%= devise_error_messages! %>
   <fieldset style="width:235px">
     <legend><%= @title %></legend>
-    
+
     <% if resource.methods.include?(:first_name) %>
       <div class="field">
         <%= f.label :first_name %><br />
         <%= f.text_field :first_name  %>
       </div>
     <% end %>
-  
+
     <% if resource.methods.include?(:last_name) %>
       <div class="field">
         <%= f.label :last_name %><br />
@@ -38,7 +38,7 @@
   </fieldset>
   <div class="actions">
     <% form_name = "new_#{resource.class.name.underscore}" %>
-    <%= link_to_function image_tag('contour/tick.png', :alt => '') + "Sign up", "$('##{form_name}').submit();", :class => "button positive" %>
+    <%= link_to_function image_tag('contour/tick.png', alt: '') + "Sign up", "$('##{form_name}').submit();", class: "button positive" %>
     <div style="clear:both"></div><br />
     <%= link_to "Already signed up? Login here!", new_session_path(resource_name) %>
   </div>

data/app/views/contour/sessions/new.html.erb

@@ -3,10 +3,10 @@
 <table class="blank padded">
   <tr>
     <td style="vertical-align:top">
-      <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
+      <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
         <fieldset style="width:235px">
           <legend><%= @title %></legend>
-    
+
           <div class="field">
             <%= f.label :email %><br />
             <%= f.text_field :email %>
@@ -18,7 +18,7 @@
         </fieldset>
         <div class="actions">
           <% form_name = "new_#{resource.class.name.underscore}" %>
-          <%= link_to_function image_tag('contour/tick.png', :alt => '') + "Login", "$('##{form_name}').submit();", :class => "button positive" %>
+          <%= link_to_function image_tag('contour/tick.png', alt: '') + "Login", "$('##{form_name}').submit();", class: "button positive" %>
           <% if devise_mapping.rememberable? -%>
             <div style="padding-top:5px;padding-bottom:4px;"><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
           <% end -%>
@@ -30,7 +30,7 @@
       <% end %>
     </td>
     <td style="vertical-align:top">
-      <%= render :partial => 'contour/layouts/latest_news' %>
+      <%= render partial: 'contour/layouts/latest_news' %>
     </td>
   </tr>
 </table>

data/contour.gemspec

@@ -17,20 +17,20 @@ Gem::Specification.new do |s|
   s.homepage    = 'https://github.com/remomueller'
   s.summary     = 'Basic Rails framework files and assets for layout and authentication'
   s.description = 'Basic Rails Framework files and assets for layout and authentication'
-  
+
   s.platform = Gem::Platform::RUBY
-  
-  s.add_dependency 'rails',                   '~> 3.2.0.rc2'
+
+  s.add_dependency 'rails',                   '~> 3.2.0'
   s.add_dependency 'jquery-rails',            '~> 2.0.0'
-  s.add_dependency 'devise',                  '~> 1.5.3'
-  s.add_dependency 'omniauth',                '~> 1.0.1'
+  s.add_dependency 'devise',                  '~> 2.0.0.rc' #'~> 1.5.3'
+  s.add_dependency 'omniauth',                '~> 1.0.2'
   s.add_dependency 'omniauth-openid',         '~> 1.0.1'
   s.add_dependency 'omniauth-ldap',           '~> 1.0.2'
   s.add_dependency 'omniauth-twitter',        '~> 0.0.7'
   s.add_dependency 'omniauth-facebook',       '~> 1.2.0'
   s.add_dependency 'omniauth-linkedin',       '~> 0.0.6'
   s.add_dependency 'omniauth-cas',            '~> 0.0.3'
-  
+
   s.files = Dir["{app,config,db,lib}/**/*"] + ["CHANGELOG.rdoc", "contour.gemspec", "LICENSE", "Rakefile", "README.rdoc"]
   s.test_files = Dir["test/**/*"]
 end

data/lib/contour/fixes/omniauth.rb

@@ -2,6 +2,8 @@ require 'omniauth'
 require 'omniauth-ldap'
 
 # Overwriting methods from Rack
+# While OmniAuth 1.0.2 fixes the Builder setup, Rack 1.4.0 still responds incorrectly to it's release version.
+# Wait for Rack 1.4.1 or updated version before removing the Builder fixes
 module OmniAuth
 
   # class Builder updates for Rack 1.4.0
@@ -10,15 +12,15 @@ module OmniAuth
       @use, @map, @run = [], nil, app
       instance_eval(&block) if block_given?
     end
-    
+
     def on_failure(&block)
       OmniAuth.config.on_failure = block
     end
-  
+
     def configure(&block)
       OmniAuth.configure(&block)
     end
-  
+
     def provider(klass, *args, &block)
       if klass.is_a?(Class)
         middleware = klass
@@ -29,10 +31,10 @@ module OmniAuth
           raise LoadError, "Could not find matching strategy for #{klass.inspect}. You may need to install an additional gem (such as omniauth-#{klass})."
         end
       end
-  
+
       use middleware, *args, &block
     end
-  
+
     def call(env)
       to_app.call(env)
     end
@@ -41,13 +43,8 @@ end
 
 # Fix for LDAP Authentication with Domains
 module OmniAuth
-  class Form
-    def hidden_field(name, value)
-      @html << "<input type='hidden' id='#{name}' name='#{name}' value='#{value}'/>"
-      self
-    end
-  end
-  
+
+  # Required to correctly authenticate given bind_dn and LDAP
   module LDAP
     class Adaptor
       class LdapError < StandardError; end
@@ -64,7 +61,7 @@ module OmniAuth
         end
         raise ArgumentError.new(message.join(",") +" MUST be provided") unless message.empty?
       end
-      
+
       def bind_as(args = {})
         result = false
         ldap = @connection
@@ -73,43 +70,39 @@ module OmniAuth
         result = rs.first if rs
         result
       end
-      
+
     end
   end
 
+  # Required for proper script name for suburis
+  # Required for appending domain option to user credentials
   module Strategies
     class LDAP
       include OmniAuth::Strategy
-      
+
       option :domain, ''
-      
+
       def request_phase
         OmniAuth::LDAP::Adaptor.validate @options
-        f = OmniAuth::Form.new(:title => (options[:title] || "LDAP Authentication"), :url => "#{@env['SCRIPT_NAME']}" + callback_path)
-        f.hidden_field 'domain', options[:domain] # Added to allow domains from option
+        f = OmniAuth::Form.new( title: (options[:title] || "LDAP Authentication"), url: "#{@env['SCRIPT_NAME']}" + callback_path ) # Modified to include @env['SCRIPT_NAME']
         f.text_field 'Login', 'username'
         f.password_field 'Password', 'password'
+        f.button "Sign In"
         f.to_response
       end
-      
+
       def callback_phase
-        failure_temp_path = "#{@env['SCRIPT_NAME']}/#{OmniAuth.config.path_prefix.split('/').last}/failure?message=invalid_credentials" # Added
-        bind_dn = "#{request['domain'] + '\\' unless request['domain'].blank?}#{request['username']}" # Added
+        bind_dn = "#{@options[:domain] + '\\' unless @options[:domain].blank?}#{request['username']}" # Added
         @options[:bind_dn] = bind_dn if @options[:bind_dn].blank? # Added
         @adaptor = OmniAuth::LDAP::Adaptor.new @options
-
         raise MissingCredentialsError.new("Missing login credentials") if request['username'].nil? || request['password'].nil?
         begin
-          @ldap_user_info = @adaptor.bind_as(base: @adaptor.base, username: bind_dn, :password => request['password']) # Modified
-
-          # return fail!(:invalid_credentials) if !@ldap_user_info
-          return redirect failure_temp_path if !@ldap_user_info
-
+          @ldap_user_info = @adaptor.bind_as(base: @adaptor.base, username: bind_dn, password: request['password']) # Modified
+          return fail!(:invalid_credentials) if !@ldap_user_info
           @user_info = self.class.map_user(@@config, @ldap_user_info)
           super
         rescue Exception => e
-          # return fail!(:ldap_error, e)
-          return redirect failure_temp_path
+          return fail!(:ldap_error, e)
         end
       end
     end

data/lib/contour/fixes/rack.rb

@@ -1,27 +1,10 @@
 # Overwriting methods from Rack
 module Rack
   class Request
-    def scheme
-      # Rails.logger.debug "Contour::Fixes => Rack::Request::scheme"
-      if @env['HTTPS'] == 'on'
-        'https'
-      elsif @env['HTTP_X_FORWARDED_SSL'] == 'on'
-        'https'
-      elsif @env['HTTP_X_FORWARDED_PROTO']
-        @env['HTTP_X_FORWARDED_PROTO'].split(',')[0]
-      else
-        @env["rack.url_scheme"]
-      end
-    end
-
-    def ssl?
-      scheme == 'https'
-    end
-
     def host_with_port
       if forwarded = @env["HTTP_X_FORWARDED_HOST"]
-        Rails.logger.info "\n\nContour::Fixes => Rack::Request::host_with_port"
-        Rails.logger.info "@env[HTTP_X_FORWARDED_HOST]: #{@env["HTTP_X_FORWARDED_HOST"]} USING => #{forwarded.split(/,\s?/).first}\n\n"
+        Rails.logger.info "\n\nContour::Fixes Rack::Request::host_with_port"
+        Rails.logger.info "@env[HTTP_X_FORWARDED_HOST]: #{@env["HTTP_X_FORWARDED_HOST"]} USING: #{forwarded.split(/,\s?/).first}\n\n"
         # forwarded.split(/,\s?/).last
         # changed forwarded to first since we don't want the internal IP.
         forwarded.split(/,\s?/).first
@@ -29,19 +12,5 @@ module Rack
         @env['HTTP_HOST'] || "#{@env['SERVER_NAME'] || @env['SERVER_ADDR']}:#{@env['SERVER_PORT']}"
       end
     end
-
-    def port
-      if port = host_with_port.split(/:/)[1]
-        port.to_i
-      elsif port = @env['HTTP_X_FORWARDED_PORT']
-        port.to_i
-      elsif ssl?
-        443
-      elsif @env.has_key?("HTTP_X_FORWARDED_HOST")
-        80
-      else
-        @env["SERVER_PORT"].to_i
-      end
-    end
   end
 end

data/lib/contour/version.rb

@@ -2,7 +2,7 @@ module Contour
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 9
-    TINY = 2
+    TINY = 3
     BUILD = nil # nil, "pre", "rc", "rc2"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')

data/test/dummy/app/models/user.rb

@@ -11,35 +11,35 @@ class User < ActiveRecord::Base
   attr_accessible :email, :password, :password_confirmation, :remember_me, :first_name, :last_name
 
   # Named Scopes
-  scope :current, :conditions => { :deleted => false }
-  
+  scope :current, conditions: { deleted: false }
+
   # Model Relationships
   has_many :authentications
-  
+
   def name
-    first_name + ' ' + last_name
+    "#{first_name} #{last_name}"
   end
-  
+
   def reverse_name
-    last_name + ', ' + first_name
+    "#{last_name}, #{first_name}"
   end
 
   # Overriding Devise built-in active? method
   def active_for_authentication?
     super and self.status == 'active' and not self.deleted?
   end
-  
+
   def apply_omniauth(omniauth)
     unless omniauth['info'].blank?
       self.email = omniauth['info']['email'] if email.blank?
       self.first_name = omniauth['info']['first_name'] if first_name.blank?
       self.last_name = omniauth['info']['last_name'] if last_name.blank?
     end
-    authentications.build(:provider => omniauth['provider'], :uid => omniauth['uid'])
+    authentications.build( provider: omniauth['provider'], uid: omniauth['uid'] )
   end
 
   def password_required?
     (authentications.empty? || !password.blank?) && super
   end
-  
+
 end

data/test/dummy/config/initializers/devise.rb

@@ -1,13 +1,17 @@
-# Use this hook to configure devise mailer, warden hooks and so forth. The first
-# four configuration values can also be set straight in your models.
+# Use this hook to configure devise mailer, warden hooks and so forth.
+# Many of these configuration options can be set straight in your model.
 Devise.setup do |config|
   # ==> Mailer Configuration
-  # Configure the e-mail address which will be shown in DeviseMailer.
-  config.mailer_sender = "please-change-me@config-initializers-devise.com"
+  # Configure the e-mail address which will be shown in Devise::Mailer,
+  # note that it will be overwritten if you use your own mailer class with default "from" parameter.
+  config.mailer_sender = "please-change-me-at-config-initializers-devise@example.com"
 
   # Configure the class responsible to send e-mails.
   # config.mailer = "Devise::Mailer"
 
+  # Automatically apply schema changes in tableless databases
+  config.apply_schema = false
+
   # ==> ORM configuration
   # Load and configure the ORM. Supports :active_record (default) and
   # :mongoid (bson_ext recommended) by default. Other ORMs may be
@@ -15,68 +19,109 @@ Devise.setup do |config|
   require 'devise/orm/active_record'
 
   # ==> Configuration for any authentication mechanism
-  # Configure which keys are used when authenticating an user. By default is
+  # Configure which keys are used when authenticating a user. The default is
   # just :email. You can configure it to use [:username, :subdomain], so for
-  # authenticating an user, both parameters are required. Remember that those
+  # authenticating a user, both parameters are required. Remember that those
   # parameters are used only when authenticating and not when retrieving from
   # session. If you need permissions, you should implement that in a before filter.
+  # You can also supply a hash where the value is a boolean determining whether
+  # or not authentication should be aborted when the value is not present.
   # config.authentication_keys = [ :email ]
 
+  # Configure parameters from the request object used for authentication. Each entry
+  # given should be a request method and it will automatically be passed to the
+  # find_for_authentication method and considered in your model lookup. For instance,
+  # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
+  # The same considerations mentioned for authentication_keys also apply to request_keys.
+  # config.request_keys = []
+
+  # Configure which authentication keys should be case-insensitive.
+  # These keys will be downcased upon creating or modifying a user and when used
+  # to authenticate or find a user. Default is :email.
+  config.case_insensitive_keys = [ :email ]
+
+  # Configure which authentication keys should have whitespace stripped.
+  # These keys will have whitespace before and after removed upon creating or
+  # modifying a user and when used to authenticate or find a user. Default is :email.
+  config.strip_whitespace_keys = [ :email ]
+
   # Tell if authentication through request.params is enabled. True by default.
   # config.params_authenticatable = true
 
-  # Tell if authentication through HTTP Basic Auth is enabled. True by default.
+  # Tell if authentication through HTTP Basic Auth is enabled. False by default.
   config.http_authenticatable = true
 
-  # Set this to true to use Basic Auth for AJAX requests.  True by default.
+  # If http headers should be returned for AJAX requests. True by default.
   # config.http_authenticatable_on_xhr = true
 
-  # The realm used in Http Basic Authentication
+  # The realm used in Http Basic Authentication. "Application" by default.
   # config.http_authentication_realm = "Application"
 
+  # It will change confirmation, password recovery and other workflows
+  # to behave the same regardless if the e-mail provided was right or wrong.
+  # Does not affect registerable.
+  # config.paranoid = true
+
+  # By default Devise will store the user in session. You can skip storage for
+  # :http_auth and :token_auth by adding those symbols to the array below.
+  config.skip_session_storage = [:http_auth]
+
   # ==> Configuration for :database_authenticatable
   # For bcrypt, this is the cost for hashing the password and defaults to 10. If
   # using other encryptors, it sets how many times you want the password re-encrypted.
-  config.stretches = 10
-
-  # Define which will be the encryption algorithm. Devise also supports encryptors
-  # from others authentication tools as :clearance_sha1, :authlogic_sha512 (then
-  # you should set stretches above to 20 for default behavior) and :restful_authentication_sha1
-  # (then you should set stretches to 10, and copy REST_AUTH_SITE_KEY to pepper)
-  config.encryptor = :bcrypt
+  #
+  # Limiting the stretches to just one in testing will increase the performance of
+  # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
+  # a value less than 10 in other environments.
+  config.stretches = Rails.env.test? ? 1 : 10
 
   # Setup a pepper to generate the encrypted password.
   config.pepper = "d142367154e5beacca404b1a6a4f8bc52c6fdcfa3ccc3cf8eb49f3458a688ee6ac3b9fae488432a3bfca863b8a90008368a9f3a3dfbe5a962e64b6ab8f3a3a1a"
 
-  # ==> Configuration for :confirmable
-  # The time you want to give your user to confirm his account. During this time
-  # he will be able to access your application without confirming. Default is nil.
-  # When confirm_within is zero, the user won't be able to sign in without confirming. 
-  # You can use this to let your user access some features of your application 
-  # without confirming the account, but blocking it after a certain period 
-  # (ie 2 days). 
-  # config.confirm_within = 2.days
+# ==> Configuration for :confirmable
+  # A period that the user is allowed to access the website even without
+  # confirming his account. For instance, if set to 2.days, the user will be
+  # able to access the website for two days without confirming his account,
+  # access will be blocked just in the third day. Default is 0.days, meaning
+  # the user cannot access the website without confirming his account.
+  # config.allow_unconfirmed_access_for = 2.days
+
+  # If true, requires any email changes to be confirmed (exctly the same way as
+  # initial account confirmation) to be applied. Requires additional unconfirmed_email
+  # db field (see migrations). Until confirmed new email is stored in
+  # unconfirmed email column, and copied to email column on successful confirmation.
+  config.reconfirmable = true
+
+  # Defines which key will be used when confirming an account
+  # config.confirmation_keys = [ :email ]
 
   # ==> Configuration for :rememberable
   # The time the user will be remembered without asking for credentials again.
   # config.remember_for = 2.weeks
 
-  # If true, a valid remember token can be re-used between multiple browsers.
-  # config.remember_across_browsers = true
-
   # If true, extends the user's remember period when remembered via cookie.
   # config.extend_remember_period = false
 
+  # If true, uses the password salt as remember token. This should be turned
+  # to false if you are not using database authenticatable.
+  config.use_salt_as_remember_token = true
+
+  # Options to be passed to the created cookie. For instance, you can set
+  # :secure => true in order to force SSL only cookies.
+  # config.cookie_options = {}
+
   # ==> Configuration for :validatable
-  # Range for password length
-  # config.password_length = 6..20
+  # Range for password length. Default is 6..128.
+  # config.password_length = 6..128
 
-  # Regex to use to validate the email address
-  # config.email_regexp = /^([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})$/i
+  # Email regex used to validate email formats. It simply asserts that
+  # an one (and only one) @ exists in the given string. This is mainly
+  # to give user feedback and not to assert the e-mail validity.
+  # config.email_regexp = /\A[^@]+@[^@]+\z/
 
   # ==> Configuration for :timeoutable
   # The time you want to timeout the user session without activity. After this
-  # time the user will be asked for credentials again.
+  # time the user will be asked for credentials again. Default is 30 minutes.
   config.timeout_in = 8.hours
 
   # ==> Configuration for :lockable
@@ -85,6 +130,9 @@ Devise.setup do |config|
   # :none            = No lock strategy. You should handle locking by yourself.
   # config.lock_strategy = :failed_attempts
 
+  # Defines which key will be used when locking and unlocking an account
+  # config.unlock_keys = [ :email ]
+
   # Defines which strategy will be used to unlock an account.
   # :email = Sends an unlock link to the user email
   # :time  = Re-enables login after a certain amount of time (see :unlock_in below)
@@ -99,6 +147,24 @@ Devise.setup do |config|
   # Time interval to unlock the account if :time is enabled as unlock_strategy.
   # config.unlock_in = 1.hour
 
+  # ==> Configuration for :recoverable
+  #
+  # Defines which key will be used when recovering the password for an account
+  # config.reset_password_keys = [ :email ]
+
+  # Time interval you can reset your password with a reset password key.
+  # Don't put a too small interval or your users won't have the time to
+  # change their passwords.
+  config.reset_password_within = 6.hours
+
+  # ==> Configuration for :encryptable
+  # Allow you to use another encryption algorithm besides bcrypt (default). You can use
+  # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1,
+  # :authlogic_sha512 (then you should set stretches above to 20 for default behavior)
+  # and :restful_authentication_sha1 (then you should set stretches to 10, and copy
+  # REST_AUTH_SITE_KEY to pepper)
+  # config.encryptor = :sha512
+
   # ==> Configuration for :token_authenticatable
   # Defines name of the authentication token params key
   # config.token_authentication_key = :auth_token
@@ -107,36 +173,43 @@ Devise.setup do |config|
   # Turn scoped views on. Before rendering "sessions/new", it will first check for
   # "users/sessions/new". It's turned off by default because it's slower if you
   # are using only default views.
-  # config.scoped_views = true
+  # config.scoped_views = false
 
   # Configure the default scope given to Warden. By default it's the first
-  # devise role declared in your routes.
+  # devise role declared in your routes (usually :user).
   # config.default_scope = :user
 
-  # Configure sign_out behavior. 
-  # By default sign_out is scoped (i.e. /users/sign_out affects only :user scope).
-  # In case of sign_out_all_scopes set to true any logout action will sign out all active scopes.
-  # config.sign_out_all_scopes = false
+  # Configure sign_out behavior.
+  # Sign_out action can be scoped (i.e. /users/sign_out affects only :user scope).
+  # The default is true, which means any logout action will sign out all active scopes.
+  # config.sign_out_all_scopes = true
 
   # ==> Navigation configuration
   # Lists the formats that should be treated as navigational. Formats like
   # :html, should redirect to the sign in page when the user does not have
   # access, but formats like :xml or :json, should return 401.
+  #
   # If you have any extra navigational formats, like :iphone or :mobile, you
-  # should add them to the navigational formats lists. Default is [:html]
-  # config.navigational_formats = [:html, :iphone]
+  # should add them to the navigational formats lists.
+  #
+  # The :"*/*" and "*/*" formats below is required to match Internet
+  # Explorer requests.
+  # config.navigational_formats = [:"*/*", "*/*", :html]
+
+  # The default HTTP method used to sign out a resource. Default is :delete.
+  config.sign_out_via = :get
+
+  # ==> OmniAuth
+  # Add a new OmniAuth provider. Check the wiki for more information on setting
+  # up on your models and hooks.
+  # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
 
   # ==> Warden configuration
-  # If you want to use other strategies, that are not (yet) supported by Devise,
-  # you can configure them inside the config.warden block. The example below
-  # allows you to setup OAuth, using http://github.com/roman/warden_oauth
+  # If you want to use other strategies, that are not supported by Devise, or
+  # change the failure app, you can configure them inside the config.warden block.
   #
   # config.warden do |manager|
-  #   manager.oauth(:twitter) do |twitter|
-  #     twitter.consumer_secret = <YOUR CONSUMER SECRET>
-  #     twitter.consumer_key  = <YOUR CONSUMER KEY>
-  #     twitter.options :site => 'http://twitter.com'
-  #   end
-  #   manager.default_strategies(:scope => :user).unshift :twitter_oauth
+  #   manager.intercept_401 = false
+  #   manager.default_strategies(:scope => :user).unshift :some_external_strategy
   # end
 end