Merge pull request #82 from pulibrary/i81-jrgriffiniii-thesis-json-fails

Upgrading to support Ruby 3.2 releases

.circleci/config.yml

@@ -5,7 +5,7 @@ jobs:
     working_directory: ~/orangetheses
 
     docker:
-      - image: cimg/ruby:3.1-browsers
+      - image: cimg/ruby:3.2-browsers
         environment:
           RAILS_ENV: test
 
@@ -59,7 +59,7 @@ jobs:
     working_directory: ~/orangetheses
 
     docker:
-      - image: cimg/ruby:3.1-browsers
+      - image: cimg/ruby:3.2-browsers
         environment:
           RAILS_ENV: test
 

lib/orangetheses/dataspace_document.rb

@@ -30,7 +30,7 @@ def embargo_terms_field
     end
 
     def embargo_date_fields
-      @embargo_date_fields ||= (embargo_lift_field || embargo_terms_field)
+      @embargo_date_fields ||= embargo_lift_field || embargo_terms_field
     end
 
     def embargo_date_field

lib/orangetheses/fetcher.rb

@@ -6,6 +6,7 @@
 require 'openssl'
 require 'retriable'
 require 'logger'
+require 'pry'
 
 # Do not fail if SSL negotiation with DSpace isn't working
 OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
@@ -218,15 +219,24 @@ def api_communities
       @api_communities ||= begin
         response = api_client.get("#{@server}/communities/")
         response.body
+      rescue StandardError => e
+        Faraday.logger.warn(e)
+        '[]'
       end
     end
 
+    def json_api_communities
+      @json_api_communities ||= JSON.parse(api_communities)
+    end
+
     ##
     # Parse the JSON feed containing all of the communities, and return only the
     # community that matches the handle.
     # @return [JSON] a json representation of the DSpace community
     def api_community
-      @api_community ||= JSON.parse(api_communities).find { |c| c['handle'] == @community }
+      return if json_api_communities.empty?
+
+      @api_community ||= json_api_communities.find { |c| c['handle'] == @community }
     end
 
     ##

lib/orangetheses/indexer.rb

@@ -8,6 +8,7 @@
 require 'iso-639'
 require 'yaml'
 require 'erb'
+require 'ostruct'
 
 module Orangetheses
   class Indexer

lib/orangetheses/visual.rb

@@ -91,7 +91,7 @@ def initialize(solr_server = nil)
       solr_server ||= self.class.default_solr_url
 
       @tmpdir = Dir.mktmpdir
-      @solr = RSolr.connect(url: solr_server, read_timeout: 120, open_timeout: 120)
+      @solr = RSolr.connect(url: solr_server, timeout: 120, open_timeout: 120)
       @logger = Logger.new($stdout)
       @logger.level = Logger::INFO
       @logger.formatter = proc do |severity, datetime, _progname, msg|