lcms-engine 0.1.2 → 0.3.1

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/link_tag.rb

@@ -24,7 +24,7 @@ module DocTemplate
         label = text.present? ? "<b>#{text}</b>" : ''
         href = build_href(title, opts[:metadata])
 
-        "<a href=\"#{href}\" target=\"_blank\" title=\"#{title}\"><i class=\"fa fa-book\"></i> #{label}</a>"
+        "<a href=\"#{href}\" target=\"_blank\" title=\"#{title}\"><i class=\"fas fa-book\"></i> #{label}</a>"
       end
 
       def build_href(title, metadata)

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/doc_template/xpath_functions.rb

@@ -3,7 +3,9 @@
 module DocTemplate
   class XpathFunctions
     def case_insensitive_equals(node_set, str_to_match)
-      node_set.find_all { |node| node.to_s.casecmp(str_to_match).zero? }
+      return node_set.to_s.squish.casecmp(str_to_match).zero? if node_set.is_a?(String)
+
+      node_set.find_all { |node| node.to_s.squish.casecmp(str_to_match).zero? }
     end
 
     def case_insensitive_contains(node_set, str_to_match)

data/lib/document_exporter/base.rb

@@ -50,11 +50,10 @@ module DocumentExporter
 
     def render_template(path, layout:)
       field = path.starts_with?('/') ? :file : :template
-      # Using backport of Rails 5 Renderer here
       Lcms::Engine::ApplicationController.render(
         field => path,
         layout: layout,
-        locals: { document: @document, options: @options }
+        assigns: { document: @document, options: @options }
       )
     end
 

data/lib/document_exporter/docx.rb

@@ -15,7 +15,6 @@ module DocumentExporter
     private
 
     def content
-      # Using backport of Rails 5 Renderer here
       @content ||= ApplicationController.render(
         layout: 'ld_docx',
         locals: { :@document => @document },

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/generators/lcms/engine/install/install_generator.rb

@@ -13,13 +13,10 @@ module Lcms
         end
 
         def update_gemfile
-          # Rails-assets.org is needed to fetch required gems (rails-assets-*)
-          add_source 'https://rails-assets.org'
-
           # Required by lcms-engine because of unpublished gems are not automatically installed with the parent gem
           gem 'wicked_pdf', git: 'https://github.com/learningtapestry/wicked_pdf.git',
                             branch: 'puppeteer-support',
-                            ref: 'c807f6b4'
+                            ref: '964a090'
         end
       end
     end

data/lib/generators/lcms/engine/install/templates/config/lcms.yml

@@ -48,4 +48,4 @@ sanitizer: '::Lcms::Engine::HtmlSanitizer'
 # material_preview_job:
 
 queries:
-  document: 'AdminDocumentsQuery'
+  document: '::Lcms::Engine::AdminDocumentsQuery'

data/lib/lcms/engine/engine.rb

@@ -3,12 +3,10 @@
 require 'active_job'
 require 'acts-as-taggable-on'
 require 'active_model_serializers'
-require 'backport_new_renderer'
 require 'carrierwave'
 require 'carrierwave/orm/activerecord'
 require 'closure_tree'
 require 'devise'
-require 'heap'
 require 'jquery-rails'
 require 'pdfjs_viewer-rails'
 require 'ransack'
@@ -26,13 +24,6 @@ require 'font-awesome-sass'
 require 'foundation-rails'
 require 'js-routes'
 require 'nested_form'
-require 'rails-assets-classnames'
-require 'rails-assets-es6-promise'
-require 'rails-assets-eventemitter3'
-require 'rails-assets-fetch'
-require 'rails-assets-jstree'
-require 'rails-assets-lodash'
-require 'rails-assets-selectize'
 require 'webpacker'
 
 # LearningTapestry gems
@@ -76,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!'
@@ -131,21 +122,6 @@ module Lcms
         )
       end
 
-      ENABLE_CACHING = ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(
-        ENV.fetch('ENABLE_CACHING', true)
-      )
-
-      if ENABLE_CACHING
-        redis_url = ENV.fetch('REDIS_URL', 'redis://localhost:6379')
-        config.cache_store = :readthis_store, {
-          expires_in: 1.hour.to_i,
-          namespace: 'unbounded',
-          redis: { url: redis_url, driver: :hiredis }
-        }
-      else
-        config.cache_store = :null_store
-      end
-
       # NOTE: Sample to customize the layout
       # config.to_prepare do
       #   Devise::SessionsController.layout "layout_for_sessions_controller"

data/lib/lcms/engine/migration.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative 'version'
+
 module Lcms
   module Engine
     if Rails::VERSION::MAJOR >= 5

data/lib/lcms/engine/version.rb

@@ -2,7 +2,7 @@
 
 module Lcms
   module Engine
-    VERSION = '0.1.2'
+    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
 

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

@@ -9,7 +9,7 @@ module Lt
       class Context
         attr_reader :context
 
-        NUM_RE = /\d+/
+        NUM_RE = /\d+/.freeze
 
         class << self
           #
@@ -17,11 +17,11 @@ module Lt
           # Is used inside `#find_or_create_resource` method
           #
           def update_grades_level_position_for(grades)
-            update_level_position_for(grades) { |m| ::Lcms::Engine::Grades::GRADES.index(m.metadata['grade']) }
+            update_level_position_for(grades) { |g| ::Lcms::Engine::Grades.grades.index(g.metadata['grade']) }
           end
 
           #
-          # Fix level position for modules (guidebooks)
+          # Fix level position for modules
           # Is used inside `#find_or_create_resource` method
           #
           def update_modules_level_position_for(modules)
@@ -30,11 +30,11 @@ module Lt
           end
 
           #
-          # Fix level position for units (sections)
+          # Fix level position for units
           # Is used inside `#find_or_create_resource` method
           #
           def update_units_level_position_for(units)
-            update_level_position_for(units) { |m| m.metadata['unit'][NUM_RE].to_i }
+            update_level_position_for(units) { |u| u.metadata['unit'][NUM_RE].to_i }
           end
 
           #
@@ -103,8 +103,6 @@ module Lt
             else
               set_lesson_position(parent, resource)
             end
-
-            parent = resource
           end
 
           update resource
@@ -292,7 +290,7 @@ module Lt
         def set_lesson_position(parent, resource)
           next_lesson = parent.children.detect do |r|
             # first lesson with a bigger lesson num
-            r.lesson_number > context[:lesson].to_i
+            r.metadata['lesson'].to_s[NUM_RE].to_i > context[:lesson].to_s[NUM_RE].to_i
           end
           next_lesson ? next_lesson.prepend_sibling(resource) : resource.save!
         end

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

@@ -35,13 +35,15 @@ module Lt
             )
           end
 
-          def parse(content, *args)
+          def parse(content, *args) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
             super
             if material?
               @metadata = DocTemplate::Tables::MaterialMetadata.parse content
+              @errors.concat @metadata.errors
               raise ::MaterialError, 'No metadata present' if !@metadata&.table_exist? || @metadata&.data&.empty?
             else
               @metadata = DocTemplate::Tables::Metadata.parse content
+              @errors.concat @metadata.errors
               raise ::DocumentError, 'No metadata present' unless @metadata&.table_exist?
 
               @agenda = DocTemplate::Tables::Agenda.parse content

data/lib/resque_job.rb

@@ -17,7 +17,8 @@ module ResqueJob
     end
 
     def find_in_queue_by_payload(job_class, &block)
-      result = Resque.peek(:default, 0, 0)
+      jobs = Array.wrap Resque.peek(queue_name, 0, 0)
+      result = jobs
                  .select { |j| j['args'].first['job_class'] == job_class.to_s }
                  .flat_map { |j| j['args'] }
       return result unless block_given?
@@ -46,11 +47,7 @@ module ResqueJob
     end
 
     def fetch_result(job_id)
-      res = Resque.redis.multi do
-        key = result_key(job_id)
-        Resque.redis.get key
-        Resque.redis.del key
-      end.first
+      res = Resque.redis.get result_key(job_id)
       JSON.parse(res) rescue res
     end
 

data/lib/standard_importer.rb

@@ -20,7 +20,7 @@ class StandardImporter
 
   private
 
-  RE_EMPHASIS = /^\(\+\)\s?/
+  RE_EMPHASIS = /^\(\+\)\s?/.freeze
 
   attr_reader :source_file, :subject
 
@@ -45,10 +45,10 @@ class StandardImporter
 
     return grades if to_name.blank?
 
-    from_idx = Grades::GRADES_ABBR.index from_name
-    to_idx = Grades::GRADES_ABBR.index from_name
+    from_idx = Grades.grades_abbrevs.index from_name
+    to_idx = Grades.grades_abbrevs.index from_name
 
-    Grades::GRADES_ABBR.slice(from_idx..to_idx).each { |name| grades << find_grade(name) }
+    Grades.grades_abbrevs.slice(from_idx..to_idx).each { |name| grades << find_grade(name) }
 
     grades.compact
   end