geoblacklight 0.11.1 → 0.12.0

data/lib/geoblacklight/search_builder.rb

@@ -1,10 +1,11 @@
 module Geoblacklight
-  class SearchBuilder  < Blacklight::Solr::SearchBuilder
+  class SearchBuilder < Blacklight::Solr::SearchBuilder
     self.default_processor_chain += [:add_spatial_params]
 
     def initialize(processor_chain, scope)
       super(processor_chain, scope)
-      @processor_chain += [:add_spatial_params] unless @processor_chain.include?(:add_spatial_params)
+      @processor_chain += [:add_spatial_params] unless @processor_chain
+                                                       .include?(:add_spatial_params)
     end
 
     ##

data/lib/geoblacklight/version.rb

@@ -1,3 +1,3 @@
 module Geoblacklight
-  VERSION = '0.11.1'
+  VERSION = '0.12.0'
 end

data/lib/geoblacklight/view_helper_override.rb

@@ -11,8 +11,8 @@ module Geoblacklight
       spatial_parameters? || super
     end
 
-    def query_has_constraints?(params = params)
-      has_search_parameters? || super
+    def query_has_constraints?(localized_params = params)
+      has_search_parameters? || super(localized_params)
     end
 
     def render_search_to_s(params)
@@ -21,19 +21,18 @@ module Geoblacklight
 
     def render_search_to_s_bbox(params)
       return ''.html_safe if params['bbox'].blank?
-      render_search_to_s_element('Bounding box', render_filter_value(params['bbox']) )
+      render_search_to_s_element('Bounding box', render_filter_value(params['bbox']))
     end
 
-    def render_constraints_filters(params = params)
-      content = super(params)
+    def render_constraints_filters(localized_params = params)
+      content = super(localized_params)
 
-      if params[:bbox]
-        content << render_constraint_element('Bounding Box',
-          params[:bbox],
-          remove: search_action_path(remove_spatial_filter_group(:bbox, params)))
+      if localized_params[:bbox]
+        path = search_action_path(remove_spatial_filter_group(:bbox, localized_params))
+        content << render_constraint_element('Bounding Box', localized_params[:bbox], remove: path)
       end
 
-      return content
+      content
     end
   end
 end

data/lib/geoblacklight/wms_layer.rb

@@ -1,6 +1,5 @@
 module Geoblacklight
   class WmsLayer
-
     def initialize(params)
       @params = params.merge(Settings.WMS_PARAMS)
       @response = Geoblacklight::FeatureInfoResponse.new(request_response)
@@ -14,25 +13,23 @@ module Geoblacklight
       @params.except('URL')
     end
 
-    def get_feature_info
+    def feature_info
       @response.check
     end
 
     def request_response
-      begin
-        conn = Faraday.new(url: url)
-        conn.get do |request|
-          request.params = search_params
-          request.options.timeout = Settings.TIMEOUT_WMS
-          request.options.open_timeout = Settings.TIMEOUT_WMS
-        end
-      rescue Faraday::Error::ConnectionFailed => error
-        Geoblacklight.logger.error error.inspect
-        { error: error.inspect }
-      rescue Faraday::Error::TimeoutError => error
-        Geoblacklight.logger.error error.inspect
-        { error: error.inspect }
+      conn = Faraday.new(url: url)
+      conn.get do |request|
+        request.params = search_params
+        request.options.timeout = Settings.TIMEOUT_WMS
+        request.options.open_timeout = Settings.TIMEOUT_WMS
       end
+    rescue Faraday::Error::ConnectionFailed => error
+      Geoblacklight.logger.error error.inspect
+      { error: error.inspect }
+    rescue Faraday::Error::TimeoutError => error
+      Geoblacklight.logger.error error.inspect
+      { error: error.inspect }
     end
   end
 end

data/lib/geoblacklight/wms_layer/feature_info_response.rb

@@ -29,4 +29,4 @@ module Geoblacklight
         @response.headers['content-type'].slice(0, 9) == 'text/xml'
     end
   end
-end
+end

data/spec/controllers/catalog_controller_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe CatalogController, type: :controller do
   describe '#web_services' do
-    it 'should return a document based off an id' do
+    it 'returns a document based off an id' do
       get :web_services, id: 'mit-us-ma-e25zcta5dct-2000'
       expect(response.status).to eq 200
       expect(assigns(:document)).to_not be_nil

data/spec/controllers/download_controller_spec.rb

@@ -3,13 +3,13 @@ require 'spec_helper'
 describe Geoblacklight::DownloadController, type: :controller do
   describe '#file' do
     describe 'restricted file' do
-      it 'should redirect to login for authentication' do
+      it 'redirects to login for authentication' do
         get :file, id: 'stanford-cg357zz0321-shapefile', format: 'zip'
         expect(response.status).to eq 401
       end
     end
     describe 'public file' do
-      it 'should initiate download' do
+      it 'initiates download' do
         expect(controller).to receive(:render)
         expect(controller).to receive(:send_file)
         get :file, id: 'mit-us-ma-e25zcta5dct-2000-shapefile', format: 'zip'
@@ -19,27 +19,27 @@ describe Geoblacklight::DownloadController, type: :controller do
   end
   describe '#show' do
     describe 'restricted file' do
-      it 'should redirect to login for authentication' do
+      it 'redirects to login for authentication' do
         get 'show', id: 'stanford-cg357zz0321', format: 'json'
         expect(response.status).to eq 401
       end
     end
     describe 'public file' do
-      it 'should initiate download creation' do
+      it 'initiates download creation' do
         get 'show', id: 'mit-us-ma-e25zcta5dct-2000', type: 'shapefile'
         expect(response.status).to eq 200
       end
     end
   end
   describe '#hgl' do
-    it 'should request file' do
+    it 'requests file' do
       expect_any_instance_of(Geoblacklight::HglDownload).to receive(:get).and_return('success')
       get :hgl, id: 'harvard-g7064-s2-1834-k3', email: 'foo@example.com'
       expect(response.status).to eq 200
     end
-    it 'should render form' do
+    it 'renders form' do
       get :hgl, id: 'harvard-g7064-s2-1834-k3'
       expect(response).to render_template('hgl')
     end
   end
-end
+end

data/spec/features/home_page_spec.rb

@@ -29,7 +29,7 @@ feature 'Home page', js: true do # use js: true for tests which require js, but
   scenario 'clicking map search should create a spatial search' do
     within '#map' do
       find('.search-control a').click
-      expect(page.current_url).to match /bbox=/
+      expect(page.current_url).to match(/bbox=/)
     end
     expect(page).to have_css '#documents'
   end

data/spec/features/layer_opacity_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+feature 'Layer opacity', js: true do
+  scenario 'WMS layer should have opacity control' do
+    visit catalog_path('mit-us-ma-e25zcta5dct-2000')
+    expect(page).to have_css('div.opacity-text', text: '75%')
+    expect(page.all('div.leaflet-layer')[1][:style]).to match(/opacity: 0.75;/)
+  end
+end

data/spec/features/metadata_panel_spec.rb

@@ -6,10 +6,12 @@ feature 'Metadata tools' do
       visit catalog_path 'stanford-cg357zz0321'
       expect(page).to have_css 'li.metadata a', text: 'Metadata'
       click_link 'Metadata'
-      within '.modal-body' do
-        expect(page).to have_css 'div.label', text: 'MODS'
-        expect(page).to have_css 'div.CodeRay', count: 2
-        expect(page).to have_css 'div.label', text: 'ISO 19139'
+      using_wait_time 15 do
+        within '.metadata-view' do
+          expect(page).to have_css 'div.label', text: 'MODS'
+          expect(page).to have_css 'div.CodeRay', count: 2
+          expect(page).to have_css 'div.label', text: 'ISO 19139'
+        end
       end
     end
   end

data/spec/features/saved_searches_spec.rb

@@ -5,7 +5,7 @@ feature 'saved searches' do
     visit root_path
     within '#map' do
       find('.search-control a').click
-      expect(page.current_url).to match /bbox=/
+      expect(page.current_url).to match(/bbox=/)
     end
     visit search_history_path
     expect(page).to have_css 'td.query a', text: /Bounding box:/

data/spec/features/split_view.html.erb_spec.rb

@@ -6,9 +6,9 @@ feature 'Index view', js: true do
   end
 
   scenario 'should have documents and map on page' do
-    visit catalog_index_path(f: { dct_provenance_s: ['Stanford']})
+    visit catalog_index_path(f: { dct_provenance_s: ['Stanford'] })
     expect(page).to have_css('#documents')
-    expect(page).to have_css(".document", count: 3)
+    expect(page).to have_css('.document', count: 3)
     expect(page).to have_css('#map')
   end
 
@@ -31,7 +31,7 @@ feature 'Index view', js: true do
 
   scenario 'hover on record should produce bounding box on map' do
     # Needed to find an svg element on the page
-    visit catalog_index_path(f: { dct_provenance_s: ['Stanford']})
+    visit catalog_index_path(f: { dct_provenance_s: ['Stanford'] })
     expect(Nokogiri::HTML.parse(page.body).css('path').length).to eq 0
     find('.documentHeader', match: :first).trigger(:mouseover)
     expect(Nokogiri::HTML.parse(page.body).css('path').length).to eq 1

data/spec/helpers/geoblacklight_helpers_spec.rb

@@ -1,13 +1,12 @@
 require 'spec_helper'
 
 describe GeoblacklightHelper, type: :helper do
-  include GeoblacklightHelper
   include ActionView::Helpers::UrlHelper
   include ActionView::Helpers::TranslationHelper
   describe '#render_facet_links' do
-    it 'should contain unique links' do
-      expect(self).to receive(:catalog_index_path).exactly(3).times.and_return("http://example.com/catalog?f[dc_subject_sm][]=category")
-      html = Capybara.string(render_facet_links('dc_subject_sm', ['Test', 'Test', 'Earth', 'Science']))
+    it 'contains unique links' do
+      expect(self).to receive(:catalog_index_path).exactly(3).times.and_return('http://example.com/catalog?f[dc_subject_sm][]=category')
+      html = Capybara.string(render_facet_links('dc_subject_sm', %w(Test Test Earth Science)))
       expect(html).to have_css 'a', count: 3
       expect(html).to have_css 'a', text: 'Test', count: 1
       expect(html).to have_css 'a', text: 'Earth', count: 1

data/spec/lib/geoblacklight/bounding_box_spec.rb

@@ -3,25 +3,25 @@ require 'spec_helper'
 describe Geoblacklight::BoundingBox do
   describe '#initialize' do
     it 'handles multiple input types as arguments' do
-      expect(Geoblacklight::BoundingBox.new('1', '1', '1', '1')).to be_an Geoblacklight::BoundingBox
-      expect(Geoblacklight::BoundingBox.new(1, 2, 3, 3)).to be_an Geoblacklight::BoundingBox
-      expect(Geoblacklight::BoundingBox.new(1.1, 2.1, 3.1, 3.1)).to be_an Geoblacklight::BoundingBox
+      expect(described_class.new('1', '1', '1', '1')).to be_an described_class
+      expect(described_class.new(1, 2, 3, 3)).to be_an described_class
+      expect(described_class.new(1.1, 2.1, 3.1, 3.1)).to be_an described_class
     end
   end
   describe '#to_envelope' do
-    let(:example_box) { Geoblacklight::BoundingBox.new(-160, -80, 120, 70) }
+    let(:example_box) { described_class.new(-160, -80, 120, 70) }
     it 'creates an envelope syntax version of the bounding box' do
       expect(example_box.to_envelope).to eq 'ENVELOPE(-160, 120, 70, -80)'
     end
   end
   describe '#from_rectangle' do
-    let(:example_box) { Geoblacklight::BoundingBox.from_rectangle('-160 -80 120 70') }
+    let(:example_box) { described_class.from_rectangle('-160 -80 120 70') }
     it 'parses and creates a Geoblacklight::BoundingBox from a Solr lat-lon' do
-      expect(example_box).to be_an Geoblacklight::BoundingBox
+      expect(example_box).to be_an described_class
       expect(example_box.to_envelope).to eq 'ENVELOPE(-160, 120, 70, -80)'
     end
     it 'checks for valididity' do
-      expect { Geoblacklight::BoundingBox.from_rectangle('-160 -80 120') }.to raise_error Geoblacklight::Exceptions::WrongBoundingBoxFormat
+      expect { described_class.from_rectangle('-160 -80 120') }.to raise_error Geoblacklight::Exceptions::WrongBoundingBoxFormat
     end
   end
 end

data/spec/lib/geoblacklight/controller_override_spec.rb

@@ -1 +1 @@
-require 'spec_helper'
+require 'spec_helper'

data/spec/lib/geoblacklight/document_presenter_spec.rb

@@ -5,7 +5,7 @@ describe Geoblacklight::DocumentPresenter do
   let(:config) { Blacklight::Configuration.new }
   subject { presenter }
   let(:presenter) do
-    Geoblacklight::DocumentPresenter.new(document, request_context, config)
+    described_class.new(document, request_context, config)
   end
 
   let(:document) do

data/spec/lib/geoblacklight/download/geojson_download_spec.rb

@@ -2,16 +2,16 @@ require 'spec_helper'
 
 describe Geoblacklight::GeojsonDownload do
   let(:document) { SolrDocument.new(layer_slug_s: 'test', solr_wfs_url: 'http://www.example.com/wfs', layer_id_s: 'stanford-test', solr_geom: 'ENVELOPE(-180, 180, 90, -90)') }
-  let(:download) { Geoblacklight::GeojsonDownload.new(document) }
+  let(:download) { described_class.new(document) }
   describe '#initialize' do
-    it 'should initialize as a GeojsonDownload object with specific options' do
-      expect(download).to be_an Geoblacklight::GeojsonDownload
+    it 'initializes as a GeojsonDownload object with specific options' do
+      expect(download).to be_an described_class
       options = download.instance_variable_get(:@options)
       expect(options[:content_type]).to eq 'application/json'
       expect(options[:request_params][:typeName]).to eq 'stanford-test'
     end
-    it 'should merge custom options' do
-      download = Geoblacklight::GeojsonDownload.new(document, timeout: 33)
+    it 'merges custom options' do
+      download = described_class.new(document, timeout: 33)
       options = download.instance_variable_get(:@options)
       expect(options[:timeout]).to eq 33
     end

data/spec/lib/geoblacklight/download/geotiff_download_spec.rb

@@ -2,17 +2,17 @@ require 'spec_helper'
 
 describe Geoblacklight::GeotiffDownload do
   let(:document) { SolrDocument.new(layer_slug_s: 'test', layer_id_s: 'stanford-test', solr_geom: 'ENVELOPE(-180, 180, 90, -90)') }
-  let(:download) { Geoblacklight::GeotiffDownload.new(document) }
+  let(:download) { described_class.new(document) }
   describe '#initialize' do
-    it 'should initialize as a GeotiffDownload object with specific options' do
-      expect(download).to be_an Geoblacklight::GeotiffDownload
+    it 'initializes as a GeotiffDownload object with specific options' do
+      expect(download).to be_an described_class
       options = download.instance_variable_get(:@options)
       expect(options[:content_type]).to eq 'image/geotiff'
       expect(options[:request_params][:layers]).to eq 'stanford-test'
       expect(options[:reflect]).to be_truthy
     end
-    it 'should merge custom options' do
-      download = Geoblacklight::GeotiffDownload.new(document, timeout: 33)
+    it 'merges custom options' do
+      download = described_class.new(document, timeout: 33)
       options = download.instance_variable_get(:@options)
       expect(options[:timeout]).to eq 33
     end

data/spec/lib/geoblacklight/download/hgl_download_spec.rb

@@ -2,18 +2,18 @@ require 'spec_helper'
 
 describe Geoblacklight::HglDownload do
   let(:document) { SolrDocument.new(layer_slug_s: 'test', layer_id_s: 'cite:harvard-test') }
-  let(:download) { Geoblacklight::HglDownload.new(document, 'foo@example.com') }
+  let(:download) { described_class.new(document, 'foo@example.com') }
   describe '#initialize' do
-    it 'should initialize as an HglDownload object with specific options' do
-      expect(download).to be_an Geoblacklight::HglDownload
+    it 'initializes as an HglDownload object with specific options' do
+      expect(download).to be_an described_class
       options = download.instance_variable_get(:@options)
       expect(options[:request_params]['LayerName']).to eq 'harvard-test'
       expect(options[:request_params]['UserEmail']).to eq 'foo@example.com'
     end
-    it 'should merge custom options' do
-      download = Geoblacklight::HglDownload.new(document, 'foo@example.com', timeout: 33)
+    it 'merges custom options' do
+      download = described_class.new(document, 'foo@example.com', timeout: 33)
       options = download.instance_variable_get(:@options)
       expect(options[:timeout]).to eq 33
     end
   end
-end
+end

data/spec/lib/geoblacklight/download/kmz_download_spec.rb

@@ -2,17 +2,17 @@ require 'spec_helper'
 
 describe Geoblacklight::KmzDownload do
   let(:document) { SolrDocument.new(layer_slug_s: 'test', solr_wfs_url: 'http://www.example.com/wfs', layer_id_s: 'stanford-test', solr_geom: 'ENVELOPE(-180, 180, 90, -90)') }
-  let(:download) { Geoblacklight::KmzDownload.new(document) }
+  let(:download) { described_class.new(document) }
   describe '#initialize' do
-    it 'should initialize as a KmzDownload object with specific options' do
-      expect(download).to be_an Geoblacklight::KmzDownload
+    it 'initializes as a KmzDownload object with specific options' do
+      expect(download).to be_an described_class
       options = download.instance_variable_get(:@options)
       expect(options[:content_type]).to eq 'application/vnd.google-earth.kmz'
       expect(options[:request_params][:layers]).to eq 'stanford-test'
       expect(options[:request_params][:bbox]).to eq '-180, -90, 180, 90'
     end
-    it 'should merge custom options' do
-      download = Geoblacklight::KmzDownload.new(document, timeout: 33)
+    it 'merges custom options' do
+      download = described_class.new(document, timeout: 33)
       options = download.instance_variable_get(:@options)
       expect(options[:timeout]).to eq 33
     end

data/spec/lib/geoblacklight/download/shapefile_download_spec.rb

@@ -2,16 +2,16 @@ require 'spec_helper'
 
 describe Geoblacklight::ShapefileDownload do
   let(:document) { SolrDocument.new(layer_slug_s: 'test', solr_wfs_url: 'http://www.example.com/wfs', layer_id_s: 'stanford-test', solr_geom: 'ENVELOPE(-180, 180, 90, -90)') }
-  let(:download) { Geoblacklight::ShapefileDownload.new(document) }
+  let(:download) { described_class.new(document) }
   describe '#initialize' do
-    it 'should initialize as a ShapefileDownload object with specific options' do
-      expect(download).to be_an Geoblacklight::ShapefileDownload
+    it 'initializes as a ShapefileDownload object with specific options' do
+      expect(download).to be_an described_class
       options = download.instance_variable_get(:@options)
       expect(options[:content_type]).to eq 'application/zip'
       expect(options[:request_params][:typeName]).to eq 'stanford-test'
     end
-    it 'should merge custom options' do
-      download = Geoblacklight::ShapefileDownload.new(document, timeout: 33)
+    it 'merges custom options' do
+      download = described_class.new(document, timeout: 33)
       options = download.instance_variable_get(:@options)
       expect(options[:timeout]).to eq 33
     end

data/spec/lib/geoblacklight/download_spec.rb

@@ -4,45 +4,45 @@ describe Geoblacklight::Download do
   let(:response) { double('response') }
   let(:get) { double('get') }
   let(:body) { double('body') }
-  let(:document) { SolrDocument.new(layer_slug_s: 'test', dct_references_s: {'http://www.opengis.net/def/serviceType/ogc/wms' => 'http://www.example.com/wms'}.to_json) }
+  let(:document) { SolrDocument.new(layer_slug_s: 'test', dct_references_s: { 'http://www.opengis.net/def/serviceType/ogc/wms' => 'http://www.example.com/wms' }.to_json) }
   let(:options) { { type: 'shapefile', extension: 'zip', service_type: 'wms', content_type: 'application/zip' } }
   let(:download) { Geoblacklight::ShapefileDownload.new(document, options) }
 
   describe '#initialize' do
-    it 'should initialize as a Download object' do
-      expect(download).to be_an Geoblacklight::Download
+    it 'initializes as a Download object' do
+      expect(download).to be_an described_class
     end
   end
   describe '#file_name' do
-    it 'should give the file name with path and extension' do
+    it 'gives the file name with path and extension' do
       expect(download.file_name).to eq 'test-shapefile.zip'
     end
   end
   describe '#file_path' do
-    it 'should return the path with name and extension' do
+    it 'returns the path with name and extension' do
       expect(download.class.file_path).to eq "#{Rails.root}/tmp/cache/downloads"
     end
-    it 'should be configurable' do
+    it 'is configurable' do
       expect(Settings).to receive(:DOWNLOAD_PATH).and_return('configured/path')
       expect(download.class.file_path).to eq 'configured/path'
     end
   end
   describe '#download_exists?' do
-    it 'should return false if file does not exist' do
+    it 'returns false if file does not exist' do
       expect(File).to receive(:file?).and_return(false)
       expect(download.download_exists?).to be_falsey
     end
-    it 'should return true if file does not exist' do
+    it 'returns true if file does not exist' do
       expect(File).to receive(:file?).and_return(true)
       expect(download.download_exists?).to be_truthy
     end
   end
   describe '#get' do
-    it 'should return filename if download exists' do
+    it 'returns filename if download exists' do
       expect(download).to receive(:download_exists?).and_return(true)
       expect(download.get).to eq download.file_name
     end
-    it 'should call create_download_file if it does not exist' do
+    it 'calls create_download_file if it does not exist' do
       expect(download).to receive(:download_exists?).and_return(false)
       expect(download).to receive(:initiate_download).and_return(object: 'file')
       expect(File).to receive(:open).with("#{download.file_path_and_name}.tmp", 'wb').and_return('')
@@ -51,14 +51,14 @@ describe Geoblacklight::Download do
     end
   end
   describe '#create_download_file' do
-    it 'should create the file in fs and delete it if the content headers are not correct' do
+    it 'creates the file in fs and delete it if the content headers are not correct' do
       bad_file = OpenStruct.new(headers: { 'content-type' => 'bad/file' })
       expect(download).to receive(:initiate_download).and_return(bad_file)
       expect(File).to receive(:delete).with("#{download.file_path_and_name}.tmp").and_return(nil)
       expect { download.create_download_file }.to raise_error(Geoblacklight::Exceptions::ExternalDownloadFailed, 'Wrong download type')
     end
-    it 'should create the file, write it, and then rename from tmp if everything is ok' do
-      shapefile = OpenStruct.new(headers: {'content-type' => 'application/zip'})
+    it 'creates the file, write it, and then rename from tmp if everything is ok' do
+      shapefile = OpenStruct.new(headers: { 'content-type' => 'application/zip' })
       expect(download).to receive(:initiate_download).and_return(shapefile)
       expect(File).to receive(:open).with("#{download.file_path_and_name}.tmp", 'wb').and_return('')
       expect(File).to receive(:rename)
@@ -71,7 +71,7 @@ describe Geoblacklight::Download do
       expect(Faraday).to receive(:new).with(url: 'http://www.example.com/wms').and_return(response)
       download.initiate_download
     end
-    it 'should raise Geoblacklight::Exceptions::ExternalDownloadFailed with a connection failure' do
+    it 'raises Geoblacklight::Exceptions::ExternalDownloadFailed with a connection failure' do
       expect(response).to receive(:url_prefix).and_return 'http://www.example.com/wms'
       expect(response).to receive(:get).and_raise(Faraday::Error::ConnectionFailed.new('Failed'))
       expect(Faraday).to receive(:new).with(url: 'http://www.example.com/wms').and_return(response)