geoblacklight 2.1.2 → 3.0.0

data/lib/geoblacklight/metadata/fgdc.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   module Metadata
     class Fgdc < Base

data/lib/geoblacklight/metadata/html.rb

@@ -1,9 +1,9 @@
+# frozen_string_literal: true
 module Geoblacklight
   module Metadata
     class Html < Base
       def transform
-        ActionController::Base.helpers.content_tag(:iframe,
-                                                   '',
+        ActionController::Base.helpers.tag.iframe('',
                                                    src: @reference.endpoint,
                                                    scrolling: 'yes',
                                                    frameborder: 0)

data/lib/geoblacklight/metadata/iso19139.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   module Metadata
     class Iso19139 < Base

data/lib/geoblacklight/metadata_transformer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'geo_combine'
 
 module Geoblacklight

data/lib/geoblacklight/metadata_transformer/base.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   module MetadataTransformer
     ##

data/lib/geoblacklight/metadata_transformer/fgdc.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   module MetadataTransformer
     ##

data/lib/geoblacklight/metadata_transformer/iso19139.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   module MetadataTransformer
     ##

data/lib/geoblacklight/reference.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   ##
   # Parses an array of dct_references to create useful reference information
@@ -36,9 +37,10 @@ module Geoblacklight
 
     ##
     # The URI used for this instance's creation
+    # Remove any trailing slashes
     # @return [String]
     def uri
-      @reference[0]
+      @reference[0].sub(/(\/)+$/, '') if @reference[0].present?
     end
   end
 end

data/lib/geoblacklight/references.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   # References is a geoblacklight-schema dct:references parser
   class References
@@ -43,7 +44,7 @@ module Geoblacklight
     # Preferred download (should be a file download)
     # @return [Hash, nil]
     def preferred_download
-      return file_download unless download.blank?
+      return file_download if download.present?
     end
 
     ##
@@ -100,9 +101,12 @@ module Geoblacklight
     # present
     # @return (see #downloads_by_format)
     def vector_download_formats
-      { shapefile: wfs.to_hash,
+      return unless wms.present? && wfs.present?
+      {
+        shapefile: wfs.to_hash,
         kmz: wms.to_hash,
-        geojson: wfs.to_hash } if wms.present? && wfs.present?
+        geojson: wfs.to_hash
+      }
     end
 
     ##

data/lib/geoblacklight/relation/ancestors.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   module Relation
     class Ancestors
@@ -8,7 +9,7 @@ module Geoblacklight
 
       def create_search_params
         { fq: ["{!join from=#{Settings.FIELDS.SOURCE} to=layer_slug_s}layer_slug_s:#{@search_id}"],
-          fl: [Settings.FIELDS.TITLE, 'layer_slug_s'] }
+          fl: [Settings.FIELDS.TITLE, 'layer_slug_s', Settings.FIELDS.GEOM_TYPE] }
       end
 
       def execute_query

data/lib/geoblacklight/relation/descendants.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   module Relation
     class Descendants
@@ -8,7 +9,7 @@ module Geoblacklight
 
       def create_search_params
         { fq: "#{Settings.FIELDS.SOURCE}:#{@search_id}",
-          fl: [Settings.FIELDS.TITLE, 'layer_slug_s'] }
+          fl: [Settings.FIELDS.TITLE, 'layer_slug_s', Settings.FIELDS.GEOM_TYPE] }
       end
 
       def execute_query

data/lib/geoblacklight/relation/relation_response.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   module Relation
     class RelationResponse
@@ -17,7 +18,7 @@ module Geoblacklight
       end
 
       def empty?
-        !(ancestors['numFound'] > 0 || descendants['numFound'] > 0)
+        !(ancestors['numFound'].positive? || descendants['numFound'].positive?)
       end
     end
   end

data/lib/geoblacklight/routes.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   module Routes
     require 'geoblacklight/routes/exportable'

data/lib/geoblacklight/routes/downloadable.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   module Routes
     class Downloadable

data/lib/geoblacklight/routes/exportable.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   module Routes
     class Exportable

data/lib/geoblacklight/routes/wms.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   module Routes
     class Wms

data/lib/geoblacklight/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
-  VERSION = '2.1.2'.freeze
+  VERSION = '3.0.0'
 end

data/lib/geoblacklight/view_helper_override.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   module ViewHelperOverride
     include CatalogHelperOverride
@@ -26,7 +27,7 @@ module Geoblacklight
 
     def render_constraints_filters(localized_params = params)
       content = super(localized_params)
-      localized_params = localized_params.to_unsafe_h unless localized_params.is_a?(Hash)
+      localized_params = localized_params.to_unsafe_h if localized_params.respond_to?(:to_unsafe_h)
 
       if localized_params[:bbox]
         path = search_action_path(remove_spatial_filter_group(:bbox, localized_params))

data/lib/geoblacklight/wms_layer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   class WmsLayer
     def initialize(params)
@@ -24,10 +25,10 @@ module Geoblacklight
         request.options.timeout = Settings.TIMEOUT_WMS
         request.options.open_timeout = Settings.TIMEOUT_WMS
       end
-    rescue Faraday::Error::ConnectionFailed => error
+    rescue Faraday::ConnectionFailed => error
       Geoblacklight.logger.error error.inspect
       { error: error.inspect }
-    rescue Faraday::Error::TimeoutError => error
+    rescue Faraday::TimeoutError => error
       Geoblacklight.logger.error error.inspect
       { error: error.inspect }
     end

data/lib/geoblacklight/wms_layer/feature_info_response.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   class FeatureInfoResponse
     def initialize(response)

data/lib/tasks/geoblacklight.rake

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rails/generators'
 require 'generators/geoblacklight/install_generator'
 
@@ -7,15 +8,15 @@ namespace :geoblacklight do
     require 'solr_wrapper'
     SolrWrapper.wrap(port: '8983') do |solr|
       solr.with_collection(name: 'blacklight-core', dir: File.join(File.expand_path('../../', File.dirname(__FILE__)), 'solr', 'conf')) do
-          puts "\nSolr server running: http://localhost:#{solr.port}/solr/#/blacklight-core"
-          puts "\n^C to stop"
-          puts ' '
-          begin
-            Rake::Task['geoblacklight:solr:seed'].invoke
-            system "bundle exec rails s #{args[:rails_server_args]}"
-          rescue Interrupt
-            puts 'Shutting down...'
-          end
+        puts "\nSolr server running: http://localhost:#{solr.port}/solr/#/blacklight-core"
+        puts "\n^C to stop"
+        puts ' '
+        begin
+          Rake::Task['geoblacklight:solr:seed'].invoke
+          system "bundle exec rails s #{args[:rails_server_args]}"
+        rescue Interrupt
+          puts 'Shutting down...'
+        end
       end
     end
   end
@@ -30,7 +31,7 @@ namespace :geoblacklight do
         puts ' '
         begin
           Rake::Task['geoblacklight:solr:seed'].invoke
-          system "foreman start"
+          system 'foreman start'
         rescue Interrupt
           puts 'Shutting down...'
         end
@@ -39,23 +40,23 @@ namespace :geoblacklight do
   end
 
   namespace :index do
-    desc "Put sample data into solr"
+    desc 'Put sample data into solr'
     task :seed => :environment do
       docs = Dir['spec/fixtures/solr_documents/*.json'].map { |f| JSON.parse File.read(f) }.flatten
       Blacklight.default_index.connection.add docs
       Blacklight.default_index.connection.commit
     end
 
-    desc "Ingests a GeoHydra transformed.json"
+    desc 'Ingests a GeoHydra transformed.json'
     task :ingest_all => :environment do
-      docs = JSON::parse(File.read("#{Rails.root}/tmp/transformed.json"))
+      docs = JSON.parse(File.read(Rails.root.join('tmp', 'transformed.json')))
       docs.each do |doc|
         Blacklight.default_index.connection.add doc
         Blacklight.default_index.connection.commit
       end
     end
 
-    desc "Ingests a directory of geoblacklight.json files"
+    desc 'Ingests a directory of geoblacklight.json files'
     task :ingest, [:directory] => :environment do |_t, args|
       args.with_defaults(directory: 'data')
       Dir.glob(File.join(args[:directory], '**', 'geoblacklight.json')).each do |fn|
@@ -66,7 +67,7 @@ namespace :geoblacklight do
           puts "Failed to ingest #{fn}: #{e.inspect}"
         end
       end
-      puts "Committing changes to Solr"
+      puts 'Committing changes to Solr'
       Blacklight.default_index.connection.commit
     end
   end
@@ -74,33 +75,33 @@ namespace :geoblacklight do
   namespace :downloads do
     desc 'Delete all cached downloads'
     task delete: :environment do
-      FileUtils.rm_rf Dir.glob("#{Rails.root}/tmp/cache/downloads/*")
+      FileUtils.rm_rf Dir.glob(Rails.root.join('tmp', 'cache', 'downloads', '*'))
     end
     desc 'Create download directory'
     task mkdir: :environment do
-      FileUtils.mkdir_p Dir.glob("#{Rails.root}/tmp/cache/downloads")
+      FileUtils.mkdir_p(Rails.root.join('tmp', 'cache', 'downloads'), verbose: true)
     end
     desc 'Precaches a download'
-    task :precache, [:doc_id, :download_type, :timeout] => [:environment] do |t, args|
-      begin
-        fail 'Please supply required arguments [document_id, download_type and timeout]' unless args[:doc_id] && args[:download_type] && args[:timeout]
-        document = Geoblacklight::SolrDocument.find(args[:doc_id])
-        fail Blacklight::Exceptions::RecordNotFound if document[:layer_slug_s] != args[:doc_id]
-        download = "Geoblacklight::#{args[:download_type].capitalize}Download"
-                   .constantize.new(document, timeout: args[:timeout].to_i)
-        download.get
-        Rails.logger.info "Successfully downloaded #{download.file_name}"
-        Rails.logger.info "#{Geoblacklight::ShapefileDownload.file_path}"
-      rescue Geoblacklight::Exceptions::ExternalDownloadFailed => error
-        Rails.logger.error error.message + ' ' + error.url
-      rescue NameError
-        Rails.logger.error "Could not find that download type \"#{args[:download_type]}\""
+    task :precache, [:doc_id, :download_type, :timeout] => [:environment] do |_t, args|
+      unless args[:doc_id] && args[:download_type] && args[:timeout]
+        fail 'Please supply required arguments [document_id, download_type and timeout]'
       end
+      document = Geoblacklight::SolrDocument.find(args[:doc_id])
+      fail Blacklight::Exceptions::RecordNotFound if document[:layer_slug_s] != args[:doc_id]
+      download = "Geoblacklight::#{args[:download_type].capitalize}Download"
+                 .constantize.new(document, timeout: args[:timeout].to_i)
+      download.get
+      Rails.logger.info "Successfully downloaded #{download.file_name}"
+      Rails.logger.info Geoblacklight::ShapefileDownload.file_path.to_s
+    rescue Geoblacklight::Exceptions::ExternalDownloadFailed => error
+      Rails.logger.error error.message + ' ' + error.url
+    rescue NameError
+      Rails.logger.error "Could not find that download type \"#{args[:download_type]}\""
     end
   end
 
   namespace :solr do
-    desc "Put sample data into solr"
+    desc 'Put sample data into solr'
     task :seed => :environment do
       Rake::Task['geoblacklight:index:seed'].invoke
     end

data/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "geoblacklight",
+  "version": "2.1.2"
+}

data/schema/references.md

@@ -11,7 +11,7 @@ Direct download file | `http://schema.org/downloadUrl` | Direct file download fe
 Data dictionary / documentation download | `http://lccn.loc.gov/sh85035852` | Direct documentation download link|
 Full layer description | `http://schema.org/url` | Further descriptive information about layer|
 Metadata in ISO 19139 | `http://www.isotc211.org/schemas/2005/gmd/` | Structured metadata in ISO standard expressed as XML|
-Metadata in FGDC | `http://www.opengis.net/cat/csw/csdgm/` | Structured metadata in FGDC standard expressed as XML|
+Metadata in FGDC | `http://www.opengis.net/cat/csw/csdgm` | Structured metadata in FGDC standard expressed as XML|
 Metadata in MODS | `http://www.loc.gov/mods/v3` | Structured metadata in MODS format|
 Metadata in HTML | `http://www.w3.org/1999/xhtml` | Structured metadata in any standard expressed as HTML|
 ArcGIS FeatureLayer | `urn:x-esri:serviceType:ArcGIS#FeatureLayer` | Previewing of ArcGIS FeatureLayer Service|
@@ -20,3 +20,4 @@ ArcGIS DynamicMapLayer | `urn:x-esri:serviceType:ArcGIS#DynamicMapLayer` | Previ
 ArcGIS ImageMapLayer | `urn:x-esri:serviceType:ArcGIS#ImageMapLayer` | Previewing of ArcGIS ImageMapLayer Service|
 Harvard Geospatial Library Email Download | `http://schema.org/DownloadAction` | Retrieve a file via email from the Harvard Geospatial Library|
 OpenIndexMap | `https://openindexmaps.org` | Provide an index map preview|
+oEmbed | `https://oembed.com` | Provide an object that is embeddable through an oEmbed service

data/solr/conf/schema.xml

@@ -147,8 +147,8 @@
     <!-- Adding field type for bboxField that enables, among other things, overlap ratio calculations -->
     <fieldType name="bbox" class="solr.BBoxField"
            geo="true" distanceUnits="kilometers" numberType="pdouble" />
-    <fieldType name="pdouble" class="solr.DoublePointField" docValues="true"/>   
-   
+    <fieldType name="pdouble" class="solr.DoublePointField" docValues="true"/>
+
 
   </types>
 
@@ -169,8 +169,8 @@
   <copyField source="layer_slug_s"       dest="layer_slug_ti"       maxChars="100"/>
 
   <!-- core text search -->
-  <copyField source="*_ti"               dest="text" />
-  <copyField source="*_tmi"              dest="text" />
+  <copyField source="*_s"                dest="text" />
+  <copyField source="*_sm"               dest="text" />
 
   <!-- for sorting text fields -->
   <copyField source="dct_provenance_s"   dest="dct_provenance_sort"/>
@@ -192,7 +192,7 @@
   <copyField source="dct_provenance_s" dest="suggest"/>
   <copyField source="dc_subject_sm" dest="suggest"/>
   <copyField source="dct_spatial_sm" dest="suggest"/>
-  
+
   <!-- for bbox value -->
   <copyField source="solr_geom" dest="solr_bboxtype"/>
 </schema>

data/spec/controllers/catalog_controller_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe CatalogController, type: :controller do

data/spec/controllers/download_controller_spec.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
-describe Geoblacklight::DownloadController, type: :controller do
+describe DownloadController, type: :controller do
   describe '#file' do
     describe 'restricted file' do
       it 'redirects to login for authentication' do

data/spec/controllers/relation_controller_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe RelationController, type: :controller do

data/spec/controllers/wms_controller_spec.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
-describe Geoblacklight::WmsController, type: :controller do
+describe WmsController, type: :controller do
   let(:wms_layer) { instance_double('Geoblacklight::WmsLayer') }
   let(:feature_info) { { values: ['fid', 'layer:example'] } }
   let(:params) do

data/spec/factories/user.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 FactoryBot.define do
   factory :user do
     sequence(:email) { |n| "user#{n}@example.com" }

data/spec/features/bookmarks_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Blacklight Bookmarks' do

data/spec/features/configurable_basemap_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Configurable basemap', js: true do
@@ -23,4 +24,13 @@ feature 'Configurable basemap', js: true do
       expect(page).to have_css "img[src*='dark_all']"
     end
   end
+  feature 'using openstreetmapHot' do
+    before do
+      CatalogController.blacklight_config.basemap_provider = 'openstreetmapHot'
+    end
+    scenario 'has openstreetmapHot map' do
+      visit root_path
+      expect(page).to have_css "img[src*='hot']"
+    end
+  end
 end

data/spec/features/data_dictionary_download_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Data dictionary download tool' do