ucb_rails 0.0.13 → 0.0.14

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

@@ -12,7 +12,8 @@ module UcbRails::LdapPerson
 
     def find_by_uid(uid)
       benchmark("find_by_uid(#{uid})") do
-        find_by_attributes(:uid => uid.to_s).first
+        find_by_attributes(:uid => uid.to_s).first ||
+          find_expired_by_attributes(:uid => uid.to_s).first
       end
     end
 
@@ -22,7 +23,7 @@ module UcbRails::LdapPerson
 
     def find_by_first_last(first_name, last_name, options={})
       raise BlankSearchTermsError unless first_name.present? || last_name.present?
-      
+
       find_by_attributes(:givenname => first_name, :sn => last_name).tap do |entries|
         if options[:sort]
           sort_symbol = options[:sort]
@@ -31,6 +32,10 @@ module UcbRails::LdapPerson
       end
     end
 
+    def find_by_affiliate_id(affiliate_id)
+      find_by_attributes("berkeleyEduAffID" => affiliate_id)
+    end
+
     def find_by_attributes(attributes)
       attributes.each { |k, v| attributes.delete(k) if v.blank?  }
       UCB::LDAP::Person.
@@ -38,6 +43,13 @@ module UcbRails::LdapPerson
         map { |ldap_entry| Entry.new_from_ldap_entry(ldap_entry) }
     end
 
+    def find_expired_by_attributes(attributes)
+      attributes.each { |k, v| attributes.delete(k) if v.blank?  }
+      UCB::LDAP::ExpiredPerson.
+        search(:filter => build_filter(attributes)).
+        map { |ldap_entry| Entry.new_from_ldap_entry(ldap_entry) }
+    end
+
     def build_filter(attrs)
       filter_parts = attrs.map { |k, v| build_filter_part(k, v) }
       filter = filter_parts.inject { |accum, filter| accum.send(:&, filter) }
@@ -62,6 +74,6 @@ module UcbRails::LdapPerson
         klass.new.send(method, *args)
       end
     end
-    
+
   end
-end
+end

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

@@ -14,6 +14,10 @@ module UcbRails::LdapPerson
       find_by_attributes(:first_name => first_name, :last_name => last_name)
     end
 
+    def find_by_affiliate_id(affiliate_id)
+      find_by_attributes("affiliate_id" => affiliate_id)
+    end
+
     def find_by_attributes(attributes)
       self.class.entries.select { |entry| entry_matches_attributes(entry, attributes) }
     end
@@ -21,20 +25,20 @@ module UcbRails::LdapPerson
     def entry_matches_attributes(entry, attributes)
       attributes.keys.all? do |key|
         value = attributes[key].to_s.downcase
-        value.blank? || entry.send(key).downcase.include?(value)
+        value.blank? || (entry.respond_to?(key) && entry.send(key).to_s.downcase.include?(value))
       end
     end
 
     def self.entries
       [
-        new_entry("1", 'art', "Art", "Andrews", "art@example.com", "999-999-0001", "Dept 1"),
-        new_entry("2", 'beth', "Beth", "Brown", "beth@example.com", "999-999-0002", "Dept 2"),
-        new_entry("61065", 'runner', "Steven", "Hansen", "runner@berkeley.edu", "999-999-9998", "EAS"),
-        new_entry("191501", 'stevedowney', "Steve", "Downey", "sldowney@berkeley.edu", "999-999-9999", "EAS"),
+        new_entry("1", 'art', "Art", "Andrews", "art@example.com", "999-999-0001", "Dept 1", "011"),
+        new_entry("2", 'beth', "Beth", "Brown", "beth@example.com", "999-999-0002", "Dept 2", "012"),
+        new_entry("61065", 'runner', "Steven", "Hansen", "runner@berkeley.edu", "999-999-9998", "EAS", "0161065"),
+        new_entry("191501", 'stevedowney', "Steve", "Downey", "sldowney@berkeley.edu", "999-999-9999", "EAS", "01191501"),
       ]
     end
 
-    def self.new_entry(uid, calnet_id, fn, ln, email, phone, depts)
+    def self.new_entry(uid, calnet_id, fn, ln, email, phone, depts, employee_id = nil, affiliate_id = nil)
       ::UcbRails::LdapPerson::Entry.new(
         :uid => uid,
         :calnet_id => calnet_id,
@@ -42,9 +46,12 @@ module UcbRails::LdapPerson
         :last_name => ln,
         :email => email,
         :phone => phone,
-        :departments => depts
+        :departments => depts,
+        :employee_id => employee_id,
+        :affiliate_id => affiliate_id,
+        :inactive => false
       )
     end
-    
+
   end
-end
+end

data/app/models/ucb_rails/user.rb

@@ -1,45 +1,53 @@
 class UcbRails::User < ActiveRecord::Base
   self.table_name = 'users'
-  
-  attr_accessible :uid, :first_name, :last_name, :inactive
-  
+
+  # attr_accessible :uid, :first_name, :last_name, :inactive
+
   before_validation :set_first_last_name
-  
+
   # Overridden by application
   def roles
     []
   end
-  
+
   def has_role?(role)
     admin? || roles.include?(role)
   end
-  
+
   def active?
     !inactive?
   end
-  
+
   def admin!(_admin=true)
     update_attribute(:admin, _admin)
   end
-  
+
   def inactive!(_inactive=true)
     update_attribute(:inactive, _inactive)
   end
-  
+
   def self.active
     where(inactive: false)
   end
-  
+
   def self.admin
     where(admin: true)
   end
-  
+
+  def ldap_entry
+    UcbRails::LdapPerson::Finder.find_by_uid!(uid)
+  end
+
+  def full_name
+    "#{first_name} #{last_name}"
+  end
+
   private
-  
+
   def set_first_last_name
     self.first_last_name = [first_name, last_name]
       .select { |n| n.present? }
       .join(' ')
       .presence
   end
-end
+end

data/app/models/ucb_rails/user_ldap_service.rb

@@ -1,36 +1,37 @@
 class UcbRails::UserLdapService
-  
+
   class << self
-    
+
     def create_user_from_uid(uid)
       UcbRails.logger.debug "create_user_from_uid #{uid}"
-      
+
       ldap_entry = UcbRails::LdapPerson::Finder.find_by_uid!(uid)
       create_user_from_ldap_entry(ldap_entry)
     end
-    
+
     def create_user_from_ldap_entry(ldap_entry)
       UcbRails.logger.debug "create_user_from_ldap_entry #{ldap_entry.uid}"
-      
+
       UcbRails::User.create! do |u|
         u.uid = ldap_entry.uid
         u.first_name = ldap_entry.first_name
         u.last_name = ldap_entry.last_name
         u.email = ldap_entry.email
         u.phone = ldap_entry.phone
+        u.inactive = ldap_entry.inactive
       end
     end
 
     def update_user_from_uid(uid)
       UcbRails.logger.debug "update_user_from_uid #{uid}"
-      
+
       ldap_entry = UcbRails::LdapPerson::Finder.find_by_uid!(uid)
       update_user_from_ldap_entry(ldap_entry)
     end
 
     def update_user_from_ldap_entry(ldap_entry)
       UcbRails.logger.debug "update_user_from_ldap_entry #{ldap_entry.uid}"
-      
+
       UcbRails::User.find_by_uid!(ldap_entry.uid).tap do |user|
         user.first_name = ldap_entry.first_name
         user.last_name = ldap_entry.last_name
@@ -39,7 +40,7 @@ class UcbRails::UserLdapService
         user.save(validate: false)
       end
     end
-    
+
     def create_or_update_user(uid)
       if user = UcbRails::User.find_by_uid(uid)
         update_user_from_uid(uid)
@@ -47,7 +48,7 @@ class UcbRails::UserLdapService
         create_user_from_uid(uid)
       end
     end
-    
+
     def create_or_update_user_from_entry(entry)
       if user = UcbRails::User.find_by_uid(entry.uid)
         update_user_from_ldap_entry(entry)
@@ -56,4 +57,4 @@ class UcbRails::UserLdapService
       end
     end
   end
-end
+end

data/app/models/ucb_rails/user_typeahead.rb

@@ -55,8 +55,8 @@ module UcbRails
     
     def where(query)
       tokens = query.to_s.strip.split(/\s+/)
-      wheres = tokens.map { |e| "#{search_column} like ?" }.join(' and ')
-      values = tokens.map { |e| "%#{e}%" }
+      wheres = build_wheres(tokens)
+      values = build_values(tokens)
       
       ["#{wheres}", *values]
     end
@@ -76,6 +76,24 @@ module UcbRails
       end
       
     end
+
+    private
+    def build_wheres(tokens)
+      if defined?(ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter) &&  ActiveRecord::Base.connection.kind_of?(ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter)      
+        tokens.map { |e| "REGEXP_LIKE(#{search_column}, ?, 'i' )" }.join(' and ')
+      else
+        tokens.map { |e| "#{search_column} like ?" }.join(' and ')
+      end
+    end
+
+    def build_values(tokens)
+      if defined?(ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter) &&  ActiveRecord::Base.connection.kind_of?(ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter)      
+        tokens.map { |e| "#{e}" }      
+      else
+        tokens.map { |e| "%#{e}%" }      
+      end
+
+    end
   end
   
 end

data/app/views/ucb_rails/admin/email_test/index.html.haml

@@ -1,7 +1,7 @@
 %h1 Send Test Email
 
 = form_tag(ucb_rails_admin_email_test_path) do
-  %p= text_field_tag :email, params[:email], placeholder: 'email@example.com', class: 'span3'
+  %p= text_field_tag :email, params[:email], placeholder: 'email@example.com', class: 'col-md-3'
   %p= submit_button_tag "Send"
   
 - if @email_result.present?  

data/app/views/ucb_rails/admin/users/_form.html.haml

@@ -3,6 +3,7 @@
   = f.input :first_name, :input_html => {disabled: 'disabled'}
   = f.input :last_name, :input_html => {disabled: 'disabled'}
   = f.input :email, :input_html => {disabled: 'disabled'}
+  = f.input :alternate_email
   = f.input :phone, :input_html => {disabled: 'disabled'}
   = f.input :last_login_at, as: :string, :input_html => {disabled: 'disabled', value: datetime_to_s(@user.last_login_at, :long)}
   = f.input :last_request_at, as: :string, :input_html => {disabled: 'disabled', value: datetime_to_s(@user.last_request_at, :long)}

data/app/views/ucb_rails/admin/users/_user.html.haml

@@ -5,9 +5,10 @@
   %td= user.first_name
   %td= user.last_name
   %td= mail_to(user.email)
+  %td= mail_to(user.alternate_email)
   %td.phone= user.phone
   %td.dt= datetime_to_s(user.last_request_at, :long)
   %td.min= user.uid
-  %td= link_to('edit', edit_ucb_rails_admin_user_path(user), :class => 'btn btn-mini', :id => dom_id(user, 'edit')) 
-  %td= link_to('delete', ucb_rails_admin_user_path(user), :data => {confirm: 'Are you sure?'}, :method => :delete, :class => 'btn btn-mini btn-danger')
-  
+  %td= link_to('edit', edit_ucb_rails_admin_user_path(user), :class => 'btn btn-default btn-xs', :id => dom_id(user, 'edit')) 
+  %td= link_to('delete', ucb_rails_admin_user_path(user), :data => {confirm: 'Are you sure?'}, :method => :delete, :class => 'btn btn-xs btn-danger')
+  

data/app/views/ucb_rails/admin/users/index.html.haml

@@ -10,6 +10,7 @@
       %th First Name
       %th Last Name
       %th Email
+      %th Alternate Email
       %th Phone
       %th.dt Last Request At
       %th UID
@@ -19,4 +20,4 @@
     =# render partial: 'ucb_rails/admin/users/user', collection: @users
     
 = render :partial => 'ucb_rails/lps/modal'
-  
+  

data/app/views/ucb_rails/home/logged_in.html.haml

@@ -1,13 +1,16 @@
 %h1 Logged In
 
 %p
-  Your are logged in as #{session[:uid]}
+  You are logged in as #{session[:uid]}
   
 %p
   = link_to("Logout", logout_path)
 
 %hr
-%p= current_ldap_person.inspect
+- begin
+  %p= current_ldap_person.inspect 
+- rescue Net::LDAP::LdapError, UCB::LDAP::BindFailedException => e
+  %p= current_user.inspect
 
 %hr
   = session.inspect

data/config/routes.rb

@@ -1,15 +1,15 @@
 Rails.application.routes.draw do
   root to: 'ucb_rails/home#index'
   
-  match 'ucb_rails', :to => 'ucb_rails/home#index'
+  match 'ucb_rails', :to => 'ucb_rails/home#index', via: [:get]
   
-  match '/login', :to => 'ucb_rails/sessions#new', :as => 'login'
-  match '/logout', :to => 'ucb_rails/sessions#destroy', :as => 'logout'
-  match '/auth/:omniauth_provider/callback' => 'ucb_rails/sessions#create'
-  match '/auth/failure' => "ucb_rails/sessions#failure"
-  match '/not_authorized', :to => 'ucb_rails/sessions#not_authorized', as: 'not_authorized'
+  match '/login', :to => 'ucb_rails/sessions#new', :as => 'login', via: [:get]
+  match '/logout', :to => 'ucb_rails/sessions#destroy', :as => 'logout', via: [:all]
+  match '/auth/:omniauth_provider/callback' => 'ucb_rails/sessions#create', via: [:get]
+  match '/auth/failure' => "ucb_rails/sessions#failure", via: [:get]
+  match '/not_authorized', :to => 'ucb_rails/sessions#not_authorized', as: 'not_authorized', via: [:get]
   
-  match '/ucb_rails/bootstrap(/:uid)' => 'ucb_rails/bootstrap#index'
+  match '/ucb_rails/bootstrap(/:uid)' => 'ucb_rails/bootstrap#index', via: [:get]
   
   resources :hidden_announcements, path: '/announcements', only: [:index, :create, :destroy]
 

data/lib/generators/ucb_rails/install_generator.rb

@@ -27,6 +27,15 @@ module UcbRails
           readme "README"
         end
       end
+
+      def self.next_migration_number(path)
+        unless @prev_migration_nr
+          @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
+        else
+          @prev_migration_nr += 1
+        end
+        @prev_migration_nr.to_s
+      end
       
       private
       
@@ -36,7 +45,7 @@ module UcbRails
           # migration_template migration_file
           # puts migration_file
           relative_name = Pathname.new(migration_file).relative_path_from(Pathname.new(template_dir))
-          migration_template relative_name
+          migration_template migration_file, relative_name
         end
       end
     end

data/lib/generators/ucb_rails/templates/app/assets/javascripts/application.js

@@ -12,6 +12,7 @@
 //
 //= require jquery
 //= require jquery_ujs
+//= require tether
 //= require bootstrap
 //= require dataTables/jquery.dataTables
 //= require dataTables/jquery.dataTables.api.fnSetFilteringDelay

data/lib/generators/ucb_rails/templates/app/assets/javascripts/ucb_rails/users_datatable.js

@@ -1,7 +1,7 @@
 $(function() {
   
   $('#ucb_rails_users').dataTable({
-    "sDom": "<'row-fluid'<'span6'l><'span6'f>r>t<'row-fluid'<'span6'i><'span6'p>>",
+    "sDom": "<'row'<'span6'l><'span6'f>r>t<'row'<'span6'i><'span6'p>>",
     "sPaginationType": "bootstrap",
     "bProcessing": true,
     "bServerSide": true,

data/lib/generators/ucb_rails/templates/app/assets/stylesheets/application.css

@@ -8,6 +8,7 @@
  * You're free to add application-wide styles to this file and they'll appear at the top of the
  * compiled file, but it's generally better to create a new file per style scope.
  *
+ *= require bootstrap-datepicker3
  *= require_self
  *= require dataTables/jquery.dataTables.bootstrap
  *= require_tree .

data/lib/generators/ucb_rails/templates/app/assets/stylesheets/bootstrap_and_overrides.css.scss

@@ -1,3 +1,4 @@
-$baseFontSize: 13px;
-
-@import "bootstrap";
+@import "ucb_rails/variables";
+@import "bootstrap-sprockets";
+@import "bootstrap";
+@import "ucb_rails";

data/lib/generators/ucb_rails/templates/app/views/layouts/_footer.html.haml

@@ -1,5 +1,5 @@
 .footer
   %hr
   .container
-    %p.muted.credit
+    %p.text-muted.credit
       = [UcbRails[:user_session_manager], session[:omniauth_provider] ].join(', ')

data/lib/generators/ucb_rails/templates/app/views/layouts/_navigation.html.haml

@@ -2,24 +2,27 @@
   
   = brand(app_name, url: root_path, with_environment: true)
 
-  = nav_bar_links do
-    - if logged_in?
-      - if admin?
-        = nav_dropdown("Admin") do
-          = dropdown_item(announcements_text, admin_announcements_path)
-          = dropdown_item(icon('user', "Users"), ucb_rails_admin_users_path)
-      
-        = render partial: 'layouts/developer'
+  = nav_bar_wrapper do 
+    = nav_bar_links(pull: 'right') do
+      - if logged_in?
+        - if admin?
+          = nav_dropdown("Admin") do
+            = dropdown_item(announcements_text, admin_announcements_path)
+            = dropdown_item(icon('user', "Users"), ucb_rails_admin_users_path)
+        
+          = render partial: 'layouts/developer'
 
+        = nav_dropdown("Logged in as #{current_user.full_name}") do
+          - if admin?
+            = dropdown_item(icon('user', "Disable admin user"), toggle_admin_path)
+          - else
+            = dropdown_item(icon('user', "Enable admin user"), toggle_admin_path)
+          = dropdown_item(announcements_text, hidden_announcements_path)
+          = dropdown_divider
+          = dropdown_item(icon('remove', 'Logout'), logout_path)
+          
 
-    - else
-      %li
-        = link_to('Login', login_path)
-        
-  - if logged_in?
-    = nav_bar_links(pull: 'right') do
-      = nav_dropdown("Logged in as #{current_user.first_last_name}") do
-        = dropdown_item(announcements_text, hidden_announcements_path)
-        = dropdown_divider
-        = dropdown_item(icon('remove', 'Logout'), logout_path)
-        
+      - else
+        %li
+          = link_to('Login', login_path)
+