sufia 0.0.1 → 0.0.2

data/Gemfile

@@ -13,7 +13,7 @@ group :development, :test do
 #  gem "rails_indexes", :git => "git://github.com/warpc/rails_indexes.git", :ref => '4a550270'
   gem 'selenium-webdriver'
   gem 'headless'
-  gem 'rspec-rails', '>= 2.11.0'
+  gem 'rspec-rails', '~> 2.12.0'
   gem 'ruby-prof'
   gem 'cucumber-rails', '~> 1.0', :require => false
   gem 'database_cleaner'

data/app/assets/javascripts/sufia.js

@@ -14,15 +14,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// require jquery-1.8.2.min
-// require jquery_ujs.js
-// require jquery-ui-1.8.23.custom.min
-// require blacklight
+//= require jquery-ui-1.9.2/jquery.ui.core
+//= require jquery-ui-1.9.2/jquery.ui.widget
+//= require jquery-ui-1.9.2/jquery.ui.menu
+//= require jquery-ui-1.9.2/jquery.ui.autocomplete
 //= require bootstrap-dropdown
 //= require bootstrap-button
 //= require bootstrap-collapse
 //= require batch_edit
-//= require generic_files
+//= require terms_of_service
+//= require fileupload
 
 //over ride the blacklight default to submit
 //form when sort by or show per page change

data/app/assets/javascripts/terms_of_service.js

@@ -0,0 +1,28 @@
+$(function () {
+    $('#main_upload_start').attr('disabled', true);
+    $("#upload_tooltip").hide();
+    $("#main_upload_start_span").mousemove(function(e){
+       if ( !$('#terms_of_service').is(':checked') ){
+           $('#main_upload_start').attr('disabled', true);
+        $("#upload_tooltip").show();
+        $("#upload_tooltip").css({
+            top: (e.clientY+5)+ "px",
+            left: (e.clientX+5) + "px"
+        });
+       } else {
+         if (filestoupload > 0) $('#main_upload_start').attr('disabled', false);
+         $("#upload_tooltip").hide();
+       }
+    });
+    $("#main_upload_start_span").mouseout(function(e){
+        $("#upload_tooltip").hide();
+    });
+    $("#main_upload_start_span").mouseleave(function(e){
+        $("#upload_tooltip").hide();
+    });
+    $('#terms_of_service').click(function () {
+        $('#main_upload_start').attr('disabled', !((this.checked) && (filestoupload > 0)));
+        $("#upload_tooltip").hide();
+    });
+});
+

data/app/controllers/batch_edits_controller.rb

@@ -36,7 +36,7 @@ class BatchEditsController < ApplicationController
    end
 
    def after_update 
-     redirect_to dashboard_index_path unless request.xhr?
+     redirect_to sufia.dashboard_index_path unless request.xhr?
    end
    
   def update_document(obj)
@@ -48,7 +48,7 @@ class BatchEditsController < ApplicationController
    def update
       # keep the batch around if we are doing ajax calls
       batch_sav = batch.dup if request.xhr?        
-      catalog_index_path = dashboard_index_path
+      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?))}

data/app/controllers/generic_files_controller.rb

@@ -154,10 +154,10 @@ class GenericFilesController < ApplicationController
       version_event = true
       Sufia.queue.push(ContentNewVersionEventJob.new(@generic_file.pid, current_user.user_key))
     end
-    @generic_file.update_attributes(params[:generic_file].reject { |k,v| %w{ Filedata Filename revision part_of date_modified date_uploaded format }.include? k})
+    @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
+    @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)

data/app/models/datastreams/fits_datastream.rb

@@ -22,7 +22,7 @@ class FitsDatastream < ActiveFedora::NokogiriDatastream
     t.identification {
       t.identity {
         t.format_label(:path=>{:attribute=>"format"})
-        t.mime_type(:path=>{:attribute=>"mimetype"})
+        t.mime_type(:path=>{:attribute=>"mimetype"}, index_as: [:searchable])
       }
     }
     t.fileinfo {

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

@@ -16,14 +16,14 @@ limitations under the License.
 
 
 
-<% content_for :head do %>
-  <% javascript_include_tag 'bootstrap-tooltip.js'%>
-  <% javascript_include_tag 'bootstrap-popover.js'%>
-  <% javascript_include_tag 'bootstrap-modal.js'%>
+<% content_for :js_head do %>
+  <%= javascript_include_tag 'bootstrap-tooltip.js'%>
+  <%= javascript_include_tag 'bootstrap-popover.js'%>
+  <%= javascript_include_tag 'bootstrap-modal.js'%>
 
-  <% javascript_include_tag 'batch.js' %>
+  <%= javascript_include_tag 'batch.js' %>
 
-  <% javascript_include_tag 'jquery.validate.js' %>
+  <%= javascript_include_tag 'jquery.validate.js' %>
   <style type="text/css">
   label.error { float: left; color: red; padding-left: .5em; vertical-align: top; }
 

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

@@ -1,8 +1,10 @@
-<% javascript 'bootstrap-modal.js'%>
-<% javascript 'bootstrap-tooltip.js'%>
-<% javascript 'bootstrap-popover.js'%>
+<% content_for :js_head do %>
+  <%= javascript_include_tag 'bootstrap-modal.js'%>
+  <%= javascript_include_tag 'bootstrap-tooltip.js'%>
+  <%= javascript_include_tag 'bootstrap-popover.js'%>
+<% end %> 
 
-<% stylesheet "jquery-ui-1.8.23.custom.css" %>
+<% stylesheet_link_tag "jquery-ui-1.8.23.custom.css" %>
 
 <% content_for :local_js do %>
 
@@ -34,9 +36,10 @@ $("a[rel=popover]").popover();
   function after_ajax(form_id){
       var key = form_id.replace("form_","");
       var save_button = "#"+key+"_save";
+      var outer_div = "#collapse_"+key;
       $("#status_"+key).html("Changes Saved");
       $(save_button).removeAttr("disabled");         
-      $('#'+form_id).removeClass("loading");
+      $(outer_div).removeClass("loading");
       $('#'+form_id).children([".control-group"]).removeClass('hidden')
   }
 
@@ -46,8 +49,9 @@ $("a[rel=popover]").popover();
   function before_ajax(form_id){
         var key = form_id.replace("form_","");
         var save_button = "#"+key+"_save";
+        var outer_div = "#collapse_"+key;
         $(save_button).attr("disabled", "disabled");
-        $('#'+form_id).addClass("loading");
+        $(outer_div).addClass("loading");
         $('#'+form_id).children([".control-group"]).addClass('hidden')        
     }
 

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

@@ -5,8 +5,8 @@
   <%= search_as_hidden_fields(:omit_keys => [:q, :search_field, :qt, :page]).html_safe %>
             <div class="controls">
               <div class="input-append">
-              <label class="accessible-hidden">Search Scholarsphere</label> 
-              <%= text_field_tag :q, q, :class => "q span50", :id => "search-field-header", :placeholder => "Type keywords in here" %><button type="submit" class="btn btn-info" id="search-submit-header"><i class="icon-search"></i> Go</button>
+              <label class="accessible-hidden"><%= t('sufia.search.form.q.label') %></label> 
+              <%= text_field_tag :q, q, :class => "q span50", :id => "search-field-header", :placeholder => t('sufia.search.form.q.placeholder') %><button type="submit" class="btn btn-info" id="search-submit-header"><i class="icon-search"></i> Go</button>
   <!-- <input type="submit" class="btn btn-info" id="search-submit-header" value="GO"><i class="icon-search"></i></input>
 &nbsp; -->
  <%# link_to 'more options', params.merge(:controller=>"advanced", :action=>"index") , :class=>"advanced_search" if ! current_page?(advanced_path)%>

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

@@ -14,13 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 %>
 
-<% content_for :head do %>
-  <% javascript_include_tag 'video.js' %>
-  <% javascript_include_tag 'audio.min.js' %>
-  <% stylesheet_link_tag 'video-js.css' %>
-  <% javascript_include_tag 'dashboard.js' %>
-  <% javascript_include_tag 'swfobject.js' %>
-  <% javascript_include_tag 'jquery.clippy.js' %>
+<% content_for :js_head do %>
+  <%= javascript_include_tag 'video.js' %>
+  <%= javascript_include_tag 'audio.min.js' %>
+  <%= stylesheet_link_tag 'video-js.css' %>
+  <%= javascript_include_tag 'dashboard.js' %>
+  <%= javascript_include_tag 'swfobject.js' %>
 
   <script type = "text/javascript"> 
 
@@ -101,6 +100,7 @@ limitations under the License.
         toggleButtons();
     });
 
+  $('#documents').batchEdit();
 
   /*$('a.copypaste').zclip({
       path: "/assets/ZeroClipboard.swf",

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

@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 %>
 
-The file <%= link_to(display_title(generic_file), generic_file_url(generic_file.noid)) %> has been updated.
+The file <%= link_to(display_title(generic_file), sufia.generic_file_url(generic_file.noid)) %> has been updated.

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

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 %>
 
-<%= form_for @generic_file, :url => sufia.generic_file_path, :html => {:multipart => true, :class => 'form-horizontal', :id => 'fileupload'} do |f| %>
+<%= 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', 'descriptions') %>
 <div id="descriptions_display">

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

@@ -17,7 +17,7 @@ limitations under the License.
 <div id="versioning_display">
   <h2 class="non lower">Versions</h2>
   <div class="well">
-    <%= form_for @generic_file, :url => sufia.generic_file_path, :html => {:multipart => true, :class => 'form-horizontal', :id => 'fileupload'} do |f| %>
+    <%= 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>

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

@@ -14,17 +14,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 %>
 
-<% content_for :head do %>
-  <% javascript_include_tag 'video.js' %>
-  <% javascript_include_tag 'audio.min.js' %>
-  <% stylesheet_link_tag 'video-js.css' %>
+<% content_for :js_head do %>
+  <%= javascript_include_tag 'video.js' %>
+  <%= javascript_include_tag 'audio.min.js' %>
+  <%= stylesheet_link_tag 'video-js.css' %>
 
-  <% javascript_include_tag 'bootstrap-tooltip.js'%>
-  <% javascript_include_tag 'bootstrap-popover.js'%>
-  <% javascript_include_tag 'bootstrap-modal.js'%>
+  <%= javascript_include_tag 'bootstrap-tooltip.js'%>
+  <%= javascript_include_tag 'bootstrap-popover.js'%>
+  <%= javascript_include_tag 'bootstrap-modal.js'%>
 
 
-  <% javascript_include_tag 'jquery.validate.js' %>
+  <%= javascript_include_tag 'jquery.validate.js' %>
 
 <style type="text/css">
 label.error { float: left; color: red; padding-left: .5em; vertical-align: top; }
@@ -35,7 +35,7 @@ label.error { float: left; color: red; padding-left: .5em; vertical-align: top;
 
 <% content_for :local_js do %>
    if (navigator.userAgent.match("MSIE")){
-      $("#fileupload").validate();
+      $("form").validate();
    }
 initialize_audio();
 
@@ -92,7 +92,7 @@ $("a[rel=popover]").popover();
     </ul>
     <%= render :partial => "descriptions", :locals => { :generic_file => @generic_file } %>
 
-    <%= form_for @generic_file, :url => sufia.generic_file_path, :html => {:multipart => true, :class => 'form-horizontal', :id => 'fileupload'} do |f| %>
+    <%= form_for @generic_file, :url => sufia.generic_file_path, :html => {:multipart => true, :class => 'form-horizontal', :id => 'permission'} do |f| %>
       <%= hidden_field_tag('redirect_tab', 'permissions') %>
       <%= render :partial => "permission", :locals => { :gf => @generic_file, :f=> f } %>
     <% end %>

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

@@ -17,14 +17,14 @@ limitations under the License.
 <h2>Upload</h2>
 
 <div class="alert">
-  <strong>Note:</strong> You must agree to <a href='/agreement/' target="_blank">ScholarSphere's Deposit Agreement</a> before starting your upload.
+  <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">Please accept Deposit Agreement before you can upload.</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.
@@ -51,7 +51,7 @@ limitations under the License.
       <%= 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 "ScholarSphere's Deposit Agreement",
+      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 -->

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

@@ -238,7 +238,7 @@ var addthis_config = {"data_track_addressbar":true};
           <th>Related Files</th>
           <td>
               <% @generic_file.related_files.each do |f| %>
-                <dd><%= link_to(f.label, generic_file_url(f.noid)) %></dd>
+                <dd><%= link_to(f.label, sufia.generic_file_url(f.noid)) %></dd>
               <% end %>
           </td>
         </tr>

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

@@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 %>
 
-<% content_for :head do %>
+<% content_for :js_head do %>
 
-  <% javascript_include_tag 'bootstrap-tooltip.js'%>
-  <% javascript_include_tag 'bootstrap-popover.js'%>
+  <%= javascript_include_tag 'bootstrap-tooltip.js'%>
+  <%= javascript_include_tag 'bootstrap-popover.js'%>
 <% end %>
 
 <% content_for :local_js do %>

data/config/locales/sufia.en.yml

@@ -1,6 +1,13 @@
 en:
   sufia:
-    product_name: "ScholarSphere"
-    account_name: "Penn State Access Account Id"
-    institution_name: "Penn State"
+    product_name:       "ScholarSphere"
+    account_name:       "Penn State Access Account Id"
+    institution_name:   "Penn State"
+    deposit_agreement:  "ScholarSphere's Deposit Agreement"
+    upload_tooltip:     "Please accept Deposit Agreement before you can upload."
+    search:
+      form:
+        q:
+          label:        "Search Scholarsphere"
+          placeholder:  "Type keywords in here"
     

data/features/step_definitions/scholarsphere.rb

@@ -11,6 +11,8 @@
 # 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.
+require "cucumber/rspec/doubles"
+
 When /^I attach a file "([^"]*)" to the dynamically created "([^"]*)"$/ do |path, field|
   find(field).native.send_keys(File.expand_path(path, Rails.root))
 end
@@ -25,7 +27,7 @@ Given /^And I click within the anchor "(.*?)"$/ do |selector|
 end
 
 Given /^I have a mail server$/ do
-  ContactForm.any_instance.stubs(:deliver).returns(true)
+  ContactForm.any_instance.stub(:deliver).and_return(true)
 end
 
 Then /^I reset the mail server$/ do

data/features/support/paths.rb

@@ -47,7 +47,7 @@ module NavigationHelpers
     #   when /^(.*)'s profile page$/i
     #     user_profile_path(User.find_by_login($1))
     when /dashboard/
-      sufia.dashboard_path
+      sufia.dashboard_index_path
 
     when /the edit document page for (.*)$/i
       sufia.edit_catalog_path($1)

data/lib/sufia/generic_file.rb

@@ -19,7 +19,6 @@ module Sufia
     include Sufia::GenericFile::Audit
     include Sufia::GenericFile::Permissions
                                                 
-    @@FIELD_LABEL_MAP = {"based_near"=>"Location", 'description'=>"Abstract or Summary", 'tag'=>"Keyword", 'date_created'=>"Date Created", 'related_url'=>"Related URL"}
 
     included do
       has_metadata :name => "descMetadata", :type => GenericFileRdfDatastream
@@ -38,8 +37,6 @@ module Sufia
       around_save :characterize_if_changed, :retry_warming
 
       #make sure the terms of service is present and set to 1 before saving
-      # note GenericFile.create will no longer save a GenericFile as the terms_of_service will not be set
-      terms_of_service = nil
       validates_acceptance_of :terms_of_service, :allow_nil => false
     end
 
@@ -177,6 +174,8 @@ module Sufia
     end
 
     module ClassMethods
+     @@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?

data/lib/sufia/generic_file/characterization.rb

@@ -34,7 +34,7 @@ module Sufia
 
       ## Extract the metadata from the content datastream and record it in the characterization datastream
       def characterize
-        self.characterization.content = self.content.extract_metadata
+        self.characterization.ng_xml = self.content.extract_metadata
         self.append_metadata
         self.filename = self.label
         self.terms_of_service = '1'

data/lib/sufia/jobs/batch_update_job.rb

@@ -60,12 +60,12 @@ class BatchUpdateJob
       return
     end
     gf.title = title[gf.pid] if title[gf.pid] rescue gf.label
-    gf.update_attributes(file_attributes)
+    gf.attributes=file_attributes
     gf.set_visibility(visibility)
 
     save_tries = 0
     begin
-      gf.save
+      gf.save!
     rescue RSolr::Error::Http => error
       save_tries += 1
       logger.warn "BatchUpdateJob caught RSOLR error on #{gf.pid}: #{error.inspect}"

data/lib/sufia/version.rb

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

data/lib/tasks/resque.rake

@@ -1 +1,27 @@
-require 'resque/tasks'
+# 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.
+
+require 'resque/pool/tasks'
+
+# This provides access to the Rails env within all Resque workers
+task 'resque:setup' => :environment
+
+# Set up resque-pool
+task 'resque:pool:setup' do
+  ActiveRecord::Base.connection.disconnect!
+  Resque::Pool.after_prefork do |job|
+    ActiveRecord::Base.establish_connection
+    Resque.redis.client.reconnect
+  end
+end