geoblacklight 4.7.0 → 5.0.0.pre.alpha.11

data/spec/lib/geoblacklight/reference_spec.rb

@@ -34,33 +34,31 @@ describe Geoblacklight::Reference do
     end
   end
 
-  describe "reference" do
-    context "key has one trailing slash" do
-      let(:iso19139_reference) do
-        described_class.new(["http://www.isotc211.org/schemas/2005/gmd/", "https://raw.githubusercontent.com/OpenGeoMetadata/edu.stanford.purl/master/cg/357/zz/0321/iso19139.xml"])
-      end
+  describe "#uri" do
+    subject { described_class.new(urls).send(:uri) }
 
-      it "removes the trailing slash" do
-        expect(iso19139_reference.send(:uri)).to eq "http://www.isotc211.org/schemas/2005/gmd"
+    context "when key has one trailing slash" do
+      let(:urls) do
+        ["http://www.isotc211.org/schemas/2005/gmd/", "https://raw.githubusercontent.com/OpenGeoMetadata/edu.stanford.purl/master/cg/357/zz/0321/iso19139.xml"]
       end
+
+      it { is_expected.to eq "http://www.isotc211.org/schemas/2005/gmd" }
     end
-    context "key does not have trailing slashes" do
-      let(:iso19139_reference) do
-        described_class.new(["http://www.isotc211.org/schemas/2005/gmd", "https://raw.githubusercontent.com/OpenGeoMetadata/edu.stanford.purl/master/cg/357/zz/0321/iso19139.xml"])
-      end
 
-      it "will return the key" do
-        expect(iso19139_reference.send(:uri)).to eq "http://www.isotc211.org/schemas/2005/gmd"
+    context "when key does not have trailing slashes" do
+      let(:urls) do
+        ["http://www.isotc211.org/schemas/2005/gmd", "https://raw.githubusercontent.com/OpenGeoMetadata/edu.stanford.purl/master/cg/357/zz/0321/iso19139.xml"]
       end
+
+      it { is_expected.to eq "http://www.isotc211.org/schemas/2005/gmd" }
     end
-    context "key has trailing slashes" do
-      let(:fgdc_reference) do
-        described_class.new(["http://www.opengis.net/cat/csw/csdgm////", "https://raw.githubusercontent.com/OpenGeoMetadata/edu.harvard/master/217/121/227/77/fgdc.xml"])
-      end
 
-      it "removes the trailing slashes" do
-        expect(fgdc_reference.send(:uri)).to eq "http://www.opengis.net/cat/csw/csdgm"
+    context "when key has multiple trailing slashes" do
+      let(:urls) do
+        ["http://www.opengis.net/cat/csw/csdgm////", "https://raw.githubusercontent.com/OpenGeoMetadata/edu.harvard/master/217/121/227/77/fgdc.xml"]
       end
+
+      it { is_expected.to eq "http://www.opengis.net/cat/csw/csdgm" }
     end
   end
 end

data/spec/lib/geoblacklight/references_spec.rb

@@ -177,13 +177,13 @@ describe Geoblacklight::References do
     it "returns available downloads by format" do
       types = complex_shapefile.download_types
       expect(types.first[1]).to eq wfs: "http://hgl.harvard.edu:8080/geoserver/wfs"
-      expect(types.count).to eq 3
+      expect(types.count).to eq 4
       expect(direct_download_only.download_types).to be_nil
     end
     it "onlies return available downloads if no direct is present" do
       types = typical_ogp_shapefile.download_types
       expect(types.first[1]).to eq wfs: "http://hgl.harvard.edu:8080/geoserver/wfs"
-      expect(types.count).to eq 3
+      expect(types.count).to eq 4
     end
   end
   describe "#esri_webservices" do
@@ -209,46 +209,36 @@ describe Geoblacklight::References do
     end
   end
   describe "downloads_by_format" do
-    it "returns shapefile" do
-      expect(typical_ogp_shapefile.downloads_by_format.count).to eq 3
-    end
-    it "returns geotiff" do
-      expect(typical_ogp_geotiff.downloads_by_format.count).to eq 1
-      expect(typical_ogp_geotiff.downloads_by_format[:geotiff][:wms]).to eq "http://hgl.harvard.edu:8080/geoserver/wms"
-    end
-    it "returns arcgrid as geotiff" do
-      expect(typical_arcgrid.downloads_by_format.count).to eq 1
-      expect(typical_arcgrid.downloads_by_format[:geotiff][:wms]).to eq "http://hgl.harvard.edu:8080/geoserver/wms"
-    end
-    it "does not return shapefile if wms and wfs are not present" do
-      expect(no_service_shapefile.downloads_by_format).to be_nil
-    end
-    it "does not return GeoTIFF if wms is not present" do
-      expect(direct_download_only.downloads_by_format).to be_nil
-    end
-  end
-  describe "#format with a document that is not a SolrDocument" do
-    let(:plain_document) do
-      Class.new do
-        def initialize(attributes)
-          @attributes = attributes
-        end
-
-        def [](key)
-          @attributes[key]
-        end
+    context "using default settings for vector download formats" do
+      it "returns shapefile" do
+        expect(typical_ogp_shapefile.downloads_by_format.count).to eq 4
+        expect(typical_ogp_shapefile.downloads_by_format[:csv][:wfs]).to eq "http://hgl.harvard.edu:8080/geoserver/wfs"
+        expect(typical_ogp_shapefile.downloads_by_format[:geojson][:wfs]).to eq "http://hgl.harvard.edu:8080/geoserver/wfs"
+        expect(typical_ogp_shapefile.downloads_by_format[:kmz][:wms]).to eq "http://hgl.harvard.edu:8080/geoserver/wms"
+        expect(typical_ogp_shapefile.downloads_by_format[:shapefile][:wfs]).to eq "http://hgl.harvard.edu:8080/geoserver/wfs"
+      end
+      it "returns geotiff" do
+        expect(typical_ogp_geotiff.downloads_by_format.count).to eq 1
+        expect(typical_ogp_geotiff.downloads_by_format[:geotiff][:wms]).to eq "http://hgl.harvard.edu:8080/geoserver/wms"
+      end
+      it "returns arcgrid as geotiff" do
+        expect(typical_arcgrid.downloads_by_format.count).to eq 1
+        expect(typical_arcgrid.downloads_by_format[:geotiff][:wms]).to eq "http://hgl.harvard.edu:8080/geoserver/wms"
+      end
+      it "does not return shapefile if wms and wfs are not present" do
+        expect(no_service_shapefile.downloads_by_format).to be_nil
+      end
+      it "does not return GeoTIFF if wms is not present" do
+        expect(direct_download_only.downloads_by_format).to be_nil
       end
     end
-
-    it "warns that GeoBlacklight 5 calls #file_format on the document" do
-      document = plain_document.new(
-        Settings.FIELDS.FORMAT => "Shapefile",
-        Settings.FIELDS.REFERENCES => "{}"
-      )
-
-      expect(Geoblacklight.deprecation).to receive(:warn).with(/does not respond to #file_format/)
-
-      expect(described_class.new(document).format).to eq "Shapefile"
+    context "using custom settings which include incorrect settings" do
+      before do
+        allow(typical_ogp_shapefile).to receive(:format_list).and_return(["noformat"])
+      end
+      it "returns no formats for download" do
+        expect(typical_ogp_shapefile.downloads_by_format.count).to eq 0
+      end
     end
   end
 end

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

@@ -29,15 +29,17 @@ describe Geoblacklight::FeatureInfoResponse do
   describe "#format" 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[:features][0][:properties].keys.length).to eq 2
+      expect(response.format[:features][0][:isHTML]).to be true
+      expect(response.format[:features][0][:properties]["Header1"]).to eq "value1"
+      expect(response.format[:features][0][:properties]["Header2"]).to eq "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.format[:features][0][:properties].keys.length).to eq 2
+      expect(response.format[:features][0][:isHTML]).to be true
+      expect(response.format[:features][0][:properties]["Header1"]).to eq "value1"
+      expect(response.format[:features][0][:properties]["Header2"]).to eq "value2"
     end
   end
 

data/spec/lib/geoblacklight/wms_layer_spec.rb

@@ -57,6 +57,20 @@ describe Geoblacklight::WmsLayer do
     end
   end
 
+  describe "#feature_info" do
+    let(:response) { instance_double(Geoblacklight::FeatureInfoResponse) }
+    let(:params) { rails_4_params }
+
+    before do
+      allow(Geoblacklight::FeatureInfoResponse).to receive(:new).and_return(response)
+      allow(response).to receive(:check)
+    end
+
+    it "returns the response from the FeatureInfoResponse object" do
+      expect(wms_layer.feature_info).to eq(response.check)
+    end
+  end
+
   describe "#request_response" do
     subject(:wms_layer) { described_class.new(params) }
     let(:params) { rails_4_params }

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

@@ -9,23 +9,7 @@ describe Geoblacklight::SolrDocument::Citation do
 
     it "creates a citation" do
       expect(document.geoblacklight_citation("http://example.com"))
-        .to eq "United States. National Oceanic and Atmospheric Administration. Circuit Rider Productions. (2002). 10 Meter Contours: Russian River Basin, California. [Shapefile]. Circuit Rider Productions. Retrieved from http://example.com"
-    end
-
-    describe "with more than one publisher" do
-      let(:document) { SolrDocument.new(fixture.merge(Settings.FIELDS.PUBLISHER => ["First", "Second"])) }
-
-      it "warns that GeoBlacklight 5 keeps only the first publisher" do
-        expect(Geoblacklight.deprecation).to receive(:warn).with(/will lose its other publishers/)
-        document.geoblacklight_citation("http://example.com")
-      end
-    end
-
-    describe "with a single publisher" do
-      it "does not warn" do
-        expect(Geoblacklight.deprecation).not_to receive(:warn)
-        document.geoblacklight_citation("http://example.com")
-      end
+        .to eq "United States. National Oceanic and Atmospheric Administration. Circuit Rider Productions. (2002). 10 Meter Contours: Russian River Basin, California. [Shapefile]. Circuit Rider Productions. http://purl.stanford.edu/cg357zz0321"
     end
   end
 end

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

@@ -64,54 +64,6 @@ describe Geoblacklight::SolrDocument do
       end
     end
   end
-  describe "deprecations for GeoBlacklight 5 behavior changes" do
-    describe "#restricted?" do
-      describe "with rights data that is present but blank" do
-        let(:document_attributes) { {rights_field => ""} }
-        it "warns that GeoBlacklight 5 stops treating the document as restricted" do
-          expect(Geoblacklight.deprecation).to receive(:warn).with(
-            /#restricted\? returns true for a document whose .* is present but blank/
-          )
-          expect(document.restricted?).to be true
-        end
-      end
-
-      describe "without rights data at all" do
-        let(:document_attributes) { {} }
-        it "does not warn" do
-          expect(Geoblacklight.deprecation).not_to receive(:warn)
-          expect(document.restricted?).to be true
-        end
-      end
-    end
-
-    describe "#geom_field and #wxs_identifier" do
-      describe "when the Solr field is missing" do
-        let(:document_attributes) { {} }
-        it "warns that GeoBlacklight 5 returns nil rather than an empty string" do
-          expect(Geoblacklight.deprecation).to receive(:warn).with(/#geom_field returns "" for a document/)
-          expect(document.geom_field).to eq ""
-        end
-
-        it "warns for wxs_identifier too" do
-          expect(Geoblacklight.deprecation).to receive(:warn).with(/#wxs_identifier returns "" for a document/)
-          expect(document.wxs_identifier).to eq ""
-        end
-      end
-
-      describe "when the Solr field is present" do
-        let(:document_attributes) do
-          {Settings.FIELDS.GEOMETRY => "ENVELOPE(-1,1,1,-1)", Settings.FIELDS.WXS_IDENTIFIER => "cite:foo"}
-        end
-        it "does not warn" do
-          expect(Geoblacklight.deprecation).not_to receive(:warn)
-          expect(document.geom_field).to eq "ENVELOPE(-1,1,1,-1)"
-          expect(document.wxs_identifier).to eq "cite:foo"
-        end
-      end
-    end
-  end
-
   describe "#downloadable?" do
     describe "available direct download" do
       let(:document_attributes) do
@@ -180,26 +132,6 @@ describe Geoblacklight::SolrDocument do
       expect(document.direct_download).to be_nil
     end
   end
-  describe "hgl_download" do
-    describe "with an hgl download" do
-      let(:document_attributes) do
-        {
-          references_field => {
-            "http://schema.org/DownloadAction" => "http://example.com/harvard"
-          }.to_json
-        }
-      end
-      it "returns an hgl download hash" do
-        expect(document.hgl_download[:hgl]).to eq("http://example.com/harvard")
-      end
-    end
-    describe "without an hgl download" do
-      let(:document_attributes) { {} }
-      it "returns nil" do
-        expect(document.direct_download).to be_nil
-      end
-    end
-  end
   describe "#oembed" do
     describe "with an oembed url" do
       let(:document_attributes) do
@@ -281,7 +213,7 @@ describe Geoblacklight::SolrDocument do
     end
     let(:document_attributes) { {} }
     it "returns leaflet protocol" do
-      expect(document.viewer_protocol).to eq "map"
+      expect(document.viewer_protocol).to be nil
     end
   end
   describe "viewer_endpoint" do

data/spec/spec_helper.rb

@@ -35,24 +35,7 @@ require "selenium-webdriver"
 require "webmock/rspec"
 WebMock.allow_net_connect!(net_http_connect_on_start: true)
 
-Capybara.register_driver :chrome_headless do |app|
-  # Set up Chrome options
-  options = Selenium::WebDriver::Chrome::Options.new
-  options.add_argument("--headless")
-  options.add_argument("--disable-gpu")
-  options.add_argument("--no-sandbox")
-  options.add_argument("--window-size=1280,1024")
-
-  # Allow longer TCP reads to prevent timeout in the case of loading fixture
-  # eee6150b-ce2f-4837-9d17-ce72a0c1c26f, as part of relations_spec.rb
-  client = Selenium::WebDriver::Remote::Http::Default.new
-  client.read_timeout = 120 # seconds
-
-  Capybara::Selenium::Driver.new(app, browser: :chrome, options: options, http_client: client)
-end
-
-Capybara.javascript_driver = :chrome_headless
-Capybara.default_max_wait_time = 120
+Capybara.javascript_driver = :selenium_chrome_headless
 
 require "geoblacklight"
 
@@ -62,20 +45,8 @@ FactoryBot.definition_file_paths = [File.expand_path("../factories", __FILE__)]
 FactoryBot.find_definitions
 
 RSpec.configure do |config|
-  config.use_transactional_fixtures = false
+  config.use_transactional_fixtures = true
 
-  config.before do
-    DatabaseCleaner.strategy = if Capybara.current_driver == :rack_test
-      :transaction
-    else
-      :truncation
-    end
-    DatabaseCleaner.start
-  end
-
-  config.after do
-    DatabaseCleaner.clean
-  end
   if Rails::VERSION::MAJOR >= 5
     config.include ::Rails.application.routes.url_helpers
     config.include ::Rails.application.routes.mounted_helpers

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

@@ -8,7 +8,7 @@ class TestAppGenerator < Rails::Generators::Base
   def add_gems
     gem "blacklight"
 
-    Bundler.with_clean_env do
+    Bundler.with_unbundled_env do
       run "bundle install"
     end
   end
@@ -17,8 +17,8 @@ class TestAppGenerator < Rails::Generators::Base
     run "yarn install && yarn build"
   end
 
-  # Ensure local frontend build is linked so internal test app
-  # can use local javascript instead of npm package.
+  # This makes the assets available in the test app so that changes made in
+  # local development can be picked up automatically
   def link_frontend
     run "yarn link"
   end
@@ -26,7 +26,7 @@ class TestAppGenerator < Rails::Generators::Base
   def run_blacklight_generator
     say_status("warning", "GENERATING BL", :yellow)
 
-    generate "blacklight:install", "--devise"
+    generate "blacklight:install", "--devise", "--skip-solr"
   end
 
   # Install geoblacklight with the `test` option

data/template.rb

@@ -1,20 +1,22 @@
 # frozen_string_literal: true
 
-gem "blacklight", "~> 7.0"
-gem "geoblacklight", "~> 4.0"
-gem "sprockets", "< 4.0" # Use sprockets less than 4.0, let webpacker users set this up themselves
+gem "blacklight", "~> 8.0"
 
-# Hack for https://github.com/rails/rails/issues/35153
-# Adapted from https://github.com/projectblacklight/blacklight/pull/2065
-gemfile = File.expand_path("Gemfile")
-File.write(gemfile, File.open(gemfile) do |f|
-  text = f.read
-  text.gsub(/^gem 'sqlite3'$/, 'gem "sqlite3", "~> 1.3.6"')
-end)
+# Ensure the app generates with Propshaft; sprockets is no longer supported
+# https://github.com/geoblacklight/geoblacklight/issues/1265
+ENV["ENGINE_CART_RAILS_OPTIONS"] = ENV["ENGINE_CART_RAILS_OPTIONS"].to_s + " -a propshaft"
+
+# Install latest version of geoblacklight gem if running
+# generator with a development branch.
+if ENV["BRANCH"]
+  gem "geoblacklight", github: "geoblacklight/geoblacklight", branch: ENV["BRANCH"]
+else
+  gem "geoblacklight", "~> 4.0"
+end
 
 run "bundle install"
 
-generate "blacklight:install", "--devise"
+generate "blacklight:install", "--devise", "--skip-solr"
 generate "geoblacklight:install", "-f"
 
 rake "db:migrate"

data/test/leaflet/layers.test.js

@@ -0,0 +1,17 @@
+import { wmsLayer, wmtsLayer } from "../../app/javascript/leaflet/layers";
+import { describe, expect, it } from "vitest";
+
+describe("leaflet/layers", () => {
+  describe("wmsLayer", () => {
+    it("returns a WMS tile layer", () => {
+      const url = "http://example.com/wms";
+      const layerId = "layerId";
+      const opacity = 0.5;
+      const detectRetina = true;
+      const layer = wmsLayer(url, { layerId, opacity, detectRetina });
+      expect(layer.options.layers).toEqual(layerId);
+      expect(layer.options.opacity).toEqual(opacity);
+      expect(layer.options.detectRetina).toEqual(detectRetina);
+    });
+  });
+});

data/vite.config.ts

@@ -1,24 +1,35 @@
-import { resolve } from 'path'
-import { defineConfig } from 'vite'
-import { exec } from 'child_process'
+import { resolve } from "path";
+import { defineConfig } from "vite";
+import includePaths from "rollup-plugin-includepaths";
 
-export default defineConfig({
-  build: {
-    manifest: true,
-    minify: true,
-    reportCompressedSize: true,
-    lib: {
-      entry: resolve(__dirname, 'app/javascript/index.js'),
-      name: '@geoblacklight/frontend',
-      fileName: 'frontend'
-    }
-  },
-  "plugins": [
-    {
-      name: 'clobber internal test app vite files and cache',
-      buildEnd: async() => {
-        exec("cd .internal_test_app && bundle exec vite clobber")
-      }
-    }
-  ]
-})
+export default defineConfig(() => {
+  return {
+    build: {
+      outDir: "app/assets/javascripts/geoblacklight",
+      emptyOutDir: true,
+      manifest: true,
+      minify: false,
+      sourcemap: true,
+      lib: {
+        entry: resolve(__dirname, "app/javascript/geoblacklight/index.js"),
+        name: "@geoblacklight/frontend",
+        fileName: "geoblacklight",
+      },
+      // Rewrite importmap-friendly bare specifiers like geoblacklight/foo/bar
+      // to bundler-friendly local paths like ./foo/bar
+      rollupOptions: {
+        plugins: [
+          includePaths({
+            paths: ["app/javascript"],
+            extensions: [".js"],
+            include: {},
+            external: [],
+          }),
+        ],
+      },
+    },
+    test: {
+      environment: "jsdom",
+    },
+  };
+});