hyrax 2.0.0.beta4 → 2.0.0.beta5

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

data/spec/services/hyrax/{query_service_spec.rb → 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 @@ RSpec.describe Hyrax::QueryService, :clean_repo do
     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 @@ RSpec.describe Hyrax::QueryService, :clean_repo do
     end
 
     context "when file is registered" do
-      it { is_expected.to eq [] }
       let(:read_groups) { ["registered"] }
+
+      it { is_expected.to eq [] }
     end
   end
 

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

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

data/spec/services/hyrax/workflow/status_list_service_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe Hyrax::Workflow::StatusListService do
     let(:document) do
       { id: '33333',
         has_model_ssim: ['GenericWork'],
-        actionable_workflow_roles_ssim: ["generic_work-approving", "generic_work-rejecting"],
+        actionable_workflow_roles_ssim: ["foobar-generic_work-approving", "foobar-generic_work-rejecting"],
         workflow_state_name_ssim: ["initial"],
         title_tesim: ['Hey dood!'] }
     end
@@ -25,9 +25,14 @@ RSpec.describe Hyrax::Workflow::StatusListService do
     end
 
     context "when user has roles" do
+      let(:template) { double('template', admin_set_id: 'foobar') }
+      let(:workflow) do
+        instance_double(Sipity::Workflow, name: 'generic_work', permission_template: template)
+      end
+
       before do
         allow(Hyrax::Workflow::PermissionQuery).to receive(:scope_processing_workflow_roles_for_user_and_workflow).and_return(workflow_roles)
-        allow(Sipity::Workflow).to receive(:all).and_return([instance_double(Sipity::Workflow, name: 'generic_work')])
+        allow(Sipity::Workflow).to receive(:all).and_return([workflow])
       end
 
       it "returns status rows" do

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

data/spec/views/hyrax/base/_form.html.erb_spec.rb

@@ -74,17 +74,8 @@ RSpec.describe 'hyrax/base/_form.html.erb', type: :view do
     end
 
     describe 'uploading a folder' do
-      context 'with Chrome' do
-        before { allow(view).to receive(:browser_supports_directory_upload?) { true } }
-        it 'renders the add folder button' do
-          expect(page).to have_content('Add folder...')
-        end
-      end
-      context 'with a non-Chrome browser' do
-        before { allow(view).to receive(:browser_supports_directory_upload?) { false } }
-        it 'does not render the add folder button' do
-          expect(page).not_to have_content('Add folder...')
-        end
+      it 'renders the add folder button' do
+        expect(page).to have_content('Add folder...')
       end
     end
   end
@@ -95,6 +86,7 @@ RSpec.describe 'hyrax/base/_form.html.erb', type: :view do
     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
 
@@ -106,6 +98,7 @@ RSpec.describe 'hyrax/base/_form.html.erb', type: :view do
 
       # It diplays form errors
       expect(page).to have_content("broken")
+      expect(page).to have_content("visibility_error")
     end
   end
 end

data/spec/views/hyrax/base/_form_progress.html.erb_spec.rb

@@ -26,13 +26,27 @@ RSpec.describe 'hyrax/base/_form_progress.html.erb', type: :view do
       let(:proxies) { [stub_model(User, email: 'bob@example.com')] }
 
       before do
+        allow(Flipflop).to receive(:proxy_deposit?).and_return(true)
         allow(user).to receive(:can_make_deposits_for).and_return(proxies)
       end
+
       it "shows options for proxy" do
         expect(page).to have_content 'On behalf of'
         expect(page).to have_selector("select#generic_work_on_behalf_of option[value=\"\"]", text: 'Yourself')
         expect(page).to have_selector("select#generic_work_on_behalf_of option[value=\"bob@example.com\"]")
       end
+
+      context 'when feature disabled' do
+        before do
+          allow(Flipflop).to receive(:proxy_deposit?).and_return(false)
+        end
+
+        it "does not show options for proxy" do
+          expect(page).not_to have_content 'On behalf of'
+          expect(page).not_to have_selector("select#generic_work_on_behalf_of option[value=\"\"]", text: 'Yourself')
+          expect(page).not_to have_selector("select#generic_work_on_behalf_of option[value=\"bob@example.com\"]")
+        end
+      end
     end
 
     context "without options for proxy" do

data/spec/views/hyrax/collections/_show_document_list_row.html.erb_spec.rb

@@ -2,9 +2,7 @@ RSpec.describe 'hyrax/collections/_show_document_list_row.html.erb', type: :view
   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]) }

data/spec/views/hyrax/dashboard/collections/_show_document_list_row.html.erb_spec.rb

@@ -2,9 +2,7 @@ RSpec.describe 'hyrax/dashboard/collections/_show_document_list_row.html.erb', t
   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]) }

data/spec/views/hyrax/dashboard/profiles/edit.html.erb_spec.rb

@@ -13,6 +13,30 @@ RSpec.describe 'hyrax/dashboard/profiles/edit.html.erb', type: :view do
     expect(rendered).to match(/ORCID Profile/)
   end
 
+  describe 'proxy deposit' do
+    context 'when enabled' do
+      before do
+        allow(Flipflop).to receive(:proxy_deposit?).and_return(true)
+      end
+
+      it 'renders proxy partial' do
+        render
+        expect(rendered).to match(/Authorize Proxies/)
+      end
+    end
+
+    context 'when disabled' do
+      before do
+        allow(Flipflop).to receive(:proxy_deposit?).and_return(false)
+      end
+
+      it 'does not render proxy partial' do
+        render
+        expect(rendered).not_to match(/Authorize Proxies/)
+      end
+    end
+  end
+
   context "with trophy" do
     let(:solr_document) { SolrDocument.new(id: 'abc123', has_model_ssim: 'GenericWork', title_tesim: ['Title']) }
     let(:page) { Capybara::Node::Simple.new(rendered) }

data/spec/views/hyrax/dashboard/show_user_spec.rb

@@ -31,4 +31,28 @@ RSpec.describe "hyrax/dashboard/show_user.html.erb", type: :view do
     expect(rendered).to have_content "sent transfers"
     expect(rendered).to have_content "received transfers"
   end
+
+  describe 'proxy deposit' do
+    context 'when enabled' do
+      before do
+        allow(Flipflop).to receive(:proxy_deposit?).and_return(true)
+      end
+
+      it 'renders proxy partial' do
+        render
+        expect(rendered).to match(/Authorize Proxies/)
+      end
+    end
+
+    context 'when disabled' do
+      before do
+        allow(Flipflop).to receive(:proxy_deposit?).and_return(false)
+      end
+
+      it 'does not render proxy partial' do
+        render
+        expect(rendered).not_to match(/Authorize Proxies/)
+      end
+    end
+  end
 end

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyrax
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta4
+  version: 2.0.0.beta5
 platform: ruby
 authors:
 - Justin Coyne
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-22 00:00:00.000000000 Z
+date: 2017-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -358,14 +358,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: flipflop
   requirement: !ruby/object:Gem::Requirement
@@ -628,14 +628,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: mida
   requirement: !ruby/object:Gem::Requirement
@@ -983,6 +983,7 @@ files:
 - app/actors/hyrax/actors/optimistic_lock_validator.rb
 - app/actors/hyrax/actors/terminator.rb
 - app/actors/hyrax/actors/transactional_request.rb
+- app/actors/hyrax/actors/transfer_request_actor.rb
 - app/assets/images/audio.png
 - app/assets/images/collection.png
 - app/assets/images/default.png
@@ -1111,7 +1112,6 @@ files:
 - app/channels/hyrax/application_cable/connection.rb
 - app/channels/hyrax/notifications_channel.rb
 - app/connections/hyrax/clean_connection.rb
-- app/controlled_vocabularies/hyrax/controlled_vocabularies/location.rb
 - app/controllers/concerns/hyrax/admin/stats_behavior.rb
 - app/controllers/concerns/hyrax/admin/users_controller_behavior.rb
 - app/controllers/concerns/hyrax/api.rb
@@ -1485,7 +1485,6 @@ files:
 - app/services/hyrax/persist_derivatives.rb
 - app/services/hyrax/persist_directly_contained_output_file_service.rb
 - app/services/hyrax/qa_select_service.rb
-- app/services/hyrax/query_service.rb
 - app/services/hyrax/quick_classification_query.rb
 - app/services/hyrax/repository_fixity_check_service.rb
 - app/services/hyrax/resource_types_service.rb
@@ -1495,6 +1494,7 @@ files:
 - app/services/hyrax/statistics/depositors/summary.rb
 - app/services/hyrax/statistics/file_sets/by_format.rb
 - app/services/hyrax/statistics/over_time.rb
+- app/services/hyrax/statistics/query_service.rb
 - app/services/hyrax/statistics/system_stats.rb
 - app/services/hyrax/statistics/term_query.rb
 - app/services/hyrax/statistics/users/over_time.rb
@@ -1624,6 +1624,7 @@ files:
 - app/views/hyrax/base/_form_share.html.erb
 - app/views/hyrax/base/_form_thumbnail.html.erb
 - app/views/hyrax/base/_form_visibility_component.html.erb
+- app/views/hyrax/base/_form_visibility_error.html.erb
 - app/views/hyrax/base/_guts4form.html.erb
 - app/views/hyrax/base/_items.html.erb
 - app/views/hyrax/base/_member.html.erb
@@ -1964,7 +1965,9 @@ files:
 - lib/generators/hyrax/templates/config/authorities/resource_types.yml
 - lib/generators/hyrax/templates/config/authorities/rights_statements.yml
 - lib/generators/hyrax/templates/config/clamav.rb
-- lib/generators/hyrax/templates/config/hyrax.rb
+- lib/generators/hyrax/templates/config/initializers/hyrax.rb
+- lib/generators/hyrax/templates/config/initializers/mini_magick.rb
+- lib/generators/hyrax/templates/config/initializers/redis_config.rb
 - lib/generators/hyrax/templates/config/initializers/simple_form.rb
 - lib/generators/hyrax/templates/config/initializers/simple_form_bootstrap.rb
 - lib/generators/hyrax/templates/config/locales/hyrax.de.yml
@@ -1975,9 +1978,7 @@ files:
 - lib/generators/hyrax/templates/config/locales/hyrax.pt-BR.yml
 - lib/generators/hyrax/templates/config/locales/hyrax.zh.yml
 - lib/generators/hyrax/templates/config/mime_types.rb
-- lib/generators/hyrax/templates/config/mini_magick.rb
 - lib/generators/hyrax/templates/config/redis.yml
-- lib/generators/hyrax/templates/config/redis_config.rb
 - lib/generators/hyrax/templates/config/tinymce.yml
 - lib/generators/hyrax/templates/config/zotero.yml
 - lib/generators/hyrax/templates/db/seeds.rb
@@ -2019,6 +2020,8 @@ files:
 - lib/hyrax/callbacks.rb
 - lib/hyrax/callbacks/registry.rb
 - lib/hyrax/configuration.rb
+- lib/hyrax/controlled_vocabularies.rb
+- lib/hyrax/controlled_vocabularies/location.rb
 - lib/hyrax/controlled_vocabulary/importer/downloader.rb
 - lib/hyrax/controlled_vocabulary/importer/language.rb
 - lib/hyrax/controller_resource.rb
@@ -2096,6 +2099,7 @@ files:
 - spec/actors/hyrax/actors/model_actor_spec.rb
 - spec/actors/hyrax/actors/optimistic_lock_validator_spec.rb
 - spec/actors/hyrax/actors/transactional_request_spec.rb
+- spec/actors/hyrax/actors/transfer_request_actor_spec.rb
 - spec/authorities/qa/authorities/find_works_spec.rb
 - spec/channels/hyrax/application_cable/channel_spec.rb
 - spec/channels/hyrax/application_cable/connection_spec.rb
@@ -2489,7 +2493,6 @@ files:
 - spec/services/hyrax/persist_derivatives_spec.rb
 - spec/services/hyrax/persist_directly_contained_output_file_service_spec.rb
 - spec/services/hyrax/qa_select_service_spec.rb
-- spec/services/hyrax/query_service_spec.rb
 - 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
@@ -2497,6 +2500,7 @@ files:
 - 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
+- spec/services/hyrax/statistics/query_service_spec.rb
 - spec/services/hyrax/statistics/system_stats_spec.rb
 - spec/services/hyrax/statistics/users/over_time_spec.rb
 - spec/services/hyrax/statistics/works/by_depositor_spec.rb
@@ -2730,6 +2734,7 @@ test_files:
 - spec/actors/hyrax/actors/model_actor_spec.rb
 - spec/actors/hyrax/actors/optimistic_lock_validator_spec.rb
 - spec/actors/hyrax/actors/transactional_request_spec.rb
+- spec/actors/hyrax/actors/transfer_request_actor_spec.rb
 - spec/authorities/qa/authorities/find_works_spec.rb
 - spec/channels/hyrax/application_cable/channel_spec.rb
 - spec/channels/hyrax/application_cable/connection_spec.rb
@@ -3123,7 +3128,6 @@ test_files:
 - spec/services/hyrax/persist_derivatives_spec.rb
 - spec/services/hyrax/persist_directly_contained_output_file_service_spec.rb
 - spec/services/hyrax/qa_select_service_spec.rb
-- spec/services/hyrax/query_service_spec.rb
 - 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
@@ -3131,6 +3135,7 @@ test_files:
 - 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
+- spec/services/hyrax/statistics/query_service_spec.rb
 - spec/services/hyrax/statistics/system_stats_spec.rb
 - spec/services/hyrax/statistics/users/over_time_spec.rb
 - spec/services/hyrax/statistics/works/by_depositor_spec.rb

data/app/services/hyrax/query_service.rb

@@ -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