From bed17aeff299b3bddc074aba11eb5c6867e816c4 Mon Sep 17 00:00:00 2001
From: Justin Coyne <jcoyne@justincoyne.com>
Date: Sun, 8 Oct 2017 22:30:01 -0500
Subject: [PATCH 01/18] Rename QueryService to Statistics::QueryService

This better reflects it's scope as specifically for statistics.
We may want to repurpose a general Hyrax::QueryService for the Valkyrie
integration.
---
 .rubocop_fixme.yml                            |  1 -
 app/services/hyrax/query_service.rb           | 53 ------------------
 .../hyrax/statistics/depositors/summary.rb    |  6 +-
 app/services/hyrax/statistics/over_time.rb    |  6 +-
 .../hyrax/statistics/query_service.rb         | 55 +++++++++++++++++++
 app/services/hyrax/statistics/works/count.rb  |  2 +-
 .../{ => statistics}/query_service_spec.rb    |  8 ++-
 7 files changed, 71 insertions(+), 60 deletions(-)
 delete mode 100644 app/services/hyrax/query_service.rb
 create mode 100644 app/services/hyrax/statistics/query_service.rb
 rename spec/services/hyrax/{ => statistics}/query_service_spec.rb (97%)

diff --git a/.rubocop_fixme.yml b/.rubocop_fixme.yml
index 1d6063fb0b..c081d82484 100644
--- a/.rubocop_fixme.yml
+++ b/.rubocop_fixme.yml
@@ -159,7 +159,6 @@ RSpec/LetBeforeExamples:
     - 'spec/forms/hyrax/forms/collection_form_spec.rb'
     - 'spec/presenters/hyrax/collection_presenter_spec.rb'
     - 'spec/presenters/hyrax/trophy_presenter_spec.rb'
-    - 'spec/services/hyrax/query_service_spec.rb'
     - 'spec/services/hyrax/workflow/action_taken_service_spec.rb'
     - 'spec/services/hyrax/workflow/notification_service_spec.rb'
 
diff --git a/app/services/hyrax/query_service.rb b/app/services/hyrax/query_service.rb
deleted file mode 100644
index 28c2c9be10..0000000000
--- a/app/services/hyrax/query_service.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-module Hyrax
-  class QueryService
-    # query to find works created during the time range
-    # @param [DateTime] start_datetime starting date time for range query
-    # @param [DateTime] end_datetime ending date time for range query
-    def find_by_date_created(start_datetime, end_datetime = nil)
-      return [] if start_datetime.blank? # no date just return nothing
-      relation.where(build_date_query(start_datetime, end_datetime))
-    end
-
-    def find_registered_in_date_range(start_datetime, end_datetime = nil)
-      find_by_date_created(start_datetime, end_datetime).merge(where_registered)
-    end
-
-    def find_public_in_date_range(start_datetime, end_datetime = nil)
-      find_by_date_created(start_datetime, end_datetime).merge(where_public)
-    end
-
-    def where_public
-      where_access_is 'public'
-    end
-
-    def where_registered
-      where_access_is 'registered'
-    end
-
-    def build_date_query(start_datetime, end_datetime)
-      start_date_str =  start_datetime.utc.strftime(date_format)
-      end_date_str = if end_datetime.blank?
-                       "*"
-                     else
-                       end_datetime.utc.strftime(date_format)
-                     end
-      "system_create_dtsi:[#{start_date_str} TO #{end_date_str}]"
-    end
-
-    delegate :count, to: :relation
-
-    def relation
-      Hyrax::WorkRelation.new
-    end
-
-    private
-
-      def where_access_is(access_level)
-        relation.where Hydra.config.permissions.read.group => access_level
-      end
-
-      def date_format
-        "%Y-%m-%dT%H:%M:%SZ"
-      end
-  end
-end
diff --git a/app/services/hyrax/statistics/depositors/summary.rb b/app/services/hyrax/statistics/depositors/summary.rb
index c0853188c0..dc5ea8ee4f 100644
--- a/app/services/hyrax/statistics/depositors/summary.rb
+++ b/app/services/hyrax/statistics/depositors/summary.rb
@@ -55,7 +55,11 @@ def query
           end
 
           def date_query
-            Hyrax::QueryService.new.build_date_query(start_dt, end_dt) if start_dt.present?
+            query_service.build_date_query(start_dt, end_dt) if start_dt.present?
+          end
+
+          def query_service
+            Hyrax::Statistics::QueryService.new
           end
       end
     end
diff --git a/app/services/hyrax/statistics/over_time.rb b/app/services/hyrax/statistics/over_time.rb
index fe56b45c3d..f280c630dc 100644
--- a/app/services/hyrax/statistics/over_time.rb
+++ b/app/services/hyrax/statistics/over_time.rb
@@ -35,7 +35,11 @@ def point(min, max)
         end
 
         def query(min, max)
-          QueryService.new.build_date_query(min, max)
+          query_service.build_date_query(min, max)
+        end
+
+        def query_service
+          Hyrax::Statistics::QueryService.new
         end
 
         # How many points are in this data set
diff --git a/app/services/hyrax/statistics/query_service.rb b/app/services/hyrax/statistics/query_service.rb
new file mode 100644
index 0000000000..56aef7725f
--- /dev/null
+++ b/app/services/hyrax/statistics/query_service.rb
@@ -0,0 +1,55 @@
+module Hyrax
+  module Statistics
+    class QueryService
+      # query to find works created during the time range
+      # @param [DateTime] start_datetime starting date time for range query
+      # @param [DateTime] end_datetime ending date time for range query
+      def find_by_date_created(start_datetime, end_datetime = nil)
+        return [] if start_datetime.blank? # no date just return nothing
+        relation.where(build_date_query(start_datetime, end_datetime))
+      end
+
+      def find_registered_in_date_range(start_datetime, end_datetime = nil)
+        find_by_date_created(start_datetime, end_datetime).merge(where_registered)
+      end
+
+      def find_public_in_date_range(start_datetime, end_datetime = nil)
+        find_by_date_created(start_datetime, end_datetime).merge(where_public)
+      end
+
+      def where_public
+        where_access_is 'public'
+      end
+
+      def where_registered
+        where_access_is 'registered'
+      end
+
+      def build_date_query(start_datetime, end_datetime)
+        start_date_str =  start_datetime.utc.strftime(date_format)
+        end_date_str = if end_datetime.blank?
+                         "*"
+                       else
+                         end_datetime.utc.strftime(date_format)
+                       end
+        "system_create_dtsi:[#{start_date_str} TO #{end_date_str}]"
+      end
+
+      delegate :count, to: :relation
+
+      def relation
+        Hyrax::WorkRelation.new
+      end
+
+      private
+
+        def where_access_is(access_level)
+          relation.where Hydra.config.permissions.read.group => access_level
+        end
+
+        def date_format
+          "%Y-%m-%dT%H:%M:%SZ"
+        end
+    end
+  end
+end
diff --git a/app/services/hyrax/statistics/works/count.rb b/app/services/hyrax/statistics/works/count.rb
index b07ad7b08a..7e752c4257 100644
--- a/app/services/hyrax/statistics/works/count.rb
+++ b/app/services/hyrax/statistics/works/count.rb
@@ -43,7 +43,7 @@ def by_permission
         private
 
           def query_service
-            @query_service ||= Hyrax::QueryService.new
+            @query_service ||= Hyrax::Statistics::QueryService.new
           end
 
           def by_date_and_permission
diff --git a/spec/services/hyrax/query_service_spec.rb b/spec/services/hyrax/statistics/query_service_spec.rb
similarity index 97%
rename from spec/services/hyrax/query_service_spec.rb
rename to spec/services/hyrax/statistics/query_service_spec.rb
index 1e11a3a152..32c07bcc9b 100644
--- a/spec/services/hyrax/query_service_spec.rb
+++ b/spec/services/hyrax/statistics/query_service_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe Hyrax::QueryService, :clean_repo do
+RSpec.describe Hyrax::Statistics::QueryService, :clean_repo do
   let(:service) { described_class.new }
 
   describe "#count" do
@@ -54,8 +54,9 @@
     end
 
     context "when file is registered" do
-      it { is_expected.to eq [work] }
       let(:read_groups) { ["registered"] }
+
+      it { is_expected.to eq [work] }
     end
   end
 
@@ -77,8 +78,9 @@
     end
 
     context "when file is registered" do
-      it { is_expected.to eq [] }
       let(:read_groups) { ["registered"] }
+
+      it { is_expected.to eq [] }
     end
   end
 

From af09e4f61e9eb8eaa8aad82fc0911eefa02e51cf Mon Sep 17 00:00:00 2001
From: Justin Coyne <jcoyne@justincoyne.com>
Date: Sun, 8 Oct 2017 22:44:51 -0500
Subject: [PATCH 02/18] Provide some Rails options that make the build faster

---
 .travis.yml   | 1 +
 hyrax.gemspec | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 66229106ee..79c963f361 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,6 +18,7 @@ rvm:
 env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+    - ENGINE_CART_RAILS_OPTIONS='--skip-git --skip-bundle --skip-listen --skip-spring --skip-yarn --skip-keeps --skip-action-cable --skip-coffee --skip-puma --skip-test'
   # Travis should check every minor version in a range of supported versions, because
   # rails does not follow sem-ver conventions, see http://guides.rubyonrails.org/maintenance_policy.html
   # It should be sufficient to test only the latest of the patch versions for a minor version, they
diff --git a/hyrax.gemspec b/hyrax.gemspec
index 133a7fb4da..459ba42f04 100644
--- a/hyrax.gemspec
+++ b/hyrax.gemspec
@@ -75,7 +75,7 @@ EOF
   spec.add_dependency 'active-fedora', '>= 11.3.1'
   spec.add_dependency 'linkeddata' # Required for getting values from geonames
 
-  spec.add_development_dependency 'engine_cart', '~> 1.0'
+  spec.add_development_dependency 'engine_cart', '~> 1.2'
   spec.add_development_dependency 'mida', '~> 0.3'
   spec.add_development_dependency 'database_cleaner', '~> 1.3'
   spec.add_development_dependency 'solr_wrapper', '~> 1.1'

From d3aa6a524dc22a99040fb5bb71390e1037825606 Mon Sep 17 00:00:00 2001
From: Jonathan Dixon <dixonj16@vbi.vt.edu>
Date: Mon, 9 Oct 2017 13:52:49 -0400
Subject: [PATCH 03/18] Include form error for works visibility field.

---
 app/assets/stylesheets/hyrax/_forms.scss                 | 6 +++++-
 app/views/hyrax/base/_form_visibility_component.html.erb | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/hyrax/_forms.scss b/app/assets/stylesheets/hyrax/_forms.scss
index bafa9ae03f..c6fad75a72 100644
--- a/app/assets/stylesheets/hyrax/_forms.scss
+++ b/app/assets/stylesheets/hyrax/_forms.scss
@@ -49,7 +49,11 @@ form {
 }
 
 .set-access-controls {
-  label { font-weight: normal; }
+  label {
+    color: #333;
+    font-weight: normal;
+  }
+
   & .form-group {
     padding: 0 1.75em;
 
diff --git a/app/views/hyrax/base/_form_visibility_component.html.erb b/app/views/hyrax/base/_form_visibility_component.html.erb
index d53feab9b4..2734d13f62 100644
--- a/app/views/hyrax/base/_form_visibility_component.html.erb
+++ b/app/views/hyrax/base/_form_visibility_component.html.erb
@@ -3,8 +3,9 @@
 <% elsif f.object.lease_expiration_date %>
   <%= render 'form_permission_under_lease', f: f %>
 <% else %>
-    <fieldset>
+    <fieldset<%= ' class="has-error"'.html_safe if f.object.errors.include?(:visibility)%>>
       <legend class="legend-save-work">Visibility</legend>
+      <%= f.error :visibility %>
       <ul class="visibility">
         <li class="radio">
           <label>

From 90d9b7f512fc154252ebab79740f8149bd7f1243 Mon Sep 17 00:00:00 2001
From: Justin Coyne <jcoyne@justincoyne.com>
Date: Mon, 9 Oct 2017 14:11:59 -0500
Subject: [PATCH 04/18] Move callbacks out of the model and into actors

Actors are a more appropriate place for business logic than models.
This will help support the change to alternative persistence strategies
(e.g. Valkyrie)
---
 .../hyrax/actors/transfer_request_actor.rb    | 23 ++++++++++
 app/models/concerns/hyrax/proxy_deposit.rb    |  8 ----
 .../hyrax/default_middleware_stack.rb         |  1 +
 .../actors/transfer_request_actor_spec.rb     | 43 +++++++++++++++++++
 spec/models/generic_work_spec.rb              | 11 -----
 .../hyrax/default_middleware_stack_spec.rb    |  1 +
 6 files changed, 68 insertions(+), 19 deletions(-)
 create mode 100644 app/actors/hyrax/actors/transfer_request_actor.rb
 create mode 100644 spec/actors/hyrax/actors/transfer_request_actor_spec.rb

diff --git a/app/actors/hyrax/actors/transfer_request_actor.rb b/app/actors/hyrax/actors/transfer_request_actor.rb
new file mode 100644
index 0000000000..1219767530
--- /dev/null
+++ b/app/actors/hyrax/actors/transfer_request_actor.rb
@@ -0,0 +1,23 @@
+module Hyrax
+  module Actors
+    # Notify the provided owner that their proxy wants to make a
+    # deposit on their behalf
+    class TransferRequestActor < AbstractActor
+      # @param [Hyrax::Actors::Environment] env
+      # @return [Boolean] true if create was successful
+      def create(env)
+        next_actor.create(env) && create_proxy_deposit_request(env)
+      end
+
+      private
+
+        def create_proxy_deposit_request(env)
+          proxy = env.curation_concern.on_behalf_of
+          return true if proxy.blank?
+          ContentDepositorChangeEventJob.perform_later(env.curation_concern,
+                                                       ::User.find_by_user_key(proxy))
+          true
+        end
+    end
+  end
+end
diff --git a/app/models/concerns/hyrax/proxy_deposit.rb b/app/models/concerns/hyrax/proxy_deposit.rb
index aefda2fee5..d0014036ca 100644
--- a/app/models/concerns/hyrax/proxy_deposit.rb
+++ b/app/models/concerns/hyrax/proxy_deposit.rb
@@ -11,14 +11,6 @@ module ProxyDeposit
       property :on_behalf_of, predicate: ::RDF::URI.new('http://scholarsphere.psu.edu/ns#onBehalfOf'), multiple: false do |index|
         index.as :symbol
       end
-
-      after_create :create_transfer_request
-    end
-
-    def create_transfer_request
-      return if on_behalf_of.blank?
-      ContentDepositorChangeEventJob.perform_later(self,
-                                                   ::User.find_by_user_key(on_behalf_of))
     end
 
     def request_transfer_to(target)
diff --git a/app/services/hyrax/default_middleware_stack.rb b/app/services/hyrax/default_middleware_stack.rb
index f09e945cca..386245c84c 100644
--- a/app/services/hyrax/default_middleware_stack.rb
+++ b/app/services/hyrax/default_middleware_stack.rb
@@ -13,6 +13,7 @@ def self.build_stack
         middleware.use Hyrax::Actors::AttachMembersActor
         middleware.use Hyrax::Actors::ApplyOrderActor
         middleware.use Hyrax::Actors::InterpretVisibilityActor
+        middleware.use Hyrax::Actors::TransferRequestActor
         middleware.use Hyrax::Actors::DefaultAdminSetActor
         middleware.use Hyrax::Actors::ApplyPermissionTemplateActor
         middleware.use Hyrax::Actors::CleanupFileSetsActor
diff --git a/spec/actors/hyrax/actors/transfer_request_actor_spec.rb b/spec/actors/hyrax/actors/transfer_request_actor_spec.rb
new file mode 100644
index 0000000000..a3a021e048
--- /dev/null
+++ b/spec/actors/hyrax/actors/transfer_request_actor_spec.rb
@@ -0,0 +1,43 @@
+require 'rails_helper'
+
+RSpec.describe Hyrax::Actors::TransferRequestActor do
+  let(:ability) { ::Ability.new(depositor) }
+  let(:env) { Hyrax::Actors::Environment.new(work, ability, attributes) }
+  let(:terminator) { Hyrax::Actors::Terminator.new }
+  let(:depositor) { create(:user) }
+  let(:work) do
+    build(:generic_work, on_behalf_of: proxied_to)
+  end
+  let(:attributes) { {} }
+
+  subject(:middleware) do
+    stack = ActionDispatch::MiddlewareStack.new.tap do |middleware|
+      middleware.use described_class
+    end
+    stack.build(terminator)
+  end
+
+  describe "create" do
+    context "when on_behalf_of is blank" do
+      let(:proxied_to) { '' }
+
+      it "returns true" do
+        expect(middleware.create(env)).to be true
+      end
+    end
+
+    context "when proxied_to is provided" do
+      let(:proxied_to) { 'james@example.com' }
+
+      before do
+        create(:user, email: proxied_to)
+        allow(terminator).to receive(:create).and_return(true)
+      end
+
+      it "adds the template users to the work" do
+        expect(ContentDepositorChangeEventJob).to receive(:perform_later).with(work, User)
+        expect(middleware.create(env)).to be true
+      end
+    end
+  end
+end
diff --git a/spec/models/generic_work_spec.rb b/spec/models/generic_work_spec.rb
index 93d9c139f3..3c6eff1b17 100644
--- a/spec/models/generic_work_spec.rb
+++ b/spec/models/generic_work_spec.rb
@@ -74,17 +74,6 @@
     end
   end
 
-  describe "created for someone (proxy)" do
-    let(:work) { described_class.new(title: ['demoname']) { |gw| gw.apply_depositor_metadata("user") } }
-    let(:transfer_to) { create(:user) }
-
-    it "transfers the request" do
-      work.on_behalf_of = transfer_to.user_key
-      expect(ContentDepositorChangeEventJob).to receive(:perform_later).once
-      work.save!
-    end
-  end
-
   describe "delegations" do
     let(:work) { described_class.new { |gw| gw.apply_depositor_metadata("user") } }
     let(:proxy_depositor) { create(:user) }
diff --git a/spec/services/hyrax/default_middleware_stack_spec.rb b/spec/services/hyrax/default_middleware_stack_spec.rb
index 5fbf3d9973..1965fe793d 100644
--- a/spec/services/hyrax/default_middleware_stack_spec.rb
+++ b/spec/services/hyrax/default_middleware_stack_spec.rb
@@ -17,6 +17,7 @@
         Hyrax::Actors::AttachMembersActor,
         Hyrax::Actors::ApplyOrderActor,
         Hyrax::Actors::InterpretVisibilityActor,
+        Hyrax::Actors::TransferRequestActor,
         Hyrax::Actors::DefaultAdminSetActor,
         Hyrax::Actors::ApplyPermissionTemplateActor,
         Hyrax::Actors::CleanupFileSetsActor,

From 51ecab7f3f31aa74a809f11d798c7de893c7e0b2 Mon Sep 17 00:00:00 2001
From: Justin Coyne <jcoyne@justincoyne.com>
Date: Mon, 9 Oct 2017 15:10:08 -0500
Subject: [PATCH 05/18] Bump tested ruby version to 2.4.2

Also made the rails 5.1 branch go first
---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 79c963f361..fd27e72532 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ before_install:
   - google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost &
 
 rvm:
-  - 2.4.1
+  - 2.4.2
 
 env:
   global:
@@ -24,8 +24,8 @@ env:
   # It should be sufficient to test only the latest of the patch versions for a minor version, they
   # should be compatible across patch versions (only bug fixes are released in patch versions).
   matrix:
-    - "RAILS_VERSION=5.0.6"
     - "RAILS_VERSION=5.1.4"
+    - "RAILS_VERSION=5.0.6"
 
 services:
   - redis-server

From 815d32ea264e0b44ccf2e9fa08eb8cf245c250a2 Mon Sep 17 00:00:00 2001
From: Jonathan Dixon <dixonj16@vbi.vt.edu>
Date: Mon, 9 Oct 2017 16:28:52 -0400
Subject: [PATCH 06/18] Render visibility errors in same way as other form
 errors.

---
 app/assets/stylesheets/hyrax/_forms.scss                 | 6 +-----
 app/views/hyrax/base/_form.html.erb                      | 3 ++-
 app/views/hyrax/base/_form_visibility_component.html.erb | 3 +--
 app/views/hyrax/base/_form_visibility_error.html.erb     | 3 +++
 spec/views/hyrax/base/_form.html.erb_spec.rb             | 2 ++
 5 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 app/views/hyrax/base/_form_visibility_error.html.erb

diff --git a/app/assets/stylesheets/hyrax/_forms.scss b/app/assets/stylesheets/hyrax/_forms.scss
index c6fad75a72..bafa9ae03f 100644
--- a/app/assets/stylesheets/hyrax/_forms.scss
+++ b/app/assets/stylesheets/hyrax/_forms.scss
@@ -49,11 +49,7 @@ form {
 }
 
 .set-access-controls {
-  label {
-    color: #333;
-    font-weight: normal;
-  }
-
+  label { font-weight: normal; }
   & .form-group {
     padding: 0 1.75em;
 
diff --git a/app/views/hyrax/base/_form.html.erb b/app/views/hyrax/base/_form.html.erb
index 9a5008d00b..9a2610c46c 100644
--- a/app/views/hyrax/base/_form.html.erb
+++ b/app/views/hyrax/base/_form.html.erb
@@ -4,12 +4,13 @@
                               'param-key' => @form.model_name.param_key },
                       multipart: true
                     } do |f| %>
-  <% if f.object.errors.include?(:base) %>
+  <% if f.object.errors.any? %>
     <div class="alert alert-danger alert-dismissable" role="alert">
       <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
       <%= f.object.errors.full_messages_for(:base).send(SimpleForm.error_method) %>
       <%= render 'form_in_works_error', f: f %>
       <%= render 'form_ordered_members_error', f: f %>
+      <%= render 'form_visibility_error', f: f %>
     </div>
   <% end %>
   <% if Flipflop.batch_upload? && f.object.new_record? %>
diff --git a/app/views/hyrax/base/_form_visibility_component.html.erb b/app/views/hyrax/base/_form_visibility_component.html.erb
index 2734d13f62..d53feab9b4 100644
--- a/app/views/hyrax/base/_form_visibility_component.html.erb
+++ b/app/views/hyrax/base/_form_visibility_component.html.erb
@@ -3,9 +3,8 @@
 <% elsif f.object.lease_expiration_date %>
   <%= render 'form_permission_under_lease', f: f %>
 <% else %>
-    <fieldset<%= ' class="has-error"'.html_safe if f.object.errors.include?(:visibility)%>>
+    <fieldset>
       <legend class="legend-save-work">Visibility</legend>
-      <%= f.error :visibility %>
       <ul class="visibility">
         <li class="radio">
           <label>
diff --git a/app/views/hyrax/base/_form_visibility_error.html.erb b/app/views/hyrax/base/_form_visibility_error.html.erb
new file mode 100644
index 0000000000..8fe6d98cd9
--- /dev/null
+++ b/app/views/hyrax/base/_form_visibility_error.html.erb
@@ -0,0 +1,3 @@
+<%= f.full_error(:visibility) %>
+<%= f.full_error(:embargo_release_date) %>
+<%= f.full_error(:visibility_after_embargo) %>
diff --git a/spec/views/hyrax/base/_form.html.erb_spec.rb b/spec/views/hyrax/base/_form.html.erb_spec.rb
index 318e9c9423..70ac5b2e3b 100644
--- a/spec/views/hyrax/base/_form.html.erb_spec.rb
+++ b/spec/views/hyrax/base/_form.html.erb_spec.rb
@@ -86,6 +86,7 @@
     before do
       # Add an error to the work
       work.errors.add :base, 'broken'
+      work.errors.add :visibility, 'visibility_error'
       allow(form).to receive(:select_files).and_return([])
     end
 
@@ -97,6 +98,7 @@
 
       # It diplays form errors
       expect(page).to have_content("broken")
+      expect(page).to have_content("visibility_error")
     end
   end
 end

From b77d977635cf8a5981a8646c80f78b0c299c554e Mon Sep 17 00:00:00 2001
From: Justin Coyne <jcoyne@justincoyne.com>
Date: Mon, 9 Oct 2017 16:01:00 -0500
Subject: [PATCH 07/18] Use FactoryGirl everywhere

---
 .../hyrax/api/items_controller_spec.rb        |  8 +++---
 .../hyrax/batch_edits_controller_spec.rb      |  9 +++----
 .../dashboard/profiles_controller_spec.rb     |  8 +++---
 .../hyrax/file_sets_controller_spec.rb        | 26 +++++--------------
 .../hyrax/fixity_checks_controller_spec.rb    |  2 +-
 .../hyrax/generic_works_controller_spec.rb    |  4 +--
 ...single_use_links_viewer_controller_spec.rb |  6 ++---
 spec/jobs/fixity_check_job_spec.rb            |  3 +--
 spec/presenters/hyrax/file_usage_spec.rb      | 10 +++----
 .../change_content_depositor_service_spec.rb  |  8 ++----
 .../hyrax/import_url_failure_service_spec.rb  |  4 +--
 ...ctly_contained_output_file_service_spec.rb |  3 ++-
 .../repository_fixity_check_service_spec.rb   |  4 +--
 .../services/hyrax/versioning_service_spec.rb |  7 ++---
 .../services/hyrax/work_query_service_spec.rb |  2 +-
 .../_show_document_list_row.html.erb_spec.rb  |  5 +---
 .../_show_document_list_row.html.erb_spec.rb  |  4 +--
 .../_show_document_list_row.html.erb_spec.rb  |  4 +--
 18 files changed, 38 insertions(+), 79 deletions(-)

diff --git a/spec/controllers/hyrax/api/items_controller_spec.rb b/spec/controllers/hyrax/api/items_controller_spec.rb
index aa97741981..45585df01c 100644
--- a/spec/controllers/hyrax/api/items_controller_spec.rb
+++ b/spec/controllers/hyrax/api/items_controller_spec.rb
@@ -2,10 +2,10 @@
   let(:arkivo_actor) { double Hyrax::Arkivo::Actor }
   let!(:user) { create(:user) }
   let!(:default_work) do
-    GenericWork.create(title: ['Foo Bar']) do |gf|
-      gf.apply_depositor_metadata(user)
-      gf.arkivo_checksum = '6872d21557992f6ad1d07375f19fbfaf'
-    end
+    create(:work,
+           title: ['Foo Bar'],
+           user: user,
+           arkivo_checksum: '6872d21557992f6ad1d07375f19fbfaf')
   end
 
   before do
diff --git a/spec/controllers/hyrax/batch_edits_controller_spec.rb b/spec/controllers/hyrax/batch_edits_controller_spec.rb
index d9d320c8f8..bae327c0c8 100644
--- a/spec/controllers/hyrax/batch_edits_controller_spec.rb
+++ b/spec/controllers/hyrax/batch_edits_controller_spec.rb
@@ -27,16 +27,13 @@
   end
 
   describe "update" do
+    let(:user) { build(:user) }
     let!(:one) do
-      GenericWork.create(creator: ["Fred"], title: ["abc"], language: ['en']) do |gw|
-        gw.apply_depositor_metadata('mjg36')
-      end
+      create(:generic_work, creator: ["Fred"], title: ["abc"], language: ['en'], user: user)
     end
 
     let!(:two) do
-      GenericWork.create(creator: ["Fred"], title: ["abc"], language: ['en']) do |gw|
-        gw.apply_depositor_metadata('mjg36')
-      end
+      create(:generic_work, creator: ["Fred"], title: ["abc"], language: ['en'], user: user)
     end
     let(:mycontroller) { "hyrax/my/works" }
 
diff --git a/spec/controllers/hyrax/dashboard/profiles_controller_spec.rb b/spec/controllers/hyrax/dashboard/profiles_controller_spec.rb
index cdb6bbee2c..e3b6991a4c 100644
--- a/spec/controllers/hyrax/dashboard/profiles_controller_spec.rb
+++ b/spec/controllers/hyrax/dashboard/profiles_controller_spec.rb
@@ -53,9 +53,9 @@
     end
 
     context "when the user has trophies" do
-      let(:work1) { GenericWork.create(title: ["w1"]) { |w| w.apply_depositor_metadata(user) } }
-      let(:work2) { GenericWork.create(title: ["w2"]) { |w| w.apply_depositor_metadata(user) } }
-      let(:work3) { GenericWork.create(title: ["w3"]) { |w| w.apply_depositor_metadata(user) } }
+      let(:work1) { create(:work, title: ["w1"], user: user) }
+      let(:work2) { create(:work, title: ["w2"], user: user) }
+      let(:work3) { create(:work, title: ["w3"], user: user) }
       let!(:trophy1) { user.trophies.create!(work_id: work1.id) }
       let!(:trophy2) { user.trophies.create!(work_id: work2.id) }
       let!(:trophy3) { user.trophies.create!(work_id: work3.id) }
@@ -138,7 +138,7 @@
     end
 
     context "when removing a trophy" do
-      let(:work) { GenericWork.create(title: ["w1"]) { |w| w.apply_depositor_metadata(user) } }
+      let(:work) { create(:generic_work, title: ["w1"], user: user) }
 
       before do
         user.trophies.create!(work_id: work.id)
diff --git a/spec/controllers/hyrax/file_sets_controller_spec.rb b/spec/controllers/hyrax/file_sets_controller_spec.rb
index 705e503032..d0195c77c0 100644
--- a/spec/controllers/hyrax/file_sets_controller_spec.rb
+++ b/spec/controllers/hyrax/file_sets_controller_spec.rb
@@ -114,14 +114,10 @@
     describe "#destroy" do
       context "file_set with a parent" do
         let(:file_set) do
-          FileSet.create do |fs|
-            fs.apply_depositor_metadata(user)
-          end
+          create(:file_set, user: user)
         end
         let(:work) do
-          GenericWork.create!(title: ['test title']) do |w|
-            w.apply_depositor_metadata(user)
-          end
+          create(:work, title: ['test title'], user: user)
         end
 
         let(:delete_message) { double('delete message') }
@@ -143,9 +139,7 @@
 
     describe "#edit" do
       let(:file_set) do
-        FileSet.create do |fs|
-          fs.apply_depositor_metadata(user)
-        end
+        create(:file_set, user: user)
       end
 
       before do
@@ -169,7 +163,7 @@
 
     describe "#update" do
       let(:file_set) do
-        FileSet.create! { |fs| fs.apply_depositor_metadata(user) }
+        create(:file_set, user: user)
       end
 
       context "when updating metadata" do
@@ -283,9 +277,7 @@
 
       context "when there's an error saving" do
         let(:file_set) do
-          FileSet.create do |fs|
-            fs.apply_depositor_metadata(user)
-          end
+          create(:file_set, user: user)
         end
 
         before do
@@ -303,9 +295,7 @@
 
     describe "#edit" do
       let(:file_set) do
-        FileSet.create(read_groups: ['public']) do |f|
-          f.apply_depositor_metadata('archivist1@example.com')
-        end
+        create(:file_set, read_groups: ['public'])
       end
 
       let(:file) do
@@ -434,9 +424,7 @@
     end
 
     let(:file_set) do
-      file_set = FileSet.create! do |gf|
-        gf.apply_depositor_metadata(user)
-      end
+      file_set = create(:file_set, user: user)
       parent.ordered_members << file_set
       parent.save
       file_set
diff --git a/spec/controllers/hyrax/fixity_checks_controller_spec.rb b/spec/controllers/hyrax/fixity_checks_controller_spec.rb
index ba76b32a64..1d1dd039e6 100644
--- a/spec/controllers/hyrax/fixity_checks_controller_spec.rb
+++ b/spec/controllers/hyrax/fixity_checks_controller_spec.rb
@@ -1,7 +1,7 @@
 RSpec.describe Hyrax::FixityChecksController do
   routes { Hyrax::Engine.routes }
   let(:user) { create(:user) }
-  let(:file_set) { FileSet.create { |fs| fs.apply_depositor_metadata(user) } }
+  let(:file_set) { create(:file_set, user: user) }
   let(:binary) { File.open(fixture_path + '/world.png') }
   let(:file) { Hydra::Derivatives::IoDecorator.new(binary, 'image/png', 'world.png') }
 
diff --git a/spec/controllers/hyrax/generic_works_controller_spec.rb b/spec/controllers/hyrax/generic_works_controller_spec.rb
index c36f7f4e77..5bc169980d 100644
--- a/spec/controllers/hyrax/generic_works_controller_spec.rb
+++ b/spec/controllers/hyrax/generic_works_controller_spec.rb
@@ -289,9 +289,7 @@
 
         context "when a work id is passed" do
           let(:work) do
-            GenericWork.create!(title: ['test title']) do |w|
-              w.apply_depositor_metadata(user)
-            end
+            create(:work, user: user, title: ['test title'])
           end
 
           it "records the work" do
diff --git a/spec/controllers/hyrax/single_use_links_viewer_controller_spec.rb b/spec/controllers/hyrax/single_use_links_viewer_controller_spec.rb
index dc436f7b92..cf0c8227cc 100644
--- a/spec/controllers/hyrax/single_use_links_viewer_controller_spec.rb
+++ b/spec/controllers/hyrax/single_use_links_viewer_controller_spec.rb
@@ -1,10 +1,8 @@
 RSpec.describe Hyrax::SingleUseLinksViewerController do
   routes { Hyrax::Engine.routes }
+  let(:user) { build(:user) }
   let(:file) do
-    FileSet.create! do |lfile|
-      lfile.label = 'world.png'
-      lfile.apply_depositor_metadata('mjg')
-    end
+    create(:file_set, label: 'world.png', user: user)
   end
 
   describe "retrieval links" do
diff --git a/spec/jobs/fixity_check_job_spec.rb b/spec/jobs/fixity_check_job_spec.rb
index dd75078021..827b8cc01f 100644
--- a/spec/jobs/fixity_check_job_spec.rb
+++ b/spec/jobs/fixity_check_job_spec.rb
@@ -2,8 +2,7 @@
   let(:user) { create(:user) }
 
   let(:file_set) do
-    FileSet.create do |file|
-      file.apply_depositor_metadata(user)
+    create(:file_set, user: user).tap do |file|
       Hydra::Works::AddFileToFileSet.call(file, File.open(fixture_path + '/world.png'), :original_file, versioning: true)
     end
   end
diff --git a/spec/presenters/hyrax/file_usage_spec.rb b/spec/presenters/hyrax/file_usage_spec.rb
index 6efddbd313..df37079c30 100644
--- a/spec/presenters/hyrax/file_usage_spec.rb
+++ b/spec/presenters/hyrax/file_usage_spec.rb
@@ -1,8 +1,7 @@
 RSpec.describe Hyrax::FileUsage, type: :model do
+  let(:user) { build(:user) }
   let(:file) do
-    FileSet.create do |file|
-      file.apply_depositor_metadata("awead")
-    end
+    create(:file_set, user: user)
   end
 
   let(:dates) do
@@ -148,11 +147,8 @@
 
   describe "on a migrated file" do
     let(:date_uploaded) { "2014-12-31" }
-
     let(:file_migrated) do
-      FileSet.create(date_uploaded: date_uploaded) do |file|
-        file.apply_depositor_metadata("awead")
-      end
+      create(:file_set, date_uploaded: date_uploaded, user: user)
     end
 
     let(:usage) do
diff --git a/spec/services/hyrax/change_content_depositor_service_spec.rb b/spec/services/hyrax/change_content_depositor_service_spec.rb
index c08c24027e..86ff1067f5 100644
--- a/spec/services/hyrax/change_content_depositor_service_spec.rb
+++ b/spec/services/hyrax/change_content_depositor_service_spec.rb
@@ -2,14 +2,10 @@
   let!(:depositor) { create(:user) }
   let!(:receiver) { create(:user) }
   let!(:file) do
-    FileSet.create! do |f|
-      f.apply_depositor_metadata(depositor.user_key)
-    end
+    create(:file_set, user: depositor)
   end
   let!(:work) do
-    GenericWork.create!(title: ['Test work']) do |w|
-      w.apply_depositor_metadata(depositor.user_key)
-    end
+    create(:work, title: ['Test work'], user: depositor)
   end
 
   before do
diff --git a/spec/services/hyrax/import_url_failure_service_spec.rb b/spec/services/hyrax/import_url_failure_service_spec.rb
index cea279404e..f41a188123 100644
--- a/spec/services/hyrax/import_url_failure_service_spec.rb
+++ b/spec/services/hyrax/import_url_failure_service_spec.rb
@@ -3,9 +3,7 @@
   let!(:depositor) { create(:user) }
   let(:inbox) { depositor.mailbox.inbox }
   let(:file) do
-    FileSet.create do |file|
-      file.apply_depositor_metadata(depositor)
-    end
+    create(:file_set, user: depositor)
   end
 
   before do
diff --git a/spec/services/hyrax/persist_directly_contained_output_file_service_spec.rb b/spec/services/hyrax/persist_directly_contained_output_file_service_spec.rb
index 645ce76e1a..e33c4b55fc 100644
--- a/spec/services/hyrax/persist_directly_contained_output_file_service_spec.rb
+++ b/spec/services/hyrax/persist_directly_contained_output_file_service_spec.rb
@@ -1,6 +1,7 @@
 RSpec.describe Hyrax::PersistDirectlyContainedOutputFileService do
   # PersistDirectlyContainedOutputFileService is used by FullTextExtract.output_file_service
-  let(:file_set) { FileSet.create! { |fs| fs.apply_depositor_metadata('justin') } }
+  let(:file_set) { create(:file_set, user: user) }
+  let(:user) { build(:user) }
   let(:content) { "fake file content" }
   let(:resource) { file_set.reload.extracted_text }
 
diff --git a/spec/services/hyrax/repository_fixity_check_service_spec.rb b/spec/services/hyrax/repository_fixity_check_service_spec.rb
index 599f56bf4f..5cd75c0318 100644
--- a/spec/services/hyrax/repository_fixity_check_service_spec.rb
+++ b/spec/services/hyrax/repository_fixity_check_service_spec.rb
@@ -1,9 +1,7 @@
 RSpec.describe Hyrax::RepositoryFixityCheckService do
-  let(:user) { FactoryGirl.create(:user) }
   let!(:file) do
-    FileSet.create! do |file|
+    create(:file_set).tap do |file|
       file.add_file(File.open(fixture_path + '/world.png'), path: 'content', original_name: 'world.png')
-      file.apply_depositor_metadata(user)
     end
   end
 
diff --git a/spec/services/hyrax/versioning_service_spec.rb b/spec/services/hyrax/versioning_service_spec.rb
index c8f05f99c5..b6e62dfff8 100644
--- a/spec/services/hyrax/versioning_service_spec.rb
+++ b/spec/services/hyrax/versioning_service_spec.rb
@@ -1,10 +1,7 @@
 RSpec.describe Hyrax::VersioningService do
   describe '#latest_version_of' do
-    let(:file) do
-      FileSet.create do |f|
-        f.apply_depositor_metadata('mjg36')
-      end
-    end
+    let(:user) { build(:user) }
+    let(:file) { create(:file_set) }
 
     before do
       # Add the original_file (this service  creates a version after saving when you call it with versioning: true)
diff --git a/spec/services/hyrax/work_query_service_spec.rb b/spec/services/hyrax/work_query_service_spec.rb
index d96bf07caf..ae76a2342d 100644
--- a/spec/services/hyrax/work_query_service_spec.rb
+++ b/spec/services/hyrax/work_query_service_spec.rb
@@ -45,7 +45,7 @@ module Hyrax
       context 'when the work is not deleted' do
         # NOTE: This is testing the full behavior of finding
         let!(:work_query_service) { described_class.new(id: work.id) }
-        let!(:work) { GenericWork.create(title: ["Test work"]) }
+        let!(:work) { create(:generic_work, title: ["Test work"]) }
 
         it 'will retrieve the SOLR document and use the #to_s method of that' do
           expect(subject).to eq(work.title.first)
diff --git a/spec/views/hyrax/admin/admin_sets/_show_document_list_row.html.erb_spec.rb b/spec/views/hyrax/admin/admin_sets/_show_document_list_row.html.erb_spec.rb
index 70af8e7329..012bfb5cab 100644
--- a/spec/views/hyrax/admin/admin_sets/_show_document_list_row.html.erb_spec.rb
+++ b/spec/views/hyrax/admin/admin_sets/_show_document_list_row.html.erb_spec.rb
@@ -1,11 +1,8 @@
-
 RSpec.describe 'hyrax/admin/admin_sets/_show_document_list_row.html.erb', type: :view do
   let(:user) { create(:user, groups: 'admin') }
 
   let(:work) do
-    GenericWork.create(creator: ["ggm"], title: ['One Hundred Years of Solitude']) do |gw|
-      gw.apply_depositor_metadata(user)
-    end
+    create(:work, user: user, creator: ["ggm"], title: ['One Hundred Years of Solitude'])
   end
 
   before do
diff --git a/spec/views/hyrax/collections/_show_document_list_row.html.erb_spec.rb b/spec/views/hyrax/collections/_show_document_list_row.html.erb_spec.rb
index d7632c9f00..59353b30c0 100644
--- a/spec/views/hyrax/collections/_show_document_list_row.html.erb_spec.rb
+++ b/spec/views/hyrax/collections/_show_document_list_row.html.erb_spec.rb
@@ -2,9 +2,7 @@
   let(:user) { create(:user) }
 
   let(:work) do
-    GenericWork.create(creator: ["ggm"], title: ['One Hundred Years of Solitude']) do |gw|
-      gw.apply_depositor_metadata(user)
-    end
+    create(:work, user: user, creator: ["ggm"], title: ['One Hundred Years of Solitude'])
   end
 
   let(:collection) { mock_model(Collection, title: 'My awesome collection', members: [work]) }
diff --git a/spec/views/hyrax/dashboard/collections/_show_document_list_row.html.erb_spec.rb b/spec/views/hyrax/dashboard/collections/_show_document_list_row.html.erb_spec.rb
index b357d6e413..bb684cea5c 100644
--- a/spec/views/hyrax/dashboard/collections/_show_document_list_row.html.erb_spec.rb
+++ b/spec/views/hyrax/dashboard/collections/_show_document_list_row.html.erb_spec.rb
@@ -2,9 +2,7 @@
   let(:user) { create(:user) }
 
   let(:work) do
-    GenericWork.create(creator: ["ggm"], title: ['One Hundred Years of Solitude']) do |gw|
-      gw.apply_depositor_metadata(user)
-    end
+    create(:work, user: user, creator: ["ggm"], title: ['One Hundred Years of Solitude'])
   end
 
   let(:collection) { mock_model(Collection, title: 'My awesome collection', members: [work]) }

From ae6aa5e404b4908665dda4ce3221d8fd7987ee1b Mon Sep 17 00:00:00 2001
From: Justin Coyne <jcoyne@justincoyne.com>
Date: Tue, 10 Oct 2017 08:52:01 -0500
Subject: [PATCH 08/18] Simplify config generator by moving files to expected
 locations

---
 lib/generators/hyrax/config_generator.rb      | 30 +++++++++----------
 .../config/{ => initializers}/hyrax.rb        |  0
 .../config/{ => initializers}/mini_magick.rb  |  0
 .../config/{ => initializers}/redis_config.rb |  0
 4 files changed, 14 insertions(+), 16 deletions(-)
 rename lib/generators/hyrax/templates/config/{ => initializers}/hyrax.rb (100%)
 rename lib/generators/hyrax/templates/config/{ => initializers}/mini_magick.rb (100%)
 rename lib/generators/hyrax/templates/config/{ => initializers}/redis_config.rb (100%)

diff --git a/lib/generators/hyrax/config_generator.rb b/lib/generators/hyrax/config_generator.rb
index c95fb6b86e..a7698e4d71 100644
--- a/lib/generators/hyrax/config_generator.rb
+++ b/lib/generators/hyrax/config_generator.rb
@@ -24,10 +24,8 @@ def local_authorities
   end
 
   def simple_form_initializers
-    copy_file 'config/initializers/simple_form.rb',
-              'config/initializers/simple_form.rb'
-    copy_file 'config/initializers/simple_form_bootstrap.rb',
-              'config/initializers/simple_form_bootstrap.rb'
+    copy_file 'config/initializers/simple_form.rb'
+    copy_file 'config/initializers/simple_form_bootstrap.rb'
   end
 
   def configure_endnote
@@ -36,30 +34,30 @@ def configure_endnote
   end
 
   def configure_redis
-    copy_file 'config/redis.yml', 'config/redis.yml'
-    copy_file 'config/redis_config.rb', 'config/initializers/redis_config.rb'
+    copy_file 'config/redis.yml'
+    copy_file 'config/initializers/redis_config.rb'
   end
 
   def create_initializer_config_file
-    copy_file 'config/hyrax.rb', 'config/initializers/hyrax.rb'
+    copy_file 'config/initializers/hyrax.rb'
   end
 
   # Add mini-magick configuration
   def minimagick_config
-    copy_file 'config/mini_magick.rb', 'config/initializers/mini_magick.rb'
+    copy_file 'config/initializers/mini_magick.rb'
   end
 
   def tinymce_config
-    copy_file "config/tinymce.yml", "config/tinymce.yml"
+    copy_file 'config/tinymce.yml'
   end
 
   def inject_i18n
-    copy_file "config/locales/hyrax.en.yml", "config/locales/hyrax.en.yml"
-    copy_file "config/locales/hyrax.es.yml", "config/locales/hyrax.es.yml"
-    copy_file "config/locales/hyrax.zh.yml", "config/locales/hyrax.zh.yml"
-    copy_file "config/locales/hyrax.de.yml", "config/locales/hyrax.de.yml"
-    copy_file "config/locales/hyrax.fr.yml", "config/locales/hyrax.fr.yml"
-    copy_file "config/locales/hyrax.it.yml", "config/locales/hyrax.it.yml"
-    copy_file "config/locales/hyrax.pt-BR.yml", "config/locales/hyrax.pt-BR.yml"
+    copy_file 'config/locales/hyrax.en.yml'
+    copy_file 'config/locales/hyrax.es.yml'
+    copy_file 'config/locales/hyrax.zh.yml'
+    copy_file 'config/locales/hyrax.de.yml'
+    copy_file 'config/locales/hyrax.fr.yml'
+    copy_file 'config/locales/hyrax.it.yml'
+    copy_file 'config/locales/hyrax.pt-BR.yml'
   end
 end
diff --git a/lib/generators/hyrax/templates/config/hyrax.rb b/lib/generators/hyrax/templates/config/initializers/hyrax.rb
similarity index 100%
rename from lib/generators/hyrax/templates/config/hyrax.rb
rename to lib/generators/hyrax/templates/config/initializers/hyrax.rb
diff --git a/lib/generators/hyrax/templates/config/mini_magick.rb b/lib/generators/hyrax/templates/config/initializers/mini_magick.rb
similarity index 100%
rename from lib/generators/hyrax/templates/config/mini_magick.rb
rename to lib/generators/hyrax/templates/config/initializers/mini_magick.rb
diff --git a/lib/generators/hyrax/templates/config/redis_config.rb b/lib/generators/hyrax/templates/config/initializers/redis_config.rb
similarity index 100%
rename from lib/generators/hyrax/templates/config/redis_config.rb
rename to lib/generators/hyrax/templates/config/initializers/redis_config.rb

From 484a827cb6ced84ecbde76f2357052eda9ab1ea7 Mon Sep 17 00:00:00 2001
From: Justin Coyne <jcoyne@justincoyne.com>
Date: Tue, 10 Oct 2017 09:08:06 -0500
Subject: [PATCH 09/18] Use the correct invocation of render_thumbnail_tag

Fixes #1820
---
 app/views/hyrax/homepage/_recent_document.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/hyrax/homepage/_recent_document.html.erb b/app/views/hyrax/homepage/_recent_document.html.erb
index 45981aa391..fd1fad9ccd 100644
--- a/app/views/hyrax/homepage/_recent_document.html.erb
+++ b/app/views/hyrax/homepage/_recent_document.html.erb
@@ -2,7 +2,7 @@
       <td class="col-sm-2">
         <%= link_to_profile recent_document.depositor("no depositor value") %>
         <%= link_to [main_app, recent_document] do %>
-          <%= render_thumbnail_tag recent_document, { width: 45 }, false %>
+          <%= render_thumbnail_tag recent_document, { width: 45 }, suppress_link: true %>
         <% end %>
       </td>
       <td>

From b62ad461ec52a7d8171afdfcdc3aa6faff18abea Mon Sep 17 00:00:00 2001
From: Olli Lyytinen <olli.lyytinen@durham.ac.uk>
Date: Tue, 10 Oct 2017 09:28:08 +0100
Subject: [PATCH 10/18] Validate local file ingestions against a whitelist of
 directories.

---
 .../actors/create_with_remote_files_actor.rb  | 22 ++++++++++++
 .../templates/config/initializers/hyrax.rb    | 16 +++++++++
 lib/hyrax/configuration.rb                    | 12 +++++++
 .../create_with_remote_files_actor_spec.rb    | 36 +++++++++++++++++++
 spec/lib/hyrax/configuration_spec.rb          |  2 ++
 5 files changed, 88 insertions(+)

diff --git a/app/actors/hyrax/actors/create_with_remote_files_actor.rb b/app/actors/hyrax/actors/create_with_remote_files_actor.rb
index 7f79768998..50f1f1ba6c 100644
--- a/app/actors/hyrax/actors/create_with_remote_files_actor.rb
+++ b/app/actors/hyrax/actors/create_with_remote_files_actor.rb
@@ -18,12 +18,34 @@ def update(env)
 
       private
 
+        def whitelisted_ingest_dirs
+          Hyrax.config.whitelisted_ingest_dirs
+        end
+
+        def validate_remote_url(url)
+          uri = URI.parse(URI.encode(url))
+          if uri.scheme == 'file'
+            path = File.absolute_path(URI.decode(uri.path))
+            whitelisted_ingest_dirs.any? do |dir|
+              path.start_with?(dir) && path.length > dir.length
+            end
+          else
+            # TODO: It might be a good idea to validate other URLs as well.
+            #       The server can probably access URLs the user can't.
+            true
+          end
+        end
+
         # @param [HashWithIndifferentAccess] remote_files
         # @return [TrueClass]
         def attach_files(env, remote_files)
           return true unless remote_files
           remote_files.each do |file_info|
             next if file_info.blank? || file_info[:url].blank?
+            unless validate_remote_url(file_info[:url])
+              Rails.logger.error "User #{env.user.user_key} attempted to ingest file from url #{file_info[:url]}, which doesn't pass validation"
+              return false
+            end
             create_file_from_url(env, file_info[:url], file_info[:file_name])
           end
           true
diff --git a/lib/generators/hyrax/templates/config/initializers/hyrax.rb b/lib/generators/hyrax/templates/config/initializers/hyrax.rb
index 7ab22c0883..808dbe681e 100644
--- a/lib/generators/hyrax/templates/config/initializers/hyrax.rb
+++ b/lib/generators/hyrax/templates/config/initializers/hyrax.rb
@@ -201,6 +201,22 @@
   rescue Errno::ENOENT
     config.browse_everything = nil
   end
+
+  ## Whitelist all directories which can be used to ingest from the local file
+  # system.
+  #
+  # Any file, and only those, that is anywhere under one of the specified
+  # directories can be used by CreateWithRemoteFilesActor to add local files
+  # to works. Files uploaded by the user are handled separately and the
+  # temporary directory for those need not be included here.
+  #
+  # Default value includes BrowseEverything.config['file_system'][:home] if it
+  # is set, otherwise default is an empty list. You should only need to change
+  # this if you have custom ingestions using CreateWithRemoteFilesActor to
+  # ingest files from the file system that are not part of the BrowseEverything
+  # mount point.
+  #
+  # config.whitelisted_ingest_dirs = []
 end
 
 Date::DATE_FORMATS[:standard] = "%m/%d/%Y"
diff --git a/lib/hyrax/configuration.rb b/lib/hyrax/configuration.rb
index 5ed286f925..f70506c96b 100644
--- a/lib/hyrax/configuration.rb
+++ b/lib/hyrax/configuration.rb
@@ -176,6 +176,18 @@ def bagit_dir
       @bagit_dir ||= "tmp/descriptions"
     end
 
+    # @!attribute [w] whitelisted_ingest_dirs
+    #   List of directories which can be used for local file system ingestion.
+    attr_writer :whitelisted_ingest_dirs
+    def whitelisted_ingest_dirs
+      @whitelisted_ingest_dirs ||= \
+        if defined? BrowseEverything
+          Array.wrap(BrowseEverything.config['file_system'].try(:[], :home)).compact
+        else
+          []
+        end
+    end
+
     callback.enable :after_create_concern, :after_create_fileset,
                     :after_update_content, :after_revert_content,
                     :after_update_metadata, :after_import_local_file_success,
diff --git a/spec/actors/hyrax/actors/create_with_remote_files_actor_spec.rb b/spec/actors/hyrax/actors/create_with_remote_files_actor_spec.rb
index 3e088a7fbd..65e65179db 100644
--- a/spec/actors/hyrax/actors/create_with_remote_files_actor_spec.rb
+++ b/spec/actors/hyrax/actors/create_with_remote_files_actor_spec.rb
@@ -51,11 +51,25 @@
          file_name: "here.txt" }]
     end
 
+    before do
+      allow(Hyrax.config).to receive(:whitelisted_ingest_dirs).and_return(["/local/file/"])
+    end
+
     it "attaches files" do
       expect(IngestLocalFileJob).to receive(:perform_later).with(FileSet, "/local/file/here.txt", user)
       expect(actor.create(environment)).to be true
     end
 
+    context "with files from non-whitelisted directories" do
+      let(:file) { "file:///local/otherdir/test.txt" }
+
+      it "doesn't attach files" do
+        expect(actor).to receive(:validate_remote_url).and_call_original
+        expect(IngestLocalFileJob).not_to receive(:perform_later)
+        expect(actor.create(environment)).to be false
+      end
+    end
+
     context "with spaces" do
       let(:file) { "file:///local/file/ pigs .txt" }
 
@@ -65,4 +79,26 @@
       end
     end
   end
+
+  describe "#validate_remote_url" do
+    before do
+      allow(Hyrax.config).to receive(:whitelisted_ingest_dirs).and_return(['/test/', '/local/file/'])
+    end
+
+    it "accepts file: urls in whitelisted directories" do
+      expect(actor.send(:validate_remote_url, "file:///local/file/test.txt")).to be true
+      expect(actor.send(:validate_remote_url, "file:///local/file/subdirectory/test.txt")).to be true
+      expect(actor.send(:validate_remote_url, "file:///test/test.txt")).to be true
+    end
+
+    it "rejects file: urls outside whitelisted directories" do
+      expect(actor.send(:validate_remote_url, "file:///tmp/test.txt")).to be false
+      expect(actor.send(:validate_remote_url, "file:///test/../tmp/test.txt")).to be false
+      expect(actor.send(:validate_remote_url, "file:///test/")).to be false
+    end
+
+    it "accepts other types of urls" do
+      expect(actor.send(:validate_remote_url, "https://example.com/test.txt")).to be true
+    end
+  end
 end
diff --git a/spec/lib/hyrax/configuration_spec.rb b/spec/lib/hyrax/configuration_spec.rb
index 36ec7611e1..1f974b81b0 100644
--- a/spec/lib/hyrax/configuration_spec.rb
+++ b/spec/lib/hyrax/configuration_spec.rb
@@ -59,4 +59,6 @@
   it { is_expected.to respond_to(:upload_path) }
   it { is_expected.to respond_to(:work_requires_files?) }
   it { is_expected.to respond_to(:extract_full_text?) }
+  it { is_expected.to respond_to(:whitelisted_ingest_dirs) }
+  it { is_expected.to respond_to(:whitelisted_ingest_dirs=) }
 end

From e82cab89c6c8591445d2731a28938a510e7ab605 Mon Sep 17 00:00:00 2001
From: "Michael J. Giarlo" <mjgiarlo@stanford.edu>
Date: Tue, 10 Oct 2017 11:10:17 -0700
Subject: [PATCH 11/18] Bump version to 2.0.0.beta5

---
 README.md                   |  4 ++--
 config/locales/hyrax.de.yml | 17 +++++++++--------
 lib/hyrax/version.rb        |  2 +-
 template.rb                 |  2 +-
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 4778695763..be13d20476 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,7 @@ The Samvera community is here to help. Please see our [support guide](./.github/
 # Getting started
 
 This document contains instructions specific to setting up an app with __Hyrax
-v2.0.0.beta4__. If you are looking for instructions on installing a different
+v2.0.0.beta5__. 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.
 
@@ -160,7 +160,7 @@ NOTE: The steps need to be done in order to create a new Hyrax based app.
 Generate a new Rails application using the template.
 
 ```
-rails _5.0.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v2.0.0.beta4/template.rb
+rails _5.0.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v2.0.0.beta5/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:
diff --git a/config/locales/hyrax.de.yml b/config/locales/hyrax.de.yml
index c669838afa..cafc661555 100644
--- a/config/locales/hyrax.de.yml
+++ b/config/locales/hyrax.de.yml
@@ -140,6 +140,7 @@ de:
                 2yrs: 2 Jahre nach der Deponierung
                 3yrs: 3 Jahre nach der Deponierung
                 6mos: 6 Monate nach der Deponierung
+                select: Wählen Sie die Sperrfrist aus.
           visibility:
             description: 'Nach dem Release-Datum können die Arbeiten in diesem Admin-Set eingesehen und heruntergeladen werden durch:'
             everyone: Jeder - alle Arbeiten in diesem Admin-Set werden öffentlich sein
@@ -166,8 +167,8 @@ de:
             success: Das Design wurde erfolgreich aktualisiert
       features:
         index:
-          feature: Features
-          header: Features
+          action: Aktion
+          description: Beschreibung
           feature: Charakteristisch
           header: Charakteristik
       sidebar:
@@ -186,8 +187,8 @@ de:
         tasks: Aufgaben
         technical: Charakteristik
         transfers: Transfers
-        user_activity: Ihre Tätigkeit
         user_activity: Ihre Aktivitäten
+        users: Benutzer verwalten
         workflow_review: Review-Rückmeldung
         workflow_roles: Workflow-Rollen
         works: Arbeiten
@@ -204,13 +205,13 @@ de:
             unpublished: Unveröffentlicht
         user_deposits:
           end_label: Ende [Voreinstellung]
-          start_label: Beginn
+          heading: Von Benutzern hinterlegte Dateien anzeigen
           start_label: Beginnend
         works:
           headers:
             main: Statistik Arbeiten
             total: 'Arbeiten gesamt:'
-            visibility: Summen nach Freigabe- und Sichtbarkeitsbeschränkungen 
+            visibility: Summen nach Freigabe- und Sichtbarkeitsbeschränkungen
       users:
         index:
           access_label: Letzter Zugriff
@@ -285,7 +286,7 @@ de:
         requirements: Bedarf
       items:
         actions: Aktionen
-        date_uploaded: Datum Upload 
+        date_uploaded: Datum Upload
         empty: Diese %{type} hat keine Dateien zugeordnet. Klicken Sie auf "Bearbeiten", um weitere Dateien hinzuzufügen.
         header: Artikel
         thumbnail: Miniaturansicht
@@ -354,7 +355,7 @@ de:
         create: Sammlung erstellen
         create_new: Zu neuer Sammlung hinzufügen
         no_collections: Sie haben keinen Zugang zu vorhandenen Sammlungen. Sie können eine neue Sammlung erstellen.
-        update: Sammlung updaten
+        select_heading: 'Wählen Sie die Sammlung aus, um Ihre Dateien hinzuzufügen:'
         title: Zur Sammlung hinzufügen
         update: Update-Sammlung
     collections:
@@ -857,7 +858,7 @@ de:
         related_url: Zugehörige URL
         title: Titel
         visibility_after_embargo: Dann öffnen sie es bis zu
-        visibility_after_lease: Zugriffsbeschränkung nach diesem Zeitraum 
+        visibility_after_lease: Zugriffsbeschränkung nach diesem Zeitraum
         visibility_during_embargo: Beschränkt auf
         visibility_during_lease: Ist vorhanden für
       proxy_deposit_request:
diff --git a/lib/hyrax/version.rb b/lib/hyrax/version.rb
index bda2bcf6cd..c08ddacac5 100644
--- a/lib/hyrax/version.rb
+++ b/lib/hyrax/version.rb
@@ -1,3 +1,3 @@
 module Hyrax
-  VERSION = '2.0.0.beta4'.freeze
+  VERSION = '2.0.0.beta5'.freeze
 end
diff --git a/template.rb b/template.rb
index 931a3913b8..d7e159395e 100644
--- a/template.rb
+++ b/template.rb
@@ -1,4 +1,4 @@
-gem 'hyrax', '2.0.0.beta4'
+gem 'hyrax', '2.0.0.beta5'
 run 'bundle install'
 generate 'hyrax:install', '-f'
 rails_command 'db:migrate'

From 258d9d7e0d6a9bcc7987c25964aee2c111e743c8 Mon Sep 17 00:00:00 2001
From: Jonathan Dixon <dixonj16@vbi.vt.edu>
Date: Tue, 10 Oct 2017 14:53:03 -0400
Subject: [PATCH 12/18] Restrict visibility options based on AS template.

---
 .../hyrax/save_work/visibility_component.es6  | 37 +++++++++++++++----
 spec/javascripts/visibility_component_spec.js | 19 ++++++++++
 2 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/hyrax/save_work/visibility_component.es6 b/app/assets/javascripts/hyrax/save_work/visibility_component.es6
index 1225e1af03..841d16d9a0 100644
--- a/app/assets/javascripts/hyrax/save_work/visibility_component.es6
+++ b/app/assets/javascripts/hyrax/save_work/visibility_component.es6
@@ -76,14 +76,9 @@ export default class VisibilityComponent {
   // Apply visibility/release restrictions based on selected AdminSet
   applyRestrictions(visibility, release_no_delay, release_date, release_before)
   {
-     // If immediate release required and visibility specified
-     if(release_no_delay && visibility) {
-       // Select required visibility
-       this.selectVisibility(visibility)
-     }
-     else if(release_no_delay) {
-       // No visibility required, but must be released today. Disable embargo & lease.
-       this.disableEmbargoAndLease();
+     // If immediate release required or the release date is in the past.
+     if(release_no_delay || (release_date && (new Date() > Date.parse(release_date)))) {
+       this.requireReleaseNow(visibility)
      }
      // Otherwise if future date and release_before==true, must be released between today and release_date
      else if(release_date && release_before) {
@@ -137,6 +132,18 @@ export default class VisibilityComponent {
     this.selectVisibilityAfterEmbargo(visibility)
   }
 
+  // Require release now
+  requireReleaseNow(visibility) {
+    if(visibility) {
+      // Select required visibility
+      this.selectVisibility(visibility)
+    }
+    else {
+      // No visibility required, but must be released today. Disable embargo & lease.
+      this.disableEmbargoAndLease()
+    }
+  }
+
   // Disable Embargo and Lease options. Work must be released immediately
   disableEmbargoAndLease() {
     this.disableVisibilityOptions(["embargo","lease"])
@@ -153,6 +160,8 @@ export default class VisibilityComponent {
       this.element.find(matchEnabled).prop("disabled", false)
     }
     this.element.find(matchDisabled).prop("disabled", true)
+
+    this.checkEnabledVisibilityOption()
   }
 
   // Disable one or more visibility option (based on array of passed in options),
@@ -166,6 +175,8 @@ export default class VisibilityComponent {
       this.element.find(matchDisabled).prop("disabled", true)
     }
     this.element.find(matchEnabled).prop("disabled", false)
+
+    this.checkEnabledVisibilityOption()
   }
 
   // Create a jQuery matcher which will match for all the specified options
@@ -255,6 +266,16 @@ export default class VisibilityComponent {
     return this.element.find("select[id$='_visibility_after_embargo']")
   }
 
+  // If the selected visibility option is disabled change selection to the
+  // least public option that is enabled.
+  checkEnabledVisibilityOption() {
+    if (this.element.find("[type='radio']:disabled:checked").length > 0) {
+      this.element.find("[type='radio']:enabled").last().prop('checked', true)
+      // Ensure required option is opened in form
+      this.showForm()
+    }
+  }
+
   // Get today's date in YYYY-MM-DD format
   getToday() {
     let today = new Date()
diff --git a/spec/javascripts/visibility_component_spec.js b/spec/javascripts/visibility_component_spec.js
index d43fa8a737..e0494669c4 100644
--- a/spec/javascripts/visibility_component_spec.js
+++ b/spec/javascripts/visibility_component_spec.js
@@ -169,6 +169,25 @@ describe("VisibilityComponent", function() {
         expect(target.requireEmbargo).toHaveBeenCalledWith("authenticated", futureDate);
       });
     });
+    describe("with required past release date, dont restrict visibility", function() {
+      beforeEach(function() {
+        spyOn(target, 'disableEmbargoAndLease');
+      });
+      it("require visibility", function() {
+        target.applyRestrictions(undefined, undefined, "2017-01-01", false);
+        expect(target.disableEmbargoAndLease).toHaveBeenCalled();
+      });
+    });
+    describe("with required past release date, and required visibility", function() {
+      beforeEach(function() {
+        spyOn(target, 'selectVisibility');
+      });
+      it("require visibility", function() {
+        var visibility = "authenticated";
+        target.applyRestrictions(visibility, undefined, "2017-01-01", false);
+        expect(target.selectVisibility).toHaveBeenCalledWith(visibility);
+      });
+    });
   });
 
   //selectVisibility(visibility)

From 7815f7a59c6d3b51d61d2a8f09ffd23c2624d709 Mon Sep 17 00:00:00 2001
From: Julie Allinson <julie.allinson@london.ac.uk>
Date: Sun, 8 Oct 2017 14:37:45 +0100
Subject: [PATCH 13/18] Remove rights from the catalog_controller in the Hyrax
 generator as rights is no longer part of basic_metadata so should not be
 listed; add license and rights_statement as these have replaced rights. Do
 the same in all locales template files. Add a helper method for
 rights_statement links and and rename the rights_statements service to
 rights_statement_service to be consistent with the license_service. Fixes
 #1765.

---
 app/helpers/hyrax/hyrax_helper_behavior.rb    | 14 +++++++++----
 ...tements.rb => rights_statement_service.rb} |  2 +-
 .../edit_fields/_rights_statement.html.erb    |  2 +-
 .../hyrax/templates/catalog_controller.rb     | 18 ++++++++++++----
 .../templates/config/locales/hyrax.de.yml     |  6 ++++--
 .../templates/config/locales/hyrax.en.yml     |  6 ++++--
 .../templates/config/locales/hyrax.es.yml     |  6 ++++--
 .../templates/config/locales/hyrax.fr.yml     |  2 ++
 .../templates/config/locales/hyrax.it.yml     |  6 ++++--
 .../templates/config/locales/hyrax.pt-BR.yml  |  6 ++++--
 .../templates/config/locales/hyrax.zh.yml     |  6 ++++--
 spec/helpers/blacklight_helper_spec.rb        | 21 ++++++++++++-------
 spec/helpers/hyrax_helper_spec.rb             | 10 +++++++--
 ...ec.rb => rights_statement_service_spec.rb} |  2 +-
 .../_index_list_default.html.erb_spec.rb      |  6 +++---
 15 files changed, 78 insertions(+), 35 deletions(-)
 rename app/services/hyrax/{rights_statements.rb => rights_statement_service.rb} (75%)
 rename spec/services/hyrax/{rights_statements_spec.rb => rights_statement_service_spec.rb} (86%)

diff --git a/app/helpers/hyrax/hyrax_helper_behavior.rb b/app/helpers/hyrax/hyrax_helper_behavior.rb
index 45a6a1ac6b..a9171fe474 100644
--- a/app/helpers/hyrax/hyrax_helper_behavior.rb
+++ b/app/helpers/hyrax/hyrax_helper_behavior.rb
@@ -1,5 +1,3 @@
-# coding: utf-8
-
 module Hyrax
   module HyraxHelperBehavior
     include Hyrax::CitationsBehavior
@@ -198,13 +196,21 @@ def link_to_profile(args)
     end
 
     # A Blacklight index field helper_method
-    # @param [Hash] options from blacklight helper_method invocation. Maps rights URIs to links with labels.
-    # @return [ActiveSupport::SafeBuffer] rights statement links, html_safe
+    # @param [Hash] options from blacklight helper_method invocation. Maps license URIs to links with labels.
+    # @return [ActiveSupport::SafeBuffer] license links, html_safe
     def license_links(options)
       service = Hyrax::LicenseService.new
       options[:value].map { |right| link_to service.label(right), right }.to_sentence.html_safe
     end
 
+    # A Blacklight index field helper_method
+    # @param [Hash] options from blacklight helper_method invocation. Maps rights statement URIs to links with labels.
+    # @return [ActiveSupport::SafeBuffer] rights statement links, html_safe
+    def rights_statement_links(options)
+      service = Hyrax::RightsStatementService.new
+      options[:value].map { |right| link_to service.label(right), right }.to_sentence.html_safe
+    end
+
     def link_to_telephone(user)
       return unless user
       link_to user.telephone, "wtai://wp/mc;#{user.telephone}" if user.telephone
diff --git a/app/services/hyrax/rights_statements.rb b/app/services/hyrax/rights_statement_service.rb
similarity index 75%
rename from app/services/hyrax/rights_statements.rb
rename to app/services/hyrax/rights_statement_service.rb
index 39fb1138b4..c6cfcfef9e 100644
--- a/app/services/hyrax/rights_statements.rb
+++ b/app/services/hyrax/rights_statement_service.rb
@@ -1,6 +1,6 @@
 module Hyrax
   # Provide select options for the copyright status (edm:rights) field
-  class RightsStatements < QaSelectService
+  class RightsStatementService < QaSelectService
     def initialize
       super('rights_statements')
     end
diff --git a/app/views/records/edit_fields/_rights_statement.html.erb b/app/views/records/edit_fields/_rights_statement.html.erb
index dc901c4800..b7b075027e 100644
--- a/app/views/records/edit_fields/_rights_statement.html.erb
+++ b/app/views/records/edit_fields/_rights_statement.html.erb
@@ -1,4 +1,4 @@
-<% rights_statements = Hyrax::RightsStatements.new %>
+<% rights_statements = Hyrax::RightsStatementService.new %>
 <%= f.input :rights_statement,
     collection: rights_statements.select_active_options,
     include_blank: true,
diff --git a/lib/generators/hyrax/templates/catalog_controller.rb b/lib/generators/hyrax/templates/catalog_controller.rb
index ea1d586b58..34fc752022 100644
--- a/lib/generators/hyrax/templates/catalog_controller.rb
+++ b/lib/generators/hyrax/templates/catalog_controller.rb
@@ -71,7 +71,8 @@ def self.modified_field
     config.add_index_field solr_name("date_uploaded", :stored_sortable, type: :date), itemprop: 'datePublished', helper_method: :human_readable_date
     config.add_index_field solr_name("date_modified", :stored_sortable, type: :date), itemprop: 'dateModified', helper_method: :human_readable_date
     config.add_index_field solr_name("date_created", :stored_searchable), itemprop: 'dateCreated'
-    config.add_index_field solr_name("rights", :stored_searchable), helper_method: :license_links
+    config.add_index_field solr_name("rights_statement", :stored_searchable), helper_method: :rights_statement_links
+    config.add_index_field solr_name("license", :stored_searchable), helper_method: :license_links
     config.add_index_field solr_name("resource_type", :stored_searchable), label: "Resource Type", link_to_search: solr_name("resource_type", :facetable)
     config.add_index_field solr_name("file_format", :stored_searchable), link_to_search: solr_name("file_format", :facetable)
     config.add_index_field solr_name("identifier", :stored_searchable), helper_method: :index_field_link, field_name: 'identifier'
@@ -92,7 +93,8 @@ def self.modified_field
     config.add_show_field solr_name("date_uploaded", :stored_searchable)
     config.add_show_field solr_name("date_modified", :stored_searchable)
     config.add_show_field solr_name("date_created", :stored_searchable)
-    config.add_show_field solr_name("rights", :stored_searchable)
+    config.add_show_field solr_name("rights_statement", :stored_searchable)
+    config.add_show_field solr_name("license", :stored_searchable)
     config.add_show_field solr_name("resource_type", :stored_searchable), label: "Resource Type"
     config.add_show_field solr_name("format", :stored_searchable)
     config.add_show_field solr_name("identifier", :stored_searchable)
@@ -248,8 +250,16 @@ def self.modified_field
       }
     end
 
-    config.add_search_field('rights') do |field|
-      solr_name = solr_name("rights", :stored_searchable)
+    config.add_search_field('rights_statement') do |field|
+      solr_name = solr_name("rights_statement", :stored_searchable)
+      field.solr_local_parameters = {
+        qf: solr_name,
+        pf: solr_name
+      }
+    end
+
+    config.add_search_field('license') do |field|
+      solr_name = solr_name("license", :stored_searchable)
       field.solr_local_parameters = {
         qf: solr_name,
         pf: solr_name
diff --git a/lib/generators/hyrax/templates/config/locales/hyrax.de.yml b/lib/generators/hyrax/templates/config/locales/hyrax.de.yml
index 74ec39594a..ba9032690e 100644
--- a/lib/generators/hyrax/templates/config/locales/hyrax.de.yml
+++ b/lib/generators/hyrax/templates/config/locales/hyrax.de.yml
@@ -24,8 +24,9 @@ de:
           identifier_tesim: Identifikator
           keyword_tesim: Stichwort
           language_tesim: Sprache
+          license_tesim: Lizenz
           publisher_tesim: Herausgeber
-          rights_tesim: Rechte
+          rights_statement_tesim: Rechte
           subject_tesim: Fach
         show:
           based_near_tesim: Ort
@@ -39,8 +40,9 @@ de:
           identifier_tesim: Identifikator
           keyword_tesim: Stichwort
           language_tesim: Sprache
+          license_tesim: Lizenz
           publisher_tesim: Herausgeber
-          rights_tesim: Rechte
+          rights_statement_tesim: Rechte
           subject_tesim: Fach
           title_tesim: Titel
   hyrax:
diff --git a/lib/generators/hyrax/templates/config/locales/hyrax.en.yml b/lib/generators/hyrax/templates/config/locales/hyrax.en.yml
index 224b88cad2..13fbad8f8f 100644
--- a/lib/generators/hyrax/templates/config/locales/hyrax.en.yml
+++ b/lib/generators/hyrax/templates/config/locales/hyrax.en.yml
@@ -23,8 +23,9 @@ en:
           identifier_tesim: Identifier
           keyword_tesim: Keyword
           language_tesim: Language
+          license_tesim: License
           publisher_tesim: Publisher
-          rights_tesim: Rights
+          rights_statement_tesim: Rights Statement
           subject_tesim: Subject
         show:
           based_near_tesim: Location
@@ -38,8 +39,9 @@ en:
           identifier_tesim: Identifier
           keyword_tesim: Keyword
           language_tesim: Language
+          license_tesim: License
           publisher_tesim: Publisher
-          rights_tesim: Rights
+          rights_statement_tesim: Rights Statement
           subject_tesim: Subject
           title_tesim: Title
   hyrax:
diff --git a/lib/generators/hyrax/templates/config/locales/hyrax.es.yml b/lib/generators/hyrax/templates/config/locales/hyrax.es.yml
index 70a3c60191..44c01f88e6 100644
--- a/lib/generators/hyrax/templates/config/locales/hyrax.es.yml
+++ b/lib/generators/hyrax/templates/config/locales/hyrax.es.yml
@@ -22,10 +22,11 @@ es:
           description_tesim: Descripción
           file_format_tesim: Formato de Archivo
           identifier_tesim: Identificador
+          license_tesim: Licencia
           keyword_tesim: Palabra clave
           language_tesim: Idioma
           publisher_tesim: Editor
-          rights_tesim: Derechos
+          rights_statement_tesim: Derechos
           subject_tesim: Tema
         show:
           based_near_tesim: Ubicación
@@ -39,8 +40,9 @@ es:
           identifier_tesim: Identificador
           keyword_tesim: Palabra clave
           language_tesim: Idioma
+          license_tesim: Licencia
           publisher_tesim: Editor
-          rights_tesim: Derechos
+          rights_statement_tesim: Derechos
           subject_tesim: Tema
           title_tesim: Título
   hyrax:
diff --git a/lib/generators/hyrax/templates/config/locales/hyrax.fr.yml b/lib/generators/hyrax/templates/config/locales/hyrax.fr.yml
index 6777579d94..e7a9307bc7 100644
--- a/lib/generators/hyrax/templates/config/locales/hyrax.fr.yml
+++ b/lib/generators/hyrax/templates/config/locales/hyrax.fr.yml
@@ -24,6 +24,7 @@ fr:
           identifier_tesim: Identificateur
           keyword_tesim: Mot-clé
           language_tesim: La langue
+          license_statement_tesim: Licence
           publisher_tesim: Éditeur
           rights_tesim: Droits
           subject_tesim: Assujettir
@@ -39,6 +40,7 @@ fr:
           identifier_tesim: Identificateur
           keyword_tesim: Mot-clé
           language_tesim: La langue
+          license_statement_tesim: Licence
           publisher_tesim: Éditeur
           rights_tesim: Droits
           subject_tesim: Assujettir
diff --git a/lib/generators/hyrax/templates/config/locales/hyrax.it.yml b/lib/generators/hyrax/templates/config/locales/hyrax.it.yml
index f4d3bcced0..49e169b3b2 100644
--- a/lib/generators/hyrax/templates/config/locales/hyrax.it.yml
+++ b/lib/generators/hyrax/templates/config/locales/hyrax.it.yml
@@ -24,8 +24,9 @@ it:
           identifier_tesim: Identifier
           keyword_tesim: Parola chiave
           language_tesim: Lingua
+          license_tesim: Licenza
           publisher_tesim: Editore
-          rights_tesim: Diritti
+          rights_statement_tesim: Diritti
           subject_tesim: Soggetto
         show:
           based_near_tesim: luogo
@@ -39,8 +40,9 @@ it:
           identifier_tesim: Identifier
           keyword_tesim: Parola chiave
           language_tesim: Lingua
+          license_tesim: Licenza
           publisher_tesim: Editore
-          rights_tesim: Diritti
+          rights_statement_tesim: Diritti
           subject_tesim: Soggetto
           title_tesim: Titolo
   hyrax:
diff --git a/lib/generators/hyrax/templates/config/locales/hyrax.pt-BR.yml b/lib/generators/hyrax/templates/config/locales/hyrax.pt-BR.yml
index 23b313a04c..9761d29f68 100644
--- a/lib/generators/hyrax/templates/config/locales/hyrax.pt-BR.yml
+++ b/lib/generators/hyrax/templates/config/locales/hyrax.pt-BR.yml
@@ -24,8 +24,9 @@ pt-BR:
           identifier_tesim: Identificador
           keyword_tesim: Palavra-chave
           language_tesim: Língua
+          license_tesim: Licença
           publisher_tesim: Editor
-          rights_tesim: Direitos
+          rights_statement_tesim: Direitos
           subject_tesim: Sujeito
         show:
           based_near_tesim: Localização
@@ -39,8 +40,9 @@ pt-BR:
           identifier_tesim: Identificador
           keyword_tesim: Palavra-chave
           language_tesim: Língua
+          license_tesim: Licença
           publisher_tesim: Editor
-          rights_tesim: Direitos
+          rights_statement_tesim: Direitos
           subject_tesim: Sujeito
           title_tesim: Título
   hyrax:
diff --git a/lib/generators/hyrax/templates/config/locales/hyrax.zh.yml b/lib/generators/hyrax/templates/config/locales/hyrax.zh.yml
index 56a1d1b50b..cdfd273346 100644
--- a/lib/generators/hyrax/templates/config/locales/hyrax.zh.yml
+++ b/lib/generators/hyrax/templates/config/locales/hyrax.zh.yml
@@ -24,8 +24,9 @@ zh:
           identifier_tesim: 识别码
           keyword_tesim: 关键词
           language_tesim: 语言
+          license_tesim: 执照
           publisher_tesim: 出版者
-          rights_tesim: 权
+          rights_statement_tesim: 权
           subject_tesim: 学科
         show:
           based_near_tesim: 位置
@@ -39,8 +40,9 @@ zh:
           identifier_tesim: 识别码
           keyword_tesim: 关键词
           language_tesim: 语言
+          license_tesim: 执照
           publisher_tesim: 出版者
-          rights_tesim: 权
+          rights_statement_tesim: 权
           subject_tesim: 学科
           title_tesim: 标题
   hyrax:
diff --git a/spec/helpers/blacklight_helper_spec.rb b/spec/helpers/blacklight_helper_spec.rb
index 413d7b2181..03baba63fb 100644
--- a/spec/helpers/blacklight_helper_spec.rb
+++ b/spec/helpers/blacklight_helper_spec.rb
@@ -1,5 +1,3 @@
-# coding: utf-8
-
 RSpec.describe BlacklightHelper, type: :helper do
   let(:blacklight_config) { CatalogController.blacklight_config }
   let(:attributes) do
@@ -8,9 +6,10 @@
       'proxy_depositor_ssim'   => ['atz@stanford.edu'],
       'description_tesim'      => ['This links to http://example.com/ What about that?'],
       'date_uploaded_dtsi'     => '2013-03-14T00:00:00Z',
-      'rights_tesim'           => ["http://creativecommons.org/publicdomain/zero/1.0/",
-                                   "http://creativecommons.org/publicdomain/mark/1.0/",
-                                   "http://www.europeana.eu/portal/rights/rr-r.html"],
+      'license_tesim' => ["http://creativecommons.org/publicdomain/zero/1.0/",
+                          "http://creativecommons.org/publicdomain/mark/1.0/",
+                          "http://www.europeana.eu/portal/rights/rr-r.html"],
+      'rights_statement_tesim' => ['http://rightsstatements.org/vocab/InC/1.0/'],
       'identifier_tesim'       => ['65434567654345654'],
       'keyword_tesim'          => ['taco', 'mustache'],
       'subject_tesim'          => ['Awesome'],
@@ -47,8 +46,8 @@ def search_action_path(stuff)
       end
     end
 
-    context "rights_tesim" do
-      let(:field_name) { 'rights_tesim' }
+    context "license_tesim" do
+      let(:field_name) { 'license_tesim' }
 
       it do
         is_expected.to eq "<a href=\"http://creativecommons.org/publicdomain/zero/1.0/\">Creative Commons CC0 1.0 Universal</a>, " \
@@ -57,6 +56,14 @@ def search_action_path(stuff)
       end
     end
 
+    context "rights_statement_tesim" do
+      let(:field_name) { 'rights_statement_tesim' }
+
+      it do
+        is_expected.to eq "<a href=\"http://rightsstatements.org/vocab/InC/1.0/\">In Copyright</a>"
+      end
+    end
+
     context "metadata index links" do
       let(:search_state) { Hyrax::SearchState.new(params, blacklight_config, controller) }
 
diff --git a/spec/helpers/hyrax_helper_spec.rb b/spec/helpers/hyrax_helper_spec.rb
index 7bc1048277..5a42076127 100644
--- a/spec/helpers/hyrax_helper_spec.rb
+++ b/spec/helpers/hyrax_helper_spec.rb
@@ -1,5 +1,3 @@
-# coding: utf-8
-
 def new_state
   Blacklight::SearchState.new({}, CatalogController.blacklight_config)
 end
@@ -352,6 +350,14 @@ def new_state
     end
   end
 
+  describe "#rights_statment_links" do
+    it "maps the url to a link with a label" do
+      expect(helper.rights_statement_links(
+               value: ["http://rightsstatements.org/vocab/InC/1.0/"]
+      )).to eq("<a href=\"http://rightsstatements.org/vocab/InC/1.0/\">In Copyright</a>")
+    end
+  end
+
   describe "#human_readable_date" do
     it "ensures that the display of the date is human-readable" do
       expect(helper.human_readable_date(value: ["2016-08-15T00:00:00Z"])).to eq("08/15/2016")
diff --git a/spec/services/hyrax/rights_statements_spec.rb b/spec/services/hyrax/rights_statement_service_spec.rb
similarity index 86%
rename from spec/services/hyrax/rights_statements_spec.rb
rename to spec/services/hyrax/rights_statement_service_spec.rb
index 7be63fc1b0..d684698932 100644
--- a/spec/services/hyrax/rights_statements_spec.rb
+++ b/spec/services/hyrax/rights_statement_service_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe Hyrax::RightsStatements do
+RSpec.describe Hyrax::RightsStatementService do
   let(:service) { described_class.new }
 
   describe "#select_active_options" do
diff --git a/spec/views/catalog/_index_list_default.html.erb_spec.rb b/spec/views/catalog/_index_list_default.html.erb_spec.rb
index 86580c3d47..c274ecb0ca 100644
--- a/spec/views/catalog/_index_list_default.html.erb_spec.rb
+++ b/spec/views/catalog/_index_list_default.html.erb_spec.rb
@@ -6,7 +6,7 @@
       'description_tesim'    => [''],
       'date_uploaded_dtsi'   => 'a date',
       'date_modified_dtsi'   => 'a date',
-      'rights_tesim'         => [''],
+      'rights_statement_tesim' => [''],
       'embargo_release_date_dtsi' => 'a date',
       'lease_expiration_date_dtsi' => 'a date' }
   end
@@ -33,8 +33,8 @@
     expect(rendered).to include 'Test proxy_depositor_ssim'
     expect(rendered).to include '<span class="attribute-label h4">Owner:</span>'
     expect(rendered).to include 'Test depositor_tesim'
-    expect(rendered).to include '<span class="attribute-label h4">Rights:</span>'
-    expect(rendered).to include 'Test rights_tesim'
+    expect(rendered).to include '<span class="attribute-label h4">Rights Statement:</span>'
+    expect(rendered).to include 'Test rights_statement_tesim'
     expect(rendered).to include '<span class="attribute-label h4">Embargo release date:</span>'
     expect(rendered).to include 'Test embargo_release_date_dtsi'
     expect(rendered).to include '<span class="attribute-label h4">Lease expiration date:</span>'

From eee7067fe475f8ac90635abff60b819ee8f9756a Mon Sep 17 00:00:00 2001
From: Jonathan Dixon <dixonj16@vbi.vt.edu>
Date: Wed, 11 Oct 2017 10:06:06 -0400
Subject: [PATCH 14/18] Additional specs for the visibility_component js.

---
 spec/javascripts/visibility_component_spec.js | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/spec/javascripts/visibility_component_spec.js b/spec/javascripts/visibility_component_spec.js
index e0494669c4..0084344d27 100644
--- a/spec/javascripts/visibility_component_spec.js
+++ b/spec/javascripts/visibility_component_spec.js
@@ -173,7 +173,7 @@ describe("VisibilityComponent", function() {
       beforeEach(function() {
         spyOn(target, 'disableEmbargoAndLease');
       });
-      it("require visibility", function() {
+      it("disable embargo and lease", function() {
         target.applyRestrictions(undefined, undefined, "2017-01-01", false);
         expect(target.disableEmbargoAndLease).toHaveBeenCalled();
       });
@@ -435,6 +435,31 @@ describe("VisibilityComponent", function() {
       expect(target.getVisibilityAfterEmbargoInput()).toHaveProp("name", "generic_work[visibility_after_embargo]");
     });
   });
+
+  //checkEnabledVisibilityOption()
+  describe("checkEnabledVisibilityOption", function() {
+    describe("with disabled option selected", function() {
+      beforeEach(function() {
+        target.enableAllOptions();
+        element.find("[type='radio'][value='restricted']").prop("checked", true).prop("disabled", true);
+      });
+      it("selects last enabled radio option", function() {
+        target.checkEnabledVisibilityOption();
+        expect(element.find("[type='radio'][value='restricted']")).not.toBeChecked();
+        expect(element.find("[type='radio'][value='lease']")).toBeChecked();
+      });
+    });
+    describe("with enabled option selected", function() {
+      beforeEach(function() {
+        target.enableAllOptions();
+        element.find("[type='radio'][value='open']").prop("checked", true);
+      });
+      it("does not change selection", function() {
+        target.checkEnabledVisibilityOption();
+        expect(element.find("[type='radio'][value='open']")).toBeChecked();
+      });
+    });
+  });
 });
 
 // Generate a form that includes AdminSet selectbox (with a passed in option)

From f7ef416772b4e7df4e34ce031f71f93aaf197fdc Mon Sep 17 00:00:00 2001
From: Jonathan Dixon <dixonj16@vbi.vt.edu>
Date: Wed, 11 Oct 2017 12:43:05 -0400
Subject: [PATCH 15/18] Default option for admin set release settings.

---
 app/forms/hyrax/forms/permission_template_form.rb  | 14 +++++++-------
 .../admin/admin_sets/_form_visibility.html.erb     |  8 +++++++-
 config/locales/hyrax.en.yml                        |  2 +-
 .../hyrax/forms/permission_template_form_spec.rb   |  7 +++++++
 .../admin_sets/_form_visibility.html.erb_spec.rb   |  1 +
 5 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/app/forms/hyrax/forms/permission_template_form.rb b/app/forms/hyrax/forms/permission_template_form.rb
index f4184d43e0..6d9e0cc843 100644
--- a/app/forms/hyrax/forms/permission_template_form.rb
+++ b/app/forms/hyrax/forms/permission_template_form.rb
@@ -186,6 +186,8 @@ def select_release_varies_option(permission_template)
         # Removes release_varies and release_embargo from the returned attributes
         # These form fields are only used to update release_period
         # @return [Hash] attributes used to update the model
+        # rubocop:disable Metrics/CyclomaticComplexity
+        # rubocop:disable Metrics/PerceivedComplexity
         def permission_template_update_params(raw_attributes)
           attributes = raw_attributes.except(:release_varies, :release_embargo)
           # If 'varies' before date option selected, then set release_period='before' and save release_date as-is
@@ -199,19 +201,21 @@ def permission_template_update_params(raw_attributes)
             attributes[:release_date] = nil
           end
 
-          if attributes[:release_period] == Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY
-            # If release is "no delay", a release_date should never be allowed/specified
+          if attributes[:release_period] == Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY || (attributes[:release_period].blank? && raw_attributes[:release_varies].blank?)
+            # If release is "no delay" or is "varies" and "allow depositor to decide",
+            # then a release_date should never be allowed/specified
             attributes[:release_date] = nil
           end
 
           attributes
         end
+        # rubocop:enable Metrics/CyclomaticComplexity
+        # rubocop:enable Metrics/PerceivedComplexity
 
         # validate the hash of attributes used to update the visibility tab of the model
         # @param [Hash] attributes
         # @return [String, Nil] the error code if invalid, nil if valid
         # rubocop:disable Metrics/CyclomaticComplexity
-        # rubocop:disable Metrics/AbcSize
         # rubocop:disable Metrics/PerceivedComplexity
         def validate_visibility_combinations(attributes)
           return unless attributes.key?(:visibility) # only the visibility tab has validations
@@ -219,9 +223,6 @@ def validate_visibility_combinations(attributes)
           # if "save" without any selections - none of the attributes are present
           return "nothing" if !attributes[:release_varies] && !attributes[:release_period] && !attributes[:release_date] && !attributes[:release_embargo]
 
-          # if "varies" without sub-options (in this case, release_varies will be missing)
-          return "varies" if attributes[:release_period].blank? && attributes[:release_varies].blank?
-
           # if "varies before" but date not selected
           return "no_date" if attributes[:release_varies] == Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE && attributes[:release_date].blank?
 
@@ -233,7 +234,6 @@ def validate_visibility_combinations(attributes)
         end
       # rubocop:enable Metrics/CyclomaticComplexity
       # rubocop:enable Metrics/PerceivedComplexity
-      # rubocop:enable Metrics/AbcSize
     end
   end
 end
diff --git a/app/views/hyrax/admin/admin_sets/_form_visibility.html.erb b/app/views/hyrax/admin/admin_sets/_form_visibility.html.erb
index cd3d506fc8..590f407a04 100644
--- a/app/views/hyrax/admin/admin_sets/_form_visibility.html.erb
+++ b/app/views/hyrax/admin/admin_sets/_form_visibility.html.erb
@@ -14,10 +14,16 @@
                   </div>
                   <div id="release-varies" class="radio">
                     <label>
-                      <%= f.radio_button :release_period, '', checked: !f.object.release_varies.blank? %>
+                      <%= f.radio_button :release_period, '', checked: f.object.release_period.blank? || !f.object.release_varies.blank? %>
                       <%= t('.release.varies.description') %>
                     </label>
                     <ul>
+                      <li class="radio form-inline">
+                        <label>
+                          <%= f.radio_button :release_varies, '' %>
+                          <%= t('.release.varies.any') %>
+                        </label>
+                      </li>
                       <li class="radio form-inline">
                         <label>
                           <%= f.radio_button :release_varies, Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE %>
diff --git a/config/locales/hyrax.en.yml b/config/locales/hyrax.en.yml
index de4cee1b23..df3b711d16 100644
--- a/config/locales/hyrax.en.yml
+++ b/config/locales/hyrax.en.yml
@@ -80,7 +80,6 @@ en:
             visibility:         "The administrative set's release & visibility settings have been updated."
             workflow:           "The administrative set's workflow has been updated."
           permission_update_errors:
-            varies:             "Release option 'Varies' requires a date or embargo period."
             no_date:            "A date is required for the selected release option."
             no_embargo:         "An embargo period is required for the selected option."
             nothing:            "Select release options before pressing save."
@@ -132,6 +131,7 @@ en:
             no_delay:           "No delay -- release all works as soon as they are deposited"
             title:              "Release"
             varies:
+              any:              "Allow depositor to decide"
               between:          "Between \"now\" and"
               description:      "Varies -- depositors can set the release date for an individual work:"
               embargo:
diff --git a/spec/forms/hyrax/forms/permission_template_form_spec.rb b/spec/forms/hyrax/forms/permission_template_form_spec.rb
index 00995df707..b917e2d2c6 100644
--- a/spec/forms/hyrax/forms/permission_template_form_spec.rb
+++ b/spec/forms/hyrax/forms/permission_template_form_spec.rb
@@ -317,6 +317,13 @@ def count_workflow_roles_for(user)
         it_behaves_like 'valid attributes'
       end
 
+      describe 'varies, with depositor choice' do
+        let(:release_period) { '' }
+        let(:release_varies) { '' }
+
+        it_behaves_like 'valid attributes'
+      end
+
       describe 'varies, with date selected' do
         let(:release_date) { Time.zone.today + 2.months }
         let(:release_varies) { Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE }
diff --git a/spec/views/hyrax/admin/admin_sets/_form_visibility.html.erb_spec.rb b/spec/views/hyrax/admin/admin_sets/_form_visibility.html.erb_spec.rb
index 278b146922..21eccae030 100644
--- a/spec/views/hyrax/admin/admin_sets/_form_visibility.html.erb_spec.rb
+++ b/spec/views/hyrax/admin/admin_sets/_form_visibility.html.erb_spec.rb
@@ -12,6 +12,7 @@
   it "has the form" do
     expect(rendered).to have_selector('#visibility input[type=radio][name="permission_template[release_period]"][value=now]')
     expect(rendered).to have_selector('#visibility input[type=radio][name="permission_template[release_period]"][value=fixed]')
+    expect(rendered).to have_selector('#visibility input[type=radio][name="permission_template[release_varies]"][value=""]')
     expect(rendered).to have_selector('#visibility input[type=radio][name="permission_template[release_varies]"][value=before]')
     expect(rendered).to have_selector('#visibility input[type=radio][name="permission_template[release_varies]"][value=embargo]')
     expect(rendered).to have_selector('#visibility select[name="permission_template[release_embargo]"]')

From 14bc7d8380b15b7c72bd0563c4c56e06a5364df2 Mon Sep 17 00:00:00 2001
From: "Michael J. Giarlo" <mjgiarlo@stanford.edu>
Date: Wed, 11 Oct 2017 12:04:46 -0700
Subject: [PATCH 16/18] Add missing translations in advance of 2.0.0.rc1
 release

---
 config/locales/hyrax.de.yml                                | 1 +
 config/locales/hyrax.es.yml                                | 1 +
 config/locales/hyrax.fr.yml                                | 1 +
 config/locales/hyrax.it.yml                                | 1 +
 config/locales/hyrax.pt-BR.yml                             | 1 +
 config/locales/hyrax.zh.yml                                | 1 +
 lib/generators/hyrax/templates/config/locales/hyrax.es.yml | 2 +-
 lib/generators/hyrax/templates/config/locales/hyrax.fr.yml | 4 ++++
 8 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/config/locales/hyrax.de.yml b/config/locales/hyrax.de.yml
index cafc661555..b27a273d16 100644
--- a/config/locales/hyrax.de.yml
+++ b/config/locales/hyrax.de.yml
@@ -133,6 +133,7 @@ de:
             no_delay: Keine Verzögerung - Freigabe aller Arbeiten, sobald sie hinterlegt sind
             title: Freigabe
             varies:
+              any: Dem Einzahler erlauben, sich zu entscheiden
               between: Zwischen "jetzt" und
               description: 'Variabel - Deponenten können den Freigabedatum für eine einzelne Arbeit festlegen:'
               embargo:
diff --git a/config/locales/hyrax.es.yml b/config/locales/hyrax.es.yml
index 9b9c0a474a..ec87ac6bee 100644
--- a/config/locales/hyrax.es.yml
+++ b/config/locales/hyrax.es.yml
@@ -133,6 +133,7 @@ es:
             no_delay: Sin demora -- liberar todas los trabajos tan pronto como se depositen
             title: Lanzamiento
             varies:
+              any: Permitir que el depositante decida
               between: Entre "ahora" y
               description: 'Varía -- los depositantes pueden fijar la fecha de lanzamiento para un trabajo individual:'
               embargo:
diff --git a/config/locales/hyrax.fr.yml b/config/locales/hyrax.fr.yml
index a7071ecd2a..b97d509584 100644
--- a/config/locales/hyrax.fr.yml
+++ b/config/locales/hyrax.fr.yml
@@ -133,6 +133,7 @@ fr:
             no_delay: Pas de retard - libère tous les travaux dès qu'ils sont déposés
             title: Libération
             varies:
+              any: Permettre au déposant de décider
               between: Entre «maintenant» et
               description: 'Variable - les déposants peuvent définir la date de sortie pour un travail individuel:'
               embargo:
diff --git a/config/locales/hyrax.it.yml b/config/locales/hyrax.it.yml
index eacdd78f7a..a14cd32fd9 100644
--- a/config/locales/hyrax.it.yml
+++ b/config/locales/hyrax.it.yml
@@ -133,6 +133,7 @@ it:
             no_delay: Nessun ritardo - rilasciare tutti i lavori non appena vengono depositati
             title: Liberare
             varies:
+              any: Consentire al depositante di decidere
               between: Tra "ora" e "
               description: 'Varia - i depositanti possono impostare la data di rilascio per un lavoro individuale:'
               embargo:
diff --git a/config/locales/hyrax.pt-BR.yml b/config/locales/hyrax.pt-BR.yml
index 847c019198..679524a4f5 100644
--- a/config/locales/hyrax.pt-BR.yml
+++ b/config/locales/hyrax.pt-BR.yml
@@ -133,6 +133,7 @@ pt-BR:
             no_delay: Sem atraso - liberte todos os trabalhos assim que eles são depositados
             title: Lançamento
             varies:
+              any: Permitir que o depositante decida
               between: Entre "agora" e
               description: 'Varia - os depositantes podem definir a data de lançamento para um trabalho individual:'
               embargo:
diff --git a/config/locales/hyrax.zh.yml b/config/locales/hyrax.zh.yml
index 048f198218..752fbcc672 100644
--- a/config/locales/hyrax.zh.yml
+++ b/config/locales/hyrax.zh.yml
@@ -139,6 +139,7 @@ zh:
             no_delay: 没有延迟 -- 所有作品一旦存储即可发布
             title: 发布
             varies:
+              any: 允许存款人决定
               between: 在'现在'之间
               description: '可变的 -- 存储者可以设置一件作品的发布日期:'
               embargo:
diff --git a/lib/generators/hyrax/templates/config/locales/hyrax.es.yml b/lib/generators/hyrax/templates/config/locales/hyrax.es.yml
index 44c01f88e6..6c737b4a1a 100644
--- a/lib/generators/hyrax/templates/config/locales/hyrax.es.yml
+++ b/lib/generators/hyrax/templates/config/locales/hyrax.es.yml
@@ -22,9 +22,9 @@ es:
           description_tesim: Descripción
           file_format_tesim: Formato de Archivo
           identifier_tesim: Identificador
-          license_tesim: Licencia
           keyword_tesim: Palabra clave
           language_tesim: Idioma
+          license_tesim: Licencia
           publisher_tesim: Editor
           rights_statement_tesim: Derechos
           subject_tesim: Tema
diff --git a/lib/generators/hyrax/templates/config/locales/hyrax.fr.yml b/lib/generators/hyrax/templates/config/locales/hyrax.fr.yml
index e7a9307bc7..0f57e7ac80 100644
--- a/lib/generators/hyrax/templates/config/locales/hyrax.fr.yml
+++ b/lib/generators/hyrax/templates/config/locales/hyrax.fr.yml
@@ -25,7 +25,9 @@ fr:
           keyword_tesim: Mot-clé
           language_tesim: La langue
           license_statement_tesim: Licence
+          license_tesim: Licence
           publisher_tesim: Éditeur
+          rights_statement_tesim: Déclaration des droits
           rights_tesim: Droits
           subject_tesim: Assujettir
         show:
@@ -41,7 +43,9 @@ fr:
           keyword_tesim: Mot-clé
           language_tesim: La langue
           license_statement_tesim: Licence
+          license_tesim: Licence
           publisher_tesim: Éditeur
+          rights_statement_tesim: Déclaration des droits
           rights_tesim: Droits
           subject_tesim: Assujettir
           title_tesim: Titre

From ec976679c3c074e01a69c26f5d3920d9f0ae60b8 Mon Sep 17 00:00:00 2001
From: "Michael J. Giarlo" <mjgiarlo@stanford.edu>
Date: Wed, 11 Oct 2017 12:06:29 -0700
Subject: [PATCH 17/18] Bump version to 2.0.0.rc1

---
 README.md            | 6 +++---
 lib/hyrax/version.rb | 2 +-
 template.rb          | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index be13d20476..89e981391a 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Docs: [![Documentation Status](https://inch-ci.org/github/samvera/hyrax.svg?bran
 [![Apache 2.0 License](http://img.shields.io/badge/APACHE2-license-blue.svg)](./LICENSE)
 
 Jump in: [![Slack Status](http://slack.samvera.org/badge.svg)](http://slack.samvera.org/)
-[![Ready Tickets](https://badge.waffle.io/samvera/hyrax.png?label=ready&milestone=2.0.0&title=Ready)](https://waffle.io/samvera/hyrax?milestone=2.0.0)
+[![Ready Tickets](https://badge.waffle.io/samvera/hyrax.png?label=ready&milestone=2.x%20series&title=Ready)](https://waffle.io/samvera/hyrax?milestone=2.x%20series)
 
 # Table of Contents
 
@@ -63,7 +63,7 @@ The Samvera community is here to help. Please see our [support guide](./.github/
 # Getting started
 
 This document contains instructions specific to setting up an app with __Hyrax
-v2.0.0.beta5__. If you are looking for instructions on installing a different
+v2.0.0.rc1__. 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.
 
@@ -160,7 +160,7 @@ NOTE: The steps need to be done in order to create a new Hyrax based app.
 Generate a new Rails application using the template.
 
 ```
-rails _5.0.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v2.0.0.beta5/template.rb
+rails _5.0.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v2.0.0.rc1/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:
diff --git a/lib/hyrax/version.rb b/lib/hyrax/version.rb
index c08ddacac5..9d94fad18d 100644
--- a/lib/hyrax/version.rb
+++ b/lib/hyrax/version.rb
@@ -1,3 +1,3 @@
 module Hyrax
-  VERSION = '2.0.0.beta5'.freeze
+  VERSION = '2.0.0.rc1'.freeze
 end
diff --git a/template.rb b/template.rb
index d7e159395e..55e8377ee5 100644
--- a/template.rb
+++ b/template.rb
@@ -1,4 +1,4 @@
-gem 'hyrax', '2.0.0.beta5'
+gem 'hyrax', '2.0.0.rc1'
 run 'bundle install'
 generate 'hyrax:install', '-f'
 rails_command 'db:migrate'

From cf947a5c9f4c3ed1ad91c431fc68d7432e13ce0b Mon Sep 17 00:00:00 2001
From: Julie Allinson <julie.allinson@london.ac.uk>
Date: Wed, 11 Oct 2017 17:49:37 +0100
Subject: [PATCH 18/18] add a rights_statement renderer to render the statement
 text rather than the URL

---
 .../rights_statement_attribute_renderer.rb    | 25 +++++++++++++++++++
 app/views/hyrax/base/_attribute_rows.html.erb |  2 +-
 lib/hyrax/configuration.rb                    | 11 ++++++++
 spec/lib/hyrax/configuration_spec.rb          |  4 +++
 ...ights_statement_attribute_renderer_spec.rb | 20 +++++++++++++++
 .../base/_attribute_rows.html.erb_spec.rb     |  2 +-
 6 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 app/renderers/hyrax/renderers/rights_statement_attribute_renderer.rb
 create mode 100644 spec/renderers/hyrax/renderers/rights_statement_attribute_renderer_spec.rb

diff --git a/app/renderers/hyrax/renderers/rights_statement_attribute_renderer.rb b/app/renderers/hyrax/renderers/rights_statement_attribute_renderer.rb
new file mode 100644
index 0000000000..90ff31c447
--- /dev/null
+++ b/app/renderers/hyrax/renderers/rights_statement_attribute_renderer.rb
@@ -0,0 +1,25 @@
+module Hyrax
+  module Renderers
+    # This is used by PresentsAttributes to show licenses
+    #   e.g.: presenter.attribute_to_html(:rights_statement, render_as: :rights_statement)
+    class RightsStatementAttributeRenderer < AttributeRenderer
+      private
+
+        ##
+        # Special treatment for license/rights.  A URL from the Hyrax gem's config/hyrax.rb is stored in the descMetadata of the
+        # curation_concern.  If that URL is valid in form, then it is used as a link.  If it is not valid, it is used as plain text.
+        def attribute_value_to_html(value)
+          begin
+            parsed_uri = URI.parse(value)
+          rescue
+            nil
+          end
+          if parsed_uri.nil?
+            ERB::Util.h(value)
+          else
+            %(<a href=#{ERB::Util.h(value)} target="_blank">#{Hyrax.config.rights_statement_service_class.new.label(value)}</a>)
+          end
+        end
+    end
+  end
+end
diff --git a/app/views/hyrax/base/_attribute_rows.html.erb b/app/views/hyrax/base/_attribute_rows.html.erb
index ea388a6a13..fbc1a81cb2 100644
--- a/app/views/hyrax/base/_attribute_rows.html.erb
+++ b/app/views/hyrax/base/_attribute_rows.html.erb
@@ -10,4 +10,4 @@
 <%= presenter.attribute_to_html(:related_url, render_as: :external_link) %>
 <%= presenter.attribute_to_html(:resource_type, render_as: :faceted) %>
 <%= presenter.attribute_to_html(:source) %>
-<%= presenter.attribute_to_html(:rights_statement) %>
+<%= presenter.attribute_to_html(:rights_statement, render_as: :rights_statement) %>
diff --git a/lib/hyrax/configuration.rb b/lib/hyrax/configuration.rb
index f70506c96b..99abdf4a68 100644
--- a/lib/hyrax/configuration.rb
+++ b/lib/hyrax/configuration.rb
@@ -228,6 +228,17 @@ def license_service_class
       @license_service_class ||= Hyrax::LicenseService
     end
 
+    # A configuration point for changing the behavior of the rights statement service.
+    #
+    # @!attribute [w] license_service_class
+    #   A configuration point for changing the behavior of the license service.
+    #
+    #   @see Hyrax::RightsStatementService for implementation details
+    attr_writer :rights_statement_service_class
+    def rights_statement_service_class
+      @rights_statement_service_class ||= Hyrax::RightsStatementService
+    end
+
     attr_writer :banner_image
     def banner_image
       # This image can be used for free and without attribution. See here for source and license: https://github.com/samvera/hyrax/issues/1551#issuecomment-326624909
diff --git a/spec/lib/hyrax/configuration_spec.rb b/spec/lib/hyrax/configuration_spec.rb
index 1f974b81b0..d6e7d4ad22 100644
--- a/spec/lib/hyrax/configuration_spec.rb
+++ b/spec/lib/hyrax/configuration_spec.rb
@@ -43,6 +43,8 @@
   it { is_expected.to respond_to(:google_analytics_id?) }
   it { is_expected.to respond_to(:google_analytics_id) }
   it { is_expected.to respond_to(:libreoffice_path) }
+  it { is_expected.to respond_to(:license_service_class) }
+  it { is_expected.to respond_to(:license_service_class=) }
   it { is_expected.to respond_to(:max_days_between_fixity_checks=) }
   it { is_expected.to respond_to(:max_days_between_fixity_checks) }
   it { is_expected.to respond_to(:max_notifications_for_dashboard) }
@@ -52,6 +54,8 @@
   it { is_expected.to respond_to(:persistent_hostpath) }
   it { is_expected.to respond_to(:realtime_notifications?) }
   it { is_expected.to respond_to(:realtime_notifications=) }
+  it { is_expected.to respond_to(:rights_statement_service_class) }
+  it { is_expected.to respond_to(:rights_statement_service_class=) }
   it { is_expected.to respond_to(:redis_namespace) }
   it { is_expected.to respond_to(:subject_prefix) }
   it { is_expected.to respond_to(:translate_id_to_uri) }
diff --git a/spec/renderers/hyrax/renderers/rights_statement_attribute_renderer_spec.rb b/spec/renderers/hyrax/renderers/rights_statement_attribute_renderer_spec.rb
new file mode 100644
index 0000000000..7865f4e541
--- /dev/null
+++ b/spec/renderers/hyrax/renderers/rights_statement_attribute_renderer_spec.rb
@@ -0,0 +1,20 @@
+RSpec.describe Hyrax::Renderers::RightsStatementAttributeRenderer do
+  let(:field) { :rights_statement }
+  let(:renderer) { described_class.new(field, ['http://rightsstatements.org/vocab/InC/1.0/']) }
+
+  describe "#attribute_to_html" do
+    subject { Nokogiri::HTML(renderer.render) }
+
+    let(:expected) { Nokogiri::HTML(tr_content) }
+
+    let(:tr_content) do
+      "<tr><th>Rights statement</th>\n" \
+       "<td><ul class='tabular'>" \
+       "<li class=\"attribute rights_statement\"><a href=\"http://rightsstatements.org/vocab/InC/1.0/\" target=\"_blank\">In Copyright</a></li>" \
+       "</ul></td></tr>"
+    end
+
+    it { expect(renderer).not_to be_microdata(field) }
+    it { expect(subject).to be_equivalent_to(expected) }
+  end
+end
diff --git a/spec/views/hyrax/base/_attribute_rows.html.erb_spec.rb b/spec/views/hyrax/base/_attribute_rows.html.erb_spec.rb
index 723c929cc2..747903903d 100644
--- a/spec/views/hyrax/base/_attribute_rows.html.erb_spec.rb
+++ b/spec/views/hyrax/base/_attribute_rows.html.erb_spec.rb
@@ -21,6 +21,6 @@
   end
 
   it 'shows rights statement with link to statement URL' do
-    expect(page).to have_link(rights_statement_uri)
+    expect(page).to have_link("In Copyright", href: rights_statement_uri)
   end
 end