contour 2.7.0 → 3.0.0.beta1

data/test/controllers/sessions_controller_test.rb

@@ -21,18 +21,6 @@ class Contour::SessionsControllerTest < ActionController::TestCase
     assert_response :success
   end
 
-  test "should do a graceful redirect to ldap with primary email" do
-    post :create, user: { email: users(:valid).email, password: '' }
-
-    assert_redirected_to '/auth/ldap'
-  end
-
-  test "should do a graceful redirect to google_apps through secondary email" do
-    post :create, user: { email: 'test@gmail.com', password: '' }
-
-    assert_redirected_to '/auth/google_apps'
-  end
-
   test "should not login invalid credentials" do
     post :create, user: { email: '', password: '' }
 

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

@@ -7,9 +7,6 @@ class User < ActiveRecord::Base
   devise :database_authenticatable, :registerable, :timeoutable,
          :recoverable, :rememberable, :trackable, :validatable
 
-  # Concerns
-  include Contourable
-
   # # Setup accessible (or protected) attributes for your model
   # attr_accessible :email, :password, :password_confirmation, :remember_me, :first_name, :last_name
 

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

@@ -21,15 +21,11 @@ Contour.setup do |config|
   # [
   #   {
   #     name: 'Login', display: 'not_signed_in', path: 'new_user_session_path', position: 'right', condition: 'true',
-  #     links: [{ name: 'Sign Up', path: 'new_user_registration_path' },
-  #             { divider: true },
-  #             { authentications: true }]
+  #     links: [{ name: 'Sign Up', path: 'new_user_registration_path' }]
   #   },
   #   {
   #     name: 'current_user.email', eval: true, display: 'signed_in', position: 'right', condition: 'true',
-  #     links: [{ name: 'Authentications', path: 'authentications_path', condition: 'not PROVIDERS.blank?' },
-  #             { divider: true },
-  #             { name: 'Logout', path: 'destroy_user_session_path' }]
+  #     links: [{ name: 'Logout', path: 'destroy_user_session_path' }]
   #   },
   #   {
   #     name: 'Home', display: 'always', path: 'root_path', position: 'left', condition: 'true', image: '', image_options: {},
@@ -46,12 +42,6 @@ Contour.setup do |config|
   #   position: 'left'
   # }
 
-  # Enter an address of a valid RSS Feed if you would like to see news on the sign in page.
-  # config.news_feed = ''
-
-  # Enter the max number of items you want to see in the news feed.
-  # config.news_feed_items = 5
-
   # The following three parameters can be set as strings, which will rotate through the colors on a daily basis, selecting an index using (YearDay % ArraySize)
 
   # A string or array of strings that represent a CSS color code for generic link color

data/test/dummy/db/migrate/20111203203123_devise_create_users.rb

@@ -42,7 +42,7 @@ class DeviseCreateUsers < ActiveRecord::Migration
       # t.string :authentication_token
 
 
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :users, :email,                     unique: true

data/test/dummy/db/schema.rb

@@ -11,17 +11,9 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20111203203307) do
+ActiveRecord::Schema.define(version: 20111203203123) do
 
-  create_table "authentications", force: true do |t|
-    t.integer  "user_id"
-    t.string   "provider"
-    t.string   "uid"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "users", force: true do |t|
+  create_table "users", force: :cascade do |t|
     t.string   "first_name"
     t.string   "last_name"
     t.string   "status",                 default: "pending", null: false
@@ -36,8 +28,8 @@ ActiveRecord::Schema.define(version: 20111203203307) do
     t.datetime "last_sign_in_at"
     t.string   "current_sign_in_ip"
     t.string   "last_sign_in_ip"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                                 null: false
+    t.datetime "updated_at",                                 null: false
   end
 
   add_index "users", ["email"], name: "index_users_on_email", unique: true

data/test/dummy/test/fixtures/users.yml

@@ -95,4 +95,4 @@ pending:
   # failed_attempts: 0
   # unlock_token: UnlockTokenFour
   # locked_at: 2011-02-23
-  # authentication_token: MyString
+  # authentication_token: MyString

data/test/models/user_test.rb

@@ -6,8 +6,4 @@ class UserTest < ActiveSupport::TestCase
   test "should get reverse name" do
     assert_equal 'LastName, FirstName', users(:valid).reverse_name
   end
-
-  test "should apply omniauth" do
-    assert_not_nil users(:valid).apply_omniauth({'info' => {'email' => 'Email', 'first_name' => 'FirstName', 'last_name' => 'LastName'}})
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contour
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 3.0.0.beta1
 platform: ruby
 authors:
 - Remo Mueller
@@ -66,48 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.4.1
-- !ruby/object:Gem::Dependency
-  name: omniauth
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.1
-- !ruby/object:Gem::Dependency
-  name: omniauth-ldap
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.4
-- !ruby/object:Gem::Dependency
-  name: omniauth-openid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -232,11 +190,10 @@ files:
 - app/assets/stylesheets/contour.scss
 - app/assets/stylesheets/contour/about.scss
 - app/assets/stylesheets/datepicker.scss
-- app/assets/stylesheets/glyphicon-overrides.scss.erb
+- app/assets/stylesheets/glyphicon-overrides.scss
 - app/assets/stylesheets/jquery-ui-1.10.0.custom.scss
-- app/assets/stylesheets/opensans.css.erb
+- app/assets/stylesheets/opensans.scss
 - app/assets/stylesheets/typeahead.js-bootstrap.scss
-- app/controllers/contour/authentications_controller.rb
 - app/controllers/contour/confirmations_controller.rb
 - app/controllers/contour/passwords_controller.rb
 - app/controllers/contour/registrations_controller.rb
@@ -244,17 +201,8 @@ files:
 - app/controllers/contour/sessions_controller.rb
 - app/controllers/contour/unlocks_controller.rb
 - app/helpers/contour_helper.rb
-- app/models/authentication.rb
-- app/models/concerns/contour_authenticatable.rb
-- app/models/concerns/contourable.rb
 - app/views/contour/_links.html.erb
-- app/views/contour/authentications/_add_remove_table.html.erb
-- app/views/contour/authentications/_authentications.html.erb
-- app/views/contour/authentications/_menu.html.erb
-- app/views/contour/authentications/destroy.js.erb
-- app/views/contour/authentications/index.html.erb
 - app/views/contour/confirmations/new.html.erb
-- app/views/contour/layouts/_latest_news.html.erb
 - app/views/contour/layouts/_menu.html.erb
 - app/views/contour/layouts/_per_page.html.erb
 - app/views/contour/layouts/application.html.erb
@@ -292,16 +240,12 @@ files:
 - lib/contour.rb
 - lib/contour/engine.rb
 - lib/contour/fixes.rb
-- lib/contour/fixes/devise-with-rails-4-2.rb
 - lib/contour/fixes/devise.rb
-- lib/contour/fixes/omniauth.rb
 - lib/contour/fixes/rack.rb
-- lib/contour/fixes/sass-rails.rb
 - lib/contour/version.rb
 - lib/generators/contour/install/install_generator.rb
 - lib/generators/contour/install/templates/README
 - lib/generators/contour/install/templates/contour.rb
-- lib/generators/contour/install/templates/omniauth.rb
 - lib/generators/contour/scaffold/USAGE
 - lib/generators/contour/scaffold/scaffold_generator.rb
 - lib/generators/contour/scaffold/templates/_form.html.erb
@@ -312,7 +256,6 @@ files:
 - lib/generators/contour/scaffold/templates/new.html.erb
 - lib/generators/contour/scaffold/templates/show.html.erb
 - test/contour_test.rb
-- test/controllers/authentications_controller_test.rb
 - test/controllers/passwords_controller_test.rb
 - test/controllers/registrations_controller_test.rb
 - test/controllers/sessions_controller_test.rb
@@ -341,7 +284,6 @@ files:
 - test/dummy/config/initializers/filter_parameter_logging.rb
 - test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/omniauth.rb
 - test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/wrap_parameters.rb
@@ -349,7 +291,6 @@ files:
 - test/dummy/config/routes.rb
 - test/dummy/db/development.sqlite3
 - test/dummy/db/migrate/20111203203123_devise_create_users.rb
-- test/dummy/db/migrate/20111203203307_create_authentications.rb
 - test/dummy/db/schema.rb
 - test/dummy/db/test.sqlite3
 - test/dummy/public/404.html
@@ -357,11 +298,9 @@ files:
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
 - test/dummy/script/rails
-- test/dummy/test/fixtures/authentications.yml
 - test/dummy/test/fixtures/users.yml
 - test/helpers/contour_helper_test.rb
 - test/integration/navigation_test.rb
-- test/models/authentication_test.rb
 - test/models/user_test.rb
 - test/test_helper.rb
 homepage: https://github.com/remomueller
@@ -379,9 +318,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5
@@ -390,7 +329,6 @@ specification_version: 4
 summary: Basic Rails framework files and assets for layout and authentication
 test_files:
 - test/contour_test.rb
-- test/controllers/authentications_controller_test.rb
 - test/controllers/passwords_controller_test.rb
 - test/controllers/registrations_controller_test.rb
 - test/controllers/sessions_controller_test.rb
@@ -417,7 +355,6 @@ test_files:
 - test/dummy/config/initializers/filter_parameter_logging.rb
 - test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/omniauth.rb
 - test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/wrap_parameters.rb
@@ -426,7 +363,6 @@ test_files:
 - test/dummy/config.ru
 - test/dummy/db/development.sqlite3
 - test/dummy/db/migrate/20111203203123_devise_create_users.rb
-- test/dummy/db/migrate/20111203203307_create_authentications.rb
 - test/dummy/db/schema.rb
 - test/dummy/db/test.sqlite3
 - test/dummy/public/404.html
@@ -435,10 +371,8 @@ test_files:
 - test/dummy/public/favicon.ico
 - test/dummy/Rakefile
 - test/dummy/script/rails
-- test/dummy/test/fixtures/authentications.yml
 - test/dummy/test/fixtures/users.yml
 - test/helpers/contour_helper_test.rb
 - test/integration/navigation_test.rb
-- test/models/authentication_test.rb
 - test/models/user_test.rb
 - test/test_helper.rb

data/app/assets/stylesheets/glyphicon-overrides.scss.erb

@@ -1,13 +0,0 @@
-@font-face {
-  font-family: 'Glyphicons Halflings Contour';
-  src:url('bootstrap/glyphicons-halflings-regular<%= asset_path('bootstrap/glyphicons-halflings-regular.eot').split('glyphicons-halflings-regular').last %>');
-
-  src:url('bootstrap/glyphicons-halflings-regular<%= asset_path('bootstrap/glyphicons-halflings-regular.eot').split('glyphicons-halflings-regular').last %>?#iefix') format('embedded-opentype'),
-      url('bootstrap/glyphicons-halflings-regular<%= asset_path('bootstrap/glyphicons-halflings-regular.woff').split('glyphicons-halflings-regular').last %>') format('woff'),
-      url('bootstrap/glyphicons-halflings-regular<%= asset_path('bootstrap/glyphicons-halflings-regular.ttf').split('glyphicons-halflings-regular').last %>') format('truetype'),
-      url('bootstrap/glyphicons-halflings-regular<%= asset_path('bootstrap/glyphicons-halflings-regular.svg').split('glyphicons-halflings-regular').last %>#glyphicons_halflingsregular') format('svg');
-}
-
-.glyphicon {
-  font-family: 'Glyphicons Halflings Contour';
-}

data/app/assets/stylesheets/opensans.css.erb

@@ -1,20 +0,0 @@
-@font-face {
-  font-family: 'Open Sans';
-  font-style: normal;
-  font-weight: 300;
-  src:url('opensans/OpenSans-Light<%= asset_path('opensans/OpenSans-Light.ttf').split('OpenSans-Light').last %>') format('truetype');
-}
-
-@font-face {
-  font-family: 'Open Sans';
-  font-style: normal;
-  font-weight: 400;
-  src:url('opensans/OpenSans-Regular<%= asset_path('opensans/OpenSans-Regular.ttf').split('OpenSans-Regular').last %>') format('truetype');
-}
-
-@font-face {
-  font-family: 'Open Sans';
-  font-style: normal;
-  font-weight: 700;
-  src:url('opensans/OpenSans-Bold<%= asset_path('opensans/OpenSans-Bold.ttf').split('OpenSans-Bold').last %>') format('truetype');
-}

data/app/controllers/contour/authentications_controller.rb

@@ -1,57 +0,0 @@
-class Contour::AuthenticationsController < ApplicationController
-  skip_before_action :verify_authenticity_token, only: :create
-
-  def index
-  end
-
-  def passthru
-    render file: "#{Rails.root}/public/404", formats: [:html], status: 404, layout: false
-  end
-
-  def failure
-    redirect_to new_user_session_path, alert: params[:message].blank? ? nil : params[:message].humanize
-  end
-
-  def create
-    omniauth = request.env["omniauth.auth"]
-    if omniauth
-      omniauth['uid'] = omniauth['info']['email'] if omniauth['provider'] == 'google_apps' and omniauth['info']
-      authentication = Authentication.find_by_provider_and_uid(omniauth['provider'], omniauth['uid'])
-      omniauth['info']['email'] = omniauth['extra']['raw_info']['email'] if omniauth['info'] and omniauth['info']['email'].blank? and omniauth['extra'] and omniauth['extra']['raw_info']
-      if authentication
-        logger.info "Existing authentication found."
-        session["user_return_to"] = request.env["action_dispatch.request.unsigned_session_cookie"]["user_return_to"] if request.env and request.env["action_dispatch.request.unsigned_session_cookie"] and request.env["action_dispatch.request.unsigned_session_cookie"]["user_return_to"] and session["user_return_to"].blank?
-        flash[:notice] = "Signed in successfully." if authentication.user.active_for_authentication?
-        sign_in_and_redirect(:user, authentication.user)
-      elsif current_user
-        logger.info "Logged in user found, creating associated authentication."
-        current_user.authentications.create!( provider: omniauth['provider'], uid: omniauth['uid'] )
-        redirect_to authentications_path, notice: "Authentication successful."
-      else
-        logger.info "Creating new user with new authentication."
-        user = User.new(params[:user])
-        user.apply_omniauth(omniauth)
-        user.password = Devise.friendly_token[0,20] if user.password.blank?
-        if user.save
-          session["user_return_to"] = request.env["action_dispatch.request.unsigned_session_cookie"]["user_return_to"] if request.env and request.env["action_dispatch.request.unsigned_session_cookie"] and request.env["action_dispatch.request.unsigned_session_cookie"]["user_return_to"] and session["user_return_to"].blank?
-          flash[:notice] = "Signed in successfully." if user.active_for_authentication?
-          sign_in_and_redirect(:user, user)
-        else
-          session[:omniauth] = omniauth.except('extra')
-          redirect_to new_user_registration_path
-        end
-      end
-    else
-      redirect_to authentications_path, alert: 'Authentication not successful.'
-    end
-  end
-
-  def destroy
-    @authentication = current_user.authentications.find(params[:id])
-    @authentication.destroy
-    respond_to do |format|
-      format.html { redirect_to authentications_path, notice: 'Successfully removed authentication.' }
-      format.js
-    end
-  end
-end

data/app/models/authentication.rb

@@ -1,4 +0,0 @@
-class Authentication < ActiveRecord::Base
-  # Concerns
-  include ContourAuthenticatable
-end

data/app/models/concerns/contour_authenticatable.rb

@@ -1,12 +0,0 @@
-module ContourAuthenticatable
-  extend ActiveSupport::Concern
-
-  included do
-    belongs_to :user
-  end
-
-  def provider_name
-    OmniAuth.config.camelizations[provider.to_s.downcase] || provider.to_s.titleize
-  end
-
-end

data/app/models/concerns/contourable.rb

@@ -1,19 +0,0 @@
-module Contourable
-  extend ActiveSupport::Concern
-
-  included do
-    has_many :authentications
-  end
-
-  def apply_omniauth(omniauth)
-    unless omniauth['info'].blank?
-      self.email = omniauth['info']['email'] if email.blank?
-    end
-    self.password = Devise.friendly_token[0,20] if self.password.blank?
-    authentications.build( provider: omniauth['provider'], uid: omniauth['uid'] )
-  end
-
-  def password_required?
-    (authentications.empty? || !password.blank?) && super
-  end
-end

data/app/views/contour/authentications/_add_remove_table.html.erb

@@ -1,31 +0,0 @@
-<% if current_user %>
-  <table class="table table-striped" style="table-layout:fixed">
-    <thead>
-      <tr>
-        <th></th>
-        <th>Provider</th>
-        <th>User ID</th>
-        <th>Actions</th>
-      </tr>
-    </thead>
-
-    <% PROVIDERS.each do |provider| %>
-      <% url_params = (provider == :google_apps) ? '?domain=gmail.com' : '' %>
-      <% provider_name = OmniAuth.config.camelizations[provider.to_s.downcase] || provider.to_s.titleize %>
-      <% image_name = provider.to_s.downcase %>
-      <% authentication = current_user.authentications.find_by_provider(provider.to_s.downcase) %>
-      <tr>
-        <td><%= image_tag "contour/#{image_name}_32.png", height: '32px' %></td>
-        <td><%= provider_name %></td>
-        <td><%= authentication.uid if authentication %></td>
-        <td>
-          <% if authentication %>
-            <%= link_to 'Remove', authentication, remote: true, method: :delete, class: 'btn btn-xs btn-danger-inverse', data: { confirm: 'Are you sure you want to remove this authentication option?' } %>
-          <% else %>
-            <%= link_to 'Add', "#{request.script_name}/#{OmniAuth.config.path_prefix.split('/').last.to_s}/#{provider.to_s.downcase}#{url_params}", class: 'btn btn-xs btn-default' %>
-          <% end %>
-        </td>
-      </tr>
-    <% end %>
-  </table>
-<% end %>