contour 2.7.0 → 3.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec4ad7b4aaf3319278a5afd7cb379369f05de69b
-  data.tar.gz: cbc64907020460e9f6dfdd4899742eae5fbd6595
+  metadata.gz: c2e373a1e2322fc9859477f26f26998728a74ef0
+  data.tar.gz: 010c2ddc245cd936603f9a7ddcdcff18ca8600a8
 SHA512:
-  metadata.gz: 7ff2d9392c2f05b54a843d61582109690955b350c0f2a2b919a8e392ecaad160672c81d3656fbf9d5d74c50a028437c69ae656046f04cf8d738e04e327228407
-  data.tar.gz: f02eb6c2475a43f58bf71b37a9d1ffdc77316a4c826584d80444ce90675c07d7732aa5dcb44843d2ed2b4820aaf9c975386b91c51b23b4faf8494fd1b34eb51e
+  metadata.gz: 51cd53eafaea08f98cc1a15ff0b5c948a5c164509735480e17bb0a134398597caae871fd6306f3e5fe4e6217b2dce33918f1ba67f5cde4fa59c42c0a5bd42681
+  data.tar.gz: 8a55bf71285748a8d1c0024906a2197f7231daa69bb58b059709804b6855f3e7874bd31de0c0d9c7dc026c6c16dd34daad1c82a564562d25c7b56db4b001be58

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 3.0.0
+
+### Breaking Changes
+- Removed multiple authentication support as this is better handled directly with omniauth and devise
+- Removed news feed stream from new registration page
+
+### Enhancements
+- Simplified SCSS files using `asset-url`
+- **Gem Changes**
+  - Removed omniauth, omniauth-ldap, and omniauth-openid
+
 ## 2.7.0 (February 13, 2015)
 
 ### Enhancements

data/README.md

@@ -35,7 +35,7 @@ cd blank_rails_project
 Modify `Gemfile` and add
 
 ```ruby
-gem 'contour', '~> 2.7.0'
+gem 'contour', '~> 3.0.0'
 ```
 
 Run Bundle install
@@ -50,20 +50,6 @@ Install contour files
 rails generate contour:install
 ```
 
-Add the authentication model
-
-```
-rails generate model Authentication user_id:integer provider:string uid:string
-```
-
-Migrate your database
-
-```
-bundle exec rake db:create
-
-bundle exec rake db:migrate
-```
-
 Create a sample controller
 
 ```
@@ -119,20 +105,6 @@ Add the following to the top of your `app/controllers/welcome_controller.rb`
 before_action :authenticate_user!
 ```
 
-Add the following to your `app/models/user.rb`
-
-```ruby
-# Concerns
-include Contourable
-```
-
-Add the following to your `app/models/authentication.rb`
-
-```ruby
-# Concerns
-include ContourAuthenticatable
-```
-
 Edit `config/initializers/devise.rb` to use `:get` for devise `sign_out_via`
 
 ```ruby

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

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

data/app/assets/stylesheets/opensans.scss

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

data/app/controllers/contour/registrations_controller.rb

@@ -27,7 +27,7 @@ class Contour::RegistrationsController < Devise::RegistrationsController
       redirect_to new_session_path(resource), notice: 'Thank you for your interest! Due to limited capacity you have been put on a waiting list. We will email you when we open up additional space.'
     else
       super
-      session[:omniauth] = nil if @user and not @user.new_record?
+      # session[:omniauth] = nil if @user and not @user.new_record?
     end
   end
 
@@ -38,15 +38,6 @@ class Contour::RegistrationsController < Devise::RegistrationsController
       devise_parameter_sanitizer.for(:sign_up) { |u| u.permit(*permitted_fields) }
     end
 
-    def build_resource(hash=nil)
-      object = super(hash)
-      if session[:omniauth]
-        @user.apply_omniauth(session[:omniauth])
-        @user.valid?
-      end
-      object
-    end
-
     def after_inactive_sign_up_path_for(resource)
       new_session_path(resource) # root_path
     end

data/app/controllers/contour/sessions_controller.rb

@@ -1,47 +1,14 @@
-require 'rss/2.0'
-require 'open-uri'
-
 class Contour::SessionsController < Devise::SessionsController
 
-  def new
-    @news_feed = ''
-    unless Contour.news_feed.blank?
-      begin
-        open(Contour.news_feed, ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE) do |http|
-          response = http.read
-          @news_feed = RSS::Parser.parse(response, false)
-        end
-      rescue => e
-        logger.info "\n\nRSS Feed #{Contour.news_feed}\nRSS Feed Error: #{e}\n\n"
-      end
-    end
-
-    super
-  end
-
-  # Overwrite Devise authentication to check if the user is typing another credential into the default box
-  # if so, find alternative login methods for that user and forward the user to those login screens
+  # Overwrite devise to provide JSON responses as well
   def create
-    # resource = warden.authenticate!(auth_options)
-    resource = warden.authenticate(auth_options)
-
-    if resource
-      set_flash_message(:notice, :signed_in) if is_navigational_format?
-      sign_in(resource_name, resource)
-
-      respond_to do |format|
-        format.html { respond_with resource, location: after_sign_in_path_for(resource) }
-        format.json { render json: { success: true, resource_name => { id: resource.id, email: resource.email, first_name: resource.first_name, last_name: resource.last_name, authentication_token: (resource.respond_to?(:authentication_token) ? resource.authentication_token : nil) } } }
-      end
-    else
-      resource = resource_name.to_s.titleize.constantize.find_by_email(params[resource_name][:email])
-      if resource and resource.respond_to?('authentications') and providers = resource.authentications.pluck(:provider).uniq and providers.size > 0
-        redirect_to request.script_name + '/auth/' + providers.first
-      elsif providers = Authentication.where(uid: params[resource_name][:email]).pluck(:provider).uniq and providers.size > 0
-        redirect_to request.script_name + '/auth/' + providers.first
-      else
-        resource = warden.authenticate!(auth_options)
-      end
+    self.resource = warden.authenticate!(auth_options)
+    set_flash_message(:notice, :signed_in) if is_flashing_format?
+    sign_in(resource_name, resource)
+    yield resource if block_given?
+    respond_to do |format|
+      format.html { respond_with resource, location: after_sign_in_path_for(resource) }
+      format.json { render json: { success: true, resource_name => { id: resource.id, email: resource.email, first_name: resource.first_name, last_name: resource.last_name, authentication_token: (resource.respond_to?(:authentication_token) ? resource.authentication_token : nil) } } }
     end
   end
 

data/app/views/contour/layouts/_menu.html.erb

@@ -32,8 +32,6 @@
                       <li class="divider"></li>
                     <% elsif not link[:header].blank? %>
                       <li class="dropdown-header"><%= link[:eval] ? eval(link[:header]) : link[:header] %></li>
-                    <% elsif link[:authentications] == true %>
-                      <%= render partial: 'contour/authentications/menu' %>
                     <% else %>
                       <li><%= link_to (link[:eval] ? eval(link[:html].blank? ? link[:name] : link[:html].html_safe) : (link[:html].blank? ? link[:name] : link[:html].html_safe) + (link[:image].blank? ? '' : image_tag(link[:image], link[:image_options]))).html_safe, link[:path].blank? ? '#' : eval(link[:path].to_s), target: link[:target] %></li>
                     <% end %>

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

@@ -1,55 +1,41 @@
 <% @title = 'Sign in' %>
 
-<div class="row">
-  <div class="col-md-8">
-    <div class="page-header">
-      <h1><%= @title %></h1>
-    </div>
-
-    <%= form_for(resource, :as => resource_name, :url => session_path(resource_name), html: { class: 'form-horizontal' }) do |f| %>
-      <div class="form-group">
-        <%= f.label :email, class: 'col-md-2 control-label' %>
-        <div class="col-md-10">
-          <%= f.email_field :email, class: 'form-control' %>
-        </div>
-      </div>
+<div class="page-header">
+  <h1><%= @title %></h1>
+</div>
 
-      <div class="form-group">
-        <%= f.label :password, class: 'col-md-2 control-label' %>
-        <div class="col-md-10">
-          <%= f.password_field :password, class: 'form-control' %>
-        </div>
-      </div>
+<%= form_for(resource, :as => resource_name, :url => session_path(resource_name), html: { class: 'form-horizontal' }) do |f| %>
+  <div class="form-group">
+    <%= f.label :email, class: 'col-md-2 control-label' %>
+    <div class="col-md-10">
+      <%= f.email_field :email, class: 'form-control' %>
+    </div>
+  </div>
 
-      <% if devise_mapping.rememberable? -%>
-        <div class="form-group">
-          <div class="col-md-offset-2 col-md-10">
-            <div class="checkbox">
-              <label>
-                <%= f.check_box :remember_me %>
-                Remember me
-              </label>
-            </div>
-          </div>
-        </div>
-      <% end -%>
+  <div class="form-group">
+    <%= f.label :password, class: 'col-md-2 control-label' %>
+    <div class="col-md-10">
+      <%= f.password_field :password, class: 'form-control' %>
+    </div>
+  </div>
 
-      <div class="form-group">
-        <div class="col-md-offset-2 col-md-10">
-          <%= f.submit "Sign in", class: 'btn btn-primary' %>
-          <%= render partial: 'contour/links' %>
-          <% PROVIDERS.each do |provider| %>
-            <a href="<%= request.script_name + "/" + OmniAuth.config.path_prefix.split('/').last.to_s + "/" + provider.to_s.downcase %>" class="btn btn-large btn-default" style="white-space:nowrap">
-              <%= image_tag "contour/#{provider.to_s.downcase}_32.png", align: 'absmiddle' %>
-            </a>
-          <% end %>
+  <% if devise_mapping.rememberable? -%>
+    <div class="form-group">
+      <div class="col-md-offset-2 col-md-10">
+        <div class="checkbox">
+          <label>
+            <%= f.check_box :remember_me %>
+            Remember me
+          </label>
         </div>
       </div>
-    <% end %>
-
-  </div>
+    </div>
+  <% end -%>
 
-  <div class="col-md-4">
-    <%= render partial: 'contour/layouts/latest_news' %>
+  <div class="form-group">
+    <div class="col-md-offset-2 col-md-10">
+      <%= f.submit "Sign in", class: 'btn btn-primary' %>
+      <%= render partial: 'contour/links' %>
+    </div>
   </div>
-</div>
+<% end %>

data/config/routes.rb

@@ -1,12 +1,7 @@
 Rails.application.routes.draw do
 
-  get '/auth/failure' => 'contour/authentications#failure'
-  post '/auth/:provider/callback' => 'contour/authentications#create'
-  get '/auth/:provider' => 'contour/authentications#passthru'
   get '/contour' => 'contour/samples#index'
 
-  resources :authentications, controller: 'contour/authentications'
-
   # devise_for :users, controllers: { registrations:  'contour/registrations',
   #                                   sessions:       'contour/sessions',
   #                                   passwords:      'contour/passwords',

data/contour.gemspec

@@ -28,9 +28,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'jquery-rails',            '>= 3.0.4'
   s.add_dependency 'coffee-rails',            '~> 4.1.0'
   s.add_dependency 'devise',                  '~> 3.4.1'
-  s.add_dependency 'omniauth',                '~> 1.2.1'
-  s.add_dependency 'omniauth-ldap',           '~> 1.0.4'
-  s.add_dependency 'omniauth-openid',         '~> 1.0.1'
   s.add_dependency 'bootstrap-sass',          '~> 3.3.3'
   s.add_dependency 'sass-rails',              '~> 5.0.1'
   s.add_dependency 'autoprefixer-rails'

data/lib/contour.rb

@@ -31,15 +31,11 @@ module Contour
   @@menu_items = [
     {
       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: {},
@@ -57,14 +53,6 @@ module Contour
   mattr_accessor :search_bar
   @@search_bar = {}
 
-  # Default news feed
-  mattr_accessor :news_feed
-  @@news_feed = nil
-
-  # Default max number of items displayed in the news feed
-  mattr_accessor :news_feed_items
-  @@news_feed_items = 5
-
   # A string or array of strings that represent a CSS color code for generic link color
   mattr_accessor :link_color
   @@link_color = nil

data/lib/contour/fixes.rb

@@ -1,8 +1,5 @@
 require 'contour/fixes/devise.rb'
-require 'contour/fixes/devise-with-rails-4-2.rb'
-require 'contour/fixes/omniauth.rb'
 require 'contour/fixes/rack.rb'
-require 'contour/fixes/sass-rails.rb'
 
 module Contour
   module Fixes

data/lib/contour/version.rb

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

data/lib/generators/contour/install/install_generator.rb

@@ -8,10 +8,6 @@ class Contour::InstallGenerator < Rails::Generators::Base
     template "contour.rb", "config/initializers/contour.rb"
   end
 
-  def copy_omniauth
-    template "omniauth.rb", "config/initializers/omniauth.rb"
-  end
-
   def install_devise
     generate("devise:install")
     model_name = ask("What would you like the user model to be called? [user]")

data/lib/generators/contour/install/templates/README

@@ -17,8 +17,4 @@ Contour requires some additional setup:
 
   4. Remove any scaffold.css files that exist in your application
 
-  5. Make a migration for Authentications
-
-       rails generate model Authentication user_id:integer provider:string uid:string
-
 ===============================================================================

data/lib/generators/contour/install/templates/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/controllers/passwords_controller_test.rb

@@ -16,13 +16,4 @@ class Contour::PasswordsControllerTest < ActionController::TestCase
     assert_equal I18n.t('devise.passwords.send_instructions'), flash[:notice]
     assert_redirected_to new_user_session_path
   end
-
-  # test "an admin should be able to create new user" do
-  #   assert_difference('User.count') do
-  #     post :create, user: { first_name: 'First Name', last_name: 'Last Name', status: 'active', email: 'new_registration@example.com',
-  #       steering_committee: true, steering_committee_secretary: false, pp_committee: false, pp_committee_secretary: false, system_admin: false }
-  #   end
-  #
-  #   assert_redirected_to user_path(assigns(:user))
-  # end
 end

data/test/controllers/registrations_controller_test.rb

@@ -64,18 +64,4 @@ class Contour::RegistrationsControllerTest < ActionController::TestCase
   #   assert_response :success
   # end
 
-  # test "an admin should be able to create new user" do
-  #   login(users(:admin))
-  #   assert_difference('User.count') do
-  #     post :create, user: { first_name: 'First Name', last_name: 'Last Name', status: 'active', email: 'new_registration@example.com', system_admin: false }
-  #   end
-
-  #   assert_not_nil assigns(:user)
-  #   assert_equal 'First Name', assigns(:user).first_name
-  #   assert_equal 'Last Name', assigns(:user).last_name
-  #   assert_equal 'active', assigns(:user).status
-  #   assert_equal 'new_registration@example.com', assigns(:user).email
-
-  #   assert_redirected_to user_path(assigns(:user))
-  # end
 end