sufia 3.4.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b325d0460fd902145ca8b8c197ea822e271d7182
-  data.tar.gz: 6cb9cb9a2b1c4838a16ee2cc5dd4526fb918fc7d
+  metadata.gz: 77cd255a8ab67cb2bcbd0bbfe17a9920d853251b
+  data.tar.gz: 528e7ca2aeb61cf7bcf5b10e370fcbfd8a51a1fc
 SHA512:
-  metadata.gz: 02ba6513e673044b55e11a6dbaa68cb83cde5b3e3381c9c75dc86dd2bd21cdb0b709f35904befcb4a8a3fa6485d3081d4028b0480489fdceb3b5ae55a1d19ec0
-  data.tar.gz: b7be173445501e70cf190ba23e2965ed3fac991ac5ca4f07a0e339692ce1ef58c7de4edf549788a95d461f32a5fa2a68afbe134518a77c8839a6ff4042dd3669
+  metadata.gz: acc4acc8293673da4aba37329ab6321be93241c9dfd2fd712a4bf5a3cf7218bfe25d5d6d8a99b1a45eb91934903dc31caacce9d7aa8311ebdfa9965075c5df4e
+  data.tar.gz: 656b6f49ed4a1a4a603cae1b40a3c9320ac42a3aa4e806ba228439442ba87168fa8e0ed2b60e7957014b9297d1221ca9e97ad77605379402f2ffa472af2f816b

data/.travis.yml

@@ -1,7 +1,12 @@
 language: ruby
+before_install:
+  - sudo apt-get install libclamav-dev clamav-data
 rvm:
   - "1.9.3"
   - "2.0.0"
+env:
+  global:
+  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
 notifications:
   email:
     recipients:
@@ -16,4 +21,4 @@ notifications:
     template:
       - "%{repository}//%{branch}@%{commit} by %{author}: %{message} - %{build_url}"
 services:
-  - redis-server
+  - redis-server

data/Gemfile

@@ -8,18 +8,17 @@ gem 'kaminari', github: 'harai/kaminari', branch: 'route_prefix_prototype'
 gem 'sufia-models', path: './sufia-models'
 
 group :development, :test do
+  gem 'devise'
+#  gem 'byebug'
+  gem 'clamav'
   gem 'sqlite3'
-  gem 'selenium-webdriver'
-  gem 'rspec-rails', '~> 2.14'
-  gem 'launchy'
-  gem 'database_cleaner'
-  gem 'capybara', '~>2.1.0'
-  gem 'bcrypt-ruby'
+  gem 'rspec-rails'
+  gem 'launchy' unless ENV['TRAVIS']
+  gem 'capybara'
   gem "jettywrapper"
-  gem "factory_girl_rails", "~> 4.2.1"
+  gem "factory_girl_rails"
   gem "devise"
   gem 'jquery-rails'
-  gem 'sass-rails'
   gem 'turbolinks'
   gem "bootstrap-sass"
   gem "simplecov", :require => false

data/README.md

@@ -146,3 +146,16 @@ rake fixtures
 rake clean spec
 bundle exec cucumber features
 ```
+### Change validation behavior
+
+To change what happens to files that fail validation add an after_validation hook
+```
+    after_validation :dump_infected_files
+
+    def dump_infected_files
+      if Array(errors.get(:content)).any? { |msg| msg =~ /A virus was found/ }
+        content.content = errors.get(:content)
+        save
+      end
+    end
+```

data/SUFIA_VERSION

@@ -1 +1 @@
-3.4.0
+3.5.0

data/app/controllers/mailbox_controller.rb

@@ -4,7 +4,7 @@ class MailboxController < ApplicationController
   def index
     if user_signed_in?
       @messages = current_user.mailbox.inbox
-      current_user.mark_as_read @messages
+      @messages.each{|m| m.mark_as_read(current_user)}
     else
       @messages =[]
     end 
@@ -15,20 +15,20 @@ class MailboxController < ApplicationController
         delete_message(msg)
      end
      empty_trash(current_user)
-     redirect_to sufia.mailbox_path
+     redirect_to sufia.notifications_path
   end
 
-  def delete
-    if (current_user)
-      msg = Conversation.find(params[:uid])
+  def destroy
+    if current_user
+      msg = Conversation.find(params[:id])
       if (msg.participants[0] == current_user) || (msg.participants[1] == current_user)
          delete_message(msg)
          empty_trash(msg.participants[0])
       end
-   else 
+    else 
       flash[:alert] = "You do not have privileges to delete the notification..."
-   end
-   redirect_to sufia.mailbox_path
+    end
+    redirect_to sufia.notifications_path
   end
 
 private 

data/app/jobs/ingest_local_file_job.rb

@@ -1,34 +1,38 @@
 class IngestLocalFileJob
+  attr_accessor :directory, :filename, :user_key, :generic_file_id
+
   def queue_name
     :ingest
   end
 
-  attr_accessor :directory, :filename, :user_key, :generic_file_id
-
   def initialize(generic_file_id, directory, filename, user_key)
     self.generic_file_id = generic_file_id
     self.directory = directory
-    self.filename = filename 
+    self.filename = filename
     self.user_key = user_key
   end
 
   def run
-    filedata = File.new( File.join(directory, filename) )
-    generic_file = GenericFile.find(generic_file_id)
     user = User.find_by_user_key(user_key)
     raise "Unable to find user for #{user_key}" unless user
-    
-    # virus check
-    virus_stat = Sufia::GenericFile::Actions.virus_check(filedata)
-    raise "Virus checking did not pass for #{File.basename(filedata.path)} status = #{virus_stat}" unless virus_stat == 0
-    
+    generic_file = GenericFile.find(generic_file_id)
+    path = File.join(directory, filename)
+
     generic_file.label = File.basename(filename)
-    generic_file.add_file(File.open(File.join(directory, filename)), 'content', generic_file.label)
+    generic_file.add_file(File.open(path), 'content', generic_file.label)
     generic_file.record_version_committer(user)
     generic_file.save!
 
-    #Sufia.queue.push(UnzipJob.new(generic_file.pid)) if generic_file.content.mimeType == 'application/zip'
+    FileUtils.rm(path)
     Sufia.queue.push(ContentDepositEventJob.new(generic_file.pid, user_key))
-    FileUtils.rm([File.join(directory, filename)])
+    # add message to user for downloaded file
+    message = "The file (#{File.basename(filename)}) was successfully deposited."
+    job_user.send_message(user, message, 'Local file ingest')
+  rescue => error
+    job_user.send_message(user, error.message, 'Local file ingest error')
+  end
+
+  def job_user
+    User.batchuser
   end
 end

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

@@ -1,6 +1,3 @@
-<!--<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 <%=t('sufia.product_name') %>?</h2>
       <p>
       <%=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. 

data/app/views/dashboard/_index_partials/_thumbnail_display.html.erb

@@ -1,31 +1,7 @@
-<%#
-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.
-%>
-
-<%- height = 42 if height.blank? -%>
-<%- width = 36 if width.blank? -%>
-<% if (document.mime_type) %>
-  <% if document.image? %>
-    <%= link_to image_tag(sufia.download_path(document["id"], {:datastream_id => 'thumbnail'}), {:width=>width}), sufia.generic_file_path(document.noid) %>
-  <% elsif document.pdf? %>
-    <%= link_to image_tag(sufia.download_path(document["id"], {:datastream_id => 'thumbnail'}), {:width=>width}),sufia.generic_file_path(document.noid) %>
-  <% elsif document.video? %>
-    <%= link_to image_tag(sufia.download_path(document["id"], {:datastream_id => 'thumbnail'}), {:width=>width}),sufia.generic_file_path(document.noid) %>
-  <% else %>
-    <%= link_to image_tag("/assets/default.png", {:width=>width}), sufia.generic_file_path(document) %>
-  <% end %>
+<% width = 36 if width.blank? %>
+<%  if document.image? || document.pdf? || document.video? %>
+  <% path = sufia.download_path(document["id"], {datastream_id: 'thumbnail'}) %>
 <% else %>
- <%= link_to image_tag("/assets/default.png", {:width=>width}), sufia.generic_file_path(document) %> 
+  <% path = "/assets/default.png" %>
 <% end %>
+<%= link_to image_tag(path, {width: width}), sufia.generic_file_path(document) %>

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

@@ -1,21 +1,7 @@
-<%#
-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.
-%>
-
 <h1>User Notifications</h1>
-<a href="<%= sufia.mailbox_delete_all_path %>" class="btn " title="click delete all User Notifications"><i class="icon-trash">&nbsp;</i>Delete All</a>
+<%= link_to raw('<i class="icon-trash icon-large">&nbsp;</i>Delete All'),
+    sufia.delete_all_notifications_path, method: :delete, class: 'btn',
+    title: 'Delete all user notifications' %>
 <div id="Data">
     <table class="table table-striped"> 
         <thead> 
@@ -27,10 +13,12 @@ limitations under the License.
         <tbody> 
             <% @messages.each do |msg| %> 
                 <tr class="<%= cycle("","zebra") %>"> 
-                   <td ><%= msg.last_message.subject.html_safe  %></td> 
-                   <td ><%= msg.last_message.body.html_safe  %></td> 
-                   <td>    <%= link_to raw('<i class="icon-trash icon-large"></i>'), sufia.mailbox_delete_path(msg.id), :class=> 'itemicon itemtrash', :title => 'Delete File', :method => :delete %>&nbsp;&nbsp;&nbsp;</td>
-                   
+                   <td><%= msg.last_message.subject.html_safe  %></td> 
+                   <td><%= msg.last_message.body.html_safe  %></td> 
+                   <td><%= link_to raw('<i class="icon-trash icon-large"></i>'),
+                     sufia.notification_path(msg.id), :class=> 'itemicon itemtrash',
+                     :title => 'Delete File', :method => :delete %>
+                   </td>
                 </tr> 
             <% end %> 
         </tbody> 

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

@@ -1,21 +1,6 @@
-<%#
-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.
-%>
-<a id="notify_link"  href="<%= sufia.mailbox_path %>" class="icon-btn btn btn-small" title="click for User Notifications">
+<%= link_to sufia.notifications_path, id: "notify_link", class: "icon-btn btn btn-small", title: "User Notifications" do %>
  <%= render :partial => 'users/notify_number' %>
-</a>  
+<% end %>  
 <div class='hide'> 
   <%= link_to "notify", sufia.user_notify_path, :remote => true, :id => 'notify_update_link' %>
 </div> 

data/config/routes.rb

@@ -27,9 +27,11 @@ Sufia::Engine.routes.draw do
   resources :downloads, :only => "show"
 
   # Messages
-  get 'notifications' => 'mailbox#index', :as => :mailbox
-  match 'notifications/delete_all' => 'mailbox#delete_all', as: :mailbox_delete_all, via: [:get, :post]
-  match 'notifications/:uid/delete' => 'mailbox#delete', as: :mailbox_delete, via: [:get, :post]
+  resources :notifications, only: [:destroy, :index], controller: :mailbox do
+    collection do
+      delete 'delete_all'
+    end
+  end
 
   # User profile & follows
   resources :users, only: [:index, :show, :edit, :update], as: :profiles

data/lib/sufia/files_controller_behavior.rb

@@ -79,7 +79,7 @@ module Sufia
     def create_from_url(params)
       params[:dropbox_urls].each do |db_file|
         next if db_file.blank?
-        # do not remove :: 
+        # do not remove ::
         @generic_file = ::GenericFile.new
         @generic_file.import_url = db_file
         @generic_file.label = File.basename(db_file)
@@ -90,27 +90,25 @@ module Sufia
     end
 
     def create_from_upload(params)
-      begin
-        # check error condition No 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
-          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
-          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"
-        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)
+      # check error condition No 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
+        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
+        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"
+      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
 
     # routed to /files/:id/citation
@@ -145,10 +143,8 @@ module Sufia
 
       if params.has_key?(:filedata)
         file = params[:filedata]
-        return unless virus_check(file) == 0
         @generic_file.add_file(file, datastream_id, file.original_filename)
         version_event = true
-        Sufia.queue.push(ContentNewVersionEventJob.new(@generic_file.pid, current_user.user_key))
       end
 
       # only update metadata if there is a generic_file object which is not the case for version updates
@@ -157,12 +153,20 @@ module Sufia
       #always save the file so the new version or metadata gets recorded
       if @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
+        if version_event
+          Sufia.queue.push(ContentNewVersionEventJob.new(@generic_file.pid, current_user.user_key)) if params.has_key?(:filedata)
+        else
+          Sufia.queue.push(ContentUpdateEventJob.new(@generic_file.pid, current_user.user_key))
+        end
         @generic_file.record_version_committer(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 })
       else
         render action: 'edit'
       end
+    rescue => error
+      flash[:error] = error.message
+      logger.error "GenericFilesController::update rescued #{error.class}\n\t#{error.message}\n #{error.backtrace.join("\n")}\n\n"
+      render action: 'edit'
     end
 
     protected
@@ -179,27 +183,26 @@ module Sufia
     end
 
     def process_file(file)
-      if virus_check(file) == 0 
-        @generic_file = ::GenericFile.new
-        update_metadata_from_upload_screen
-        create_metadata(@generic_file)
-        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."}]
+      @generic_file = ::GenericFile.new
+      update_metadata_from_upload_screen
+      create_metadata(@generic_file)
+      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
+    rescue ActiveFedora::RecordInvalid => af
+      flash[:error] = af.message
+      json_error "Error creating generic file: #{af.message}"
     end
 
-    # override this method if you want to change how the terms are accepted on upload. 
+    # override this method if you want to change how the terms are accepted on upload.
     def terms_accepted?
       params[:terms_of_service] == '1'
     end
@@ -231,14 +234,6 @@ module Sufia
       @generic_file.date_modified = DateTime.now
     end
 
-
-    def virus_check( file)
-      stat = Sufia::GenericFile::Actions.virus_check(file)
-      flash[:error] = "Virus checking did not pass for #{File.basename(file.path)} status = #{stat}" unless stat == 0
-      stat
-    end
-
-
     def create_metadata(file)
       Sufia::GenericFile::Actions.create_metadata(file, current_user, params[:batch_id])
     end

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "3.4.0"
+  VERSION = "3.5.0"
 end