lcms-engine 0.3.0 → 0.3.1

data/app/views/lcms/engine/documents/gdoc/_agenda.html.erb

@@ -11,7 +11,7 @@
     <td class="u-text--right o-agenda__item"><p>TIME</p></td>
   </tr>
   <% document.toc.children.each do |l1| %>
-    <% l1_excluded = l1.excluded?(excludes, document.ela?) %>
+    <% l1_excluded = l1.excluded?(excludes, ela: document.ela?) %>
     <% l1_time = l1_excluded ? l1.time : l1.time_with(excludes) %>
     <tr class="<%= 'u-text--strikethrough' if l1_excluded %>">
       <td colspan="3" class="u-txt--agenda-l1-title o-agenda__item">

data/app/views/lcms/engine/documents/show.html.erb

@@ -14,7 +14,7 @@
           Go to Lessons Admin
         <% end %>
         <%= link_to @document.file_url, class: 'o-ub-ld-btn o-ub-ld-btn--bordered', target: '_blank' do %>
-          <i class="ub-icon ub-file-gdoc"></i> Google Doc
+          <i class="fab fa-google"></i> Google Doc
         <% end %>
         <%= render partial: 'lcms/engine/admin/documents/reimport', locals: { lesson: @document, btn_class: 'o-ub-ld-btn o-ub-ld-btn--bordered' } %>
 

data/app/views/lcms/engine/materials/show.html.erb

@@ -6,7 +6,7 @@
       <div>
         <%= link_to 'Go to Materials Admin', admin_materials_path(request.query_parameters), class: 'button primary u-margin-right--base' %>
         <%= link_to @material.file_url, class: 'button primary u-margin-right--base', target: '_blank' do %>
-            <i class="ub-icon ub-file-gdoc"></i> Google Doc
+          <i class="fab fa-google"></i> Google Doc
         <% end %>
         <%= render partial: 'lcms/engine/admin/materials/reimport', locals: { material: @material, btn_size: 'default' } %>
       </div>

data/app/views/lcms/engine/resources/_download.html.erb

@@ -3,14 +3,14 @@
     <span>
       <%= link_to preview_download_path(id: download, slug: resource.slug), class: 'resource-attachment',
         data: { no_turbolink: true }, target: '_blank' do %>
-        <i class="ub-icon ub-eye" aria-hidden="true"></i>
+        <i class="fas fa-eye" aria-hidden="true"></i>
       <% end %>
     </span>
   <% end %>
   <% id = SecureRandom.hex(4) %>
   <span data-toggle="<%= id %>">
     <%= link_to download_path(download, slug: resource.slug), class: 'resource-attachment', data: { no_turbolink: true } do %>
-      <i class="ub-icon fa-lg file-<%= "#{file_icon(download.download.attachment_content_type)} #{indent}" %>"></i>
+      <i class="far fa-file-<%= "#{file_icon(download.download.attachment_content_type)} #{indent}" %>"></i>
       <%= download.download.title %>
     <% end %>
   </span>

data/app/views/lcms/engine/resources/_unit_bundles.html.erb

@@ -9,12 +9,12 @@
         <li class="o-unit-bundles__item">
           <div class="o-unit-bundles__item--links">
             <%= link_to bundle.file&.url, data: { no_turbolink: true } do %>
-              <i class="ub-icon fa-lg ub-file-zip"></i>
+              <i class="far fa-file-archive"></i>
             <% end %>
             <% if (gdoc_bundle =  resource.document_bundles.detect { |b| b.content_type == 'gdoc' }) %>
               <% if cat == 'full' %>
                 <%= link_to gdoc_bundle.url, target: '_blank', data: { no_turbolink: true } do %>
-                  <i class="ub-icon fa-lg ub-file-gdoc"></i>
+                  <i class="fab fa-google"></i>
                 <% end %>
               <% else %>
                 <span class="o-unit-bundles__item--placeholder"></span>

data/config/locales/admin/en.yml

@@ -216,7 +216,7 @@ en:
             unit_bundles: Generate Unit Bundles
           create:
             error: Error
-            success: Lesson %{name} parsed successfully.
+            success: Lesson %{name} parsed successfully. %{errors}
           new:
             page_title: Add a lesson
             submit: Parse

data/db/schema.rb

@@ -14,8 +14,8 @@
 ActiveRecord::Schema.define(version: 0) do
 
   # These are extensions that must be enabled in order to support this database
-  enable_extension "plpgsql"
   enable_extension "hstore"
+  enable_extension "plpgsql"
 
   create_table "access_codes", force: :cascade do |t|
     t.string   "code",                      null: false

data/lcms-engine.gemspec

@@ -19,12 +19,12 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- spec/*`.split("\n")
 
-  s.required_ruby_version = '>= 2.5'
+  s.required_ruby_version = '>= 2.6'
 
-  s.add_dependency 'active_model_serializers', '~> 0.10.10'
   s.add_dependency 'activejob-retry', '~> 0.6.3'
-  s.add_dependency 'acts-as-taggable-on', '~> 6.5'
+  s.add_dependency 'active_model_serializers', '~> 0.10.10'
   s.add_dependency 'acts_as_list', '~> 1.0'
+  s.add_dependency 'acts-as-taggable-on', '~> 6.5'
   s.add_dependency 'addressable', '~> 2.7'
   s.add_dependency 'airbrake', '~> 10.0'
   s.add_dependency 'autoprefixer-rails', '~> 9.7'
@@ -46,14 +46,14 @@ Gem::Specification.new do |s|
   s.add_dependency 'fog-aws', '~> 3.5', '>= 3.5.2'
   s.add_dependency 'font-awesome-sass', '~> 5.12'
   s.add_dependency 'foundation-rails', '~> 6.6', '>= 6.6.1'
-  s.add_dependency 'google-api-client', '~> 0.37.1'
+  s.add_dependency 'google-api-client', '< 1'
   s.add_dependency 'hiredis', '~> 0.6.3'
   s.add_dependency 'httparty', '~> 0.18'
   s.add_dependency 'jbuilder', '~> 2.10'
   s.add_dependency 'jquery-rails', '~> 4.3', '>= 4.3.5'
   s.add_dependency 'js-routes', '~> 1.4', '>= 1.4.9'
-  s.add_dependency 'lt-google-api', '~> 0.1.1'
-  s.add_dependency 'lt-lcms', '~> 0.3'
+  s.add_dependency 'lt-google-api', '~> 0.2', '>= 0.2.2'
+  s.add_dependency 'lt-lcms', '~> 0.4', '>= 0.4.1'
   s.add_dependency 'migration_data', '~> 0.6'
   s.add_dependency 'mini_magick', '~> 4.10', '>= 4.10.1'
   s.add_dependency 'nested_form', '~> 0.3.2'
@@ -92,13 +92,15 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'email_spec', '~> 2.1'
   s.add_development_dependency 'factory_bot', '~> 5'
   s.add_development_dependency 'faker', '~> 2.1'
-  s.add_development_dependency 'overcommit', '~> 0.49.1'
+  s.add_development_dependency 'overcommit', '~> 0.57'
   s.add_development_dependency 'pry-byebug', '~> 3.7'
   s.add_development_dependency 'pry-rails', '~> 0.3.5'
   s.add_development_dependency 'rspec-rails', '~> 3.8'
-  s.add_development_dependency 'rubocop', '~> 0.59.2'
-  s.add_development_dependency 'sdoc', '~> 1.1'
-  s.add_development_dependency 'selenium-webdriver', '~> 3.142'
+  s.add_development_dependency 'rubocop', '~> 0.93.1'
+  s.add_development_dependency 'safe_attributes', '~> 1.0.10'
+  s.add_development_dependency 'sdoc', '~> 2'
+  s.add_development_dependency 'seedbank', '~> 0.3'
+  s.add_development_dependency 'selenium-webdriver', '~> 3.142', '>= 3.142.7'
   s.add_development_dependency 'shoulda-matchers', '~> 4.1'
   s.add_development_dependency 'spring', '~> 2.1'
   s.add_development_dependency 'spring-commands-rspec', '~> 1.0'

data/lib/doc_template.rb

@@ -19,7 +19,7 @@ module DocTemplate
     sanitizer: 'Lcms::Engine::HtmlSanitizer'
   }.freeze
 
-  FULL_TAG ||= /\[([^\]:\s]*)?\s*:?\s*([^\]]*?)?\]/mo
+  FULL_TAG ||= /\[([^\]:\s]*)?\s*:?\s*([^\]]*?)?\]/mo.freeze
   START_TAG ||= '\[[^\]]*'
 
   STARTTAG_XPATH ||= 'span[contains(., "[")]'

data/lib/doc_template/objects/agenda_metadata.rb

@@ -62,7 +62,7 @@ module DocTemplate
 
       attribute :children, Array[Group]
 
-      def self.build_from(data)
+      def self.build_from(data) # rubocop:disable Metrics/AbcSize
         copy = Marshal.load Marshal.dump(data)
         agenda_data =
           copy.map do |d|

data/lib/doc_template/objects/metadata_helpers.rb

@@ -3,7 +3,7 @@
 module DocTemplate
   module Objects
     module MetadataHelpers
-      SEPARATOR = /\s*[,;]\s*/
+      SEPARATOR = /\s*[,;]\s*/.freeze
 
       def self.build_anchor_from(item)
         [

data/lib/doc_template/objects/toc_metadata.rb

@@ -18,7 +18,7 @@ module DocTemplate
         attribute :time, Integer, default: 0
         attribute :title, String
 
-        def excluded?(excludes, ela = false)
+        def excluded?(excludes, ela: false)
           # Do not exclude parent if all children are optional and deselected
           return false if ela && children.all?(&:optional)
           return excludes.exclude?(anchor) if optional
@@ -27,7 +27,7 @@ module DocTemplate
           children.any? && children.all? { |c| c.excluded?(excludes) }
         end
 
-        def time_with(excludes)
+        def time_with(excludes) # rubocop:disable Metrics/PerceivedComplexity
           # Optional and nothing to exclude explicitly
           return excludes.include?(anchor) ? time : 0 if optional
           # General and excluded explicitly

data/lib/doc_template/tables/base.rb

@@ -3,9 +3,9 @@
 module DocTemplate
   module Tables
     class Base
-      SPLIT_REGEX = /[,;\r\n]/
+      SPLIT_REGEX = /[,;\r\n]/.freeze
 
-      attr_reader :data
+      attr_reader :errors, :data
 
       def self.parse(fragment, *args)
         new.parse(fragment, *args)
@@ -13,6 +13,7 @@ module DocTemplate
 
       def initialize
         @data = {}
+        @errors = []
         @table_exists = false
       end
 

data/lib/doc_template/tags/activity_metadata_type_tag.rb

@@ -7,7 +7,7 @@ module DocTemplate
       include ERB::Util
 
       TAG_NAME = 'activity-metadata-type'
-      TASK_RE = /(\[task:\s(#)\])/i
+      TASK_RE = /(\[task:\s(#)\])/i.freeze
       TEMPLATES = {
         default: 'activity.html.erb',
         gdoc: 'gdoc/activity.html.erb'

data/lib/doc_template/tags/answer_space_tag.rb

@@ -6,7 +6,7 @@ module DocTemplate
       SPACE_SIZE = {
         s: 5, # small = 5 lines
         m: 10, # medium = 10 lines
-        l: 20, # large = 20 lines
+        l: 20 # large = 20 lines
       }.freeze
       TAG_NAME = 'answer-space'
 

data/lib/doc_template/tags/base_tag.rb

@@ -3,8 +3,8 @@
 module DocTemplate
   module Tags
     class BaseTag
-      SOFT_RETURN_RE = /([[:graph:]]+\[|\][[:graph:]]+)/
-      UNICODE_SPACES_RE = /(\u0020|\u00A0|\u1680|\u180E|[\u2000-\u200B]|\u202F|\u205F|\u3000|\uFEFF)/
+      SOFT_RETURN_RE = /([[:graph:]]+\[|\][[:graph:]]+)/.freeze
+      UNICODE_SPACES_RE = /(\u0020|\u00A0|\u1680|\u180E|[\u2000-\u200B]|\u202F|\u205F|\u3000|\uFEFF)/.freeze
 
       attr_reader :anchor, :content
 
@@ -16,7 +16,7 @@ module DocTemplate
         def tag_with_html_regexp
           raise NotImplementedError unless const_defined?(:TAG_NAME)
 
-          @tag_with_html_regexp ||= /\[[^\]]*#{self::TAG_NAME}[[^\:,;.]]*:?\s?[^\]]*\]/i
+          @tag_with_html_regexp ||= /\[[^\]]*#{self::TAG_NAME}[[^:,;.]]*:?\s?[^\]]*\]/i
         end
 
         def template_path_for(name)

data/lib/doc_template/tags/columns_tag.rb

@@ -5,7 +5,7 @@ module DocTemplate
     class ColumnsTag < BlockTag
       include ERB::Util
 
-      ALIGNMENT_RE = /^align-right\s/i
+      ALIGNMENT_RE = /^align-right\s/i.freeze
       SPLIT_SYMBOL = ';'
       TAG_NAME = 'columns'
       TEMPLATE = 'columns.html.erb'

data/lib/doc_template/tags/def_tag.rb

@@ -5,7 +5,7 @@ module DocTemplate
     class DefTag < BaseTag
       include ERB::Util
 
-      STYLE_RE = /<span (style=[^.>]*)>[^<]*$/i
+      STYLE_RE = /<span (style=[^.>]*)>[^<]*$/i.freeze
       TAG_NAME = 'def'
       TAG_SEPARATOR = '[separator]'
       TEMPLATES = {

data/lib/doc_template/tags/expand_tag.rb

@@ -27,6 +27,7 @@ module DocTemplate
         # iterates over all child nodes looking for break tag
         node.at_xpath('.//tr[2]/td').children.each do |child|
           (broken = true) && next if child.text.index("[#{BREAK_TAG_NAME}]")
+
           child.remove_attribute('class')
           child.children.each { |x| x.remove_attribute('class') }
           broken ? content_hidden.push(child) : content_visible.push(child)

data/lib/doc_template/tags/heading_tag.rb

@@ -25,7 +25,7 @@ module DocTemplate
       end
 
       def heading(value)
-        value.include?(prefix + ':') ? value : "#{prefix}: #{value}"
+        value.include?("#{prefix}:") ? value : "#{prefix}: #{value}"
       end
     end
 

data/lib/doc_template/tags/inset_tag.rb

@@ -28,8 +28,8 @@ module DocTemplate
       def preserve_styles(node, opts)
         add_css_class(node, 'o-ld-inset') if gdoc?(opts)
         node.children.each do |el|
-          el['class'] = el['class'].to_s + ' text-bold' if el['style'] =~ STYLES_REGEXP[:bold]
-          el['class'] = el['class'].to_s + ' text-italic' if el['style'] =~ STYLES_REGEXP[:italic]
+          el['class'] = "#{el['class']} text-bold" if el['style'] =~ STYLES_REGEXP[:bold]
+          el['class'] = "#{el['class']} text-italic" if el['style'] =~ STYLES_REGEXP[:italic]
         end
         node
       end

data/lib/doc_template/tags/latex_tag.rb

@@ -5,7 +5,7 @@ require 'doc_template'
 module DocTemplate
   module Tags
     class LatexTag < BaseTag
-      SPACE_RE = /[[:space:]]/
+      SPACE_RE = /[[:space:]]/.freeze
       TAG_NAME = 'latex'
 
       def self.s3_folder

data/lib/doc_template/tags/page_break_tag.rb

@@ -4,7 +4,7 @@ module DocTemplate
   module Tags
     class PageBreakTag < BaseTag
       CSS_CLASS = 'u-pdf-alwaysbreak'
-      TAG_NAME = /page(-|\s*)break/
+      TAG_NAME = /page(-|\s*)break/.freeze
       TAG_SUB = '<p>--GDOC-PAGE-BREAK--</p>'
 
       def parse(node, opts)

data/lib/doc_template/tags/pd_tag.rb

@@ -5,10 +5,10 @@ module DocTemplate
     class PdTag < BaseTag
       include Rails.application.routes.url_helpers
 
-      CG_RE = %r{/content_guides/(\d+)/}i
-      PDF_HTTP_RE = %r{^https?://}i
-      PDF_HTTP_REPLACE_RE = /^http:/i
-      PDF_RE = /\.pdf$/i
+      CG_RE = %r{/content_guides/(\d+)/}i.freeze
+      PDF_HTTP_RE = %r{^https?://}i.freeze
+      PDF_HTTP_REPLACE_RE = /^http:/i.freeze
+      PDF_RE = /\.pdf$/i.freeze
       TAG_NAME = 'pd'
       TEMPLATES = {
         default: 'pd.html.erb',

data/lib/doc_template/tags/section_tag.rb

@@ -5,9 +5,9 @@ module DocTemplate
     class SectionTag < BaseTag
       include DocTemplate::Tags::Helpers
 
-      STUDENT_RE = /^\s*student\s*resources\s*$/i
+      STUDENT_RE = /^\s*student\s*resources\s*$/i.freeze
       TAG_NAME = 'section'
-      SECTION_REMOVE_RE = /\[#{TAG_NAME}:[^\]]*\]/i
+      SECTION_REMOVE_RE = /\[#{TAG_NAME}:[^\]]*\]/i.freeze
       TEMPLATES = {
         default: 'section.html.erb',
         gdoc: 'gdoc/section.html.erb'

data/lib/doc_template/tags/standard_tag.rb

@@ -5,9 +5,9 @@ module DocTemplate
     class StandardTag < BaseTag
       include ERB::Util
 
-      STANDARD_RE = /[^\[\]]*\[(ela\.)?((rl|ri|rf|w|sl|l)\.[^\]]+)\]/i # [rl.2.2a.2]
-      TAG_NAME = /(ela\.)?((rl|ri|rf|w|sl|l)\.[^\]]+)/ # RL.2.4 or ELA.RL.2.4
-      TAG_RE = /\[[^\]]*\]/
+      STANDARD_RE = /[^\[\]]*\[(ela\.)?((rl|ri|rf|w|sl|l)\.[^\]]+)\]/i.freeze # [rl.2.2a.2]
+      TAG_NAME = /(ela\.)?((rl|ri|rf|w|sl|l)\.[^\]]+)/.freeze # RL.2.4 or ELA.RL.2.4
+      TAG_RE = /\[[^\]]*\]/.freeze
       TAG_SEPARATOR = '[separator]'
       TEMPLATES = { default: 'standard.html.erb',
                     gdoc: 'gdoc/standard.html.erb' }.freeze

data/lib/doc_template/tags/table_preserve_alignment_tag.rb

@@ -3,7 +3,7 @@
 module DocTemplate
   module Tags
     class TablePreserveAlignmentTag < BaseTag
-      STYLE_RE = /text-align:(left|center|right)/i
+      STYLE_RE = /text-align:(left|center|right)/i.freeze
       TAG_NAME = 'table-preserve-alignment'
 
       def parse(node, _options = {})

data/lib/document_exporter/gdoc/base.rb

@@ -16,7 +16,7 @@ module DocumentExporter
           send_timeout_sec: GOOGLE_API_CLIENT_UPLOAD_TIMEOUT
         }
       }.freeze
-      VERSION_RE = /_v\d+$/i
+      VERSION_RE = /_v\d+$/i.freeze
 
       attr_reader :document, :options
 

data/lib/document_renderer/part.rb

@@ -2,7 +2,7 @@
 
 module DocumentRenderer
   class Part
-    PART_RE = /{{[^}]+}}/
+    PART_RE = /{{[^}]+}}/.freeze
 
     class << self
       def call(content, options)
@@ -11,7 +11,7 @@ module DocumentRenderer
           next unless placeholder
           next unless (part = options[:parts_index][placeholder])
           next unless (subpart = part[:content])
-          next unless should_render?(part, !options[:with_optional])
+          next unless should_render?(part, omit_optional: !options[:with_optional])
 
           call subpart.to_s, options
         end
@@ -26,7 +26,7 @@ module DocumentRenderer
       # If part is not optional:
       # - just ignore it if it has been turned OFF
       #
-      def should_render?(part, omit_optional = true)
+      def should_render?(part, omit_optional: true)
         if part[:optional] && omit_optional
           false unless @excludes.include?(part[:anchor])
         elsif @excludes.include?(part[:anchor])

data/lib/elasticsearch/persistence/repository/response/results.rb

@@ -20,7 +20,7 @@ module Elasticsearch
             results.respond_to?(method_name) ? results.__send__(method_name, *arguments, &block) : super
           end
 
-          def respond_to?(method_name, include_private = false)
+          def respond_to?(method_name, include_private = false) # rubocop:disable Style/OptionalBooleanParameter
             results.respond_to?(method_name) || super
           end
 

data/lib/lcms/engine/engine.rb

@@ -67,7 +67,7 @@ module Lcms
         next unless ActiveRecord::Base.connection
 
         Dir
-          .glob(Rails.root + 'app/decorators/**/*_decorator*.rb')
+          .glob("#{Rails.root}/app/decorators/**/*_decorator*.rb")
           .each(&method(:require_dependency))
       rescue ActiveRecord::NoDatabaseError
         puts 'ActiveRecord::NoDatabaseError thrown!'

data/lib/lcms/engine/version.rb

@@ -2,7 +2,7 @@
 
 module Lcms
   module Engine
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
     RAILS_5_VERSION = 5.2
   end
 end

data/lib/lt/lcms/metadata/base_service.rb

@@ -6,7 +6,7 @@ module Lt
     module Metadata
       class BaseService
         class << self
-          attr_reader :activity_metadata, :metadata, :section_metadata
+          attr_reader :activity_metadata, :errors, :metadata, :section_metadata
 
           def materials_metadata
             raise NotImplementedError
@@ -22,6 +22,7 @@ module Lt
           end
 
           def parse(_content, *args)
+            @errors = []
             @options = args.extract_options!
           end