sufia 0.0.1.pre1 → 0.0.1.pre2

data/.gitignore

@@ -24,8 +24,7 @@ tmtags
 .\#*
 
 ## VIM
-*.swp
-*.swo
+*.sw[pon]
 
 ## OSX
 .DS_Store

data/Gemfile

@@ -15,7 +15,6 @@ group :development, :test do
   gem "rails_indexes", :git => "git://github.com/warpc/rails_indexes.git", :ref => '4a550270'
   gem 'selenium-webdriver'
   gem 'headless'
-  gem 'rspec', '2.11.0'
   gem 'rspec-rails', '>= 2.11.0'
   gem 'ruby-prof'
   gem 'mocha', '0.12.4', :require => false
@@ -26,4 +25,6 @@ group :development, :test do
   gem "jettywrapper"
   gem "factory_girl_rails", "~> 4.1.0"
   gem 'launchy'
+
+  gem 'devise'
 end # (leave this comment here to catch a stray line inserted by blacklight!)

data/README.md

@@ -1,11 +1,10 @@
-# Scholarsphere
+# Sufia
 
-Run the blacklight, hydra mailboxer and scholarsphere generators
+Run the blacklight, hydra and scholarsphere generators
 ```
 rails g blacklight --devise
-rails g hydra:head -df
-rails g mailboxer:install
-rails g scholarsphere -df
+rails g hydra:head -f
+rails g sufia -f
 ```
 
 Run the migrations
@@ -14,20 +13,25 @@ Run the migrations
 rake db:migrate
 ```
 
-Add include Scholarsphere::User into your user model
-Add include Scholarsphere::Controller into your application_controller.rb
-
-Add role_map_*.yml files into config?
-
-
+In your Gemfile add this:
 ```
 gem 'jettywrapper'
 ```
-bundle install
+Then run `bundle install`
 
 
-application.css
+If you want to use the assets that ship with Sufia, add the following to application.css
+```
  *= require scholarsphere
-
-application.js
+```
+and add the following to application.js
+```
 //= require scholarsphere
+```
+
+Testing: 
+```
+rake scholarsphere:fixtures:create scholarsphere:fixtures:generate
+rake fixtures
+rake spec
+```

data/Rakefile

@@ -1,3 +1,5 @@
 #!/usr/bin/env rake
 
 require "bundler/gem_tasks"
+Dir.glob('tasks/*.rake').each { |r| import r }
+

data/app/controllers/batch_controller.rb

@@ -14,7 +14,6 @@
 
 class BatchController < ApplicationController
   include Hydra::Controller::ControllerBehavior
-  include Hydra::AssetsControllerHelper  # for apply_depositor_metadata method
   include Hydra::Controller::UploadBehavior
   include Sufia::Noid # for normalize_identifier method
 
@@ -39,8 +38,8 @@ class BatchController < ApplicationController
     @batch =  Batch.find_or_create(params[:id])
     @batch.status="processing"
     @batch.save
-    Resque.enqueue(BatchUpdateJob, current_user.login, params, params[:generic_file])
+    Resque.enqueue(BatchUpdateJob, current_user.user_key, params, params[:generic_file])
     flash[:notice] = 'Your files are being processed by ScholarSphere in the background. The metadata and access controls you specified are being applied. Files will be marked <span class="label label-important" title="Private">Private</span> until this process is complete (shouldn\'t take too long, hang in there!). You may need to refresh your dashboard to see these updates.'
-    redirect_to dashboard_path
+    redirect_to sufia.dashboard_path
   end
 end

data/app/controllers/contact_form_controller.rb

@@ -22,6 +22,7 @@ class ContactFormController < ApplicationController
     @contact_form = ContactForm.new(params[:contact_form])
     @contact_form.request = request
     # not spam and a valid form
+    logger.warn "*** MARK ***"
     if @contact_form.deliver
       flash.now[:notice] = 'Thank you for your message!'
       render :new

data/app/controllers/dashboard_controller.rb

@@ -33,8 +33,8 @@ class DashboardController < ApplicationController
   DashboardController.solr_search_params_logic << :exclude_unwanted_models
 
   def index
-    extra_head_content << view_context.auto_discovery_link_tag(:rss, url_for(params.merge(:format => 'rss')), :title => "RSS for results")
-    extra_head_content << view_context.auto_discovery_link_tag(:atom, url_for(params.merge(:format => 'atom')), :title => "Atom for results")
+    extra_head_content << view_context.auto_discovery_link_tag(:rss, sufia.url_for(params.merge(:format => 'rss')), :title => "RSS for results")
+    extra_head_content << view_context.auto_discovery_link_tag(:atom, sufia.url_for(params.merge(:format => 'atom')), :title => "Atom for results")
     (@response, @document_list) = get_search_results
     @user = current_user
     @events = @user.events(100)

data/app/controllers/generic_files_controller.rb

@@ -22,7 +22,17 @@ class GenericFilesController < ApplicationController
   # This is needed as of BL 3.7
   self.copy_blacklight_config_from(CatalogController)
 
-  rescue_from AbstractController::ActionNotFound, :with => :render_404
+  # Catch permission errors
+  rescue_from Hydra::AccessDenied do |exception|
+    if (exception.action == :edit)
+      redirect_to(sufia.url_for({:action=>'show'}), :alert => exception.message)
+    elsif current_user and current_user.persisted?
+      redirect_to root_url, :alert => exception.message
+    else
+      session["user_return_to"] = request.url
+      redirect_to new_user_session_url, :alert => exception.message
+    end
+  end
 
   # actions: audit, index, create, new, edit, show, update, destroy, permissions, citation
   before_filter :authenticate_user!, :except => [:show, :citation]
@@ -54,11 +64,11 @@ class GenericFilesController < ApplicationController
     pid = @generic_file.noid
     @generic_file.delete
     begin
-      Resque.enqueue(ContentDeleteEventJob, pid, current_user.login)
+      Resque.enqueue(ContentDeleteEventJob, pid, current_user.user_key)
     rescue Redis::CannotConnectError
       logger.error "Redis is down!"
     end
-    redirect_to dashboard_path, :notice => render_to_string(:partial=>'generic_files/asset_deleted_flash', :locals => { :generic_file => @generic_file })
+    redirect_to sufia.dashboard_path, :notice => render_to_string(:partial=>'generic_files/asset_deleted_flash', :locals => { :generic_file => @generic_file })
   end
 
   # routed to /files (POST)
@@ -84,7 +94,7 @@ class GenericFilesController < ApplicationController
         create_and_save_generic_file
         if @generic_file
           begin
-            Resque.enqueue(ContentDepositEventJob, @generic_file.pid, current_user.login)
+            Resque.enqueue(ContentDepositEventJob, @generic_file.pid, current_user.user_key)
           rescue Redis::CannotConnectError
             logger.error "Redis is down!"
           end
@@ -144,7 +154,7 @@ class GenericFilesController < ApplicationController
       @generic_file.add_file_datastream(revision.content, :dsid => 'content')
       version_event = true
       begin
-        Resque.enqueue(ContentRestoredVersionEventJob, @generic_file.pid, current_user.login, params[:revision])
+        Resque.enqueue(ContentRestoredVersionEventJob, @generic_file.pid, current_user.user_key, params[:revision])
       rescue Redis::CannotConnectError
         logger.error "Redis is down!"
       end
@@ -155,7 +165,7 @@ class GenericFilesController < ApplicationController
       add_posted_blob_to_asset(@generic_file, params[:filedata])
       version_event = true
       begin
-        Resque.enqueue(ContentNewVersionEventJob, @generic_file.pid, current_user.login)
+        Resque.enqueue(ContentNewVersionEventJob, @generic_file.pid, current_user.user_key)
       rescue Redis::CannotConnectError
         logger.error "Redis is down!"
       end
@@ -166,12 +176,12 @@ class GenericFilesController < ApplicationController
     @generic_file.save
     # do not trigger an update event if a version event has already been triggered
     begin
-      Resque.enqueue(ContentUpdateEventJob, @generic_file.pid, current_user.login) unless version_event
+      Resque.enqueue(ContentUpdateEventJob, @generic_file.pid, current_user.user_key) unless version_event
     rescue Redis::CannotConnectError
       logger.error "Redis is down!"
     end
     record_version_committer(@generic_file, current_user)
-    redirect_to edit_generic_file_path(:tab => params[:redirect_tab]), :notice => render_to_string(:partial=>'generic_files/asset_updated_flash', :locals => { :generic_file => @generic_file })
+    redirect_to sufia.edit_generic_file_path(:tab => params[:redirect_tab]), :notice => render_to_string(:partial=>'generic_files/asset_updated_flash', :locals => { :generic_file => @generic_file })
 
   end
 
@@ -180,8 +190,8 @@ class GenericFilesController < ApplicationController
     Sufia::GenericFile::Permissions.parse_permissions(params)
     @generic_file.update_attributes(params[:generic_file].reject { |k,v| %w{ Filedata Filename revision}.include? k})
     @generic_file.save
-    Resque.enqueue(ContentUpdateEventJob, @generic_file.pid, current_user.login)
-    redirect_to edit_generic_file_path, :notice => render_to_string(:partial=>'generic_files/asset_updated_flash', :locals => { :generic_file => @generic_file })
+    Resque.enqueue(ContentUpdateEventJob, @generic_file.pid, current_user.user_key)
+    redirect_to sufia.edit_generic_file_path, :notice => render_to_string(:partial=>'generic_files/asset_updated_flash', :locals => { :generic_file => @generic_file })
   end
 
   protected
@@ -192,7 +202,7 @@ class GenericFilesController < ApplicationController
     VersionCommitter.create(:obj_id => version.pid,
                             :datastream_id => version.dsid,
                             :version_id => version.versionID,
-                            :committer_login => user.login)
+                            :committer_login => user.user_key)
   end
 
   def find_by_id
@@ -230,6 +240,7 @@ class GenericFilesController < ApplicationController
     #   file.tempfile = f
     #end
     add_posted_blob_to_asset(@generic_file,file)
+
     @generic_file.apply_depositor_metadata(user_key)
     @generic_file.date_uploaded = Time.now.ctime
     @generic_file.date_modified = Time.now.ctime
@@ -248,12 +259,13 @@ class GenericFilesController < ApplicationController
       @generic_file.save
     rescue RSolr::Error::Http => error
       logger.warn "GenericFilesController::create_and_save_generic_file Caught RSOLR error #{error.inspect}"
-      save_tries++
+      save_tries+=1
       # fail for good if the tries is greater than 3
       rescue_action_without_handler(error) if save_tries >=3
       sleep 0.01
       retry
     end
+
     record_version_committer(@generic_file, current_user)
     begin
       Resque.enqueue(UnzipJob, @generic_file.pid) if file.content_type == 'application/zip'

data/app/controllers/mailbox_controller.rb

@@ -30,7 +30,7 @@ class MailboxController < ApplicationController
         delete_message(msg)
      end
      empty_trash(current_user)
-     redirect_to mailbox_path
+     redirect_to sufia.mailbox_path
   end
 
   def delete
@@ -43,7 +43,7 @@ class MailboxController < ApplicationController
    else 
       flash[:alert] = "You do not have privileges to delete the notification..."
    end
-   redirect_to mailbox_path
+   redirect_to sufia.mailbox_path
   end
 
 private 

data/app/controllers/single_use_link_controller.rb

@@ -6,7 +6,7 @@ class SingleUseLinkController < DownloadsController
   def generate_download
     id  = check_single_use_link
     @su =  SingleUseLink.create_download(id)
-    @link =  Rails.application.routes.url_helpers.download_single_use_link_path(@su.downloadKey)
+    @link =  sufia.download_single_use_link_path(@su.downloadKey)
     @generic_file = GenericFile.find(id)
     respond_to do |format|
       format.html
@@ -18,7 +18,7 @@ class SingleUseLinkController < DownloadsController
   def generate_show
     id  = check_single_use_link
     @su = SingleUseLink.create_show(id)
-    @link = Rails.application.routes.url_helpers.show_single_use_link_path(@su.downloadKey)
+    @link = sufia.show_single_use_link_path(@su.downloadKey)
     @generic_file = GenericFile.find(id)
     respond_to do |format|
       format.html
@@ -35,7 +35,7 @@ class SingleUseLinkController < DownloadsController
     id = link.itemId 
     
     #check to make sure the path matches
-    not_found if link.path != Rails.application.routes.url_helpers.download_path(id)
+    not_found if link.path != sufia.download_path(id)
     
     # send the data content
     send_content(id)
@@ -48,7 +48,7 @@ class SingleUseLinkController < DownloadsController
     id = link.itemId 
     
     #check to make sure the path matches
-    not_found if link.path != Rails.application.routes.url_helpers.generic_file_path(id)
+    not_found if link.path != sufia.generic_file_path(id)
     
     #show the file
     @generic_file = GenericFile.find(id)
@@ -57,7 +57,7 @@ class SingleUseLinkController < DownloadsController
     
     # create a dowload link that is single use for the user since we do not just want to show metadata we want to access it too
     @su =  SingleUseLink.create_download(id)
-    @download_link =  Rails.application.routes.url_helpers.download_single_use_link_path(@su.downloadKey)
+    @download_link =  sufia.download_single_use_link_path(@su.downloadKey)
   end
   
   protected

data/app/controllers/users_controller.rb

@@ -50,15 +50,15 @@ class UsersController < ApplicationController
     @user.populate_attributes if params[:update_directory]
     @user.avatar = nil if params[:delete_avatar]
     unless @user.save
-      redirect_to edit_profile_path(@user.to_s), alert: @user.errors.full_messages
+      redirect_to sufia.edit_profile_path(@user.to_s), alert: @user.errors.full_messages
       return
     end
     begin
-      Resque.enqueue(UserEditProfileEventJob, @user.login)
+      Resque.enqueue(UserEditProfileEventJob, @user.user_key)
     rescue Redis::CannotConnectError
       logger.error "Redis is down!"
     end
-    redirect_to profile_path(@user.to_s), notice: "Your profile has been updated"
+    redirect_to sufia.profile_path(@user.to_s), notice: "Your profile has been updated"
   end
 
   # Follow a user
@@ -66,12 +66,12 @@ class UsersController < ApplicationController
     unless current_user.following?(@user)
       current_user.follow(@user)
       begin
-        Resque.enqueue(UserFollowEventJob, current_user.login, @user.login)
+        Resque.enqueue(UserFollowEventJob, current_user.user_key, @user.user_key)
       rescue Redis::CannotConnectError
         logger.error "Redis is down!"
       end
     end
-    redirect_to profile_path(@user.to_s), notice: "You are following #{@user.to_s}"
+    redirect_to sufia.profile_path(@user.to_s), notice: "You are following #{@user.to_s}"
   end
 
   # Unfollow a user
@@ -79,26 +79,26 @@ class UsersController < ApplicationController
     if current_user.following?(@user)
       current_user.stop_following(@user)
       begin
-        Resque.enqueue(UserUnfollowEventJob, current_user.login, @user.login)
+        Resque.enqueue(UserUnfollowEventJob, current_user.user_key, @user.user_key)
       rescue Redis::CannotConnectError
         logger.error "Redis is down!"
       end
     end
-    redirect_to profile_path(@user.to_s), notice: "You are no longer following #{@user.to_s}"
+    redirect_to sufia.profile_path(@user.to_s), notice: "You are no longer following #{@user.to_s}"
   end
 
   private
   def find_user
-    @user = User.find_by_login(params[:uid])
+    @user = User.find_by_user_key(params[:uid])
     redirect_to root_path, alert: "User '#{params[:uid]}' does not exist" if @user.nil?
   end
 
   def user_is_current_user
-    redirect_to profile_path(@user.to_s), alert: "You cannot edit #{@user.to_s}\'s profile" unless @user == current_user
+    redirect_to sufia.profile_path(@user.to_s), alert: "You cannot edit #{@user.to_s}\'s profile" unless @user == current_user
   end
 
   def user_not_current_user
-    redirect_to profile_path(@user.to_s), alert: "You cannot follow or unfollow yourself" if @user == current_user
+    redirect_to sufia.profile_path(@user.to_s), alert: "You cannot follow or unfollow yourself" if @user == current_user
   end
 
   def get_sort

data/app/helpers/{application_helper.rb → sufia_helper.rb}

@@ -12,15 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-module ApplicationHelper
-
-  def javascript(*files)
-    content_for(:js_head) { javascript_include_tag(*files) }
-  end
-
-  def stylesheet(*files)
-    content_for(:css_head) { stylesheet_link_tag(*files) }
-  end
+module SufiaHelper
 
   # link_back_to_dashboard(:label=>'Back to Search')
   # Create a link back to the dashboard screen, keeping the user's facet, query and paging choices intact by using session.
@@ -43,7 +35,7 @@ module ApplicationHelper
 
   def display_user_name(recent_document)
     return "no display name" unless recent_document[:depositor_t]
-    return User.where(:login => recent_document[:depositor_t][0]).name rescue recent_document[:depositor_t][0]
+    return User.find_by_user_key(recent_document[:depositor_t][0]).name rescue recent_document[:depositor_t][0]
   end
 
   def get_depositor_from_document(doc)
@@ -76,10 +68,10 @@ module ApplicationHelper
   end
 
   def link_to_profile(login)
-    user = User.find_by_login(login)
-    link_to user.name, profile_path(login)
+    user = User.find_by_user_key(login)
+    link_to user.name, Sufia::Engine.routes.url_helpers.profile_path(login)
   rescue
-    link_to login, profile_path(login)
+    link_to login, Sufia::Engine.routes.url_helpers.profile_path(login)
   end
 
   def linkify_chat_id(chat_id)

data/app/models/audit_job.rb

@@ -34,11 +34,10 @@ class AuditJob
         #logger.info "User login is #{login}"`
         #logger.info "All users = #{User.all}"
         if login
-          user = User.find_by_login(login)
+          user = User.find_by_user_key(login)
+          logger.warn "User '#{login}' not found" unless user
           #logger.info "ZZZ user = #{user.inspect}"
-          job_user = User.where(login:"audituser").first
-          job_user = User.create(login:"audituser", email:"auditemail") unless job_user
-
+          job_user = User.audituser()
           #send the user a message about the failing audit
           unless (log.pass == 1)
             message = "The audit run at #{log.created_at} for #{log.pid}:#{log.dsid}:#{log.version} was #{log.pass == 1 ? 'passing' : 'failing'}."

data/app/models/batch.rb

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'datastreams/batch_rdf_datastream'
+
 class Batch < ActiveFedora::Base
   include Hydra::ModelMixins::CommonMetadata
   include Hydra::ModelMixins::RightsMetadata

data/app/models/batch_update_job.rb

@@ -29,14 +29,13 @@ class BatchUpdateJob
     params = HashWithIndifferentAccess.new(params)
     perms = HashWithIndifferentAccess.new(perms)
     batch = Batch.find_or_create(params[:id])
-    user = User.find_by_login(login)
-
+    user = User.find_by_user_key(login)
     saved = []
     denied = []
 
     batch.generic_files.each do |gf|
       unless user.can? :edit, get_permissions_solr_response_for_doc_id(gf.pid)[1]
-        logger.error "User #{user.login} DEEEENIED access to #{gf.pid}!"
+        logger.error "User #{user.user_key} DEEEENIED access to #{gf.pid}!"
         denied << gf
         next
       end
@@ -65,8 +64,7 @@ class BatchUpdateJob
     end
     batch.update_attributes({status:["Complete"]})
     
-    job_user = User.where(login:"batchuser").first
-    job_user = User.create(login:"batchuser", email:"batchmail") unless job_user
+    job_user = User.batchuser()
     
     message = '<a class="batchid ui-helper-hidden">ss-'+batch.noid+'</a>The file(s) '+ file_list(saved)+ " have been saved." unless saved.empty?
     job_user.send_message(user, message, 'Batch upload complete') unless saved.empty?
@@ -77,7 +75,7 @@ class BatchUpdateJob
   end
   
   def file_list ( files)
-    return files.map {|gf| '<a href="'+generic_files_path+'/'+gf.noid+'">'+display_title(gf)+'</a>'}.join(', ')
+    return files.map {|gf| '<a href="'+Sufia::Engine.routes.url_helpers.generic_files_path+'/'+gf.noid+'">'+display_title(gf)+'</a>'}.join(', ')
     
   end