contour 0.5.0 → 0.5.1

data/CHANGELOG.rdoc

@@ -1,3 +1,11 @@
+== 0.5.1
+
+* Refactoring
+  * Removed debug output
+
+* Documentation
+  * Contour Walkthrough from an empty Rails 3.1 application now works correctly (# Devise.config.sign_out_via = :delete)
+
 == 0.5.0
 
 * Enhancements

data/README.rdoc

@@ -132,12 +132,29 @@ Add the following to your app/models/user.rb
     (authentications.empty? || !password.blank?) && super
   end
 
+Add the following to your app/models/authentication.rb
+
+  belongs_to :user
+
+  def provider_name
+    if provider == 'open_id'
+      "OpenID"
+    else
+      provider.titleize
+    end
+  end
+
 Make sure the devise line in config/routes.rb looks as follows
 
   devise_for :users, :controllers => {:registrations => 'contour/registrations', :sessions => 'contour/sessions', :passwords => 'contour/passwords'}, :path_names => { :sign_up => 'register', :sign_in => 'login' }
   
 If there is a line that just says 'devise_for :users' or a duplicate, remove it
 
+Edit config/initializers/devise.rb and comment out the sign_out_via delete line
+
+  # The default HTTP method used to sign out a resource. Default is :delete.
+  # config.sign_out_via = :delete
+
 Start your server and navigate to localhost:3000/users/login
 
   rails s

data/lib/contour/fixes/omniauth.rb

@@ -7,7 +7,7 @@ module OmniAuth
       # include OmniAuth::Strategy
       
       def initialize(app, options = {}, &block)
-        Rails.logger.debug "Contour::Fixes => Omniauth::Strategies::LDAP::initialize"
+        # Rails.logger.debug "Contour::Fixes => Omniauth::Strategies::LDAP::initialize"
         super(app, options[:name] || :ldap, options.dup, &block)
         @name_proc = (@options.delete(:name_proc) || Proc.new {|name| name})
         @adaptor = OmniAuth::Strategies::LDAP::Adaptor.new(options)
@@ -19,13 +19,13 @@ module OmniAuth
       # Reroutes directly to callback_phase instead of redirecting to callback_path
       # TODO: Possibility that this could be removed in the future.
       def request_phase
-        Rails.logger.info "Request Phase Hook"
+        # Rails.logger.info "Contour::Fixes => Omniauth::Strategies::LDAP::request_phase Request Phase Hook"
         if env['REQUEST_METHOD'] == 'GET'
           get_credentials
         else
           session['omniauth.ldap'] = {'username' => request['username'], 'password' => request['password']}
           if true
-            Rails.logger.info "Skipping Redirect"
+            # Rails.logger.info "Contour::Fixes => Omniauth::Strategies::LDAP::request_phase Skipping Redirect"
             callback_phase # Added
           else
             redirect callback_path

data/lib/contour/fixes/rack.rb

@@ -2,7 +2,7 @@
 module Rack
   class Request
     def scheme
-      Rails.logger.debug "Contour::Fixes => Rack::Request::scheme"
+      # Rails.logger.debug "Contour::Fixes => Rack::Request::scheme"
       if @env['HTTPS'] == 'on'
         'https'
       elsif @env['HTTP_X_FORWARDED_SSL'] == 'on'
@@ -20,7 +20,8 @@ module Rack
 
     def host_with_port
       if forwarded = @env["HTTP_X_FORWARDED_HOST"]
-        Rails.logger.debug "@env[HTTP_X_FORWARDED_HOST]: #{@env["HTTP_X_FORWARDED_HOST"]} USING => #{forwarded.split(/,\s?/).first}"
+        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

data/lib/contour/version.rb

@@ -1,3 +1,3 @@
 module Contour
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contour
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-08 00:00:00.000000000Z
+date: 2011-09-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70117242428300 !ruby/object:Gem::Requirement
+  requirement: &70170518340580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *70117242428300
+  version_requirements: *70170518340580
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &70117242427760 !ruby/object:Gem::Requirement
+  requirement: &70170518339820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 0.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70117242427760
+  version_requirements: *70170518339820
 description: Basic Rails Framework files and assets for layout and authentication
 email: remosm@gmail.com
 executables: []