sufia 6.2.0 → 6.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5983e2ea047b6ee6b08ef678cb233a8f20b68a3
-  data.tar.gz: 73adb6f66582d0b1021d0addba02efb4e15ee8ca
+  metadata.gz: e188410a3abce213d0a71c5d20f29852e272845a
+  data.tar.gz: 83e3218b65097ce2757367f6864f13e0fc3293b3
 SHA512:
-  metadata.gz: e378ea0a2b5e17b0f86ab170c276d92863a8933468c4b5af31e472b2d226a096f9f9475e51a41ce3f9f9523df83f069c0605f24a08973888f79b425943cf0db7
-  data.tar.gz: b4e5438fbd558768b324b336a5c1d9b0194c44c56360c66069bfee3d38bac696998d1115160194a150e9832cd9ee3297f1ec18bbfc3a43bb0ea9282693724938
+  metadata.gz: 6f0b3722d9e23c720e42d8f2cf9856984e2b7d6408484effce030256dd97314193c7f7b2fcbfbd9bb01c4b1c61f4d141ab80de6c9960f7b6c5b7be846a31abe2
+  data.tar.gz: fb33d7ec4280f2fc544b9d43599aeaa3671d1ac92b1e208ea2d39bf4b82aa0d97df80c91c2a46a2415e7d367d310d4a85152a1ad704f1db4332cf6fdb2d833de

data/.rubocop.yml

@@ -0,0 +1,146 @@
+require: rubocop-rspec
+
+AllCops:
+  RunRailsCops: true
+  DisplayCopNames: true
+  Include:
+    - '**/Rakefile'
+    - '**/config.ru'
+  Exclude:
+    - 'db/**/*'
+    - 'script/**/*'
+    - 'vendor/**/*'
+    - 'spec/internal/**/*'
+    - 'sufia-models/app/models/concerns/sufia/generic_file/export.rb'
+
+Metrics/LineLength:
+  Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Exclude:
+    - 'lib/sufia/arkivo/metadata_munger.rb'
+    - 'sufia-models/app/services/sufia/generic_file_audit_service.rb'
+    - 'app/controllers/concerns/sufia/files_controller_behavior.rb'
+    - 'app/helpers/sufia/sufia_helper_behavior.rb'
+
+Metrics/PerceivedComplexity:
+  Exclude:
+    - 'sufia-models/app/services/sufia/generic_file_audit_service.rb'
+    - 'app/controllers/concerns/sufia/files_controller_behavior.rb'
+    - 'app/helpers/sufia/sufia_helper_behavior.rb'
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/ClassLength:
+  Exclude:
+    - 'lib/generators/sufia/templates/catalog_controller.rb'
+    - 'sufia-models/app/models/datastreams/fits_datastream.rb'
+    - 'sufia-models/app/actors/sufia/generic_file/actor.rb'
+
+Metrics/ModuleLength:
+  Exclude:
+    - 'app/controllers/concerns/sufia/users_controller_behavior.rb'
+    - 'app/controllers/concerns/sufia/files_controller_behavior.rb'
+    - 'app/helpers/sufia/sufia_helper_behavior.rb'
+
+Style/BlockDelimiters:
+  Exclude:
+    - 'spec/**/*'
+
+Style/BlockEndNewline:
+  Exclude:
+    - 'spec/**/*'
+
+Style/MultilineBlockLayout:
+  Exclude:
+    - 'spec/**/*'
+
+Style/IndentationConsistency:
+  EnforcedStyle: rails
+
+Style/CollectionMethods:
+  PreferredMethods:
+    collect: 'map'
+    collect!: 'map!'
+    inject: 'reduce'
+    detect: 'find'
+    find_all: 'select'
+
+Style/WordArray:
+  Enabled: false
+
+Style/RegexpLiteral:
+  Enabled: false
+
+Style/StringLiterals:
+  Enabled: false
+
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/HashSyntax:
+  Exclude:
+    - 'lib/generators/sufia/templates/catalog_controller.rb'
+
+Style/LineEndConcatenation:
+  Exclude:
+    - 'spec/test_app_templates/lib/generators/**/*'
+    - 'sufia-models/lib/generators/**/*'
+
+Style/PredicateName:
+  Exclude:
+    - 'app/helpers/sufia/sufia_helper_behavior.rb'
+    - 'app/controllers/concerns/sufia/controller.rb'
+
+Style/GlobalVars:
+  Exclude:
+    - 'spec/**/*'
+    - 'spec/jobs/event_jobs_spec.rb'
+    - 'sufia-models/lib/generators/sufia/models/templates/config/redis_config.rb'
+    - 'sufia-models/lib/sufia/models/active_record/redis.rb'
+    - 'sufia-models/lib/sufia/models/active_fedora/redis.rb'
+
+Style/SingleLineBlockParams:
+  Enabled: false
+
+Style/ClassVars:
+  Exclude:
+    - 'sufia-models/lib/sufia/models.rb'
+    - 'sufia-models/lib/sufia/models/engine.rb'
+
+Style/SignalException:
+  Enabled: false
+
+Rails/Output:
+  Exclude:
+    - 'lib/generators/**/*'
+    - 'sufia-models/lib/generators/**/*'
+
+Rails/Date:
+  Enabled: false
+
+Rails/TimeZone:
+  Enabled: false
+
+RSpec/FilePath:
+  Enabled: false
+
+RSpec/InstanceVariable:
+  Enabled: false
+
+RSpec/DescribeClass:
+  Exclude:
+    - 'spec/javascripts/jasmine_spec.rb'
+    - 'spec/tasks/rake_spec.rb'
+    - 'spec/jobs/event_jobs_spec.rb'
+    - 'spec/features/**/*'
+    - 'spec/views/**/*'
+    - 'spec/routing/**/*'
+    - 'spec/inputs/**/*'

data/.travis.yml

@@ -6,18 +6,13 @@ rvm:
 matrix:
   include:
     - rvm: 2.1
-      env: "RAILS_VERSION=4.2.1"
+      env: "RAILS_VERSION=4.2.3"
 env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
   matrix:
-    - "RAILS_VERSION=4.2.2"
+    - "RAILS_VERSION=4.2.3"
 notifications:
-  email:
-    recipients:
-      - "ul-dlt-hydra@lists.psu.edu"
-    on_success: "change"
-    on_failure: "always"
   irc:
     channels:
       - "irc.freenode.org#scholarsphere"
@@ -26,3 +21,5 @@ notifications:
       - "%{repository}//%{branch}@%{commit} by %{author}: %{message} - %{build_url}"
 services:
   - redis-server
+before_script:
+  - jdk_switcher use oraclejdk8

data/Gemfile

@@ -12,6 +12,8 @@ group :development, :test do
   gem "simplecov", require: false
   gem 'byebug' unless ENV['CI']
   gem 'coveralls', require: false
+  gem 'rubocop', require: false
+  gem 'rubocop-rspec', 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,34 @@
 # History of Sufia releases
 
+## 6.3.0
+
+* Fix problems with single use download links. [Olli Lyytinen]
+* Use ActiveFedora::Noid 1.0 and surface its config in the Sufia config. [Michael J. Giarlo]
+* Do not use hard-coded paths to URLs in the navbar. [Michael J. Giarlo]
+* Fixes 2 label issue for radio button and better accessibility compliance. [mtribone]
+* Tweak link text and switch Bootstrap icon to span. [mtribone]
+* Fixed open alt tag that I incorrectly set previously to address accessibility [mtribone]
+* Obey rubocop 0.33. [Michael J. Giarlo]
+* Unregistered users should have the ability to see file citations [Michael J. Giarlo]
+* After a week of training on "Practical Object-Oriented Design" with Sandi Metz @cam156 @awead and I decided to take a stab at refactoring a small piece of functionality with some of the ideas that we learned. [Hector Correa]
+* Build a Rubocop config file that matches our community's styles. Allow Rubocop to autocorrect where possible. Correct style exceptions. [Michael J. Giarlo]
+* Fixing audit service since audit no longer exists on the GenericFile [Carolyn Cole]
+* Reload the object in the imprt url job after loading in the file incase another job has modified the object in the while the data was being copied [Carolyn Cole]
+* Refactor the controller test to assume the ingest job is already tested [Carolyn Cole]
+* Adding an announcement editable content block to the home page [Carolyn Cole]
+* Adding object type and facte count to get all the files deposited by all users, not just all the objects deposited by the top 10 users [Carolyn Cole]
+* Adds mention of Java 8 prerequisite for hydra-jetty. Fixes #1253 [kerchner]
+* Fixes Bootstrap columns to allow caret to remain with text for batch editing. [mtribone]
+* Makes the edit actions under thumbnail match browse view [mtribone]
+* Fixes dropdown menu from being hidden on small devices 767px or smaller [mtribone]
+* Update README.md [E. Lynette Rayle]
+* Moving admin stats controller to a behavior so it can be overriden in the main app [Carolyn Cole]
+* Swaps order of heading and sort, adjusts spacing of gallery display, and adds Bootstrap columns for structure [mtribone]
+* Test on CI with the latest JDK and the latest Rails [Michael J. Giarlo]
+* Updates README for v6.2.0. [Andrew Myers]
+* Our librarians wants to be able to edit the labels.  There is no real need to have the headings around and hard coded. [Carolyn Cole]
+* Show deposits between a date range by users.  fixes #1188 [Carolyn Cole]
+
 ## 6.2.0
 
 * Check to make sure Zotero integration is enabled before asking user instances if they have a Zotero user ID. Fixes #1235 [Michael J. Giarlo]
@@ -372,7 +401,6 @@
 * Merge travis config change to speed up the build [Michael J. Giarlo]
 * Adding the browse view link into the bread crumbs so it shows on both the edit and the stats page. [Carolyn Cole]
 
-
 ## 4.3.1
 
 * Adds an ORCID field to the user model. [Michael J. Giarlo]

data/README.md

@@ -1,12 +1,13 @@
 # Sufia
 
 [![Version](https://badge.fury.io/rb/sufia.png)](http://badge.fury.io/rb/sufia)
-[![Apache 2.0 License](http://img.shields.io/badge/APACHE2-license-blue.svg)](./LICENSE)
-[![Contribution Guidelines](http://img.shields.io/badge/CONTRIBUTING-Guidelines-blue.svg)](./CONTRIBUTING.md)
-[![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://coveralls.io/repos/projecthydra/sufia/badge.svg)](https://coveralls.io/r/projecthydra/sufia)
+[![Code Climate](https://codeclimate.com/github/projecthydra/sufia/badges/gpa.svg)](https://codeclimate.com/github/projecthydra/sufia)
+[![Apache 2.0 License](http://img.shields.io/badge/APACHE2-license-blue.svg)](./LICENSE)
+[![Contribution Guidelines](http://img.shields.io/badge/CONTRIBUTING-Guidelines-blue.svg)](./CONTRIBUTING.md)
+[![API Docs](http://img.shields.io/badge/API-docs-blue.svg)](http://rubydoc.info/gems/sufia)
 [![Stories in Ready](https://badge.waffle.io/projecthydra/sufia.png?label=ready&title=Ready)](https://waffle.io/projecthydra/sufia)
 
 # Table of Contents
@@ -87,6 +88,11 @@ If you have questions or need help, please email [the Hydra community tech list]
 
 # Creating a Sufia-based app
 
+This document contains instructions specific to setting up an app with __Sufia
+v6.3.0__. If you are looking for instructions on installing a different
+version, be sure to select the appropriate branch or tag from the drop-down
+menu above.
+
 ## Prerequisites
 
 Sufia requires the following software to work:
@@ -121,10 +127,10 @@ We recommend either Ruby 2.2 or the latest 2.1 version.
 
 ## Rails
 
-Generate a new Rails application.  We recommend either Rails 4.2 or the latest 4.1 version.
+Generate a new Rails application.  Sufia > 6.1.0 requires Rails 4.2.
 
 ```
-gem install rails -v 4.1.8
+gem install rails -v 4.2
 rails new my_app
 ```
 
@@ -133,7 +139,7 @@ rails new my_app
 Add the following lines to your application's Gemfile.
 
 ```
-gem 'sufia', '6.0.0'
+gem 'sufia', '6.3.0'
 gem 'kaminari', github: 'jcoyne/kaminari', branch: 'sufia'  # required to handle pagination properly in dashboard. See https://github.com/amatsuda/kaminari/pull/322
 ```
 
@@ -162,7 +168,9 @@ rake db:migrate
 
 ## Solr and Fedora
 
-If you already have instances of Solr and Fedora that you would like to use, you may skip this step. Otherwise feel free to use the bundled copy of Jetty, a Java servlet container that is configured to run versions of Solr and Fedora that are known to work with Sufia.
+If you already have instances of Solr and Fedora that you would like to use, you may skip this step. Otherwise feel free to use [hydra-jetty](https://github.com/projecthydra/hydra-jetty), the bundled copy of Jetty, a Java servlet container that is configured to run versions of Solr and Fedora that are known to work with Sufia. Hydra-jetty (since v8.4.0) requires Java 8.
+
+The following rake tasks will install hydra-jetty and start up Jetty with Solr and Fedora.
 
 ```
 rake jetty:clean
@@ -335,13 +343,21 @@ To add proxies and transfers to your **Sufia 4**-based app, run the 'sufia:model
 
 ### One time setup for first admin
 
-Follow the directions for installing hydra-role-management.
+Follow the directions for [installing hydra-role-management](https://github.com/projecthydra/hydra-role-management#installing).
 
 Add the following gem to Sufia installed app's Gemfile
-```
+```ruby
 gem "hydra-role-management"
 ```
 
+Then install the gem, run the generator, and database migrations:
+```
+# each of these commands will produce some output.
+bundle install
+rails generate roles
+rake db:migrate
+```
+
 ### Adding an admin user
 
 In rails console, run the following commands to create the admin role.

data/SUFIA_VERSION

@@ -1 +1 @@
-6.2.0
+6.3.0

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

@@ -61,4 +61,19 @@
 .label-default a:hover {
   color: #FFF;
   text-align: center;
+}
+
+.edit_collection {
+  margin-top: 20px;
+}
+
+div.view-type {
+  padding-left: 0;
+}
+
+form.per_page {
+  fieldset {
+    margin-bottom: 1em;
+    padding-left: 0;
+  }
 }

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

@@ -5,6 +5,13 @@ h4 .small {
   color: $navbar-default-toggle-icon-bar-bg;
 }
 
+@media screen and (max-width: 767px) {
+  .table-responsive .open > .dropdown-menu  {
+    position: relative;
+    left: -8em;
+  }
+}
+
 .table-responsive {
   overflow-x: visible;
 }

data/app/assets/stylesheets/sufia/_home-page.scss

@@ -55,3 +55,13 @@
   border-top-left-radius: 4px;
   border-bottom-left-radius: 4px;
 }
+
+div#announcement {
+  text-align: center;
+  color: white;
+  font-size: 1.5em;
+  background-color: $vermilion;
+  border: 10px solid white;
+  padding-top: 10px;
+  border-radius: 15px;
+}

data/app/builders/sufia/bootstrap_breadcrumbs_builder.rb

@@ -9,13 +9,11 @@
 class Sufia::BootstrapBreadcrumbsBuilder < BreadcrumbsOnRails::Breadcrumbs::Builder
   include ActionView::Helpers::OutputSafetyHelper
   def render
-    if @elements.blank?
-      return ""
-    end
+    return "" if @elements.blank?
 
     @context.content_tag(:ul, class: 'breadcrumb') do
-      safe_join(@elements.uniq.collect {|e| render_element(e)})
-    end 
+      safe_join(@elements.uniq.collect { |e| render_element(e) })
+    end
   end
 
   def render_element(element)

data/app/controllers/admin/stats_controller.rb

@@ -1,80 +1,5 @@
 # -*- encoding : utf-8 -*-
 
 class Admin::StatsController < ApplicationController
-  def index
-    # total user count
-    @users_count = User.count
-
-    # The most recent users to join
-    @users_stats = params.fetch(:users_stats, {})
-    @recent_users = recent_users
-
-    # Query Solr for top depositors
-    @active_users = top_depositors
-
-    # Count of documents by permissions
-    @files_count = document_by_permission
-
-    # Query Solr for top file formats
-    @top_formats = top_formats
-
-    render 'index'
-  end
-
-  private
-
-    def top_depositors_count
-      count = params[:dep_count].to_i
-      count.in?(5..20) ? count : 5
-    end
-
-    def document_by_permission
-      return document_by_date_by_permission if @users_stats[:file_start_date]
-
-      files_count = {}
-      files_count[:total] = GenericFile.count
-      files_count[:public] = GenericFile.where_public.count
-      files_count[:registered] = GenericFile.where_registered.count
-      files_count[:private] = files_count[:total] - (files_count[:registered] + files_count[:public])
-      files_count
-    end
-
-    def document_by_date_by_permission
-      start_date = DateTime.parse(@users_stats[:file_start_date])
-      end_date = DateTime.parse(@users_stats[:file_end_date]).end_of_day unless @users_stats[:file_end_date].blank?
-      files_count = {}
-      files_count[:total] = GenericFile.find_by_date_created(start_date, end_date).count
-      files_count[:public] = GenericFile.find_by_date_created(start_date, end_date).merge(GenericFile.where_public).count
-      files_count[:registered] = GenericFile.find_by_date_created(start_date, end_date).merge(GenericFile.where_registered).count
-      files_count[:private] = files_count[:total] - (files_count[:registered] + files_count[:public])
-      files_count
-    end
-
-    def top_depositors
-      depositor_key = Solrizer.solr_name('depositor', :stored_searchable, type: :string)
-      top_data(depositor_key, top_depositors_count)
-    end
-
-    def top_formats
-      format_key = Solrizer.solr_name('file_format', Solrizer::Descriptor.new(:string, :indexed, :multivalued))
-      top_data(format_key, 5)
-    end
-
-    def top_data (key, limit)
-      query_url = "#{ActiveFedora.solr_config[:url]}/terms?terms.fl=#{key}&terms.sort=count&terms.limit=#{limit}&wt=json&omitHeader=true"
-      # Parse JSON response (looks like {"terms":{"depositor_tesim":["mjg36",3]}} for depositor)
-      json = open(query_url).read
-      tuples = JSON.parse(json)['terms'][key] rescue []
-      # Change to hash where keys = logins and values = counts
-      Hash[*tuples]
-    end
-
-    def recent_users
-      # no dates return the top 5
-      return  User.order('created_at DESC').limit(5) if @users_stats[:start_date].blank?
-
-      start_date = DateTime.parse @users_stats[:start_date]
-      end_date = DateTime.parse(@users_stats[:end_date]).end_of_day unless  @users_stats[:end_date].blank?
-      User.recent_users start_date, end_date
-    end
+  include Sufia::Admin::StatsBehavior
 end