sufia 4.0.0.rc1 → 4.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba41b878b539854a7ac45bdaa3e8e7eeef65e6ab
-  data.tar.gz: 1d4bc6af71c96d65611b48c2dbabf1bb87bef5be
+  metadata.gz: 88a671be1433e1c547df206f1ebb565b0f9f7f35
+  data.tar.gz: 4c2809c2f8252ba717431ecc9d32816722916d8e
 SHA512:
-  metadata.gz: ea0b45add59651469320fc050cc674fdce1688177a881489909019b39c18829d0dfcc9542db65ca86717a6643daebfc389c47e48a31b1ed9abef40ab39bbd455
-  data.tar.gz: 4f3743ffb78f0299458d0b473e32870c33ee8e08ea2e916567805148cc2b17d4f654fc6dcb4bfd255511b2f2adbf81924a74a6dc42b8ced54e15ff035135cd02
+  metadata.gz: c94f29af9b894337d7c6b6222c8371e3671b13aeb1d8d1fde54acb3858ca231b123102c3e452b23bc4c88339bcc7e0fe0c12f44bf6c76f8c3fa3e83578bee8c0
+  data.tar.gz: 5622829fa0cd2330279dad596a89cf01988e5865f86b4f05a2ccf375aaf7985d463215bdb1f3bc38fedb470dce6e9ec5c1652a96d430a4a9b9798bfbc508ad3b

data/.gitignore

@@ -97,3 +97,5 @@ public/system/
 
 ## Sitemap
 public/sitemap.xml
+
+./spec/internal

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
-  - "2.1.1"
-  - "2.0.0"
+  - 2.1
+  - 2.0
 env:
   global:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true

data/Gemfile

@@ -3,26 +3,18 @@ source 'https://rubygems.org'
 # Please see sufia.gemspec for dependency information.
 gemspec
 
-
 # Required for doing pagination inside an engine. See https://github.com/amatsuda/kaminari/pull/322
 gem 'kaminari', github: 'harai/kaminari', branch: 'route_prefix_prototype'
 gem 'sufia-models', path: './sufia-models'
-gem 'sass-rails', '~> 4.0.0'
+gem 'sass-rails', '~> 4.0.3'
 
 group :development, :test do
-  gem 'sqlite3'
-  gem 'rspec-rails', '~> 2.99'
-  gem 'launchy' unless ENV['TRAVIS']
-  gem 'byebug' unless ENV['TRAVIS']
-  gem 'capybara'
-  gem 'poltergeist'
-  gem "jettywrapper"
-  gem "factory_girl_rails"
-  gem "devise"
-  gem 'jquery-rails'
-  gem 'turbolinks'
-  gem "bootstrap-sass"
-  gem "simplecov", :require => false
-  gem "spring"
-  gem 'database_cleaner'
+  gem "simplecov", require: false
+  gem "byebug", require: false
 end # (leave this comment here to catch a stray line inserted by blacklight!)
+
+file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path("../spec/internal", __FILE__))
+if File.exists?(file)
+  puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
+  instance_eval File.read(file)
+end

data/README.md

@@ -2,7 +2,7 @@
 
 # Please Note!
 Sufia is currently in transition to a new 4.0 release scheduled for late summer 2014.  If wish to use Sufia now,
-please ensure you using version 3.7.2, available from RubyGems.org.  For documentation specific to this version,
+please ensure you using version 3.7.2, available from RubyGems.org. For documentation specific to this version,
 please consult the [Sufia 3.7.2 documentation](http://rubydoc.info/gems/sufia/3.7.2/frames).
 
 If you have questions or need help, please email `hydra-tech@googlegroups.com`
@@ -21,7 +21,7 @@ Sufia has the following features:
 * Version control
 * Characterization of uploaded files
 * Forms for batch editing metadata
-* Faceted search and browse (based on Blacklight)
+* Faceted search and browse
 * Social media interaction
 * User profiles
 * User dashboard for file management
@@ -31,7 +31,15 @@ Sufia has the following features:
 * Activity streams
 * Background jobs
 * Single-use links
-* Analytics
+* Google Analytics for usage statistics
+* Integration w/ cloud storage providers
+* Google Scholar-specific metadata embedding
+* Schema.org microdata, Open Graph meta tags, and Twitter cards for rich snippets
+* User-managed collections for grouping files
+* Full-text indexing & searching
+* Responsive, fluid, Bootstrap 3-based UI
+* Dynamically configurable featured works and researchers on homepage
+* Proxy deposit and transfers of ownership (coming soon!)
 
 ## Sufia needs the following software to work:
 1. Solr
@@ -57,7 +65,7 @@ Note the line with kaminari listed as a dependency.  This is a temporary fix to
 
 ### Run the sufia generator
 ```
-rails g sufia -f
+rails generate sufia:install -f
 ```
 
 ### Run the migrations
@@ -66,10 +74,10 @@ rails g sufia -f
 rake db:migrate
 ```
 
-### Get a copy of hydra-jetty
+### Get a copy of jetty (Solr and Fedora)
 ```
 rake jetty:clean
-rake jetty:config
+rake sufia:jetty:config
 rake jetty:start
 ```
 
@@ -84,9 +92,10 @@ Add this line:
 ```*= require_tree .```
 
 _Removing the require_tree from application.css will ensure you're not loading the blacklight.css.  This is because blacklight's css styling does not mix well with sufia's default styling._
+
 #### Modify app/assets/javascripts/application.js
 
-Add this line:
+Add this line at the bottom of the file:
 ```
 //= require sufia
 ```
@@ -200,8 +209,8 @@ Sufia provides a tag cloud on the home page.  To change which field is displayed
 ```ruby
 configure_blacklight do |config|
   ...
-  
-  # Specify which field to use in the tag cloud on the homepage.  
+
+  # Specify which field to use in the tag cloud on the homepage.
   # To disable the tag cloud, comment out this line.
   config.tag_cloud_field_name = Solrizer.solr_name("desc_metadata__tag", :facetable)
 end

data/Rakefile

@@ -1,9 +1,14 @@
 #!/usr/bin/env rake
 
-require "bundler/gem_tasks"
-Dir.glob('tasks/*.rake').each { |r| import r }
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+
+Bundler::GemHelper.install_tasks
 
-desc 'Run CI tests in Travis environment'
-task :travis => ['clean', 'ci']
+Dir.glob('tasks/*.rake').each { |r| import r }
+import 'sufia-models/lib/tasks/sufia-models_tasks.rake'
 
-task :default => [:travis]
+task default: :ci

data/SUFIA_VERSION

@@ -1 +1 @@
-4.0.0.rc1
+4.0.0.rc2

data/app/assets/javascripts/jquery.blacklightTagCloud.js

@@ -17,7 +17,7 @@
       var $tagCloud = $(this)
       $.ajax({url:"/catalog/facet/"+facet_name+".json"}).done(function(data) {
         data.response.facets.items.map(function(item) {
-          $tagCloud.append('<li rel="'+item.hits+'" title="'+item.value+'"><a href="/?f['+facet_name+'][]='+item.value+'">'+item.value+'</a><span class="badge facet-count">'+item.hits+'</span></li>');
+          $tagCloud.append('<li rel="'+item.hits+'" title="'+item.value+'"><a href="/catalog?f['+facet_name+'][]='+item.value+'">'+item.value+'&emsp;</a><span class="badge facet-count">'+item.hits+'</span></li>');
         });
         $tagCloud.tagcloud(options);
         $tagCloud.children().tsort({attr:'title', order:'asc'});

data/app/assets/javascripts/sufia.js

@@ -41,8 +41,10 @@
 //= require sufia/search
 //= require sufia/editor
 //= require sufia/ga_events
+//= require sufia/tabs
 //= require hydra/batch_select
 //= require sufia/dashboard_actions
+//= require sufia/batch
 //= require hydra_collections
 //= require browse_everything
 //= require jquery.blacklightTagCloud
@@ -95,25 +97,6 @@ Blacklight.onLoad(function() {
     });
   };
 
-  // show/hide more information on the dashboard when clicking
-  // plus/minus
-  $('.glyphicon-plus').on('click', function() {
-    var button = $(this);
-    //this.id format: "expand_NNNNNNNNNN"
-    var array = this.id.split("expand_");
-    if (array.length > 1) {
-      var docId = array[1];
-      $("#detail_" + docId + " .expanded-details").slideToggle();
-      button.toggleClass('glyphicon-plus glyphicon-minus');
-    }
-    return false;
-  });
-
-  $('#add_descriptions').click(function() {
-      $('#more_descriptions').show();
-      $('#add_descriptions').hide();
-      return false;
-  });
 
   $("a[rel=popover]").click(function() { return false;});
 
@@ -123,7 +106,7 @@ Blacklight.onLoad(function() {
   $(".tagcloud").blacklightTagCloud({
     size: {start: 0.9, end: 2.5, unit: 'em'},
     cssHooks: {granularity: 15},
-    // color: {start: '#cde', end: '#f52'}
+    color: {start: '#0F0', end: '#F00'}
   });
 
 
@@ -132,11 +115,11 @@ Blacklight.onLoad(function() {
    */
   $("li.expandable").click(function(){
     $(this).next("ul").slideToggle();
-    $(this).find('i').toggleClass("glyphicon glyphicon-chevron-down");
+    $(this).find('i').toggleClass("glyphicon-chevron-right glyphicon-chevron-down");
   });
 
   $("li.expandable_new").click(function(){
-    $(this).find('i').toggleClass("glyphicon glyphicon-chevron-down");
+    $(this).find('i').toggleClass("glyphicon-chevron-right glyphicon-chevron-down");
   });
 
   $(".sorts-dash").click(function(){

data/app/assets/javascripts/sufia/batch.js

@@ -0,0 +1,8 @@
+Blacklight.onLoad(function() {
+  $('#add_descriptions').click(function() {
+    $('#more_descriptions').show();
+    $('#add_descriptions').hide();
+    return false;
+  });
+  $('#more_descriptions').hide();
+});

data/app/assets/javascripts/sufia/batch_edit.js

@@ -108,7 +108,7 @@ function batch_edit_init () {
         $("#status_" + key).html("Changes Saved");
         $(save_button).removeAttr("disabled");
         $(outer_div).removeClass("loading");
-        $('#' + form_id).children([".control-group"]).removeClass('hidden')
+        $('#' + form_id).children([".form-group"]).removeClass('hidden')
     }
 
     function before_ajax(form_id) {
@@ -117,7 +117,7 @@ function batch_edit_init () {
         var outer_div = "#collapse_" + key;
         $(save_button).attr("disabled", "disabled");
         $(outer_div).addClass("loading");
-        $('#' + form_id).children([".control-group"]).addClass('hidden')
+        $('#' + form_id).children([".form-group"]).addClass('hidden')
     }
 
 
@@ -151,14 +151,30 @@ function batch_edit_init () {
         setTimeout(ajaxManager.runNow(), 100);
     }
 
+    function enable_show_hide_links() {
+        // Show/hide field details when clicking on a link with ID "expand_link_XXX".
+        // We expect to find an element named detail_XXX in addition to the expand_link_XXX.
+        // The "detail_XXX" element has the chevron icon.
+        $('.glyphicon-chevron-right-helper').on('click', function() {
+            var array = this.id.split("expand_link_");
+            if (array.length > 1) {
+                var docId = array[1];
+                $("#detail_" + docId + " .expanded-details").slideToggle();
+                var button = $("#expand_" + docId);
+                button.toggleClass('glyphicon-chevron-right glyphicon-chevron-down');
+            }
+            return false;
+        });
+    }
+
     $("#permissions_save").click(runSave);
     $(".field-save").click(runSave);
+    enable_show_hide_links();
 
 }
 
 
 
-
 // turbolinks triggers page:load events on page transition
 // If app isn't using turbolinks, this event will never be triggered, no prob.
 $(document).on('page:load', function() {

data/app/assets/javascripts/sufia/dashboard_actions.js

@@ -1,13 +1,26 @@
 Blacklight.onLoad(function() {
-    // toggle button on or off based on boxes being clicked
-    $(".batch_document_selector, .batch_document_selector_all").bind('click', function(e) {
-        var n = $(".batch_document_selector:checked").length;
-        if (n>0 || $('input#check_all')[0].checked) {
-            $('.sort-toggle').hide();
-        } else {
-            $('.sort-toggle').show();
-        }
+  // toggle button on or off based on boxes being clicked
+  $(".batch_document_selector, .batch_document_selector_all").bind('click', function(e) {
+    var n = $(".batch_document_selector:checked").length;
+    if (n>0 || ($('input#check_all').length && $('input#check_all')[0].checked)) {
+      $('.sort-toggle').hide();
+    } else {
+      $('.sort-toggle').show();
+    }
+  });
 
-    });
-});
+  // show/hide more information on the dashboard when clicking
+  // plus/minus
+  $('.glyphicon-chevron-right').on('click', function() {
+  var button = $(this);
+  //this.id format: "expand_NNNNNNNNNN"
+  var array = this.id.split("expand_");
+  if (array.length > 1) {
+    var docId = array[1];
+    $("#detail_" + docId + " .expanded-details").slideToggle();
+    button.toggleClass('glyphicon-chevron-right glyphicon-chevron-down');
+  }
+  return false;
+  });
 
+});

data/app/assets/javascripts/sufia/multiForm.js

@@ -6,7 +6,7 @@
     var settings = $.extend( { }, options);
 
     function addField() {
-      count = $(this).closest('.control-group').find('.controls').size();
+      count = $(this).closest('.form-group').find('input').size();
       var cloneId = this.id.replace("submit", "clone");
       var newId = this.id.replace("submit", "elements");
       var cloneElem = $('#'+cloneId).clone();
@@ -29,7 +29,7 @@
       textFields = cloneElem.find('input[type=text]')
       $.each(textFields, function(n, tf) {
         newName = $(tf).attr('name').replace('[0]', '['+count+']');
-        $(tf).attr('name', newName).attr("value", "").attr("required", false)
+        $(tf).attr('name', newName).val('').attr("required", false)
       })
 
       if (settings.afterAdd) {

data/app/assets/javascripts/sufia/permissions.js

@@ -44,9 +44,9 @@ Blacklight.onLoad(function() {
         return false;
       }
 
-      if ($('#new_user_name_skel').val() == $('#file_owner').html()) {
-        $('#permissions_error_text').html("Cannot change owner permissions.");
-        $('#permissions_error').show();
+      if ( ($('#new_user_name_skel').val()+$('.add-on').text()) == $('#file_owner').data('depositor') ) {
+        $('#permissions_error_text').html("Cannot change depositor permissions.");
+        $('#permissions_error').removeClass('hidden');
         $('#new_user_name_skel').val('');
         $('#new_user_name_skel').focus();
         return false;
@@ -54,12 +54,12 @@ Blacklight.onLoad(function() {
 
       if (!is_permission_duplicate($('#new_user_name_skel').val())) {
         $('#permissions_error_text').html("This user already has a permission.");
-        $('#permissions_error').show();
+        $('#permissions_error').removeClass('hidden');
         $('#new_user_name_skel').focus();
         return false;
       }
       $('#permissions_error').html();
-      $('#permissions_error').hide();
+      $('#permissions_error').addClass('hidden');
 
       var un = $('#new_user_name_skel').val();
       var perm_form = $('#new_user_permission_skel').val();
@@ -84,12 +84,12 @@ Blacklight.onLoad(function() {
 
       if (!is_permission_duplicate($('#new_group_name_skel').val())) {
         $('#permissions_error_text').html("This group already has a permission.");
-        $('#permissions_error').show();
+        $('#permissions_error').removeClass('hidden');
         $('#new_group_name_skel').focus();
         return false;
       }
       $('#permissions_error').html();
-      $('#permissions_error').hide();
+      $('#permissions_error').addClass('hidden');
       // clear out the elements to add more
       $('#new_group_name_skel').val('');
       $('#new_group_permission_skel').val('none');
@@ -118,7 +118,7 @@ Blacklight.onLoad(function() {
       var td2 = $(document.createElement('td'));
       var remove = $('<button class="btn close">X</button>');
 
-      $('#save_perm_note').show();
+      $('#save_perm_note').removeClass('hidden');
 
       $('#new_perms').append(td1);
       $('#new_perms').append(td2);
@@ -143,8 +143,9 @@ Blacklight.onLoad(function() {
 
   $('.remove_perm').on('click', function() {
      var top = $(this).parent().parent();
-     top.hide(); // do not show the block
+     top.addClass('hidden'); // do not show the block
      top.find('.select_perm')[0].options[0].selected= true; // select the first otion which is none
+     $('#save_perm_note').removeClass('hidden');
      return false;
 
   });

data/app/assets/javascripts/sufia/tabs.js

@@ -0,0 +1,20 @@
+Blacklight.onLoad(function () {
+  $('#homeTabs a, #myTab a').click(function (e) {
+    e.preventDefault();
+    $(this).tab('show');
+  });
+  $('#homeTabs a:first, #myTab a:first').tab('show'); // Select first tab
+
+  // Show the tabs in GenericFile#edit given an anchor
+  switch (window.location.hash.substring(1)) {
+    case 'versioning_display':
+      $('#edit_versioning_link a').tab('show');
+      break;
+    case 'descriptions_display':
+      $('#edit_descriptions_link a').tab('show');
+      break;
+    case 'permissions_display':
+      $('#edit_permissions_link a').tab('show');
+      break;
+  }
+});

data/app/assets/stylesheets/catalog.css.scss

@@ -0,0 +1,5 @@
+// makes it so images don't bleed into the content on the right
+.catalog img {
+  max-width: 100%;
+  max-height: auto;
+}

data/app/assets/stylesheets/collections.css.scss

@@ -0,0 +1,40 @@
+.collection_description {
+  color: #333;
+  font-family: 'Lato', Verdana, Arail, Helvetica, sans-serif;
+  font-size: 1.15em;
+  font-weight: 300;
+  line-height: 1.25em;
+  letter-spacing: .10em;
+}
+
+.metadata-collections dt {
+  float: left;
+  margin-right: 1em;
+}
+
+.collection-icon, .collection-icon-search, .collection-icon-small {
+  font-size: 12vw;
+  color: #fab801;
+  padding: 15px 0 0 10px;
+}
+
+.collection-icon-search {
+  font-size: 10vw;
+}
+
+.collection-icon-small {
+  font-size: 2vw;
+}
+
+
+.actions-controls-collections {
+  display: block;
+  margin: 1em 0 0 1em;
+}
+
+.actions-controls-collections a:link,
+.actions-controls-collections a:visited,
+.actions-controls-collections a:hover {
+  color: #FFF;
+  text-align: center;
+}