sufia 0.1.0 → 1.0.0

data/app/assets/javascripts/sufia/multiForm.js

@@ -0,0 +1,57 @@
+(function( $ ){
+
+  $.fn.multiForm = function( options ) {  
+
+    // Create some defaults, extending them with any options that were provided
+    var settings = $.extend( { }, options);
+
+    function addField() {
+      var cloneId = this.id.replace("submit", "clone");
+      var newId = this.id.replace("submit", "elements");
+      var cloneElem = $('#'+cloneId).clone();
+      // change the add button to a remove button
+      var plusbttn = cloneElem.find('#'+this.id);
+      plusbttn.html('-<span class="accessible-hidden">remove this '+ this.name.replace("_", " ") +'</span>');
+      plusbttn.on('click',removeField);
+
+      // remove the help tag on subsequent added fields
+      cloneElem.find('.formHelp').remove();
+      cloneElem.find('i').remove();
+      cloneElem.find('.modal-div').remove();
+
+      //clear out the value for the element being appended
+      //so the new element has a blank value
+      cloneElem.find('input[type=text]').attr("value", "");
+      cloneElem.find('input[type=text]').attr("required", false);
+
+      if (settings.afterAdd) {
+        settings.afterAdd(this, cloneElem)
+      }
+
+      $('#'+newId).append(cloneElem);
+      cloneElem.find('input[type=text]').focus();
+      return false;
+    }
+
+    function removeField () {
+      // get parent and remove it
+      $(this).parent().remove();
+      return false;
+    }
+
+    return this.each(function() {        
+
+      // Tooltip plugin code here
+      /*
+       * adds additional metadata elements
+       */
+      $('.adder', this).click(addField);
+
+      $('.remover', this).click(removeField);
+
+
+    });
+
+  };
+})( jQuery );  
+

data/app/assets/javascripts/terms_of_service.js

@@ -1,4 +1,11 @@
+jQuery.fn.exists = function(){return this.length>0;}
+
 $(function () {
+    if (!$('#terms_of_service').exists()) {
+      // deactivate if there is no checkbox, which allows installations to skip the agreement.
+      return;
+    }
+    
     $('#main_upload_start').attr('disabled', true);
     $("#upload_tooltip").hide();
     $("#main_upload_start_span").mousemove(function(e){

data/app/assets/stylesheets/audio-js.css

@@ -0,0 +1,3 @@
+.audiojs {
+  width: 338px;
+}

data/app/assets/stylesheets/dashboard.css.scss

@@ -0,0 +1,51 @@
+.dashboard {
+  .audiojs {
+    width: 38px;
+    float: left;  
+  }
+
+  audio {
+    width: 38px;
+    float: left;
+  }
+
+  .batch-select-all, .button_to {
+   
+    float: right;
+    padding-left: 6px;
+    padding-top: 0px;
+    padding-top: 0px;
+  }
+
+  .bedit {
+    width: 65%;
+   }
+   
+  .batch-select-all .btn-primary {
+    background-color:#da4f49;background-image:-moz-linear-gradient(top, #ee5f5b, #bd362f);background-image:-ms-linear-gradient(top, #ee5f5b, #bd362f);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));background-image:-webkit-linear-gradient(top, #ee5f5b, #bd362f);background-image:-o-linear-gradient(top, #ee5f5b, #bd362f);background-image:linear-gradient(top, #ee5f5b, #bd362f);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0);border-color:#bd362f #bd362f #802420;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#bd362f;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{background-color:#bd362f;*background-color:#a9302a;
+  }
+
+  .button_to .btn-primary {
+  background-color:#faa732;background-image:-moz-linear-gradient(top, #fbb450, #f89406);background-image:-ms-linear-gradient(top, #fbb450, #f89406);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));background-image:-webkit-linear-gradient(top, #fbb450, #f89406);background-image:-o-linear-gradient(top, #fbb450, #f89406);background-image:linear-gradient(top, #fbb450, #f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);border-color:#f89406 #f89406 #ad6704;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#f89406;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{background-color:#f89406;*background-color:#df8505;
+  }
+
+  .table th, .table td {
+    padding: 4px;
+  }
+  .table .sm {
+    padding: 2px;
+  }
+
+  .over {
+  z-index:100;
+  }
+  .under
+  {
+  position:absolute;
+  padding:0px 0px 0px 0px;
+  left:10px;
+  top:-8px;
+  color:orange;
+  z-index:1; 
+  }
+}

data/app/assets/stylesheets/generic_files.css

@@ -8,3 +8,39 @@
 button.close {
     display: block;
 }
+
+.related-files {
+height: 100px;
+overflow-x: auto;
+}
+
+label.error { float: left; color: red; padding-left: .5em; vertical-align: top; }
+
+
+/* These were from batch_edit/edit.html.erb */
+#upload_tooltip { background: #ff0; padding: 5px; border: 1px solid #ddd; position: absolute; }
+
+.fileHeight {
+  max-height: 50px
+}
+
+.scrollx {
+  overflow-x: auto;
+}
+
+.scrolly {
+  overflow-y: auto;
+}
+
+h2 small {
+   color: red;   
+}
+
+.status {
+   color: green; 
+   padding:5px 5px 5px;  
+}
+
+.loading { 
+ background: white url('/assets/loading.gif') center bottom no-repeat; 
+}

data/app/assets/stylesheets/sufia.css.scss

@@ -7,6 +7,8 @@
  *= require batch_edit
  *= require generic_files
  *= require video-js
+ *= require audio-js
+ *= require dashboard
  *= require jquery-ui
 */
 

data/app/controllers/batch_controller.rb

@@ -25,6 +25,7 @@ class BatchController < ApplicationController
     @generic_file = GenericFile.new
     @generic_file.creator = current_user.name
     @generic_file.title =  @batch.generic_files.map(&:label)
+    initialize_fields(@generic_file)
   end
 
   def update
@@ -36,4 +37,14 @@ class BatchController < ApplicationController
     flash[:notice] = 'Your files are being processed by ' + t('sufia.product_name') + ' 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 sufia.dashboard_index_path
   end
+
+  protected
+
+  # override this method if you need to initialize more complex RDF assertions (b-nodes)
+  def initialize_fields(file)
+    file.terms_for_editing.each do |key|
+      # if value is empty, we create an one element array to loop over for output 
+      file[key] = [''] if file[key].empty?
+    end
+  end
 end

data/app/controllers/batch_edits_controller.rb

@@ -1,81 +1,5 @@
 class BatchEditsController < ApplicationController  
    include Hydra::BatchEditBehavior
    include GenericFileHelper
-   
-   def edit
-       super 
-       @generic_file = GenericFile.new
-       @generic_file.depositor = current_user.user_key
-       @terms = @generic_file.terms_for_editing - [:title] # +:format, :resource_type 
-
-       # do we want to show the original values for anything...
-       @show_file = GenericFile.new
-       @show_file.depositor = current_user.user_key
-       h  = {}
-       @names = []
-       permissions = []
-
-       # For each of the files in the batch, set the attributes to be the concatination of all the attributes
-       batch.each do |doc_id|
-          gf = GenericFile.find(doc_id)
-          gf.terms_for_editing.each do |key|
-            h[key] ||= []
-            h[key] = (h[key] + gf.send(key)).uniq 
-          end
-          @names << display_title(gf)    
-          permissions =  (permissions+gf.permissions).uniq
-       end
-       
-       # why am I doing this you may ask... Well... if truth be told I have no idea, but if I use just a single item in the batch
-       # my h arrays get converted into strings in update attributes unless I do this first....
-       #h.keys.each {|key| h[key] = h[key].to_a} if (batch.size == 1)        
-       # end of wierd fix...
-       
-       @show_file.attributes = h
-       # map the permissions to parameter like input so that the assign will work
-       # todo sort the access level some how...
-       perm_param ={'user'=>{},'group'=>{"public"=>"1"}}
-       permissions.each{ |perm| perm_param[perm[:type]][perm[:name]] = perm[:access]}
-       @show_file.permissions = HashWithIndifferentAccess.new(perm_param)       
-   end
-
-   def after_update 
-     redirect_to sufia.dashboard_index_path unless request.xhr?
-   end
-   
-  def update_document(obj)
-      super
-      obj.date_modified = Time.now.ctime
-      obj.set_visibility(params[:visibility])
-  end
-    
-   def update
-      # keep the batch around if we are doing ajax calls
-      batch_sav = batch.dup if request.xhr?        
-      catalog_index_path = sufia.dashboard_index_path
-      type = params["update_type"]
-      if (type == "update")
-        #params["generic_file"].reject! {|k,v| (v.blank? || (v.respond_to?(:length) && v.length==1 && v.first.blank?))}
-        super        
-      elsif (type == "delete_all")
-        batch.each do |doc_id|
-          gf = GenericFile.find(doc_id)
-          gf.delete
-        end
-        clear_batch! 
-        after_update
-      end
-
-      # reset the batch around if we are doing ajax calls
-      if request.xhr?
-        self.batch = batch_sav.dup 
-        @key = params["key"]
-        if (@key != "permissions")
-            @vals = params["generic_file"][@key]
-        else
-            @vals = [""]
-        end            
-        render :update_edit
-      end        
-   end
+   include Sufia::BatchEditsControllerBehavior
 end   

data/app/controllers/generic_files_controller.rb

@@ -14,5 +14,6 @@
 # limitations under the License.
 
 class GenericFilesController < ApplicationController
+  include Sufia::Controller
   include Sufia::FilesControllerBehavior
 end

data/app/controllers/mailbox_controller.rb

@@ -16,7 +16,7 @@ class MailboxController < ApplicationController
   before_filter :authenticate_user!
 
   def index
-    if current_user
+    if user_signed_in?
       inbox = current_user.mailbox.inbox
       @messages = inbox.all
       current_user.mark_as_read @messages

data/app/controllers/single_use_link_controller.rb

@@ -1,7 +1,10 @@
+require 'sufia/single_use_error'
+
 class SingleUseLinkController < DownloadsController
   before_filter :authenticate_user!, :except => [:show, :download]
   skip_filter :normalize_identifier
   prepend_before_filter :normalize_identifier, :except => [:download, :show]
+  rescue_from Sufia::SingleUseError, :with => :render_single_use_error
   
   def generate_download
     @generic_file = GenericFile.find(params[:id])
@@ -76,11 +79,12 @@ class SingleUseLinkController < DownloadsController
     
     return link
   end
-  
-  def not_found 
-    raise ActionController::RoutingError.new('Not Found') 
-  end 
-  def expired 
-    raise ActionController::RoutingError.new('expired') 
-  end 
+ 
+  def not_found
+    raise Sufia::SingleUseError.new('Single Use Link Not Found')
+  end
+  def expired
+    raise Sufia::SingleUseError.new('Single Use Link Expired')
+  end
+ 
 end

data/app/helpers/generic_file_helper.rb

@@ -50,7 +50,17 @@ module GenericFileHelper
   end
 
   def render_edit_field_partial(key, locals)
-    ["generic_files/edit_fields/#{key}", "generic_files/edit_fields/default"].each do |str|
+    render_edit_field_partial_with_action('generic_files', key, locals)
+  end
+
+  def render_batch_edit_field_partial(key, locals)
+    render_edit_field_partial_with_action('batch_edit', key, locals)
+  end
+
+ private 
+
+  def render_edit_field_partial_with_action(action, key, locals)
+    ["#{action}/edit_fields/#{key}", "#{action}/edit_fields/default"].each do |str|
       # XXX rather than handling this logic through exceptions, maybe there's a Rails internals method
       # for determining if a partial template exists..
       begin
@@ -61,8 +71,6 @@ module GenericFileHelper
     end
   end
 
- private 
-
  def more_or_less_button(key, html_class, symbol)
    # TODO, there could be more than one element with this id on the page, but the fuctionality doesn't work without it.
    content_tag('button', class: "#{html_class} btn", id: "additional_#{key}_submit", name: "additional_#{key}") do

data/app/helpers/sufia_helper.rb

@@ -35,12 +35,8 @@ module SufiaHelper
   end
 
   def display_user_name(recent_document)
-    return "no display name" unless recent_document[:depositor_t]
-    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)
-    doc[:depositor_t] ? doc[:depositor_t][0] : "no depositor value"
+    return "no display name" unless recent_document.depositor
+    return User.find_by_user_key(recent_document.depositor).name rescue recent_document.depositor
   end
 
   def link_to_facet(field, field_string)
@@ -48,7 +44,8 @@ module SufiaHelper
   end
 
   def link_to_facet_list(list, field_string, emptyText="No value entered", separator=", ")
-    return list.map{ |item| link_to_facet(item, field_string) }.join(separator) unless list.blank?
+    facet_field = Solrizer.solr_name(field_string, :facetable)
+    return list.map{ |item| link_to_facet(item, facet_field) }.join(separator) unless list.blank?
     return emptyText
   end
 
@@ -70,9 +67,15 @@ module SufiaHelper
 
   def link_to_profile(login)
     user = User.find_by_user_key(login)
-    link_to user.name, Sufia::Engine.routes.url_helpers.profile_path(login)
-  rescue
-    link_to login, Sufia::Engine.routes.url_helpers.profile_path(login)
+    return login if user.nil?
+
+    text = if user.respond_to? :name
+      user.name
+    else
+      login
+    end
+
+    link_to text, Sufia::Engine.routes.url_helpers.profile_path(user)
   end
 
   def linkify_chat_id(chat_id)

data/app/models/batch.rb

@@ -40,7 +40,7 @@ class Batch < ActiveFedora::Base
 
   def to_solr(solr_doc={}, opts={})
     super(solr_doc, opts)
-    solr_doc["noid_s"] = noid
+    solr_doc[Solrizer.solr_name('noid', Sufia::GenericFile.noid_indexer)] = noid
     return solr_doc
   end
 end

data/app/models/datastreams/fits_datastream.rb

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class FitsDatastream < ActiveFedora::NokogiriDatastream
+class FitsDatastream < ActiveFedora::OmDatastream
   include OM::XML::Document
 
   set_terminology do |t|
@@ -22,7 +22,7 @@ class FitsDatastream < ActiveFedora::NokogiriDatastream
     t.identification {
       t.identity {
         t.format_label(:path=>{:attribute=>"format"})
-        t.mime_type(:path=>{:attribute=>"mimetype"}, index_as: [:searchable])
+        t.mime_type(:path=>{:attribute=>"mimetype"}, index_as: [:stored_searchable])
       }
     }
     t.fileinfo {

data/app/models/datastreams/generic_file_rdf_datastream.rb

@@ -16,56 +16,60 @@ class GenericFileRdfDatastream < ActiveFedora::NtriplesRDFDatastream
   map_predicates do |map|
     map.part_of(:to => "isPartOf", :in => RDF::DC)
     map.contributor(:in => RDF::DC) do |index|
-      index.as :searchable, :displayable
+      index.as :stored_searchable, :facetable
     end
     map.creator(:in => RDF::DC) do |index|
-      index.as :searchable, :facetable, :displayable
+      index.as :stored_searchable, :facetable
     end
     map.title(:in => RDF::DC) do |index|
-      index.as :searchable, :displayable
+      index.as :stored_searchable
     end
     map.description(:in => RDF::DC) do |index|
       index.type :text
-      index.as :searchable, :displayable
+      index.as :stored_searchable
     end
     map.publisher(:in => RDF::DC) do |index|
-      index.as :searchable, :facetable, :displayable
+      index.as :stored_searchable, :facetable
     end
     map.date_created(:to => "created", :in => RDF::DC) do |index|
-      index.as :searchable, :displayable
+      index.as :stored_searchable
     end
     map.date_uploaded(:to => "dateSubmitted", :in => RDF::DC) do |index|
       index.type :date
-      index.as :searchable, :displayable, :sortable
+      index.as :stored_sortable
     end
     map.date_modified(:to => "modified", :in => RDF::DC) do |index|
       index.type :date
-      index.as :searchable, :displayable, :sortable
+      index.as :stored_sortable
     end
     map.subject(:in => RDF::DC) do |index|
-      index.as :searchable, :facetable, :displayable
+      index.as :stored_searchable, :facetable
     end
     map.language(:in => RDF::DC) do |index|
-      index.as :searchable, :facetable, :displayable
+      index.as :stored_searchable, :facetable
     end
     map.rights(:in => RDF::DC) do |index|
-      index.as :searchable, :displayable
+      index.as :stored_searchable
     end
     map.resource_type(:to => "type", :in => RDF::DC) do |index|
-      index.as :searchable, :facetable, :displayable
+      index.as :stored_searchable, :facetable
     end
     map.identifier(:in => RDF::DC) do |index|
-      index.as :searchable, :displayable
+      index.as :stored_searchable
     end
     map.based_near(:in => RDF::FOAF) do |index|
-      index.as :searchable, :facetable, :displayable
+      index.as :stored_searchable, :facetable
     end
     map.tag(:to => "relation", :in => RDF::DC) do |index|
-      index.as :searchable, :facetable, :displayable
+      index.as :stored_searchable, :facetable
     end
     map.related_url(:to => "seeAlso", :in => RDF::RDFS)
   end
-  LocalAuthority.register_vocabulary(self, "subject", "lc_subjects")
-  LocalAuthority.register_vocabulary(self, "language", "lexvo_languages")
-  LocalAuthority.register_vocabulary(self, "tag", "lc_genres")
+  begin
+    LocalAuthority.register_vocabulary(self, "subject", "lc_subjects")
+    LocalAuthority.register_vocabulary(self, "language", "lexvo_languages")
+    LocalAuthority.register_vocabulary(self, "tag", "lc_genres")
+  rescue
+    puts "tables for vocabularies missing"
+  end
 end