geoblacklight 2.4.0 → 3.3.0

data/spec/lib/geoblacklight/item_viewer_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::ItemViewer do
@@ -25,6 +26,18 @@ describe Geoblacklight::ItemViewer do
         expect(item_viewer.viewer_preference).to eq wms: 'http://www.example.com/wms'
       end
     end
+    describe 'for tms reference' do
+      let(:document_attributes) do
+        {
+          references_field => {
+            'https://wiki.osgeo.org/wiki/Tile_Map_Service_Specification' => 'http://www.example.com/tms'
+          }.to_json
+        }
+      end
+      it 'tms if tms is present' do
+        expect(item_viewer.viewer_preference).to eq tms: 'http://www.example.com/tms'
+      end
+    end
     describe 'for iiif only reference' do
       let(:document_attributes) do
         {

data/spec/lib/geoblacklight/metadata/base_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::Metadata::Base do

data/spec/lib/geoblacklight/metadata/html_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::Metadata::Html do

data/spec/lib/geoblacklight/metadata_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::Metadata do

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::MetadataTransformer::Base do
@@ -8,8 +9,8 @@ describe Geoblacklight::MetadataTransformer::Base do
   end
 
   context 'with metadata types without XSL Stylesheets' do
-    let(:metadata) { instance_double(GeoCombine::Metadata) }
     subject { described_class.new(metadata) }
+    let(:metadata) { instance_double(GeoCombine::Metadata) }
     describe '#transform' do
       before do
         allow(metadata).to receive(:to_html).and_raise(NoMethodError, 'undefined method `to_html\'')
@@ -21,8 +22,8 @@ describe Geoblacklight::MetadataTransformer::Base do
   end
 
   context 'with metadata types with XSL Stylesheets but invalid HTML' do
-    let(:metadata) { instance_double(GeoCombine::Metadata) }
     subject { described_class.new(metadata) }
+    let(:metadata) { instance_double(GeoCombine::Metadata) }
     describe '#transform' do
       before do
         allow(metadata).to receive(:to_html).and_return('<invalid-html></invalid-html>')

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

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::MetadataTransformer::Fgdc do
-  let(:fgdc_html) { File.read(File.join(Rails.root, 'spec', 'fixtures', 'metadata', 'fgdc.html')) }
-  let(:metadata) { instance_double('Geoblacklight::Metadata::Fgdc') }
   subject 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') }
 
   describe '#transform' do
     before do

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

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::MetadataTransformer::Iso19139 do
-  let(:iso_html) { File.read(File.join(Rails.root, 'spec', 'fixtures', 'metadata', 'iso.html')) }
-  let(:metadata) { instance_double('Geoblacklight::Metadata::Iso19139') }
   subject 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') }
 
   describe '#transform' do
     before do

data/spec/lib/geoblacklight/metadata_transformer_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::MetadataTransformer do
@@ -9,10 +10,10 @@ describe Geoblacklight::MetadataTransformer do
 
   describe '.instance' do
     context 'with FGDC metadata' do
-      let(:metadata) { instance_double(Geoblacklight::Metadata::Fgdc) }
       subject do
         described_class.instance(metadata)
       end
+      let(:metadata) { instance_double(Geoblacklight::Metadata::Fgdc) }
 
       before do
         allow(klass).to receive(:name).and_return('Geoblacklight::Metadata::Fgdc')
@@ -24,10 +25,10 @@ describe Geoblacklight::MetadataTransformer do
     end
 
     context 'with ISO19139 metadata' do
-      let(:metadata) { instance_double(Geoblacklight::Metadata::Iso19139) }
       subject do
         described_class.instance(metadata)
       end
+      let(:metadata) { instance_double(Geoblacklight::Metadata::Iso19139) }
 
       before do
         allow(klass).to receive(:name).and_return('Geoblacklight::Metadata::Iso19139')
@@ -39,10 +40,10 @@ describe Geoblacklight::MetadataTransformer do
     end
 
     context 'without a metadata type' do
-      let(:metadata) { instance_double(Geoblacklight::Metadata::Base) }
       subject do
         described_class.instance(metadata)
       end
+      let(:metadata) { instance_double(Geoblacklight::Metadata::Base) }
 
       before do
         allow(klass).to receive(:name).and_return('Geoblacklight::Metadata::Base')

data/spec/lib/geoblacklight/reference_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::Reference do

data/spec/lib/geoblacklight/references_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::References do
@@ -75,7 +76,7 @@ describe Geoblacklight::References do
         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'
+          'http://iiif.io/api/image' => 'https://iiif-cloud.princeton.edu/iiif/2/6c%2F52%2F12%2F6c5212e81bc845f59bb1cdc740a88bad%2Fintermediate_file/info.json'
         }.to_json
       )
     )
@@ -133,7 +134,7 @@ describe Geoblacklight::References do
     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(:METADATA_SHOWN).and_return %w[iso19139 mods]
         allow(settings_klass).to receive(:FIELDS).and_return OpenStruct.new(FILE_FORMAT: 'dc_format_s')
       end
       it 'is ordered by the configuration' do
@@ -166,8 +167,6 @@ describe Geoblacklight::References do
     end
     it 'returns nil if there is no direct download' do
       expect(typical_ogp_shapefile.preferred_download).to be_nil
-    end
-    it 'returns nil if there is no direct download' do
       expect(typical_ogp_geotiff.preferred_download).to be_nil
     end
   end

data/spec/lib/geoblacklight/relation/ancestors_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::Relation::Ancestors do
@@ -7,7 +8,7 @@ describe Geoblacklight::Relation::Ancestors do
 
   describe '#create_search_params' do
     it 'assembles the correct search params for finding ancestor documents' do
-      expect(ancestors.create_search_params).to eq(fq: ["{!join from=#{Settings.FIELDS.SOURCE} to=layer_slug_s}layer_slug_s:nyu_2451_34502"], fl: [Settings.FIELDS.TITLE.to_s, 'layer_slug_s', 'layer_geom_type_s'])
+      expect(ancestors.create_search_params).to eq(fq: ["{!join from=#{Settings.FIELDS.SOURCE} to=#{Settings.FIELDS.UNIQUE_KEY}}#{Settings.FIELDS.UNIQUE_KEY}:nyu_2451_34502"], fl: [Settings.FIELDS.TITLE.to_s, Settings.FIELDS.UNIQUE_KEY, Settings.FIELDS.GEOM_TYPE])
     end
   end
 

data/spec/lib/geoblacklight/relation/descendants_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::Relation::Descendants do
@@ -7,7 +8,7 @@ describe Geoblacklight::Relation::Descendants do
 
   describe '#create_search_params' do
     it 'assembles the correct search params for finding descendant documents' do
-      expect(descendants.create_search_params).to eq(fq: "#{Settings.FIELDS.SOURCE}:nyu_2451_34636", fl: [Settings.FIELDS.TITLE.to_s, 'layer_slug_s', 'layer_geom_type_s'])
+      expect(descendants.create_search_params).to eq(fq: "#{Settings.FIELDS.SOURCE}:nyu_2451_34636", fl: [Settings.FIELDS.TITLE.to_s, Settings.FIELDS.UNIQUE_KEY, Settings.FIELDS.GEOM_TYPE])
     end
   end
 

data/spec/lib/geoblacklight/relation/relation_response_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::Relation::RelationResponse do

data/spec/lib/geoblacklight/view_helper_override_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::ViewHelperOverride do

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::FeatureInfoResponse do
@@ -28,14 +29,14 @@ describe Geoblacklight::FeatureInfoResponse do
     it 'returns a formated response' do
       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)
+      expect(response.format[:values][0]).to eq %w[Header1 value1]
+      expect(response.format[:values][1]).to eq %w[Header2 value2]
     end
     it 'returns a formated response when multiple features are retrieved' do
       expect(response_multiple_features.format).not_to be_nil
       expect(response_multiple_features.format[:values].length).to eq 2
-      expect(response_multiple_features.format[:values][0]).to eq %w(Header1 value1)
-      expect(response_multiple_features.format[:values][1]).to eq %w(Header2 value2)
+      expect(response_multiple_features.format[:values][0]).to eq %w[Header1 value1]
+      expect(response_multiple_features.format[:values][1]).to eq %w[Header2 value2]
     end
   end
 

data/spec/lib/geoblacklight/wms_layer_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::WmsLayer do

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::SolrDocument::Carto do
@@ -38,24 +39,4 @@ describe Geoblacklight::SolrDocument::Carto do
       expect(document.carto_reference).to eq 'http://www.example.com/geojsonDownload'
     end
   end
-
-  describe '#cartodb_reference' do
-    before do
-      allow(Deprecation).to receive(:warn).with(
-        described_class,
-        'cartodb_reference is deprecated and will be removed from Geoblacklight 2.0.0 (use Geoblacklight::SolrDocument::Carto#carto_reference instead)',
-        kind_of(Array)
-      )
-      allow(document).to receive(:public?).and_return(true)
-      allow(document).to receive(:download_types).and_return(geojson: { 'stuff' => 'stuff' })
-      allow(geojson_download)
-        .to receive(:url_with_params)
-        .and_return('http://www.example.com/geojsonDownload')
-    end
-
-    it 'aliases to #carto_reference' do
-      expect(Deprecation).to receive(:warn)
-      expect(document.cartodb_reference).to eq(document.carto_reference)
-    end
-  end
 end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::SolrDocument::Citation do

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::SolrDocument::Finder do

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::SolrDocument::Inspection do

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::SolrDocument do

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

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::SpatialSearchBehavior do
   subject { search_builder.with(user_params) }
 
-  let(:user_params) { Hash.new }
-  let(:solr_params) { Hash.new }
+  let(:user_params) { {} }
+  let(:solr_params) { {} }
   let(:blacklight_config) { CatalogController.blacklight_config.deep_copy }
   let(:context) { CatalogController.new }
   let(:search_builder_class) do
@@ -53,6 +54,18 @@ describe Geoblacklight::SpatialSearchBehavior do
         expect(subject.add_spatial_params(solr_params)).not_to have_key(:overlap)
       end
 
+      context 'when local boost parameter is present' do
+        before do
+          solr_params[:bf] = ['local_boost^5']
+        end
+
+        it 'appends overlap and includes the local boost' do
+          allow(Settings).to receive(:OVERLAP_RATIO_BOOST).and_return 2
+          expect(subject.add_spatial_params(solr_params)[:bf].to_s).to include('$overlap^2')
+          expect(solr_params[:bf].to_s).to include('local_boost^5')
+        end
+      end
+
       context 'when the wrong format for the bounding box is used' do
         before do
           allow(subject).to receive(:bounding_box).and_raise(Geoblacklight::Exceptions::WrongBoundingBoxFormat)

data/spec/routing/catalog_routing_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'Catalog Routes', type: :routing do

data/spec/spec_helper.rb

@@ -1,17 +1,19 @@
+# frozen_string_literal: true
 ENV['RAILS_ENV'] ||= 'test'
 
 require 'simplecov'
-require 'coveralls'
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(
-  [
-    SimpleCov::Formatter::HTMLFormatter,
-    Coveralls::SimpleCov::Formatter
-  ]
-)
+SimpleCov.formatter = SimpleCov::Formatter::HTMLFormatter
+
+if ENV['CIRCLE_ARTIFACTS']
+  dir = File.join(ENV['CIRCLE_ARTIFACTS'], 'coverage')
+  SimpleCov.coverage_dir(dir)
+end
+
 SimpleCov.start 'rails' do
   add_filter 'lib/generators/geoblacklight/install_generator.rb'
   add_filter 'lib/geoblacklight/version.rb'
-  add_filter 'lib/generators/geoblacklight/templates'
+  add_filter 'lib/generators'
+  add_filter 'lib/tasks/geoblacklight.rake'
   add_filter '/spec'
   add_filter '.internal_test_app/'
 end
@@ -26,6 +28,7 @@ require 'rails-controller-testing' if Rails::VERSION::MAJOR >= 5
 require 'rspec/rails'
 require 'capybara/rspec'
 require 'selenium-webdriver'
+require 'webdrivers'
 
 Capybara.register_driver(:headless_chrome) do |app|
   Capybara::Selenium::Driver.load_selenium
@@ -56,7 +59,7 @@ FactoryBot.find_definitions
 RSpec.configure do |config|
   config.use_transactional_fixtures = false
 
-  config.before :each do
+  config.before do
     DatabaseCleaner.strategy = if Capybara.current_driver == :rack_test
                                  :transaction
                                else

data/spec/support/backport_test_helpers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Backport the Rails 5 controller test methods to Rails 4
 module BackportTestHelpers
   def delete(*args)

data/spec/support/features.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../features/session_helpers.rb', __FILE__)
 
 RSpec.configure do |config|

data/spec/support/features/session_helpers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Features
   module SessionHelpers
     def sign_up_with(email, password)

data/spec/support/fixtures.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 def read_fixture(fname)
   File.read(File.join(fixture_dir, fname))
 end

data/spec/tasks/geoblacklight_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 require 'rake'
 require 'fileutils'
@@ -6,13 +7,13 @@ describe 'geoblacklight.rake' do
   describe 'geoblacklight:downloads:mkdir' do
     before do
       Rails.application.load_tasks
-      FileUtils.rm_rf Rails.root.join('tmp/cache/downloads')
+      FileUtils.rm_rf Rails.root.join('tmp', 'cache', 'downloads')
     end
 
     it 'creates the tmp/cache/downloads directory' do
       Rake::Task['geoblacklight:downloads:mkdir'].invoke
-      expect(File.directory? Rails.root.join('tmp/cache/downloads')).
-        to be true
+      expect(File.directory?(Rails.root.join('tmp', 'cache', 'downloads')))
+        .to be true
     end
   end
 end

data/spec/test_app_templates/Gemfile.extra

@@ -1 +1,2 @@
 gem 'sprockets', '< 4'
+gem 'view_component', '!= 2.26.0'

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rails/generators'
 
 class TestAppGenerator < Rails::Generators::Base
@@ -13,9 +14,7 @@ class TestAppGenerator < Rails::Generators::Base
 
   def add_gems
     gem 'blacklight'
-    gem 'teaspoon'
-    gem 'teaspoon-jasmine'
-    gem 'webpacker'
+    gem 'webpacker' unless Rails.version.to_s.start_with? '6.1.'
     Bundler.with_clean_env do
       run 'bundle install'
     end
@@ -41,9 +40,4 @@ class TestAppGenerator < Rails::Generators::Base
     FileUtils.mkdir_p 'spec/fixtures/metadata'
     directory 'metadata', 'spec/fixtures/metadata'
   end
-
-  def install_teaspoon
-    # Implicit copy of GeoBlacklight checked-in teaspoon_env.rb
-    copy_file '../teaspoon_env.rb', 'spec/teaspoon_env.rb'
-  end
 end