curation_concerns 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fce83d5072e8e270e130b70cbbcd172c4a67f8b
-  data.tar.gz: 810425e450dc9b3c74b34f8e2e5b5d792caad21c
+  metadata.gz: 26855485f2643a47ee5a78b29009b4fbcfe706c6
+  data.tar.gz: 88f265f67966b7e34a60fa75b04a1a89b6c690d6
 SHA512:
-  metadata.gz: 464f2c154c361745c3fcba8eaac523c4ebee3d7a625163980c5754ac5c9f1f476fd8ccb813d3c7d39f42ab26fe96c5dfc72be5113ee0233f7397e73faaea1191
-  data.tar.gz: f477c89852669354e20fd1243788c7dec5263e12c0636e9869478317b82422bb4ecdcd7138c5ab74cfeb8ccf5d6978ff7cb91bc206cd964dfbaf28b359fbf5c0
+  metadata.gz: 2104575cd50826e59ddc75148a96060e4d9f016d70d717e46228d008cb6995eb01ef3a86c099c8b3c2772acce9e23215c4d92c26e389a6c2c07ae99b2b539039
+  data.tar.gz: cfa2b836990e759572ed1ee9f12c1db96f678be38ea065443ad8c220e3fa719d4a1b24b1c33fbeb511fe3e2cca51383b74a3039f7701aa41f679925a3b34043e

data/app/search_builders/curation_concerns/collection_search_builder.rb

@@ -9,9 +9,9 @@ module CurationConcerns
   class CollectionSearchBuilder < ::SearchBuilder
     include FilterByType
     # Defines which search_params_logic should be used when searching for Collections
-    def initialize(context)
+    def initialize(*)
       @rows = 100
-      super(context)
+      super
     end
 
     # @return [String] Solr field name indicating default sort order

data/app/search_builders/curation_concerns/filter_suppressed_with_roles.rb

@@ -25,6 +25,9 @@ module CurationConcerns
 
       def user_has_active_workflow_role?
         CurationConcerns::Workflow::PermissionQuery.scope_permitted_workflow_actions_available_for_current_state(user: current_ability.current_user, entity: current_work).any?
+      rescue PowerConverter::ConversionError
+        # The current_work doesn't have a sipity workflow entity
+        false
       end
   end
 end

data/app/search_builders/curation_concerns/work_search_builder.rb

@@ -1,4 +1,8 @@
 module CurationConcerns
+  # Finds a single work result. It returns no result if you don't have
+  # access to the requested work.  If the work is suppressed (due to being in a
+  # workflow), then it checks to see if the current_user has any workflow role
+  # on the given work.
   class WorkSearchBuilder < ::SearchBuilder
     include CurationConcerns::SingleResult
     include CurationConcerns::FilterSuppressedWithRoles

data/lib/curation_concerns/version.rb

@@ -1,3 +1,3 @@
 module CurationConcerns
-  VERSION = '1.7.0'.freeze
+  VERSION = '1.7.1'.freeze
 end

data/spec/search_builders/curation_concerns/work_search_builder_spec.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+
+RSpec.describe CurationConcerns::WorkSearchBuilder do
+  let(:me) { create(:user) }
+  let(:config) { CatalogController.blacklight_config }
+  let(:scope) do
+    double('The scope',
+           blacklight_config: config,
+           current_ability: Ability.new(me),
+           current_user: me)
+  end
+  let(:builder) { described_class.new(scope).with(params) }
+  let(:params) { { id: '123abc' } }
+
+  before do
+    allow(builder).to receive(:gated_discovery_filters).and_return(["access_filter1", "access_filter2"])
+
+    # This prevents any generated classes from interfering with this test:
+    allow(builder).to receive(:work_classes).and_return([GenericWork])
+  end
+
+  describe "#query" do
+    subject { builder.query }
+    let(:doc) { instance_double(SolrDocument) }
+    before do
+      allow(SolrDocument).to receive(:find).and_return(doc)
+    end
+
+    context "when the current_work has a workflow entity" do
+      before do
+        expect(CurationConcerns::Workflow::PermissionQuery).to receive(:scope_permitted_workflow_actions_available_for_current_state)
+          .with(user: me,
+                entity: doc).and_return(roles)
+      end
+      context "and the current user has a role" do
+        let(:roles) { [double] }
+        it "filters for id, access, suppressed and type" do
+          expect(subject[:fq]).to eq ["access_filter1 OR access_filter2",
+                                      "{!terms f=has_model_ssim}GenericWork,Collection",
+                                      "{!raw f=id}123abc"]
+        end
+      end
+      context "and the current user doesn't have a role" do
+        let(:roles) { [] }
+        it "filters for id, access, suppressed and type" do
+          expect(subject[:fq]).to eq ["access_filter1 OR access_filter2",
+                                      "{!terms f=has_model_ssim}GenericWork,Collection",
+                                      "-suppressed_bsi:true",
+                                      "{!raw f=id}123abc"]
+        end
+      end
+    end
+
+    context "when the current_work doesn't have a workflow entity" do
+      before do
+        expect(CurationConcerns::Workflow::PermissionQuery).to receive(:scope_permitted_workflow_actions_available_for_current_state)
+          .and_raise(PowerConverter::ConversionError.new(double, {}))
+      end
+      it "filters for id, access, suppressed and type" do
+        expect(subject[:fq]).to eq ["access_filter1 OR access_filter2",
+                                    "{!terms f=has_model_ssim}GenericWork,Collection",
+                                    "-suppressed_bsi:true",
+                                    "{!raw f=id}123abc"]
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2016-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -1479,6 +1479,7 @@ files:
 - spec/search_builders/curation_concerns/file_set_search_builder_spec.rb
 - spec/search_builders/curation_concerns/lease_search_builder_spec.rb
 - spec/search_builders/curation_concerns/work_relation_spec.rb
+- spec/search_builders/curation_concerns/work_search_builder_spec.rb
 - spec/search_builders/resource_types_service_spec.rb
 - spec/services/curation_concern_spec.rb
 - spec/services/curation_concerns/admin_set_service_spec.rb
@@ -1772,6 +1773,7 @@ test_files:
 - spec/search_builders/curation_concerns/file_set_search_builder_spec.rb
 - spec/search_builders/curation_concerns/lease_search_builder_spec.rb
 - spec/search_builders/curation_concerns/work_relation_spec.rb
+- spec/search_builders/curation_concerns/work_search_builder_spec.rb
 - spec/search_builders/resource_types_service_spec.rb
 - spec/services/curation_concern_spec.rb
 - spec/services/curation_concerns/admin_set_service_spec.rb