geo_combine 0.4.0 → 0.5.0

data/spec/features/iso2html_spec.rb

@@ -20,31 +20,37 @@ describe 'ISO 19139 to html' do
   describe 'Spatial Reference Information' do
     it 'has sections' do
       expect(page).to have_tag '#iso-spatial-reference-info'
+      expect(page).to have_tag 'h2', text: 'Identification Information'
     end
   end
   describe 'Data Quality Information' do
     it 'has sections' do
       expect(page).to have_tag '#iso-data-quality-info'
+      expect(page).to have_tag 'h2', text: 'Data Quality Information'
     end
   end
   describe 'Distribution Information' do
     it 'has sections' do
       expect(page).to have_tag '#iso-distribution-info'
+      expect(page).to have_tag 'h2', text: 'Distribution Information'
     end
   end
   describe 'Content Information' do
     it 'has sections' do
-      expect(page).to have_tag '#iso-distribution-info'
+      expect(page).to have_tag '#iso-content-info'
+      expect(page).to have_tag 'h2', text: 'Content Information'
     end
   end
   describe 'Spatial Representation Information' do
     it 'has sections' do
       expect(page).to have_tag '#iso-spatial-representation-info'
+      expect(page).to have_tag 'h2', text: 'Spatial Representation Information'
     end
   end
   describe 'Metadata Reference Information' do
     it 'has sections' do
       expect(page).to have_tag '#iso-metadata-reference-info'
+      expect(page).to have_tag 'h2', text: 'Metadata Reference Information'
     end
   end
 end

data/spec/lib/geo_combine/geo_blacklight_harvester_spec.rb

@@ -0,0 +1,190 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'rsolr'
+
+RSpec.describe GeoCombine::GeoBlacklightHarvester do
+  let(:site_key) { :INSTITUTION }
+  let(:stub_json_response) { '{}' }
+  let(:stub_solr_connection) { double('RSolr::Connection') }
+  subject(:harvester) { described_class.new(site_key) }
+
+  before do
+    allow(described_class).to receive(:config).and_return({
+      INSTITUTION: {
+        host: 'https://example.com/',
+        params: {
+          f: { dct_provenance_s: ['INSTITUTION'] }
+        }
+      }
+    })
+  end
+
+  describe 'initialization' do
+    context 'when an unconfigured site is sent in' do
+      let(:site_key) { 'unknown' }
+
+      it { expect { harvester }.to raise_error(ArgumentError) }
+    end
+  end
+
+  describe '#index' do
+    before do
+      expect(Net::HTTP).to receive(:get).with(
+        URI('https://example.com?f%5Bdct_provenance_s%5D%5B%5D=INSTITUTION&format=json&per_page=100&page=1')
+      ).and_return(stub_json_response)
+      allow(RSolr).to receive(:connect).and_return(stub_solr_connection)
+    end
+
+    let(:docs) { [{ layer_slug_s: 'abc-123' }, { layer_slug_s: 'abc-321' }] }
+    let(:stub_json_response) do
+      { response: { docs: docs, pages: { current_page: 1, total_pages: 1 } } }.to_json
+    end
+
+    it 'adds documents returned to solr' do
+      expect(stub_solr_connection).to receive(:update).with(hash_including(data: docs.to_json)).and_return(nil)
+      harvester.index
+    end
+
+    describe 'document tranformations' do
+      let(:docs) do
+        [
+         { layer_slug_s: 'abc-123', _version_: '1', timestamp: '1999-12-31', score: 0.1 },
+         { layer_slug_s: 'abc-321', dc_source_s: 'abc-123' }
+        ]
+      end
+
+      context 'when a tranformer is set' do
+        before do
+          expect(described_class).to receive(:document_transformer).at_least(:once).and_return(
+            ->(doc) {
+              doc.delete('_version_')
+              doc
+            }
+          )
+        end
+
+        it 'removes the _version_ field as requested' do
+          expect(stub_solr_connection).to receive(:update).with(
+            hash_including(
+              data: [
+                { layer_slug_s: 'abc-123', timestamp: '1999-12-31', score: 0.1 },
+                { layer_slug_s: 'abc-321', dc_source_s: 'abc-123' }
+              ].to_json
+            )
+          ).and_return(nil)
+
+          harvester.index
+        end
+      end
+
+      context 'when no transformer is set' do
+        it 'removes the _version_, timestamp, and score fields' do
+          expect(stub_solr_connection).to receive(:update).with(
+            hash_including(
+              data: [
+                { layer_slug_s: 'abc-123' },
+                { layer_slug_s: 'abc-321', dc_source_s: 'abc-123' }
+              ].to_json
+            )
+          ).and_return(nil)
+
+          harvester.index
+        end
+      end
+    end
+  end
+
+  describe 'BlacklightResponseVersionFactory' do
+    let(:version_class) { described_class::BlacklightResponseVersionFactory.call(json) }
+
+    context 'when a legacy blacklight version (6 and earlier)' do
+      let(:json) { { 'response' => {} } }
+
+      it { expect(version_class).to be described_class::LegacyBlacklightResponse }
+    end
+
+    context 'when a modern blacklight version (7 and later)' do
+      let(:json) { { 'links' => {}, 'data' => [] } }
+
+      it { expect(version_class).to be described_class::ModernBlacklightResponse }
+    end
+
+    context 'when a the JSON response is not recognizable' do
+      let(:json) { { error: 'Broken' } }
+
+      it { expect { version_class }.to raise_error(NotImplementedError) }
+    end
+  end
+
+  describe 'LegacyBlacklightResponse' do
+    before do
+      allow(RSolr).to receive(:connect).and_return(stub_solr_connection)
+    end
+
+    let(:first_docs) {  [{ 'layer_slug_s' => 'abc-123' }, { 'layer_slug_s' => 'abc-321' }] }
+    let(:second_docs) { [{ 'layer_slug_s' => 'xyz-123' }, { 'layer_slug_s' => 'xyz-321' }] }
+    let(:stub_first_response) do
+      { 'response' => { 'docs' => first_docs, 'pages' =>  { 'current_page' => 1, 'total_pages' => 2 } } }
+    end
+    let(:stub_second_response) do
+      { 'response' => { 'docs' => second_docs, 'pages' => { 'current_page' => 2, 'total_pages' => 2 } } }
+    end
+
+    describe '#documents' do
+      it 'pages through the response and returns all the documents' do
+        expect(Net::HTTP).to receive(:get).with(
+          URI('https://example.com?f%5Bdct_provenance_s%5D%5B%5D=INSTITUTION&format=json&per_page=100&page=2')
+        ).and_return(stub_second_response.to_json)
+        base_url = 'https://example.com?f%5Bdct_provenance_s%5D%5B%5D=INSTITUTION&format=json&per_page=100'
+        docs = described_class::LegacyBlacklightResponse.new(response: stub_first_response, base_url: base_url).documents
+
+        expect(docs.to_a).to eq([first_docs, second_docs])
+      end
+    end
+  end
+
+  describe 'ModernBlacklightResponse' do
+    before do
+      allow(RSolr).to receive(:connect).and_return(stub_solr_connection)
+      expect(Net::HTTP).to receive(:get).with(
+        URI('https://example.com?f%5Bdct_provenance_s%5D%5B%5D=INSTITUTION&format=json&per_page=100&page=2')
+      ).and_return(second_results_response.to_json)
+    end
+
+    let(:first_results_response) do
+      { 'data' => [
+          { 'links' => { 'self' => 'https://example.com/catalog/abc-123' } },
+          { 'links' => { 'self' => 'https://example.com/catalog/abc-321' } }
+        ],
+        'links' => { 'next' => 'https://example.com?f%5Bdct_provenance_s%5D%5B%5D=INSTITUTION&format=json&per_page=100&page=2' }
+      }
+    end
+
+    let(:second_results_response) do
+      { 'data' => [
+          { 'links' => { 'self' => 'https://example.com/catalog/xyz-123' } },
+          { 'links' => { 'self' => 'https://example.com/catalog/xyz-321' } }
+        ]
+      }
+    end
+
+    describe '#documents' do
+      it 'pages through the response and fetches documents for each "link" on the response data' do
+        %w[abc-123 abc-321 xyz-123 xyz-321].each do |id|
+          expect(Net::HTTP).to receive(:get).with(
+            URI("https://example.com/catalog/#{id}/raw")
+          ).and_return({ 'layer_slug_s' => id }.to_json)
+        end
+
+        base_url = 'https://example.com?f%5Bdct_provenance_s%5D%5B%5D=INSTITUTION&format=json&per_page=100'
+        docs = described_class::ModernBlacklightResponse.new(response: first_results_response, base_url: base_url).documents
+
+        expect(docs.to_a).to eq([
+          [{ 'layer_slug_s' => 'abc-123' }, { 'layer_slug_s' => 'abc-321' }],
+          [{ 'layer_slug_s' => 'xyz-123' }, { 'layer_slug_s' => 'xyz-321' }],
+        ])
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geo_combine
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Jack Reed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-23 00:00:00.000000000 Z
+date: 2020-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -191,6 +191,7 @@ files:
 - lib/geo_combine/fgdc.rb
 - lib/geo_combine/formats.rb
 - lib/geo_combine/formatting.rb
+- lib/geo_combine/geo_blacklight_harvester.rb
 - lib/geo_combine/geoblacklight.rb
 - lib/geo_combine/geometry_types.rb
 - lib/geo_combine/iso19139.rb
@@ -234,6 +235,7 @@ files:
 - spec/lib/geo_combine/esri_open_data_spec.rb
 - spec/lib/geo_combine/fgdc_spec.rb
 - spec/lib/geo_combine/formatting_spec.rb
+- spec/lib/geo_combine/geo_blacklight_harvester_spec.rb
 - spec/lib/geo_combine/geoblacklight_spec.rb
 - spec/lib/geo_combine/iso19139_spec.rb
 - spec/lib/geo_combine/ogp_spec.rb
@@ -258,8 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A Ruby toolkit for managing geospatial metadata
@@ -282,6 +283,7 @@ test_files:
 - spec/lib/geo_combine/esri_open_data_spec.rb
 - spec/lib/geo_combine/fgdc_spec.rb
 - spec/lib/geo_combine/formatting_spec.rb
+- spec/lib/geo_combine/geo_blacklight_harvester_spec.rb
 - spec/lib/geo_combine/geoblacklight_spec.rb
 - spec/lib/geo_combine/iso19139_spec.rb
 - spec/lib/geo_combine/ogp_spec.rb