geoblacklight 4.0.0.pre.rc1 → 4.0.0.pre.rc2

data/spec/fixtures/solr_documents/b1g_wabash_child_18.json

@@ -0,0 +1,62 @@
+{
+  "id": "b835efbd-ca27-41af-bae2-c22210e58a89",
+  "gbl_mdVersion_s": "Aardvark",
+  "dct_title_s": "Wabash Topo (18): Indiana, 1929",
+  "dct_description_sm": [
+    "The maps represented here are on tiff files owned by EAS library. The topos were scanned in color and are up to 550MB each. These images can be viewed and performed in the using either ArcGIS Desktop or QGIS (user choice), referencing against a number of known mapsets like the 2005 Indiana Orthophoto setand USGS DRGs. The geographic coordinate system reference of the maps included are applied in GCS_WGS_1984."
+  ],
+  "dct_language_sm": [
+    "eng"
+  ],
+  "dct_creator_sm": [
+    "Brock & Weymouth Inc.",
+    "United States Engineer Office"
+  ],
+  "dct_publisher_sm": [
+    "Purdue University Libraries"
+  ],
+  "gbl_resourceClass_sm": [
+    "Maps"
+  ],
+  "dcat_keyword_sm": [
+    "Topography",
+    "Purdue Georeferenced Imagery"
+  ],
+  "dcat_theme_sm": [
+    "Imagery and Base Maps"
+  ],
+  "dct_issued_s": "2015-10-30",
+  "dct_temporal_sm": [
+    "1929"
+  ],
+  "gbl_dateRange_drsim": [
+    "[1929 TO 1929]"
+  ],
+  "gbl_indexYear_im": [
+    1929
+  ],
+  "dct_spatial_sm": [
+    "Indiana"
+  ],
+  "locn_geometry": "ENVELOPE(-87.4407,-87.2936,39.7429,39.6653)",
+  "dcat_bbox": "ENVELOPE(-87.4407,-87.2936,39.7429,39.6653)",
+  "dcat_centroid": "39.7041,-87.36715000000001",
+  "pcdm_memberOf_sm": [
+    "09d-01"
+  ],
+  "gbl_resourceType_sm": [
+    "Topographic maps"
+  ],
+  "dct_format_s": "GeoTIFF",
+  "dct_references_s": "{\"http://schema.org/downloadUrl\":\"https://mapsweb.lib.purdue.edu/datasets/Wabash1929/wabash_topo_18.tif.zip\",\"urn:x-esri:serviceType:ArcGIS#ImageMapLayer\":\"https://mapsweb.lib.purdue.edu/arcgis/rest/services/Purdue/wabashtopo/ImageServer\",\"http://schema.org/url\":\"https://mapsweb.lib.purdue.edu/wabashriver/\"}",
+  "dct_identifier_sm": [
+    "b835efbd-ca27-41af-bae2-c22210e58a89"
+  ],
+  "schema_provider_s": "Purdue University",
+  "dct_isPartOf_sm": [
+    "88cc9b19-3294-4da9-9edd-775c81fb1c59"
+  ],
+  "dct_accessRights_s": "Public",
+  "gbl_suppressed_b": true,
+  "gbl_mdModified_dt": "2021-05-07T23:00:10Z"
+}

data/spec/fixtures/solr_documents/b1g_wabash_parent.json

@@ -0,0 +1,59 @@
+{
+  "id": "88cc9b19-3294-4da9-9edd-775c81fb1c59",
+  "gbl_mdVersion_s": "Aardvark",
+  "dct_title_s": "Wabash River Topographic Maps: Indiana, 1929",
+  "dct_description_sm": [
+    "See Related Records below to download individual GeoTIFFs. The maps represented here are tiff files owned by Purdue University's EAS library. The topos were scanned in color and are up to 550MB each. These images can be viewed and performed in the using either ArcGIS Desktop or QGIS (user choice), referencing against a number of known mapsets like the 2005 Indiana Orthophoto setand USGS DRGs. The geographic coordinate system reference of the maps included are applied in GCS_WGS_1984."
+  ],
+  "dct_language_sm": [
+    "eng"
+  ],
+  "dct_creator_sm": [
+    "Brock & Weymouth Inc.",
+    "United States Engineer Office"
+  ],
+  "dct_publisher_sm": [
+    "Purdue University Libraries"
+  ],
+  "gbl_resourceClass_sm": [
+    "Maps"
+  ],
+  "dcat_keyword_sm": [
+    "Topography",
+    "Purdue Georeferenced Imagery"
+  ],
+  "dcat_theme_sm": [
+    "Imagery and Base Maps"
+  ],
+  "dct_issued_s": "2015-10-17",
+  "dct_temporal_sm": [
+    "1929"
+  ],
+  "gbl_dateRange_drsim": [
+    "[1929 TO 1929]"
+  ],
+  "gbl_indexYear_im": [
+    1929
+  ],
+  "dct_spatial_sm": [
+    "Indiana"
+  ],
+  "locn_geometry": "ENVELOPE(-87.5291,-86.2066,40.8009,39.3999)",
+  "dcat_bbox": "ENVELOPE(-87.5291,-86.2066,40.8009,39.3999)",
+  "dcat_centroid": "40.1004,-86.86785",
+  "pcdm_memberOf_sm": [
+    "09d-01"
+  ],
+  "gbl_resourceType_sm": [
+    "Topographic maps"
+  ],
+  "dct_format_s": "Image Service",
+  "dct_references_s": "{\"urn:x-esri:serviceType:ArcGIS#ImageMapLayer\":\"https://mapsweb.lib.purdue.edu/arcgis/rest/services/Purdue/wabashtopo/ImageServer\",\"http://schema.org/url\":\"https://mapsweb.lib.purdue.edu/wabashriver/\"}",
+  "dct_identifier_sm": [
+    "88cc9b19-3294-4da9-9edd-775c81fb1c59"
+  ],
+  "schema_provider_s": "Purdue University",
+  "dct_accessRights_s": "Public",
+  "gbl_suppressed_b": false,
+  "gbl_mdModified_dt": "2021-05-07T23:00:10Z"
+}

data/spec/lib/geoblacklight/metadata_transformer/fgdc_spec.rb

@@ -6,7 +6,7 @@ describe Geoblacklight::MetadataTransformer::Fgdc do
     described_class.new(metadata)
   end
   let(:fgdc_html) { File.read(Rails.root.join('spec', 'fixtures', 'metadata', 'fgdc.html')) }
-  let(:metadata) { instance_double('Geoblacklight::Metadata::Fgdc') }
+  let(:metadata) { instance_double(Geoblacklight::Metadata::Fgdc) }
 
   describe '#transform' do
     before do

data/spec/lib/geoblacklight/metadata_transformer/iso19139_spec.rb

@@ -6,7 +6,7 @@ describe Geoblacklight::MetadataTransformer::Iso19139 do
     described_class.new(metadata)
   end
   let(:iso_html) { File.read(Rails.root.join('spec', 'fixtures', 'metadata', 'iso.html')) }
-  let(:metadata) { instance_double('Geoblacklight::Metadata::Iso19139') }
+  let(:metadata) { instance_double(Geoblacklight::Metadata::Iso19139) }
 
   describe '#transform' do
     before do

data/spec/lib/geoblacklight/references_spec.rb

@@ -132,10 +132,12 @@ describe Geoblacklight::References do
       expect(complex_shapefile.shown_metadata_refs.last.type.to_s).to eq 'iso19139'
     end
     context 'with an overridden order for the formats' do
-      let(:settings_klass) { class_double('Settings').as_stubbed_const }
       before do
-        allow(settings_klass).to receive(:METADATA_SHOWN).and_return %w[iso19139 mods]
-        allow(settings_klass).to receive(:FIELDS).and_return OpenStruct.new(FORMAT: 'dct_format_s')
+        stub_const('Settings', Module.new)
+        allow(Settings).to receive_messages(
+          METADATA_SHOWN: %w[iso19139 mods],
+          FIELDS: OpenStruct.new(FORMAT: 'dct_format_s')
+        )
       end
       it 'is ordered by the configuration' do
         expect(complex_shapefile.shown_metadata_refs.first.type.to_s).to eq 'iso19139'

data/spec/lib/geoblacklight/wms_layer_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 describe Geoblacklight::WmsLayer do
   let(:wms_layer) { described_class.new(params) }
   let(:rails_4_params) { { 'URL' => 'http://www.example.com/', 'X' => '277' } }
-  let(:rails_5_params) { instance_double('ActionController::Parameters') }
+  let(:rails_5_params) { instance_double(ActionController::Parameters) }
 
   before do
     allow(rails_5_params).to receive(:to_h).and_return('URL' => 'http://www.example.com/', 'X' => '277')

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

@@ -3,64 +3,83 @@
 require 'spec_helper'
 
 RSpec.describe Geoblacklight::BboxFilterField do
-  let(:search_state) { Blacklight::SearchState.new(params.with_indifferent_access, blacklight_config, controller) }
+  subject(:filter) { search_state.filter('bbox') }
 
+  let(:bbox_value) { '140.143709 -65.487905 160.793791 86.107541' }
+  let(:search_state) { Blacklight::SearchState.new(params.with_indifferent_access, blacklight_config, controller) }
   let(:params) { {} }
   let(:blacklight_config) do
     Blacklight::Configuration.new.configure do |config|
       config.add_facet_field 'bbox', filter_class: described_class
     end
   end
+  let(:facet_config) { blacklight_config.facet_fields['bbox'] }
   let(:controller) { double }
 
   describe '#add' do
     context 'with a ordinary parameter' do
       it 'adds the parameter to the facets' do
-        filter = search_state.filter('bbox')
-        new_state = filter.add('140.143709 -65.487905 160.793791 86.107541')
+        new_state = filter.add(bbox_value)
 
-        expect(new_state.params).to include bbox: '140.143709 -65.487905 160.793791 86.107541'
+        expect(new_state.params).to include bbox: bbox_value
       end
     end
 
     context 'with a bounding box' do
       it 'adds the parameter to the bbox parameter' do
-        filter = search_state.filter('bbox')
-        new_state = filter.add(Geoblacklight::BoundingBox.from_rectangle('140.143709 -65.487905 160.793791 86.107541'))
+        new_state = filter.add(Geoblacklight::BoundingBox.from_rectangle(bbox_value))
 
-        expect(new_state.params).to include bbox: '140.143709 -65.487905 160.793791 86.107541'
+        expect(new_state.params).to include bbox: bbox_value
       end
     end
   end
 
   context 'with some existing data' do
-    let(:params) { { bbox: '140.143709 -65.487905 160.793791 86.107541' } }
+    let(:params) { { bbox: bbox_value } }
 
     describe '#add' do
+      let(:bbox_replacement) { '100.143709 -70.487905 100.793791 96.107541' }
       it 'replaces the existing range' do
-        filter = search_state.filter('bbox')
-        new_state = filter.add(Geoblacklight::BoundingBox.from_rectangle('100.143709 -70.487905 100.793791 96.107541'))
+        new_state = filter.add(Geoblacklight::BoundingBox.from_rectangle(bbox_replacement))
 
-        expect(new_state.params).to include bbox: '100.143709 -70.487905 100.793791 96.107541'
+        expect(new_state.params).to include bbox: bbox_replacement
       end
     end
 
     describe '#remove' do
       it 'removes the existing bbox' do
-        filter = search_state.filter('bbox')
-        new_state = filter.remove(Geoblacklight::BoundingBox.from_rectangle('140.143709 -65.487905 160.793791 86.107541'))
+        new_state = filter.remove(Geoblacklight::BoundingBox.from_rectangle(bbox_value))
 
         expect(new_state.params[:bbox]).to be_nil
       end
     end
 
     describe '#values' do
-      let(:params) { { bbox: '140.143709 -65.487905 160.793791 86.107541' } }
-
       it 'converts the parameters to a Geoblacklight::BoundingBox' do
-        filter = search_state.filter('bbox')
+        expect(filter.values.first).to be_a(Geoblacklight::BoundingBox).and(have_attributes(to_param: bbox_value))
+      end
+    end
+
+    describe '#needs_normalization?' do
+      it 'returns false for the expected keyed representation of the bounding box' do
+        expect(filter.needs_normalization?(search_state.params)).to be false
+      end
+    end
+
+    context 'when array param represented by facebook as a Hash' do
+      let(:filter) { described_class.new(facet_config, search_state) }
+      let(:params) { { bbox: { '0' => bbox_value } } }
+
+      describe '#normalize' do
+        it 'converts the parameters to a list' do
+          expect(filter.normalize(search_state.params[:bbox])).to eql [bbox_value]
+        end
+      end
 
-        expect(filter.values.first).to be_a(Geoblacklight::BoundingBox).and(have_attributes(to_param: '140.143709 -65.487905 160.793791 86.107541'))
+      describe '#needs_normalization?' do
+        it 'returns true for the hash-as-array keyed representation of the bounding box' do
+          expect(filter.needs_normalization?(search_state.params[:bbox])).to be true
+        end
       end
     end
   end

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

@@ -9,18 +9,18 @@ RSpec.describe Geoblacklight::BboxFilterQuery do
   let(:solr_params) { {} }
 
   # Search State
-  let(:search_state) { Blacklight::SearchState.new(params.with_indifferent_access, {}) }
+  let(:search_state) { Blacklight::SearchState.new(params.with_indifferent_access, blacklight_config) }
 
   let(:params) do
     { bbox: '-180 -80 120 80' }
   end
 
-  let(:facet_config) do
-    Blacklight::Configuration::FacetField.new(
-      key: 'bbox',
-      filter_class: Geoblacklight::BboxFilterField
-    )
+  let(:blacklight_config) do
+    Blacklight::Configuration.new.configure do |config|
+      config.add_facet_field 'bbox', filter_class: Geoblacklight::BboxFilterField
+    end
   end
+  let(:facet_config) { blacklight_config.facet_fields['bbox'] }
 
   # Filter
   let(:filter) { Geoblacklight::BboxFilterField.new(facet_config, search_state) }

data/spec/spec_helper.rb

@@ -4,8 +4,8 @@ ENV['RAILS_ENV'] ||= 'test'
 require 'simplecov'
 SimpleCov.formatter = SimpleCov::Formatter::HTMLFormatter
 
-if ENV['CIRCLE_ARTIFACTS']
-  dir = File.join(ENV['CIRCLE_ARTIFACTS'], 'coverage')
+if ENV.fetch('CIRCLE_ARTIFACTS', false)
+  dir = File.join(ENV.fetch('CIRCLE_ARTIFACTS'), 'coverage')
   SimpleCov.coverage_dir(dir)
 end