ucb_rails 0.0.6 → 0.0.7

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

@@ -0,0 +1,7 @@
+class UcbRails::Admin::ConfigurationController < UcbRails::Admin::BaseController
+  
+  def index
+    
+  end
+  
+end

data/app/controllers/ucb_rails/sessions_controller.rb

@@ -55,7 +55,7 @@ class UcbRails::SessionsController < ApplicationController
   
   def redirect_url(provider)
     if provider.to_s == 'cas'
-      "http://auth.berkeley.edu/cas/logout?url=#{root_url}"
+      "http://#{UcbRails[:cas_host]}/cas/logout?url=#{root_url}"
     else
       root_path
     end

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

@@ -0,0 +1,53 @@
+module UcbRails
+  module Configuration
+    
+    class Cas
+      attr_accessor :config
+      
+      def initialize(config)
+        self.config = config.presence || {}
+      end
+      
+      def configure
+        configure_omniauth
+        set_ucb_rails_cas_host
+      end
+      
+      def configure_omniauth
+        host_name = host
+        Rails.application.config.middleware.use OmniAuth::Builder do
+          
+          unless RailsEnvironment.production?
+            provider(:developer, fields: [:uid], uid_field: :uid)
+          end
+          
+          provider :cas,
+            host: host_name,
+            login_url: '/cas/login',
+            service_validate_url: '/cas/serviceValidate'
+        end
+      end
+      
+      def set_ucb_rails_cas_host
+        UcbRails.config.cas_host = host
+      end
+      
+      private
+
+      def host
+        config.fetch('host', default_host)
+      end
+      
+      def default_host
+        RailsEnvironment.production? ? 'auth.berkeley.edu' : 'auth-test.berkeley.edu'
+      end
+      
+      class << self
+        def configure(config)
+          new(config).configure
+        end
+      end
+    end
+    
+  end
+end

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

@@ -0,0 +1,40 @@
+module UcbRails
+  module Configuration
+    
+    class Ldap
+      attr_accessor :config
+      
+      def initialize(config)
+        self.config = config.presence || {}
+      end
+      
+      def configure
+        configure_host
+        authenticate
+      end
+      
+      private
+
+      def configure_host
+        UCB::LDAP.host = config.fetch('host', default_host)
+      end
+
+      def authenticate
+        if config.has_key?('username')
+          UCB::LDAP.authenticate config['username'], config['password']
+        end
+      end
+
+      def default_host
+        RailsEnvironment.production? ? 'nds.berkeley.edu' : 'nds-test.berkeley.edu'
+      end
+
+      class << self
+        def configure(config)
+          new(config).configure
+        end
+      end
+    end
+    
+  end
+end

data/app/models/ucb_rails/user.rb

@@ -5,6 +5,15 @@ class UcbRails::User < ActiveRecord::Base
   
   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

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

@@ -0,0 +1,47 @@
+%h1 Configuration
+
+%h2 config/config.yml
+
+- config = UcbRails::Configuration::Configuration.new
+%pre
+  = preserve do
+    = config.config_yaml.to_yaml
+  
+%h2 LDAP
+
+%pre
+  = preserve do
+    = ["host:     #{UCB::LDAP.host}", "username: #{UCB::LDAP.username}", "password: #{UCB::LDAP.password}"].join("\n")
+    
+%h2 Email
+
+%table{border: 1, cellpadding: '4px', cellspacing: 0}
+  %tr
+    %th Key
+    %th Value
+  %tr
+    %td default
+    %td= ActionMailer::Base.default.inspect
+  %tr
+    %td default_url_options
+    %td= ActionMailer::Base.default_url_options.inspect
+  %tr
+    %td delivery method
+    %td= ActionMailer::Base.delivery_method.inspect
+  %tr
+    %td raise delivery errors
+    %td= ActionMailer::Base.raise_delivery_errors.inspect
+  %tr
+    %td sendmail_settings
+    %td= ActionMailer::Base.sendmail_settings.inspect
+  %tr
+    %td smtp_settings
+    %td= ActionMailer::Base.smtp_settings.inspect
+  %tr
+    %td subject prefix
+    %td= UcbRails[:email_subject_prefix]
+    
+%h2 Exception Notifier
+
+%pre
+  = config.for('exception_notifier')

data/config/routes.rb

@@ -18,6 +18,7 @@ Rails.application.routes.draw do
     
     namespace :admin do
       resources :announcements
+      get 'configuration' => 'configuration#index'
       get 'force_exception' => 'force_exception#index'
       resources :users do
         get 'ldap_search', on: :collection

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

@@ -11,7 +11,7 @@ $(function() {
     "oLanguage": {
       "sSearch": "First or Last Name starts with:"
     },
-    "aLengthMenu": [[10, 20, 50, -1], [10, 20, 50, 'All']],
+    "aLengthMenu": [[20, 50, 100, 1000], [20, 50, 100, 1000]],
     "aaSorting": [[ 5, "desc" ]],
     "aoColumnDefs": [
       { "aDataSort": [ 0, 2, 3 ], "aTargets": [ 0 ] }, // admin

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

@@ -1,5 +1,6 @@
 = nav_dropdown("Developer") do
-  = dropdown_item("Bootstrap Examples", bvh_path)
+  = dropdown_item(icon('cog', "Configuration"), ucb_rails_admin_configuration_path)
+  = dropdown_item(icon('picture', "Bootstrap Examples"), bvh_path)
   = dropdown_item(icon('exclamation-sign', "Force Exception"), ucb_rails_admin_force_exception_path)
 
   - if RailsEnvironment.development?

data/lib/generators/ucb_rails/templates/config/config.yml.example

@@ -1,14 +1,20 @@
 # You can have configuration per-environment by nesting under the
 # environment key, or have a top level.
 
-
-    
 # ldap:
+#   host: 'nds.berkeley.edu'
+#   host: 'nds-test.berkeley.edu'
 #   username: <username>
 #   password: <password>
 
 development:
 
+  # Default behavior will do the right thing.  Only set if you want
+  # non-standard behavior.
+  # cas:
+  #   host: 'auth.berkeley.edu'
+  #   host: 'auth-test.berkeley.edu'
+
   # email:
   #   default:
   #     from: user@gmail.com
@@ -40,7 +46,11 @@ development:
   #       - user1@example.com
   #       - user2@example.com
 
+  # Default behavior will select the correct host.  No need to set anything if
+  # you aren't specifying username/password.
   # ldap:
+  #   host: 'nds.berkeley.edu'
+  #   host: 'nds-test.berkeley.edu'
   #   username: <username>
   #   password: <password>
 

data/lib/generators/ucb_rails/templates/config/initializers/local/ucb_rails.rb

@@ -20,24 +20,17 @@ UcbRails::Configuration::ExceptionNotification.configure(config.for('exception_n
 # UCB::LDAP
 ############################################################
 
-UCB::LDAP.host = 'nds.berkeley.edu'
-if ldap_credentials = config.for('ldap')
-  puts "[UcbRails] Using ldap credentials from #{config.config_filename}"
-  UCB::LDAP.authenticate(ldap_credentials['username'], ldap_credentials['password'])
-else
-  puts "[UcbRails] No ldap credentials found.  Using anonymous bind."
-end
-  
+UcbRails::Configuration::Ldap.configure(config.for('ldap'))
+
 ############################################################
 # OmniAuth
 ############################################################
 
-Rails.application.config.middleware.use OmniAuth::Builder do
-  provider(:developer, fields: [:uid], uid_field: :uid) unless RailsEnvironment.production?
-  
-  cas_host = RailsEnvironment.production? ? 'auth.berkeley.edu/cas' : 'auth-test.berkeley.edu/cas'
-  provider :cas, host: cas_host
-end
+UcbRails::Configuration::Cas.configure(config.for('cas'))
+
+############################################################
+# UcbRails
+############################################################
 
 UcbRails.config do |config|
   

data/lib/ucb_rails/version.rb

@@ -1,3 +1,3 @@
 module UcbRails
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ucb_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-21 00:00:00.000000000 Z
+date: 2013-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -563,6 +563,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - app/controllers/ucb_rails/admin/base_controller.rb
+- app/controllers/ucb_rails/admin/configuration_controller.rb
 - app/controllers/ucb_rails/admin/force_exception_controller.rb
 - app/controllers/ucb_rails/admin/users_controller.rb
 - app/controllers/ucb_rails/bootstrap_controller.rb
@@ -581,9 +582,11 @@ files:
 - app/helpers/ucb_rails/renderer/ldap_person_search_result_link.rb
 - app/helpers/ucb_rails/renderer/lps_typeahead_search_field.rb
 - app/mailers/ucb_rails/test_mailer.rb
+- app/models/ucb_rails/configuration/cas.rb
 - app/models/ucb_rails/configuration/configuration.rb
 - app/models/ucb_rails/configuration/email.rb
 - app/models/ucb_rails/configuration/exception_notification.rb
+- app/models/ucb_rails/configuration/ldap.rb
 - app/models/ucb_rails/ldap_person/entry.rb
 - app/models/ucb_rails/ldap_person/finder.rb
 - app/models/ucb_rails/ldap_person/test_finder.rb
@@ -596,6 +599,7 @@ files:
 - app/models/ucb_rails/user_session_manager/in_people_ou_add_to_users_table.rb
 - app/models/ucb_rails/user_session_manager/ldap_person_user_wrapper.rb
 - app/models/ucb_rails/user_typeahead.rb
+- app/views/ucb_rails/admin/configuration/index.html.haml
 - app/views/ucb_rails/admin/users/_form.html.haml
 - app/views/ucb_rails/admin/users/_user.html.haml
 - app/views/ucb_rails/admin/users/edit.html.haml