sufia 0.0.1.pre1 → 0.0.1.pre2

data/app/views/users/_search_form.html.erb

@@ -15,7 +15,7 @@ limitations under the License.
 %>
 
 <div style="float: right;" >
-    <%= form_tag profiles_path, :method => :search, :class => "well form-search" do %>
+    <%= form_tag sufia.profiles_path, :method => :search, :class => "well form-search" do %>
       <label class="accessible-hidden">Search Users</label>
       <%= text_field_tag :uq, params[:uq], :class => "q", :placeholder => "Search Users", :size => '30', :type => "search", :id => "user_search" %>
       <%= hidden_field_tag :sort, params[:sort], :id => 'user_sort' %>

data/app/views/users/edit.html.erb

@@ -14,8 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 %>
 
-<% javascript 'bootstrap-tooltip.js'%>
-<% javascript 'bootstrap-popover.js'%>
+<% content_for :head do %>
+
+  <% javascript_include_tag 'bootstrap-tooltip.js'%>
+  <% javascript_include_tag 'bootstrap-popover.js'%>
+<% end %>
 
 <% content_for :local_js do %>
 // initialize popover helpers
@@ -51,7 +54,7 @@ $("a[rel=popover]").popover();
       <div class="controls">
         <label class="checkbox">
           <%= check_box_tag 'update_directory' %> Yes
-          <a href="#" id="refresh_directory_help" rel="popover" data-content="The information displayed in your profile comes from Penn State's central directory (LDAP) and is cached by ScholarSphere.  If you have updated that information and don't see those changes in your ScholarSphere profile, check the box and save your profile." data-original-title="Refresh Directory Info"><i class="icon-question-sign icon-large"></i></a>
+          <a href="#" id="refresh_directory_help" rel="popover" data-content="The information displayed in your profile comes from <%=t('sufia.institution_name') %>'s central directory (LDAP) and is cached by <%=t('sufia.product_name') %>.  If you have updated that information and don't see those changes in your <%=t('sufia.product_name') %> profile, check the box and save your profile." data-original-title="Refresh Directory Info"><i class="icon-question-sign icon-large"></i></a>
         </label>
       </div>
     </div>

data/config/locales/sufia.en.yml

@@ -0,0 +1,6 @@
+en:
+  sufia:
+    product_name: "ScholarSphere"
+    account_name: "Penn State Access Account Id"
+    institution_name: "Penn State"
+    

data/config/routes.rb

@@ -6,9 +6,6 @@ Sufia::Engine.routes.draw do
 
   match 'batch_edits/clear' => 'batch_edits#clear', :as => :batch_edits_clear
 
-  # add batch edit routes
-  Hydra::BatchEdit.add_routes(self)
-
   # Route path-less requests to the index view of catalog
   root :to => "catalog#index"
 
@@ -31,6 +28,7 @@ Sufia::Engine.routes.draw do
   resources :downloads, :only => "show"
 
   # Login/logout route to destroy session
+  # can just be in the PSU scholarsphere
   match 'logout' => 'sessions#destroy', :as => :destroy_user_session
   match 'login' => 'sessions#new', :as => :new_user_session
 

data/features/browse_dashboard_files.feature

@@ -2,7 +2,7 @@ Feature: Browse Dashboard files
 
   Scenario: Browse via Fixtures 
     Given I load scholarsphere fixtures
-    Given I am logged in as "archivist2"
+    Given I am logged in as "archivist2@example.com"
     And I follow "dashboard"
     And I follow "more Keywords"
     And I follow "keyf"

data/features/display_dashboard.feature

@@ -34,7 +34,7 @@ Feature: As an authenticate and authorized
  @javascript
   Scenario: I have files on my dashboard I should see icons 
     Given I load scholarsphere fixtures
-    And I am logged in as "archivist1"
+    And I am logged in as "archivist1@example.com"
     And I follow "dashboard"
     Then I should see "Test Document Text"
     Given I follow "Delete"

data/features/step_definitions/fixture_steps.rb

@@ -15,7 +15,7 @@
 require "rake"
 
 def loaded_files_excluding_current_rake_file
-  $".reject { |file| file.include? "lib/tasks/scholarsphere-fixtures" }
+  $".reject { |file| file.include? "lib/tasks/fixtures" }
 end
 
 def activefedora_path
@@ -25,7 +25,7 @@ end
 Given /^I load scholarsphere fixtures$/ do
   @rake = Rake::Application.new
   Rake.application = @rake
-  Rake.application.rake_require("lib/tasks/scholarsphere-fixtures", ["."], loaded_files_excluding_current_rake_file)
+  Rake.application.rake_require("lib/tasks/fixtures", ["."], loaded_files_excluding_current_rake_file)
   Rake.application.rake_require("lib/tasks/active_fedora", [activefedora_path], loaded_files_excluding_current_rake_file)
   Rake::Task.define_task(:environment)
   @rake['scholarsphere:fixtures:refresh'].invoke

data/features/step_definitions/user_steps.rb

@@ -17,15 +17,19 @@
 # @example
 #   I am logged in as "archivist1@example.com"
 Given /^I (?:am )?log(?:ged)? in as "([^\"]*)"$/ do |login|
-  driver_name = "rack_test_authenticated_header_#{login}".to_s
-  Capybara.register_driver(driver_name) do |app|
-    Capybara::RackTest::Driver.new(app, headers: { 'REMOTE_USER' => login })
-  end
-  user = User.find_or_create_by_login(login)
-  User.find_by_login(login).should_not be_nil
-  Capybara.current_driver = driver_name
-  
+  # driver_name = "rack_test_authenticated_header_#{login}".to_s
+  # Capybara.register_driver(driver_name) do |app|
+  #   Capybara::RackTest::Driver.new(app, headers: { 'REMOTE_USER' => login })
+  # end
+  #Capybara.current_driver = driver_name
+  user = User.where(:email=>login).first || FactoryGirl.create(:user, :email=>login)
+  User.find_by_user_key(login).should_not be_nil
   visit "/"
+  step %{And I click the anchor "Login"} 
+  fill_in 'Email', with: login
+  fill_in 'Password', with: 'password'
+  click_button 'Sign in'
+  
   step %{And I click the anchor "#{login}"} 
   step %{I should see a link to "ingest" with label "upload"}
   step %{I should see a link to "dashboard" with label "dashboard"}

data/features/support/env.rb

@@ -4,6 +4,15 @@
 # instead of editing this one. Cucumber will automatically load all features/**/*.rb
 # files.
 
+#require 'capybara'
+ENV["RAILS_ENV"] ||= "test"
+require File.expand_path("../../../spec/internal/config/environment.rb",  __FILE__)
+ENV["RAILS_ROOT"] ||= File.dirname(__FILE__) + "../../../spec/internal"
+
+
+FactoryGirl.definition_file_paths = [File.expand_path("../../../spec/factories", __FILE__)]
+FactoryGirl.find_definitions
+
 require 'cucumber/rails'
 
 # Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In

data/features/support/paths.rb

@@ -28,61 +28,61 @@ module NavigationHelpers
     when /the search page/
       '/catalog'
     when /ingest/
-      new_generic_file_path
+      sufia.new_generic_file_path
     when /logout/
-      destroy_user_session_path
+      sufia.destroy_user_session_path
     when /my account info/
-      edit_user_registration_path
+      sufia.edit_user_registration_path
     when /the base search page/
       '/catalog?q=&search_field=search&action=index&controller=catalog&commit=search'
     when /the document page for id (.+)/ 
-      catalog_path($1)
+      sufia.catalog_path($1)
     when /the edit page for id (.+)/ 
-      edit_catalog_path($1)
+      sufia.edit_catalog_path($1)
     when /the catalog index page/
-      catalog_index_path
+      sufia.catalog_index_path
     # Add more mappings here.
     # Here is a more fancy example:
     #
     #   when /^(.*)'s profile page$/i
     #     user_profile_path(User.find_by_login($1))
     when /dashboard/
-      dashboard_path
+      sufia.dashboard_path
 
     when /the edit document page for (.*)$/i
-      edit_catalog_path($1)
+      sufia.edit_catalog_path($1)
     when /the show document page for (.*)$/i
-      catalog_path($1)
+      sufia.catalog_path($1)
     when /the delete confirmation page for (.*)$/i
-      delete_catalog_path($1)
+      sufia.delete_catalog_path($1)
       
     when /the file (?:asset )?list page for (.*)$/i
-      asset_file_assets_path($1)
+      sufia.asset_file_assets_path($1)
     when /the file asset creation page for (.*)$/i
-      asset_file_assets_path($1)
+      sufia.asset_file_assets_path($1)
     when /the deletable file list page for (.*)/i
-      asset_file_assets_path($1, :deletable=>"true",:layout=>"false")
+      sufia.asset_file_assets_path($1, :deletable=>"true",:layout=>"false")
     when /the file asset (.*) with (.*) as its container$/i
-      asset_file_asset_path($2, $1)
+      sufia.asset_file_asset_path($2, $1)
     when /the file asset (.*)$/i
-      file_asset_path($1)
+      sufia.file_asset_path($1)
     when /the permissions page for (.*)$/i
-      asset_permissions_path($1)
+      sufia.asset_permissions_path($1)
     
     when /new (.*) page$/i
-      new_asset_path(:content_type => $1)
+      sufia.new_asset_path(:content_type => $1)
     when /the asset (.*)$/i
-      asset_path($1)
+      sufia.asset_path($1)
     when /show asset page for (.*)$/i
-      asset_path($1)
+      sufia.asset_path($1)
 
       
     when /the (\d+)(?:st|nd|rd|th) (person|organization|conference) entry in (.*)$/i
       # contributor_id = "#{$2}_#{$1.to_i-1}"
-      asset_contributor_path($3, $2, $1.to_i-1, :content_type=>"mods_asset")
+      sufia.asset_contributor_path($3, $2, $1.to_i-1, :content_type=>"mods_asset")
     
     when /the edit (.*) page for (.*)$/i
-      edit_catalog_path($2,:wf_step=>$1)
+      sufia.edit_catalog_path($2,:wf_step=>$1)
     else
       begin
         page_name =~ /the (.*) page/

data/lib/generators/sufia/sufia_generator.rb

@@ -11,6 +11,11 @@ class SufiaGenerator < Rails::Generators::Base
   desc """
 This generator makes the following changes to your application:
  1. Creates several database migrations if they do not exist in /db/migrate
+ 2. Adds user behavior to the user model
+ 3. Adds controller behavior to the application controller
+ 4. Creates the sufia.rb configuration file
+ 5. Copies the catalog controller into the local app
+ 6. Generates mailboxer
        """ 
 
   # Implement the required interface for Rails::Generators::Migration.
@@ -34,8 +39,36 @@ add_groups_to_users.rb		create_local_authorities.rb}.each do |f|
     end
   end
 
+  # Add behaviors to the user model
+  def inject_sufia_user_behavior
+    file_path = "app/models/#{model_name.underscore}.rb"
+    if File.exists?(file_path) 
+      inject_into_class file_path, model_name.classify do 
+        "# Connects this user object to Sufia behaviors. " +
+        "\n include Sufia::User\n"        
+      end
+    else
+      puts "     \e[31mFailure\e[0m  Sufia requires a user object. This generators assumes that the model is defined in the file #{file_path}, which does not exist.  If you used a different name, please re-run the generator and provide that name as an argument. Such as \b  rails -g sufia client" 
+    end    
+  end
+
+  # Add behaviors to the application controller
+  def inject_sufia_controller_behavior    
+    controller_name = "ApplicationController"
+    file_path = "app/controllers/application_controller.rb"
+    if File.exists?(file_path) 
+      insert_into_file file_path, :after => 'include Hydra::Controller::ControllerBehavior' do 
+        "  \n# Adds Sufia behaviors into the application controller \n" +        
+        "  include Sufia::Controller\n"
+      end
+    else
+      puts "     \e[31mFailure\e[0m  Could not find #{file_path}.  To add Sufia behaviors to your  Controllers, you must include the Sufia::Controller module in the Controller class definition." 
+    end
+  end
+  
   def create_configuration_files
     copy_file "config/sufia.rb", "config/initializers/sufia.rb"
+    copy_file "config/redis_config.rb", "config/initializers/redis_config.rb"
   end
 
   def catalog_controller
@@ -43,11 +76,20 @@ add_groups_to_users.rb		create_local_authorities.rb}.each do |f|
   end
   
 
+  # The engine routes have to come after the devise routes so that /users/sign_in will work
   def inject_routes
-    # These will end up in routes.rb file in reverse order
-    # we add em, since each is added at the top of file. 
-    # we want "root" to be FIRST for optimal url generation. 
-    route "mount Sufia::Engine => '/'"
+    routing_code = "Hydra::BatchEdit.add_routes(self)"
+    sentinel = /HydraHead.add_routes\(self\)/
+    inject_into_file 'config/routes.rb', "\n  #{routing_code}\n", { :after => sentinel, :verbose => false }
+
+    routing_code = "mount Sufia::Engine => '/'"
+    sentinel = /devise_for :users/
+    inject_into_file 'config/routes.rb', "\n  #{routing_code}\n", { :after => sentinel, :verbose => false }
+    
+  end
+
+  def install_mailboxer
+    generate "mailboxer:install" 
   end
 
   private  

data/lib/generators/sufia/templates/catalog_controller.rb

@@ -47,7 +47,7 @@ class CatalogController < ApplicationController
   def recent
     if user_signed_in?
       # grab other people's documents
-      (resp, doc_list) = get_search_results(:q =>'{!lucene q.op=AND df=depositor_t}-'+current_user.login, :sort=>"system_create_dt desc", :rows=>3)      
+      (resp, doc_list) = get_search_results(:q =>'{!lucene q.op=AND df=depositor_t}-'+current_user.user_key, :sort=>"system_create_dt desc", :rows=>3)      
     else 
       # grab any documents we do not know who you are
       (resp, doc_list) = get_search_results(:q =>'', :sort=>"system_create_dt desc", :rows=>3)
@@ -57,7 +57,7 @@ class CatalogController < ApplicationController
 
   def recent_me
     if user_signed_in?
-      (resp, doc_list) = get_search_results(:q =>'{!lucene q.op=AND df=depositor_t}'+current_user.login, :sort=>"system_create_dt desc", :rows=>3)
+      (resp, doc_list) = get_search_results(:q =>'{!lucene q.op=AND df=depositor_t}'+current_user.user_key, :sort=>"system_create_dt desc", :rows=>3)
       @recent_user_documents = doc_list[0..3]
     else 
        @recent_user_documents = nil

data/lib/generators/sufia/templates/config/redis_config.rb

@@ -12,6 +12,26 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+if defined?(PhusionPassenger)
+  PhusionPassenger.on_event(:starting_worker_process) do |forked|
+    # We're in smart spawning mode.
+    if forked
+      # Re-establish redis connection
+      require 'redis'
+      config = YAML::load(ERB.new(IO.read(File.join(Rails.root, 'config', 'redis.yml'))).result)[Rails.env].with_indifferent_access
+
+      # The important two lines
+      $redis.client.disconnect if $redis 
+      $redis = Redis.new(host: config[:host], port: config[:port], thread_safe: true) rescue nil
+      Resque.redis.client.reconnect if Resque.redis
+    end
+  end
+else
+  config = YAML::load(ERB.new(IO.read(File.join(Rails.root, 'config', 'redis.yml'))).result)[Rails.env].with_indifferent_access
+  $redis = Redis.new(host: config[:host], port: config[:port], thread_safe: true) rescue nil
+end
+
+
 # Code borrowed from Obie's Redis patterns talk at RailsConf'12
 Nest.class_eval do
   def initialize(key, redis=$redis)

data/lib/generators/sufia/templates/config/sufia.rb

@@ -1,3 +1,32 @@
+
+require 'sufia/http_header_auth'
+
+# TODO move this method to HttpAuth initializer
+# Returns an array containing the vhost 'CoSign service' value and URL
 Sufia.config do |config|
   config.id_namespace = "sufia"
+  config.fits_path = "fits.sh"
+  config.fits_to_desc_mapping= {
+      :file_title => :title,
+      :file_author => :creator
+    }
+
+  config.max_days_between_audits = 7
+
+  # TODO move these to an HttpAuth initializer
+    # Map hostnames onto vhosts
+  config.hosts_vhosts_map = {
+    'fedora1test' => 'https://scholarsphere-integration.dlt.psu.edu:8443/',
+    'fedora2test' => 'https://scholarsphere-test.dlt.psu.edu/',
+    'ss1stage' => 'https://scholarsphere-staging.dlt.psu.edu/',
+    'ss2stage' => 'https://scholarsphere-staging.dlt.psu.edu/',
+    'ss1prod' => 'https://scholarsphere.psu.edu/',
+    'ss2prod' => 'https://scholarsphere.psu.edu/'
+  }
+
+  # TODO move these to an HttpAuth initializer
+  config.logout_url = "https://webaccess.psu.edu/cgi-bin/logout?#{Sufia::HttpHeaderAuth.get_vhost_by_host(config)[1]}"
+  config.login_url = "https://webaccess.psu.edu?cosign-#{Sufia::HttpHeaderAuth.get_vhost_by_host(config)[0]}&#{Sufia::HttpHeaderAuth.get_vhost_by_host(config)[1]}"
 end
+
+

data/lib/generators/sufia/templates/migrations/add_groups_to_users.rb

@@ -16,14 +16,10 @@ class AddGroupsToUsers < ActiveRecord::Migration
   def self.up
     add_column :users, :group_list, :text
     add_column :users, :groups_last_update, :datetime
-    add_column :users, :ldap_available, :boolean
-    add_column :users, :ldap_last_update, :datetime
   end
 
   def self.down
     remove_column :users, :group_list
     remove_column :users, :groups_last_update
-    remove_column :users, :ldap_available
-    remove_column :users, :ldap_last_update
   end
 end

data/lib/sufia.rb

@@ -1,5 +1,6 @@
 require "sufia/version"
 require 'blacklight'
+require 'blacklight_advanced_search'
 require 'hydra/head'
 require 'hydra-batch-edit'
 require 'resque/server'
@@ -8,11 +9,24 @@ require 'mailboxer'
 require 'acts_as_follower'
 require 'paperclip'
 require 'will_paginate'
+require 'nest'
+require 'RMagick'
+require 'activerecord-import'
 
+autoload :Zip, 'zipruby'
 module Sufia
 
   class Engine < ::Rails::Engine
     engine_name 'sufia'
+
+    initializer "Patch active_fedora" do
+      require 'sufia/active_fedora/redis'
+    end
+
+    initializer "Patch active_record" do
+      require 'sufia/active_record/redis'
+    end
+
   end
 
   class ResqueAdmin
@@ -20,7 +34,7 @@ module Sufia
       current_user = request.env['warden'].user
       return false if current_user.blank?
       # TODO code a group here that makes sense
-      current_user.groups.include? 'umg/up.dlt.scholarsphere-admin'
+      #current_user.groups.include? 'umg/up.dlt.scholarsphere-admin'
     end
   end
 
@@ -32,19 +46,12 @@ module Sufia
     return @@config
   end
 
-  autoload :Controller,   'sufia/controller'
-  autoload :Ldap,         'sufia/ldap'
-  autoload :Utils,        'sufia/utils'
-  autoload :User,         'sufia/user'
-  autoload :ModelMethods, 'sufia/model_methods'
-  autoload :Noid,         'sufia/noid'
-  autoload :IdService,    'sufia/id_service'
+  autoload :Controller,    'sufia/controller'
+  autoload :Utils,         'sufia/utils'
+  autoload :User,          'sufia/user'
+  autoload :ModelMethods,  'sufia/model_methods'
+  autoload :Noid,          'sufia/noid'
+  autoload :IdService,     'sufia/id_service'
+  autoload :HttpHeaderAuth,'sufia/http_header_auth'
 end
 
-module ActiveFedora
-  class UnsavedDigitalObject
-    def assign_pid
-      @pid ||= Sufia::IdService.mint
-    end
-  end
-end