added layer of retries on gdrive upload + updated lt-lcms/lt-google-api

Author: shlag3n

Gemfile

@@ -18,11 +18,11 @@ gemspec
 
 gem 'lt-google-api', github: 'learningtapestry/lt-google-api',
                      branch: 'ruby-3-upgrade',
-                     ref: '3dd76b6'
+                     ref: '08cece7'
 
 gem 'lt-lcms', github: 'learningtapestry/lt-lcms',
                branch: 'ruby-3-upgrade',
-               ref: '9394667'
+               ref: 'a673e78'
 
 gem 'wicked_pdf', github: 'learningtapestry/wicked_pdf',
                   branch: 'puppeteer-support',

Gemfile.lock

@@ -1,22 +1,22 @@
 GIT
   remote: https://github.com/learningtapestry/lt-google-api.git
-  revision: 3dd76b67695ce6ddf91c80512eb3cb096b810b4b
-  ref: 3dd76b6
+  revision: 08cece7288b1a5efd30f4ff33158f54fe1b726ba
+  ref: 08cece7
   branch: ruby-3-upgrade
   specs:
-    lt-google-api (0.3.0)
-      google-apis-drive_v3 (~> 0.46)
-      googleauth (~> 1.9)
+    lt-google-api (0.3.2)
+      google-apis-drive_v3 (~> 0.66)
+      googleauth (~> 1.14)
 
 GIT
   remote: https://github.com/learningtapestry/lt-lcms.git
-  revision: 93946677b63120c132c7c2005a8f0e49700553ac
-  ref: 9394667
+  revision: a673e780638cd897f187444130274f9f41be961c
+  ref: a673e78
   branch: ruby-3-upgrade
   specs:
-    lt-lcms (0.6.0)
-      google-apis-core (~> 0.11, >= 0.11.1)
-      httparty (~> 0.18)
+    lt-lcms (0.6.2)
+      google-apis-core (~> 0.18)
+      httparty (~> 0.22)
       nokogiri (~> 1.10, >= 1.10.8)
       rubyzip (~> 2)
 
@@ -52,7 +52,8 @@ PATH
       elasticsearch-persistence (~> 7.0)
       elasticsearch-rails (~> 7.0)
       fog-aws (~> 3.5, >= 3.5.2)
-      google-api-client (< 1)
+      google-apis-drive_v3 (~> 0.66)
+      google-apis-script_v1 (~> 0.28)
       hiredis (~> 0.6.3)
       httparty (~> 0.18)
       jbuilder (~> 2.10)
@@ -359,36 +360,27 @@ GEM
     fugit (1.8.1)
       et-orbi (~> 1, >= 1.2.7)
       raabro (~> 1.4)
-    gems (1.2.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    google-api-client (0.53.0)
-      google-apis-core (~> 0.1)
-      google-apis-generator (~> 0.1)
-    google-apis-core (0.11.1)
+    google-apis-core (0.18.0)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.16.2, < 2.a)
-      httpclient (>= 2.8.1, < 3.a)
+      googleauth (~> 1.9)
+      httpclient (>= 2.8.3, < 3.a)
       mini_mime (~> 1.0)
+      mutex_m
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
-      rexml
-      webrick
-    google-apis-discovery_v1 (0.14.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-drive_v3 (0.46.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-generator (0.12.0)
-      activesupport (>= 5.0)
-      gems (~> 1.2)
-      google-apis-core (>= 0.11.0, < 2.a)
-      google-apis-discovery_v1 (~> 0.5)
-      thor (>= 0.20, < 2.a)
-    google-cloud-env (2.1.0)
+    google-apis-drive_v3 (0.66.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-script_v1 (0.28.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-cloud-env (2.2.1)
       faraday (>= 1.0, < 3.a)
-    googleauth (1.9.1)
+    google-logging-utils (0.2.0)
+    googleauth (1.14.0)
       faraday (>= 1.0, < 3.a)
-      google-cloud-env (~> 2.1)
+      google-cloud-env (~> 2.2)
+      google-logging-utils (~> 0.1)
       jwt (>= 1.4, < 3.0)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
@@ -399,7 +391,8 @@ GEM
     http-accept (1.7.0)
     http-cookie (1.0.5)
       domain_name (~> 0.5)
-    httparty (0.21.0)
+    httparty (0.23.1)
+      csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
@@ -450,6 +443,7 @@ GEM
     multipart-post (2.3.0)
     mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
+    mutex_m (0.3.0)
     net-imap (0.3.7)
       date
       net-protocol
@@ -707,7 +701,6 @@ GEM
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
       selenium-webdriver (> 3.141, < 5.0)
-    webrick (1.8.1)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -724,6 +717,7 @@ PLATFORMS
   aarch64-linux
   arm64-darwin-21
   arm64-darwin-23
+  arm64-darwin-24
   x86_64-linux
 
 DEPENDENCIES

app/forms/lcms/engine/curriculum_form.rb

@@ -11,7 +11,7 @@ class CurriculumForm
 
       def initialize(params = {})
         parsed_change_log = parse_change_log params
-        super params.merge(change_log: parsed_change_log)
+        super(params.merge(change_log: parsed_change_log))
       end
 
       def save

app/helpers/lcms/engine/resource_helper.rb

@@ -35,7 +35,7 @@ def resource_breadcrumbs_with_links(resource)
 
         [].tap do |result|
           pieces.each_with_index do |piece, idx|
-            ((result << piece) && next) if idx.zero?
+            (result << piece) && next if idx.zero?
 
             slug = Slug.build_from(pieces[0..idx])
 

app/middleware/remove_session.rb

@@ -16,11 +16,10 @@ def call(env)
     # Don't delete the session cookie if:
     #   - We're in the process of logging in (breaks CSRF for sign in form)
     #   - We're logged in (needed for Devise)
-    skip_delete = (
+    skip_delete =
       path =~ %r{^/users} ||
       user_key.present? ||
       headers[SET_COOKIE].blank?
-    )
 
     signing_out = path == '/users/sign_out'
 

app/services/lcms/engine/html_sanitizer.rb

@@ -12,7 +12,7 @@ class HtmlSanitizer # rubocop:disable Metrics/ClassLength
       SKIP_P_CHECK = %w(ul ol table).freeze
       STRIP_ELEMENTS = %w(a div h1 h2 h3 h4 h5 h6 p span table).freeze
 
-      class << self # rubocop:todo Metrics/ClassLength
+      class << self # rubocop:disable Metrics/ClassLength
         def clean_content(html, context_type)
           return html unless context_type.to_s.casecmp('gdoc').zero?
 
@@ -334,7 +334,7 @@ def post_processing_images_gdoc(nodes)
 
           css = ':not(.u-ld-not-image-wrap) > img:not([src*=googleapis]):not(.o-ld-icon):not(.o-ld-latex)'
           nodes.css(css).each do |img|
-            img = img.parent.replace(img) if img.parent.name == 'span' || img.parent.name == 'p'
+            img = img.parent.replace(img) if %w(span p).include?(img.parent.name)
             img.replace(%(
           <table class='o-simple-table o-ld-image-wrap--math'>
             <tr>
@@ -382,7 +382,7 @@ def remove_spans_wo_attrs(env)
         def remove_empty_paragraphs(env)
           node = env[:node]
 
-          node.unlink if node.element? && (node.name == 'p' || node.name == 'span') && node.inner_html.squish.blank?
+          node.unlink if node.element? && %w(p span).include?(node.name) && node.inner_html.squish.blank?
         end
 
         # replace inline borders style with width = 0 as they're not processing correct for pdf

app/services/lcms/engine/react_materials_resolver.rb

@@ -23,7 +23,7 @@ def replace_react(node, document) # rubocop:disable Metrics/PerceivedComplexity
                       else
                         JSON.parse(data)
                       end
-          node.remove && return if (raw_props['material_ids']).empty?
+          node.remove && return if raw_props['material_ids'].empty?
 
           props = PreviewsMaterialSerializer.new(raw_props, document)
           node.remove && return if props.data && props.data.empty?

config/initializers/elasticsearch.rb

@@ -6,4 +6,4 @@
   host: ENV.fetch('ELASTICSEARCH_ADDRESS', nil),
   adapter: :net_http
 )
-Hashie.logger = Logger.new('/dev/null')
+Hashie.logger = Logger.new(File::NULL)

lcms-engine.gemspec

@@ -47,7 +47,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'elasticsearch-persistence', '~> 7.0'
   s.add_dependency 'elasticsearch-rails', '~> 7.0'
   s.add_dependency 'fog-aws', '~> 3.5', '>= 3.5.2'
-  s.add_dependency 'google-api-client', '< 1'
+  s.add_dependency 'google-apis-drive_v3', '~> 0.66'
+  s.add_dependency 'google-apis-script_v1', '~> 0.28'
   s.add_dependency 'hiredis', '~> 0.6.3'
   s.add_dependency 'httparty', '~> 0.18'
   s.add_dependency 'jbuilder', '~> 2.10'

lib/doc_template/document.rb

@@ -106,7 +106,7 @@ def parse_node(node)
         context_type: @opts[:context_type],
         data: parsed_tag.tag_data,
         materials: parsed_tag.materials,
-        optional: (parsed_tag.try(:optional?) || false),
+        optional: parsed_tag.try(:optional?) || false,
         placeholder: parsed_tag.placeholder,
         part_type: tag_name.to_s.underscore
       }