geoblacklight 3.2.0 → 4.0.0.pre.alpha

Sign up to get free protection for your applications and to get access to all the features.
Files changed (190) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/ruby.yml +148 -0
  3. data/.gitignore +8 -0
  4. data/.rubocop.yml +14 -10
  5. data/.rubocop_todo.yml +361 -26
  6. data/README.md +3 -3
  7. data/Rakefile +19 -12
  8. data/app/assets/images/blacklight/michigan-state-university.svg +6 -0
  9. data/app/assets/images/blacklight/pennsylvania-state-university.svg +6 -0
  10. data/app/assets/images/blacklight/purdue-university.svg +6 -0
  11. data/app/assets/images/blacklight/the-ohio-state-university.svg +7 -0
  12. data/app/assets/images/blacklight/university-of-chicago.svg +6 -0
  13. data/app/assets/images/blacklight/university-of-illinois-urbana-champaign.svg +6 -0
  14. data/app/assets/images/blacklight/university-of-iowa.svg +5 -0
  15. data/app/assets/images/blacklight/university-of-maryland.svg +5 -0
  16. data/app/assets/images/blacklight/university-of-michigan.svg +5 -0
  17. data/app/assets/images/blacklight/university-of-minnesota.svg +5 -0
  18. data/app/assets/images/blacklight/university-of-nebraska-lincoln.svg +8 -0
  19. data/app/assets/images/blacklight/university-of-wisconsin-madison.svg +5 -0
  20. data/app/assets/images/favicon.ico +0 -0
  21. data/app/assets/javascripts/geoblacklight/geoblacklight.js +18 -1
  22. data/app/assets/javascripts/geoblacklight/modules/bookmarks.js +43 -0
  23. data/app/assets/javascripts/geoblacklight/modules/metadata_download_button.js +6 -1
  24. data/app/assets/javascripts/geoblacklight/modules/results.js +7 -8
  25. data/app/assets/javascripts/geoblacklight/modules/util.js +5 -0
  26. data/app/assets/javascripts/geoblacklight/viewers/esri.js +1 -1
  27. data/app/assets/javascripts/geoblacklight/viewers/index_map.js +1 -1
  28. data/app/assets/javascripts/geoblacklight/viewers/map.js +12 -2
  29. data/app/assets/javascripts/geoblacklight/viewers/tms.js +10 -0
  30. data/app/assets/javascripts/geoblacklight/viewers/wms.js +1 -1
  31. data/app/assets/stylesheets/geoblacklight/modules/icon-customization.scss +41 -0
  32. data/app/assets/stylesheets/geoblacklight/modules/results.scss +1 -1
  33. data/app/assets/stylesheets/geoblacklight/modules/toolbar.scss +6 -0
  34. data/app/components/geoblacklight/homepage_feature_facet_component.html.erb +11 -0
  35. data/app/components/geoblacklight/homepage_feature_facet_component.rb +13 -0
  36. data/{lib → app/helpers}/geoblacklight/geoblacklight_helper_behavior.rb +6 -4
  37. data/app/helpers/geoblacklight_helper.rb +14 -8
  38. data/app/models/concerns/geoblacklight/solr_document/citation.rb +2 -2
  39. data/app/models/concerns/geoblacklight/solr_document.rb +11 -16
  40. data/app/models/concerns/geoblacklight/spatial_search_behavior.rb +5 -5
  41. data/app/views/catalog/_arcgis.html.erb +1 -1
  42. data/app/views/catalog/_data_dictionary.html.erb +1 -2
  43. data/app/views/catalog/_document_split.html.erb +1 -1
  44. data/app/views/catalog/_header_icons.html.erb +1 -1
  45. data/app/views/catalog/_home_text.html.erb +7 -29
  46. data/app/views/catalog/_index_split_default.html.erb +1 -1
  47. data/app/views/catalog/_show_default_viewer_container.html.erb +1 -1
  48. data/app/views/catalog/_show_header_default.html.erb +1 -1
  49. data/app/views/download/hgl.html.erb +13 -11
  50. data/app/views/relation/_relations.html.erb +15 -0
  51. data/app/views/relation/index.html.erb +4 -16
  52. data/app/views/relation/index.json.jbuilder +6 -2
  53. data/babel.config.json +4 -0
  54. data/config/initializers/new_gbl_settings_defaults_3_4.yml +6 -0
  55. data/config/locales/geoblacklight.en.yml +12 -0
  56. data/geoblacklight.gemspec +5 -3
  57. data/jest.config.js +25 -0
  58. data/lib/generators/geoblacklight/install_generator.rb +1 -1
  59. data/lib/generators/geoblacklight/templates/catalog_controller.rb +78 -35
  60. data/lib/generators/geoblacklight/templates/settings.gbl_v1.yml +195 -0
  61. data/lib/generators/geoblacklight/templates/settings.yml +91 -17
  62. data/lib/geoblacklight/bounding_box.rb +1 -1
  63. data/lib/geoblacklight/constants.rb +1 -0
  64. data/lib/geoblacklight/download/geojson_download.rb +1 -1
  65. data/lib/geoblacklight/download/geotiff_download.rb +1 -1
  66. data/lib/geoblacklight/download/hgl_download.rb +1 -1
  67. data/lib/geoblacklight/download/kmz_download.rb +2 -2
  68. data/lib/geoblacklight/download/shapefile_download.rb +1 -1
  69. data/lib/geoblacklight/geometry.rb +85 -0
  70. data/lib/geoblacklight/item_viewer.rb +5 -1
  71. data/lib/geoblacklight/metadata/base.rb +1 -7
  72. data/lib/geoblacklight/references.rb +1 -1
  73. data/lib/geoblacklight/relation/ancestors.rb +4 -3
  74. data/lib/geoblacklight/relation/descendants.rb +4 -3
  75. data/lib/geoblacklight/relation/relation_response.rb +21 -6
  76. data/lib/geoblacklight/version.rb +1 -1
  77. data/lib/geoblacklight/view_helper_override.rb +1 -1
  78. data/lib/geoblacklight/wms_layer.rb +1 -4
  79. data/lib/geoblacklight.rb +1 -3
  80. data/lib/tasks/geoblacklight.rake +5 -0
  81. data/package.json +17 -1
  82. data/schema/{geoblacklight-schema.json → geoblacklight-schema-1.0.json} +1 -1
  83. data/schema/geoblacklight-schema-aardvark.json +211 -0
  84. data/setupJest.js +14 -0
  85. data/solr/conf/schema.xml +35 -29
  86. data/solr/conf/solrconfig.xml +15 -15
  87. data/spec/components/geoblacklight/homepage_feature_facet_component_spec.rb +39 -0
  88. data/spec/config/initializers/rails_config_spec.rb +15 -0
  89. data/spec/controllers/catalog_controller_spec.rb +7 -7
  90. data/spec/features/esri_viewer_spec.rb +1 -1
  91. data/spec/features/home_page_spec.rb +4 -4
  92. data/spec/features/layer_opacity_spec.rb +1 -0
  93. data/spec/features/metadata_panel_spec.rb +1 -1
  94. data/spec/features/missing_metadata_spec.rb +2 -2
  95. data/spec/features/relations_spec.rb +2 -2
  96. data/spec/features/search_results_map_spec.rb +2 -1
  97. data/spec/features/search_results_overlap_ratio_spec.rb +2 -2
  98. data/spec/features/split_view.html.erb_spec.rb +16 -12
  99. data/spec/features/tms_spec.rb +10 -0
  100. data/spec/fixtures/solr_documents/README.md +48 -36
  101. data/spec/fixtures/solr_documents/actual-papermap1.json +41 -18
  102. data/spec/fixtures/solr_documents/actual-point1.json +47 -27
  103. data/spec/fixtures/solr_documents/actual-polygon1.json +43 -18
  104. data/spec/fixtures/solr_documents/actual-raster1.json +52 -23
  105. data/spec/fixtures/solr_documents/all-relationships.json +48 -0
  106. data/spec/fixtures/solr_documents/baruch_ancestor1.json +62 -37
  107. data/spec/fixtures/solr_documents/baruch_ancestor2.json +62 -37
  108. data/spec/fixtures/solr_documents/baruch_documentation_download.json +60 -34
  109. data/spec/fixtures/solr_documents/bbox-spans-180.json +34 -16
  110. data/spec/fixtures/solr_documents/cornell_html_metadata.json +46 -26
  111. data/spec/fixtures/solr_documents/esri-dynamic-layer-all-layers.json +43 -25
  112. data/spec/fixtures/solr_documents/esri-dynamic-layer-single-layer.json +45 -28
  113. data/spec/fixtures/solr_documents/esri-feature-layer.json +44 -34
  114. data/spec/fixtures/solr_documents/esri-image-map-layer.json +45 -31
  115. data/spec/fixtures/solr_documents/esri-tiled_map_layer.json +42 -17
  116. data/spec/fixtures/solr_documents/esri-wms-layer.json +46 -21
  117. data/spec/fixtures/solr_documents/harvard_raster.json +55 -36
  118. data/spec/fixtures/solr_documents/iiif-eastern-hemisphere.json +35 -22
  119. data/spec/fixtures/solr_documents/index-map-polygon-no-downloadurl.json +48 -27
  120. data/spec/fixtures/solr_documents/index-map-polygon.json +48 -27
  121. data/spec/fixtures/solr_documents/index-map-stanford.json +54 -25
  122. data/spec/fixtures/solr_documents/index_map_point.json +54 -26
  123. data/spec/fixtures/solr_documents/metadata_no_geom.json +27 -0
  124. data/spec/fixtures/solr_documents/metadata_no_provider.json +39 -0
  125. data/spec/fixtures/solr_documents/multiple-downloads.json +33 -20
  126. data/spec/fixtures/solr_documents/no_locn_geometry.json +25 -0
  127. data/spec/fixtures/solr_documents/no_spatial.json +37 -19
  128. data/spec/fixtures/solr_documents/oembed.json +34 -17
  129. data/spec/fixtures/solr_documents/princeton-child1.json +45 -28
  130. data/spec/fixtures/solr_documents/princeton-child2.json +45 -28
  131. data/spec/fixtures/solr_documents/princeton-child3.json +45 -28
  132. data/spec/fixtures/solr_documents/princeton-child4.json +45 -28
  133. data/spec/fixtures/solr_documents/princeton-parent.json +46 -23
  134. data/spec/fixtures/solr_documents/public_direct_download.json +48 -21
  135. data/spec/fixtures/solr_documents/public_iiif_princeton.json +49 -24
  136. data/spec/fixtures/solr_documents/public_polygon_mit.json +31 -15
  137. data/spec/fixtures/solr_documents/restricted-line.json +52 -21
  138. data/spec/fixtures/solr_documents/the-related-record.json +27 -0
  139. data/spec/fixtures/solr_documents/tms.json +45 -0
  140. data/spec/fixtures/solr_documents/umn_metro_result1.json +44 -28
  141. data/spec/fixtures/solr_documents/umn_state_result1.json +44 -26
  142. data/spec/fixtures/solr_documents/umn_state_result2.json +45 -24
  143. data/spec/fixtures/solr_documents/uva_slug_colon.json +43 -20
  144. data/spec/{lib → helpers}/geoblacklight/geoblacklight_helper_behavior_spec.rb +1 -0
  145. data/spec/helpers/geoblacklight_helper_spec.rb +30 -4
  146. data/spec/javascripts/geoblacklight_spec.js +0 -6
  147. data/spec/javascripts/metadata_download_button_spec.js +5 -3
  148. data/spec/javascripts/util_spec.js +2 -4
  149. data/spec/lib/geoblacklight/download/geojson_download_spec.rb +1 -1
  150. data/spec/lib/geoblacklight/download/geotiff_download_spec.rb +1 -1
  151. data/spec/lib/geoblacklight/download/hgl_download_spec.rb +1 -1
  152. data/spec/lib/geoblacklight/download/kmz_download_spec.rb +2 -2
  153. data/spec/lib/geoblacklight/download/shapefile_download_spec.rb +1 -1
  154. data/spec/lib/geoblacklight/download_spec.rb +1 -1
  155. data/spec/lib/geoblacklight/geometry_spec.rb +59 -0
  156. data/spec/lib/geoblacklight/item_viewer_spec.rb +12 -0
  157. data/spec/lib/geoblacklight/references_spec.rb +3 -3
  158. data/spec/lib/geoblacklight/relation/ancestors_spec.rb +3 -3
  159. data/spec/lib/geoblacklight/relation/descendants_spec.rb +3 -3
  160. data/spec/lib/geoblacklight/relation/relation_response_spec.rb +32 -17
  161. data/spec/models/concerns/geoblacklight/solr_document_spec.rb +4 -4
  162. data/spec/spec_helper.rb +2 -0
  163. data/spec/support/view_component_capybara_test_helpers.rb +8 -0
  164. data/spec/test_app_templates/Gemfile.extra +1 -0
  165. data/spec/test_app_templates/lib/generators/test_app_generator.rb +0 -7
  166. data/spec/views/catalog/_document_split.html.erb_spec.rb +1 -1
  167. data/spec/views/catalog/_index_split.html.erb_spec.rb +1 -1
  168. data/template.rb +1 -0
  169. metadata +99 -51
  170. data/.circleci/config.yml +0 -256
  171. data/app/views/catalog/_document_action.html.erb +0 -6
  172. data/app/views/catalog/_facet_tag_item.html.erb +0 -3
  173. data/app/views/catalog/_facet_tag_layout.html.erb +0 -2
  174. data/app/views/relation/_ancestors.html.erb +0 -8
  175. data/app/views/relation/_descendants.html.erb +0 -15
  176. data/schema/format-values.md +0 -50
  177. data/schema/geoblacklight-schema-deprecated.md +0 -39
  178. data/schema/geoblacklight-schema.md +0 -323
  179. data/schema/geometry-type-values.md +0 -11
  180. data/schema/references.md +0 -23
  181. data/schema/schema-commentary.md +0 -198
  182. data/schema/subjects.md +0 -41
  183. data/schema/type-values.md +0 -10
  184. data/spec/fixtures/solr_documents/metadata_no_dct_provenance_s.json +0 -30
  185. data/spec/fixtures/solr_documents/metadata_no_layer_geom_type_s.json +0 -17
  186. data/spec/fixtures/solr_documents/metadata_no_solr_geom.json +0 -23
  187. data/spec/javascripts/geoblacklight/viewers/esri/tiled_map_layer_spec.js +0 -12
  188. data/spec/javascripts/spec_helper.js +0 -32
  189. data/spec/lib/geoblacklight/controller_override_spec.rb +0 -2
  190. data/spec/teaspoon_env.rb +0 -214
data/setupJest.js ADDED
@@ -0,0 +1,14 @@
1
+ import { JSDOM } from 'jsdom';
2
+ import $ from 'jquery';
3
+ const GeoBlacklight = require('./app/assets/javascripts/geoblacklight/geoblacklight');
4
+
5
+ const jsdom = new JSDOM('<html></html>', { pretendToBeVisual: true });
6
+ const { window } = jsdom;
7
+
8
+ global.GeoBlacklight = GeoBlacklight;
9
+ global.window = window;
10
+ global.jQuery = $;
11
+ global.$ = global.jQuery;
12
+
13
+ import * as L from 'leaflet.js.erb';
14
+ global.leaflet = L;
data/solr/conf/schema.xml CHANGED
@@ -1,12 +1,11 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
- <schema name="geoblacklight-schema" version="1.7">
3
- <uniqueKey>layer_slug_s</uniqueKey>
2
+ <schema name="geoblacklight-schema" version="4.0">
3
+ <uniqueKey>id</uniqueKey>
4
4
  <fields>
5
5
  <field name="_version_" type="long" stored="true" indexed="true"/>
6
6
  <field name="timestamp" type="date" stored="true" indexed="true" default="NOW"/>
7
- <field name="layer_slug_s" type="string" stored="true" indexed="true" required="true"/>
8
7
  <field name="geoblacklight_version" type="string" stored="true" indexed="true"/>
9
- <field name="uuid" type="string" stored="true" indexed="true"/><!-- deprecated -->
8
+ <field name="id" type="string" stored="true" indexed="true" required="true"/>
10
9
 
11
10
  <!-- core generated fields -->
12
11
  <field name="text" type="text_en" stored="false" indexed="true" multiValued="true"
@@ -43,6 +42,9 @@
43
42
 
44
43
  <dynamicField name="*suggest" type="textSuggest" indexed="true" stored="false" multiValued="true" />
45
44
 
45
+ <!-- date range (_drsim) -->
46
+ <dynamicField name="*_drsim" type="dateRange" stored="true" indexed="true" multiValued="true"/>
47
+
46
48
  <!-- Spatial field types:
47
49
 
48
50
  Solr3:
@@ -64,6 +66,7 @@
64
66
  <dynamicField name="*_pt" type="location" stored="true" indexed="true"/>
65
67
  <dynamicField name="*_bbox" type="location_rpt" stored="true" indexed="true"/><!-- deprecated -->
66
68
  <dynamicField name="*_geom" type="location_rpt" stored="true" indexed="true"/>
69
+ <dynamicField name="*_geometry" type="location_rpt" stored="true" indexed="true"/>
67
70
  <dynamicField name="*_bboxtype" type="bbox" stored="true" indexed="true"/>
68
71
 
69
72
  </fields>
@@ -82,6 +85,9 @@
82
85
  A Trie based date field for faster date range queries and date faceting. -->
83
86
  <fieldType name="date" class="solr.TrieDateField" precisionStep="6" positionIncrementGap="0"/>
84
87
 
88
+ <!-- A DateRange based date field for truly faster date range queries. -->
89
+ <fieldType name="dateRange" class="solr.DateRangeField"/>
90
+
85
91
  <!--Binary data type. The data should be sent/retrieved in as Base64 encoded Strings -->
86
92
  <fieldtype name="binary" class="solr.BinaryField"/>
87
93
 
@@ -155,44 +161,44 @@
155
161
  <!-- for scoring formula -->
156
162
  <copyField source="dct_spatial_sm" dest="dct_spatial_tmi" maxChars="10000"/>
157
163
  <copyField source="dct_temporal_sm" dest="dct_temporal_tmi" maxChars="10000"/>
158
- <copyField source="dc_creator_sm" dest="dc_creator_tmi" maxChars="1000"/>
159
- <copyField source="dc_description_s" dest="dc_description_ti" maxChars="10000"/>
160
- <copyField source="dc_format_s" dest="dc_format_ti" maxChars="100"/>
161
- <copyField source="dc_identifier_s" dest="dc_identifier_ti" maxChars="100"/>
162
- <copyField source="dc_publisher_s" dest="dc_publisher_ti" maxChars="1000"/>
163
- <copyField source="dc_rights_s" dest="dc_rights_ti" maxChars="100"/>
164
- <copyField source="dct_provenance_s" dest="dct_provenance_ti" maxChars="1000"/>
165
- <copyField source="dc_subject_sm" dest="dc_subject_tmi" maxChars="10000"/>
166
- <copyField source="dc_title_s" dest="dc_title_ti" maxChars="1000"/>
164
+ <copyField source="dct_creator_sm" dest="dc_creator_tmi" maxChars="1000"/>
165
+ <copyField source="dct_description_sm" dest="dc_description_tmi" maxChars="10000"/>
166
+ <copyField source="dct_format_s" dest="dc_format_ti" maxChars="100"/>
167
+ <copyField source="dct_identifier_sm" dest="dc_identifier_tmi" maxChars="100"/>
168
+ <copyField source="dct_publisher_sm" dest="dc_publisher_tmi" maxChars="1000"/>
169
+ <copyField source="dct_accessRights_s" dest="dc_rights_ti" maxChars="100"/>
170
+ <copyField source="schema_provider_s" dest="dct_provider_ti" maxChars="1000"/>
171
+ <copyField source="dct_subject_sm" dest="dc_subject_tmi" maxChars="10000"/>
172
+ <copyField source="dct_title_s" dest="dc_title_ti" maxChars="1000"/>
167
173
  <copyField source="dct_isPartOf_sm" dest="dct_isPartOf_tmi" maxChars="1000"/>
168
- <copyField source="layer_geom_type_s" dest="layer_geom_type_ti" maxChars="100"/>
169
- <copyField source="layer_slug_s" dest="layer_slug_ti" maxChars="100"/>
174
+ <copyField source="locn_geometry_s" dest="layer_geom_type_ti" maxChars="100"/>
175
+ <copyField source="id" dest="layer_slug_ti" maxChars="100"/>
170
176
 
171
177
  <!-- core text search -->
172
178
  <copyField source="*_s" dest="text" />
173
179
  <copyField source="*_sm" dest="text" />
174
180
 
175
181
  <!-- for sorting text fields -->
176
- <copyField source="dct_provenance_s" dest="dct_provenance_sort"/>
177
- <copyField source="dc_publisher_s" dest="dc_publisher_sort"/>
178
- <copyField source="dc_title_s" dest="dc_title_sort"/>
182
+ <copyField source="schema_provider_s" dest="schema_provider_sort"/>
183
+ <copyField source="dct_publisher_sm" dest="dc_publisher_sort"/>
184
+ <copyField source="dct_title_s" dest="dct_title_sort"/>
179
185
 
180
186
  <!-- for spell checking -->
181
- <copyField source="dc_title_s" dest="spell"/>
182
- <copyField source="dc_creator_sm" dest="spell"/>
183
- <copyField source="dc_publisher_s" dest="spell"/>
184
- <copyField source="dct_provenance_s" dest="spell"/>
185
- <copyField source="dc_subject_sm" dest="spell"/>
187
+ <copyField source="dct_title_s" dest="spell"/>
188
+ <copyField source="dct_creator_sm" dest="spell"/>
189
+ <copyField source="dct_publisher_sm" dest="spell"/>
190
+ <copyField source="schema_provider_s" dest="spell"/>
191
+ <copyField source="dct_subject_sm" dest="spell"/>
186
192
  <copyField source="dct_spatial_sm" dest="spell"/>
187
193
 
188
194
  <!-- for suggestions -->
189
- <copyField source="dc_title_s" dest="suggest"/>
190
- <copyField source="dc_creator_sm" dest="suggest"/>
191
- <copyField source="dc_publisher_s" dest="suggest"/>
192
- <copyField source="dct_provenance_s" dest="suggest"/>
193
- <copyField source="dc_subject_sm" dest="suggest"/>
195
+ <copyField source="dct_title_s" dest="suggest"/>
196
+ <copyField source="dct_creator_sm" dest="suggest"/>
197
+ <copyField source="dct_publisher_sm" dest="suggest"/>
198
+ <copyField source="schema_provider_s" dest="suggest"/>
199
+ <copyField source="dct_subject_sm" dest="suggest"/>
194
200
  <copyField source="dct_spatial_sm" dest="suggest"/>
195
201
 
196
202
  <!-- for bbox value -->
197
- <copyField source="solr_geom" dest="solr_bboxtype"/>
203
+ <copyField source="locn_geometry" dest="solr_bboxtype"/>
198
204
  </schema>
data/solr/conf/solrconfig.xml CHANGED
@@ -20,7 +20,7 @@
20
20
  this file, see http://wiki.apache.org/solr/SolrConfigXml.
21
21
  -->
22
22
  <config>
23
-
23
+
24
24
  <!-- Controls what version of Lucene various components of Solr
25
25
  adhere to. Generally, you want to use the latest version to
26
26
  get all bug fixes and improvements. It is highly recommended
@@ -28,7 +28,7 @@
28
28
  affect both how text is indexed and queried.
29
29
  -->
30
30
  <luceneMatchVersion>7.6</luceneMatchVersion>
31
-
31
+
32
32
  <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
33
33
  <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />
34
34
 
@@ -38,7 +38,7 @@
38
38
  <schemaFactory class="ClassicIndexSchemaFactory"/>
39
39
 
40
40
  <dataDir>${solr.blacklight-core.data.dir:}</dataDir>
41
-
41
+
42
42
  <indexConfig>
43
43
  <lockType>${solr.lock.type:native}</lockType>
44
44
  </indexConfig>
@@ -113,7 +113,7 @@
113
113
  <int name="ps">0</int>
114
114
  <float name="tie">0.01</float>
115
115
  <str name="fl">*,score</str>
116
- <str name="sort">score desc, dc_title_sort asc</str>
116
+ <str name="sort">score desc, dct_title_sort asc</str>
117
117
  <str name="q.alt">*:*</str>
118
118
  <str name="qf">
119
119
  text^1
@@ -126,7 +126,7 @@
126
126
  dct_temporal_tmi^5
127
127
  dc_title_ti^6
128
128
  dc_rights_ti^7
129
- dct_provenance_ti^8
129
+ dct_provider_ti^8
130
130
  layer_geom_type_ti^9
131
131
  layer_slug_ti^10
132
132
  dc_identifier_ti^10
@@ -142,7 +142,7 @@
142
142
  dct_temporal_tmi^5
143
143
  dc_title_ti^6
144
144
  dc_rights_ti^7
145
- dct_provenance_ti^8
145
+ dct_provider_ti^8
146
146
  layer_geom_type_ti^9
147
147
  layer_slug_ti^10
148
148
  dc_identifier_ti^10
@@ -151,16 +151,16 @@
151
151
  <int name="facet.mincount">1</int>
152
152
  <int name="facet.limit">10</int>
153
153
  <str name="facet.field">dct_isPartOf_sm</str>
154
- <str name="facet.field">dct_provenance_s</str>
154
+ <str name="facet.field">schema_provider_s</str>
155
155
  <str name="facet.field">dct_spatial_sm</str>
156
- <str name="facet.field">dc_creator_sm</str>
157
- <str name="facet.field">dc_format_s</str>
158
- <str name="facet.field">dc_language_s</str>
159
- <str name="facet.field">dc_publisher_s</str>
160
- <str name="facet.field">dc_rights_s</str>
161
- <str name="facet.field">dc_subject_sm</str>
162
- <str name="facet.field">layer_geom_type_s</str>
163
- <str name="facet.field">solr_year_i</str>
156
+ <str name="facet.field">dct_creator_sm</str>
157
+ <str name="facet.field">dct_format_s</str>
158
+ <str name="facet.field">dct_language_sm</str>
159
+ <str name="facet.field">dct_publisher_sm</str>
160
+ <str name="facet.field">dct_accessRights_s</str>
161
+ <str name="facet.field">dct_subject_sm</str>
162
+ <str name="facet.field">locn_geometry_s</str>
163
+ <str name="facet.field">gbl_indexYear_im</str>
164
164
 
165
165
  <str name="spellcheck">true</str>
166
166
  </lst>
data/spec/components/geoblacklight/homepage_feature_facet_component_spec.rb ADDED
@@ -0,0 +1,39 @@
1
+ # frozen_string_literal: true
2
+ require 'spec_helper'
3
+
4
+ RSpec.describe Geoblacklight::HomepageFeatureFacetComponent, type: :component do
5
+ subject(:rendered) do
6
+ render_inline_to_capybara_node(described_class.new(**kargs))
7
+ end
8
+
9
+ # Build a search
10
+ let(:context) { { whatever: :value } }
11
+ let(:service) { Blacklight::SearchService.new(config: blacklight_config, user_params: user_params, **context) }
12
+ let(:repository) { Blacklight::Solr::Repository.new(blacklight_config) }
13
+ let(:user_params) { {} }
14
+ let(:blacklight_config) { Blacklight::Configuration.new }
15
+ let(:copy_of_catalog_config) { ::CatalogController.blacklight_config.deep_copy }
16
+ let(:blacklight_solr) { RSolr.connect(Blacklight.connection_config.except(:adapter)) }
17
+
18
+ describe 'homepage' do
19
+ before do
20
+ (@response, @document_list) = service.search_results
21
+ end
22
+
23
+ let(:kargs) do
24
+ {
25
+ icon: 'home',
26
+ label: 'geoblacklight.home.institution',
27
+ facet_field: Settings.FIELDS.PROVIDER,
28
+ response: @response
29
+ }
30
+ end
31
+
32
+ it 'includes facet links' do
33
+ expect(rendered).to have_selector('div.category-block')
34
+ expect(rendered).to have_selector('div.category-icon')
35
+ expect(rendered).to have_selector('a.home-facet-link')
36
+ expect(rendered).to have_selector('a.more_facets_link')
37
+ end
38
+ end
39
+ end
data/spec/config/initializers/rails_config_spec.rb ADDED
@@ -0,0 +1,15 @@
1
+ # frozen_string_literal: true
2
+ require 'spec_helper'
3
+
4
+ describe 'Config' do
5
+ it 'Loads new Aardvark relationships' do
6
+ expect(Settings).to respond_to('RELATIONSHIPS_SHOWN')
7
+ [:field, :query_type, :icon, :label].each do |method|
8
+ expect(Settings.RELATIONSHIPS_SHOWN.MEMBER_OF).to respond_to(method)
9
+ end
10
+ end
11
+
12
+ it 'Loads new v3.4 Settings.FIELDS defaults' do
13
+ expect(Settings.HOMEPAGE_MAP_GEOM).to eq nil
14
+ end
15
+ end
data/spec/controllers/catalog_controller_spec.rb CHANGED
@@ -71,13 +71,13 @@ describe CatalogController, type: :controller do
71
71
  expect(response.status).to eq 200
72
72
  expect(response.body).not_to be_empty
73
73
  response_values = JSON.parse(response.body)
74
- expect(response_values).to include 'geoblacklight_version' => '1.0'
75
- expect(response_values).to include 'dc_title_s' => '100 Foot Grid Cambridge MA 2004'
76
- expect(response_values).to include 'dc_identifier_s' => 'urn:geodata.tufts.edu:Tufts.CambridgeGrid100_04'
77
- expect(response_values).to include 'dc_rights_s' => 'Public'
78
- expect(response_values).to include 'dct_provenance_s' => 'Tufts'
79
- expect(response_values).to include 'layer_slug_s' => 'tufts-cambridgegrid100-04'
80
- expect(response_values).to include 'solr_geom' => 'ENVELOPE(-71.163984, -71.052581, 42.408316, 42.34757)'
74
+ expect(response_values).to include 'gbl_mdVersion_s' => 'Aardvark'
75
+ expect(response_values).to include Settings.FIELDS.TITLE => '100 Foot Grid Cambridge MA 2004'
76
+ expect(response_values).to include Settings.FIELDS.IDENTIFIER => ['urn:geodata.tufts.edu:Tufts.CambridgeGrid100_04']
77
+ expect(response_values).to include Settings.FIELDS.ACCESS_RIGHTS => 'Public'
78
+ expect(response_values).to include Settings.FIELDS.PROVIDER => 'Tufts'
79
+ expect(response_values).to include Settings.FIELDS.ID => 'tufts-cambridgegrid100-04'
80
+ expect(response_values).to include Settings.FIELDS.SPATIAL_EXTENT => 'ENVELOPE(-71.163984,-71.052581,42.408316,42.34757)'
81
81
  end
82
82
  end
83
83
  end
data/spec/features/esri_viewer_spec.rb CHANGED
@@ -3,12 +3,12 @@ require 'spec_helper'
3
3
 
4
4
  feature 'feature_layer reference', js: true do
5
5
  scenario 'displays image map layer' do
6
+ skip 'CORS error - Purdue web services are down'
6
7
  visit solr_document_path '32653ed6-8d83-4692-8a06-bf13ffe2c018'
7
8
  expect(page).to have_css '.leaflet-control-zoom', visible: true
8
9
  expect(page).to have_css 'img.leaflet-image-layer', visible: true
9
10
  end
10
11
  scenario 'displays dynamic layer (all layers)' do
11
- pending 'external service disabled cors access'
12
12
  visit solr_document_path '90f14ff4-1359-4beb-b931-5cb41d20ab90'
13
13
  expect(page).to have_css '.leaflet-control-zoom', visible: true
14
14
  expect(page).to have_css 'img.leaflet-image-layer', visible: true
data/spec/features/home_page_spec.rb CHANGED
@@ -21,9 +21,9 @@ feature 'Home page', js: true do # use js: true for tests which require js, but
21
21
  expect(page).to have_css '.category-block', count: 4
22
22
  expect(page).to have_css '.home-facet-link', count: 36
23
23
  expect(page).to have_css 'a.more_facets_link', count: 4
24
- click_link 'Elevation'
24
+ click_link 'Topography'
25
25
  expect(page).to have_css '.filter-name', text: 'Subject'
26
- expect(page).to have_css '.filter-value', text: 'Elevation'
26
+ expect(page).to have_css '.filter-value', text: 'Topography'
27
27
  end
28
28
  scenario 'map should be visible' do
29
29
  within '#main-container' do
@@ -39,8 +39,8 @@ feature 'Home page', js: true do # use js: true for tests which require js, but
39
39
  expect(page).to have_css '#documents'
40
40
  end
41
41
  scenario 'can search by placename' do
42
- click_link 'Minnesota, United States'
42
+ click_link 'New York, New York'
43
43
  results = page.all(:css, 'article.document')
44
- expect(results.count).to equal(3)
44
+ expect(results.count).to equal(4)
45
45
  end
46
46
  end
data/spec/features/layer_opacity_spec.rb CHANGED
@@ -9,6 +9,7 @@ feature 'Layer opacity', js: true do
9
9
  end
10
10
 
11
11
  scenario 'ESRI image service layer should have opacity control' do
12
+ skip 'CORS error - Purdue web services are down'
12
13
  visit solr_document_path('32653ed6-8d83-4692-8a06-bf13ffe2c018')
13
14
  expect(page).to have_css('div.opacity-text', text: '75%')
14
15
  expect(page.find('img.leaflet-image-layer', match: :first)[:style]).to match(/opacity: 0.75;/)
data/spec/features/metadata_panel_spec.rb CHANGED
@@ -29,7 +29,7 @@ feature 'Metadata tools' do
29
29
  allow(connection).to receive(:get).and_return(response)
30
30
  allow(Faraday).to receive(:new).with(url: 'http://purl.stanford.edu/cg357zz0321.mods').and_return(connection)
31
31
 
32
- allow(Faraday).to receive(:new).with(hash_including(url: 'http://127.0.0.1:8983/solr/blacklight-core/')).and_call_original
32
+ allow(Faraday).to receive(:new).with(hash_including(url: %r{solr/blacklight-core})).and_call_original
33
33
  end
34
34
 
35
35
  scenario 'shows up as HTML' do
data/spec/features/missing_metadata_spec.rb CHANGED
@@ -14,8 +14,8 @@ feature 'Missing metadata', js: true do
14
14
  visit solr_document_path('05d-03-noGeomType')
15
15
  expect(page).to have_css('#map')
16
16
  end
17
- scenario 'Yields error free show page for no dct_provenance_s' do
18
- visit solr_document_path('99-0001-noProvenance')
17
+ scenario 'Yields error free show page for no dct_provider_s' do
18
+ visit solr_document_path('99-0001-noprovider')
19
19
  expect(page).to have_css('#map')
20
20
  end
21
21
  scenario 'Yields error free show page for no solr_geom' do
data/spec/features/relations_spec.rb CHANGED
@@ -15,8 +15,8 @@ feature 'Display related documents' do
15
15
  scenario 'Relations should respond to json' do
16
16
  visit relations_solr_document_path('nyu_2451_34635', format: 'json')
17
17
  response = JSON.parse(page.body)
18
- expect(response['ancestors']['numFound']).to eq 0
19
- expect(response['descendants']['docs'].first['layer_slug_s']).to eq 'nyu_2451_34502'
18
+ expect(response['relations']).not_to respond_to('source_ancestors')
19
+ expect(response['relations']['source_descendants']['docs'].first[Settings.FIELDS.ID]).to eq 'nyu_2451_34502'
20
20
  expect(response['current_doc']).to eq 'nyu_2451_34635'
21
21
  end
22
22
 
data/spec/features/search_results_map_spec.rb CHANGED
@@ -7,6 +7,7 @@ feature 'search results map', js: true do
7
7
  expect(page).to have_css '#map'
8
8
  end
9
9
  scenario 'view is scoped to Minnesota' do
10
+ pending 'Minnesota fixtures have changed.'
10
11
  visit root_path
11
12
  click_link 'Minnesota, United States'
12
13
  expect(page).to have_css '#map'
@@ -35,7 +36,7 @@ feature 'search results map', js: true do
35
36
  end
36
37
  scenario 'view is scoped to NYC' do
37
38
  visit root_path
38
- click_link 'New York, New York, United States'
39
+ click_link 'New York, New York'
39
40
  expect(page).to have_css '#map'
40
41
  bbox = page.find('#map')['data-js-map-render-bbox']
41
42
 
data/spec/features/search_results_overlap_ratio_spec.rb CHANGED
@@ -8,7 +8,7 @@ feature 'spatial search results overlap ratio' do
8
8
  # BBox param is the US upper midwest and Canada, roughly centered on the state of Minnesota
9
9
  visit search_catalog_path(
10
10
  bbox: '-103.196521 39.21962 -84.431873 53.63497',
11
- 'f[dct_provenance_s][]': 'Minnesota'
11
+ "f[#{Settings.FIELDS.PROVIDER}][]": 'University of Minnesota'
12
12
  )
13
13
 
14
14
  # MN State result
@@ -30,7 +30,7 @@ feature 'spatial search results overlap ratio' do
30
30
  # BBox param is the center to western edge of New York state and Canada, roughly centered on Lake Ontario
31
31
  visit search_catalog_path(
32
32
  bbox: '-83.750499 40.41709 -74.368175 47.963663',
33
- 'f[dct_provenance_s][]': 'Cornell'
33
+ "f[#{Settings.FIELDS.PROVIDER}][]": 'Cornell'
34
34
  )
35
35
 
36
36
  # NY State result
data/spec/features/split_view.html.erb_spec.rb CHANGED
@@ -8,41 +8,45 @@ feature 'Index view', js: true do
8
8
  end
9
9
 
10
10
  scenario 'should have documents and map on page' do
11
- visit search_catalog_path(f: { Settings.FIELDS.PROVENANCE => ['Stanford'] })
11
+ visit search_catalog_path(f: { Settings.FIELDS.PROVIDER => ['Stanford'] })
12
12
  expect(page).to have_css('#documents')
13
- expect(page).to have_css('.document', count: 5)
13
+ expect(page).to have_css('.document', count: 6)
14
14
  expect(page).to have_css('#map')
15
15
  end
16
16
 
17
17
  scenario 'should have sort and per_page on page' do
18
- visit search_catalog_path(f: { Settings.FIELDS.PROVENANCE => ['Stanford'] })
18
+ visit search_catalog_path(f: { Settings.FIELDS.PROVIDER => ['Stanford'] })
19
19
  expect(page).to have_css('#sort-dropdown')
20
20
  expect(page).to have_css('#per_page-dropdown')
21
21
  end
22
22
 
23
23
  scenario 'should have facets listed correctly' do
24
24
  within '#facet-panel-collapse' do
25
- expect(page).to have_css('div.card.facet-limit', text: 'Institution')
26
- expect(page).to have_css('div.card.facet-limit', text: 'Publisher')
27
- expect(page).to have_css('div.card.facet-limit', text: 'Subject')
28
- expect(page).to have_css('div.card.facet-limit', text: 'Place')
29
25
  expect(page).to have_css('div.card.facet-limit', text: 'Year')
26
+ expect(page).to have_css('div.card.facet-limit', text: 'Place')
30
27
  expect(page).to have_css('div.card.facet-limit', text: 'Access')
31
- expect(page).to have_css('div.card.facet-limit', text: 'Data type')
28
+ expect(page).to have_css('div.card.facet-limit', text: 'Resource Class')
29
+ expect(page).to have_css('div.card.facet-limit', text: 'Resource Type')
32
30
  expect(page).to have_css('div.card.facet-limit', text: 'Format')
31
+ expect(page).to have_css('div.card.facet-limit', text: 'Subject')
32
+ expect(page).to have_css('div.card.facet-limit', text: 'Theme')
33
+ expect(page).to have_css('div.card.facet-limit', text: 'Creator')
34
+ expect(page).to have_css('div.card.facet-limit', text: 'Publisher')
35
+ expect(page).to have_css('div.card.facet-limit', text: 'Provider')
36
+ expect(page).to have_css('div.card.facet-limit', text: 'Georeferenced')
33
37
  end
34
- click_button 'Institution'
38
+ click_button 'Provider'
35
39
  using_wait_time 120 do
36
- expect(page).to have_css('a.facet-select', text: 'Minnesota', visible: true)
40
+ expect(page).to have_css('a.facet-select', text: 'University of Minnesota', visible: true)
37
41
  expect(page).to have_css('a.facet-select', text: 'MIT', visible: true)
38
42
  expect(page).to have_css('a.facet-select', text: 'Stanford', visible: true)
39
- expect(page).to have_css('a.more_facets_link', text: /more\sInstitution\s»/, visible: true)
43
+ expect(page).to have_css('a.more_facets_link', text: /more\sProvider\s»/, visible: true)
40
44
  end
41
45
  end
42
46
 
43
47
  scenario 'hover on record should produce bounding box on map' do
44
48
  # Needed to find an svg element on the page
45
- visit search_catalog_path(f: { Settings.FIELDS.PROVENANCE => ['Stanford'] })
49
+ visit search_catalog_path(f: { Settings.FIELDS.PROVIDER => ['Stanford'] })
46
50
  # BL7 has svg icons, so sniffing for SVG path won't return false
47
51
  # expect(Nokogiri::HTML.parse(page.body).css('path').length).to eq 0
48
52
  find('.documentHeader', match: :first).hover