sufia 0.0.1.pre1 → 0.0.1.pre2

data/app/models/checksum_audit_log.rb

@@ -13,6 +13,8 @@
 # limitations under the License.
 
 class ChecksumAuditLog < ActiveRecord::Base
+  attr_accessible :pass, :pid, :dsid, :version, :created_at
+
   def ChecksumAuditLog.get_audit_log(version)
     log = ChecksumAuditLog.find_or_create_by_pid_and_dsid_and_version(:pid => version.pid,
                                                                       :dsid => version.dsid,

data/app/models/contact_form.rb

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'mail_form'
+
 class ContactForm < MailForm::Base
   ISSUE_TYPES = [ 
       ["Depositing content", "Depositing content"],

data/app/models/content_delete_event_job.rb

@@ -16,7 +16,7 @@ class ContentDeleteEventJob < EventJob
   def initialize(generic_file_id, depositor_id)
     action = "User #{link_to_profile depositor_id} has deleted file '#{generic_file_id}'"
     timestamp = Time.now.to_i
-    depositor = User.find_by_login(depositor_id)
+    depositor = User.find_by_user_key(depositor_id)
     # Create the event
     event = depositor.create_event(action, timestamp)
     # Log the event to the depositor's profile stream

data/app/models/content_deposit_event_job.rb

@@ -15,9 +15,9 @@
 class ContentDepositEventJob < EventJob
   def initialize(generic_file_id, depositor_id)
     gf = GenericFile.find(generic_file_id)
-    action = "User #{link_to_profile depositor_id} has deposited #{link_to gf.title.first, generic_file_path(gf.noid)}"
+    action = "User #{link_to_profile depositor_id} has deposited #{link_to gf.title.first, Sufia::Engine.routes.url_helpers.generic_file_path(gf.noid)}"
     timestamp = Time.now.to_i
-    depositor = User.find_by_login(depositor_id)
+    depositor = User.find_by_user_key(depositor_id)
     # Create the event
     event = depositor.create_event(action, timestamp)
     # Log the event to the depositor's profile stream

data/app/models/content_new_version_event_job.rb

@@ -15,9 +15,9 @@
 class ContentNewVersionEventJob < EventJob
   def initialize(generic_file_id, depositor_id)
     gf = GenericFile.find(generic_file_id)
-    action = "User #{link_to_profile depositor_id} has added a new version of #{link_to gf.title.first, generic_file_path(gf.noid)}"
+    action = "User #{link_to_profile depositor_id} has added a new version of #{link_to gf.title.first, Sufia::Engine.routes.url_helpers.generic_file_path(gf.noid)}"
     timestamp = Time.now.to_i
-    depositor = User.find_by_login(depositor_id)
+    depositor = User.find_by_user_key(depositor_id)
     # Create the event
     event = depositor.create_event(action, timestamp)
     # Log the event to the depositor's profile stream

data/app/models/content_restored_version_event_job.rb

@@ -15,9 +15,9 @@
 class ContentRestoredVersionEventJob < EventJob
   def initialize(generic_file_id, depositor_id, revision_id)
     gf = GenericFile.find(generic_file_id)
-    action = "User #{link_to_profile depositor_id} has restored a version '#{revision_id}' of #{link_to gf.title.first, generic_file_path(gf.noid)}"
+    action = "User #{link_to_profile depositor_id} has restored a version '#{revision_id}' of #{link_to gf.title.first, Sufia::Engine.routes.url_helpers.generic_file_path(gf.noid)}"
     timestamp = Time.now.to_i
-    depositor = User.find_by_login(depositor_id)
+    depositor = User.find_by_user_key(depositor_id)
     # Create the event
     event = depositor.create_event(action, timestamp)
     # Log the event to the depositor's profile stream

data/app/models/content_update_event_job.rb

@@ -15,9 +15,9 @@
 class ContentUpdateEventJob < EventJob
   def initialize(generic_file_id, depositor_id)
     gf = GenericFile.find(generic_file_id)
-    action = "User #{link_to_profile depositor_id} has updated #{link_to gf.title.first, generic_file_path(gf.noid)}"
+    action = "User #{link_to_profile depositor_id} has updated #{link_to gf.title.first, Sufia::Engine.routes.url_helpers.generic_file_path(gf.noid)}"
     timestamp = Time.now.to_i
-    depositor = User.find_by_login(depositor_id)
+    depositor = User.find_by_user_key(depositor_id)
     # Create the event
     event = depositor.create_event(action, timestamp)
     # Log the event to the depositor's profile stream

data/app/models/datastreams/properties_datastream.rb

@@ -17,7 +17,7 @@ class PropertiesDatastream < ActiveFedora::NokogiriDatastream
   set_terminology do |t|
     t.root(:path=>"fields", :xmlns => '', :namespace_prefix => nil) 
     # This is where we put the user id of the object depositor -- impacts permissions/access controls
-    t.depositor :xmlns => '', :namespace_prefix => nil
+    t.depositor :xmlns => '', :namespace_prefix => nil, :index_as=>[:searchable]
     # This is where we put the relative path of the file if submitted as a folder
     t.relative_path :xmlns => '', :namespace_prefix => nil
   end

data/app/models/domain_term.rb

@@ -13,5 +13,6 @@
 # limitations under the License.
 
 class DomainTerm < ActiveRecord::Base
+  attr_accessible :model, :term
   has_and_belongs_to_many :local_authorities, :uniq=> true 
 end

data/app/models/event_job.rb

@@ -17,7 +17,7 @@ class EventJob
   include ActionView::Helpers
   include ActionView::Helpers::DateHelper
   include Hydra::AccessControlsEnforcement
-  include ApplicationHelper
+  include SufiaHelper
 
   def self.queue
     :event

data/app/models/generic_file.rb

@@ -161,7 +161,8 @@ class GenericFile < ActiveFedora::Base
   def related_files
     relateds = begin
                  self.batch.generic_files
-               rescue NoMethodError
+               rescue NoMethodError => e
+                 #batch is nil
                  batch_id = self.object_relations["isPartOf"].first || self.object_relations[:is_part_of].first
                  return [] if batch_id.nil?
                  self.class.find(:is_part_of_s => batch_id)
@@ -188,8 +189,8 @@ class GenericFile < ActiveFedora::Base
     # use the field type to see if the return will be one item or multiple
     if args.is_a? String
       gf.terms_of_service = '1'
-    else
-      gf.each {|f| f.terms_of_service = '1'}
+    elsif gf.respond_to? :each
+      gf.each {|f| f.terms_of_service = '1'} 
     end
     return gf
   end
@@ -653,7 +654,7 @@ class GenericFile < ActiveFedora::Base
       #logger.debug "***AUDIT*** last audit = #{latest_audit.updated_at.to_date}"
       days_since_last_audit = (DateTime.now - latest_audit.updated_at.to_date).to_i
       #logger.debug "***AUDIT*** days since last audit: #{days_since_last_audit}"
-      if days_since_last_audit < Rails.application.config.max_days_between_audits
+      if days_since_last_audit < Sufia::Engine.config.max_days_between_audits
         #logger.debug "***AUDIT*** No audit needed for #{version.pid} #{version.versionID} (#{latest_audit.updated_at})"
         return false
       end

data/app/models/local_authority.rb

@@ -16,6 +16,7 @@ require 'rdf'
 require 'rdf/rdfxml'
 
 class LocalAuthority < ActiveRecord::Base
+  attr_accessible :name
   has_and_belongs_to_many :domain_terms, :uniq=> true 
   has_many :local_authority_entries
 

data/app/models/local_authority_entry.rb

@@ -14,4 +14,5 @@
 
 class LocalAuthorityEntry < ActiveRecord::Base
   belongs_to :local_authority
+  attr_accessible :local_authority, :label, :uri
 end

data/app/models/single_use_link.rb

@@ -5,11 +5,11 @@ class SingleUseLink < ActiveRecord::Base
     
   
   def self.create_show(item_id)
-     create_path(item_id, Rails.application.routes.url_helpers.generic_file_path(item_id) )     
+     create_path(item_id, Sufia::Engine.routes.url_helpers.generic_file_path(item_id) )     
   end
 
   def self.create_download(item_id)
-     create_path(item_id, Rails.application.routes.url_helpers.download_path(item_id) )
+     create_path(item_id, Sufia::Engine.routes.url_helpers.download_path(item_id) )
   end
   
   def expired?

data/app/models/user_edit_profile_event_job.rb

@@ -16,7 +16,7 @@ class UserEditProfileEventJob < EventJob
   def initialize(editor_id)
     action = "User #{link_to_profile editor_id} has edited his or her profile"
     timestamp = Time.now.to_i
-    editor = User.find_by_login(editor_id)
+    editor = User.find_by_user_key(editor_id)
     # Create the event
     event = editor.create_event(action, timestamp)
     # Log the event to the editor's stream

data/app/models/user_follow_event_job.rb

@@ -16,13 +16,13 @@ class UserFollowEventJob < EventJob
   def initialize(follower_id, followee_id)
     action = "User #{link_to_profile follower_id} is now following #{link_to_profile followee_id}"
     timestamp = Time.now.to_i
-    follower = User.find_by_login(follower_id)
+    follower = User.find_by_user_key(follower_id)
     # Create the event
     event = follower.create_event(action, timestamp)
     # Log the event to the follower's stream
     follower.log_event(event)
     # Fan out the event to followee
-    followee = User.find_by_login(followee_id)
+    followee = User.find_by_user_key(followee_id)
     followee.log_event(event)
     # Fan out the event to all followers
     follower.followers.each do |user|

data/app/models/user_unfollow_event_job.rb

@@ -16,13 +16,13 @@ class UserUnfollowEventJob < EventJob
   def initialize(unfollower_id, unfollowee_id)
     action = "User #{link_to_profile unfollower_id} has unfollowed #{link_to_profile unfollowee_id}"
     timestamp = Time.now.to_i
-    unfollower = User.find_by_login(unfollower_id)
+    unfollower = User.find_by_user_key(unfollower_id)
     # Create the event
     event = unfollower.create_event(action, timestamp)
     # Log the event to the unfollower's stream
     unfollower.log_event(event)
     # Fan out the event to unfollowee
-    unfollowee = User.find_by_login(unfollowee_id)
+    unfollowee = User.find_by_user_key(unfollowee_id)
     unfollowee.log_event(event)
     # Fan out the event to all followers
     unfollower.followers.each do |user|

data/app/models/version_committer.rb

@@ -13,4 +13,5 @@
 # limitations under the License.
 
 class VersionCommitter < ActiveRecord::Base
+  attr_accessible :obj_id, :datastream_id, :version_id, :committer_login
 end

data/app/views/_footer.html.erb

@@ -0,0 +1,21 @@
+<div id="footer-wrapper" class="row-fluid">
+  <div id="footer">
+    <div class="footer-logo">
+      <p class="fright">
+      <a href="/versions/"><%= Sufia::VERSION %></a></p>
+      <a href="/"></a>
+      <p>A service of Project Hydra.</p>
+    </div>
+    <div class="footer-text">
+      <p><strong>Copyright &copy; 2012 Project Hydra</strong></p>
+      <ul>
+        <li><a href="">One</a></li>
+        <li><a href="">Two</a></li>
+        <li><a href="">Three</a></li>
+        <li><a href="">Four</a></li>
+      </ul>
+    </div>
+    <div class="clearfix"></div>
+  </div><!-- /footer -->
+</div><!-- /footer-wrapper -->
+

data/app/views/_logo.html.erb

@@ -0,0 +1,3 @@
+  <a class="brand shield" href="/"><%=t('sufia.product_name') %></a>
+  <a id="logo" href="/"></a>
+

data/app/views/_masthead.html.erb

@@ -0,0 +1,38 @@
+<%#
+Copyright © 2012 The Pennsylvania State University
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+%>
+
+<div id="masthead">
+  <%= render partial: '/logo' %>
+  <div class="navbar">
+    <div class="nav-inner">
+      <div class="container">
+        <ul class="nav pull-right">
+          <li <%= 'class=active' if params[:controller] == "catalog" and action_name == "index" %>><a href="/" class="top_nav">Home</a></li>
+          <li <%= 'class=active' if action_name == "about" %>><a href="/about/" class="top_nav">About</a></li>
+          <li <%= 'class=active' if action_name == "help" %>><a href="/help/" class="top_nav">Help</a></li>
+          <li <%= 'class=active' if params[:controller] == "contact_form" %>><a href="<%= sufia.contact_form_index_path %>" class="top_nav">Contact</a></li>
+          <li>
+            <div class="btn-group">
+              <%= render partial: '/user_util_links' %>
+            </div><!-- /.btn-group -->
+          </li>
+        </ul><!-- /.nav /.pull-right -->
+      </div><!-- /.container -->
+    </div><!-- /.nav-inner -->
+  </div><!-- /.navbar -->
+  <%= render :partial => 'catalog/search_form' %>
+</div> <!-- /masthead -->
+

data/app/views/_user_util_links.html.erb

@@ -13,46 +13,17 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 %>
-
-<div id="masthead">
-  <a id="shield" href="http://psu.edu/"><img src="/assets/site_images/logo_psuss_shield.png" width="219" height="60" alt="Penn State University" /></a>
-  <a id="logo" href="/"><img src="/assets/site_images/logo_psuss_logotype.png" width="132" height="37" alt="Penn State ScholarSphere" /></a>
-  <div class="navbar">
-    <div class="nav-inner">
-      <div class="container">
-        <ul class="nav pull-right">
-          <li <%= 'class=active' if params[:controller] == "catalog" and action_name == "index" %>><a href="/" class="top_nav">Home</a></li>
-          <li <%= 'class=active' if action_name == "about" %>><a href="/about/" class="top_nav">About</a></li>
-          <li <%= 'class=active' if action_name == "help" %>><a href="/help/" class="top_nav">Help</a></li>
-          <li <%= 'class=active' if params[:controller] == "contact_form" %>><a href="<%= sufia.contact_form_index_path %>" class="top_nav">Contact</a></li>
-          <li>
-            <div class="btn-group">
-              <% if current_user %>
-                 <%= render :partial => 'users/notify_link' %>
-                <a href="<%= sufia.profile_path(current_user.to_s) %>" class="btn btn-small " title="click for User Profile"><i class="icon-user">&nbsp;</i><%= current_user.name %></a>
-                <a class="btn btn-small dropdown-toggle" data-toggle="dropdown" href="#"><span class="icon-caret-down" title="click for additional menu options"></span></a>
-                <ul class="dropdown-menu">
-                    <li><%= link_to raw('<i class="icon-dashboard"></i> my dashboard'), sufia.dashboard_path, :id => 'dashboard_nav_link'  %></li>
-                    <li><%= link_to raw('<i class="icon-upload-alt"></i> upload'), sufia.new_generic_file_path, :id => 'upload_nav_link'  %></li>
-                    <li><%= link_to raw('<i class="icon-cog"></i> edit profile'), sufia.edit_profile_path(current_user.login), :id => 'upload_nav_link'  %></li>
-                    <li class="divider"></li>
-                    <li><%= link_to raw('<i class="icon-signout"></i> log out'), destroy_user_session_path, :id => 'logout_nav_link' %></li>
-                </ul>
-              <% else %>
-                  <%= link_to raw('<i class="icon-signin"></i> Login'), new_user_session_path, :class => "btn btn-small" %>
-              <% end %>
-            </div><!-- /.btn-group -->
-          </li>
-        </ul><!-- /.nav /.pull-right -->
-      </div><!-- /.container -->
-    </div><!-- /.nav-inner -->
-  </div><!-- /.navbar -->
-  <%# logger.info " controller = #{params[:controller]}" %>
-  <%= render :partial => 'catalog/search_form' %>
-</div> <!-- /masthead -->
-
-          <!-- <li><%# link_to 'your bookmarks', bookmarks_path %></li> -->
-          <!-- <li><%# link_to "saved searches", saved_searches_path %></li> -->
-          <!-- <li><%# link_to "Selected Items", folder_index_path %>(<span id="folder_number"><%= "#{session[:folder_document_ids] ? session[:folder_document_ids].length : 0}" %></span>)</li> -->
-          <!-- <li><%# link_to "selected items", folder_index_path %></li> -->
-          <!-- <li><%# link_to "search history", search_history_path %></li> -->
+<% if current_user %>
+   <%= render :partial => 'users/notify_link' %>
+  <a href="<%= sufia.profile_path(current_user.to_s) %>" class="btn btn-small " title="click for User Profile"><i class="icon-user">&nbsp;</i><%= current_user.name %></a>
+  <a class="btn btn-small dropdown-toggle" data-toggle="dropdown" href="#"><span class="icon-caret-down" title="click for additional menu options"></span></a>
+  <ul class="dropdown-menu">
+      <li><%= link_to raw('<i class="icon-dashboard"></i> my dashboard'), sufia.dashboard_path, :id => 'dashboard_nav_link'  %></li>
+      <li><%= link_to raw('<i class="icon-upload-alt"></i> upload'), sufia.new_generic_file_path, :id => 'upload_nav_link'  %></li>
+      <li><%= link_to raw('<i class="icon-cog"></i> edit profile'), sufia.edit_profile_path(current_user.user_key), :id => 'upload_nav_link'  %></li>
+      <li class="divider"></li>
+      <li><%= link_to raw('<i class="icon-signout"></i> log out'), destroy_user_session_path, :id => 'logout_nav_link' %></li>
+  </ul>
+<% else %>
+    <%= link_to raw('<i class="icon-signin"></i> Login'), new_user_session_path, :class => "btn btn-small" %>
+<% end %>

data/app/views/catalog/_document_list.html.erb

@@ -1,9 +1,2 @@
 <% # container for all documents in index view -%>
-  <% facet_name = grouping_facet %>
-  <%- if facet_name -%>
-    <%- @response.docs.group_by {|d| d[facet_name]}.each do |grouping| -%>
-      <%= render :partial => 'catalog/_index_partials/default_group', :locals => {:docs => grouping[1].map { |x| SolrDocument.new(x) }, :facet_name => facet_name, :facet_value => grouping[0].to_s} %>
-    <%- end -%>
-  <%- else -%>
     <%= render :partial => 'catalog/_index_partials/default_group', :locals => {:docs => @response.docs.map { |x| SolrDocument.new(x) }, :facet_name => nil, :facet_value => nil} %>
-  <%- end -%>

data/app/views/catalog/_home_text.html.erb

@@ -1,11 +1,11 @@
 <!--<h1>Getting Started</h1>
 <img src="/assets/splashscreen.png" width="450" height="259" alt="just a place holder" />
       <br/><br/> -->
-      <h2 class="heading1">What is ScholarSphere?</h2>
+      <h2 class="heading1">What is <%=t('sufia.product_name') %>?</h2>
       <p>
-      ScholarSphere is a secure repository service enabling the Penn State community to share its research and scholarly work with a worldwide audience. 
-      Faculty, staff, and students can use ScholarSphere to collect their work in one location and create a durable and citeable record of their papers, 
-      presentations, publications, data sets, or other scholarly creations. Through this service, Penn State researchers can also comply with 
+      <%=t('sufia.product_name') %> is a secure repository service enabling the <%=t('sufia.institution_name') %> community to share its research and scholarly work with a worldwide audience. 
+      Faculty, staff, and students can use <%=t('sufia.product_name') %> to collect their work in one location and create a durable and citeable record of their papers, 
+      presentations, publications, data sets, or other scholarly creations. Through this service, <%=t('sufia.institution_name') %> researchers can also comply with 
       grant-funding-agency requirements for sharing and managing research data. 
       <hr class="grey"/>
       <h2 class="heading1">Recently Uploaded <span class="heading1 label label-success">Open Access</span></h2>

data/app/views/catalog/_recent_document.html.erb

@@ -10,14 +10,14 @@
       <td>
         <h3>
           <% if title.length > 25 %>
-            <%= link_to "#{title[0..24]}...", generic_file_path(recent_document.fetch(:noid_s, :id)), :title => title  %>
+            <%= link_to "#{title[0..24]}...", sufia.generic_file_path(recent_document.fetch(:noid_s, :id)), :title => title  %>
           <% else %>
-            <%= link_to title, generic_file_path(recent_document.fetch(:noid_s, :id)), :title => title  %>
+            <%= link_to title, sufia.generic_file_path(recent_document.fetch(:noid_s, :id)), :title => title  %>
           <% end %>
 
           <% if display_access %>
               <% if !recent_document[:read_access_group_t].blank? and recent_document[:read_access_group_t].include?('registered') %>
-                 <span class="label label-info" title="Penn State">Penn State</span>
+                 <span class="label label-info" title="<%=t('sufia.institution_name') %>"><%=t('sufia.institution_name') %></span>
               <% elsif recent_document[:read_access_group_t].nil? or (recent_document[:read_access_group_t] & ['public']).empty? %>
                 <span class="label label-important">Private</span>
               <% else %>
@@ -27,9 +27,9 @@
         </h3>
         <p> 
           <% if filename.length > 25 %>
-            <%= link_to "#{filename[0..24]}...", generic_file_path(recent_document.fetch(:noid_s, :id)), :title => filename %><br />
+            <%= link_to "#{filename[0..24]}...", sufia.generic_file_path(recent_document.fetch(:noid_s, :id)), :title => filename %><br />
           <% else %>
-            <%= link_to filename, generic_file_path(recent_document.fetch(:noid_s, :id)), :title => filename %><br />
+            <%= link_to filename, sufia.generic_file_path(recent_document.fetch(:noid_s, :id)), :title => filename %><br />
           <% end %>
             <%= keywords.html_safe %>
         </p>

data/app/views/contact_form/_directions.html.erb

@@ -0,0 +1,4 @@
+  Please use the contact form to submit inquiries about <%=t('sufia.product_name') %> in general, to report a problem you are experiencing with the system, 
+  to request assistance using <%=t('sufia.product_name') %>; or to provide feedback. See the <%= link_to "Help page", "/help/" %> for 
+  additional information on user support and the <%=t('sufia.product_name') %> <%= link_to "Frequently Asked Questions (FAQ)", "/help/" %>. 
+

data/app/views/contact_form/new.html.erb

@@ -16,9 +16,7 @@ limitations under the License.
 
 <h1>Contact</h1>
 <div class="alert">
-  Please use the contact form to submit inquiries about ScholarSphere in general, to report a problem you are experiencing with the system, 
-  to request assistance using ScholarSphere; or to provide feedback. See the <%= link_to "Help page", "/help/" %> for 
-  additional information on user support and the ScholarSphere <%= link_to "Frequently Asked Questions (FAQ)", "/help/" %>. 
+  <%= render partial: 'directions' %>
 </div>
 
 <% if current_user %>
@@ -30,7 +28,7 @@ limitations under the License.
 <% end %>
 
 <h2>Contact Form</h2>
-<%= form_for(@contact_form, :url => contact_form_index_path, :html => {:class => 'form-horizontal well'}) do |f| %>
+<%= form_for(@contact_form, :url => sufia.contact_form_index_path, :html => {:class => 'form-horizontal well'}) do |f| %>
   <%= f.text_field :contact_method, :class => 'hide' %>
   <div class="control-group">
     <%= f.label :category, 'Issue Type', :class => "control-label" %>

data/app/views/dashboard/_document_list.html.erb

@@ -16,12 +16,5 @@ limitations under the License.
 
 <% # container for all documents in index view -%>
 <div id="documents" class="clear">
-  <% facet_name = grouping_facet %>
-  <%- if facet_name -%>
-    <%- @response.docs.group_by {|d| d[facet_name]}.each do |grouping| -%>
-      <%= render :partial => 'dashboard/_index_partials/default_group', :locals => {:docs => grouping[1].map { |x| SolrDocument.new(x) }, :facet_name => facet_name, :facet_value => grouping[0].to_s} %>
-    <%- end -%>
-  <%- else -%>
-    <%= render :partial => 'dashboard/_index_partials/default_group', :locals => {:docs => @response.docs.map { |x| SolrDocument.new(x) }, :facet_name => nil, :facet_value => nil} %>
-  <%- end -%>
+  <%= render :partial => 'dashboard/_index_partials/default_group', :locals => {:docs => @response.docs.map { |x| SolrDocument.new(x) }, :facet_value => nil} %>
 </div>