update to 4.1.1 (#5)

* update to GBL 4.1.1

* update solr test data

* update title and email

* spec test

.gitignore

@@ -49,6 +49,9 @@ bower.json
 # Ignore Byebug command history file.
 .byebug_history
 
+# Ignore Bash history file.
+.bash_history
+
 # Ignore node_modules
 node_modules/
 

Gemfile

@@ -7,7 +7,7 @@ gem 'bootsnap', require: false
 gem 'bootstrap', '~> 4.0'
 gem 'devise'
 gem 'devise-guests', '~> 0.8'
-gem 'geoblacklight', '~> 4.1.0'
+gem 'geoblacklight', '~> 4.1.1'
 gem 'importmap-rails'
 gem 'jbuilder'
 gem 'jquery-rails'

Gemfile.lock

@@ -69,12 +69,12 @@ GEM
     addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
-    autoprefixer-rails (10.4.15.0)
+    autoprefixer-rails (10.4.16.0)
       execjs (~> 2)
-    base64 (0.1.1)
-    bcrypt (3.1.19)
+    base64 (0.2.0)
+    bcrypt (3.1.20)
     bindex (0.8.1)
-    blacklight (7.34.0)
+    blacklight (7.33.0)
       deprecation
       globalid
       hashdiff
@@ -83,7 +83,7 @@ GEM
       kaminari (>= 0.15)
       ostruct (>= 0.3.2)
       rails (>= 5.1, < 7.1)
-      view_component (>= 2.66, < 4)
+      view_component (~> 2.66)
     bootsnap (1.17.0)
       msgpack (~> 1.2)
     bootstrap (4.6.2)
@@ -108,7 +108,7 @@ GEM
       dry-validation (~> 1.0, >= 1.0.0)
     connection_pool (2.4.1)
     crass (1.0.6)
-    date (3.3.3)
+    date (3.3.4)
     debug (1.8.0)
       irb (>= 1.5.0)
       reline (>= 0.3.1)
@@ -125,8 +125,7 @@ GEM
       devise
     diff-lcs (1.5.0)
     docile (1.4.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
+    domain_name (0.6.20231109)
     dry-configurable (1.1.0)
       dry-core (~> 1.0, < 2)
       zeitwerk (~> 2.6)
@@ -161,7 +160,7 @@ GEM
       zeitwerk (~> 2.6)
     erubi (1.12.0)
     execjs (2.9.1)
-    faraday (2.7.11)
+    faraday (2.7.12)
       base64
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
@@ -182,8 +181,8 @@ GEM
       rsolr
       sanitize
       thor
-    geoblacklight (4.1.0)
-      blacklight (~> 7.33)
+    geoblacklight (4.1.1)
+      blacklight (>= 7.0, <= 7.33)
       coderay
       config
       deprecation
@@ -219,7 +218,7 @@ GEM
       activesupport (>= 6.0.0)
       railties (>= 6.0.0)
     io-console (0.6.0)
-    irb (1.8.3)
+    irb (1.10.0)
       rdoc
       reline (>= 0.3.8)
     jbuilder (2.11.5)
@@ -229,7 +228,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.6.3)
+    json (2.7.0)
     json-schema (4.1.1)
       addressable (>= 2.8)
     kaminari (1.2.2)
@@ -248,7 +247,7 @@ GEM
     llhttp-ffi (0.4.0)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
-    loofah (2.21.4)
+    loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -268,21 +267,21 @@ GEM
     msgpack (1.7.2)
     net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
-    net-imap (0.4.4)
+    net-imap (0.4.7)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.2.1)
+    net-protocol (0.2.2)
       timeout
     net-smtp (0.4.0)
       net-protocol
-    nio4r (2.5.9)
-    nokogiri (1.15.4-aarch64-linux)
+    nio4r (2.7.0)
+    nokogiri (1.15.5-aarch64-linux)
       racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-darwin)
+    nokogiri (1.15.5-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-linux)
+    nokogiri (1.15.5-x86_64-linux)
       racc (~> 1.4)
     omniauth (1.9.2)
       hashie (>= 3.4.6)
@@ -292,7 +291,7 @@ GEM
       nokogiri (~> 1.5)
       omniauth (~> 1.2)
     orm_adapter (0.5.0)
-    ostruct (0.5.5)
+    ostruct (0.6.0)
     parallel (1.23.0)
     parser (3.2.2.4)
       ast (~> 2.4.1)
@@ -301,10 +300,10 @@ GEM
     popper_js (1.16.1)
     psych (5.1.1.1)
       stringio
-    public_suffix (5.0.3)
+    public_suffix (5.0.4)
     puma (5.6.7)
       nio4r (~> 2.0)
-    racc (1.7.2)
+    racc (1.7.3)
     rack (2.2.8)
     rack-test (2.1.0)
       rack (>= 1.3)
@@ -339,17 +338,17 @@ GEM
     rainbow (3.1.1)
     rake (13.1.0)
     rchardet (1.8.0)
-    rdoc (6.5.0)
+    rdoc (6.6.0)
       psych (>= 4.0.0)
     regexp_parser (2.8.2)
-    reline (0.3.9)
+    reline (0.4.1)
       io-console (~> 0.5)
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
     retriable (3.1.2)
     rexml (3.2.6)
-    rgeo (3.0.0)
+    rgeo (3.0.1)
     rgeo-geojson (2.1.1)
       rgeo (>= 1.0.0)
     rsolr (2.5.0)
@@ -363,7 +362,7 @@ GEM
     rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-rails (6.0.3)
+    rspec-rails (6.1.0)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
@@ -374,15 +373,15 @@ GEM
     rspec-support (3.12.1)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.57.2)
+    rubocop (1.58.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.2.2.4)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.30.0)
@@ -391,10 +390,11 @@ GEM
       rubocop (~> 1.41)
     rubocop-factory_bot (2.24.0)
       rubocop (~> 1.33)
-    rubocop-rails (2.22.1)
+    rubocop-rails (2.22.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
     rubocop-rspec (2.25.0)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
@@ -439,10 +439,10 @@ GEM
       sprockets (>= 3.0.0)
     stimulus-rails (1.3.0)
       railties (>= 6.0.0)
-    stringio (3.0.8)
+    stringio (3.1.0)
     thor (1.3.0)
     tilt (2.3.0)
-    timeout (0.4.0)
+    timeout (0.4.1)
     turbo-rails (1.5.0)
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)
@@ -453,11 +453,8 @@ GEM
       railties (>= 3.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
     unicode-display_width (2.5.0)
-    view_component (3.7.0)
+    view_component (2.82.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
@@ -495,7 +492,7 @@ DEPENDENCIES
   debug
   devise
   devise-guests (~> 0.8)
-  geoblacklight (~> 4.1.0)
+  geoblacklight (~> 4.1.1)
   importmap-rails
   jbuilder
   jquery-rails

app/views/layouts/blacklight/base.html.erb

@@ -8,7 +8,7 @@
     <!--  Internet Explorer use the highest version available  -->
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
-    <title>UC Berkeley GeoData Repository111</title>
+    <title>UC Berkeley GeoData Repository</title>
     <%if (gtag_id = Rails.application.config.lit_gtag_id) %>
     <!-- Google tag (gtag.js) -->
     <script async src="https://www.googletagmanager.com/gtag/js?id=G-L2R076CPK1"></script>

config/application.rb

@@ -17,7 +17,7 @@ module Geodata
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
     config.load_defaults 7.0
-    config.action_mailer.default_options = { from: 'lib-geodata@berkeley.edu' }
+    config.action_mailer.default_options = { from: 'fake@berkeley.edu' }
     config.lit_gtag_id = ENV.fetch('LIT_GTAG_ID', nil)
     # Configuration for the application, engines, and railties goes here.
     #

spec/fixtures/solr_documents/berkeley_public.json

@@ -12,7 +12,7 @@
   "dct_publisher_sm": [
     "San Benito County (Calif.) -- Information Technology"
   ],
-  "schema_provider_s": "Berkeley",
+  "schema_provider_s": "University of California Berkeley",
   "gbl_resourceClass_sm": [
     "Datasets"
   ],

spec/fixtures/solr_documents/berkeley_public_doc.json

@@ -12,7 +12,7 @@
   "dct_publisher_sm": [
     "San Benito County (Calif.) -- Information Technology"
   ],
-  "schema_provider_s": "Berkeley",
+  "schema_provider_s": "University of California Berkeley",
   "gbl_resourceClass_sm": [
     "Datasets"
   ],

spec/fixtures/solr_documents/berkeley_public_pdf.json

@@ -12,7 +12,7 @@
   "dct_publisher_sm": [
     "San Benito County (Calif.) -- Information Technology"
   ],
-  "schema_provider_s": "Berkeley",
+  "schema_provider_s": "University of California Berkeley",
   "gbl_resourceClass_sm": [
     "Datasets"
   ],

spec/fixtures/solr_documents/berkeley_restricted.json

@@ -1,45 +1,44 @@
 {
-  "dct_title_s": "City Boundaries, China, 2012", 
+  "dct_title_s": "City Boundaries, China, 2012",
   "dct_alternative_sm": [
     "City Boundaries, China"
   ],
   "dct_description_sm": [
     "This polygon dataset represents city boundaries in China from 2012. The attribute table includes the GB codes and names in Chinese and English (Pinyin). All data is copyrighted by China Data Center and/or its suppliers. Derived works that include the source data must be merged with other value-added data in such a way that the derived work cannot be converted back to the original source data format. This data is licensed by UC Berkeley for research, educational, and other non-commercial use by authorized users, which include persons affiliated with UC Berkeley and walk-in users who must access the data in person at the library.The data sources for the layers in the collection \"Administrative Boundary Maps of China, 1949-2014\" include the following primary sources: \u201cThe Historical Changes of Administrative Regions of China, 1949-1983\u201d (three volumes); \u300a\u4e2d\u534e\u4eba\u6c11\u5171\u548c\u56fd\u53bf\u7ea7\u4ee5\u4e0a\u884c\u653f\u533a\u6cbf\u9769\u300b\uff08\u4e09\u518c\uff0c1949-1983\u5e74\uff09\u201cThe Atlas of Changes of Administrative Regions of China\u201d;\u300a\u4e2d\u534e\u4eba\u6c11\u5171\u548c\u56fd\u884c\u653f\u533a\u5212\u6cbf\u9769\u5730\u56fe\u96c6\u300bThe yearly publications of \u201cThe Administrative Regions\u201d, 1985-2014; \u6bcf\u5e74\u7684\u51fa\u7248\u884c\u653f\u533a\u5212\u7b80\u518c\uff081985-2014\u5e74\uff09The web site for administrative regions: www.xzqh.org; \u884c\u653f\u533a\u5212\u7f51www.xzqh.org"
-   ],
+  ],
   "dct_language_sm": [
     "eng"
   ],
   "dct_publisher_sm": [
     "All China Marketing Research Co., Ltd."
   ],
-  "schema_provider_s": "Berkeley", 
+  "schema_provider_s": "University of California Berkeley",
   "gbl_resourceClass_sm": [
     "Datasets"
   ],
   "gbl_resourceType_sm": [
     "Polygon Data"
   ],
   "dct_subject_sm": [
-    "Boundaries", 
+    "Boundaries",
     "Administrative and Political Divisions"
-  ], 
+  ],
   "dct_issued_s": "2010-04-01",
   "gbl_indexYear_im": [
     2012
   ],
   "dct_spatial_sm": [
     "China"
-], 
-  "locn_geometry": "ENVELOPE(68.196555, 136.429552, 54.139796, 13.097289)", 
+  ],
+  "locn_geometry": "ENVELOPE(68.196555, 136.429552, 54.139796, 13.097289)",
   "dct_accessRights_s": "Restricted",
   "dct_format_s": "Shapefile",
-  "gbl_wxsIdentifier_s":  "s7b12n", 
-  "dct_references_s":  "{\"http://www.opengis.net/def/serviceType/ogc/wfs\":\"https://geoservices-secure.lib.berkeley.edu/geoserver/wfs\",\"http://www.opengis.net/def/serviceType/ogc/wms\":\"https://geoservices-secure.lib.berkeley.edu/geoserver/wms\",\"http://www.isotc211.org/schemas/2005/gmd/\":\"https://spatial.lib.berkeley.edu/metadata/berkeley-s7b12n/iso19139.xml\",\"http://schema.org/downloadUrl\":\"https://spatial.lib.berkeley.edu/UCB/berkeley-s7b12n/data.zip\"}", 
-  "id":  "berkeley-s7b12n",         
+  "gbl_wxsIdentifier_s": "s7b12n",
+  "dct_references_s": "{\"http://www.opengis.net/def/serviceType/ogc/wfs\":\"https://geoservices-secure.lib.berkeley.edu/geoserver/wfs\",\"http://www.opengis.net/def/serviceType/ogc/wms\":\"https://geoservices-secure.lib.berkeley.edu/geoserver/wms\",\"http://www.isotc211.org/schemas/2005/gmd/\":\"https://spatial.lib.berkeley.edu/metadata/berkeley-s7b12n/iso19139.xml\",\"http://schema.org/downloadUrl\":\"https://spatial.lib.berkeley.edu/UCB/berkeley-s7b12n/data.zip\"}",
+  "id": "berkeley-s7b12n",
   "dct_identifier_sm": [
     "https://spatial.lib.berkeley.edu/viewpublic/berkeley-s7b12n"
   ],
-  "gbl_mdModified_dt": "2019-06-26T23:34:35.206Z", 
+  "gbl_mdModified_dt": "2019-06-26T23:34:35.206Z",
   "gbl_mdVersion_s": "Aardvark"
-}
-
+}

spec/system/application_system_spec.rb

@@ -7,6 +7,6 @@
 
   it 'can veiw restricted data' do
     visit '/catalog/berkeley-s7b12n'
-    expect(page).to have_text('Login to View and Download')
+    expect(page).to have_text('Administrative Boundary Maps of China, 1949-2014')
   end
 end