sufia 0.1.0 → 1.0.0

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

@@ -0,0 +1,10 @@
+module Sufia
+  class ResqueAdmin
+    def self.matches?(request)
+      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'
+    end
+  end
+end

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

@@ -61,6 +61,14 @@ Sufia.config do |config|
     # Map hostnames onto Google Analytics tracking IDs
     #config.google_analytics_id = 'UA-99999999-1'
 
+    
+    # Where to store tempfiles, leave blank for the system temp directory (e.g. /tmp)
+    #config.temp_file_base = '/home/developer1'
+
+    # If you have ffmpeg installed and want to transcode audio and video uncomment this line
+    #config.enable_ffmpeg = true
+
 end
 
+Date::DATE_FORMATS[:standard] = "%m/%d/%Y"
 

data/lib/sufia.rb

@@ -24,10 +24,12 @@ module Sufia
   class Engine < ::Rails::Engine
     engine_name 'sufia'
 
+    # Set some configuration defaults
     config.queue = Sufia::Resque::Queue
+    config.enable_ffmpeg = false
     config.ffmpeg_path = 'ffmpeg'
     config.fits_message_length = 5
-    
+    config.temp_file_base = nil
 
     config.autoload_paths << File.expand_path("../sufia/jobs", __FILE__)
     
@@ -35,25 +37,12 @@ module Sufia
       require 'sufia/active_fedora/redis'
     end
 
-    initializer "Patch kaminari" do
-      require "kaminari/helpers/tag"
-    end
-
     initializer "Patch active_record" do
       require 'sufia/active_record/redis'
     end
 
   end
 
-  class ResqueAdmin
-    def self.matches?(request)
-      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'
-    end
-  end
-
   def self.config(&block)
     @@config ||= Sufia::Engine::Configuration.new
 
@@ -76,6 +65,7 @@ module Sufia
   autoload :HttpHeaderAuth
   autoload :SolrDocumentBehavior
   autoload :FilesControllerBehavior
+  autoload :BatchEditsControllerBehavior
   autoload :DownloadsControllerBehavior
   autoload :FileContent
 end

data/lib/sufia/batch_edits_controller_behavior.rb

@@ -0,0 +1,89 @@
+module Sufia
+  module BatchEditsControllerBehavior
+    extend ActiveSupport::Concern
+
+    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
+
+       initialize_fields(h, @show_file)
+
+       # 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
+
+    protected
+
+    # override this method if you need to initialize more complex RDF assertions (b-nodes)
+    def initialize_fields(attributes, 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] = attributes[key].empty? ? [''] : attributes[key]
+       end
+    end
+
+  end
+end

data/lib/sufia/controller.rb

@@ -25,11 +25,11 @@ module Sufia::Controller
   end
 
   def current_ability
-    current_user ? current_user.ability : super
+    user_signed_in? ? current_user.ability : super
   end
 
   def groups
-    @groups ||= current_user ? current_user.groups : []
+    @groups ||= user_signed_in? ? current_user.groups : []
   end
 
   def render_404(exception)
@@ -42,12 +42,16 @@ module Sufia::Controller
     render :template => '/error/500', :layout => "error", :formats => [:html], :status => 500
   end
 
+  def render_single_use_error(exception)
+    logger.error("Rendering PAGE due to exception: #{exception.inspect} - #{exception.backtrace if exception.respond_to? :backtrace}")
+    render :template => '/error/single_use_error', :layout => "error", :formats => [:html], :status => 404
+  end
 
   def notifications_number
     @notify_number=0
     @batches=[]
     return if action_name == "index" && controller_name == "mailbox"
-    if current_user 
+    if user_signed_in? 
       @notify_number= current_user.mailbox.inbox(:unread => true).count(:id, :distinct => true)
       @batches=current_user.mailbox.inbox.map {|msg| msg.last_message.body[/<a class="batchid ui-helper-hidden">(.*)<\/a>The file(.*)/,1]}.select{|val| !val.blank?}
     end
@@ -60,6 +64,4 @@ module Sufia::Controller
     true
   end
 
-  # include Sufia::HttpHeaderAuth
-
 end

data/lib/sufia/downloads_controller_behavior.rb

@@ -36,36 +36,31 @@ module Sufia
     end
 
     protected
-    
-    def send_content (asset)
-        opts = {}
-        ds = nil
-        opts[:filename] = params["filename"] || asset.label
-        opts[:disposition] = 'inline' 
-        if params.has_key?(:datastream_id)
+
+    def datastream_name
+      @datastream_name ||= params[:datastream_id] || DownloadsController.default_content_dsid
+    end
+
+    def send_content(asset)
+        opts = {disposition: 'inline'}
+        if default_datastream?
+          opts[:filename] = params["filename"] || asset.label
+        else
           opts[:filename] = params[:datastream_id]
-          ds = asset.datastreams[params[:datastream_id]]
         end
-        ds = default_content_ds(asset) if ds.nil?
+        ds = asset.datastreams[datastream_name]
         raise ActionController::RoutingError.new('Not Found') if ds.nil?
         data = ds.content
         opts[:type] = ds.mimeType
         send_data data, opts
-        return
     end
     
+    def default_datastream?
+      datastream_name == self.class.default_content_dsid
+    end
     
     private 
     
-    def default_content_ds(asset)
-      ActiveFedora::ContentModel.known_models_for(asset).each do |model_class|
-        return model_class.default_content_ds if model_class.respond_to?(:default_content_ds)
-      end
-      if asset.datastreams.keys.include?(DownloadsController.default_content_dsid)
-        return asset.datastreams[DownloadsController.default_content_dsid]
-      end
-    end
-    
     module ClassMethods
       def default_content_dsid
         "content"

data/lib/sufia/file_content/extract_metadata.rb

@@ -13,7 +13,8 @@ module Sufia
       end
 
       def to_tempfile &block
-        return if content.nil?
+        return unless has_content?
+        tmp_base = Sufia::Engine.config.temp_file_base
         f = Tempfile.new("#{pid}-#{dsVersionID}")
         f.binmode
         if content.respond_to? :read
@@ -25,21 +26,27 @@ module Sufia
         content.rewind if content.respond_to? :rewind
         yield(f)
         f.unlink
+      end
 
+      # Return true if the content is present
+      # You can override this method if your content is an external datastream
+      def has_content?
+        !content.nil?
       end
 
       private 
 
 
         def run_fits!(file_path)
-            command = "#{fits_path} -i #{file_path}"
-            stdin, stdout, stderr = popen3(command)
+            command = "#{fits_path} -i \"#{file_path}\""
+            stdin, stdout, stderr, wait_thr = 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"
+            exit_status = wait_thr.value
+            raise "Unable to execute command \"#{command}\"\n#{err}" unless exit_status.success?
             out
         end
 

data/lib/sufia/files_controller_behavior.rb

@@ -53,7 +53,7 @@ module Sufia
 
     # routed to /files/:id/edit
     def edit
-      @terms = @generic_file.terms_for_editing
+      initialize_fields(@generic_file)
       @groups = current_user.groups
     end
 
@@ -74,55 +74,26 @@ module Sufia
     # routed to /files (POST)
     def create
       begin
-        retval = " "
         # check error condition No files
-        return render(:json => [{:error => "Error! No file to save"}].to_json) if !params.has_key?(:files)
+        return json_error("Error! No file to save") if !params.has_key?(:files)
 
         file = params[:files].detect {|f| f.respond_to?(:original_filename) }
         if !file
-          render :json => [{:name => 'unknown file', :error => "Error! No file for upload"}], :status => :unprocessable_entity
-          return false
-        end
-
-        # check error condition empty file
-        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 => file.original_filename, :error => "You must accept the terms of service!"}].to_json
-
-        # process file
+          json_error "Error! No file for upload", 'unknown file', :status => :unprocessable_entity
+        elsif (empty_file?(file))
+          json_error "Error! Zero Length File!", file.original_filename 
+        elsif (!terms_accepted?)
+          json_error "You must accept the terms of service!", file.original_filename
         else
-          if virus_check(file) == 0 
-            @generic_file = ::GenericFile.new
-            # Relative path is set by the jquery uploader when uploading a directory
-            @generic_file.relative_path = params[:relative_path] if params[:relative_path]
-            Sufia::GenericFile::Actions.create_metadata(@generic_file, current_user, params[:batch_id])
-            Sufia::GenericFile::Actions.create_content(@generic_file, file, file.original_filename, datastream_id, current_user)
-            respond_to do |format|
-              format.html {
-                retval = render :json => [@generic_file.to_jq_upload].to_json,
-                  :content_type => 'text/html',
-                  :layout => false
-              }
-              format.json {
-                retval = render :json => [@generic_file.to_jq_upload].to_json
-              }
-            end
-          else
-            retval = render :json => [{:error => "Error creating generic file."}].to_json
-          end
+          process_file(file)
         end
       rescue => error
         logger.error "GenericFilesController::create rescued #{error.class}\n\t#{error.to_s}\n #{error.backtrace.join("\n")}\n\n"
-        retval = render :json => [{:error => "Error occurred while creating generic file."}].to_json
+        json_error "Error occurred while creating generic file." 
       ensure
         # remove the tempfile (only if it is a temp file)
         file.tempfile.delete if file.respond_to?(:tempfile)
       end
-
-      return retval
     end
 
     # routed to /files/:id/citation
@@ -131,11 +102,10 @@ module Sufia
 
     # routed to /files/:id
     def show
-      @can_edit =  can? :edit, @generic_file
-      @events = @generic_file.events(100)
-
       respond_to do |format|
-        format.html
+        format.html {
+          @events = @generic_file.events(100)
+        }
         format.endnote { render :text => @generic_file.export_as_endnote }
       end
     end
@@ -164,7 +134,12 @@ module Sufia
         Sufia.queue.push(ContentNewVersionEventJob.new(@generic_file.pid, current_user.user_key))
       end
 
-      update_metadata
+      # only update metadata if there is a generic_file object which is not the case for version updates
+      update_metadata if params[:generic_file]
+
+      #always save the file so the new version or metadata gets recorded
+      @generic_file.save!
+      
 
       # do not trigger an update event if a version event has already been triggered
       Sufia.queue.push(ContentUpdateEventJob.new(@generic_file.pid, current_user.user_key)) unless version_event
@@ -175,6 +150,51 @@ module Sufia
 
     protected
 
+    def json_error(error, name=nil, additional_arguments={})
+      args = {:error => error}
+      args[:name] = name if name
+      render additional_arguments.merge({:json => [args]})
+    end
+
+    def empty_file?(file)
+      (file.respond_to?(:tempfile) && file.tempfile.size == 0) || (file.respond_to?(:size) && file.size == 0)
+    end
+
+    def process_file(file)
+      if virus_check(file) == 0 
+        @generic_file = ::GenericFile.new
+        # Relative path is set by the jquery uploader when uploading a directory
+        @generic_file.relative_path = params[:relative_path] if params[:relative_path]
+        Sufia::GenericFile::Actions.create_metadata(@generic_file, current_user, params[:batch_id])
+        Sufia::GenericFile::Actions.create_content(@generic_file, file, file.original_filename, datastream_id, current_user)
+        respond_to do |format|
+          format.html {
+            render :json => [@generic_file.to_jq_upload],
+              :content_type => 'text/html',
+              :layout => false
+          }
+          format.json {
+            render :json => [@generic_file.to_jq_upload]
+          }
+        end
+      else
+        render :json => [{:error => "Error creating generic file."}]
+      end
+    end
+
+    # override this method if you want to change how the terms are accepted on upload. 
+    def terms_accepted?
+      params[:terms_of_service] == '1'
+    end
+
+    # 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
+
     # The name of the datastream where we store the file data
     def datastream_id
       'content'
@@ -186,7 +206,6 @@ module Sufia
       @generic_file.attributes = valid_attributes
       @generic_file.set_visibility(params[:visibility])
       @generic_file.date_modified = DateTime.now
-      @generic_file.save!
     end