ucb_rails 0.0.13 → 0.0.14

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 847162c41f4ac6964dfc23f26f0f1d968562bf7e
+  data.tar.gz: e7b409a5d0ad22e8ab523a8c79a3e5144a618bf0
+SHA512:
+  metadata.gz: 933bdac9da8cdb6aff405a0dc2a37763f4e5171c239cadb58181c1f76663b668650c3c0a38b751bdac204c6290e9d32d92c9b926fb20883321cac254377db96f
+  data.tar.gz: a9f654f4b1c10b5b682eb1785b5601a445687dd2e4ea973ae217d089e67fb49544d795ec600d7130e23139100a14226d9d6dd2d6a28588d394d548635c4c6e8e

data/README.md

@@ -1,16 +1,11 @@
-# UCB Rails
-
-[![Gem Version](https://badge.fury.io/rb/ucb_rails.png)](http://badge.fury.io/rb/ucb_rails)
-[![Build Status](https://travis-ci.org/stevedowney/ucb_rails.png)](https://travis-ci.org/stevedowney/ucb_rails)
-[![Coverage Status](https://coveralls.io/repos/stevedowney/ucb_rails/badge.png?branch=master)](https://coveralls.io/r/stevedowney/ucb_rails?branch=master)
-[![Code Climate](https://codeclimate.com/github/stevedowney/ucb_rails.png)](https://codeclimate.com/github/stevedowney/ucb_rails)
+# UCB Rails (Rails 4 Compatible, see master branch for Rails 3)
 
 Get a jump start on your Rails project at UCB.  Includes:
 
 * CalNet authentication with [omniauth-cas](https://github.com/dlindahl/omniauth-cas)
 * LDAP integration with [ucb_ldap](https://rubygems.org/gems/ucb_ldap)
 * includes several other gems including:
-  * [bootstrap-view-helpers](https://github.com/stevedowney/bootstrap-view-helpers)
+  * [bootstrap-view-helpers](https://github.com/ucb-ist-eas/bootstrap-view-helpers/tree/rails4)
   * [user_announcements](https://github.com/stevedowney/user_announcements)
   * [rails_environment](https://github.com/stevedowney/rails_environment)
 
@@ -20,9 +15,8 @@ Add it to your Gemfile
 
 ```ruby
 gem 'ucb_rails'
-
-# bleeding edge
-gem 'ucb_rails', git: 'https://github.com/stevedowney/ucb_rails'
+# 'bootstrap-view-helpers' needs to be added as well
+gem 'bootstrap-view-helpers', github: 'ucb-ist-eas/bootstrap-view-helpers', branch: 'rails4'
 ```
 
 From the command line, install the `ucb_rails` gem:
@@ -49,7 +43,17 @@ Remove superseded files:
 
 ```sh
 rm public/index.html
-rm app/views/layouts/application.html.erb  
+```
+
+Add includes to application stylesheet
+
+```ruby
+ *= require bootstrap-datepicker3
+```
+
+Add includes to application javascript
+```ruby
+//= require bootstrap-datepicker
 ```
 
 Restart your server and point your browser to:
@@ -68,4 +72,10 @@ host app (if any) will take precedence.
 * `current_ldap_person`
 * `logged_in?`
  
+## Upgrading From An Older Version
 
+If you're upgrading from a version older than March 2015, you'll need to run an extra migration in the project that contains the ucb_rails gem. This will add an `alternate_email` column to your users table.
+
+```
+cp ucb_rails/dummy/db/migrate//20150318234744_add_alternate_email_to_users.rb [YOUR_PROJECT_ROOT]/db/migrate
+```

data/Rakefile

@@ -20,7 +20,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path("../dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
 

data/app/assets/stylesheets/ucb_rails.css.scss

@@ -0,0 +1,7 @@
+@import "ucb_rails/common";
+@import "ucb_rails/branding";
+@import "ucb_rails/typography";
+@import "ucb_rails/nav";
+@import "ucb_rails/buttons";
+@import "ucb_rails/bootstrap-view-helpers";
+

data/app/assets/stylesheets/ucb_rails/berkeley-colors.sass

@@ -0,0 +1,27 @@
+$pri-blue: #003262
+$pri-yellow: #FDB515
+
+$alt-blue: #3B7EA1
+$alt-yellow: #E09E19
+
+$neu-gray: #C2B9A7
+$neu-orange: #D9661F
+$neu-green: #B9D3B6
+
+$vib-blue: #00B0DA
+$vib-orange: #EE1F60
+$vib-yellow: #CFDD45
+
+$bri-blue: #00B2A5
+$bri-orange: #ED4E33
+$bri-yellow: #9DAD33
+
+$dar-blue: #53626F
+$dar-orange: #6C3302
+$dar-yellow: #584F29
+
+$light-gray: rgba(255, 255, 255, 0.62)
+$medium-gray: #DADADA
+$dark-gray: #A5A5A5
+$light-yellow: #FFF5DF
+$light-blue: #E7F6FF

data/app/assets/stylesheets/ucb_rails/bootstrap-view-helpers.sass

@@ -0,0 +1,4 @@
+.label-pill
+  padding-right: .6em
+  padding-left: .6em
+  border-radius: 10rem

data/app/assets/stylesheets/ucb_rails/branding.sass

@@ -0,0 +1,66 @@
+
+
+body
+  background-image: asset-data-url("seal.png")
+  background-position:  105% 0px
+  background-repeat:  no-repeat
+  background-size: 36%
+  background-attachment: fixed
+  background-color: $body-bg
+
+h1, h2, h3
+  color: #00B0DA
+
+.nav-tabs > .active > a, .nav-tabs > .active > a:hover, .nav-tabs > .active > a:focus
+  background-color: $body-bg !important
+
+html body .nav > li > a:hover, html body .nav > li > a:focus
+  background-color: $vib-blue
+  color: white
+
+html body .form-actions
+  background-color: transparent
+  border-top: none
+
+.nav-list > .active > a, .nav-list > .active > a:hover, .nav-list > .active > a:focus
+  border-radius: 3px
+
+.nav-header,a
+  text-shadow: none !important
+
+html body .alert
+  display: inline-block
+
+html body .sidebar-nav
+  padding: 10px 0
+
+  .nav-header
+    border-top: 1px solid white
+
+    &:first-child
+      border-top: 0
+
+  .nav-header,
+  .nav-list a
+    padding: 10px 15px
+    margin-left: 0
+    margin-right: 0
+
+  .nav-list a
+    display: block
+
+html body .well
+  border: 1px solid $pri-blue
+  border-radius: 3px
+  background: rgba(245, 245, 245, 0.41)
+  
+  .nav-list
+    padding: 0
+
+.field_with_errors
+  display: inline-block
+
+.alert-error, .field_with_errors input, .field_with_errors select
+  background-color: #f2dede !important
+  border-color: #eed3d7 !important
+  color: #b94a48 !important

data/app/assets/stylesheets/ucb_rails/buttons.sass

@@ -0,0 +1,2 @@
+.alert-default
+  @include alert-variant($alert-warning-bg, $alert-warning-border, $alert-warning-text)

data/app/assets/stylesheets/ucb_rails/common.sass

@@ -0,0 +1,30 @@
+
+  
+
+
+table
+  th.c, td.c
+    text-align: center
+  
+  th.min, td.min
+    width: 1%
+
+#lps-modal 
+  width: 750px
+  
+  form
+    input[type="text"]
+      width: 140px
+      margin-right: 10px
+    
+    #lps-search
+      margin-left: 20px
+      margin-right: 10px
+  
+  tr.ldap-result-exists
+    opacity: 0.5
+
+div.control-group.lps-typeahead
+  i.ldap-person-search
+    cursor: pointer
+

data/app/assets/stylesheets/ucb_rails/nav.sass

@@ -0,0 +1,51 @@
+.navbar
+  
+  .dropdown-menu .dropdown:hover
+    @include gradient-vertical($dropdown-link-hover-bg, darken($dropdown-link-hover-bg, 5%))
+    color: white !important
+
+  .dropdown-menu:before 
+    position: absolute
+    top: -7px
+    left: 9px
+    display: inline-block
+    border-right: 7px solid transparent
+    border-bottom: 7px solid #ccc
+    border-left: 7px solid transparent
+    border-bottom-color: rgba(0, 0, 0, 0.2)
+    content: ''
+
+  .dropdown-menu:after 
+    position: absolute
+    top: -6px
+    left: 10px
+    display: inline-block
+    border-right: 6px solid transparent
+    border-bottom: 6px solid #ffffff
+    border-left: 6px solid transparent
+    content: ''
+    
+  .navbar-right > li > .dropdown-menu:before,
+  .nav > li > .dropdown-menu.navbar-right:before
+    right: 12px
+    left: auto
+
+  .navbar-right > li > .dropdown-menu:after,
+  .nav > li > .dropdown-menu.navbar-right:after
+    right: 13px
+    left: auto
+
+  a.navbar-brand, span.navbar-brand, a.navbar-brand:hover, span.navbar-brand:hover
+    &.rails-development 
+      background-color: gold
+      color: blue
+    
+    &.rails-quality_assurance 
+      background-color: blue
+      color: gold    
+
+.sidebar-nav
+  .nav-stacked
+    li a
+      padding: 2px 0
+      color: $link-color

data/app/assets/stylesheets/ucb_rails/typography.sass

@@ -0,0 +1,43 @@
+@font-face
+  font-family: 'open_sansbold'
+  src: image_path('open-sans/opensans_bold_macroman/OpenSans-Bold-webfont.eot')
+  src: image_path('open-sans/opensans_bold_macroman/OpenSans-Bold-webfont.eot?#iefix') format('embedded-opentype'), image_path('open-sans/opensans_bold_macroman/OpenSans-Bold-webfont.woff') format('woff'), image_path('open-sans/opensans_bold_macroman/OpenSans-Bold-webfont.ttf') format('truetype'), image_path('open-sans/opensans_bold_macroman/OpenSans-Bold-webfont.svg#open_sansbold') format('svg')
+  font-weight: normal
+  font-style: normal
+
+@font-face
+  font-family: 'open_sanslight'
+  src: image_path('open-sans/opensans_bold_macroman/OpenSans-Light-webfont.eot')
+  src: image_path('open-sans/opensans_bold_macroman/OpenSans-Light-webfont.eot?#iefix') format('embedded-opentype'), image_path('open-sans/opensans_bold_macroman/OpenSans-Light-webfont.woff') format('woff'), image_path('open-sans/opensans_bold_macroman/OpenSans-Light-webfont.ttf') format('truetype'), image_path('open-sans/opensans_bold_macroman/OpenSans-Light-webfont.svg#open_sanslight') format('svg')
+  font-weight: normal
+  font-style: normal   
+
+@font-face
+  font-family: 'open_sansregular'
+  src: image_path('open-sans/opensans_regular_macroman/OpenSans-Regular-webfont.eot')
+  src: image_path('open-sans/opensans_regular_macroman/OpenSans-Regular-webfont.eot?#iefix') format('embedded-opentype'), image_path('open-sans/opensans_regular_macroman/OpenSans-Regular-webfont.woff') format('woff'), image_path('open-sans/opensans_regular_macroman/OpenSans-Regular-webfont.ttf') format('truetype'), url('open-sans/opensans_regular_macroman/OpenSans-Regular-webfont.svg#open_sansregular') format('svg')
+  font-weight: normal
+  font-style: normal
+
+$bold-family: 'open_sansbold', helvetica, sans-serif
+
+.bold
+  font-family: $bold-family
+  font-weight: 600
+
+.thin
+  font-weight: 100
+
+html body
+  h1, h2, h3, h4, h5, h6
+    color: $pri-blue
+
+body, p, li
+  font-family: "open_sansregular", "helvetica", "arial", sans-serif !important
+
+h1, h2, h3, h4, h5, h6, .thin
+  font-family: "open_sanslight", "helvetica", "arial", sans-serif !important
+  font-weight: 100 !important
+
+strong
+  font-family: "open_sansbold", "helvetica", "arial", sans-serif

data/app/assets/stylesheets/ucb_rails/variables.sass

@@ -0,0 +1,26 @@
+@import berkeley-colors
+
+// $font-size-base: 13px
+$body-bg: #F0F5F8
+$brand-info: $bri-blue
+$danger: #EE1F60
+$brand-danger: $danger
+$brand-primary: $pri-blue
+
+$btn-primary-bg: $alt-blue
+
+$font-family-sans-serif: "open_sansregular", "helvetica", "arial", sans-serif
+$font-family-base: $font-family-sans-serif
+
+$link-color: $vib-blue
+
+$dropdown-link-hover-color:      #fff
+$dropdown-link-hover-bg:         #08c  
+
+$navbar-height: 55px
+$well-bg: transparent
+$nav-link-hover-bg: $bri-blue
+$headings-font-weight: 100
+$font-size-h5: 15px
+$font-size-h4: 18.25px
+

data/app/controllers/ucb_rails/admin/users_controller.rb

@@ -5,7 +5,7 @@ class UcbRails::Admin::UsersController < UcbRails::Admin::BaseController
   def index
     respond_to do |format|
       format.html { @users = UcbRails::User.all }
-      format.json { render json: UcbRails::UsersDatatable.new(view_context) }
+      format.json { render json: UcbRails::UsersDatatable.new(view_context).as_json }
     end
   end
   
@@ -64,4 +64,4 @@ class UcbRails::Admin::UsersController < UcbRails::Admin::BaseController
     @user ||= UcbRails::User.find(params.fetch(:id))
   end
   
-end
+end

data/app/controllers/ucb_rails/bootstrap_controller.rb

@@ -14,7 +14,7 @@ class UcbRails::BootstrapController < ApplicationController
       UCB::LDAP::Person.find_by_uid(uid).tap do |e|
         return render_text("Bad uid: #{uid.inspect}") if e.blank?
         user = UcbRails::UserLdapService.create_user_from_uid(uid)
-        user.update_attributes({admin: true}, without_protection: true)
+        user.update_attributes(admin: true)
         redirect_to login_path
       end
     else

data/app/datatables/ucb_rails/base_datatable.rb

@@ -44,6 +44,8 @@
 # end
 #
 class UcbRails::BaseDatatable
+  include ActionView::Helpers::SanitizeHelper
+
   
   def initialize(view)
     @view = view

data/app/datatables/ucb_rails/users_datatable.rb

@@ -7,7 +7,7 @@ class UcbRails::UsersDatatable < UcbRails::BaseDatatable
   end
   
   def column_names
-    @column_names ||= %w[admin inactive first_name last_name email phone last_request_at uid]
+    @column_names ||= %w[admin inactive first_name last_name email alternate_email phone last_request_at uid]
   end
   
   def search(search_term)
@@ -16,17 +16,18 @@ class UcbRails::UsersDatatable < UcbRails::BaseDatatable
   
   def record_to_data(user)
     [
-      bln(user.admin),
-      bln(user.inactive),
-      h(user.first_name),
-      h(user.last_name),
-      h(user.email),
-      h(user.phone),
-      h(user.last_request_at),
-      h(user.uid),
+      user.admin? ? "Yes" : "No",
+      user.inactive? ? "Yes" : "No",
+      sanitize(user.first_name),
+      sanitize(user.last_name),
+      sanitize(user.email),
+      sanitize(user.alternate_email),
+      sanitize(user.phone),
+      user.last_request_at.to_s,
+      sanitize(user.uid),
       link_to("Edit", edit_ucb_rails_admin_user_path(user), :id => dom_id(user)),
       link_to('Delete', ucb_rails_admin_user_path(user), :method => :delete, :confirm => 'Are you sure?'),
     ]
   end
 
-end
+end

data/app/models/ucb_rails/configuration/email.rb

@@ -42,7 +42,7 @@ module UcbRails
 
       def process_default_url_options
         if hash.has_key?('default_url_options')
-          ActionMailer::Base.default_url_options = hash.fetch('default_url_options')
+          ActionMailer::Base.default_url_options = hash.fetch('default_url_options').symbolize_keys
         end
       end
 

data/app/models/ucb_rails/ldap_person/entry.rb

@@ -1,54 +1,61 @@
 module UcbRails::LdapPerson
   class Entry
-    
+
     # include ActiveAttr::Model  <--- doesn't work with 4.0 (mass assign. security)
     include ::ActiveAttr::Attributes
     include ::ActiveAttr::BasicModel
     include ::ActiveAttr::BlockInitialization
     include ::ActiveAttr::MassAssignment
-  
+
     attribute :uid
     attribute :calnet_id
+    attribute :employee_id
     attribute :first_name
     attribute :last_name
     attribute :email
     attribute :phone
     attribute :departments
     attribute :affiliations
-  
+    attribute :affiliate_id
+    attribute :inactive
+
     def full_name
       "#{first_name()} #{last_name()}"
     end
-  
+
     def last_first
       "#{last_name}, #{first_name}"
     end
-    
+
     def last_first_downcase
       last_first.downcase
     end
-    
+
     # Currently only used in rspec
     def ==(other)
       uid == other.uid
     end
-    
+
     class << self
-      
+
       def new_from_ldap_entry(ldap_entry)
+        p ldap_entry.expired?
         new(
           :uid => ldap_entry.uid,
           :calnet_id => ldap_entry.berkeleyedukerberosprincipalstring.first,
+          :employee_id => ldap_entry.employeenumber,
           :first_name => ldap_entry.givenname.first,
           :last_name => ldap_entry.sn.first,
           :email => ldap_entry.mail.first,
-          :phone => ldap_entry.phone,  
+          :phone => ldap_entry.phone,
           :departments => ldap_entry.berkeleyeduunithrdeptname,
-          :affiliations => ldap_entry.berkeleyeduaffiliations
+          :affiliations => ldap_entry.berkeleyeduaffiliations,
+          :affiliate_id => ldap_entry.berkeleyeduaffid,
+          :inactive => ldap_entry.expired? || false
         )
       end
-      
+
     end
-    
+
   end
-end
+end