geoblacklight 2.4.0 → 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

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

data/lib/geoblacklight/relation/descendants.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   module Relation
     class Descendants

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.4.0'.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

data/lib/geoblacklight/wms_layer.rb

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

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 Rails.root.join('tmp/cache/downloads'), verbose: true
+      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/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,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe DownloadController, type: :controller 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,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe WmsController, type: :controller 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

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

data/spec/features/download_layer_spec.rb

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

data/spec/features/empty_search_spec.rb

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

data/spec/features/esri_viewer_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'feature_layer reference', js: true do
@@ -24,11 +25,6 @@ feature 'feature_layer reference', js: true do
     expect(Nokogiri::HTML.parse(page.body).css('g').length).to eq 23
     fail
   end
-  scenario 'displays image map layer' do
-    visit solr_document_path '32653ed6-8d83-4692-8a06-bf13ffe2c018'
-    expect(page).to have_css '.leaflet-control-zoom', visible: true
-    expect(page).to have_css 'img.leaflet-image-layer', visible: true
-  end
   scenario 'displays tiled map layer' do
     visit solr_document_path 'nyu-test-soil-survey-map'
     expect(page).to have_css '.leaflet-control-zoom', visible: true

data/spec/features/exports_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Export features' do
@@ -5,7 +6,7 @@ feature 'Export features' do
     feature 'Open in Carto' do
       scenario 'shows up in tools' do
         visit solr_document_path 'tufts-cambridgegrid100-04'
-        expect(page).to have_css 'li.exports a', text: 'Open in Carto'
+        expect(page).to have_css 'li.carto a', text: 'Open in Carto'
         click_link 'Open in Carto'
       end
     end
@@ -14,23 +15,14 @@ feature 'Export features' do
     feature 'Open in ArcGIS Online' do
       scenario 'shows up in tools' do
         visit solr_document_path '90f14ff4-1359-4beb-b931-5cb41d20ab90'
-        expect(page).to have_css 'li.exports a', text: 'Open in ArcGIS Online'
+        expect(page).to have_css 'li.arcgis a', text: 'Open in ArcGIS Online'
       end
     end
   end
   feature 'when restricted or no wfs' do
     scenario 'is not in tools' do
       visit solr_document_path 'princeton-02870w62c'
-      expect(page).not_to have_css 'li.exports a', text: 'Open in Carto'
-    end
-  end
-  context 'when carto is configured not to display' do
-    before do
-      allow(Settings).to receive(:CARTO_HIDE).and_return(true)
-    end
-    it 'will not display the carto link' do
-      visit solr_document_path 'tufts-cambridgegrid100-04'
-      expect(page).not_to have_css 'li.exports a', text: 'Open in Carto'
+      expect(page).not_to have_css 'li.carto a', text: 'Open in Carto'
     end
   end
 end

data/spec/features/help_text_spec.rb

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

data/spec/features/home_page_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Home page', js: true do # use js: true for tests which require js, but it slows things down
@@ -37,4 +38,9 @@ feature 'Home page', js: true do # use js: true for tests which require js, but
     end
     expect(page).to have_css '#documents'
   end
+  scenario 'can search by placename' do
+    click_link 'Minnesota, United States'
+    results = page.all(:css, 'article.document')
+    expect(results.count).to equal(3)
+  end
 end

data/spec/features/iiif_viewer_spec.rb

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

data/spec/features/index_map_spec.rb

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

data/spec/features/layer_inspection_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Layer inspection', js: true do

data/spec/features/layer_opacity_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Layer opacity', js: true do

data/spec/features/layer_preview_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Layer preview', js: true do