geoblacklight 0.12.1 → 1.0.0.pre1

data/spec/lib/geoblacklight/document_presenter_spec.rb

@@ -2,30 +2,58 @@ require 'spec_helper'
 
 describe Geoblacklight::DocumentPresenter do
   let(:request_context) { double(add_facet_params: '') }
-  let(:config) { Blacklight::Configuration.new }
+  let(:blacklight_config) do
+    Blacklight::Configuration.new.configure do |config|
+      config.add_index_field 'layer_id_s'
+      config.add_index_field 'index_display'
+      config.add_index_field 'period'
+      config.add_index_field 'multi_display'
+    end
+  end
+  let(:solr_fields) { Settings.FIELDS }
   subject { presenter }
   let(:presenter) do
-    described_class.new(document, request_context, config)
+    described_class.new(document, request_context, blacklight_config)
   end
 
   let(:document) do
-    SolrDocument.new(id: 1, layer_id_s: 'druid:abc123')
+    SolrDocument.new(
+      id: 1,
+      layer_id_s: 'druid:abc123',
+      non_index_field: 'do not render',
+      period: 'Ends with period.',
+      multi_display: %w(blue blah)
+    )
   end
 
-  describe '#wxs_identifier' do
-    describe 'without wxs identifier in configuration' do
+  describe '#index_fields_display' do
+    let(:rendered_index_text) { subject.index_fields_display }
+    let(:multi_valued_text) { document['multi_display'].join(' and ') }
+    let(:combined_fields) { document['layer_id_s'] + '. ' + document['period'] }
+
+    context 'with multi-valued field' do
+      it 'each value is separated by comma' do
+        expect(rendered_index_text).to include(multi_valued_text)
+      end
     end
-    it 'returns empty string' do
-      expect(subject.wxs_identifier).to eq ''
+    context 'with document fields not configured as index field' do
+      it 'does not render' do
+        expect(rendered_index_text).not_to include(document['non_index_field'])
+      end
     end
-    describe 'without wxs identifier in configuration' do
-      let(:config) do
-        Blacklight::Configuration.new.configure do |config|
-          config.wxs_identifier_field = 'layer_id_s'
+    context 'with multiple document index fields present' do
+      it 'separates fields by period followed by a space' do
+        expect(rendered_index_text).to include(combined_fields)
+      end
+      context 'with index field ending in period' do
+        it 'renders only 1 period' do
+          expect(rendered_index_text).to include(document['period'] + ' ')
         end
       end
-      it 'returns configured field' do
-        expect(subject.wxs_identifier).to eq 'druid:abc123'
+    end
+    context 'with document empty configured index field' do
+      it 'does not render a period followed by a space' do
+        expect(rendered_index_text).not_to include('. .')
       end
     end
   end

data/spec/lib/geoblacklight/download_spec.rb

@@ -4,7 +4,8 @@ describe Geoblacklight::Download do
   let(:response) { double('response') }
   let(:get) { double('get') }
   let(:body) { double('body') }
-  let(:document) { SolrDocument.new(layer_slug_s: 'test', dct_references_s: { 'http://www.opengis.net/def/serviceType/ogc/wms' => 'http://www.example.com/wms' }.to_json) }
+  let(:references_field) { Settings.FIELDS.REFERENCES }
+  let(:document) { SolrDocument.new(layer_slug_s: 'test', references_field => { 'http://www.opengis.net/def/serviceType/ogc/wms' => 'http://www.example.com/wms' }.to_json) }
   let(:options) { { type: 'shapefile', extension: 'zip', service_type: 'wms', content_type: 'application/zip' } }
   let(:download) { Geoblacklight::ShapefileDownload.new(document, options) }
 
@@ -64,6 +65,13 @@ describe Geoblacklight::Download do
       expect(File).to receive(:rename)
       expect(download.create_download_file).to eq download.file_name
     end
+    it 'accepts response MIME type that is more complex than requested' do
+      geojson = OpenStruct.new(headers: { 'content-type' => 'application/json;charset=utf-8' })
+      expect(download).to receive(:initiate_download).and_return(geojson)
+      expect(File).to receive(:open).with("#{download.file_path_and_name}.tmp", 'wb').and_return('')
+      expect(File).to receive(:rename)
+      expect(download.create_download_file).to eq download.file_name
+    end
   end
   describe '#initiate_download' do
     it 'request download from server' do

data/spec/lib/geoblacklight/geoblacklight_helper_behavior_spec.rb

@@ -5,17 +5,20 @@ describe Geoblacklight::GeoblacklightHelperBehavior do
     Class.new.extend(described_class)
   end
 
-  describe '#wxs_identifier' do
-    it 'calls defined presenter class' do
+  describe '#geoblacklight_present' do
+    before do
       expect(dummy_class).to receive(:presenter)
-        .and_return(double(wxs_identifier: 'druid:abc123'))
-      expect(dummy_class.wxs_identifier).to eq 'druid:abc123'
+        .and_return(double(fake_name: 'druid:abc123'))
     end
-  end
-  describe '#presenter_class' do
-    it 'is defined as Geoblacklight::DocumentPresenter' do
-      expect(dummy_class.presenter_class.new({}, {}, {}))
-        .to be_a Geoblacklight::DocumentPresenter
+    context 'as a Symbol' do
+      it 'calls defined presenter class' do
+        expect(dummy_class.geoblacklight_present(:fake_name)).to eq 'druid:abc123'
+      end
+    end
+    context 'as a String' do
+      it 'calls defined presenter class' do
+        expect(dummy_class.geoblacklight_present('fake_name')).to eq 'druid:abc123'
+      end
     end
   end
 end

data/spec/lib/geoblacklight/item_viewer_spec.rb

@@ -4,6 +4,7 @@ describe Geoblacklight::ItemViewer do
   let(:document) { SolrDocument.new(document_attributes) }
   let(:document_attributes) { {} }
   let(:references) { document.references }
+  let(:references_field) { Settings.FIELDS.REFERENCES }
   let(:item_viewer) { described_class.new(references) }
   describe 'viewer_preference' do
     describe 'for no references' do
@@ -14,7 +15,7 @@ describe Geoblacklight::ItemViewer do
     describe 'for wms reference' do
       let(:document_attributes) do
         {
-          dct_references_s: {
+          references_field => {
             'http://www.opengis.net/def/serviceType/ogc/wms' => 'http://www.example.com/wms',
             'http://iiif.io/api/image' => 'http://www.example.com/iiif'
           }.to_json
@@ -27,7 +28,7 @@ describe Geoblacklight::ItemViewer do
     describe 'for iiif only reference' do
       let(:document_attributes) do
         {
-          dct_references_s: {
+          references_field => {
             'http://iiif.io/api/image' => 'http://www.example.com/iiif'
           }.to_json
         }
@@ -39,7 +40,7 @@ describe Geoblacklight::ItemViewer do
     describe 'for tiled map layer reference' do
       let(:document_attributes) do
         {
-          dct_references_s: {
+          references_field => {
             'urn:x-esri:serviceType:ArcGIS#TiledMapLayer' => 'http://www.example.com/MapServer'
           }.to_json
         }

data/spec/lib/geoblacklight/references_spec.rb

@@ -1,11 +1,13 @@
 require 'spec_helper'
 
 describe Geoblacklight::References do
+  let(:references_field) { Settings.FIELDS.REFERENCES }
+  let(:file_format_field) { Settings.FIELDS.FILE_FORMAT }
   let(:typical_ogp_shapefile) do
     described_class.new(
       SolrDocument.new(
-        dc_format_s: 'Shapefile',
-        dct_references_s: {
+        file_format_field => 'Shapefile',
+        references_field => {
           'http://www.opengis.net/def/serviceType/ogc/wms' => 'http://hgl.harvard.edu:8080/geoserver/wms',
           'http://www.opengis.net/def/serviceType/ogc/wfs' => 'http://hgl.harvard.edu:8080/geoserver/wfs'
         }.to_json
@@ -15,16 +17,16 @@ describe Geoblacklight::References do
   let(:no_service_shapefile) do
     described_class.new(
       SolrDocument.new(
-        dc_format_s: 'Shapefile',
-        dct_references_s: {}.to_json
+        file_format_field => 'Shapefile',
+        references_field => {}.to_json
       )
     )
   end
   let(:typical_ogp_geotiff) do
     described_class.new(
       SolrDocument.new(
-        dc_format_s: 'GeoTIFF',
-        dct_references_s: {
+        file_format_field => 'GeoTIFF',
+        references_field => {
           'http://www.opengis.net/def/serviceType/ogc/wms' => 'http://hgl.harvard.edu:8080/geoserver/wms',
           'http://www.opengis.net/def/serviceType/ogc/wfs' => 'http://hgl.harvard.edu:8080/geoserver/wfs'
         }.to_json
@@ -34,8 +36,8 @@ describe Geoblacklight::References do
   let(:typical_arcgrid) do
     described_class.new(
       SolrDocument.new(
-        dc_format_s: 'ArcGRID',
-        dct_references_s: {
+        file_format_field => 'ArcGRID',
+        references_field => {
           'http://www.opengis.net/def/serviceType/ogc/wms' => 'http://hgl.harvard.edu:8080/geoserver/wms',
           'http://www.opengis.net/def/serviceType/ogc/wfs' => 'http://hgl.harvard.edu:8080/geoserver/wfs'
         }.to_json
@@ -45,8 +47,8 @@ describe Geoblacklight::References do
   let(:complex_shapefile) do
     described_class.new(
       SolrDocument.new(
-        dc_format_s: 'Shapefile',
-        dct_references_s: {
+        file_format_field => 'Shapefile',
+        references_field => {
           'http://schema.org/downloadUrl' => 'http://example.com/urn:hul.harvard.edu:HARVARD.SDE2.TG10USAIANNH/data.zip',
           'http://www.isotc211.org/schemas/2005/gmd/' => 'http://example.com/urn:hul.harvard.edu:HARVARD.SDE2.TG10USAIANNH/iso19139.xml',
           'http://www.loc.gov/mods/v3' => 'http://example.com/urn:hul.harvard.edu:HARVARD.SDE2.TG10USAIANNH/mods.xml',
@@ -59,17 +61,19 @@ describe Geoblacklight::References do
   end
   let(:direct_download_only) do
     described_class.new(
-      dc_format_s: 'GeoTIFF',
-      dct_references_s: {
-        'http://schema.org/downloadUrl' => 'http://example.com/layer-id-geotiff.tiff'
-      }.to_json
+      SolrDocument.new(
+        file_format_field => 'GeoTIFF',
+        references_field => {
+          'http://schema.org/downloadUrl' => 'http://example.com/layer-id-geotiff.tiff'
+        }.to_json
+      )
     )
   end
   let(:simple_iiif_image) do
     described_class.new(
       SolrDocument.new(
-        dc_format_s: 'Raster',
-        dct_references_s: {
+        file_format_field => 'Raster',
+        references_field => {
           'http://schema.org/url' => 'http://arks.princeton.edu/ark:/88435/02870w62c',
           'http://iiif.io/api/image' => 'http://libimages.princeton.edu/loris2/pudl0076%2Fmap_pownall%2F00000001.jp2/info.json'
         }.to_json
@@ -82,7 +86,7 @@ describe Geoblacklight::References do
     )
   end
   describe '#initialize' do
-    it 'parses dct_references_s to @refs' do
+    it 'parses configured references field to @refs' do
       expect(typical_ogp_shapefile.instance_variable_get(:@refs)).to be_an Array
     end
     it 'empty references return an empty array' do
@@ -91,7 +95,7 @@ describe Geoblacklight::References do
       expect(empty_refs).to eq []
     end
     it 'sets @references_field' do
-      expect(typical_ogp_shapefile.reference_field).to eq :dct_references_s
+      expect(typical_ogp_shapefile.reference_field).to eq references_field
       expect(custom_fields.reference_field).to eq :new_ref_field
     end
   end

data/spec/lib/geoblacklight/view_helper_override_spec.rb

@@ -7,7 +7,7 @@ describe Geoblacklight::ViewHelperOverride do
 
   let(:fake_controller) do
     GeoblacklightControllerTestClass.new
-      .extend(described_class)
+                                    .extend(described_class)
   end
 
   describe 'spatial_parameters?' do

data/spec/lib/geoblacklight/wms_layer/feature_info_response_spec.rb

@@ -25,7 +25,7 @@ describe Geoblacklight::FeatureInfoResponse do
 
   describe '#format' do
     it 'returns a formated response' do
-      expect(response.format).to_not be_nil
+      expect(response.format).not_to be_nil
       expect(response.format[:values].length).to eq 2
       expect(response.format[:values][0]).to eq %w(Header1 value1)
       expect(response.format[:values][1]).to eq %w(Header2 value2)

data/spec/lib/geoblacklight/wms_layer_spec.rb

@@ -18,7 +18,7 @@ describe Geoblacklight::WmsLayer do
   describe '#search_params' do
     it 'returns all params except URL plus default params' do
       expect(wms_layer.search_params.length).to eq 8
-      expect(wms_layer.search_params).to_not include 'URL' => 'http://www.example.com'
+      expect(wms_layer.search_params).not_to include 'URL' => 'http://www.example.com'
     end
   end
 

data/spec/models/concerns/geoblacklight/solr_document/carto_db_spec.rb

@@ -2,6 +2,12 @@ require 'spec_helper'
 
 describe Geoblacklight::SolrDocument::CartoDb do
   let(:subject) { SolrDocument.new }
+  let(:geojson_download) { instance_double(Geoblacklight::GeojsonDownload) }
+
+  before do
+    allow(Geoblacklight::GeojsonDownload).to receive(:new).and_return(geojson_download)
+  end
+
   describe '#cartodb_reference' do
     it 'returns nil for restricted documents' do
       expect(subject).to receive(:public?).and_return(false)
@@ -21,7 +27,7 @@ describe Geoblacklight::SolrDocument::CartoDb do
       expect(subject).to receive(:public?).and_return(true)
       expect(subject).to receive(:download_types)
         .and_return(geojson: { 'stuff' => 'stuff' })
-      expect_any_instance_of(Geoblacklight::GeojsonDownload)
+      expect(geojson_download)
         .to receive(:url_with_params)
         .and_return('http://www.example.com/geojsonDownload')
       expect(subject.cartodb_reference).to eq 'http://www.example.com/geojsonDownload'

data/spec/models/concerns/geoblacklight/solr_document_spec.rb

@@ -2,6 +2,9 @@ require 'spec_helper'
 
 describe Geoblacklight::SolrDocument do
   let(:document) { SolrDocument.new(document_attributes) }
+  let(:rights_field) { Settings.FIELDS.RIGHTS }
+  let(:provenance_field) { Settings.FIELDS.PROVENANCE }
+  let(:references_field) { Settings.FIELDS.REFERENCES }
   describe '#available?' do
     let(:document_attributes) { {} }
     describe 'a public document' do
@@ -21,13 +24,13 @@ describe Geoblacklight::SolrDocument do
   end
   describe '#public?' do
     describe 'a public document' do
-      let(:document_attributes) { { dc_rights_s: 'PUBLIC' } }
+      let(:document_attributes) { { rights_field => 'PUBLIC' } }
       it 'is public' do
         expect(document.public?).to be_truthy
       end
     end
     describe 'a restricted resource' do
-      let(:document_attributes) { { dc_rights_s: 'RESTRICTED' } }
+      let(:document_attributes) { { rights_field => 'RESTRICTED' } }
       it 'does not be public' do
         expect(document.public?).to be_falsey
       end
@@ -37,8 +40,8 @@ describe Geoblacklight::SolrDocument do
     describe 'available direct download' do
       let(:document_attributes) do
         {
-          dc_rights_s: 'Public',
-          dct_references_s: {
+          rights_field => 'Public',
+          references_field => {
             'http://schema.org/downloadUrl' => 'http://example.com/direct/data.zip'
           }.to_json
         }
@@ -50,7 +53,7 @@ describe Geoblacklight::SolrDocument do
   end
   describe '#same_institution?' do
     describe 'within the same institution' do
-      let(:document_attributes) { { dct_provenance_s: 'STANFORD' } }
+      let(:document_attributes) { { provenance_field => 'STANFORD' } }
       it 'is true' do
         allow(Settings).to receive('Institution').and_return('Stanford')
         expect(document.same_institution?).to be_truthy
@@ -61,7 +64,7 @@ describe Geoblacklight::SolrDocument do
       end
     end
     describe 'within a different institution' do
-      let(:document_attributes) { { dct_provenance_s: 'MIT' } }
+      let(:document_attributes) { { provenance_field => 'MIT' } }
       it 'is false' do
         allow(Settings).to receive('Institution').and_return('Stanford')
         expect(document.same_institution?).to be_falsey
@@ -86,7 +89,7 @@ describe Geoblacklight::SolrDocument do
     describe 'with a direct download' do
       let(:document_attributes) do
         {
-          dct_references_s: {
+          references_field => {
             'http://schema.org/downloadUrl' => 'http://example.com/urn:hul.harvard.edu:HARVARD.SDE2.TG10USAIANNH/data.zip'
           }.to_json
         }
@@ -97,7 +100,7 @@ describe Geoblacklight::SolrDocument do
       end
     end
     it 'returns nil if no direct download' do
-      expect_any_instance_of(Geoblacklight::Reference).to_not receive(:to_hash)
+      expect_any_instance_of(Geoblacklight::Reference).not_to receive(:to_hash)
       expect(document.direct_download).to be_nil
     end
   end
@@ -105,7 +108,7 @@ describe Geoblacklight::SolrDocument do
     describe 'with an hgl download' do
       let(:document_attributes) do
         {
-          dct_references_s: {
+          references_field => {
             'http://schema.org/DownloadAction' => 'http://example.com/harvard'
           }.to_json
         }
@@ -121,6 +124,26 @@ describe Geoblacklight::SolrDocument do
       end
     end
   end
+  describe 'iiif_download' do
+    describe 'with a IIIF download' do
+      let(:document_attributes) do
+        {
+          references_field => {
+            'http://iiif.io/api/image' => 'https://example.edu/images/info.json'
+          }.to_json
+        }
+      end
+      it 'returns a IIIF download hash' do
+        expect(document.iiif_download[:iiif]).to eq('https://example.edu/images/info.json')
+      end
+    end
+    describe 'without a IIIF download' do
+      let(:document_attributes) { {} }
+      it 'returns nil' do
+        expect(document.iiif_download).to be_nil
+      end
+    end
+  end
   describe 'item_viewer' do
     let(:document_attributes) { {} }
     it 'is a ItemViewer' do
@@ -131,7 +154,7 @@ describe Geoblacklight::SolrDocument do
     describe 'with a wms reference' do
       let(:document_attributes) do
         {
-          dct_references_s: {
+          references_field => {
             'http://www.opengis.net/def/serviceType/ogc/wms' => 'http://www.example.com/wms'
           }.to_json
         }
@@ -149,7 +172,7 @@ describe Geoblacklight::SolrDocument do
     describe 'with a wms reference' do
       let(:document_attributes) do
         {
-          dct_references_s: {
+          references_field => {
             'http://www.opengis.net/def/serviceType/ogc/wms' => 'http://www.example.com/wms'
           }.to_json
         }

data/spec/{lib/geoblacklight/search_builder_spec.rb → models/concerns/geoblacklight/spatial_search_behavior_spec.rb}

@@ -1,27 +1,22 @@
 require 'spec_helper'
 
-describe Geoblacklight::SearchBuilder do
-  let(:method_chain) { CatalogController.search_params_logic }
+describe Geoblacklight::SpatialSearchBehavior do
   let(:user_params) { Hash.new }
   let(:solr_params) { Hash.new }
+  let(:blacklight_config) { CatalogController.blacklight_config.deep_copy }
   let(:context) { CatalogController.new }
 
-  let(:search_builder) { described_class.new(method_chain, context) }
-
-  subject { search_builder.with(user_params) }
-
-  describe '#initialize' do
-    it 'has add_spatial_params in processor chain once' do
-      expect(subject.processor_chain).to include :add_spatial_params
-      expect(subject.processor_chain
-        .count { |x| x == :add_spatial_params }).to eq 1
-      new_search = described_class.new(subject.processor_chain, context)
-      expect(new_search.processor_chain).to include :add_spatial_params
-      expect(subject.processor_chain
-        .count { |x| x == :add_spatial_params }).to eq 1
+  let(:search_builder_class) do
+    Class.new(Blacklight::SearchBuilder).tap do |klass|
+      include Blacklight::Solr::SearchBuilderBehavior
+      klass.include(described_class)
     end
   end
 
+  let(:search_builder) { search_builder_class.new(context) }
+
+  subject { search_builder.with(user_params) }
+
   describe '#add_spatial_params' do
     it 'returns the solr_params when no bbox is given' do
       expect(subject.add_spatial_params(solr_params)).to eq solr_params