sufia 6.5.0 → 6.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e188dc963a308bd78feb2a92a99548eb2b641d6
-  data.tar.gz: a5e2f06bbe6f5d816541b523f8346448958b00c2
+  metadata.gz: 9c1e5c64eca348793606e623debb1ad8bd047b46
+  data.tar.gz: 5f81c3cbf777333d417103baf8bea1d32dd087b2
 SHA512:
-  metadata.gz: ee2f8d43dd936f3fe4586da46a0de8215f4abcac9f93728c5f7ea88fcde725d0aa12810bbe20b008dcc2212a7d038af3b0ac61be8d9c28997fabb30f17dac517
-  data.tar.gz: 6ed19074ad147367a53b8d5a15d39ecab27aea1b2d2146dd71db9dceeaa1895cfccbc1e4e1281e35f04807fc591f31abf513ad32d8f2d7229e97450048f6a389
+  metadata.gz: 9ae3c7d7685f039792cceb23ae03c31d43e527e35235733a55cd050fd09fd66422825bbe10ba818c8f880b86ece6eb420425d41c96a3f1a097565cae7cf701d0
+  data.tar.gz: a3b315a19b8bee86f65455aa2bb686c2e41254f6e17d29d62c78c0a6698a3fe05909be953f9b7bfccb15eba8184b7cf8574648a371ed6bc8e3e246d0217f9ddd

data/.rubocop.yml

@@ -1,7 +1,7 @@
 require: rubocop-rspec
 
 AllCops:
-  RunRailsCops: true
+  TargetRubyVersion: 2.2
   DisplayCopNames: true
   Include:
     - '**/Rakefile'
@@ -13,6 +13,11 @@ AllCops:
     - 'spec/internal/**/*'
     - 'sufia-models/app/models/concerns/sufia/generic_file/export.rb'
 
+Lint/ImplicitStringConcatenation:
+  Exclude:
+    - 'lib/generators/**/*'
+    - 'sufia-models/lib/generators/**/*'
+
 Metrics/LineLength:
   Enabled: false
 
@@ -119,6 +124,9 @@ Style/ClassVars:
 Style/SignalException:
   Enabled: false
 
+Rails:
+  Enabled: true
+
 Rails/Output:
   Exclude:
     - 'lib/generators/**/*'

data/Gemfile

@@ -12,7 +12,7 @@ group :development, :test do
   gem "simplecov", require: false
   gem 'byebug' unless ENV['CI']
   gem 'coveralls', require: false
-  gem 'rubocop', require: false
+  gem 'rubocop', '~> 0.36', require: false
   gem 'rubocop-rspec', require: false
 end
 

data/History.md

@@ -1,5 +1,18 @@
 # History of Sufia releases
 
+## 6.6.0
+* Update background workers doc [E. Lynette Rayle]
+* Replaces table rows with an unordered list to make html valid, fixes #1058 [Adam Wead]
+* Fix duplicative labels on show pages [Adam Wead]
+* Add default metadata help for collection fixes #1057 [Adam Wead]
+* Pin Sufia 6 to hydra-head 9.5 [Adam Wead]
+* Updating to Rubocop 0.36 [Adam Wead]
+* Reindex generic_files in background from batch_update_job [E. Lynette Rayle]
+* Include the name of the file if it fails to upload [Adam Wead]
+* Fix intermittent failure to add file to collection [E. Lynette Rayle]
+* Don't generate auto_link on a non-url rights statement, fixes projecthydra/sufia#1356 [Anna Headley]
+* Use lockable module to prevent race conditions in Batches. [Michael J. Giarlo]
+
 ## 6.5.0
 * Remove unnecessary require [Justin Coyne]
 * Option to show collection facet in Dashboard and search results [E. Lynette Rayle]

data/README.md

@@ -26,8 +26,13 @@
     * [Install Sufia](#install-sufia)
     * [Database tables and indexes](#database-tables-and-indexes)
     * [Solr and Fedora](#solr-and-fedora)
-    * [Start background workers](#start-background-workers)
-    * [Monitor background workers](#monitor-background-workers)
+    * [Background Workers](#background-workers)
+      * [Resque Terminology](#resque-terminology)
+      * [Configure Resque](#configure-resque)
+      * [Start Worker Pool](#start-worker-pool)
+      * [Restarting Worker Pool](#restarting-worker-pool)
+      * [Expected processes for Resque -- Resolving Unexpected Behaviors and Failures](#expected-processes-for-resque----resolving-unexpected-behaviors-and-failures)
+      * [Monitor background workers](#monitor-background-workers)
     * [Audiovisual transcoding](#audiovisual-transcoding)
     * [User interface](#user-interface)
     * [Integration with Dropbox, Box, etc.](#integration-with-dropbox-box-etc)
@@ -90,7 +95,7 @@ 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.5.0__. If you are looking for instructions on installing a different
+v6.6.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.
 
@@ -142,7 +147,7 @@ rails new my_app
 Add the following lines to your application's Gemfile.
 
 ```
-gem 'sufia', '6.5.0'
+gem 'sufia', '6.6.0'
 gem 'kaminari', github: 'jcoyne/kaminari', branch: 'sufia'  # required to handle pagination properly in dashboard. See https://github.com/amatsuda/kaminari/pull/322
 ```
 
@@ -181,33 +186,119 @@ rake sufia:jetty:config
 rake jetty:start
 ```
 
-## Start background workers
+## Background Workers
 
-Sufia uses a queuing system named Resque to manage long-running or slow processes. Resque relies on the [Redis](http://redis.io/) key-value store, so [Redis](http://redis.io/) must be installed *and running* on your system in order for background workers to pick up jobs.
+Reference:  https://github.com/resque/resque
 
-Unless Redis has already been started, you will want to start it up. You can do this either by calling the `redis-server` command, or if you're on certain Linuxes, you can do this via `sudo service redis-server start`.
+### Resque Terminology
 
-Next you will need to start up the Resque workers provided by Sufia. The following command will run until you stop it, so you may want to do this in a dedicated terminal.
+<dl>
+<dt>resque</dt>
+<dd>resque is a <a href="https://en.wikipedia.org/wiki/Message_queue">message queue</a> that is used by Sufia to manage long-running or slow processes.</dd>
 
+<dt>pools</dt>
+<dd>resque-pool is a tool for managing (starting, stopping) and configuring a bunch of resque worker processes.  See Configure Resque below for more information.</dd>
+
+<dt>workers</dt>
+<dd>Workers run the background jobs.  Each worker has a copy of the rails-app which has the jobs code in `app/jobs` or `sufia-models/app/jobs`.  The workers listen to queues (by polling redis) and pull off messages waiting on the queue.  Once a worker pulls a message, it will execute the background job encoded in the json message.  A worker can be dedicated to a single queue or may listen to multiple queues.  Multiple workers can listen to the same queue.</dd>
+
+<dt>queue</dt>
+<dd>Messages are sent to a queue where they wait until a worker is ready to process the message.  Sufia defines a number of queues for processing different background jobs (e.g. batch_update, characterize, etc.).  There could have been one queue to process all messages, but Sufia decided to have specialized queues.</dd>
+
+<dt>message</dt>
+<dd>Messages encode in json what job should be run.  It includes the name of the method to execute in background and any parameters to pass to the method.</dd>
+
+<dt>redis</dt>
+<dd><a href="http://redis.io/">Redis</a> is a key-value store.  Resque uses redis to track messages in the queue.</dd>
+</dl>
+
+### Configure Resque
+
+Configuration File:  `config/resque-pool.yml`.
+
+Minimal configuration:  Create 1 worker and all queues are processed by this worker.
+
+```
+ "*": 1
+```
+
+Typical configuration:  ([Scholarsphere example](https://github.com/psu-stewardship/scholarsphere/blob/develop/config/resque-pool.yml))
+
+```
+batch_update: 3
+derivatives: 1
+resolrize: 1
+audit: 2
+event: 5
+import_url: 3
+sufia: 1
+"*": 1
+```
+
+Each line defines a queue name and how many workers should be created to process that queue.
+
+### Start Worker Pool
+
+**Prerequisite:**  [Redis](http://redis.io/) must be installed *and running* on your system in order for background workers to pick up jobs.  Unless Redis has already been started, you will want to start it up. You can do this either by calling the `redis-server` command, or if you're on certain Linuxes, you can do this via `sudo service redis-server start`.
+
+OPTION 1: Start 1 worker (ignores the configuration file):  The following command will run until you stop it, so you may want to do this in a dedicated terminal and would typically be used during development only.
+
+**IMPORTANT:** Change directories to the root of the rails app before executing.
 ```
 RUN_AT_EXIT_HOOKS=true TERM_CHILD=1 QUEUE=* rake environment resque:work
 ```
 
-Or, if you prefer (e.g., in production-like environments), you may want to set up a `config/resque-pool.yml` file -- [here is a simple example](https://github.com/projecthydra/sufia/blob/master/sufia-models/lib/generators/sufia/models/templates/config/resque-pool.yml) -- and run `resque-pool` (at the root of your rails app) which will manage your background workers in a dedicated process.
+OPTION 2: Start workers based on configuration:  Typically used for production, and can be used for development.  See configuration examples above.
 
+**IMPORTANT:** Change directories to the root of the rails app before executing.
 ```
 RUN_AT_EXIT_HOOKS=true TERM_CHILD=1 bundle exec resque-pool --daemon --environment development start
 ```
 
 Occasionally, Resque may not give background jobs a chance to clean up temporary files. The `RUN_AT_EXIT_HOOKS` variable allows Resque to do so. The `TERM_CHILD` variable allows workers to terminate gracefully rather than interrupting currently running workers. For more information on the signals that Resque responds to, see the [resque-pool documentation](https://github.com/nevans/resque-pool#signals).
 
-See https://github.com/defunkt/resque for more options. If you use resque-pool, you may also be interested in a shell script to help manage it. [Here is an example](https://github.com/psu-stewardship/scholarsphere/blob/develop/script/restart_resque.sh) which you can adapt for your own needs.
+### Restarting Worker Pool
+
+**IMPORTANT:** Change directories to the root of the rails app before executing.
+
+Script to restart worker pool:  [restart-pool](https://github.com/psu-stewardship/scholarsphere/blob/develop/script/restart_resque.sh)
+
+You may want to adjust it to meet your needs.  
+
+NOTE: The default location for the pid file is the tmp directory.  You will want to update RESQUE_POOL_PIDFILE to point to the location where your pid file is generated if you use a location other than the default.
+
+### Expected processes for Resque -- Resolving Unexpected Behaviors and Failures
+
+The code executed by workers should stay in sync with changes you make to your rails app.  If the code isn't staying in sync, you may have more than one resque-pool process running.  You can also see unusual behaviors if more than one redis-server is running.  The information below describes the processes that will be running when everything is operating correctly.
+
+You should see 1 redis-server process. 
+```
+$ ps -ef | grep redis-server
+user1     7982  7882  0 01:26 pts/3    00:00:00 grep redis-server
+root      8398     1  0 00:08 ?        00:00:04 /usr/local/bin/redis-server 0.0.0.0:6379    
+```
+NOTE: If you see multiple redis-server processes running, kill each and start redis-server again.  You should only have one redis-server process running.
+
+
+You should see 1 resque-pool process.
+```
+$$ ps -ef | grep resque-pool
+user1    8059  7882  0 01:27 pts/3    00:00:00 grep resque-pool
+root     8416     1  0 00:08 ?        00:00:08 resque-pool-master[agriknowledge]: managing [8653]  
+```
+
+You should see at least one worker process waiting.
+```
+$$ ps -ef | grep resque | grep Waiting
+root     8653  8416  0 00:08 ?        00:00:01 resque-1.25.2: Waiting for *  
+```
+NOTE: If you see multiple resque-pool processes running, kill each AND all the resque Waiting processes as well.  Start resque-pool again.  You should only have one resque-pool process running.  But you may have multiple worker processes running.
 
-## Monitor background workers
+### Monitor background workers
 
-Edit config/initializers/resque_admin.rb so that ResqueAdmin#matches? returns a true value for the user/s who should be able to access this page. One fast way to do this is to return current_user.admin? and add an admin? method to your user model which checks for specific emails.
+Edit `config/initializers/resque_admin.rb` so that ResqueAdmin#matches? returns a true value for the user/s who should be able to access this page. One fast way to do this is to return current_user.admin? and add an admin? method to your user model which checks for specific emails or the admin role.  See [Admin Users](#admin-users) for information on how to add users with the admin role.
 
-Then you can view jobs at the admin/queues route.
+Then you can view jobs at the `admin/queues` route.
 
 ## Audiovisual transcoding
 

data/SUFIA_VERSION

@@ -1 +1 @@
-6.5.0
+6.6.0

data/app/controllers/concerns/sufia/contact_form_controller_behavior.rb

@@ -12,12 +12,11 @@ module Sufia
         flash.now[:notice] = 'Thank you for your message!'
         after_deliver
         @contact_form = ContactForm.new
-        render :new
       else
         flash.now[:error] = 'Sorry, this message was not sent successfully. '
         flash.now[:error] << @contact_form.errors.full_messages.map(&:to_s).join(",")
-        render :new
       end
+      render :new
     rescue
       flash.now[:error] = 'Sorry, this message was not delivered.'
       render :new

data/app/controllers/concerns/sufia/files_controller_behavior.rb

@@ -106,7 +106,7 @@ module Sufia
       end
     rescue => error
       logger.error "GenericFilesController::create rescued #{error.class}\n\t#{error}\n #{error.backtrace.join("\n")}\n\n"
-      json_error "Error occurred while creating generic file."
+      json_error "Error occurred while creating generic file.", file.original_filename
     ensure
       # remove the tempfile (only if it is a temp file)
       file.tempfile.delete if file.respond_to?(:tempfile)

data/app/controllers/concerns/sufia/my_controller_behavior.rb

@@ -48,7 +48,7 @@ module Sufia
       @all_checked = (count_on_page == @document_list.count)
       @entire_result_set_selected = @response.response["numFound"] == batch_size
       @batch_size_on_other_page = batch_size - count_on_page
-      @batch_part_on_other_page = (@batch_size_on_other_page) > 0
+      @batch_part_on_other_page = @batch_size_on_other_page > 0
 
       @add_files_to_collection = params.fetch(:add_files_to_collection, '')
 

data/app/controllers/concerns/sufia/users_controller_behavior.rb

@@ -28,11 +28,11 @@ module Sufia::UsersControllerBehavior
 
   # Display user profile
   def show
-    if @user.respond_to? :profile_events
-      @events = @user.profile_events(100)
-    else
-      @events = []
-    end
+    @events = if @user.respond_to? :profile_events
+                @user.profile_events(100)
+              else
+                []
+              end
     @trophies = @user.trophy_files
     @followers = @user.followers
     @following = @user.all_following

data/app/helpers/batch_edits_helper.rb

@@ -6,6 +6,6 @@ module BatchEditsHelper
   end
 
   def render_check_all
-    render partial: 'batch_edits/check_all' unless params[:controller].match("my/collections")
+    render partial: 'batch_edits/check_all' unless params[:controller] =~ /my\/collections/
   end
 end

data/app/helpers/concerns/sufia/facets_helper_behavior.rb

@@ -0,0 +1,15 @@
+module Sufia
+  module FacetsHelperBehavior
+    extend ActiveSupport::Concern
+
+    def display_collection_facet
+      if Sufia.config.collection_facet == :public
+        true
+      elsif Sufia.config.collection_facet == :user && current_user
+        true
+      else
+        false
+      end
+    end
+  end
+end

data/app/helpers/facets_helper.rb

@@ -1,13 +1,4 @@
 module FacetsHelper
   include Blacklight::FacetsHelperBehavior
-
-  def display_collection_facet
-    if Sufia.config.collection_facet == :public
-      true
-    elsif Sufia.config.collection_facet == :user && current_user
-      true
-    else
-      false
-    end
-  end
+  include Sufia::FacetsHelperBehavior
 end

data/app/helpers/sufia/sufia_helper_behavior.rb

@@ -113,14 +113,19 @@ module Sufia
       link_to(display, link_url)
     end
 
-    def iconify_auto_link(text, showLink = true)
+    def iconify_auto_link(text, show_link = true)
       # this block is only executed when a link is inserted;
       # if we pass text containing no links, it just returns text.
       auto_link(text) do |value|
-        "<i class='glyphicon glyphicon-new-window'></i>#{('&nbsp;' + value) if showLink}<br />"
+        "<i class='glyphicon glyphicon-new-window'></i>#{('&nbsp;' + value) if show_link}<br />"
       end
     end
 
+    def iconify_link(text)
+      # different from above in that if text is not a url, return nil.
+      iconify_auto_link(text, false) if is_url?(text)
+    end
+
     def link_to_profile(login)
       user = ::User.find_by_user_key(login)
       return login if user.nil?
@@ -152,11 +157,8 @@ module Sufia
     # If they are in the dashboard, then the search defaults to the user's files and not
     # all of Sufia.
     def current_search_parameters
-      if on_the_dashboard?
-        return nil
-      else
-        return params[:q]
-      end
+      return if on_the_dashboard?
+      params[:q]
     end
 
     # Depending on which page we're landed on, we'll need to set the appropriate action url for
@@ -191,6 +193,10 @@ module Sufia
       user.respond_to?(:name) ? "#{user.name} (#{user_key})" : user_key
     end
 
+    def is_url?(str)
+      str =~ /\A#{URI.regexp(['http', 'https'])}\z/
+    end
+
     private
 
       def search_action_for_dashboard

data/app/models/contact_form.rb

@@ -7,7 +7,7 @@ class ContactForm < MailForm::Base
     ["Browsing and searching", "Browsing and searching"],
     ["Reporting a problem", "Reporting a problem"],
     ["General inquiry or request", "General inquiry or request"]
-  ]
+  ].freeze
   attribute :contact_method, captcha: true
   attribute :category, validate: true
   attribute :name, validate: true

data/app/models/content_block.rb

@@ -1,7 +1,7 @@
 class ContentBlock < ActiveRecord::Base
-  MARKETING  = 'marketing_text'
-  RESEARCHER = 'featured_researcher'
-  ANNOUNCEMENT = 'announcement_text'
+  MARKETING  = 'marketing_text'.freeze
+  RESEARCHER = 'featured_researcher'.freeze
+  ANNOUNCEMENT = 'announcement_text'.freeze
 
   def self.recent_researchers
     where(name: RESEARCHER).order('created_at DESC')

data/app/presenters/sufia/version_presenter.rb

@@ -8,7 +8,7 @@ module Sufia
     end
 
     delegate :label, :uri, to: :version
-    alias_method :current?, :current
+    alias current? current
 
     def current!
       @current = true

data/app/views/records/show_fields/_rights.html.erb

@@ -1,4 +1,3 @@
 <% record.rights.each do |r| %>
-  <%=link_to_field('rights',r, Sufia.config.cc_licenses_reverse[r])%> <%= iconify_auto_link(r,false) %><br />
+  <%=link_to_field('rights',r, Sufia.config.cc_licenses_reverse[r])%> <%=iconify_link(r) %><br />
 <% end %>
-

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

@@ -1,5 +1,4 @@
 <div class="tab-pane active" id="contributions">
-  <i class="glyphicon glyphicon-star trophy-on"></i> <strong>Highlighted Files</strong>
   <% if @trophies.count > 0 %>
     <table>
       <% @trophies.each do |t| %>

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

@@ -1,7 +1,7 @@
       <ul class="nav nav-tabs" id="myTab">
-        <li class="active"><a href="#contributions"><i class="glyphicon glyphicon-star"></i> Contributions</a></li>
-        <li><a href="#profile"><i class="glyphicon glyphicon-info-sign"></i> Profile</a></li>
-        <li><a href="#activity_log" ><i class="glyphicon glyphicon-calendar"></i> Activity</a></li>
+        <li class="active"><a href="#contributions"><i class="glyphicon glyphicon-star"></i> <%= I18n.t('sufia.user_profile.tab_highlighted') %></a></li>
+        <li><a href="#profile"><i class="glyphicon glyphicon-info-sign"></i> <%= I18n.t('sufia.user_profile.tab_profile') %></a></li>
+        <li><a href="#activity_log" ><i class="glyphicon glyphicon-calendar"></i> <%= I18n.t('sufia.user_profile.tab_activity') %></a></li>
       </ul>
        
       <div class="tab-content">

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

@@ -1,8 +1,9 @@
-        <div class="tab-pane" id="proxies">
-          <h2>Proxies</h2>
-          <% @user.can_receive_deposits_from.each do |depositor| %>
-              <tr><td><%= link_to_profile depositor.user_key %></td>
-              </tr>
-          <% end %>
+<div class="tab-pane" id="proxies">
+  <h2>Proxies</h2>
+  <ul>
+  <% @user.can_receive_deposits_from.each do |depositor| %>
+    <li><%= link_to_profile depositor.user_key %></li>
+  <% end %>
+  </ul>
 
-        </div> <!-- /profile -->
+</div> <!-- /profile -->

data/config/locales/sufia.en.yml

@@ -146,6 +146,9 @@ en:
         label: "Zotero Profile"
         connected: "Connected!"
         unlinked: "Link with Zotero"
+      tab_highlighted: "Highlighted"
+      tab_profile: "Profile"
+      tab_activity: "Activity"
     batch:
       help:
         title: "Filename will be the default title. Please provide a more meaningful title, and filenames will still be preserved by the system."
@@ -227,6 +230,8 @@ en:
         language: "The language of the file content."
         publisher: "The person or group making the file available. Generally this is the institution."
         rights: "Licensing and distribution information governing access to the file. Select from the provided drop-down list. <em>This is a required field</em>."
+      collection:
+        creator_html: 'The person or group responsible for the collection. Usually this is the author of the collected content. Personal names should be entered with the last name first, e.g. "Smith, John." <em>This is a required field</em>.'
 
     aria_label:
       generic_file:

data/lib/generators/sufia/templates/catalog_controller.rb

@@ -124,7 +124,7 @@ class CatalogController < ApplicationController
       title_name = solr_name("title", :stored_searchable)
       field.solr_parameters = {
         qf: "#{all_names} file_format_tesim all_text_timv",
-        pf: "#{title_name}"
+        pf: title_name.to_s
       }
     end
 

data/lib/sufia.rb

@@ -32,13 +32,22 @@ module Sufia
 
     config.autoload_paths += %W(
       #{config.root}/app/controllers/concerns
+      #{config.root}/app/helpers/concerns
       #{config.root}/app/models/concerns
       #{Hydra::Engine.root}/app/models/concerns
     )
 
-    config.assets.paths << config.root.join('vendor', 'assets', 'fonts')
-    config.assets.precompile << /vjs\.(?:eot|ttf|woff)$/
-    config.assets.precompile << /fontawesome-webfont\.(?:svg|ttf|woff)$/
-    config.assets.precompile += %w( ZeroClipboard.swf )
+    initializer 'sufia.assets.precompile' do |app|
+      app.config.assets.paths << config.root.join('vendor', 'assets', 'fonts')
+      app.config.assets.paths << config.root.join('app', 'assets', 'images')
+      app.config.assets.paths << config.root.join('app', 'assets', 'images', 'blacklight')
+      app.config.assets.paths << config.root.join('app', 'assets', 'images', 'hydra')
+      app.config.assets.paths << config.root.join('app', 'assets', 'images', 'site_images')
+
+      app.config.assets.precompile << /vjs\.(?:eot|ttf|woff)$/
+      app.config.assets.precompile << /fontawesome-webfont\.(?:svg|ttf|woff)$/
+      app.config.assets.precompile += %w( ZeroClipboard.swf )
+      app.config.assets.precompile += %w(*.png *.jpg *.ico *.gif *.svg)
+    end
   end
 end

data/lib/sufia/arkivo/metadata_munger.rb

@@ -3,13 +3,13 @@ module Sufia
     CREATOR_TYPES = ['author', 'interviewer', 'director', 'scriptwriter',
                      'inventor', 'composer', 'cartographer', 'programmer', 'artist',
                      'bookAuthor'
-                    ]
+                    ].freeze
 
     CONTRIBUTOR_TYPES = ['contributor', 'editor', 'translator', 'seriesEditor',
                          'interviewee', 'producer', 'castMember', 'sponsor', 'counsel',
                          'attorneyAgent', 'recipient', 'performer', 'wordsBy', 'commenter',
                          'presenter', 'guest', 'podcaster', 'reviewedAuthor', 'cosponsor'
-                        ]
+                        ].freeze
 
     class MetadataMunger
       def initialize(metadata)

data/lib/sufia/arkivo/schema_validator.rb

@@ -33,7 +33,7 @@ module Sufia
           }
         }
       }
-    }
+    }.freeze
 
     class InvalidItem < RuntimeError
     end

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "6.5.0"
+  VERSION = "6.6.0".freeze
 end

data/spec/controllers/generic_files_controller_spec.rb

@@ -133,7 +133,7 @@ describe GenericFilesController do
 
           file = fixture_file_upload('/world.png', 'image/png')
           xhr :post, :create, files: [file], Filename: "The world", batch_id: "sample_batch_id", permission: { "group" => { "public" => "read" } }, terms_of_service: "1"
-          expect(response.body).to include("Error occurred while creating generic file.")
+          expect(response.body).to include("Error occurred while creating generic file.", "world.png")
         end
       end
     end
@@ -334,11 +334,11 @@ describe GenericFilesController do
         sign_in user
         mock_query = double('query')
         allow(mock_query).to receive(:for_path).and_return([
-          OpenStruct.new(date: '2014-01-01', pageviews: 4),
-          OpenStruct.new(date: '2014-01-02', pageviews: 8),
-          OpenStruct.new(date: '2014-01-03', pageviews: 6),
-          OpenStruct.new(date: '2014-01-04', pageviews: 10),
-          OpenStruct.new(date: '2014-01-05', pageviews: 2)])
+                                                             OpenStruct.new(date: '2014-01-01', pageviews: 4),
+                                                             OpenStruct.new(date: '2014-01-02', pageviews: 8),
+                                                             OpenStruct.new(date: '2014-01-03', pageviews: 6),
+                                                             OpenStruct.new(date: '2014-01-04', pageviews: 10),
+                                                             OpenStruct.new(date: '2014-01-05', pageviews: 2)])
         allow(mock_query).to receive(:map).and_return(mock_query.for_path.map(&:marshal_dump))
         profile = double('profile')
         allow(profile).to receive(:sufia__pageview).and_return(mock_query)
@@ -346,8 +346,8 @@ describe GenericFilesController do
 
         download_query = double('query')
         allow(download_query).to receive(:for_file).and_return([
-          OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "123456789", totalEvents: "3")
-        ])
+                                                                 OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "123456789", totalEvents: "3")
+                                                               ])
         allow(download_query).to receive(:map).and_return(download_query.for_file.map(&:marshal_dump))
         allow(profile).to receive(:sufia__download).and_return(download_query)
       end

data/spec/helpers/sufia_helper_spec.rb

@@ -52,7 +52,7 @@ describe SufiaHelper, type: :helper do
       let(:document) { SolrDocument.new(mime_type_tesim: 'audio/x-wave', id: '1234') }
       it "shows the audio thumbnail" do
         rendered = helper.sufia_thumbnail_tag(document, {})
-        expect(rendered).to match(/src="\/assets\/audio.png"/)
+        expect(rendered).to match(/src="\/assets\/audio-.*.png"/)
       end
     end
     context "for an document object" do
@@ -186,4 +186,16 @@ describe SufiaHelper, type: :helper do
       conn.commit
     end
   end
+
+  describe "#is_url?" do
+    it "returns false for non-url string" do
+      url = 'all rights reserved'
+      expect(helper.is_url?(url)).to be_falsey
+    end
+
+    it "returns true for url" do
+      url = 'http://creativecommons.org/licenses/by/3.0/us/'
+      expect(helper.is_url?(url)).to be_truthy
+    end
+  end
 end

data/spec/models/file_download_stat_spec.rb

@@ -50,17 +50,17 @@ RSpec.describe FileDownloadStat, type: :model do
       end
 
       it "includes cached ga data" do
-        expect(described_class.to_flots stats).to include(*download_output)
+        expect(described_class.to_flots(stats)).to include(*download_output)
       end
 
       it "caches data" do
-        expect(described_class.to_flots stats).to include(*download_output)
+        expect(described_class.to_flots(stats)).to include(*download_output)
 
         # at this point all data should be cached
         allow(described_class).to receive(:ga_statistics).with(Date.today, file_id).and_raise("We should not call Google Analytics All data should be cached!")
 
         stats2 = described_class.statistics(file_id, Date.today - 4.days)
-        expect(described_class.to_flots stats2).to include(*download_output)
+        expect(described_class.to_flots(stats2)).to include(*download_output)
       end
     end
 
@@ -73,7 +73,7 @@ RSpec.describe FileDownloadStat, type: :model do
       end
 
       it "includes cached data" do
-        expect(described_class.to_flots stats).to include([file_download_stat.date.to_i * 1000, file_download_stat.downloads], *download_output)
+        expect(described_class.to_flots(stats)).to include([file_download_stat.date.to_i * 1000, file_download_stat.downloads], *download_output)
       end
     end
   end

data/spec/models/file_view_stat_spec.rb

@@ -51,18 +51,18 @@ RSpec.describe FileViewStat, type: :model do
       end
 
       it "includes cached ga data" do
-        expect(described_class.to_flots stats).to include(*view_output)
+        expect(described_class.to_flots(stats)).to include(*view_output)
       end
 
       it "caches data" do
-        expect(described_class.to_flots stats).to include(*view_output)
+        expect(described_class.to_flots(stats)).to include(*view_output)
         expect(stats.first.user_id).to eq user_id
 
         # at this point all data should be cached
         allow(described_class).to receive(:ga_statistics).with(Date.today, file_id).and_raise("We should not call Google Analytics All data should be cached!")
 
         stats2 = described_class.statistics(file_id, Date.today - 5.days)
-        expect(described_class.to_flots stats2).to include(*view_output)
+        expect(described_class.to_flots(stats2)).to include(*view_output)
       end
     end
 
@@ -75,7 +75,7 @@ RSpec.describe FileViewStat, type: :model do
       end
 
       it "includes cached data" do
-        expect(described_class.to_flots stats).to include([file_view_stat.date.to_i * 1000, file_view_stat.views], *view_output)
+        expect(described_class.to_flots(stats)).to include([file_view_stat.date.to_i * 1000, file_view_stat.views], *view_output)
       end
     end
   end

data/spec/views/dashboard/index_spec.rb

@@ -93,9 +93,9 @@ describe "dashboard/index.html.erb", type: :view do
       before do
         @now = DateTime.now.to_i
         assign(:activity, [
-          { action: 'so and so edited their profile', timestamp: @now },
-          { action: 'so and so uploaded a file', timestamp: (@now - 360) }
-        ])
+                 { action: 'so and so edited their profile', timestamp: @now },
+                 { action: 'so and so uploaded a file', timestamp: (@now - 360) }
+               ])
       end
 
       it "includes recent activities and notifications" do

data/spec/views/records/show_fields/_rights.html.erb_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe "records/show_fields/_rights.html.erb" do
+  let(:file) { object_double(GenericFile.new) }
+
+  it 'displays links as icons' do
+    allow(file).to receive(:[]).with(:rights).and_return(['http://example.org/rights/1'])
+    record = Sufia::GenericFilePresenter.new(file)
+    render partial: "records/show_fields/rights", locals: { record: record }
+    expect(rendered).to include('<a href="http://example.org/rights/1"><i class="glyphicon glyphicon-new-window"></i><br></a>')
+  end
+
+  it 'does not display a link for non-urls' do
+    allow(file).to receive(:[]).with(:rights).and_return(['all rights reserved'])
+    record = Sufia::GenericFilePresenter.new(file)
+    render partial: "records/show_fields/rights", locals: { record: record }
+    expect(rendered).not_to include('<i class="glyphicon glyphicon-new-window">')
+  end
+end

data/tasks/release.rake

@@ -29,7 +29,7 @@ directory 'pkg'
         major, minor, tiny, pre = version.split('.')
         pre = pre ? pre.inspect : "nil"
 
-        ruby.gsub!(/^(\s*)VERSION = ".*?"$/, "\\1VERSION = \"#{version}\"")
+        ruby.gsub!(/^(\s*)VERSION = ".*?"\.freeze$/, "\\1VERSION = \"#{version}\".freeze")
         raise "Could not insert VERSION in #{file}" unless $1
         File.open(file, 'w') { |f| f.write ruby }
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 6.5.0
+  version: 6.6.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sufia-models
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.5.0
+        version: 6.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.5.0
+        version: 6.6.0
 - !ruby/object:Gem::Dependency
   name: blacklight_advanced_search
   requirement: !ruby/object:Gem::Requirement
@@ -654,6 +654,7 @@ files:
 - app/forms/sufia/forms/collection_edit_form.rb
 - app/forms/sufia/forms/generic_file_edit_form.rb
 - app/helpers/batch_edits_helper.rb
+- app/helpers/concerns/sufia/facets_helper_behavior.rb
 - app/helpers/contact_form_helper.rb
 - app/helpers/content_block_helper.rb
 - app/helpers/dashboard_helper.rb
@@ -1172,6 +1173,7 @@ files:
 - spec/views/homepage/_featured_works.html.erb_spec.rb
 - spec/views/homepage/_home_header.html.erb_spec.rb
 - spec/views/my/facet.html.erb_spec.rb
+- spec/views/records/show_fields/_rights.html.erb_spec.rb
 - spec/views/single_use_links/new_download.html.erb_spec.rb
 - spec/views/single_use_links_viewer/show.html.erb_spec.rb
 - spec/views/users/_follower_modal.html.erb_spec.rb
@@ -1245,7 +1247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Sufia was extracted from ScholarSphere developed by Penn State University
@@ -1458,6 +1460,7 @@ test_files:
 - spec/views/homepage/_featured_works.html.erb_spec.rb
 - spec/views/homepage/_home_header.html.erb_spec.rb
 - spec/views/my/facet.html.erb_spec.rb
+- spec/views/records/show_fields/_rights.html.erb_spec.rb
 - spec/views/single_use_links/new_download.html.erb_spec.rb
 - spec/views/single_use_links_viewer/show.html.erb_spec.rb
 - spec/views/users/_follower_modal.html.erb_spec.rb