blacklight_oai_provider 6.1.0 → 6.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ceebec774a13c7b3e0651472ef6c78ef01e091cad8e5a2b7cfe4dee8597f883
-  data.tar.gz: bea9de1be5db043c9094a66f3be592623a3ef5ed970579e406ccacae1c1246d6
+  metadata.gz: 6b8abebeaa16868fc1ad106d29bc74be140a2c3bcd1452ca77d80a305c54ff71
+  data.tar.gz: fa4142efe30c1183c79b4f5a96a74ed7b6c8fa4c13d9622b1f8aa3e644b9fceb
 SHA512:
-  metadata.gz: aabaa271f67221254df440c532664dbba119e50031f5cf9dffaddbf31453483d354b783dbbd3291a991a8e939b8d5459541d73aeca210eaac28b53a56d49f5bb
-  data.tar.gz: 4b5fa537fb35349a6cd5814d16726964bee90f22aeff513868287a50c97d9fda5be7b07343748f0380d478d2d318b8e4ba6580a7845881bbaf0a2a2b58e49d8e
+  metadata.gz: 951af42d0f21f58fd0af44277b59c640e6de517da49fc4eaa2e06ada02627be0c8465aa080b6924f8ef13062795718bff8f9d90bfd16e736cfbf4205d26ba36b
+  data.tar.gz: 24bbe4772cd6cead1db8519c9719b294b1439ffe314e472e82455cfd39135a5c5cdf53c8746d7b59d99d014015ee37a40026903e1ad5928540ab233ecd08a0df

data/.github/workflows/ci.yml

@@ -0,0 +1,66 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: CI
+
+on: push
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.6
+      - name: Install dependencies
+        run: bundle install
+        env:
+          RAILS_VERSION: 5.2.4.4
+      - name: Run linter
+        run: bundle exec rubocop
+  test_rails5_2:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [2.6]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Install dependencies
+        run: bundle install
+        env:
+          RAILS_VERSION: 5.2.4.4
+      - name: Run tests
+        run: bundle exec rake ci
+        env:
+          RAILS_VERSION: 5.2.4.4
+          ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
+  test_rails5_1:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [2.5]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Install dependencies
+        run: bundle install
+        env:
+          RAILS_VERSION: 5.1.7
+      - name: Run tests
+        run: bundle exec rake ci
+        env:
+          RAILS_VERSION: 5.1.7
+          ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'

data/.rubocop.yml

@@ -50,3 +50,6 @@ Style/Documentation:
 Lint/UnusedMethodArgument:
   Exclude:
   - 'lib/blacklight_oai_provider/set.rb'
+
+RSpec/NestedGroups:
+  Enabled: false

data/VERSION

@@ -1 +1 @@
-6.1.0
+6.1.1

data/lib/blacklight_oai_provider/solr_document_wrapper.rb

@@ -41,7 +41,8 @@ module BlacklightOaiProvider
         end
         response.documents
       else
-        @controller.fetch(selector).first.documents.first
+        query = @controller.search_builder.where(document_model.unique_key => selector).query
+        @controller.repository.search(query).documents.first
       end
     end
 

data/solr/sample_solr_documents.yml

@@ -1932,6 +1932,7 @@
   - Israel
   title_si: bituaḥ u-viṭaḥon sotsyali
   id: '2005553155'
+  visibility_si: "open"
   author_si: "\U0010FFFF Bituaḥ uviṭaḥon sotsyali"
   title_addl_tsim:
   - "[Bituaḥ u-viṭaḥon sotsyali]."
@@ -2064,6 +2065,7 @@
   - '9780743297790'
   - 0743297792
   id: '2007020969'
+  visibility_si: "restricted"
   author_si: Hearth Amy Hill 1958 Strong Medicine speaks a Native American elder
     has her say  an oral history
   title_addl_tsim:

data/spec/controllers/catalog_controller_spec.rb

@@ -29,7 +29,7 @@ describe CatalogController do
       )
     end
 
-    it 'return corrext document configuration' do
+    it 'return correct document configuration' do
       expect(controller.oai_config[:document][:limit]).to be 25
     end
   end

data/spec/lib/blacklight_oai_provider/solr_document_wrapper_spec.rb

@@ -51,8 +51,30 @@ RSpec.describe BlacklightOaiProvider::SolrDocumentWrapper do
     end
 
     context 'when selector is an individual record' do
-      it 'returns a single record' do
-        expect(wrapper.find('2005553155')).to be_a SolrDocument
+      class VisibilityAwareSearchBuilder < Blacklight::SearchBuilder
+        include Blacklight::Solr::SearchBuilderBehavior
+        self.default_processor_chain += [:only_visible]
+
+        def only_visible(solr_parameters)
+          solr_parameters[:fq] ||= []
+          solr_parameters[:fq] << 'visibility_si:"open"'
+        end
+      end
+
+      before do
+        allow(controller).to receive(:search_builder_class).and_return(VisibilityAwareSearchBuilder)
+      end
+
+      context 'with a restricted work' do
+        it 'returns nothing' do
+          expect(wrapper.find('2007020969')).to be_nil
+        end
+      end
+
+      context 'with a public work' do
+        it 'returns a single record' do
+          expect(wrapper.find('2005553155')).to be_a SolrDocument
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_oai_provider
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.1.1
 platform: ruby
 authors:
 - Chris Beer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-14 00:00:00.000000000 Z
+date: 2021-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -173,11 +173,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".solr_wrapper"
-- ".travis.yml"
 - Gemfile
 - MIT-LICENSE
 - README.md

data/.travis.yml

@@ -1,26 +0,0 @@
-dist: bionic
-language: ruby
-addons:
-  chrome: stable
-before_install:
-  - google-chrome-stable --headless --disable-gpu --no-sandbox --remote-debugging-port=9222 http://localhost &
-
-notifications:
-  email: false
-
-matrix:
-  include:
-    - rvm: 2.6.5
-      env: "RAILS_VERSION=5.2.3"
-    - rvm: 2.5.7
-      env: "RAILS_VERSION=5.1.7"
-
-notifications:
-  irc: "irc.freenode.org#blacklight"
-  email:
-      - blacklight-commits@googlegroups.com
-
-global_env:
-  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
-
-jdk: oraclejdk9