fixed rubocop & updated version

shlag3n · shlag3n · commit e723f45f1e8a · 2025-05-30T20:28:22.000+04:00
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -18,6 +18,9 @@ AllCops:
   NewCops: enable
   TargetRubyVersion: 2.7
 
+Gemspec/DevelopmentDependencies:
+  Enabled: false
+
 Layout/LineLength:
   Max: 120
 
diff --git a/app/controllers/lcms/engine/admin/documents_controller.rb b/app/controllers/lcms/engine/admin/documents_controller.rb
@@ -127,10 +127,10 @@ def reimport_lesson_materials
 
         def set_query_params
           @query_params = params[:query]
-            &.permit(
-              :broken_materials, :course, :grade, :inactive, :locale, :module, :only_failed, :reimport_required,
-              :search_term, :sort_by
-            ) || {}
+                            &.permit(
+                              :broken_materials, :course, :grade, :inactive, :locale, :module, :only_failed,
+                              :reimport_required, :search_term, :sort_by
+                            ) || {}
         end
       end
     end
diff --git a/app/controllers/lcms/engine/admin/materials_controller.rb b/app/controllers/lcms/engine/admin/materials_controller.rb
@@ -103,10 +103,10 @@ def gdoc_files_from(url)
 
         def set_query_params
           @query_params = params[:query]
-            &.permit(
-              :course, :lesson, :name_date, :orientation, :search_term, :search_file_name, :sort_by, :title, :type,
-              :unit
-            ) || {}
+                            &.permit(
+                              :course, :lesson, :name_date, :orientation, :search_term, :search_file_name, :sort_by,
+                              :title, :type, :unit
+                            ) || {}
         end
       end
     end
diff --git a/app/entities/lcms/engine/external_page.rb b/app/entities/lcms/engine/external_page.rb
@@ -11,7 +11,7 @@ class ExternalPage
       attribute :description, String
       attribute :permalink, String
       attribute :slug, String
-      attribute :keywords, Array[String], default: []
+      attribute :keywords, [String], default: []
       attribute :teaser, String
       attribute :title, String
 
diff --git a/app/forms/lcms/engine/curriculum_form.rb b/app/forms/lcms/engine/curriculum_form.rb
@@ -7,11 +7,11 @@ class CurriculumForm
       include Virtus.model
       include ActiveModel::Model
 
-      attribute :change_log, Array[Hash]
+      attribute :change_log, [Hash]
 
       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
diff --git a/app/helpers/lcms/engine/resource_helper.rb b/app/helpers/lcms/engine/resource_helper.rb
@@ -46,7 +46,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])
 
diff --git a/app/helpers/lcms/engine/view_helper.rb b/app/helpers/lcms/engine/view_helper.rb
@@ -105,7 +105,7 @@ def color_code(model, base: false)
 
       def selected_id?(id)
         selected_ids = params[:selected_ids]
-        return unless selected_ids.present?
+        return false unless selected_ids.present?
 
         case selected_ids
         when Array
diff --git a/app/interactors/lcms/engine/explore_curriculum_interactor.rb b/app/interactors/lcms/engine/explore_curriculum_interactor.rb
@@ -57,7 +57,7 @@ def expanded_props
 
         {
           active: active_branch,
-          expanded: expanded? ? true : nil,
+          expanded: expanded? || nil,
           results: grades.map do |curr|
             CurriculumResourceSerializer.new(
               curr,
diff --git a/app/middleware/remove_session.rb b/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'
 
diff --git a/app/models/lcms/engine/search/document.rb b/app/models/lcms/engine/search/document.rb
@@ -22,10 +22,10 @@ class Document < ElasticSearchDocument
         attribute :position, String
         attribute :slug, String
         attribute :subject, String
-        attribute :tag_authors, Array[String]
-        attribute :tag_keywords, Array[String]
-        attribute :tag_standards, Array[String]
-        attribute :tag_texts, Array[String]
+        attribute :tag_authors, [String]
+        attribute :tag_keywords, [String]
+        attribute :tag_standards, [String]
+        attribute :tag_texts, [String]
         attribute :teaser, String
         attribute :title, String
 
diff --git a/app/models/lcms/engine/search/repository.rb b/app/models/lcms/engine/search/repository.rb
@@ -166,11 +166,9 @@ def tags_query(term, tags, options)
             query: {
               bool: {
                 filter: [],
-                should: tags.map { |t| { match: { t => term } } }.concat(
-                  [
-                    { match_phrase: { title: term } },
-                    { match_phrase: { teaser: term } }
-                  ]
+                should: tags.map { |t| { match: { t => term } } }.push(
+                  { match_phrase: { title: term } },
+                  { match_phrase: { teaser: term } }
                 ),
                 minimum_should_match: 1
               }
diff --git a/app/models/lcms/engine/user.rb b/app/models/lcms/engine/user.rb
@@ -40,7 +40,7 @@ def ready_to_go?
       private
 
       def access_code_valid?
-        return if AccessCode.by_code(access_code).exists?
+        return false if AccessCode.by_code(access_code).exists?
 
         errors.add :access_code, 'not found'
       end
diff --git a/app/serializers/lcms/engine/curriculum_resource_serializer.rb b/app/serializers/lcms/engine/curriculum_resource_serializer.rb
@@ -7,7 +7,7 @@ class CurriculumResourceSerializer < ActiveModel::Serializer
                  :resource,  :type, :unit_count, :unit_sizes
 
       def initialize(object, options = {})
-        super(object, options)
+        super
         @depth = options[:depth] || 0
         @depth_branch = options[:depth_branch]
       end
diff --git a/app/services/lcms/engine/google/drive_service.rb b/app/services/lcms/engine/google/drive_service.rb
@@ -15,15 +15,15 @@ def self.build(document, options = {})
         end
 
         def copy(file_ids, folder_id = parent)
-          super file_ids, folder_id
+          super
         end
 
         def create_folder(folder_name, parent_id = FOLDER_ID)
-          super folder_name, parent_id
+          super
         end
 
         def initialize(document, options)
-          super google_credentials
+          super(google_credentials)
           @document = document
           @options = options
         end
diff --git a/app/services/lcms/engine/html_sanitizer.rb b/app/services/lcms/engine/html_sanitizer.rb
@@ -332,7 +332,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>
@@ -380,7 +380,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
diff --git a/app/services/lcms/engine/react_materials_resolver.rb b/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?
diff --git a/config/initializers/elasticsearch.rb b/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)
diff --git a/lib/doc_template/document.rb b/lib/doc_template/document.rb
@@ -181,7 +181,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.underscore
       }
diff --git a/lib/doc_template/objects/activity_metadata.rb b/lib/doc_template/objects/activity_metadata.rb
@@ -35,14 +35,14 @@ class Activity
         attribute :title, String, default: ->(a, _) { a.activity_title }
         attribute :time, Integer, default: ->(a, _) { a.activity_time }
 
-        attribute :material_ids, Array[Integer], default: []
+        attribute :material_ids, [Integer], default: []
 
         def activity_standard_info
           standard_info [activity_standard, activity_mathematical_practice]
         end
       end
 
-      attribute :children, Array[Activity]
+      attribute :children, [Activity]
       attribute :idx, Integer
       attribute :task_counter, Hash[String => Integer], default: {} # rubocop:disable Style/HashConversion
 
diff --git a/lib/doc_template/objects/agenda_metadata.rb b/lib/doc_template/objects/agenda_metadata.rb
@@ -23,7 +23,7 @@ class MetaData
       class Section
         include Virtus.model
 
-        attribute :icons, Array[String], default: []
+        attribute :icons, [String], default: []
         attribute :materials, String
         attribute :metacognition, MetaCognition
         attribute :metadata, MetaData
@@ -40,13 +40,13 @@ class Section
         attribute :time, Integer, default: ->(s, _) { s.metadata.time }
         attribute :use_color, Boolean, default: false
 
-        attribute :material_ids, Array[Integer], default: []
+        attribute :material_ids, [Integer], default: []
       end
 
       class Group
         include Virtus.model
 
-        attribute :children, Array[Section]
+        attribute :children, [Section]
         attribute :metadata, MetaData
         attribute :title, String
 
@@ -57,10 +57,10 @@ class Group
         attribute :level, Integer, default: 1
         attribute :time, Integer, default: ->(g, _) { g.metadata.time }
 
-        attribute :material_ids, Array[Integer], default: []
+        attribute :material_ids, [Integer], default: []
       end
 
-      attribute :children, Array[Group]
+      attribute :children, [Group]
 
       def self.build_from(data) # rubocop:disable Metrics/AbcSize
         copy = Marshal.load Marshal.dump(data)
diff --git a/lib/doc_template/objects/sections_metadata.rb b/lib/doc_template/objects/sections_metadata.rb
@@ -10,7 +10,7 @@ class Section
         include Virtus.model
         include DocTemplate::Objects::MetadataHelpers
 
-        attribute :children, Array[DocTemplate::Objects::ActivityMetadata::Activity]
+        attribute :children, [DocTemplate::Objects::ActivityMetadata::Activity]
         attribute :summary, String
         attribute :time, Integer, default: 0
         attribute :title, String
@@ -22,7 +22,7 @@ class Section
         attribute :level, Integer, default: 1
         attribute :anchor, String, default: ->(a, _) { DocTemplate::Objects::MetadataHelpers.build_anchor_from(a) }
 
-        attribute :material_ids, Array[Integer], default: []
+        attribute :material_ids, [Integer], default: []
 
         def add_activity(activity)
           self.time += activity.time.to_i
@@ -35,7 +35,7 @@ def section_standard_info
         end
       end
 
-      attribute :children, Array[Section]
+      attribute :children, [Section]
       attribute :idx, Integer
 
       def self.build_from(data, template_type)
diff --git a/lib/doc_template/objects/toc_metadata.rb b/lib/doc_template/objects/toc_metadata.rb
@@ -9,9 +9,9 @@ class Heading
         include Virtus.model
 
         attribute :anchor, String
-        attribute :children, Array[Heading], default: []
+        attribute :children, [Heading], default: []
         attribute :level, Integer
-        attribute :material_ids, Array[Integer], default: []
+        attribute :material_ids, [Integer], default: []
         attribute :optional, Boolean, default: false
         attribute :priority, Integer, default: 0
         attribute :standard, String, default: ''
@@ -45,7 +45,7 @@ def time_with(excludes)
         end
       end
 
-      attribute :children, Array[Heading], default: []
+      attribute :children, [Heading], default: []
       attribute :priority, Integer, default: 0
       attribute :total_time, Integer, default: ->(t, _) { t.children.sum(&:time) }
 
diff --git a/lib/document_exporter/gdoc/base.rb b/lib/document_exporter/gdoc/base.rb
@@ -52,11 +52,13 @@ def export
           upload_source: StringIO.new(content)
         }.merge(GOOGLE_API_UPLOAD_OPTIONS)
 
-        @id = if file_id.blank?
-                drive_service.service.create_file(metadata, params)
-              else
-                drive_service.service.update_file(file_id, metadata, params)
-              end.id
+        @id = Retriable.retriable(base_interval: 1, tries: GOOGLE_API_CLIENT_UPLOAD_RETRIES) do
+          if file_id.present?
+            drive_service.service.update_file(file_id, metadata, params)
+          else
+            drive_service.service.create_file(metadata, params)
+          end.id
+        end
 
         post_processing
 
diff --git a/lib/lcms/engine/version.rb b/lib/lcms/engine/version.rb
@@ -2,7 +2,7 @@
 
 module Lcms
   module Engine
-    VERSION = '0.5.6'
+    VERSION = '0.5.7'
     RAILS_5_VERSION = 5.2
   end
 end
diff --git a/lib/lti/thin_common_cartridge.rb b/lib/lti/thin_common_cartridge.rb
@@ -7,6 +7,10 @@ module Lti
   class ThinCommonCartridge
     attr_reader :links
 
+    LTI_LINK_RESOURCE_TYPE = 'imsbasiclti_xmlv1p0'
+    MANIFEST_FILEPATH = ::Lcms::Engine::Engine.root.join 'lib', 'lti', 'xml', 'imsmanifest.xml'
+    LTI_LINK_FILEPATH = ::Lcms::Engine::Engine.root.join 'lib', 'lti', 'xml', 'lti_link.xml'
+
     def initialize(items)
       @items = Array.wrap items
       @xml = File.open(File.expand_path MANIFEST_FILEPATH) { |f| Nokogiri::XML(f) }
@@ -28,10 +32,6 @@ def manifest
 
     private
 
-    LTI_LINK_RESOURCE_TYPE = 'imsbasiclti_xmlv1p0'
-    MANIFEST_FILEPATH = ::Lcms::Engine::Engine.root.join 'lib', 'lti', 'xml', 'imsmanifest.xml'
-    LTI_LINK_FILEPATH = ::Lcms::Engine::Engine.root.join 'lib', 'lti', 'xml', 'lti_link.xml'
-
     attr_reader :items, :link_template, :xml
 
     def add_item(item, parent)
diff --git a/lib/standard_importer.rb b/lib/standard_importer.rb
@@ -21,6 +21,7 @@ def run
   private
 
   RE_EMPHASIS = /^\(\+\)\s?/.freeze
+  private_constant :RE_EMPHASIS
 
   attr_reader :source_file, :subject
 
diff --git a/lib/tasks/cleanup.rake b/lib/tasks/cleanup.rake
@@ -52,7 +52,7 @@ namespace :cleanup do # rubocop:disable Metrics/BlockLength
       folder_id = ENV.fetch('GOOGLE_APPLICATION_PREVIEW_FOLDER_ID')
 
       service = Google::Apis::DriveV3::DriveService.new
-      service.authorization = ::Lt::Google::Api::Auth::Cli.new.credentials
+      service.authorization = Lt::Google::Api::Auth::Cli.new.credentials
       service
         .list_files(q: "'#{folder_id}' in parents")
         .files.each { |file| service.delete_file file.id }
diff --git a/lib/tasks/google.rake b/lib/tasks/google.rake
@@ -7,7 +7,7 @@ require 'lt/google/api/auth/cli'
 namespace :google do
   desc 'Set up google credentials. Specify `domain` argument which will be used as a base for redirect URI'
   task :setup_auth, [:domain] => [:environment] do |_task, args|
-    service = ::Lt::Google::Api::Auth::Cli.new
+    service = Lt::Google::Api::Auth::Cli.new
 
     # Check if there is existing auth token
     if service.credentials.present?
@@ -32,7 +32,7 @@ namespace :google do
     code = $stdin.gets.to_s.strip
 
     authorizer.get_and_store_credentials_from_code(
-      user_id: ::Lt::Google::Api::Auth::Cli::USER_ID,
+      user_id: Lt::Google::Api::Auth::Cli::USER_ID,
       code: code,
       base_url: args[:domain]
     )
diff --git a/spec/controllers/admin/curriculums_controller_spec.rb b/spec/controllers/admin/curriculums_controller_spec.rb
diff --git a/spec/controllers/admin/documents_controller_spec.rb b/spec/controllers/admin/documents_controller_spec.rb
diff --git a/spec/controllers/admin/materials_controller_spec.rb b/spec/controllers/admin/materials_controller_spec.rb
diff --git a/spec/dummy/config/environments/production.rb b/spec/dummy/config/environments/production.rb
diff --git a/spec/factories/resources.rb b/spec/factories/resources.rb
diff --git a/spec/features/admin/materials/add_material_spec.rb b/spec/features/admin/materials/add_material_spec.rb
diff --git a/spec/lib/doc_template/tables/base_spec.rb b/spec/lib/doc_template/tables/base_spec.rb
diff --git a/spec/lib/doc_template/tags/base_tag_spec.rb b/spec/lib/doc_template/tags/base_tag_spec.rb
diff --git a/spec/lib/doc_template/tags/gls_tag_spec.rb b/spec/lib/doc_template/tags/gls_tag_spec.rb
diff --git a/spec/lib/lt/lcms/metadata/context_spec.rb b/spec/lib/lt/lcms/metadata/context_spec.rb
diff --git a/spec/lib/lt/lcms/metadata/service_spec.rb b/spec/lib/lt/lcms/metadata/service_spec.rb
diff --git a/spec/models/search/elastic_search_document_spec.rb b/spec/models/search/elastic_search_document_spec.rb
diff --git a/spec/services/document_build_service_spec.rb b/spec/services/document_build_service_spec.rb
diff --git a/spec/services/html_sanitizer_spec.rb b/spec/services/html_sanitizer_spec.rb

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ def expanded_props`
`57`	`57`
`58`	`58`	`{`
`59`	`59`	`active: active_branch,`
`60`		`- expanded: expanded? ? true : nil,`
	`60`	`+ expanded: expanded? \|\| nil,`
`61`	`61`	`results: grades.map do \|curr\|`
`62`	`62`	`CurriculumResourceSerializer.new(`
`63`	`63`	`curr,`