blacklight-access_controls 0.3.0 → 0.4.0

data/solr_conf/conf/solrconfig.xml

@@ -17,11 +17,11 @@
 -->
 
 <!--
- This is a stripped down config file used for a simple example...
- It is *not* a good example to work from.
+ This is a stripped down config file used for a simple example...  
+ It is *not* a good example to work from. 
 -->
 <config>
-
+  
   <!-- Controls what version of Lucene various components of Solr
        adhere to.  Generally, you want to use the latest version to
        get all bug fixes and improvements. It is highly recommended
@@ -29,15 +29,15 @@
        affect both how text is indexed and queried.
   -->
   <luceneMatchVersion>5.0.0</luceneMatchVersion>
+  
+  <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
+  <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />
+  <lib dir="${solr.install.dir:../../../..}/contrib/extraction/lib" regex=".*\.jar" />
+  <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-cell-\d.*\.jar" />
 
-  <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-dataimporthandler-.*\.jar"/>
-
-  <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib"/>
-  <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs"/>
-
-  <directoryFactory name="DirectoryFactory"
+  <directoryFactory name="DirectoryFactory" 
                     class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}">
-  </directoryFactory>
+  </directoryFactory> 
 
   <codecFactory class="solr.SchemaCodecFactory"/>
 
@@ -45,23 +45,32 @@
 
 
   <dataDir>${solr.blacklight-core.data.dir:}</dataDir>
-
+  
   <requestDispatcher handleSelect="true" >
-    <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" />
+    <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048000" />
   </requestDispatcher>
-
+  
   <requestHandler name="/analysis/field" startup="lazy" class="solr.FieldAnalysisRequestHandler" />
 
-  <!-- config for the admin interface -->
+  <!-- config for the admin interface --> 
   <admin>
     <defaultQuery>*:*</defaultQuery>
   </admin>
 
-  <requestHandler name="/dataimport" class="solr.DataImportHandler">
-    <lst name="defaults">
-      <str name="config">db-data-config.xml</str>
-    </lst>
-  </requestHandler>
+  <updateHandler class="solr.DirectUpdateHandler2">
+    <updateLog>
+      <str name="dir">${solr.ulog.dir:}</str>
+    </updateLog>
+
+    <autoCommit>
+      <maxTime>${solr.autoCommit.maxTime:15000}</maxTime>
+      <openSearcher>false</openSearcher>
+    </autoCommit>
+
+    <autoSoftCommit>
+      <maxTime>${solr.autoSoftCommit.maxTime:-1}</maxTime>
+    </autoSoftCommit>
+  </updateHandler>
 
   <!-- SearchHandler
 
@@ -76,117 +85,98 @@
     <!-- default values for query parameters can be specified, these
          will be overridden by parameters in the request
       -->
-    <lst name="defaults">
-      <str name="defType">edismax</str>
-      <str name="echoParams">explicit</str>
-      <int name="rows">10</int>
-
-      <str name="q.alt">*:*</str>
-      <str name="mm">2&lt;-1 5&lt;-2 6&lt;90%</str>
-
-      <!-- this qf and pf are used by default, if not otherwise specified by
-           client. The default blacklight_config will use these for the
-           "keywords" search. See the author_qf/author_pf, title_qf, etc
-           below, which the default blacklight_config will specify for
-           those searches. You may also be interested in:
-           http://wiki.apache.org/solr/LocalParams
-      -->
-
-      <str name="qf">
-        title_ssi^25000
-        abstract_tesi^1000
-        text
-      </str>
-
-      <int name="ps">3</int>
-      <float name="tie">0.01</float>
+     <lst name="defaults">
+       <str name="defType">edismax</str>
+       <str name="echoParams">explicit</str>
+       <str name="q.alt">*:*</str>
+       <str name="mm">2&lt;-1 5&lt;-2 6&lt;90%</str>
+       <int name="qs">1</int>
+       <int name="ps">2</int>
+       <float name="tie">0.01</float>
+       <!-- this qf and pf are used by default, if not otherwise specified by
+            client. The default blacklight_config will use these for the
+            "keywords" search. See the author_qf/author_pf, title_qf, etc
+            below, which the default blacklight_config will specify for
+            those searches. You may also be interested in:
+            http://wiki.apache.org/solr/LocalParams
+       -->
+        <str name="qf">
+          id
+          active_fedora_model_ssi
+          title_tesim
+          author_tesim
+          subject_tesim
+        </str>
+        <str name="pf">
+          all_text_timv^10
+        </str>
+
+       <str name="author_qf">
+          author_tesim
+       </str>
+       <str name="author_pf">
+       </str>
+       <str name="title_qf">
+          title_tesim
+       </str>
+       <str name="title_pf">
+       </str>
+       <str name="subject_qf">
+          subject_tesim
+       </str>
+       <str name="subject_pf">
+       </str>
+
+       <str name="fl">
+         *,
+         score
+       </str>
+
+       <str name="facet">true</str>
+       <str name="facet.mincount">1</str>
+
+       <str name="spellcheck">true</str>
+       <str name="spellcheck.dictionary">default</str>
+       <str name="spellcheck.onlyMorePopular">true</str>
+       <str name="spellcheck.extendedResults">true</str>
+       <str name="spellcheck.collate">false</str>
+       <str name="spellcheck.count">5</str>
+
+     </lst>
+    <arr name="last-components">
+      <str>spellcheck</str>
+    </arr>
+  </requestHandler>
 
-      <!-- NOT using marc_display because it is large and will slow things down for search results -->
+  <requestHandler name="permissions" class="solr.SearchHandler" >
+    <lst name="defaults">
+      <str name="facet">off</str>
+      <str name="echoParams">all</str>
+      <str name="rows">1</str>
+      <str name="q">{!raw f=id v=$id}</str> <!-- use id=666 instead of q=id:666 -->
       <str name="fl">
-        *,
-        score
-      </str>
-      <!--str name="fl">
         id,
-        score,
-        title_tsi,
-        access_level_ss,
-        abstract_tesi
-      </str-->
-
-      <str name="facet">true</str>
-      <str name="facet.mincount">1</str>
-      <str name="facet.limit">10</str>
-      <str name="facet.field">year_isi</str>
-      <str name="facet.field">degree_name_ssi</str>
-      <str name="facet.field">semester_ssi</str>
-      <str name="facet.field">program_name_ssi</str>
-
-      <str name="spellcheck">true</str>
-      <str name="spellcheck.dictionary">default</str>
-      <str name="spellcheck.onlyMorePopular">true</str>
-      <str name="spellcheck.extendedResults">true</str>
-      <str name="spellcheck.collate">false</str>
-      <str name="spellcheck.count">5</str>
-
+        access_ssim,
+        discover_access_group_ssim,discover_access_person_ssim,
+        read_access_group_ssim,read_access_person_ssim,
+        edit_access_group_ssim,edit_access_person_ssim,
+        download_access_group_ssim,download_access_person_ssim,
+        depositor_ti,
+        embargo_release_date_dtsi
+        inheritable_access_ssim,
+        inheritable_discover_access_group_ssim,inheritable_discover_access_person_ssim,
+        inheritable_read_access_group_ssim,inheritable_read_access_person_ssim,
+        inheritable_edit_access_group_ssim,inheritable_edit_access_person_ssim,
+        inheritable_embargo_release_date_dtsi
+      </str>
     </lst>
-    <!-- In addition to defaults, "appends" params can be specified
-         to identify values which should be appended to the list of
-         multi-val params from the query (or the existing "defaults").
-      -->
-    <!-- In this example, the param "fq=instock:true" would be appended to
-         any query time fq params the user may specify, as a mechanism for
-         partitioning the index, independent of any user selected filtering
-         that may also be desired (perhaps as a result of faceted searching).
-         that may also be desired (perhaps as a result of faceted searching).
-
-         NOTE: there is *absolutely* nothing a client can do to prevent these
-         "appends" values from being used, so don't use this mechanism
-         unless you are sure you always want it.
-      -->
-    <!--
-       <lst name="appends">
-         <str name="fq">inStock:true</str>
-       </lst>
-      -->
-    <!-- "invariants" are a way of letting the Solr maintainer lock down
-         the options available to Solr clients.  Any params values
-         specified here are used regardless of what values may be specified
-         in either the query, the "defaults", or the "appends" params.
-
-         In this example, the facet.field and facet.query params would
-         be fixed, limiting the facets clients can use.  Faceting is
-         not turned on by default - but if the client does specify
-         facet=true in the request, these are the only facets they
-         will be able to see counts for; regardless of what other
-         facet.field or facet.query params they may specify.
-
-         NOTE: there is *absolutely* nothing a client can do to prevent these
-         "invariants" values from being used, so don't use this mechanism
-         unless you are sure you always want it.
-      -->
-    <!--
-       <lst name="invariants">
-         <str name="facet.field">cat</str>
-         <str name="facet.field">manu_exact</str>
-         <str name="facet.query">price:[* TO 500]</str>
-         <str name="facet.query">price:[500 TO *]</str>
-       </lst>
-      -->
-    <!-- If the default list of SearchComponents is not desired, that
-         list can either be overridden completely, or components can be
-         prepended or appended to the default list.  (see below)
-      -->
-    <!--
-       <arr name="components">
-         <str>nameOfCustomComponent1</str>
-         <str>nameOfCustomComponent2</str>
-       </arr>
-      -->
-    <arr name="last-components">
-      <str>spellcheck</str>
-    </arr>
+  </requestHandler>
 
+  <requestHandler name="standard" class="solr.SearchHandler">
+     <lst name="defaults">
+       <str name="echoParams">explicit</str>
+       <str name="defType">lucene</str>
+     </lst>
   </requestHandler>
 
   <!-- for requests to get a single document; use id=666 instead of q=id:666 -->
@@ -199,13 +189,13 @@
     </lst>
   </requestHandler>
 
-  <!-- Spell Check
+<!-- Spell Check
 
-          The spell check component can return a list of alternative spelling
-          suggestions.
+        The spell check component can return a list of alternative spelling
+        suggestions.  
 
-          http://wiki.apache.org/solr/SpellCheckComponent
-       -->
+        http://wiki.apache.org/solr/SpellCheckComponent
+     -->
   <searchComponent name="spellcheck" class="solr.SpellCheckComponent">
 
     <str name="queryAnalyzerFieldType">textSpell</str>
@@ -257,7 +247,7 @@
        </lst>
      -->
 
-    <!-- a spellchecker that use an alternate comparator
+    <!-- a spellchecker that use an alternate comparator 
 
          comparatorClass be one of:
           1. score (default)
@@ -306,25 +296,18 @@
     </arr>
   </requestHandler>
 
-  <requestHandler name="permissions" class="solr.SearchHandler" >
+  <requestHandler name="/update/extract" class="org.apache.solr.handler.extraction.ExtractingRequestHandler">
     <lst name="defaults">
-      <str name="facet">off</str>
-      <str name="echoParams">all</str>
-      <str name="rows">1</str>
-      <str name="q">{!raw f=id v=$id}</str> <!-- use id=666 instead of q=id:666 -->
-      <str name="fl">
-        id,
-        access_ssim,
-        discover_access_group_ssim,discover_access_person_ssim,
-        read_access_group_ssim,read_access_person_ssim,
-        download_access_group_ssim,download_access_person_ssim,
-        depositor_ti,
-        inheritable_access_ssim,
-        inheritable_discover_access_group_ssim,inheritable_discover_access_person_ssim,
-        inheritable_read_access_group_ssim,inheritable_read_access_person_ssim,
-        inheritable_download_access_group_ssim,inheritable_download_access_person_ssim,
-      </str>
+      <str name="fmap.Last-Modified">last_modified</str>
+      <str name="uprefix">ignored_</str>
     </lst>
+    <!--Optional.  Specify a path to a tika configuration file. See the Tika docs for details.-->
+    <!-- <str name="tika.config">/my/path/to/tika.config</str> -->
+    <!-- Optional. Specify one or more date formats to parse. See DateUtil.DEFAULT_DATE_FORMATS
+         for default date formats -->
+    <!-- <lst name="date.formats"> -->
+    <!--   <str>yyyy&#45;MM&#45;dd</str> -->
+    <!-- </lst> -->
   </requestHandler>
-
 </config>
+

data/spec/unit/enforcement_spec.rb

@@ -12,6 +12,10 @@ describe Blacklight::AccessControls::Enforcement do
 
   subject { search_builder }
 
+  before do
+    allow(controller).to receive(:current_ability).and_return(ability)
+  end
+
   describe "When I am searching for content" do
     before do
       @solr_parameters = {}
@@ -19,7 +23,6 @@ describe Blacklight::AccessControls::Enforcement do
 
     context "Given I am not logged in" do
       before do
-        subject.current_ability = ability
         subject.send(:apply_gated_discovery, @solr_parameters)
       end
 
@@ -33,11 +36,13 @@ describe Blacklight::AccessControls::Enforcement do
     end
 
     context "Given I am a registered user" do
-      let(:user) { create(:user) }
+      let(:user) do
+        create(:user).tap do |u|
+          allow(u).to receive(:groups) { ["faculty", "africana-faculty"] }
+        end
+      end
 
       before do
-        allow(user).to receive(:groups) { ["faculty", "africana-faculty"] }
-        subject.current_ability = Ability.new(user)
         subject.send(:apply_gated_discovery, @solr_parameters)
       end
 
@@ -67,7 +72,6 @@ describe Blacklight::AccessControls::Enforcement do
   describe "#except" do
     let(:user) { build(:user) }
     let(:ability) { Ability.new(user) }
-    before { search_builder.current_ability = ability }
     subject { search_builder.except('foo') }
 
     it "keeps the current_ability set" do
@@ -78,7 +82,6 @@ describe Blacklight::AccessControls::Enforcement do
   describe "#append" do
     let(:user) { build(:user) }
     let(:ability) { Ability.new(user) }
-    before { search_builder.current_ability = ability }
     subject { search_builder.append('foo') }
 
     it "keeps the current_ability set" do
@@ -87,23 +90,25 @@ describe Blacklight::AccessControls::Enforcement do
   end
 
   describe "apply_gated_discovery" do
-    let(:user) { create(:user) }
+    let(:user) do
+      create(:user).tap do |u|
+        allow(u).to receive(:groups) { groups }
+      end
+    end
     let(:groups) { ["archivist","researcher"] }
 
     before do
-      allow(user).to receive(:groups) { groups }
-      subject.current_ability = Ability.new(user)
       @solr_parameters = {}
     end
 
-    it "should set query fields for the user id checking against the discover, read fields" do
+    it "sets query fields for the user id checking against the discover, read fields" do
       subject.send(:apply_gated_discovery, @solr_parameters)
       ["discover","read"].each do |type|
         expect(@solr_parameters[:fq].first).to match(/#{type}_access_person_ssim\:#{user.user_key}/)
       end
     end
 
-    it "should set query fields for all roles the user is a member of checking against the discover, read fields" do
+    it "sets query fields for all roles the user is a member of checking against the discover, read fields" do
       subject.send(:apply_gated_discovery, @solr_parameters)
       ["discover","read"].each do |type|
         expect(@solr_parameters[:fq].first).to match(/#{type}_access_group_ssim\:archivist/)
@@ -150,21 +155,16 @@ describe Blacklight::AccessControls::Enforcement do
 
   describe "apply_user_permissions" do
     describe "when the user is a guest user (user key nil)" do
-      before { subject.current_ability = ability }
-
-      it "should not create filters" do
+      it "does not create filters" do
         expect(subject.send(:apply_user_permissions, ["discover","read"])).to eq []
       end
     end
 
     describe "when the user is a guest user (user key empty string)" do
       let(:user) { User.new(email: '') }
-      before { subject.current_ability = ability }
-
-      it "should not create filters" do
+      it "does not create filters" do
         expect(subject.send(:apply_user_permissions, ["discover","read"])).to eq []
       end
     end
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-access_controls
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cancancan
@@ -41,6 +41,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: deprecation
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -250,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Access controls for blacklight-based applications