geoblacklight 1.9.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6b5a2a687ebb538b81e612ae973587c11c30f84
-  data.tar.gz: 720dc64d284c889f81d99a8fedbefe83c855b9db
+  metadata.gz: 7f6f7e3ec44252086ea0128a9b13faddaf5803c9
+  data.tar.gz: d7ee0ef4ee9c272ed30ddd3e14a7f90db875a798
 SHA512:
-  metadata.gz: 957e36971bdb8e95eb07ccd6100cb7aca43df15347344088152f6f8fb3d319f02ed31db85dd13e497c757242f4b54753bf9901fbac9591a6d97adb3b9ad987d7
-  data.tar.gz: b45106b0fb306f0e9b950b4a057758d358a650e11a2f681b940cf91de9b98bbccd19b18949bae2d52c9a89b0b4d5a3c74e222a12cd8f53464a3e1afc0435e57e
+  metadata.gz: '04023491e031e0f4cb74eed28c0ee4f77fa83d090031edc46032ce0174e919d4d5bcee5f38b17d2300a769220cff24bceb63ddc9332d11214eba250fdac69a44'
+  data.tar.gz: 1c1f049700647e865452c0f78d81eb51384dbae93e4acdc6f7629e9d628a2821aec02fcd8fdffb81519d9d6eb1a1c4320a17a0d05b43a0e73d9c25b83353dbed

data/.circleci/config.yml

@@ -34,7 +34,7 @@ jobs:
         key: geoblacklight-solr{{ checksum ".solr_wrapper" }}
         paths:
           - tmp/solr
-      # Run specs
+      # Run the test suites
       - run: bundle exec rake ci
       # Store bundle cache
       - type: cache-save
@@ -73,7 +73,7 @@ jobs:
         key: geoblacklight-solr{{ checksum ".solr_wrapper" }}
         paths:
           - tmp/solr
-      # Run specs
+      # Run the test suites
       - run: bundle exec rake ci
       # Store bundle cache
       - type: cache-save

data/.rubocop.yml

@@ -9,6 +9,7 @@ Rails:
   Enabled: true
 
 AllCops:
+  TargetRubyVersion: 2.3
   DisplayCopNames: true
   Include:
   - '**/Rakefile'
@@ -40,6 +41,7 @@ Metrics/LineLength:
   - 'Rakefile'
   - 'lib/generators/geoblacklight/install_generator.rb'
   - 'lib/tasks/geoblacklight.rake'
+  - 'app/models/concerns/geoblacklight/spatial_search_behavior.rb'
 
 Metrics/MethodLength:
   Max: 16
@@ -65,6 +67,7 @@ RSpec/AnyInstance:
     - 'spec/models/concerns/geoblacklight/solr_document_spec.rb'
     - 'spec/helpers/geoblacklight_helper_spec.rb'
     - 'spec/models/concerns/geoblacklight/solr_document/finder_spec.rb'
+    - 'spec/features/download_layer_spec.rb'
 
 # Rubocop bug causes view specs to fail.
 #  https://github.com/nevir/rubocop-rspec/issues/47
@@ -72,20 +75,7 @@ RSpec/DescribeClass:
   Enabled: false
 
 RSpec/ExampleLength:
-  Exclude:
-    - 'spec/views/catalog/_show_downloads.html.erb_spec.rb'
-    - 'spec/features/download_layer_spec.rb'
-    - 'spec/features/home_page_spec.rb'
-    - 'spec/features/index_map_spec.rb'
-    - 'spec/features/metadata_panel_spec.rb'
-    - 'spec/features/saved_searches_spec.rb'
-    - 'spec/features/search_results_map_spec.rb'
-    - 'spec/features/show_page_metadata_spec.rb'
-    - 'spec/features/split_view.html.erb_spec.rb'
-    - 'spec/features/web_services_modal_spec.rb'
-    - 'spec/helpers/geoblacklight_helper_spec.rb'
-    - 'spec/models/concerns/geoblacklight/solr_document/carto_spec.rb'
-    - 'spec/models/concerns/geoblacklight/solr_document/finder_spec.rb'
+  Enabled: false
 
 RSpec/VerifiedDoubles:
   Exclude:

data/.rubocop_todo.yml

@@ -1,16 +1,31 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2018-07-24 14:15:32 -0500 using RuboCop version 0.52.1.
+# on 2018-12-21 14:41:38 -0700 using RuboCop version 0.52.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 17
+# Offense count: 16
 # Cop supports --auto-correct.
 # Configuration parameters: Width, IgnoredPatterns.
 Layout/IndentationWidth:
-  Enabled: false
+  Exclude:
+    - 'app/controllers/download_controller.rb'
+    - 'app/controllers/relation_controller.rb'
+    - 'app/controllers/wms_controller.rb'
+    - 'app/helpers/carto_helper.rb'
+    - 'app/models/concerns/geoblacklight/solr_document.rb'
+    - 'app/models/concerns/geoblacklight/solr_document/finder.rb'
+    - 'lib/geoblacklight/bounding_box.rb'
+    - 'lib/geoblacklight/download.rb'
+    - 'lib/geoblacklight/metadata/base.rb'
+    - 'lib/geoblacklight/metadata/fgdc.rb'
+    - 'lib/geoblacklight/metadata/iso19139.rb'
+    - 'lib/geoblacklight/metadata_transformer/base.rb'
+    - 'lib/geoblacklight/reference.rb'
+    - 'lib/geoblacklight/references.rb'
+    - 'lib/tasks/geoblacklight.rake'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -26,7 +41,7 @@ Lint/UnusedBlockArgument:
   Exclude:
     - 'lib/tasks/geoblacklight.rake'
 
-# Offense count: 37
+# Offense count: 46
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/BlockLength:
   Max: 227
@@ -45,33 +60,14 @@ RSpec/EmptyExampleGroup:
     - 'spec/views/catalog/_document_split.html.erb_spec.rb'
     - 'spec/views/catalog/_index_split.html.erb_spec.rb'
 
-# Offense count: 24
-# Configuration parameters: Max.
-RSpec/ExampleLength:
-  Exclude:
-    - 'spec/features/download_layer_spec.rb'
-    - 'spec/features/home_page_spec.rb'
-    - 'spec/features/index_map_spec.rb'
-    - 'spec/features/metadata_panel_spec.rb'
-    - 'spec/features/saved_searches_spec.rb'
-    - 'spec/features/search_results_map_spec.rb'
-    - 'spec/features/show_page_metadata_spec.rb'
-    - 'spec/features/split_view.html.erb_spec.rb'
-    - 'spec/features/web_services_modal_spec.rb'
-    - 'spec/helpers/geoblacklight_helper_spec.rb'
-    - 'spec/models/concerns/geoblacklight/solr_document/carto_spec.rb'
-    - 'spec/models/concerns/geoblacklight/solr_document/finder_spec.rb'
-    - 'spec/views/catalog/_downloads.html.erb_spec.rb'
-
-# Offense count: 2
+# Offense count: 1
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: implicit, each, example
 RSpec/HookArgument:
   Exclude:
     - 'spec/spec_helper.rb'
-    - 'spec/views/catalog/_downloads.html.erb_spec.rb'
 
-# Offense count: 9
+# Offense count: 8
 RSpec/LeadingSubject:
   Exclude:
     - 'spec/lib/geoblacklight/document_presenter_spec.rb'
@@ -79,15 +75,14 @@ RSpec/LeadingSubject:
     - 'spec/lib/geoblacklight/metadata_transformer/fgdc_spec.rb'
     - 'spec/lib/geoblacklight/metadata_transformer/iso19139_spec.rb'
     - 'spec/lib/geoblacklight/metadata_transformer_spec.rb'
-    - 'spec/models/concerns/geoblacklight/spatial_search_behavior_spec.rb'
 
-# Offense count: 58
+# Offense count: 49
 # Configuration parameters: .
 # SupportedStyles: have_received, receive
 RSpec/MessageSpies:
   EnforcedStyle: receive
 
-# Offense count: 38
+# Offense count: 24
 RSpec/NamedSubject:
   Exclude:
     - 'spec/lib/geoblacklight/metadata/base_spec.rb'
@@ -95,8 +90,6 @@ RSpec/NamedSubject:
     - 'spec/lib/geoblacklight/metadata_transformer/fgdc_spec.rb'
     - 'spec/lib/geoblacklight/metadata_transformer/iso19139_spec.rb'
     - 'spec/lib/geoblacklight/metadata_transformer_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/spatial_search_behavior_spec.rb'
 
@@ -112,24 +105,11 @@ RSpec/RepeatedExample:
   Exclude:
     - 'spec/features/esri_viewer_spec.rb'
 
-# Offense count: 1
+# Offense count: 2
 RSpec/SubjectStub:
   Exclude:
     - 'spec/models/concerns/geoblacklight/spatial_search_behavior_spec.rb'
 
-# Offense count: 12
-# Configuration parameters: IgnoreSymbolicNames.
-RSpec/VerifiedDoubles:
-  Exclude:
-    - 'spec/helpers/geoblacklight_helper_spec.rb'
-    - 'spec/lib/geoblacklight/document_presenter_spec.rb'
-    - 'spec/lib/geoblacklight/download_spec.rb'
-    - 'spec/lib/geoblacklight/geoblacklight_helper_behavior_spec.rb'
-    - 'spec/lib/geoblacklight/wms_layer_spec.rb'
-    - 'spec/models/concerns/geoblacklight/solr_document/finder_spec.rb'
-    - 'spec/models/concerns/geoblacklight/spatial_search_behavior_spec.rb'
-    - 'spec/views/catalog/_downloads.html.erb_spec.rb'
-
 # Offense count: 7
 Rails/FilePath:
   Exclude:
@@ -139,7 +119,7 @@ Rails/FilePath:
     - 'spec/lib/geoblacklight/metadata_transformer/fgdc_spec.rb'
     - 'spec/lib/geoblacklight/metadata_transformer/iso19139_spec.rb'
 
-# Offense count: 6
+# Offense count: 7
 Rails/OutputSafety:
   Exclude:
     - 'app/controllers/download_controller.rb'
@@ -166,6 +146,13 @@ Style/EmptyLiteral:
   Exclude:
     - 'spec/models/concerns/geoblacklight/spatial_search_behavior_spec.rb'
 
+# Offense count: 128
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: when_needed, always, never
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
 # Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
@@ -180,13 +167,23 @@ Style/MethodMissing:
     - 'app/models/concerns/geoblacklight/solr_document.rb'
     - 'lib/geoblacklight/references.rb'
 
-# Offense count: 1
+# Offense count: 2
 # Cop supports --auto-correct.
 Style/MultilineIfModifier:
   Exclude:
+    - 'app/helpers/geoblacklight_helper.rb'
     - 'lib/geoblacklight/references.rb'
 
-# Offense count: 12
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, EnforcedStyle.
+# SupportedStyles: predicate, comparison
+Style/NumericPredicate:
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/geoblacklight/relation/relation_response.rb'
+
+# Offense count: 11
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:
@@ -196,9 +193,15 @@ Style/PercentLiteralDelimiters:
     - 'spec/lib/geoblacklight/document_presenter_spec.rb'
     - 'spec/lib/geoblacklight/references_spec.rb'
     - 'spec/lib/geoblacklight/wms_layer/feature_info_response_spec.rb'
-    - 'spec/models/concerns/geoblacklight/solr_document/finder_spec.rb'
     - 'spec/spec_helper.rb'
 
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: ConvertCodeThatCanStartToReturnNil.
+Style/SafeNavigation:
+  Exclude:
+    - 'app/models/concerns/geoblacklight/solr_document.rb'
+
 # Offense count: 5
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.

data/README.md

@@ -26,6 +26,9 @@ $ rake geoblacklight:server
 Or install with [Docker](https://github.com/geoblacklight/geoblacklight-docker)
 For more information see the [installation guide](https://github.com/geoblacklight/geoblacklight/wiki/Installation)
 
+### Webpacker
+GeoBlacklight can use [Webpacker](https://github.com/rails/webpacker) in order to manage JavaScript dependencies and assets, which requires that either [Yarn](https://yarnpkg.com/) or the [Node Package Manager](https://www.npmjs.com/) be available on the system where this is deployed.  How Webpacker interacts with Rails is overviewed within its own documentation, including [how best to configure JavaScript processing settings](https://github.com/rails/webpacker/blob/master/docs/webpack.md).  We encourage you to review this.
+
 ### Contributing
 Interested in contributing to GeoBlacklight? Please see our [contributing](CONTRIBUTING.md) guide.
 

data/Rakefile

@@ -14,8 +14,6 @@ require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 require 'solr_wrapper/rake_task'
 
-EngineCart.fingerprint_proc = EngineCart.rails_fingerprint_proc
-
 desc 'Run RuboCop style checker'
 RuboCop::RakeTask.new(:rubocop) do |task|
   task.requires << 'rubocop-rspec'
@@ -38,6 +36,7 @@ task ci: ['geoblacklight:generate'] do
     solr.with_collection(name: 'blacklight-core', dir: File.join(File.expand_path('.', File.dirname(__FILE__)), 'solr', 'conf')) do
       within_test_app do
         system 'RAILS_ENV=test rake geoblacklight:index:seed'
+        system 'RAILS_ENV=test bundle exec rails webpacker:compile'
       end
       Rake::Task['geoblacklight:coverage'].invoke
     end

data/app/assets/javascripts/geoblacklight/basemaps.js

@@ -2,7 +2,7 @@
 
 GeoBlacklight.Basemaps = {
   darkMatter: L.tileLayer(
-    'http://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}{retina}.png', {
+    'https://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}{retina}.png', {
       attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="http://carto.com/attributions">Carto</a>',
       maxZoom: 18,
       worldCopyJump: true,
@@ -11,7 +11,7 @@ GeoBlacklight.Basemaps = {
     }
   ),
   positron: L.tileLayer(
-    'http://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{retina}.png', {
+    'https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{retina}.png', {
       attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="http://carto.com/attributions">Carto</a>',
       maxZoom: 18,
       worldCopyJump: true,
@@ -20,7 +20,7 @@ GeoBlacklight.Basemaps = {
     }
   ),
   positronLite: L.tileLayer(
-    'http://{s}.basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}{retina}.png', {
+    'https://{s}.basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}{retina}.png', {
       attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="http://carto.com/attributions">Carto</a>',
       maxZoom: 18,
       worldCopyJump: true,

data/app/assets/javascripts/geoblacklight/downloaders/downloader.js

@@ -10,7 +10,7 @@
       L.Util.setOptions(this, options);
       this.$el = $(el);
       this.options.spinner.hide();
-      $('.exports .panel-heading').append(this.options.spinner);
+      $('.exports .card-header').append(this.options.spinner);
       this.configureHandler();
     },
 

data/app/assets/javascripts/geoblacklight/geoblacklight.js

@@ -21,7 +21,7 @@
 
   var GeoBlacklight = L.Class.extend({
     statics: {
-      __version__: '1.9.1',
+      __version__: '2.0.0',
 
       debounce: function(fn, delay) {
         var timeout = null;

data/app/assets/javascripts/geoblacklight/modules/download.js

@@ -2,7 +2,7 @@ Blacklight.onLoad(function() {
   $('[data-download-path]').each(function(i, element) {
     GeoBlacklight.downloader(element);
   });
-  $('#ajax-modal').on('loaded.blacklight.ajax-modal', function() {
+  $('#blacklight-modal').on('loaded.blacklight.blacklight-modal', function() {
     var modal = this;
     $(this).find('#hglRequest').each(function() {
       GeoBlacklight.hglDownloader(this, { modal: modal });

data/app/assets/javascripts/geoblacklight/modules/home.js

@@ -1,8 +1,9 @@
 Blacklight.onLoad(function() {
   $('[data-map="home"]').each(function(i, element) {
 
-    var geoblacklight = new GeoBlacklight.Viewer.Map(this),
-        data = $(this).data();
+    var geoblacklight = new GeoBlacklight.Viewer.Map(this);
+    var data = $(this).data();
+
     geoblacklight.map.addControl(L.control.geosearch({
       baseUrl: data.catalogPath,
       dynamic: false,

data/app/assets/javascripts/geoblacklight/modules/util.js

@@ -6,6 +6,14 @@ GeoBlacklight.Util = {
     var urlRegEx = /((([A-Za-z]{3,9}:(?:\/\/)?)(?:[\-;:&=\+\$,\w]+@)?[A-Za-z0-9\.\-]+|(?:www\.|[\-;:&=\+\$,\w]+@)[A-Za-z0-9\.\-]+)((?:\/[\+~%\/\.\w\-]*)?\??(?:[\-\+=&;%@\.\w]*)#?(?:[\.\!\/\\\w]*))?)/g;
     return str.toString().replace(urlRegEx, '<a href=\'$1\'>$1</a>');
   },
+  /**
+   * Calls the index map download template
+   * @param {Object} data - GeoJSON feature properties object
+   * @param {requestCallback} cb
+   */
+  indexMapDownloadTemplate: function(data, cb) {
+    cb(HandlebarsTemplates["index_map_download"](data));
+  },
   /**
    * Calls the index map template
    * @param {Object} data - GeoJSON feature properties object

data/app/assets/javascripts/geoblacklight/templates/index_map_download.hbs

@@ -0,0 +1,19 @@
+{{#if downloadUrl}}
+  <li class="list-group-item download js-index-map-feature">
+    <h3 class="card-subtitle">Selected feature</h3>
+
+    <ul class="list-group list-group-flush list-group-nested">
+      <li class="list-group-item download">
+        <div class="download-link-container">
+          <a class="btn btn-default download download-original" href="{{downloadUrl}}">
+            {{#if label}}
+              {{label}}
+            {{else}}
+              Download
+            {{/if}}
+          </a>
+        </div>
+      </li>
+    </ul>
+  </li>
+{{/if}}

data/app/assets/javascripts/geoblacklight/templates/index_map_info.hbs

@@ -1,8 +1,10 @@
 <div class="index-map-info">
   {{#if title}}
-    <h3>{{title}}</h3>
+    <div class="col-sm-12">
+      <h3>{{title}}</h3>
+    </div>
   {{/if}}
-  <div class="">
+  <div class="col-sm-12">
     {{#if thumbnailUrl}}
       {{#if websiteUrl}}
         <a href="{{websiteUrl}}">
@@ -12,26 +14,26 @@
         <img src="{{thumbnailUrl}}">
       {{/if}}
     {{/if}}
-    <dl>
+    <dl class="row dl-invert document-metadata">
       {{#if websiteUrl}}
-        <dt>Website</dt>
-        <dd><a href="{{websiteUrl}}">{{websiteUrl}}</a></dd>
+        <dt class="col-sm-3">Website:</dt>
+        <dd class="col-sm-9"><a href="{{websiteUrl}}">{{websiteUrl}}</a></dd>
       {{/if}}
       {{#if downloadUrl}}
-        <dt>Download</dt>
-        <dd><a href="{{downloadUrl}}">{{downloadUrl}}</a></dd>
+        <dt class="col-sm-3">Download:</dt>
+        <dd class="col-sm-9"><a href="{{downloadUrl}}">{{downloadUrl}}</a></dd>
       {{/if}}
       {{#if recordIdentifier}}
-        <dt>Record Identifier</dt>
-        <dd>{{recordIdentifier}}</dd>
+        <dt class="col-sm-3">Record Identifier:</dt>
+        <dd class="col-sm-9">{{recordIdentifier}}</dd>
       {{/if}}
       {{#if label}}
-        <dt>Label</dt>
-        <dd>{{label}}</dd>
+        <dt class="col-sm-3">Label:</dt>
+        <dd class="col-sm-9">{{label}}</dd>
       {{/if}}
       {{#if note}}
-        <dt>Note</dt>
-        <dd>{{note}}</dd>
+        <dt class="col-sm-3">Note:</dt>
+        <dd class="col-sm-9">{{note}}</dd>
       {{/if}}
     </dl>
   </div>