geoblacklight 1.0.3 → 1.1.0

data/spec/features/configurable_basemap_spec.rb

@@ -19,7 +19,6 @@ feature 'Configurable basemap', js: true do
       CatalogController.blacklight_config.basemap_provider = 'darkMatter'
     end
     scenario 'has darkMatter map' do
-      puts CatalogController.blacklight_config.basemap_provider
       visit root_path
       expect(page).to have_css "img[src*='dark_all']"
     end

data/spec/features/exports_spec.rb

@@ -2,18 +2,18 @@ require 'spec_helper'
 
 feature 'Export features' do
   feature 'when item is public and wfs is available' do
-    feature 'Open in CartoDB' 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 CartoDB'
-        click_link 'Open in CartoDB'
+        expect(page).to have_css 'li.exports a', text: 'Open in Carto'
+        click_link 'Open in Carto'
       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 CartoDB'
+      expect(page).not_to have_css 'li.exports a', text: 'Open in Carto'
     end
   end
 end

data/spec/fixtures/solr_documents/esri-image-map-layer.json

@@ -15,7 +15,7 @@
   "layer_slug_s": "princeton-test-oregon-naip-2011",
   "layer_id_s": "oregon-naip-2011",
   "layer_geom_type_s": "Raster",
-  "layer_modified_dt": "2015-27-15T00:41:49Z",
+  "layer_modified_dt": "2015-07-15T00:41:49Z",
   "solr_geom": "ENVELOPE(-124.88, -116.41, 46.34, 41.91)",
   "solr_year_i": 2008
-}
+}

data/spec/helpers/carto_helper_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe CartoHelper, type: :helper do
+  describe '#carto_link' do
+    let(:application_name) { 'My GeoBlacklight Deployment' }
+
+    it 'removes spaces from application_name to produce valid Carto request URL' do
+      expect(carto_link('http://demo.org/wfs/layer.json')).to eq 'http://oneclick.cartodb.com/?file=http%3A%2F%2Fdemo.org%2Fwfs%2Flayer.json&provider=MyGeoBlacklightDeployment&logo=http%3A%2F%2Fgeoblacklight.org%2Fimages%2Fgeoblacklight-logo.png'
+    end
+  end
+end

data/spec/helpers/geoblacklight_helpers_spec.rb

@@ -111,14 +111,6 @@ describe GeoblacklightHelper, type: :helper do
     end
   end
 
-  describe '#cartodb_link' do
-    let(:application_name) { 'My GeoBlacklight Deployment' }
-
-    it 'removes spaces from application_name to produce valid CartoDB request URL' do
-      expect(cartodb_link('http://demo.org/wfs/layer.json')).to eq 'http://oneclick.cartodb.com/?file=http%3A%2F%2Fdemo.org%2Fwfs%2Flayer.json&provider=MyGeoBlacklightDeployment&logo=http%3A%2F%2Fgeoblacklight.org%2Fimages%2Fgeoblacklight-logo.png'
-    end
-  end
-
   describe '#render_web_services' do
     let(:reference) { double(type: 'wms') }
     it 'with a reference to a defined partial' do

data/spec/models/concerns/geoblacklight/solr_document/{carto_db_spec.rb → carto_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Geoblacklight::SolrDocument::CartoDb do
+describe Geoblacklight::SolrDocument::Carto do
   let(:subject) { SolrDocument.new }
   let(:geojson_download) { instance_double(Geoblacklight::GeojsonDownload) }
 
@@ -8,20 +8,20 @@ describe Geoblacklight::SolrDocument::CartoDb do
     allow(Geoblacklight::GeojsonDownload).to receive(:new).and_return(geojson_download)
   end
 
-  describe '#cartodb_reference' do
+  describe '#carto_reference' do
     it 'returns nil for restricted documents' do
       expect(subject).to receive(:public?).and_return(false)
-      expect(subject.cartodb_reference).to be_nil
+      expect(subject.carto_reference).to be_nil
     end
     it 'returns nil for no download_types' do
       expect(subject).to receive(:public?).and_return(true)
       expect(subject).to receive(:download_types).and_return(nil)
-      expect(subject.cartodb_reference).to be_nil
+      expect(subject.carto_reference).to be_nil
     end
     it 'returns nil with no :geojson download type' do
       expect(subject).to receive(:public?).and_return(true)
       expect(subject).to receive(:download_types).and_return(geotiff: 'geotiff')
-      expect(subject.cartodb_reference).to be_nil
+      expect(subject.carto_reference).to be_nil
     end
     it 'Creates and returns a GeojsonDownload url' do
       expect(subject).to receive(:public?).and_return(true)
@@ -30,7 +30,7 @@ describe Geoblacklight::SolrDocument::CartoDb do
       expect(geojson_download)
         .to receive(:url_with_params)
         .and_return('http://www.example.com/geojsonDownload')
-      expect(subject.cartodb_reference).to eq 'http://www.example.com/geojsonDownload'
+      expect(subject.carto_reference).to eq 'http://www.example.com/geojsonDownload'
     end
   end
 end

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@ require 'coveralls'
 Coveralls.wear!('rails')
 EngineCart.load_application!
 
+require 'rails-controller-testing' if Rails::VERSION::MAJOR >= 5
 require 'rspec/rails'
 require 'capybara/rspec'
 require 'capybara/poltergeist'
@@ -15,7 +16,7 @@ Capybara.javascript_driver = :poltergeist
 Capybara.register_driver :poltergeist do |app|
   options = {}
 
-  options[:timeout] = 120 if RUBY_PLATFORM == 'java'
+  options[:timeout] = RUBY_PLATFORM == 'java' ? 120 : 15
 
   Capybara::Poltergeist::Driver.new(app, options)
 end
@@ -52,6 +53,12 @@ RSpec.configure do |config|
   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
+  else
+    config.include BackportTestHelpers, type: :controller
+  end
 
   config.include Devise::Test::ControllerHelpers, type: :controller
 end

data/spec/support/backport_test_helpers.rb

@@ -0,0 +1,45 @@
+# Backport the Rails 5 controller test methods to Rails 4
+module BackportTestHelpers
+  def delete(*args)
+    (action, rest) = *args
+    rest ||= {}
+
+    @request.env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest' if rest[:xhr]
+
+    super(action, rest[:params])
+  end
+
+  def get(*args)
+    (action, rest) = *args
+    rest ||= {}
+    @request.env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest' if rest[:xhr]
+    super(action, rest[:params])
+  end
+
+  def post(*args)
+    (action, rest) = *args
+    rest ||= {}
+    body = rest[:body]
+    @request.env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest' if rest[:xhr]
+
+    if body
+      super(action, body, rest.except(:params).merge(rest[:params]))
+    else
+      super(action, rest[:params])
+    end
+  end
+
+  def put(*args)
+    (action, rest) = *args
+    rest ||= {}
+    @request.env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest' if rest[:xhr]
+    super(action, rest[:params])
+  end
+
+  def patch(*args)
+    (action, rest) = *args
+    rest ||= {}
+    @request.env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest' if rest[:xhr]
+    super(action, rest[:params])
+  end
+end

data/spec/test_app_templates/solr_documents

@@ -0,0 +1 @@
+../fixtures/solr_documents

data/template.rb

@@ -5,6 +5,6 @@ gem 'jettywrapper'
 run 'bundle install'
 
 generate 'blacklight:install', '--devise'
-generate 'geoblacklight:install', '--jettywrapper'
+generate 'geoblacklight:install', '--solrwrapper'
 
 rake 'db:migrate'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Mike Graves
@@ -11,8 +11,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-04 00:00:00.000000000 Z
+date: 2016-08-05 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
@@ -56,19 +76,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails_config
+  name: config
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -112,61 +132,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: deprecation
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 11.0.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 11.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: rails-controller-testing
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: jettywrapper
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
@@ -185,30 +205,30 @@ dependencies:
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -227,16 +247,16 @@ dependencies:
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 description: GeoBlacklight provides a world-class discovery platform for geospatial
   (GIS) holdings. It is an open collaborative project aiming to build off of the successes
   of the Blacklight Solr-powered discovery interface and the multi-institutional OpenGeoportal
@@ -257,6 +277,7 @@ files:
 - ".jshintignore"
 - ".jshintrc"
 - ".rubocop.yml"
+- ".solr_wrapper"
 - ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
@@ -310,9 +331,10 @@ files:
 - app/controllers/download_controller.rb
 - app/controllers/wms_controller.rb
 - app/helpers/blacklight_helper.rb
+- app/helpers/carto_helper.rb
 - app/helpers/geoblacklight_helper.rb
 - app/models/concerns/geoblacklight/solr_document.rb
-- app/models/concerns/geoblacklight/solr_document/carto_db.rb
+- app/models/concerns/geoblacklight/solr_document/carto.rb
 - app/models/concerns/geoblacklight/solr_document/finder.rb
 - app/models/concerns/geoblacklight/solr_document/inspection.rb
 - app/models/concerns/geoblacklight/spatial_search_behavior.rb
@@ -349,12 +371,10 @@ files:
 - app/views/download/hgl.html.erb
 - app/views/shared/_header_navbar.html.erb
 - config/initializers/rails_config.rb
-- config/jetty.yml
 - config/locales/geoblacklight.en.yml
 - geoblacklight.gemspec
 - lib/generators/geoblacklight/install_generator.rb
 - lib/generators/geoblacklight/templates/catalog_controller.rb
-- lib/generators/geoblacklight/templates/config/jetty.yml
 - lib/generators/geoblacklight/templates/geoblacklight.js
 - lib/generators/geoblacklight/templates/geoblacklight.scss
 - lib/generators/geoblacklight/templates/settings.yml
@@ -384,15 +404,25 @@ files:
 - lib/geoblacklight/view_helper_override.rb
 - lib/geoblacklight/wms_layer.rb
 - lib/geoblacklight/wms_layer/feature_info_response.rb
-- lib/tasks/configure_solr.rake
 - lib/tasks/geoblacklight.rake
 - schema/geoblacklight-schema.json
 - schema/geoblacklight-schema.md
-- schema/solr/conf/protwords.txt
-- schema/solr/conf/schema.xml
-- schema/solr/conf/solrconfig.xml
-- schema/solr/conf/stopwords_en.txt
-- schema/solr/conf/synonyms.txt
+- solr/conf/_rest_managed.json
+- solr/conf/admin-extra.html
+- solr/conf/elevate.xml
+- solr/conf/mapping-ISOLatin1Accent.txt
+- solr/conf/protwords.txt
+- solr/conf/schema.xml
+- solr/conf/scripts.conf
+- solr/conf/solrconfig.xml
+- solr/conf/spellings.txt
+- solr/conf/stopwords.txt
+- solr/conf/stopwords_en.txt
+- solr/conf/synonyms.txt
+- solr/conf/xslt/example.xsl
+- solr/conf/xslt/example_atom.xsl
+- solr/conf/xslt/example_rss.xsl
+- solr/conf/xslt/luke.xsl
 - spec/controllers/catalog_controller_spec.rb
 - spec/controllers/download_controller_spec.rb
 - spec/factories/user.rb
@@ -431,6 +461,7 @@ files:
 - spec/fixtures/solr_documents/public_iiif_princeton.json
 - spec/fixtures/solr_documents/public_polygon_mit.json
 - spec/fixtures/solr_documents/restricted-line.json
+- spec/helpers/carto_helper_spec.rb
 - spec/helpers/geoblacklight_helpers_spec.rb
 - spec/javascripts/geoblacklight_spec.js
 - spec/javascripts/spec_helper.js
@@ -452,16 +483,18 @@ files:
 - spec/lib/geoblacklight/view_helper_override_spec.rb
 - spec/lib/geoblacklight/wms_layer/feature_info_response_spec.rb
 - spec/lib/geoblacklight/wms_layer_spec.rb
-- spec/models/concerns/geoblacklight/solr_document/carto_db_spec.rb
+- spec/models/concerns/geoblacklight/solr_document/carto_spec.rb
 - spec/models/concerns/geoblacklight/solr_document/finder_spec.rb
 - spec/models/concerns/geoblacklight/solr_document/inspection_spec.rb
 - spec/models/concerns/geoblacklight/solr_document_spec.rb
 - spec/models/concerns/geoblacklight/spatial_search_behavior_spec.rb
 - spec/spec_helper.rb
+- spec/support/backport_test_helpers.rb
 - spec/support/features.rb
 - spec/support/features/session_helpers.rb
 - spec/teaspoon_env.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb
+- spec/test_app_templates/solr_documents
 - spec/views/catalog/_document_split.html.erb_spec.rb
 - spec/views/catalog/_downloads.html.erb_spec.rb
 - spec/views/catalog/_index_split.html.erb_spec.rb
@@ -490,7 +523,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A discovery platform for geospatial holdings
@@ -533,6 +566,7 @@ test_files:
 - spec/fixtures/solr_documents/public_iiif_princeton.json
 - spec/fixtures/solr_documents/public_polygon_mit.json
 - spec/fixtures/solr_documents/restricted-line.json
+- spec/helpers/carto_helper_spec.rb
 - spec/helpers/geoblacklight_helpers_spec.rb
 - spec/javascripts/geoblacklight_spec.js
 - spec/javascripts/spec_helper.js
@@ -554,16 +588,18 @@ test_files:
 - spec/lib/geoblacklight/view_helper_override_spec.rb
 - spec/lib/geoblacklight/wms_layer/feature_info_response_spec.rb
 - spec/lib/geoblacklight/wms_layer_spec.rb
-- spec/models/concerns/geoblacklight/solr_document/carto_db_spec.rb
+- spec/models/concerns/geoblacklight/solr_document/carto_spec.rb
 - spec/models/concerns/geoblacklight/solr_document/finder_spec.rb
 - spec/models/concerns/geoblacklight/solr_document/inspection_spec.rb
 - spec/models/concerns/geoblacklight/solr_document_spec.rb
 - spec/models/concerns/geoblacklight/spatial_search_behavior_spec.rb
 - spec/spec_helper.rb
+- spec/support/backport_test_helpers.rb
 - spec/support/features.rb
 - spec/support/features/session_helpers.rb
 - spec/teaspoon_env.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb
+- spec/test_app_templates/solr_documents
 - spec/views/catalog/_document_split.html.erb_spec.rb
 - spec/views/catalog/_downloads.html.erb_spec.rb
 - spec/views/catalog/_index_split.html.erb_spec.rb