sufia 6.0.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2796b98ae30851164de5f1e0c2e39dcc91dda839
-  data.tar.gz: f4e1fa1b7eebf06bfca330f1f08373cd2931142b
+  metadata.gz: afe7739c6421450db9e6d2f9651152c8d4ff0624
+  data.tar.gz: 08b718c691ae8e6813f928d57efaeb3d2265151b
 SHA512:
-  metadata.gz: 2e10c49d8a7e0b075abdff71ca943189497c6c7dce4746dfc418604777405dd78d56e4142c0de6e261e2997c98e94630ca246d59ae2b5af8331ec15eea216d02
-  data.tar.gz: b135eb633c321d549b2b510e66a68cc814a45ff5d3ed19b6b3f7f0b216ebd7c95dded451bdb4728ab35309bf1afc5da46f374302501917792529e3c75eed6d79
+  metadata.gz: a5e5252d70908e42cdd09137947531a696f05bc4b7ab23989cf47774e25597415566c649333efdbb1e65d9f981f08206cb9a1ce68ca7c2199754cf7e910ef78f
+  data.tar.gz: ba76310232b867f0e7bc6bba3dcc16ec1282b7d912b940e2f206cac7b068a38a43b4c8d8b1008aa6639e7a3dff86b3e757bf2be1f1fe0e37f385c9f1fb327701

data/.travis.yml

@@ -6,15 +6,12 @@ rvm:
 matrix:
   include:
     - rvm: 2.1
-      env: "RAILS_VERSION=4.1.8"
+      env: "RAILS_VERSION=4.2.1"
 env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
-
   matrix:
-    - "RAILS_VERSION=4.1.8"
-    - "RAILS_VERSION=4.2.1"
-
+    - "RAILS_VERSION=4.2.2"
 notifications:
   email:
     recipients:

data/CONTRIBUTING.md

@@ -81,16 +81,16 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
 [Detailed Walkthrough of One Pull Request per Commit](http://ndlib.github.io/practices/one-commit-per-pull-request/)
 
 * Read the article ["Using Pull Requests"](https://help.github.com/articles/using-pull-requests) on GitHub.
+* Squash the commits for your branch into one commit
+  * `git rebase --interactive HEAD~<number-of-commits>` ([See Github help](https://help.github.com/articles/interactive-rebase))
+  * To determine the number of commits on your branch: `git log master..<your-branch> --oneline | wc -l`
+  * Squashing your branch's changes into one commit is "good form" and helps the person merging your request to see everything that is going on.
 * Make sure your branch is up to date with its parent branch (i.e. master)
   * `git checkout master`
   * `git pull --rebase`
   * `git checkout <your-branch>`
   * `git rebase master`
   * It is likely a good idea to run your tests again.
-* Squash the commits for your branch into one commit
-  * `git rebase --interactive HEAD~<number-of-commits>` ([See Github help](https://help.github.com/articles/interactive-rebase))
-  * To determine the number of commits on your branch: `git log master..<your-branch> --oneline | wc -l`
-  * Squashing your branch's changes into one commit is "good form" and helps the person merging your request to see everything that is going on.
 * Push your changes to a topic branch in your fork of the repository.
 * Submit a pull request from your fork to the project.
 

data/Gemfile

@@ -6,11 +6,12 @@ gemspec
 # Required for doing pagination inside an engine. See https://github.com/amatsuda/kaminari/pull/322
 gem 'kaminari', github: 'jcoyne/kaminari', branch: 'sufia'
 gem 'sufia-models', path: './sufia-models'
-gem 'slop', '~> 3.6.0' # This just helps us generate a valid Gemfile.lock when Rails 4.2 is installed (which requires byebug which has a dependency on slop)
+gem 'slop', '~> 4.2' # This just helps us generate a valid Gemfile.lock when Rails 4.2 is installed (which requires byebug which has a dependency on slop)
 
 group :development, :test do
   gem "simplecov", require: false
   gem 'byebug' unless ENV['CI']
+  gem 'coveralls', require: false
 end
 
 file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path("../spec/internal", __FILE__))

data/History.md

@@ -1,5 +1,74 @@
 # History of Sufia releases
 
+## 6.1.0
+
+ * Making the image thumbnail alt tag empty for better accessibility, since there is more information about title and description in the result. [Michael Tribone]
+ * Changing to make sure we have a current_user before comparing the id [Carolyn Cole]
+ * Update outdated dependencies to make Gemnasium green. [Michael J. Giarlo]
+ * checking for members and saved before querying solr.  fixes #1216 [Carolyn Cole]
+ * Remove has_many_versions because it doesn't have any effect [Justin Coyne]
+ * Fixes accessibility issues with labels and form elements in add to collection modal [Michael Tribone]
+ * Fixes HTML source order, adds ARIA roles, and skip to content link for better accessibility. [Michael Tribone]
+ * Removes old icon and replaces it with SVG when searching in collections [mtribone]
+ * Fixes vertical overflow of popover helper and small height for files to be changed. [mtribone]
+ * Support collection size calculations using a Solr query instead of loading each file sequentially. This should greatly improve performance and has been tested on collections with thousands of GenericFiles effectively [Nathan Rogers]
+ * Enable coveralls and update badge per coveralls.io instructions [Michael J. Giarlo]
+ * Remove logic around user groups from ability methods. [Michael J. Giarlo]
+ * removing unecissary local variables identified by rubocop [Carolyn Cole]
+ * Remove unused test helpers [Justin Coyne]
+ * Handle unauthorized access to DepositorsController The test was expecting some kind of error and it was receiving ActionController::UrlGenerationError. This was caused by the default access denied error redirecting to the `show` action which doesn't exist for this particular controller.  This commit overrides the default error handling code and updates the tests. [Justin Coyne]
+ * Remove duplicate poltergeist setup [Justin Coyne]
+ * Upgrade the tested versions of Rails to the latest [Justin Coyne]
+ * replaced Rspec.describe with describe in featured_item_spec [luisgreg99]
+ * Stop supporting Rails 4.1 [Justin Coyne]
+ * Update CONTRIBUTING.md [Michael J. Giarlo]
+ * added narrower selector for show actions partial [luisgreg99]
+ * Fix up JS a little. [Trey Terrell]
+ * updated featured_works and featured_works_controller [luisgreg99]
+ * Aligning the end of a block with the beginning of the block as pointed out by rubocop [Carolyn Cole]
+ * Fixes contrast issues with font color and badge color in the statistics [mtribone]
+ * Refactors CSS to use label-default link and improves text/label visibility [mtribone]
+ * Surrounding regular expressions being passed to a method by parens to distiguish them from division [Carolyn Cole]
+ * removing useless assignemnt to sanatize_text varriable [Carolyn Cole]
+ * Removing space after let before the paren: 'let(' instead of 'let (' [Carolyn Cole]
+ * Removing unused mailboxer init. refs #1174 [Carolyn Cole]
+ * Adding admin stats to sufia by copying them from ScholarSphere [Carolyn Cole]
+ * Adding user email list rake task.  fixes #1060 [Carolyn Cole]
+ * Refactors CSS to keep defaults intact and more specifically  target .remove [mtribone]
+ * Adding clamav generator to master install and as a separate action. refs #1174 [Carolyn Cole]
+ * Making the user stats reporter more robust to the intermittent errors returned by google analytics [Carolyn Cole]
+ * Fixes background color of facet X when filtering. Collision with .remove class #136 [mtribone]
+ * Allow the GenericFile show page to be loaded exclusively from solr [Carolyn Cole]
+ * Adding a coffescript test for testing the terms of service javascript and single use link javascript Updated the spec runner to not fail on multiples of 10 and to output the number of jasmine tests run on passing to make it more transparant how many jasmine tests are running. [Carolyn Cole]
+ * Adding a configurable sleep to retry unless.  default is set to zero or no sleep to not change the original behavior. fixes #1059 [Carolyn Cole]
+ * Moving where the edit permissions are so that the my controller will filter for only items I have edit access to.  fixes #1061 [Carolyn Cole]
+ * Integrating jasmine with rspec and adding simple jasmine tests [Carolyn Cole]
+ * Adding in jasmine and it's generated files, and jasmine-jquery [Carolyn Cole]
+ * Resque jobs should be namespaced appropriately under Passenger. Fixes #1131 [Michael J. Giarlo]
+ * Add Zotero integration [Michael J. Giarlo]
+ * Remove hash trackers in addressbar. Fixes #1051. [Anna Headley]
+ * Fix terms of service feature test. [Anna Headley]
+ * Uses correct file date when collecting analytics [Hector Correa]
+ * Add spec to show how to override validations. [Trey Terrell]
+ * Use an overridable method instead of a constant. [Trey Terrell]
+ * Get rid of deprecation warnings on ActiveFedora 9.1 [Justin Coyne]
+ * Update follower and following message [Adam Wead]
+ * Update the test matrix to the latest versions of rails. [Justin Coyne]
+ * Upgrade to AF 9.1 and prevent deprecations [Justin Coyne]
+ * Sufia shouln't have its own copy of sufia-models. Fixes #1035 [Justin Coyne]
+ * update toc with Admin Users change [E. Lynette Rayle]
+ * add instructions for creating an admin user [E. Lynette Rayle]
+ * Fix alignment of dropdown menu [Adam Wead]
+ * Prevent user profile page from crashing if a file listed as a trophy does not exist in Fedora. We log the error instead. [Hector Correa]
+ * Use binary mode when downloading jars from maven [Chris Beer]
+ * Fixes bug in batch edit when users only changes the permissions of the files. [Hector Correa]
+ * Fix typo in README [Michael J. Giarlo]
+ * fixes #1023 faulty test for showing the correct collection [Tricia Jenkins]
+ * Download full-text jars via HTTPS, else the task winds up downloading a bunch of 161-byte HTML files with 302 FOUND in them [Michael J. Giarlo]
+ * Noid service extracted out into its own gem [Michael J. Giarlo]
+ * Correct version of Sufia in README [Michael J. Giarlo]
+
+
 ## 6.0.0
 
 * Replace pid with id in config [Adam Wead]

data/README.md

@@ -1,4 +1,3 @@
-[![Stories in Ready](https://badge.waffle.io/projecthydra/sufia.png?label=ready&title=Ready)](https://waffle.io/projecthydra/sufia)
 # Sufia
 
 [![Version](https://badge.fury.io/rb/sufia.png)](http://badge.fury.io/rb/sufia)
@@ -7,7 +6,8 @@
 [![API Docs](http://img.shields.io/badge/API-docs-blue.svg)](http://rubydoc.info/gems/sufia)
 [![Build Status](https://travis-ci.org/projecthydra/sufia.png?branch=master)](https://travis-ci.org/projecthydra/sufia)
 [![Dependency Status](https://gemnasium.com/projecthydra/sufia.png)](https://gemnasium.com/projecthydra/sufia)
-[![Coverage Status](https://img.shields.io/coveralls/projecthydra/sufia.svg)](https://coveralls.io/r/projecthydra/sufia?branch=master)
+[![Coverage Status](https://coveralls.io/repos/projecthydra/sufia/badge.svg)](https://coveralls.io/r/projecthydra/sufia)
+[![Stories in Ready](https://badge.waffle.io/projecthydra/sufia.png?label=ready&title=Ready)](https://waffle.io/projecthydra/sufia)
 
 # Table of Contents
 
@@ -31,9 +31,13 @@
     * [Analytics and usage statistics](#analytics-and-usage-statistics)
       * [Capturing usage](#capturing-usage)
       * [Displaying usage in the UI](#displaying-usage-in-the-ui)
+    * [Zotero integration](#zotero-integration)
     * [Tag Cloud](#tag-cloud)
     * [Customizing metadata](#customizing-metadata)
     * [Proxies and Transfers (Sufia 4.x only)](#proxies-and-transfers-sufia-4x-only)
+    * [Admin Users](#admin-users)
+      * [One time setup for first admin](#one-time-setup-for-first-admin)
+      * [Adding an admin user](#adding-an-admin-user)
   * [License](#license)
   * [Contributing](#contributing)
   * [Development](#development)
@@ -75,6 +79,7 @@ Sufia has the following features:
 * Responsive, fluid, Bootstrap 3-based UI
 * Dynamically configurable featured works and researchers on homepage
 * Proxy deposit and transfers of ownership
+* Integration with Zotero for automatic population of user content
 
 # Help
 
@@ -128,7 +133,7 @@ rails new my_app
 Add the following lines to your application's Gemfile.
 
 ```
-gem 'sufia', '6.0.0.rc4'
+gem 'sufia', '6.0.0'
 gem 'kaminari', github: 'jcoyne/kaminari', branch: 'sufia'  # required to handle pagination properly in dashboard. See https://github.com/amatsuda/kaminari/pull/322
 ```
 
@@ -270,6 +275,36 @@ Lastly, you will need to set `config.analytics = true` and `config.analytic_star
 has the proper access within your Google Analyics account.  To do so, go to the _Admin_ tab for your Google Analytics account.
 Click on _User Management_, in the _Account_ column, and add "Read & Analyze" permissions for the OAuth client email address.
 
+## Zotero integration
+
+Integration with Zotero-managed publications is possible using [Arkivo](https://github.com/inukshuk/arkivo). Arkivo is a Node-based Zotero subscription service that monitors Zotero for changes and will feed those changes to your Sufia-based app. [Read more about this work.](https://www.zotero.org/blog/feeds-and-institutional-repositories-coming-to-zotero/)
+
+To enable Zotero integration, first [register an OAuth client with Zotero](https://www.zotero.org/oauth/apps), then [install and start Arkivo-Sufia](https://github.com/inukshuk/arkivo-sufia) and then generate the Arkivo API in your Sufia-based application:
+
+```
+rails g sufia:models:arkivo_api
+```
+
+The generator does the following:
+
+* Enables the API in the Sufia initializer
+* Adds a database migration
+* Creates a routing constraint that allows you to control what clients can access the API
+* Copies a config file that allows you to specify the host and port Arkivo is running on
+* Copies a config file for your Zotero OAuth client credentials
+
+Update your database schema with `rake db:migrate`.
+
+Add unique Arkivo tokens for each of your existing user accounts with `rake sufia:user:tokens`. (New users will have tokens created as part of the account creation process.)
+
+Edit the routing constraint in `config/initializers/arkivo_constraint.rb` so that your Sufia-based app will allow connections from Arkivo. **Make sure this is restrictive as you are allowing access to an API that allows creates, updates and deletes.**
+
+Tweak `config/arkivo.yml` to point at the host and port your instance of Arkivo is running on.
+
+Tweak `config/zotero.yml` to hold your Zotero OAuth client key and secret. Alternatively, if you'd rather not paste these into a file, you may use the environment variables `ZOTERO_CLIENT_KEY` and `ZOTERO_CLIENT_SECRET`.
+
+Restart your app and it should now be able to pull in Zotero-managed publications on behalf of your users.  Each user will need to link their Sufia app account with their Zotero accounts, which can be done in the "Edit Profile" page. After the accounts are linked, Arkivo will create a subscription to that user's Zotero-hosted "My Publications" collection. When users add items to their "My Publications" collection via the Zotero client, they will automatically be pushed into the Sufia-based repository application. Updates to these items will trigger updates to item metadata in your app, and deletes will delete the files from your app.
+
 ## Tag Cloud
 
 Sufia provides a tag cloud on the home page.  To change which field is displayed in that cloud, change the value of `config.tag_cloud_field_name` in the `blacklight_config` section of your CatalogController.  For example:
@@ -296,6 +331,51 @@ Chances are you will want to customize the default metadata provided by Sufia.
 
 To add proxies and transfers to your **Sufia 4**-based app, run the 'sufia:models:proxies' generator and then run 'rake db:migrate'.  If you're already running Sufia 5 or 6, this is already added and you may skip this step.
 
+## Admin Users
+
+### One time setup for first admin
+
+Follow the directions for installing hydra-role-management.
+
+Add the following gem to Sufia installed app's Gemfile
+```
+gem "hydra-role-management"
+```
+
+### Adding an admin user
+
+In rails console, run the following commands to create the admin role.
+```
+r = Role.create name: "admin"
+```
+
+Add a user as the admin.
+```
+r.users << User.find_by_user_key( "your_admin_users_email@fake.email.org" )
+r.save
+```
+
+Confirm user was made an admin.
+```
+u = User.find_by_user_key( "your_admin_users_email@fake.email.org" )
+u.admin?
+  # shows SELECT statment
+ => true
+
+if u.admin? == true then SUCCESS
+```
+
+Confirm in browser
+
+* go to your Sufia install
+* login as the admin user
+* add /roles to the end of the main URL
+
+SUCCESS will look like...
+
+* you don't get an error on the /roles page
+* you see a button labeled "Create a new role"
+
 # License
 
 Sufia is available under [the Apache 2.0 license](LICENSE.md).
@@ -312,7 +392,7 @@ This information is for people who want to modify the engine itself, not an appl
 
 [Install the gh-md-toc tool](https://github.com/ekalinin/github-markdown-toc/blob/master/README.md#installation), then ensure your README changes are up on GitHub, and then run:
 
-`gh-md-toc https://github.com/USERNAME/sufia/blog/BRANCH/README.md`
+`gh-md-toc https://github.com/USERNAME/sufia/blob/BRANCH/README.md`
 
 That will print to stdout the new TOC, which you can copy into `README.md`, commit, and push.
 

data/SUFIA_VERSION

@@ -1 +1 @@
-6.0.0
+6.1.0

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

@@ -31,20 +31,37 @@ function dragAndDrop(selector) {
 }
 
 Blacklight.onLoad(function() {
-  $('a[data-behavior="feature"]').on('click', function(evt) {
+  $('#show_actions').on('click', 'a[data-behavior="feature"]', function(evt) {
     evt.preventDefault();
+    evt.stopPropagation();
     anchor = $(this);
     $.ajax({
        url: anchor.attr('href'),
        type: "post",
        success: function(data) {
-         anchor.before("Featured");
+         anchor.before('<a data-method="post" data-behavior="unfeature-page" href="'+anchor.attr('href')+'">Unfeature</a>');
          anchor.remove();
        }
     });
   });
 
-  $('a[data-behavior="unfeature"]').on('click', function(evt) {
+  $('#show_actions').on('click', 'a[data-behavior="unfeature-page"]', function(evt) {
+    evt.preventDefault();
+    evt.stopPropagation();
+    anchor = $(this);
+    $.ajax({
+       url: anchor.attr('href'),
+       type: "post",
+       data: {"_method":"delete"}, 
+       success: function(data) {
+         anchor.before('<a data-method="post" data-behavior="feature" href="'+anchor.attr('href')+'">Feature</a>');
+         anchor.remove();
+       }
+    });
+  });
+
+
+  $('#featured_works').on('click', 'a[data-behavior="unfeature"]', function(evt) {
     evt.preventDefault();
     anchor = $(this);
     $.ajax({

data/app/assets/stylesheets/generic_files.css.erb

@@ -20,7 +20,7 @@ label.error { float: left; color: red; padding-left: .5em; vertical-align: top;
 #upload_tooltip { background: #ff0; padding: 5px; border: 1px solid #ddd; position: absolute; }
 
 .fileHeight {
-  max-height: 50px
+  max-height: 8em;
 }
 
 .scrollx {
@@ -28,7 +28,7 @@ label.error { float: left; color: red; padding-left: .5em; vertical-align: top;
 }
 
 .scrolly {
-  overflow-y: auto;
+  overflow-y: visible;
 }
 
 h2 small {

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

@@ -18,7 +18,7 @@
 @import 'sufia/settings', 'sufia/header', 'sufia/styles', 'sufia/file-listing',
         'sufia/collections', 'sufia/batch-edit', 'sufia/dashboard', 'sufia/home-page',
         'sufia/featured', 'sufia/tagcloud', 'sufia/usage-stats', 'sufia/catalog', 'sufia/buttons',
-        'sufia/tinymce', 'sufia/proxy-rights', 'sufia/file-show';
+        'sufia/tinymce', 'sufia/proxy-rights', 'sufia/file-show', 'sufia/modal';
 @import 'hydra-editor/multi_value_fields';
 
 #browse-everything {
@@ -38,7 +38,7 @@
   padding-top: 10px;
 }
 
-.profile img.orcid {
+.profile img.profile {
   float: left;
   margin-right: 2px;
 }

data/app/assets/stylesheets/sufia/_buttons.scss

@@ -35,12 +35,12 @@ ul.listing .add, ul.listing .remove {
   }
 }
 
-.remove, .btn-danger {
+span.appliedFilter .remove, .btn-danger {
   background-color: $remove-background-color;
   border-color: $remove-border-color;
   color: $remove-text-color;
 }
-.remove:hover, .remove:focus,
+span.appliedFilter .remove:hover, span.appliedFilter .remove:focus,
 .btn-danger:hover, .btn-danger:focus {
   background-color: $remove-background-hover;
   border-color: $remove-border-color;

data/app/assets/stylesheets/sufia/_collections.scss

@@ -39,7 +39,7 @@
 }
 
 .collection-icon-search {
-  padding: 15px 0 0 10px;
+  padding: 0;
 }
 
 .collection-icon-small {
@@ -56,9 +56,9 @@
   margin: 1em 0 0 1em;
 }
 
-.actions-controls-collections a:link,
-.actions-controls-collections a:visited,
-.actions-controls-collections a:hover {
+.label-default a:link,
+.label-default a:visited,
+.label-default a:hover {
   color: #FFF;
   text-align: center;
 }

data/app/assets/stylesheets/sufia/_dashboard.scss

@@ -21,7 +21,7 @@
   .badge-optional {
     background-color: $badge-optional-background-color;
     border-radius: 2px;
-    color: $badge-font-color;
+    color: $badge-optional-font-color;
     padding: 0 .25em;
   }
   .views-downloads-dashboard {

data/app/assets/stylesheets/sufia/_file-listing.scss

@@ -1,3 +1,6 @@
+div.facets h3 {
+  font-size: 1.4em;
+}
 h4 .small {
   color: $navbar-default-toggle-icon-bar-bg;
 }

data/app/assets/stylesheets/sufia/_modal.scss

@@ -0,0 +1,4 @@
+div.collection-list legend {
+  font-size: 1.4em;
+  border: none;
+}

data/app/assets/stylesheets/sufia/_settings.scss

@@ -16,7 +16,7 @@ $brown-light: #D2B48C;
 $classic-white: #FFF;
 $cream-light: #FCFBF7;
 $gray-dark: #333;
-$gray-med-dark: #888;
+$gray-med-dark: #666;
 $gray-medium: #CECDCD;
 $gray-light: #DDD;
 $gray-lighter: #E1E1E1;
@@ -29,8 +29,9 @@ $red-orange: #D6562B;
 
 // Dashboard
 $badge-background-color: $highlight-yellow;
-$badge-optional-background-color: $gray-medium;
-$badge-font-color: $classic-white;
+$badge-optional-background-color: $gray-med-dark;
+$badge-font-color: $basic-black;
+$badge-optional-font-color: $classic-white;
 
 $content-wrapper-background-color: $cream-light;