SRCH-4972: Update Ruby to version 3.3.0

.circleci/config.yml

@@ -61,8 +61,8 @@ workflows:
           matrix:
             parameters:
               ruby_version:
-                - 3.0.5
                 - 3.0.6
+                - 3.3.0
                 # not yet compatible with 3.1 or 3.2
               elasticsearch_version:
                 - 7.17.7

Dockerfile

@@ -1,4 +1,4 @@
-ARG RUBY_VERSION=3.0.6
+ARG RUBY_VERSION=3.3.0
 FROM public.ecr.aws/docker/library/ruby:$RUBY_VERSION-slim as base
 
 WORKDIR /rails

Dockerfile.dev

@@ -1,4 +1,4 @@
-FROM ruby:3.0.6
+FROM ruby:3.3.0
 WORKDIR /usr/src/app
 EXPOSE 3300
 

app/queries/terms_filter.rb

@@ -10,6 +10,7 @@ def query_body
     builder = Jbuilder.new do |json|
       filtered_query(json)
     end
+
     builder.attributes!
   end
 

app/workers/mrss_photos_importer.rb

@@ -32,9 +32,9 @@ def get_photos
   end
 
   def store_photos(mrss_entries)
-    mrss_entries.collect do |mrss_entry|
+    mrss_entries.filter_map do |mrss_entry|
       store_photo(mrss_entry)
-    end.compact.select(&:persisted?)
+    end.select(&:persisted?)
   end
 
   def store_photo(mrss_entry)
@@ -59,7 +59,7 @@ def store_photo(mrss_entry)
 
   def get_attributes(mrss_entry)
     { id: mrss_entry.entry_id, mrss_names: [@mrss.name], title: mrss_entry.title, description: mrss_entry.summary,
-      taken_at: mrss_entry.published, url: mrss_entry.url, thumbnail_url: mrss_entry.thumbnail_url }
+      taken_at: mrss_entry.pub_date || mrss_entry.published, url: mrss_entry.url, thumbnail_url: mrss_entry.thumbnail_url }
   end
 
   def fetch_xml(url)

lib/feedjira/parser/oasis/mrss.rb

@@ -12,7 +12,6 @@ class Mrss
         element :title
         element :link
         element :description
-
         elements :item, as: :entries, class: Oasis::MrssEntry
 
         attr_accessor :feed_url

lib/feedjira/parser/oasis/mrss_entry.rb

@@ -9,20 +9,15 @@ class MrssEntry
 
         element :guid, as: :entry_id
         element :'dc:identifier', as: :entry_id
-
         element :title
-
         element :link, as: :url
-
-        element :pubDate, as: :published
-        element :pubdate, as: :published
-        element :'dc:date', as: :published
-        element :'dc:Date', as: :published
-        element :'dcterms:created', as: :published
-        element :issued, as: :published
-
+        element :pubDate, as: :pub_date
+        element :pubdate, as: :pub_date
+        element :'dc:date', as: :pub_date
+        element :'dc:Date', as: :pub_date
+        element :'dcterms:created', as: :pub_date
+        element :issued, as: :pub_date
         element 'media:thumbnail', value: :url, as: :thumbnail_url
-
         element :description, as: :summary
         element 'media:description', as: :summary
         element 'content:encoded', as: :summary

spec/parsers/mrss_entry_spec.rb

@@ -32,7 +32,7 @@
       end
 
       it 'has the correct published time' do
-        expect(entry.published).to eq(Time.parse('2014-10-22 14:24:00Z'))
+        expect(entry.pub_date.to_time).to eq(Time.parse('2014-10-22 14:24:00Z'))
       end
     end
   end

spec/workers/mrss_photos_importer_spec.rb

@@ -40,13 +40,13 @@
       end
 
       it 'indexes the photos' do
-        expect { perform }.to change{ MrssPhoto.count }.from(0).to(4)
+        expect { perform }.to change { MrssPhoto.count }.from(0).to(4)
       end
     end
 
     context 'when MRSS photo entries are returned' do
       it 'indexes the photos' do
-        expect { perform }.to change{ MrssPhoto.count }.from(0).to(4)
+        expect { perform }.to change { MrssPhoto.count }.from(0).to(4)
       end
 
       it 'indexes the expected content' do
@@ -89,7 +89,7 @@
         [photo1, photo2]
       end
 
-      let(:feed) { double(Feedjira::Parser::Oasis::Mrss, entries: photos) }
+      let(:feed) { instance_double(Feedjira::Parser::Oasis::Mrss, entries: photos) }
 
       before do
         allow(Feedjira::Feed).to receive(:parse).with(mrss_xml) { feed }
@@ -141,9 +141,7 @@
         expect(already_exists.title).to eq('initial title')
         expect(already_exists.description).to eq('initial description')
         expect(already_exists.tags).to match_array(%w[tag1 tag2])
-        expect(already_exists.mrss_names).to match_array(
-          ['existing_mrss_name', mrss_profile.name]
-        )
+        expect(already_exists.mrss_names).to match_array(['existing_mrss_name', mrss_profile.name])
       end
     end