hyrax 2.0.0.rc1 → 2.0.0.rc2

data/hyrax.gemspec

@@ -87,7 +87,7 @@ EOF
   spec.add_development_dependency 'capybara-maleficent', '~> 0.2'
   spec.add_development_dependency "chromedriver-helper"
   spec.add_development_dependency "selenium-webdriver"
-  spec.add_development_dependency "factory_girl_rails", '~> 4.4'
+  spec.add_development_dependency "factory_bot_rails", '~> 4.4'
   spec.add_development_dependency "equivalent-xml", '~> 0.5'
   spec.add_development_dependency "jasmine", '~> 2.3'
   # Pin rubocop and rubocop-rspec tightly. Minor-level version bumps
@@ -103,7 +103,7 @@ EOF
   spec.add_development_dependency 'rubocop', '~> 0.49.1'
   spec.add_development_dependency 'rubocop-rspec', '~> 1.16.0'
   spec.add_development_dependency 'shoulda-matchers', '~> 3.1'
-  spec.add_development_dependency 'rails-controller-testing', '~> 0'
+  spec.add_development_dependency 'rails-controller-testing', '~> 1'
   spec.add_development_dependency 'webmock'
   spec.add_development_dependency 'i18n-debug' if ENV['I18N_DEBUG']
   spec.add_development_dependency 'i18n_yaml_sorter' unless ENV['TRAVIS']

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

@@ -4,7 +4,7 @@ de:
     search:
       fields:
         facet:
-          based_near_sim: Ort
+          based_near_label_sim: Ort
           creator_sim: Schöpfer
           file_format_sim: Format
           generic_type_sim: Art

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

@@ -3,7 +3,7 @@ en:
     search:
       fields:
         facet:
-          based_near_sim: Location
+          based_near_label_sim: Location
           creator_sim: Creator
           file_format_sim: Format
           generic_type_sim: Type

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

@@ -4,7 +4,7 @@ es:
     search:
       fields:
         facet:
-          based_near_sim: Ubicación
+          based_near_label_sim: Ubicación
           creator_sim: Creador
           file_format_sim: Formato
           generic_type_sim: Tipo

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

@@ -4,7 +4,7 @@ fr:
     search:
       fields:
         facet:
-          based_near_sim: Emplacement
+          based_near_label_sim: Emplacement
           creator_sim: Créateur
           file_format_sim: Format
           generic_type_sim: Type

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

@@ -4,7 +4,7 @@ it:
     search:
       fields:
         facet:
-          based_near_sim: luogo
+          based_near_label_sim: luogo
           creator_sim: Creatore
           file_format_sim: Formato
           generic_type_sim: Tipo

data/lib/generators/hyrax/templates/config/locales/hyrax.pt-BR.yml

@@ -4,7 +4,7 @@ pt-BR:
     search:
       fields:
         facet:
-          based_near_sim: Localização
+          based_near_label_sim: Localização
           creator_sim: O Criador
           file_format_sim: Formato
           generic_type_sim: Tipo

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

@@ -4,7 +4,7 @@ zh:
     search:
       fields:
         facet:
-          based_near_sim: 位置
+          based_near_label_sim: 位置
           creator_sim: 创造者
           file_format_sim: 文件格式
           generic_type_sim: 类型

data/lib/hyrax/configuration.rb

@@ -228,6 +228,17 @@ module Hyrax
       @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

data/lib/hyrax/version.rb

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

data/spec/abilities/file_set_abilities_spec.rb

@@ -27,7 +27,7 @@ RSpec.describe 'User' do
       end
 
       describe 'as a repository manager' do
-        let(:manager_user) { FactoryGirl.create(:admin) }
+        let(:manager_user) { FactoryBot.create(:admin) }
         let(:creating_user) { user }
         let(:current_user) { manager_user }
 
@@ -41,7 +41,7 @@ RSpec.describe 'User' do
       end
 
       describe 'another authenticated user' do
-        let(:creating_user) { FactoryGirl.create(:user) }
+        let(:creating_user) { FactoryBot.create(:user) }
         let(:current_user) { user }
 
         it do
@@ -54,7 +54,7 @@ RSpec.describe 'User' do
       end
 
       describe 'a nil user' do
-        let(:creating_user) { FactoryGirl.create(:user) }
+        let(:creating_user) { FactoryBot.create(:user) }
         let(:current_user) { nil }
 
         it do

data/spec/abilities/generic_work_abilities_spec.rb

@@ -4,8 +4,8 @@ RSpec.describe 'User' do
   describe 'Abilities' do
     subject { Ability.new(current_user) }
 
-    let(:generic_work) { FactoryGirl.create(:private_generic_work, user: creating_user) }
-    let(:user) { FactoryGirl.create(:user) }
+    let(:generic_work) { FactoryBot.create(:private_generic_work, user: creating_user) }
+    let(:user) { FactoryBot.create(:user) }
 
     describe 'without embargo' do
       describe 'creator of object' do
@@ -21,7 +21,7 @@ RSpec.describe 'User' do
       end
 
       describe 'as a repository manager' do
-        let(:manager_user) { FactoryGirl.create(:admin) }
+        let(:manager_user) { FactoryBot.create(:admin) }
         let(:creating_user) { user }
         let(:current_user) { manager_user }
 
@@ -34,7 +34,7 @@ RSpec.describe 'User' do
       end
 
       describe 'another authenticated user' do
-        let(:creating_user) { FactoryGirl.create(:user) }
+        let(:creating_user) { FactoryBot.create(:user) }
         let(:current_user) { user }
 
         it do
@@ -47,7 +47,7 @@ RSpec.describe 'User' do
       end
 
       describe 'a nil user' do
-        let(:creating_user) { FactoryGirl.create(:user) }
+        let(:creating_user) { FactoryBot.create(:user) }
         let(:current_user) { nil }
 
         it do

data/spec/actors/hyrax/actors/generic_work_actor_spec.rb

@@ -101,7 +101,7 @@ RSpec.describe Hyrax::Actors::GenericWorkActor do
       context 'with in_work_ids' do
         let(:parent) { create(:generic_work, user: user) }
         let(:attributes) do
-          FactoryGirl.attributes_for(:generic_work, visibility: visibility, admin_set_id: admin_set.id).merge(
+          FactoryBot.attributes_for(:generic_work, visibility: visibility, admin_set_id: admin_set.id).merge(
             in_works_ids: [parent.id]
           )
         end
@@ -120,7 +120,7 @@ RSpec.describe Hyrax::Actors::GenericWorkActor do
 
       context 'with a file' do
         let(:attributes) do
-          FactoryGirl.attributes_for(:generic_work, admin_set_id: admin_set.id, visibility: visibility).tap do |a|
+          FactoryBot.attributes_for(:generic_work, admin_set_id: admin_set.id, visibility: visibility).tap do |a|
             a[:uploaded_files] = [uploaded_file.id]
           end
         end
@@ -158,7 +158,7 @@ RSpec.describe Hyrax::Actors::GenericWorkActor do
         let(:file_actor) { double }
         let(:uploaded_file2) { Hyrax::UploadedFile.create(file: file, user: user) }
         let(:attributes) do
-          FactoryGirl.attributes_for(:generic_work, admin_set_id: admin_set.id, visibility: visibility).tap do |a|
+          FactoryBot.attributes_for(:generic_work, admin_set_id: admin_set.id, visibility: visibility).tap do |a|
             a[:uploaded_files] = [uploaded_file.id, uploaded_file2.id]
           end
         end
@@ -189,7 +189,7 @@ RSpec.describe Hyrax::Actors::GenericWorkActor do
 
       context 'with a present and a blank title' do
         let(:attributes) do
-          FactoryGirl.attributes_for(:generic_work, admin_set_id: admin_set.id, title: ['this is present', ''])
+          FactoryBot.attributes_for(:generic_work, admin_set_id: admin_set.id, title: ['this is present', ''])
         end
 
         it 'stamps each link with the access rights' do
@@ -227,7 +227,7 @@ RSpec.describe Hyrax::Actors::GenericWorkActor do
       let(:parent) { create(:generic_work, user: user) }
       let(:old_parent) { create(:generic_work, user: user) }
       let(:attributes) do
-        FactoryGirl.attributes_for(:generic_work).merge(
+        FactoryBot.attributes_for(:generic_work).merge(
           in_works_ids: [parent.id]
         )
       end
@@ -244,9 +244,9 @@ RSpec.describe Hyrax::Actors::GenericWorkActor do
     end
 
     context 'without in_works_ids' do
-      let(:old_parent) { FactoryGirl.create(:generic_work) }
+      let(:old_parent) { FactoryBot.create(:generic_work) }
       let(:attributes) do
-        FactoryGirl.attributes_for(:generic_work).merge(
+        FactoryBot.attributes_for(:generic_work).merge(
           in_works_ids: []
         )
       end
@@ -266,9 +266,9 @@ RSpec.describe Hyrax::Actors::GenericWorkActor do
     end
 
     context 'with nil in_works_ids' do
-      let(:parent) { FactoryGirl.create(:generic_work) }
+      let(:parent) { FactoryBot.create(:generic_work) }
       let(:attributes) do
-        FactoryGirl.attributes_for(:generic_work).merge(
+        FactoryBot.attributes_for(:generic_work).merge(
           in_works_ids: nil
         )
       end
@@ -289,7 +289,7 @@ RSpec.describe Hyrax::Actors::GenericWorkActor do
       let!(:collection1) { create(:collection, user: user) }
       let!(:collection2) { create(:collection, user: user) }
       let(:attributes) do
-        FactoryGirl.attributes_for(:generic_work, member_of_collection_ids: [collection2.id])
+        FactoryBot.attributes_for(:generic_work, member_of_collection_ids: [collection2.id])
       end
 
       before do
@@ -318,7 +318,7 @@ RSpec.describe Hyrax::Actors::GenericWorkActor do
       let(:file_set2) { create(:file_set) }
       let(:curation_concern) { create(:generic_work, user: user, ordered_members: [file_set1, file_set2], admin_set_id: admin_set.id) }
       let(:attributes) do
-        FactoryGirl.attributes_for(:generic_work, ordered_member_ids: [file_set2.id, file_set1.id])
+        FactoryBot.attributes_for(:generic_work, ordered_member_ids: [file_set2.id, file_set1.id])
       end
 
       it 'updates the order of file sets' do
@@ -331,7 +331,7 @@ RSpec.describe Hyrax::Actors::GenericWorkActor do
       ## Is this something we want to support?
       context "when told to stop ordering a file set" do
         let(:attributes) do
-          FactoryGirl.attributes_for(:generic_work, ordered_member_ids: [file_set2.id])
+          FactoryBot.attributes_for(:generic_work, ordered_member_ids: [file_set2.id])
         end
 
         it "works" do

data/spec/actors/hyrax/actors/transactional_request_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe Hyrax::Actors::TransactionalRequest do
   let(:good_actor) do
     Class.new(Hyrax::Actors::AbstractActor) do
       def create(_attributes)
-        FactoryGirl.create(:user)
+        FactoryBot.create(:user)
       end
     end
   end

data/spec/controllers/hyrax/api/items_controller_spec.rb

@@ -19,7 +19,7 @@ RSpec.describe Hyrax::API::ItemsController, type: :controller do
 
   context 'with an HTTP GET or HEAD' do
     let(:token) { user.arkivo_token }
-    let(:item) { FactoryGirl.json(:post_item, token: token) }
+    let(:item) { FactoryBot.json(:post_item, token: token) }
     let(:item_hash) { JSON.parse(item) }
 
     context 'with a missing token' do
@@ -115,7 +115,7 @@ RSpec.describe Hyrax::API::ItemsController, type: :controller do
       let(:deposited_file) { FileSet.where(label: item_hash['file']['filename']).take }
       let(:a_work) { build :generic_work, id: '123' }
       let!(:token) { user.arkivo_token }
-      let(:item) { FactoryGirl.json(:post_item, token: token) }
+      let(:item) { FactoryBot.json(:post_item, token: token) }
       let(:item_hash) { JSON.parse(item) }
 
       before do
@@ -159,7 +159,7 @@ RSpec.describe Hyrax::API::ItemsController, type: :controller do
       before { post :create, body: item, params: { format: :json } }
 
       let(:token) { 'unfamiliar_token' }
-      let(:item) { FactoryGirl.json(:post_item, token: token) }
+      let(:item) { FactoryBot.json(:post_item, token: token) }
 
       it "is unathorized" do
         expect(response).not_to be_success
@@ -170,7 +170,7 @@ RSpec.describe Hyrax::API::ItemsController, type: :controller do
   end
 
   context 'with an HTTP PUT' do
-    let(:put_item) { FactoryGirl.json(:put_item, token: token) }
+    let(:put_item) { FactoryBot.json(:put_item, token: token) }
     let(:token) { user.arkivo_token }
     let(:gw) { build :generic_work, id: '123' }
     let(:relation) { double }
@@ -265,7 +265,7 @@ RSpec.describe Hyrax::API::ItemsController, type: :controller do
 
     context 'with a valid item and unfamiliar token' do
       let(:bad_token) { 'unfamiliar_token' }
-      let(:bad_token_item) { FactoryGirl.json(:put_item, token: bad_token) }
+      let(:bad_token_item) { FactoryBot.json(:put_item, token: bad_token) }
 
       before do
         request.env['RAW_POST_DATA'] = bad_token_item
@@ -296,7 +296,7 @@ RSpec.describe Hyrax::API::ItemsController, type: :controller do
 
   context 'with an HTTP DELETE' do
     let(:token) { user.arkivo_token }
-    let(:item) { FactoryGirl.json(:post_item, token: token) }
+    let(:item) { FactoryBot.json(:post_item, token: token) }
     let(:item_hash) { JSON.parse(item) }
     let(:gw) { build :generic_work, id: '123' }
     let(:relation) { double }

data/spec/controllers/hyrax/citations_controller_spec.rb

@@ -14,7 +14,7 @@ RSpec.describe Hyrax::CitationsController do
         expect(controller).to receive(:add_breadcrumb).with('My Dashboard', Hyrax::Engine.routes.url_helpers.dashboard_path(locale: 'en'))
         get :work, params: { id: work }
         expect(response).to be_successful
-        expect(response).to render_template('layouts/hyrax')
+        expect(response).to render_template('layouts/hyrax/1_column')
         expect(assigns(:presenter)).to be_kind_of Hyrax::WorkShowPresenter
       end
     end
@@ -42,7 +42,7 @@ RSpec.describe Hyrax::CitationsController do
         expect(controller).to receive(:add_breadcrumb).with('My Dashboard', Hyrax::Engine.routes.url_helpers.dashboard_path(locale: 'en'))
         get :file, params: { id: file_set }
         expect(response).to be_successful
-        expect(response).to render_template('layouts/hyrax')
+        expect(response).to render_template('layouts/hyrax/1_column')
         expect(assigns(:presenter)).to be_kind_of Hyrax::FileSetPresenter
       end
     end

data/spec/controllers/hyrax/collections_controller_spec.rb

@@ -32,6 +32,7 @@ RSpec.describe Hyrax::CollectionsController do
         expect(controller).to receive(:add_breadcrumb).with(I18n.t('hyrax.dashboard.title'), Hyrax::Engine.routes.url_helpers.dashboard_path(locale: 'en'))
         get :show, params: { id: collection }
         expect(response).to be_successful
+        expect(response).to render_template("layouts/hyrax/1_column")
         expect(assigns[:presenter]).to be_kind_of Hyrax::CollectionPresenter
         expect(assigns[:presenter].title).to match_array collection.title
         expect(assigns[:member_docs].map(&:id)).to match_array [asset1, asset2, asset3].map(&:id)

data/spec/controllers/hyrax/content_blocks_controller_spec.rb

@@ -1,12 +1,12 @@
 RSpec.describe Hyrax::ContentBlocksController, type: :controller do
   let!(:announcement_text) do
-    FactoryGirl.create(:content_block, name: 'announcement_text')
+    FactoryBot.create(:content_block, name: 'announcement_text')
   end
   let!(:marketing_text) do
-    FactoryGirl.create(:content_block, name: 'marketing_text')
+    FactoryBot.create(:content_block, name: 'marketing_text')
   end
   let!(:featured_researcher) do
-    FactoryGirl.create(:content_block, name: 'featured_researcher')
+    FactoryBot.create(:content_block, name: 'featured_researcher')
   end
 
   before do
@@ -14,7 +14,7 @@ RSpec.describe Hyrax::ContentBlocksController, type: :controller do
   end
 
   context 'with an unprivileged user' do
-    let(:user) { FactoryGirl.create(:user) }
+    let(:user) { FactoryBot.create(:user) }
 
     describe "GET #edit" do
       it "denies the request" do
@@ -32,7 +32,7 @@ RSpec.describe Hyrax::ContentBlocksController, type: :controller do
   end
 
   context 'with an administrator' do
-    let(:user) { FactoryGirl.create(:admin) }
+    let(:user) { FactoryBot.create(:admin) }
 
     describe "GET #edit" do
       it "renders breadcrumbs" do

data/spec/controllers/hyrax/dashboard/profiles_controller_spec.rb

@@ -1,5 +1,5 @@
 RSpec.describe Hyrax::Dashboard::ProfilesController do
-  let(:user) { FactoryGirl.create(:user) }
+  let(:user) { FactoryBot.create(:user) }
 
   before do
     sign_in user
@@ -71,7 +71,7 @@ RSpec.describe Hyrax::Dashboard::ProfilesController do
 
   describe "#update" do
     context "the profile of another user" do
-      let(:another_user) { FactoryGirl.create(:user) }
+      let(:another_user) { FactoryBot.create(:user) }
 
       it "does not allow other users to update" do
         post :update, params: { id: another_user.user_key, user: { avatar: nil } }

data/spec/controllers/hyrax/downloads_controller_spec.rb

@@ -2,9 +2,9 @@ RSpec.describe Hyrax::DownloadsController do
   routes { Hyrax::Engine.routes }
 
   describe '#show' do
-    let(:user) { FactoryGirl.create(:user) }
+    let(:user) { FactoryBot.create(:user) }
     let(:file_set) do
-      FactoryGirl.create(:file_with_work, user: user, content: File.open(fixture_path + '/image.png'))
+      FactoryBot.create(:file_with_work, user: user, content: File.open(fixture_path + '/image.png'))
     end
     let(:default_image) { ActionController::Base.helpers.image_path 'default.png' }
 
@@ -15,7 +15,7 @@ RSpec.describe Hyrax::DownloadsController do
     end
 
     context "when user doesn't have access" do
-      let(:another_user) { FactoryGirl.create(:user) }
+      let(:another_user) { FactoryBot.create(:user) }
 
       before { sign_in another_user }
 

data/spec/controllers/hyrax/featured_work_lists_controller_spec.rb

@@ -4,8 +4,8 @@ RSpec.describe Hyrax::FeaturedWorkListsController, type: :controller do
       expect(controller).to receive(:authorize!).with(:update, FeaturedWork)
     end
 
-    let(:feature1) { FactoryGirl.create(:featured_work) }
-    let(:feature2) { FactoryGirl.create(:featured_work) }
+    let(:feature1) { FactoryBot.create(:featured_work) }
+    let(:feature2) { FactoryBot.create(:featured_work) }
 
     it "is successful" do
       post :create, params: {