hyrax 2.0.0.beta5 → 2.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66a42f4f84b9b456857d5b5262a5b424eafe3814
-  data.tar.gz: 7b78a9ea6a2d7c304ee49da60282e66489520849
+  metadata.gz: 6a96b72971c72adabf7c92ab360d35bb5d98eb63
+  data.tar.gz: 3292d8aaf5784bcdd8e061f2446ad321e84a64f7
 SHA512:
-  metadata.gz: f5cb54d0f8f526b1aa2f6decb4247831a2fc695afb3e3e8cabfc153847ac6029a05d899296070258e4736a397ff37b010ff442b9a961e1672598887f97d34974
-  data.tar.gz: a7dc23482e9c9362d08dd4845824f6bd5b37ffee27d504799c2ea74e56a0ff4fe0f0950b39a8b60b866748d11b7ff14d9b2bfdcc0da52d1c2a78987d8ea72b2e
+  metadata.gz: a12c44a6f0bb8b928a40666fbe8e0f3dbdc0d7c2a84410aff8e550c65916a2644910258160cca03ca806fc4b7f5c17d0fa963fa278dbb7ac49c06ee341f19abc
+  data.tar.gz: bf7f7762658984fe13a62829dc706eeb32a070a13c57c8e8320988aa0f0e3a7fe289b12b647626e634871a2e3a7bfffb8427a4d49b3a0e894d7cac4ce5d40cde

data/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:

data/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()

data/app/forms/hyrax/forms/permission_template_form.rb

@@ -186,6 +186,8 @@ module Hyrax
         # 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 @@ module Hyrax
             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 @@ module Hyrax
           # 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 @@ module Hyrax
         end
       # rubocop:enable Metrics/CyclomaticComplexity
       # rubocop:enable Metrics/PerceivedComplexity
-      # rubocop:enable Metrics/AbcSize
     end
   end
 end

data/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 @@ module Hyrax
     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

data/app/services/hyrax/{rights_statements.rb → 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

data/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 %>

data/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,

data/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:

data/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:

data/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:

data/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:

data/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:

data/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:

data/config/locales/hyrax.zh.yml

@@ -139,6 +139,7 @@ zh:
             no_delay: 没有延迟 -- 所有作品一旦存储即可发布
             title: 发布
             varies:
+              any: 允许存款人决定
               between: 在'现在'之间
               description: '可变的 -- 存储者可以设置一件作品的发布日期:'
               embargo:

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

@@ -71,7 +71,8 @@ class CatalogController < ApplicationController
     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 @@ class CatalogController < ApplicationController
     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 @@ class CatalogController < ApplicationController
       }
     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

data/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:

data/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:

data/lib/generators/hyrax/templates/config/locales/hyrax.es.yml

@@ -24,8 +24,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
         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:

data/lib/generators/hyrax/templates/config/locales/hyrax.fr.yml

@@ -24,7 +24,10 @@ fr:
           identifier_tesim: Identificateur
           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:
@@ -39,7 +42,10 @@ fr:
           identifier_tesim: Identificateur
           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

data/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:

data/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:

data/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:

data/lib/hyrax/version.rb

@@ -1,3 +1,3 @@
 module Hyrax
-  VERSION = '2.0.0.beta5'.freeze
+  VERSION = '2.0.0.rc1'.freeze
 end

data/spec/forms/hyrax/forms/permission_template_form_spec.rb

@@ -317,6 +317,13 @@ RSpec.describe Hyrax::Forms::PermissionTemplateForm do
         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 }

data/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 @@ RSpec.describe BlacklightHelper, type: :helper do
       '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 @@ RSpec.describe BlacklightHelper, type: :helper do
       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 @@ RSpec.describe BlacklightHelper, type: :helper do
       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) }
 

data/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 @@ RSpec.describe HyraxHelper, type: :helper do
     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")

data/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("disable embargo and lease", 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)
@@ -416,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)

data/spec/services/hyrax/{rights_statements_spec.rb → 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

data/spec/views/catalog/_index_list_default.html.erb_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe 'catalog/_index_list_default', type: :view do
       '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 @@ RSpec.describe 'catalog/_index_list_default', type: :view do
     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>'

data/spec/views/hyrax/admin/admin_sets/_form_visibility.html.erb_spec.rb

@@ -12,6 +12,7 @@ RSpec.describe 'hyrax/admin/admin_sets/_form_visibility.html.erb', type: :view d
   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]"]')

data/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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyrax
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta5
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Justin Coyne
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-10 00:00:00.000000000 Z
+date: 2017-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1489,7 +1489,7 @@ files:
 - app/services/hyrax/repository_fixity_check_service.rb
 - app/services/hyrax/resource_types_service.rb
 - app/services/hyrax/restriction_service.rb
-- app/services/hyrax/rights_statements.rb
+- app/services/hyrax/rights_statement_service.rb
 - app/services/hyrax/statistics/collections/over_time.rb
 - app/services/hyrax/statistics/depositors/summary.rb
 - app/services/hyrax/statistics/file_sets/by_format.rb
@@ -2496,7 +2496,7 @@ files:
 - spec/services/hyrax/quick_classification_query_spec.rb
 - spec/services/hyrax/repository_fixity_check_service_spec.rb
 - spec/services/hyrax/resource_types_service_spec.rb
-- spec/services/hyrax/rights_statements_spec.rb
+- spec/services/hyrax/rights_statement_service_spec.rb
 - spec/services/hyrax/statistics/collections/over_time_spec.rb
 - spec/services/hyrax/statistics/depositors/summary_spec.rb
 - spec/services/hyrax/statistics/file_sets/by_format_spec.rb
@@ -3131,7 +3131,7 @@ test_files:
 - spec/services/hyrax/quick_classification_query_spec.rb
 - spec/services/hyrax/repository_fixity_check_service_spec.rb
 - spec/services/hyrax/resource_types_service_spec.rb
-- spec/services/hyrax/rights_statements_spec.rb
+- spec/services/hyrax/rights_statement_service_spec.rb
 - spec/services/hyrax/statistics/collections/over_time_spec.rb
 - spec/services/hyrax/statistics/depositors/summary_spec.rb
 - spec/services/hyrax/statistics/file_sets/by_format_spec.rb