geoblacklight 2.2.0 → 3.0.1

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
@@ -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'])
+      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'])
     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'])
+      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'])
     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
@@ -73,7 +74,7 @@ describe Geoblacklight::WmsLayer do
     context 'when the HTTP connection fails' do
       before do
         allow(Geoblacklight.logger).to receive(:error).with('#<Faraday::ConnectionFailed wrapped=#<StandardError: test connection error>>')
-        allow(connection).to receive(:get).and_raise(Faraday::Error::ConnectionFailed.new(StandardError.new('test connection error')))
+        allow(connection).to receive(:get).and_raise(Faraday::ConnectionFailed.new(StandardError.new('test connection error')))
       end
 
       it 'logs the Faraday error' do
@@ -86,7 +87,7 @@ describe Geoblacklight::WmsLayer do
     context 'when the HTTP connection times out' do
       before do
         allow(Geoblacklight.logger).to receive(:error).with('#<Faraday::TimeoutError #<Faraday::TimeoutError: timeout>>')
-        allow(connection).to receive(:get).and_raise(Faraday::Error::TimeoutError)
+        allow(connection).to receive(:get).and_raise(Faraday::TimeoutError)
       end
 
       it 'logs the Faraday error' 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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+describe Geoblacklight::SolrDocument::Citation do
+  describe '#geoblacklight_citation' do
+    let(:fixture) { JSON.parse(read_fixture('solr_documents/restricted-line.json')) }
+    let(:document) { SolrDocument.new(fixture) }
+
+    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
+  end
+end

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
@@ -35,6 +36,32 @@ describe Geoblacklight::SolrDocument do
         expect(document.public?).to be_falsey
       end
     end
+    describe 'without rights data' do
+      let(:document_attributes) { {} }
+      it 'is not public' do
+        expect(document.public?).to be_falsey
+      end
+    end
+  end
+  describe '#restricted?' do
+    describe 'a restricted document' do
+      let(:document_attributes) { { rights_field => 'RESTRICTED' } }
+      it 'is restricted' do
+        expect(document.restricted?).to be_truthy
+      end
+    end
+    describe 'a non-restricted resource' do
+      let(:document_attributes) { { rights_field => 'PUBLIC' } }
+      it 'is not restricted' do
+        expect(document.restricted?).to be_falsey
+      end
+    end
+    describe 'without rights data' do
+      let(:document_attributes) { {} }
+      it 'is restricted' do
+        expect(document.restricted?).to be_truthy
+      end
+    end
   end
   describe '#downloadable?' do
     describe 'available direct download' 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

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+def read_fixture(fname)
+  File.read(File.join(fixture_dir, fname))
+end
+
+def fixture_dir
+  @fixture_dir ||= File.join(File.dirname(__FILE__), '../fixtures')
+end

data/spec/tasks/geoblacklight_spec.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+require 'spec_helper'
+require 'rake'
+require 'fileutils'
+
+describe 'geoblacklight.rake' do
+  describe 'geoblacklight:downloads:mkdir' do
+    before do
+      Rails.application.load_tasks
+      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
+    end
+  end
+end

data/spec/teaspoon_env.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 unless defined?(Rails)
   ENV['RAILS_ROOT'] = File.expand_path('../../', __FILE__)
   require File.expand_path('../../config/environment', __FILE__)

data/spec/test_app_templates/Gemfile.extra

@@ -0,0 +1 @@
+gem 'sprockets', '< 4'

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

data/spec/views/catalog/_document_split.html.erb_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'catalog/_document_split.html.erb' do

data/spec/views/catalog/_index_split.html.erb_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'catalog/_document_split.html.erb' do

data/spec/views/catalog/_results_pagination.html.erb_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'catalog/_results_pagination.html.erb', type: :view do

data/spec/views/catalog/_show_downloads.html.erb_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'catalog/_show_downloads.html.erb', type: :view do

data/spec/views/catalog/_show_tools.html.erb_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'catalog/_show_tools.html.erb', type: :view do
@@ -6,11 +7,8 @@ describe 'catalog/_show_tools.html.erb', type: :view do
   let(:context) { Blacklight::Configuration::Context.new(controller) }
 
   before do
-    assign :response, instance_double(Blacklight::Solr::Response, params: {})
     assign :document, document
     allow(view).to receive(:blacklight_config).and_return blacklight_config
-    allow(view).to receive(:has_user_authentication_provider?).and_return false
-
     allow(view).to receive(:blacklight_configuration_context).and_return context
   end
 
@@ -18,7 +16,7 @@ describe 'catalog/_show_tools.html.erb', type: :view do
     let(:document_actions) { blacklight_config.show.document_actions }
 
     it 'renders a document action' do
-      allow(view).to receive(:some_action_solr_document_path).with(document).and_return 'x'
+      allow(view).to receive(:some_action_solr_document_path).with(document, any_args).and_return 'x'
       document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new partial: 'document_action'
       render partial: 'catalog/show_tools'
       expect(rendered).to have_link 'Some action', href: 'x'