geoblacklight 4.0.0.pre.alpha.1 → 4.0.0.pre.rc1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (205) hide show
  1. checksums.yaml +4 -4
  2. data/.github/ISSUE_TEMPLATE.md +1 -1
  3. data/.github/workflows/ruby.yml +32 -64
  4. data/.gitignore +1 -0
  5. data/.rubocop.yml +6 -6
  6. data/.rubocop_todo.yml +0 -3
  7. data/.solr_wrapper +1 -0
  8. data/README.md +1 -4
  9. data/Rakefile +0 -1
  10. data/app/assets/images/blacklight/child-item.svg +3 -0
  11. data/app/assets/images/blacklight/collections.svg +4 -0
  12. data/app/assets/images/blacklight/datasets.svg +7 -0
  13. data/app/assets/images/blacklight/geoblacklight-icons.json +363 -332
  14. data/app/assets/images/blacklight/imagery.svg +4 -0
  15. data/app/assets/images/blacklight/maps.svg +4 -0
  16. data/app/assets/images/blacklight/michigan-state-university.svg +0 -1
  17. data/app/assets/images/blacklight/parent-item.svg +3 -0
  18. data/app/assets/images/blacklight/pennsylvania-state-university.svg +0 -1
  19. data/app/assets/images/blacklight/purdue-university.svg +0 -1
  20. data/app/assets/images/blacklight/the-ohio-state-university.svg +0 -1
  21. data/app/assets/images/blacklight/university-of-chicago.svg +0 -1
  22. data/app/assets/images/blacklight/university-of-colorado-boulder.svg +6 -0
  23. data/app/assets/images/blacklight/university-of-illinois-urbana-champaign.svg +0 -1
  24. data/app/assets/images/blacklight/university-of-iowa.svg +0 -1
  25. data/app/assets/images/blacklight/university-of-maryland.svg +0 -1
  26. data/app/assets/images/blacklight/university-of-michigan.svg +0 -1
  27. data/app/assets/images/blacklight/university-of-minnesota.svg +0 -1
  28. data/app/assets/images/blacklight/university-of-nebraska-lincoln.svg +0 -1
  29. data/app/assets/images/blacklight/university-of-wisconsin-madison.svg +0 -1
  30. data/app/assets/images/blacklight/websites.svg +4 -0
  31. data/app/assets/javascripts/geoblacklight/controls/fullscreen.js +8 -0
  32. data/app/assets/javascripts/geoblacklight/geoblacklight.js +2 -1
  33. data/app/assets/javascripts/geoblacklight/viewers/esri.js +1 -0
  34. data/app/assets/javascripts/geoblacklight/viewers/index_map.js +1 -0
  35. data/app/assets/javascripts/geoblacklight/viewers/tilejson.js +33 -0
  36. data/app/assets/javascripts/geoblacklight/viewers/tms.js +2 -2
  37. data/app/assets/javascripts/geoblacklight/viewers/viewer.js +3 -0
  38. data/app/assets/javascripts/geoblacklight/viewers/wms.js +2 -2
  39. data/app/assets/javascripts/geoblacklight/viewers/wmts.js +85 -0
  40. data/app/assets/javascripts/geoblacklight/viewers/xyz.js +10 -0
  41. data/app/assets/stylesheets/geoblacklight/geoblacklight.scss +1 -0
  42. data/app/assets/stylesheets/geoblacklight/modules/_base.scss +0 -1
  43. data/app/assets/stylesheets/geoblacklight/modules/_styles.scss +5 -1
  44. data/app/assets/stylesheets/geoblacklight/modules/downloads.scss +20 -47
  45. data/app/assets/stylesheets/geoblacklight/modules/index_maps.scss +68 -0
  46. data/app/assets/stylesheets/geoblacklight/modules/item.scss +16 -0
  47. data/app/assets/stylesheets/geoblacklight/modules/modal.scss +6 -0
  48. data/app/assets/stylesheets/geoblacklight/modules/sidebar.scss +4 -0
  49. data/app/components/geoblacklight/icon_facet_item_component.rb +33 -0
  50. data/app/helpers/geoblacklight_helper.rb +6 -45
  51. data/app/models/concerns/geoblacklight/bbox_filter_field.rb +45 -0
  52. data/app/models/concerns/geoblacklight/bbox_filter_query.rb +50 -0
  53. data/app/models/concerns/geoblacklight/solr_document.rb +1 -1
  54. data/app/models/concerns/geoblacklight/suppressed_records_search_behavior.rb +26 -0
  55. data/app/presenters/geoblacklight/bbox_item_presenter.rb +9 -0
  56. data/app/views/catalog/_downloads_collapse.html.erb +27 -0
  57. data/app/views/catalog/_header_icons.html.erb +2 -2
  58. data/app/views/catalog/_index_split_default.html.erb +2 -2
  59. data/app/views/catalog/_show_default_viewer_container.html.erb +17 -0
  60. data/app/views/catalog/_show_downloads.html.erb +10 -21
  61. data/app/views/catalog/_show_sidebar.html.erb +3 -0
  62. data/app/views/catalog/_show_web_services.html.erb +11 -0
  63. data/app/views/catalog/_web_services.html.erb +3 -2
  64. data/app/views/catalog/web_services.html.erb +1 -1
  65. data/app/views/relation/_relations.html.erb +1 -1
  66. data/app/views/relation/index.html.erb +1 -1
  67. data/config/locales/geoblacklight.en.yml +4 -1
  68. data/geoblacklight.gemspec +6 -6
  69. data/lib/generators/geoblacklight/install_generator.rb +1 -1
  70. data/lib/generators/geoblacklight/templates/assets/_customizations.scss +5 -4
  71. data/lib/generators/geoblacklight/templates/assets/application.scss +0 -3
  72. data/lib/generators/geoblacklight/templates/catalog_controller.rb +74 -56
  73. data/lib/generators/geoblacklight/templates/settings.gbl_v1.yml +5 -5
  74. data/lib/generators/geoblacklight/templates/settings.yml +36 -23
  75. data/lib/geoblacklight/bounding_box.rb +4 -0
  76. data/lib/geoblacklight/constants.rb +3 -0
  77. data/lib/geoblacklight/engine.rb +3 -2
  78. data/lib/geoblacklight/faraday_middleware/follow_redirects.rb +176 -0
  79. data/lib/geoblacklight/item_viewer.rb +13 -1
  80. data/lib/geoblacklight/metadata/base.rb +2 -1
  81. data/lib/geoblacklight/version.rb +1 -1
  82. data/lib/geoblacklight/view_helper_override.rb +2 -28
  83. data/lib/geoblacklight.rb +0 -10
  84. data/lib/tasks/geoblacklight.rake +1 -1
  85. data/schema/geoblacklight-schema-aardvark.json +3 -23
  86. data/solr/conf/schema.xml +37 -43
  87. data/solr/conf/solrconfig.xml +17 -17
  88. data/spec/components/geoblacklight/icon_facet_item_component_spec.rb +17 -0
  89. data/spec/controllers/catalog_controller_spec.rb +1 -1
  90. data/spec/features/download_layer_spec.rb +31 -14
  91. data/spec/features/esri_viewer_spec.rb +5 -1
  92. data/spec/features/full_screen_controll_spec.rb +15 -0
  93. data/spec/features/home_page_spec.rb +2 -2
  94. data/spec/features/index_map_spec.rb +2 -2
  95. data/spec/features/missing_metadata_spec.rb +1 -1
  96. data/spec/features/multiple_downloads_spec.rb +2 -1
  97. data/spec/features/relations_spec.rb +1 -1
  98. data/spec/features/saved_searches_spec.rb +1 -1
  99. data/spec/features/search_results_complex_geometry_spec.rb +24 -0
  100. data/spec/features/search_results_icons_spec.rb +16 -0
  101. data/spec/features/search_results_map_spec.rb +2 -2
  102. data/spec/features/search_spec.rb +22 -0
  103. data/spec/features/show_page_download_spec.rb +29 -0
  104. data/spec/features/show_page_metadata_spec.rb +2 -2
  105. data/spec/features/split_view.html.erb_spec.rb +12 -1
  106. data/spec/features/tilejson_spec.rb +22 -0
  107. data/spec/features/tms_spec.rb +2 -2
  108. data/spec/features/web_services_modal_spec.rb +35 -2
  109. data/spec/features/wmts_spec.rb +34 -0
  110. data/spec/features/xyz_spec.rb +10 -0
  111. data/spec/fixtures/manifests/tilejson.json +21 -0
  112. data/spec/fixtures/manifests/wmts-multiple.xml +813 -0
  113. data/spec/fixtures/manifests/wmts-single.xml +126 -0
  114. data/spec/fixtures/solr_documents/README.md +46 -43
  115. data/spec/fixtures/solr_documents/actual-papermap1.json +2 -1
  116. data/spec/fixtures/solr_documents/actual-point1.json +2 -1
  117. data/spec/fixtures/solr_documents/actual-polygon1.json +2 -1
  118. data/spec/fixtures/solr_documents/actual-raster1.json +3 -2
  119. data/spec/fixtures/solr_documents/baruch_ancestor1.json +2 -1
  120. data/spec/fixtures/solr_documents/baruch_ancestor2.json +2 -1
  121. data/spec/fixtures/solr_documents/baruch_documentation_download.json +1 -1
  122. data/spec/fixtures/solr_documents/bbox-spans-180.json +2 -1
  123. data/spec/fixtures/solr_documents/cornell_html_metadata.json +4 -3
  124. data/spec/fixtures/solr_documents/esri-dynamic-layer-all-layers.json +3 -2
  125. data/spec/fixtures/solr_documents/esri-dynamic-layer-single-layer.json +3 -2
  126. data/spec/fixtures/solr_documents/esri-feature-layer.json +2 -1
  127. data/spec/fixtures/solr_documents/esri-image-map-layer.json +3 -2
  128. data/spec/fixtures/solr_documents/esri-tiled_map_layer.json +2 -1
  129. data/spec/fixtures/solr_documents/esri-wms-layer.json +2 -1
  130. data/spec/fixtures/solr_documents/harvard_raster.json +3 -2
  131. data/spec/fixtures/solr_documents/iiif-eastern-hemisphere.json +3 -2
  132. data/spec/fixtures/solr_documents/index-map-polygon-no-downloadurl.json +2 -1
  133. data/spec/fixtures/solr_documents/index-map-polygon.json +2 -1
  134. data/spec/fixtures/solr_documents/index-map-stanford.json +2 -1
  135. data/spec/fixtures/solr_documents/index_map_point.json +3 -2
  136. data/spec/fixtures/solr_documents/metadata_no_provider.json +2 -1
  137. data/spec/fixtures/solr_documents/multiple-downloads.json +3 -2
  138. data/spec/fixtures/solr_documents/no_spatial.json +1 -4
  139. data/spec/fixtures/solr_documents/oembed.json +2 -1
  140. data/spec/fixtures/solr_documents/princeton-child1.json +3 -2
  141. data/spec/fixtures/solr_documents/princeton-child2.json +3 -2
  142. data/spec/fixtures/solr_documents/princeton-child3.json +2 -1
  143. data/spec/fixtures/solr_documents/princeton-child4.json +3 -2
  144. data/spec/fixtures/solr_documents/princeton-parent.json +5 -3
  145. data/spec/fixtures/solr_documents/public_direct_download.json +2 -1
  146. data/spec/fixtures/solr_documents/public_iiif_princeton.json +3 -2
  147. data/spec/fixtures/solr_documents/public_polygon_mit.json +2 -1
  148. data/spec/fixtures/solr_documents/restricted-line.json +2 -1
  149. data/spec/fixtures/solr_documents/tilejson.json +48 -0
  150. data/spec/fixtures/solr_documents/tms.json +15 -18
  151. data/spec/fixtures/solr_documents/umn_metro_result1.json +5 -3
  152. data/spec/fixtures/solr_documents/umn_state_result1.json +3 -2
  153. data/spec/fixtures/solr_documents/umn_state_result2.json +3 -5
  154. data/spec/fixtures/solr_documents/uva_slug_colon.json +2 -1
  155. data/spec/fixtures/solr_documents/wmts-multiple.json +41 -0
  156. data/spec/fixtures/solr_documents/wmts-single-layer.json +48 -0
  157. data/spec/fixtures/solr_documents/xyz.json +46 -0
  158. data/spec/helpers/geoblacklight_helper_spec.rb +12 -35
  159. data/spec/lib/geoblacklight/document_presenter_spec.rb +3 -3
  160. data/spec/lib/geoblacklight/download/geojson_download_spec.rb +1 -1
  161. data/spec/lib/geoblacklight/download/geotiff_download_spec.rb +1 -1
  162. data/spec/lib/geoblacklight/download/kmz_download_spec.rb +1 -1
  163. data/spec/lib/geoblacklight/download/shapefile_download_spec.rb +1 -1
  164. data/spec/lib/geoblacklight/download_spec.rb +2 -2
  165. data/spec/lib/geoblacklight/metadata/base_spec.rb +19 -1
  166. data/spec/lib/geoblacklight/references_spec.rb +1 -1
  167. data/spec/lib/geoblacklight/relation/relation_response_spec.rb +5 -0
  168. data/spec/lib/geoblacklight/view_helper_override_spec.rb +0 -10
  169. data/spec/models/concerns/geoblacklight/bbox_filter_field_spec.rb +77 -0
  170. data/spec/models/concerns/geoblacklight/bbox_filter_query_spec.rb +105 -0
  171. data/spec/models/concerns/geoblacklight/solr_document/inspection_spec.rb +2 -1
  172. data/spec/models/concerns/geoblacklight/suppressed_records_search_behavior_spec.rb +31 -0
  173. data/spec/presenters/geoblacklight/bbox_item_presenter_spec.rb +36 -0
  174. data/spec/spec_helper.rb +6 -1
  175. data/spec/test_app_templates/Gemfile.extra +1 -0
  176. data/spec/test_app_templates/lib/generators/test_app_generator.rb +4 -4
  177. data/spec/views/catalog/_show_downloads.html.erb_spec.rb +5 -5
  178. data/template.rb +2 -4
  179. data/vendor/assets/images/fullscreen.png +0 -0
  180. data/vendor/assets/images/fullscreen@2x.png +0 -0
  181. data/vendor/assets/javascripts/Leaflet.fullscreen.js +152 -0
  182. data/vendor/assets/javascripts/esri-leaflet.js +10 -3
  183. data/vendor/assets/javascripts/esri-leaflet.js.map +1 -1
  184. data/vendor/assets/javascripts/leaflet-iiif.js +39 -18
  185. data/vendor/assets/javascripts/leaflet-src.js.erb +14062 -0
  186. data/vendor/assets/javascripts/leaflet-src.js.map +1 -1
  187. data/vendor/assets/stylesheets/leaflet.css +640 -634
  188. data/vendor/assets/stylesheets/leaflet.fullscreen.css +40 -0
  189. metadata +91 -46
  190. data/app/models/concerns/geoblacklight/spatial_search_behavior.rb +0 -71
  191. data/app/views/catalog/_download_generated_link.html.erb +0 -4
  192. data/app/views/catalog/_download_link.html.erb +0 -3
  193. data/app/views/catalog/_downloads_generated.html.erb +0 -6
  194. data/app/views/catalog/_downloads_primary.html.erb +0 -21
  195. data/app/views/catalog/_downloads_secondary.html.erb +0 -39
  196. data/app/views/catalog/_icon_facet.html.erb +0 -16
  197. data/bin/coverage.rb +0 -36
  198. data/lib/generators/geoblacklight/templates/Procfile +0 -3
  199. data/lib/generators/geoblacklight/templates/package.json +0 -14
  200. data/lib/generators/geoblacklight/templates/webpacker.yml +0 -67
  201. data/lib/generators/geoblacklight/webpacker_generator.rb +0 -36
  202. data/lib/geoblacklight/catalog_helper_override.rb +0 -14
  203. data/spec/models/concerns/geoblacklight/spatial_search_behavior_spec.rb +0 -97
  204. data/vendor/assets/javascripts/leaflet.js.erb +0 -13922
  205. data/vendor/assets/stylesheets/leaflet-label.css +0 -54
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: d502418a98a00cc58de5824dbc9f79ac002f4e301bd994714ab0603422317fff
4
- data.tar.gz: 353d8af1637ab4e6143ef29b660b032ac26d8f76cb02f2a5fe0fdc043ad8c91d
3
+ metadata.gz: e35f0dd973e0bd06a6e80c4b2c10df2603312a4b2a8e8a750a57e3a289929a82
4
+ data.tar.gz: addf3e2ca5fc2f91d4a99f96181949c3f85bfa928b1574a3128e3fcbc0856a57
5
5
  SHA512:
6
- metadata.gz: 2e06534fad43010d8999c9129be281de983978859fe1004c0913c77606c76add0c081e1d09d9b0fe57d5e3a08c97120108a95e17700c414a300983487d0e3358
7
- data.tar.gz: ecc3612e861656a526ce2fe0312dcff12f15d2deccbb36aac048365e7a54f28bbb2e7fe984cd60d4ecdefd806e5fe3aa4392a882334f9d40e79ee79bb96d045d
6
+ metadata.gz: 994da847b15fd940b705e1abf1c68a339384533bc4fee4221fa9af5550a8f4034fa7204c0d43624221e7ef1e78dc19dd45770bf68d7f202b1a322658a3d4893f
7
+ data.tar.gz: c1817f025bff6255c3ee0b9576864c3d97855bd3a4f6f7754962b8054a31d1066d114ed18edf53d7d2bd66b0c0f449022abe9b5a0634c5007c3878af5b114ddc
@@ -1,6 +1,6 @@
1
1
  ### Descriptive summary
2
2
 
3
- Include what version of GeoBlacklight related to this issue (1.3.0, master, etc.) if appropriate, and any relevant tracebacks if you're reporting a bug.
3
+ Include what version of GeoBlacklight related to this issue (1.3.0, main, etc.) if appropriate, and any relevant tracebacks if you're reporting a bug.
4
4
 
5
5
  ### Expected behavior
6
6
 
@@ -1,6 +1,10 @@
1
1
  name: CI
2
2
 
3
- on: [push]
3
+ on:
4
+ push:
5
+ branches:
6
+ - main
7
+ pull_request:
4
8
 
5
9
  jobs:
6
10
  rubocop:
@@ -16,34 +20,15 @@ jobs:
16
20
  - name: Run linter
17
21
  run: bundle exec rake rubocop
18
22
 
19
- coverage:
20
- runs-on: ubuntu-latest
21
- needs: test
22
- steps:
23
- - uses: actions/checkout@v2
24
-
25
- - name: Set up Ruby
26
- uses: ruby/setup-ruby@v1
27
- with:
28
- ruby-version: 2.7
29
-
30
- - name: Install dependencies
31
- run: bundle install
32
-
33
- - name: Download coverage artifacts
34
- uses: actions/download-artifact@v2
35
- with:
36
- name: coverage
37
- path: coverage_results
38
-
39
- - name: Run coverage report
40
- run: RAILS_ENV=test bundle exec ruby ./bin/coverage.rb
41
-
42
23
  test:
43
24
  runs-on: ubuntu-latest
44
25
  strategy:
45
26
  matrix:
46
- ruby: [2.7, 3.0]
27
+ ruby: [2.7, '3.0']
28
+ faraday_version: ['']
29
+ include:
30
+ - ruby: 2.7
31
+ faraday_version: '~> 1.0'
47
32
  steps:
48
33
  - uses: actions/checkout@v2
49
34
 
@@ -55,8 +40,17 @@ jobs:
55
40
  - name: Create Solr container
56
41
  run: docker run -d -p 8983:8983 geoblacklight/solr:8.9-v1.0.0 server/scripts/ci-start.sh
57
42
 
43
+ - name: Install bundler
44
+ run: gem install bundler -v 2.1.1
45
+
58
46
  - name: Install dependencies
59
- run: bundle install
47
+ run: bundle _2.1.1_ install
48
+ env:
49
+ rails_version: 7.0.1
50
+ FARADAY_VERSION: ${{ matrix.faraday_version }}
51
+
52
+ - name: Setup Yarn
53
+ run: exec "yarnpkg"
60
54
 
61
55
  - name: Load config into solr
62
56
  run: |
@@ -68,16 +62,19 @@ jobs:
68
62
  - name: Run tests
69
63
  run: bundle exec rake ci
70
64
  env:
65
+ rails_version: 7.0.1
71
66
  ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
72
67
  SOLR_URL: http://solr:SolrRocks@localhost:8983/solr/blacklight-core
68
+ FARADAY_VERSION: ${{ matrix.faraday_version }}
73
69
 
74
70
  - name: Upload coverage artifacts
75
71
  uses: actions/upload-artifact@v2
72
+ if: always()
76
73
  with:
77
74
  name: coverage
78
75
  path: coverage/
79
76
 
80
- test_rails6_0:
77
+ test_rails6_1:
81
78
  runs-on: ubuntu-latest
82
79
  strategy:
83
80
  matrix:
@@ -93,45 +90,16 @@ jobs:
93
90
  - name: Create Solr container
94
91
  run: docker run -d -p 8983:8983 geoblacklight/solr:8.9-v1.0.0 server/scripts/ci-start.sh
95
92
 
96
- - name: Install dependencies
97
- run: bundle install
98
- env:
99
- RAILS_VERSION: 6.0.3.4
100
-
101
- - name: Load config into solr
102
- run: |
103
- cd solr/conf
104
- zip -1 -r solr_config.zip ./*
105
- curl -H "Content-type:application/octet-stream" --data-binary @solr_config.zip "http://solr:SolrRocks@127.0.0.1:8983/solr/admin/configs?action=UPLOAD&name=blacklight"
106
- curl -H 'Content-type: application/json' http://solr:SolrRocks@127.0.0.1:8983/api/collections/ -d '{create: {name: blacklight-core, config: blacklight, numShards: 1}}'
107
-
108
- - name: Run tests
109
- run: bundle exec rake ci
110
- env:
111
- RAILS_VERSION: 6.0.3.4
112
- ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
113
- SOLR_URL: http://solr:SolrRocks@localhost:8983/solr/blacklight-core
114
-
115
- test_rails5_2:
116
- runs-on: ubuntu-latest
117
- strategy:
118
- matrix:
119
- ruby: [2.6]
120
- steps:
121
- - uses: actions/checkout@v2
122
-
123
- - name: Set up Ruby
124
- uses: ruby/setup-ruby@v1
125
- with:
126
- ruby-version: ${{ matrix.ruby }}
127
-
128
- - name: Create Solr container
129
- run: docker run -d -p 8983:8983 geoblacklight/solr:8.9-v1.0.0 server/scripts/ci-start.sh
93
+ - name: Install bundler
94
+ run: gem install bundler -v 2.1.1
130
95
 
131
96
  - name: Install dependencies
132
- run: bundle install
97
+ run: bundle _2.1.1_ install
133
98
  env:
134
- RAILS_VERSION: 5.2.6
99
+ RAILS_VERSION: 6.1.4.4
100
+
101
+ - name: Setup Yarn
102
+ run: exec "yarnpkg"
135
103
 
136
104
  - name: Load config into solr
137
105
  run: |
@@ -143,6 +111,6 @@ jobs:
143
111
  - name: Run tests
144
112
  run: bundle exec rake ci
145
113
  env:
146
- RAILS_VERSION: 5.2.6
114
+ RAILS_VERSION: 6.1.4.4
147
115
  ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
148
116
  SOLR_URL: http://solr:SolrRocks@localhost:8983/solr/blacklight-core
data/.gitignore CHANGED
@@ -17,6 +17,7 @@ test/version_tmp
17
17
  tmp
18
18
  jetty
19
19
  .internal_test_app
20
+ .tool-versions
20
21
  # Ignore byebug history
21
22
  .byebug_history
22
23
  .DS_Store
data/.rubocop.yml CHANGED
@@ -7,7 +7,7 @@ inherit_from: .rubocop_todo.yml
7
7
  AllCops:
8
8
  TargetRubyVersion: 2.7
9
9
  DisplayCopNames: true
10
- NewCops: pending
10
+ NewCops: enable
11
11
  Exclude:
12
12
  - '.internal_test_app/**/*'
13
13
  - 'db/**/*'
@@ -31,6 +31,7 @@ Layout/DotPosition:
31
31
  Layout/LineLength:
32
32
  Max: 115
33
33
  Exclude:
34
+ - 'app/models/concerns/geoblacklight/bbox_filter_query.rb'
34
35
  - 'app/models/concerns/geoblacklight/spatial_search_behavior.rb'
35
36
  - 'bin/coverage.rb'
36
37
  - 'lib/generators/geoblacklight/install_generator.rb'
@@ -59,11 +60,6 @@ Metrics/ModuleLength:
59
60
  Style/Documentation:
60
61
  Enabled: false
61
62
 
62
- # Overrides method in blacklight. Must use method name.
63
- Naming/PredicateName:
64
- Exclude:
65
- - 'lib/geoblacklight/view_helper_override.rb'
66
-
67
63
  # geoblacklight references in solr_document_spec are
68
64
  # difficult to mock because of the use of 'method_missing'.
69
65
  # https://relishapp.com/rspec/rspec-mocks/docs/verifying-doubles/dynamic-classes
@@ -90,6 +86,10 @@ RSpec/VerifiedDoubles:
90
86
  - 'spec/lib/geoblacklight/download/hgl_download_spec.rb'
91
87
  - 'spec/lib/geoblacklight/document_presenter_spec.rb'
92
88
 
89
+ # TODO: Investigate use of OpenStruct in specs
90
+ Style/OpenStructUse:
91
+ Enabled: false
92
+
93
93
  Style/SignalException:
94
94
  EnforcedStyle: semantic
95
95
 
data/.rubocop_todo.yml CHANGED
@@ -29,7 +29,6 @@ Layout/EmptyLineAfterGuardClause:
29
29
  - 'lib/geoblacklight/item_viewer.rb'
30
30
  - 'lib/geoblacklight/metadata/base.rb'
31
31
  - 'lib/geoblacklight/references.rb'
32
- - 'lib/geoblacklight/view_helper_override.rb'
33
32
 
34
33
  # Offense count: 141
35
34
  # Cop supports --auto-correct.
@@ -266,7 +265,6 @@ RSpec/NestedGroups:
266
265
  RSpec/PredicateMatcher:
267
266
  Exclude:
268
267
  - 'spec/lib/geoblacklight/download_spec.rb'
269
- - 'spec/lib/geoblacklight/view_helper_override_spec.rb'
270
268
  - 'spec/lib/geoblacklight/wms_layer/feature_info_response_spec.rb'
271
269
  - 'spec/models/concerns/geoblacklight/solr_document/inspection_spec.rb'
272
270
  - 'spec/models/concerns/geoblacklight/solr_document_spec.rb'
@@ -333,7 +331,6 @@ Rails/OutputSafety:
333
331
  Style/ExpandPathArguments:
334
332
  Exclude:
335
333
  - 'lib/generators/geoblacklight/install_generator.rb'
336
- - 'lib/generators/geoblacklight/webpacker_generator.rb'
337
334
  - 'spec/spec_helper.rb'
338
335
  - 'spec/support/features.rb'
339
336
  - 'spec/test_app_templates/lib/generators/test_app_generator.rb'
data/.solr_wrapper CHANGED
@@ -1,4 +1,5 @@
1
1
  validate: false
2
+ instance_dir: tmp/solr
2
3
  download_dir: tmp/solr
3
4
  collection:
4
5
  dir: solr/conf/
data/README.md CHANGED
@@ -1,6 +1,6 @@
1
1
  # GeoBlacklight
2
2
 
3
- ![CI](https://github.com/geoblacklight/geoblacklight/actions/workflows/ruby.yml/badge.svg) | [![Coverage Status](https://raw.githubusercontent.com/geoblacklight/geoblacklight/coverage-badge/coverage.svg)]() | [![Gem Version](https://img.shields.io/gem/v/geoblacklight.svg)](https://github.com/geoblacklight/geoblacklight/releases)
3
+ ![CI](https://github.com/geoblacklight/geoblacklight/actions/workflows/ruby.yml/badge.svg) | [![Coverage Status](https://img.shields.io/badge/coverage-100%25-brightgreen)]() | [![Gem Version](https://img.shields.io/gem/v/geoblacklight.svg)](https://github.com/geoblacklight/geoblacklight/releases)
4
4
 
5
5
  GeoBlacklight is a world-class discovery platform for geospatial (GIS) holdings. It
6
6
  is an open collaborative project aiming to build off of the successes
@@ -25,9 +25,6 @@ $ rake geoblacklight:server
25
25
 
26
26
  Note that this method launches an application that does not have any fixture records to be examined. You may want to launch a test application that has fixture data loaded into a Solr core. If so, refer to the [development guide](https://github.com/geoblacklight/geoblacklight/wiki/Development). For further information on installing a blank app, see the [installation guide](https://github.com/geoblacklight/geoblacklight/wiki/Installation)
27
27
 
28
- ### Webpacker
29
- 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). We encourage you to review this.
30
-
31
28
  ### Contributing
32
29
  Interested in contributing to GeoBlacklight? Please see our [contributing](CONTRIBUTING.md) guide.
33
30
 
data/Rakefile CHANGED
@@ -35,7 +35,6 @@ desc 'Run test suite'
35
35
  task ci: ['geoblacklight:generate'] do
36
36
  within_test_app do
37
37
  system 'RAILS_ENV=test rake geoblacklight:index:seed'
38
- system 'RAILS_ENV=test bundle exec rails webpacker:compile'
39
38
  end
40
39
 
41
40
  # Run RSpec tests with Coverage
@@ -0,0 +1,3 @@
1
+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28">
2
+ <path fill="#6c757d" d="M20 11a1 1 0 0 0-1-1c-5.53 0-9.1 2.31-12.7 6.3a1 1 0 0 0-.3.7 1 1 0 1 0 1.7.7c.77-.68 1.46-1.43 2.2-2.14C12.74 13.01 15.17 12 19 12a1 1 0 0 0 1-1zm8-3.1c0 1-.1 2.02-.31 3.02-1 4.86-4.13 8.02-8.47 10.17a15.33 15.33 0 0 1-6.85 1.7c-1.5 0-3.04-.26-4.46-.74-.75-.25-2.25-1.24-2.88-1.24-.78 0-1.72 3.19-3.08 3.19-.98 0-1.28-.48-1.7-1.2-.14-.27-.25-.36-.25-.7 0-1.62 3.1-2.88 3.1-3.79 0-.14-.41-.97-.48-1.28a9.35 9.35 0 0 1-.14-1.62c0-4.97 3.96-8.52 8.4-9.99 3.2-1.06 10.01.17 12.18-1.89.86-.8 1.28-1.53 2.6-1.53C27.42 2 28 6.58 28 7.9z"/>
3
+ </svg>
@@ -0,0 +1,4 @@
1
+ <!-- Generated by IcoMoon.io -->
2
+ <svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
3
+ <path fill="#6c757d" d="M2 28c0 1.106 0.894 2 2 2h24c1.106 0 2-0.894 2-2v-18h-28v18zM12 14.75c0-0.412 0.338-0.75 0.75-0.75h6.5c0.413 0 0.75 0.338 0.75 0.75v0.5c0 0.412-0.337 0.75-0.75 0.75h-6.5c-0.412 0-0.75-0.338-0.75-0.75v-0.5zM30 2h-28c-1.106 0-2 0.894-2 2v3c0 0.55 0.45 1 1 1h30c0.55 0 1-0.45 1-1v-3c0-1.106-0.894-2-2-2z"></path>
4
+ </svg>
@@ -0,0 +1,7 @@
1
+ <!-- Generated by IcoMoon.io -->
2
+ <svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="30" height="32" viewBox="0 0 30 32">
3
+ <path fill="none" stroke="#6c757d" stroke-linejoin="miter" stroke-linecap="butt" stroke-miterlimit="4" stroke-width="1.72" d="M0.86 10.9h4.2v4.17h-4.2v-4.17zM16.87 10.9h4.2v4.17h-4.2v-4.17zM0.86 26.89h4.2v4.22h-4.2v-4.22zM16.87 26.89h4.2v4.22h-4.2v-4.22z"></path>
4
+ <path fill="none" stroke="#6c757d" stroke-linejoin="miter" stroke-linecap="butt" stroke-miterlimit="4" stroke-width="3.44" d="M5.020 13.060h11.78M5.020 29.56h11.78M18.94 26.83v-11.76M3.010 26.83v-11.76"></path>
5
+ <path fill="none" stroke="#6c757d" stroke-linejoin="miter" stroke-linecap="butt" stroke-miterlimit="4" stroke-width="1.72" d="M8.75 0.86h4.2v4.16h-4.2v-4.16zM24.76 0.86h4.2v4.16h-4.2v-4.16zM8.75 16.84h4.2v4.23h-4.2v-4.23zM24.76 16.84h4.2v4.22h-4.2v-4.22z"></path>
6
+ <path fill="none" stroke="#6c757d" stroke-linejoin="miter" stroke-linecap="butt" stroke-miterlimit="4" stroke-width="3.44" d="M12.91 3.010h11.77M12.91 19.52h11.77M26.83 16.79v-11.77M10.9 16.79v-11.77"></path>
7
+ </svg>