sufia 0.0.2 → 0.0.3

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

@@ -14,12 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 %>
 
-<% content_for :js_head do %>
-
-  <%= javascript_include_tag 'bootstrap-tooltip.js'%>
-  <%= javascript_include_tag 'bootstrap-popover.js'%>
-<% end %>
-
 <% content_for :local_js do %>
 // initialize popover helpers
 $("a[rel=popover]").popover();

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

@@ -290,8 +290,8 @@ class CatalogController < ApplicationController
         :"spellcheck.dictionary" => "format"
       }
       field.solr_local_parameters = {
-        :qf => "generic_file__format_t",
-        :pf => "generic_file__format_t"
+        :qf => "file_format_t",
+        :pf => "file_format_t"
       }
     end
 

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

@@ -95,6 +95,9 @@ Sufia.config do |config|
 
     config.queue = Sufia::Resque::Queue
 
+    # Map hostnames onto Google Analytics tracking IDs
+    #config.google_analytics_id = 'UA-99999999-1'
+
 end
 
 

data/lib/sufia.rb

@@ -68,13 +68,15 @@ module Sufia
   end
 
   autoload :GenericFile
-  autoload :Controller,           'sufia/controller'
-  autoload :Utils,                'sufia/utils'
-  autoload :User,                 'sufia/user'
-  autoload :ModelMethods,         'sufia/model_methods'
-  autoload :Noid,                 'sufia/noid'
-  autoload :IdService,            'sufia/id_service'
-  autoload :HttpHeaderAuth,       'sufia/http_header_auth'
-  autoload :SolrDocumentBehavior, 'sufia/solr_document_behavior'
+  autoload :Controller
+  autoload :Utils
+  autoload :User
+  autoload :ModelMethods
+  autoload :Noid
+  autoload :IdService
+  autoload :HttpHeaderAuth
+  autoload :SolrDocumentBehavior
+  autoload :FilesControllerBehavior
+  autoload :DownloadsControllerBehavior
 end
 

data/lib/sufia/downloads_controller_behavior.rb

@@ -0,0 +1,77 @@
+# 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.
+
+module Sufia
+  module DownloadsControllerBehavior
+    extend ActiveSupport::Concern
+
+    included do
+      # module mixes in normalize_identifier method
+      include Sufia::Noid
+
+      # moved check into the routine so we can handle the user with no access 
+      prepend_before_filter :normalize_identifier 
+    end
+    
+    def show
+      if can? :read, params["id"]
+        logger.info "Can read #{params['id']}"
+
+        send_content (params["id"])
+        return
+      else 
+        logger.info "Can not read #{params['id']}"
+        redirect_to "/assets/NoAccess.png"
+      end
+    end
+
+    protected
+    
+    def send_content (id)
+        @asset = ActiveFedora::Base.find(id, :cast=>true)
+        opts = {}
+        ds = nil
+        opts[:filename] = params["filename"] || @asset.label
+        opts[:disposition] = 'inline' 
+        if params.has_key?(:datastream_id)
+          opts[:filename] = params[:datastream_id]
+          ds = @asset.datastreams[params[:datastream_id]]
+        end
+        ds = default_content_ds(@asset) if ds.nil?
+        raise ActionController::RoutingError.new('Not Found') if ds.nil?
+        data = ds.content
+        opts[:type] = ds.mimeType
+        send_data data, opts
+        return
+    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"
+      end
+    end
+  end
+end

data/lib/sufia/files_controller_behavior.rb

@@ -0,0 +1,245 @@
+# -*- coding: utf-8 -*-
+# 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.
+
+module Sufia
+  module FilesControllerBehavior
+    extend ActiveSupport::Concern
+
+    included do
+      include Hydra::Controller::ControllerBehavior
+      include Hydra::Controller::UploadBehavior # for add_posted_blob_to_asset method
+      include Blacklight::Configurable # comply with BL 3.7
+      include Sufia::Noid # for normalize_identifier method
+
+      # This is needed as of BL 3.7
+      self.copy_blacklight_config_from(CatalogController)
+
+      # Catch permission errors
+      rescue_from Hydra::AccessDenied, CanCan::AccessDenied do |exception|
+        if (exception.action == :edit)
+          redirect_to(sufia.url_for({:action=>'show'}), :alert => "You do not have sufficient privileges to edit this document")
+        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]
+      before_filter :has_access?, :except => [:show]
+      prepend_before_filter :normalize_identifier, :except => [:index, :create, :new]
+      load_resource :only=>[:audit]
+      load_and_authorize_resource :except=>[:index, :audit]
+    end
+
+
+    # routed to /files/new
+    def new
+      @generic_file = ::GenericFile.new
+      @batch_noid = Sufia::Noid.noidify(Sufia::IdService.mint)
+    end
+
+    # routed to /files/:id/edit
+    def edit
+      @terms = @generic_file.get_terms
+      @groups = current_user.groups
+    end
+
+    # routed to /files/:id
+    def index
+      @generic_files = ::GenericFile.find(:all, :rows => ::GenericFile.count)
+      render :json => @generic_files.map(&:to_jq_upload).to_json
+    end
+
+    # routed to /files/:id (DELETE)
+    def destroy
+      pid = @generic_file.noid
+      @generic_file.delete
+      Sufia.queue.push(ContentDeleteEventJob.new(pid, current_user.user_key))
+      redirect_to sufia.dashboard_index_path, :notice => render_to_string(:partial=>'generic_files/asset_deleted_flash', :locals => { :generic_file => @generic_file })
+    end
+
+    # routed to /files (POST)
+    def create
+      begin
+        retval = " "
+        # check error condition No files
+        if !params.has_key?(:files)
+           retval = render :json => [{:error => "Error! No file to save"}].to_json
+
+        # 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
+
+        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
+
+        # process file
+        else
+          create_and_save_generic_file
+          if @generic_file
+            Sufia.queue.push(ContentDepositEventJob.new(@generic_file.pid, current_user.user_key))
+            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
+        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
+      ensure
+        # remove the tempfile (only if it is a temp file)
+        params[:files][0].tempfile.delete if params[:files][0].respond_to?(:tempfile)
+      end
+
+      return retval
+    end
+
+    # routed to /files/:id/citation
+    def citation
+    end
+
+    # routed to /files/:id
+    def show
+      @can_edit =  can? :edit, @generic_file
+      @events = @generic_file.events(100)
+
+      respond_to do |format|
+        format.html
+        format.endnote { render :text => @generic_file.export_as_endnote }
+      end
+    end
+
+    # routed to /files/:id/audit (POST)
+    def audit
+      render :json=>@generic_file.audit
+    end
+
+    # routed to /files/:id (PUT)
+    def update
+      version_event = false
+
+      if params.has_key?(:revision) and params[:revision] !=  @generic_file.content.latest_version.versionID
+        revision = @generic_file.content.get_version(params[:revision])
+        @generic_file.add_file_datastream(revision.content, :dsid => 'content')
+        version_event = true
+        Sufia.queue.push(ContentRestoredVersionEventJob.new(@generic_file.pid, current_user.user_key, params[:revision]))
+      end
+
+      if params.has_key?(:filedata)
+        return unless virus_check(params[:filedata]) == 0
+        add_posted_blob_to_asset(@generic_file, params[:filedata])
+        version_event = true
+        Sufia.queue.push(ContentNewVersionEventJob.new(@generic_file.pid, current_user.user_key))
+      end
+      @generic_file.attributes = params[:generic_file].reject { |k,v| %w{ Filedata Filename revision part_of date_modified date_uploaded format }.include? k}
+      @generic_file.set_visibility(params[:visibility])
+      @generic_file.date_modified = Time.now.ctime
+      @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
+      record_version_committer(@generic_file, current_user)
+      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
+
+    protected
+    def record_version_committer(generic_file, user)
+      version = generic_file.content.latest_version
+      # content datastream not (yet?) present
+      return if version.nil?
+      VersionCommitter.create(:obj_id => version.pid,
+                              :datastream_id => version.dsid,
+                              :version_id => version.versionID,
+                              :committer_login => user.user_key)
+    end
+
+    def virus_check( file)
+      if defined? ClamAV
+        stat = ClamAV.instance.scanfile(file.path)
+        flash[:error] = "Virus checking did not pass for #{file.original_filename} status = #{stat}" unless stat == 0
+        logger.warn "Virus checking did not pass for #{file.inspect} status = #{stat}" unless stat == 0
+        stat
+      else
+        logger.warn "Virus checking disabled for #{file.inspect}"
+        0
+      end
+    end 
+
+    def create_and_save_generic_file
+      unless params.has_key?(:files)
+        logger.warn "!!!! No Files !!!!"
+        return
+      end
+      file = params[:files][0]
+      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)
+
+      @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.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}")
+      else
+        logger.warn "unable to find batch to attach to"
+      end
+
+      save_tries = 0
+      begin
+        @generic_file.save
+      rescue RSolr::Error::Http => error
+        logger.warn "GenericFilesController::create_and_save_generic_file Caught RSOLR error #{error.inspect}"
+        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)
+      Sufia.queue.push(UnzipJob.new(@generic_file.pid)) if file.content_type == 'application/zip'
+      return @generic_file
+    end
+  end
+end

data/lib/sufia/generic_file.rb

@@ -32,12 +32,13 @@ module Sufia
       delegate_to :descMetadata, [:date_uploaded, :date_modified], :unique => true
       delegate_to :descMetadata, [:related_url, :based_near, :part_of, :creator,
                                   :contributor, :title, :tag, :description, :rights,
-                                  :publisher, :date_created, :subject, :format,
+                                  :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?
@@ -160,7 +161,7 @@ module Sufia
       terms.each do |t|
           next if t.empty?
           key = t.to_s.split("generic_file__").last
-          next if ['part_of', 'date_modified', 'date_uploaded', 'format'].include?(key)
+          next if ['part_of', 'date_modified', 'date_uploaded'].include?(key)
           values[key] = self.send(key) if self.respond_to?(key)
       end        
       return values          
@@ -173,26 +174,19 @@ 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
-     @@FIELD_LABEL_MAP = {"based_near"=>"Location", 'description'=>"Abstract or Summary", 'tag'=>"Keyword", 'date_created'=>"Date Created", 'related_url'=>"Related URL"}
+      # 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"}
 
       def get_label(key)
          label = @@FIELD_LABEL_MAP[key]
          label = key.gsub('_',' ').titleize if label.blank?
          return label
       end
-
-      # redefine find so that it sets the terms of service
-      def find(args, opts={})
-        gf = super
-        # 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'
-        elsif gf.respond_to? :each
-          gf.each {|f| f.terms_of_service = '1'} 
-        end
-        return gf
-      end
     end
 
   end

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/controllers/generic_files_controller_spec.rb

@@ -188,8 +188,7 @@ describe GenericFilesController do
 
   describe "destroy" do
     before(:each) do
-      GenericFile.any_instance.stub(:terms_of_service).and_return('1')
-      @generic_file = GenericFile.new
+      @generic_file = GenericFile.new(:terms_of_service => '1')
       @generic_file.apply_depositor_metadata(@user.user_key)
       @generic_file.save
       @user = FactoryGirl.find_or_create(:user)
@@ -213,9 +212,8 @@ describe GenericFilesController do
 
   describe "update" do
     before do
-      GenericFile.any_instance.stub(:terms_of_service).and_return('1')
       #controller.should_receive(:virus_check).and_return(0)      
-      @generic_file = GenericFile.new
+      @generic_file = GenericFile.new(:terms_of_service=>'1')
       @generic_file.apply_depositor_metadata(@user.user_key)
       @generic_file.save
     end
@@ -335,9 +333,8 @@ describe GenericFilesController do
   end
 
   describe "someone elses files" do
-    before(:all) do
-      GenericFile.any_instance.stub(:terms_of_service).and_return('1')
-      f = GenericFile.new(:pid => 'sufia:test5')
+    before do
+      f = GenericFile.new(:pid => 'sufia:test5', :terms_of_service=> '1')
       f.apply_depositor_metadata('archivist1@example.com')
       f.set_title_and_label('world.png')
       f.add_file_datastream(File.new(fixture_path +  '/world.png'))
@@ -347,8 +344,8 @@ describe GenericFilesController do
       f.save
       @file = f
     end
-    after(:all) do
-      GenericFile.find('sufia:test5').delete
+    after do
+      GenericFile.find('sufia:test5').destroy
     end
     describe "edit" do
       it "should give me a flash error" do
@@ -367,7 +364,6 @@ describe GenericFilesController do
       end
     end
     describe "flash" do
-      render_views
       it "should not let the user submit if they logout" do
         sign_out @user
         get :new
@@ -376,23 +372,17 @@ describe GenericFilesController do
         flash[:alert].should include("You need to sign in or sign up before continuing")
       end
       it "should filter flash if they signin" do
-        request.env['warden'].stub(:user).and_return(@user)
-        sign_out @user
-        get :new
         sign_in @user
         get :show, id:"test5"
-        response.body.should_not include("You need to sign in or sign up before continuing")
+        flash[:alert].should be_nil
       end
       describe "failing audit" do
-        before(:all) do
+        render_views
+        before do
           ActiveFedora::RelsExtDatastream.any_instance.stub(:dsChecksumValid).and_return(false)
           @archivist = FactoryGirl.find_or_create(:archivist)
         end
-        after(:all) do
-          @archivist.delete
-        end
         it "should display failing audits" do
-          sign_out @user
           sign_in @archivist
           @ds = @file.datastreams.first
           AuditJob.new(@file.pid, @ds[0], @ds[1].versionID).run