sufia 0.0.3 → 0.0.4

data/app/views/generic_files/_permission.html.erb

@@ -59,10 +59,7 @@ limitations under the License.
     <button class="btn btn-mini btn-inverse" onclick="return false;"><i class="icon-plus-sign" ></i>Add</button>.
     </p>
 
-    <p>
-    The list of groups in the drop-down marked &quot;Select a group&quot; is a list of User Managed Groups that you are a member of, and are managed by <%=t('sufia.institution_name') %>'s ITS department.  You may select a specific group and assign an access
-    level for a file within <%=t('sufia.product_name') %>, similarly to adding user access levels.  However, management of these groups and their membership is handled centrally at <a href="http://umg.its.psu.edu" target="_blank">umg.its.psu.edu</a>.  
-    </p>
+    <%= render partial: 'groups_description' %>
 
     <h3>Permission Definitions</h3>
     <p>
@@ -97,7 +94,7 @@ limitations under the License.
     <div id="new-user"> 
       <div class="input-append">
         <p class="help-block">Enter <%=t('sufia.account_label') %> (one at a time)</p>
-        <%= text_field_tag 'new_user_name_skel', nil, :class => "span29" %><span class="add-on">@psu.edu</span>
+        <%= text_field_tag 'new_user_name_skel', nil, :class => "span29" %><span class="add-on"><%=t('sufia.directory.suffix') %></span>
         <%= select_tag 'new_user_permission_skel', options_for_select(Sufia::Engine.config.permission_levels), :class=> 'span17' %>
         <button class="btn btn-mini btn-inverse" id="add_new_user_skel"><i class="icon-plus-sign"></i> Add</button>
         <br /> <span id="directory_user_result"></span> 

data/app/views/generic_files/_versioning.html.erb

@@ -18,7 +18,6 @@ limitations under the License.
   <h2 class="non lower">Versions</h2>
   <div class="well">
     <%= form_for @generic_file, :url => sufia.generic_file_path, :html => {:multipart => true, :class => 'form-horizontal'} do |f| %>
-      <%= hidden_field_tag('generic_file[terms_of_service]', '1') %>
       <%= hidden_field_tag('redirect_tab', 'versions') %>
     <h3>Upload New Version</h3>
     <p>Upload a new version of this file from your computer.</p>

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

@@ -58,9 +58,6 @@ $("a[rel=popover]").popover();
 label.error { float: left; color: red; padding-left: .5em; vertical-align: top; }
 <% end %>
   
-
-
-<% end %>
 <%= render :partial => 'breadcrumbs' %>
 
 <h1 class="lower">Edit <%= display_title(@generic_file) %></h1>

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

@@ -15,141 +15,5 @@ limitations under the License.
 %>
 
 <h2>Upload</h2>
-
-<div class="alert">
-  <strong>Note:</strong> You must agree to <a href='/agreement/' target="_blank"><%= t('sufia.deposit_agreement') %></a> before starting your upload.
-</div>
-
-<div class="alert alert-info hide" id="redirect-loc" type="text/x-jquery-tmpl">
-  <%=sufia.batch_edit_path(@batch_noid)%>
-</div>
-
-<div id="upload_tooltip"><%= t('sufia.upload_tooltip') %></div>
-
-<div class="alert alert-info hide" id="success">
-  You have successfully uploaded some of your files.  Either continue to upload or edit use the links below to abandon the rest of your added files.
-  <p>
-  <%= link_to 'Add Descriptions', sufia.batch_edit_path(@batch_noid), :class=>'btn' %>
-  </p>
-</div>
-
-<div class="alert hide" id="fail">
-  There was a problem during upload. Please click the &quot;Start Upload&quot; button or <%= link_to 'start over', sufia.new_generic_file_path %>
-</div>
-
-<div class="alert hide" id="partial_fail">
-  One or more files did not upload successfully. To continue using the files uploaded use one of the links below.<br />
-  <%= link_to 'Add Descriptions', sufia.batch_edit_path(@batch_noid), :class=>'btn' %>
-</div>
-
-<div class="alert hide" id="errmsg"> </div>
-
-    <!-- The file upload form used as target for the file upload widget -->
-    <%= form_for(@generic_file, :url => sufia.generic_files_path, :html => {:multipart => true, :class => 'form-horizontal well', :id => 'fileupload'}) do |f| %>
-      <%= hidden_field_tag(:total_upload_size, 0) %>
-      <%= hidden_field_tag(:relative_path) %>
-      <%= hidden_field_tag(:batch_id, @batch_noid) %>
-      <label class="checkbox">
-      <%= check_box_tag 'terms_of_service' %> I have read and do agree
-      to <%= link_to t('sufia.deposit_agreement'),
-        '/agreement/', :target => "_blank" %>.
-    </label>
-        <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
-        <div class="row fileupload-buttonbar">
-            <div class="span70">
-                <!-- The fileinput-button span is used to style the file input field as button -->
-                <span class="btn btn-success fileinput-button">
-                    <i class="icon-plus icon-white"></i>
-                    <span>Select files...</span>
-                    <input type="file" name="files[]" multiple />
-                </span>
-                <% ua = request.env['HTTP_USER_AGENT'] %>
-                <% if !!(ua =~ /Chrome/) %>
-                <span class="btn btn-success fileinput-button">
-                    <i class="icon-plus icon-white"></i>
-                    <span>Select folder...</span>
-                    <input type="file" name="files[]" directory webkitdirectory mozdirectory />
-                </span>
-                <% end %>
-                <span id="main_upload_start_span">
-                <button type="submit" class="btn btn-primary start" id='main_upload_start'>
-                    <i class="icon-upload icon-white"></i>
-                    <span>Start upload</span>
-                </button>
-                </span>
-                <button type="reset" class="btn btn-warning cancel">
-                    <i class="icon-ban-circle icon-white"></i>
-                    <span>Cancel upload</span>
-                </button>
-            </div>
-            <div class="span50">
-                <!-- The global progress bar -->
-                <div class="progress progress-success progress-striped active fade">
-                    <div class="bar" style="width:0%;"></div>
-                </div>
-            </div>
-        </div>
-        <!-- The loading indicator is shown during image processing -->
-        <div class="fileupload-loading"></div>
-        <br />
-        <!-- The table listing the files available for upload/download -->
-        <table id="file-table" class="table table-striped"><tbody class="files" data-toggle="modal-gallery" data-target="#modal-gallery"></tbody></table>
-    </form>
-  <% end %>
-
-<!-- The template to display files available for upload -->
-<script id="template-upload" type="text/x-jquery-tmpl">
- {% for (var i=0, file; file=o.files[i]; i++) { %}
-
-    <tr class="template-upload fade">
-        <td class="preview"><span class="fade"></span></td>
-        <td class="name"><span>{%=file.name%}</span></td>
-        <td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
-        {% if (file.error) { %}
-            <td class="error" colspan="2"><span class="label label-important">{%=locale.fileupload.error%}</span> {%=locale.fileupload.errors[file.error] || file.error%}</td>
-        {% } else if (o.files.valid && !i) { %}
-            <td>
-                <div class="progress progress-success progress-striped active"><div class="bar" style="width:0%;"></div></div>
-            </td>
-            <td class="start">{% if (!o.options.autoUpload) { %}
-              <button class="btn btn-primary hide">
-                    <i class="icon-upload icon-white"></i>
-                    <span>{%=locale.fileupload.start%}</span>
-              </button>
-            {% } %}</td>
-        {% } else { %}
-            <td colspan="2"></td>
-        {% } %}
-        <td class="cancel">{% if (!i) { %}
-            <button class="btn btn-warning">
-                <i class="icon-ban-circle icon-white"></i>
-                <span>{%=locale.fileupload.cancel%}</span>
-            </button>
-        {% } %}</td>
-    </tr>
-{% } %}
-</script>
-<!-- The template to display files available for download -->
-<script id="template-download" type="text/x-jquery-tmpl">
-{% for (var i=0, file; file=o.files[i]; i++) { %}
-    <tr class="template-download fade">
-        {% if (file.error) { %}
-            <td><span></span></td>
-            <td class="name"><span>{%=file.name%}</span></td>
-            <td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
-            <td class="error" colspan="2"><span class="label label-important">{%=locale.fileupload.error%}</span> {%=locale.fileupload.errors[file.error] || file.error%}</td>
-        {% } else { %}
-            <td class="preview">
-              {% if (file.thumbnail_url) { %} <span class="label label-success">Success</span> {% } %}
-            </td>
-            <td class="name">
-                {%=file.name%}
-                <!--a href="{%=file.url%}" title="{%=file.name%}" rel="{%=file.thumbnail_url&&'gallery'%}" download="{%=file.name%}" target="_blank">{%=file.name%}</a-->
-            </td>
-            <td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
-            <td colspan="2"></td>
-        {% } %}
-    </tr>
-{% } %}
-</script>
-
+<%# using partials rather than inlining, so implementers can add or change stuff on this page without much duplication %>
+<%= render partial: 'multiple_upload' %>

data/app/views/layouts/hydra-head.html.erb

@@ -96,5 +96,6 @@ limitations under the License.
   </div><!-- /.container -->
 </div><!-- /#wrapper -->
 <%= render partial: '/footer' %>
+<div id="ajax-modal" class="modal hide fade" tabindex="-1"></div>
 </body>
 </html>

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

@@ -32,9 +32,9 @@ limitations under the License.
         <tbody> 
             <% @users.each do |user| %> 
                 <tr class="<%= cycle("","zebra") %>"> 
-                   <td><a href="<%= sufia.profile_path(URI.escape(user.login,'@.'i)) %>" class="btn btn-small " ><%= image_tag user.avatar.url(:thumb), :width => 30 %></a></td> 
-                   <td ><a href="<%= sufia.profile_path(URI.escape(user.login,'@.'i)) %>"  ><%= user.name %><a></td> 
-                   <td><a href="<%= sufia.profile_path(URI.escape(user.login,'@.'i)) %>"  ><%= user.login %><a></td>
+                   <td><a href="<%= sufia.profile_path(URI.escape(user.user_key,'@.')) %>" class="btn btn-small " ><%= image_tag user.avatar.url(:thumb), :width => 30 %></a></td> 
+                   <td ><a href="<%= sufia.profile_path(URI.escape(user.user_key,'@.')) %>"  ><%= user.name %><a></td> 
+                   <td><a href="<%= sufia.profile_path(URI.escape(user.user_key,'@.')) %>"  ><%= user.user_key %><a></td>
                    <td><%= user.department %> </td> 
                    <td><%= GenericFile.find(:depositor_t => user.to_s).count %> </td> 
                 </tr> 
@@ -42,5 +42,7 @@ limitations under the License.
             <% end %> 
         </tbody> 
     </table> 
-    <%= will_paginate @users, :class => 'pager', :previous_label => '&laquo; Previous', :next_label => 'Next &raquo;'%> 
+    <div class="pager">
+      <%= paginate @users,  :theme => 'blacklight'%>
+    </div>
 </div> 

data/config/locales/sufia.en.yml

@@ -5,6 +5,8 @@ en:
     institution_name:   "Penn State"
     deposit_agreement:  "ScholarSphere's Deposit Agreement"
     upload_tooltip:     "Please accept Deposit Agreement before you can upload."
+    directory:
+      suffix:           "@psu.edu"
     search:
       form:
         q:

data/lib/sufia.rb

@@ -8,7 +8,6 @@ require 'resque/server'
 require 'mailboxer'
 require 'acts_as_follower'
 require 'paperclip'
-require 'will_paginate'
 require 'nest'
 require 'RMagick'
 require 'activerecord-import'
@@ -78,5 +77,6 @@ module Sufia
   autoload :SolrDocumentBehavior
   autoload :FilesControllerBehavior
   autoload :DownloadsControllerBehavior
+  autoload :FileContent
 end
 

data/lib/sufia/file_content.rb

@@ -0,0 +1,8 @@
+module Sufia
+  module FileContent
+    extend ActiveSupport::Autoload
+
+    autoload :ExtractMetadata
+    autoload :Versions
+  end
+end

data/lib/sufia/file_content/extract_metadata.rb

@@ -0,0 +1,53 @@
+require 'open3'
+module Sufia
+  module FileContent
+    module ExtractMetadata
+      include Open3
+
+      def extract_metadata
+        out = nil
+        to_tempfile do |f|
+          out = run_fits!(f.path)
+        end
+        out
+      end
+
+      def to_tempfile &block
+        return if content.nil?
+        f = Tempfile.new("#{pid}-#{dsVersionID}")
+        f.binmode
+        if content.respond_to? :read
+          f.write(content.read)
+        else
+          f.write(content)
+        end
+        f.close
+        content.rewind if content.respond_to? :rewind
+        yield(f)
+        f.unlink
+
+      end
+
+      private 
+
+
+        def run_fits!(file_path)
+            command = "#{fits_path} -i #{file_path}"
+            stdin, stdout, stderr = popen3(command)
+            stdin.close
+            out = stdout.read
+            stdout.close
+            err = stderr.read
+            stderr.close
+            raise "Unable to execute command \"#{command}\"\n#{err}" unless err.empty? or err.include? "Error parsing Exiftool XML Output"
+            out
+        end
+
+
+        def fits_path
+          Sufia::Engine.config.fits_path
+        end
+
+      end
+    end
+end

data/lib/sufia/file_content/versions.rb

@@ -0,0 +1,23 @@
+module Sufia
+  module FileContent
+    module Versions
+      def get_version(version_id)
+        self.versions.select { |v| v.versionID == version_id}.first
+      end
+
+      def latest_version
+        self.versions.first
+      end
+
+      def version_committer(version)
+        vc = VersionCommitter.where(:obj_id => version.pid,
+                                    :datastream_id => version.dsid,
+                                    :version_id => version.versionID)
+        return vc.empty? ? nil : vc.first.committer_login
+      end
+
+
+    end
+  end
+end
+

data/lib/sufia/files_controller_behavior.rb

@@ -78,23 +78,22 @@ module Sufia
       begin
         retval = " "
         # check error condition No files
-        if !params.has_key?(:files)
-           retval = render :json => [{:error => "Error! No file to save"}].to_json
+        return render(:json => [{:error => "Error! No file to save"}].to_json) if !params.has_key?(:files)
 
+        file = params[:files][0]
         # check error condition empty file
-        elsif ((params[:files][0].respond_to?(:tempfile)) && (params[:files][0].tempfile.size == 0))
-           retval = render :json => [{ :name => params[:files][0].original_filename, :error => "Error! Zero Length File!"}].to_json
-
-        elsif ((params[:files][0].respond_to?(:size)) && (params[:files][0].size == 0))
-           retval = render :json => [{ :name => params[:files][0].original_filename, :error => "Error! Zero Length File!"}].to_json
-
+        if ((file.respond_to?(:tempfile)) && (file.tempfile.size == 0))
+           retval = render :json => [{ :name => file.original_filename, :error => "Error! Zero Length File!"}].to_json
+        elsif ((file.respond_to?(:size)) && (file.size == 0))
+           retval = render :json => [{ :name => file.original_filename, :error => "Error! Zero Length File!"}].to_json
         elsif (params[:terms_of_service] != '1')
-           retval = render :json => [{ :name => params[:files][0].original_filename, :error => "You must accept the terms of service!"}].to_json
+           retval = render :json => [{ :name => file.original_filename, :error => "You must accept the terms of service!"}].to_json
 
         # process file
         else
-          create_and_save_generic_file
+          create_and_save_generic_file(file, params[:relative_path], params[:batch_id], file.original_filename)
           if @generic_file
+            Sufia.queue.push(UnzipJob.new(@generic_file.pid)) if file.content_type == 'application/zip'
             Sufia.queue.push(ContentDepositEventJob.new(@generic_file.pid, current_user.user_key))
             respond_to do |format|
               format.html {
@@ -115,7 +114,7 @@ module Sufia
         retval = render :json => [{:error => "Error occurred while creating generic file."}].to_json
       ensure
         # remove the tempfile (only if it is a temp file)
-        params[:files][0].tempfile.delete if params[:files][0].respond_to?(:tempfile)
+        file.tempfile.delete if file.respond_to?(:tempfile)
       end
 
       return retval
@@ -154,7 +153,7 @@ module Sufia
 
       if params.has_key?(:filedata)
         return unless virus_check(params[:filedata]) == 0
-        add_posted_blob_to_asset(@generic_file, params[:filedata])
+        add_posted_blob_to_asset(@generic_file, params[:filedata], params[:filedata].original_filename)
         version_event = true
         Sufia.queue.push(ContentNewVersionEventJob.new(@generic_file.pid, current_user.user_key))
       end
@@ -192,35 +191,21 @@ module Sufia
       end
     end 
 
-    def create_and_save_generic_file
-      unless params.has_key?(:files)
-        logger.warn "!!!! No Files !!!!"
-        return
-      end
-      file = params[:files][0]
+    def create_and_save_generic_file(file, relative_path, batch_id, file_name)
       return nil unless virus_check(file) == 0  
 
       @generic_file = ::GenericFile.new
-      @generic_file.terms_of_service = params[:terms_of_service]
-      # if we want to be able to save zero length files then we can use this to make the file 1 byte instead of zero length and fedora will take it
-      #if (file.tempfile.size == 0)
-      #   logger.warn "Encountered an empty file...  Creating a new temp file with on space."
-      #   f = Tempfile.new ("emptyfile")
-      #   f.write " "
-      #   f.rewind
-      #   file.tempfile = f
-      #end
-      add_posted_blob_to_asset(@generic_file,file)
+      #This depends on the 3 arg constructor in hh 5.2.0
+      add_posted_blob_to_asset(@generic_file,file, file_name)
 
       @generic_file.apply_depositor_metadata(user_key)
       @generic_file.date_uploaded = Time.now.ctime
       @generic_file.date_modified = Time.now.ctime
-      @generic_file.relative_path = params[:relative_path] if params.has_key?(:relative_path)
+      @generic_file.relative_path = relative_path if relative_path
       @generic_file.creator = current_user.name
 
-      if params.has_key?(:batch_id)
-        batch_id = Sufia::Noid.namespaceize(params[:batch_id])
-        @generic_file.add_relationship("isPartOf", "info:fedora/#{batch_id}")
+      if batch_id
+        @generic_file.add_relationship("isPartOf", "info:fedora/#{Sufia::Noid.namespaceize(batch_id)}")
       else
         logger.warn "unable to find batch to attach to"
       end
@@ -238,7 +223,6 @@ module Sufia
       end
 
       record_version_committer(@generic_file, current_user)
-      Sufia.queue.push(UnzipJob.new(@generic_file.pid)) if file.content_type == 'application/zip'
       return @generic_file
     end
   end

data/lib/sufia/generic_file.rb

@@ -35,10 +35,6 @@ module Sufia
                                   :publisher, :date_created, :subject,
                                   :resource_type, :identifier, :language]
       around_save :characterize_if_changed, :retry_warming
-
-      #make sure the terms of service is present and set to 1 before saving
-      validates_acceptance_of :terms_of_service, :allow_nil => false
-      after_find :preset_terms
     end
 
     def pdf?
@@ -174,10 +170,6 @@ module Sufia
        return (!self.batch.status.empty?) && (self.batch.status.count == 1) && (self.batch.status[0] == "processing")
     end
 
-    def preset_terms
-      self.terms_of_service = '1'
-    end
-
     module ClassMethods
       # TODO this could probably be better handled by i18n
       @@FIELD_LABEL_MAP = {"based_near"=>"Location", 'description'=>"Abstract or Summary", 'tag'=>"Keyword", 'date_created'=>"Date Created", 'related_url'=>"Related URL"}