lcms-engine 0.1.2 → 0.3.1

data/app/models/lcms/engine/settings.rb

@@ -2,7 +2,7 @@
 
 module Lcms
   module Engine
-    class Settings < ActiveRecord::Base
+    class Settings < ApplicationRecord
       class << self
         def [](key)
           settings.data[key.to_s]

data/app/models/lcms/engine/social_thumbnail.rb

@@ -2,7 +2,7 @@
 
 module Lcms
   module Engine
-    class SocialThumbnail < ActiveRecord::Base
+    class SocialThumbnail < ApplicationRecord
       MEDIAS = %w(all facebook pinterest twitter).freeze
 
       mount_uploader :image, SocialThumbnailUploader

data/app/models/lcms/engine/staff_member.rb

@@ -2,7 +2,7 @@
 
 module Lcms
   module Engine
-    class StaffMember < ActiveRecord::Base
+    class StaffMember < ApplicationRecord
       validates :first_name, :last_name, presence: true
       validates :bio, length: { maximum: 4096 }
       enum staff_type: { staff: 1, board: 2 }

data/app/models/lcms/engine/standard.rb

@@ -2,7 +2,7 @@
 
 module Lcms
   module Engine
-    class Standard < ActiveRecord::Base
+    class Standard < ApplicationRecord
       # NOTE: #954 - to be removed?
       ALT_NAME_REGEX = {
         'ela' => /^[[:alpha:]]+\.(k|pk|\d+)\.\d+(\.[[:alnum:]]+)?$/,

data/app/models/lcms/engine/standard_link.rb

@@ -2,7 +2,7 @@
 
 module Lcms
   module Engine
-    class StandardLink < ActiveRecord::Base
+    class StandardLink < ApplicationRecord
       belongs_to :standard_begin, class_name: 'Standard', foreign_key: 'standard_begin_id'
       belongs_to :standard_end, class_name: 'Standard', foreign_key: 'standard_end_id'
     end

data/app/models/lcms/engine/user.rb

@@ -4,7 +4,7 @@ require 'devise'
 
 module Lcms
   module Engine
-    class User < ActiveRecord::Base
+    class User < ApplicationRecord
       # Include default devise modules. Others available are:
       # :lockable, :timeoutable and :omniauthable
       devise :database_authenticatable, :registerable, :confirmable,
@@ -12,9 +12,9 @@ module Lcms
 
       enum role: { admin: 1, user: 0 }
 
-      validates_presence_of :access_code, on: :create, unless: 'admin?'
+      validates_presence_of :access_code, on: :create, unless: :admin?
       validates_presence_of :email, :role
-      validate :access_code_valid?, on: :create, unless: 'admin?'
+      validate :access_code_valid?, on: :create, unless: :admin?
 
       def full_name
         [

data/app/presenters/lcms/engine/content_presenter.rb

@@ -71,7 +71,7 @@ module Lcms
       end
 
       def layout_content(context_type)
-        layout(context_type).content
+        layout(context_type)&.content.to_s
       end
     end
   end

data/app/presenters/lcms/engine/document_presenter.rb

@@ -131,7 +131,7 @@ module Lcms
         Lcms::Engine::ReactMaterialsResolver.resolve(content, self)
       end
 
-      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      # rubocop:disable Metrics/PerceivedComplexity
       def short_breadcrumb(join_with: ' / ', with_short_lesson: false, with_subject: true, unit_level: false)
         unless unit_level
           lesson_abbr =
@@ -149,18 +149,16 @@ module Lcms
           lesson_abbr
         ].compact.join(join_with)
       end
-      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      # rubocop:enable Metrics/PerceivedComplexity
 
       def short_title
         assessment? ? doc_type : "Lesson #{lesson}"
       end
 
       def short_url
-        # TODO: Temporary turning off short url
-        ''
-        # @short_url ||= Bitly.client
-        #                  .shorten(Rails.application.routes.url_helpers.document_url(self))
-        #                  .short_url
+        @short_url ||= Bitly.client
+                         .shorten(Rails.application.routes.url_helpers.document_url(self))
+                         .short_url
       end
 
       def standards

data/app/queries/lcms/engine/admin_documents_query.rb

@@ -20,7 +20,7 @@ module Lcms
 
       private
 
-      def apply_filters # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      def apply_filters # rubocop:disable Metrics/AbcSize
         @scope = @scope.actives unless q.inactive == '1'
         @scope = @scope.failed if q.only_failed == '1'
         @scope = @scope.filter_by_term(q.search_term) if q.search_term.present?
@@ -36,7 +36,7 @@ module Lcms
       def sorted_scope
         @scope = @scope.order_by_curriculum if q.sort_by.blank? || q.sort_by == 'curriculum'
         @scope = @scope.order(updated_at: :desc) if q.sort_by == 'last_update'
-        @scope.uniq.order(active: :desc)
+        @scope.distinct.order(active: :desc)
       end
     end
   end

data/app/queries/lcms/engine/admin_materials_query.rb

@@ -45,7 +45,7 @@ module Lcms
       def sorted_scope
         @scope = @scope.reorder(:identifier) if q.sort_by.blank? || q.sort_by == 'identifier'
         @scope = @scope.reorder(updated_at: :desc) if q.sort_by == 'last_update'
-        @scope.uniq
+        @scope.distinct
       end
     end
   end

data/app/serializers/lcms/engine/association_item_serializer.rb

@@ -3,7 +3,6 @@
 module Lcms
   module Engine
     class AssociationItemSerializer < ActiveModel::Serializer
-      self.root = false
       attributes :id, :name
     end
   end

data/app/serializers/lcms/engine/curriculum_resource_serializer.rb

@@ -3,8 +3,6 @@
 module Lcms
   module Engine
     class CurriculumResourceSerializer < ActiveModel::Serializer
-      self.root = false
-
       attributes :children, :id, :lesson_count, :module_count, :module_sizes,
                  :resource,  :type, :unit_count, :unit_sizes
 

data/app/serializers/lcms/engine/document_material_serializer.rb

@@ -3,7 +3,6 @@
 module Lcms
   module Engine
     class DocumentMaterialSerializer < ActiveModel::Serializer
-      self.root = false
       attributes :data
 
       def initialize(document, materials)

data/app/serializers/lcms/engine/material_serializer.rb

@@ -3,7 +3,6 @@
 module Lcms
   module Engine
     class MaterialSerializer < ActiveModel::Serializer
-      self.root = false
       attributes :anchors, :id, :identifier, :gdoc_url, :orientation, :pdf_url, :source_type, :subtitle, :title,
                  :thumb_url, :pdf?
       delegate :anchors, :gdoc_url, :lesson, :orientation, :pdf_url, :source_type, :subtitle, :title,

data/app/serializers/lcms/engine/previews_material_serializer.rb

@@ -3,9 +3,9 @@
 module Lcms
   module Engine
     class PreviewsMaterialSerializer < ActiveModel::Serializer
-      self.root = false
       attributes :activity, :color, :content_type, :data, :for_group, :lesson, :subject
       attr_reader :document
+
       delegate :content_type, :subject, to: :document
 
       def initialize(props, document)

data/app/serializers/lcms/engine/resource_details_serializer.rb

@@ -8,8 +8,6 @@ module Lcms
     class ResourceDetailsSerializer < ResourceSerializer
       include ResourceHelper
 
-      self.root = false
-
       attributes :breadcrumb_title, :copyright, :downloads, :grade, :has_related, :id,
                  :opr_description, :opr_standards, :path, :short_title, :subject, :teaser, :time_to_teach,
                  :title, :type

data/app/serializers/lcms/engine/resource_instruction_serializer.rb

@@ -5,8 +5,6 @@ module Lcms
     class ResourceInstructionSerializer < ActiveModel::Serializer
       include ResourceHelper
 
-      self.root = false
-
       attributes :id, :title, :subject, :teaser, :path, :img, :instruction_type,
                  :grade_avg, :time_to_teach
 

data/app/serializers/lcms/engine/resource_picker_serializer.rb

@@ -3,8 +3,6 @@
 module Lcms
   module Engine
     class ResourcePickerSerializer < ActiveModel::Serializer
-      self.root = false
-
       attributes :id, :title
     end
   end

data/app/serializers/lcms/engine/resource_serializer.rb

@@ -8,8 +8,6 @@ module Lcms
     class ResourceSerializer < ActiveModel::Serializer
       include ResourceHelper
 
-      self.root = false
-
       attributes :breadcrumb_title, :grade, :id, :is_assessment, :is_foundational, :is_opr, :is_prerequisite, :path,
                  :short_title, :subject, :teaser, :time_to_teach, :title, :type
 

data/app/serializers/lcms/engine/search_document_serializer.rb

@@ -3,8 +3,6 @@
 module Lcms
   module Engine
     class SearchDocumentSerializer < ActiveModel::Serializer
-      self.root = false
-
       attributes :id, :model_id, :model_type, :title, :path, :type_name, :teaser,
                  :breadcrumbs, :subject, :grade
 

data/app/services/lcms/engine/document_build_service.rb

@@ -7,8 +7,11 @@ module Lcms
     class DocumentBuildService
       EVENT_BUILT = 'document:built'
 
+      attr_reader :errors
+
       def initialize(credentials, opts = {})
         @credentials = credentials
+        @errors = []
         @options = opts
       end
 
@@ -19,6 +22,7 @@ module Lcms
         @content = download url
         @expand_document = expand
         @template = DocTemplate::Template.parse @content
+        @errors = @template.metadata_service.errors
 
         create_document
         clear_preview_link
@@ -143,6 +147,7 @@ module Lcms
           last_author_email: downloader.file.last_modifying_user.try(:email_address),
           last_author_name: downloader.file.last_modifying_user.try(:display_name),
           metadata: template.metadata,
+          reimported_at: Time.current,
           sections_metadata: template.metadata_service.try(:section_metadata),
           version: downloader.file.version
         }

data/app/services/lcms/engine/html_sanitizer.rb

@@ -5,10 +5,10 @@ require 'sanitize'
 module Lcms
   module Engine
     class HtmlSanitizer # rubocop:disable Metrics/ClassLength
-      LIST_STYLE_RE = /\.lst-(\S+)[^{}]+>\s*(?:li:before)\s*{\s*content[^{}]+counter\(lst-ctn-\1,([^)]+)\)/
+      LIST_STYLE_RE = /\.lst-(\S+)[^{}]+>\s*(?:li:before)\s*{\s*content[^{}]+counter\(lst-ctn-\1,([^)]+)\)/.freeze
       CLEAN_ELEMENTS = %w(a div h1 h2 h3 h4 h5 h6 p table).join(',')
       GDOC_REMOVE_EMPTY_SELECTOR = '.o-ld-activity'
-      LINK_UNDERLINE_REGEX = /text-decoration\s*:\s*underline/i
+      LINK_UNDERLINE_REGEX = /text-decoration\s*:\s*underline/i.freeze
       SKIP_P_CHECK = %w(ul ol table).freeze
       STRIP_ELEMENTS = %w(a div h1 h2 h3 h4 h5 h6 p span table).freeze
 
@@ -169,7 +169,7 @@ module Lcms
         ].freeze
         private_constant :FONT_STYLES_RE
 
-        BORDER_RE = /border-\w+-width:\s*0\w+;?/
+        BORDER_RE = /border-\w+-width:\s*0\w+;?/.freeze
         private_constant :BORDER_RE
 
         BORDER_REPLACE_RE = {
@@ -186,7 +186,7 @@ module Lcms
         ].freeze
         private_constant :SUB_SUP_RE
 
-        SUB_SUP_STYLE_RE = /vertical-align:\s*(sub|super);?/i
+        SUB_SUP_STYLE_RE = /vertical-align:\s*(sub|super);?/i.freeze
         private_constant :SUB_SUP_STYLE_RE
 
         def add_css_class(el, *classes)
@@ -242,7 +242,7 @@ module Lcms
         end
 
         def fix_table_styles(nodes, param, selector)
-          attr_regex = /(^|;\s*)#{param}\s*:\s*([\w\.]+)\s*($|;)*/
+          attr_regex = /(^|;\s*)#{param}\s*:\s*([\w.]+)\s*($|;)*/
           nodes.css(selector).each do |node|
             node[param] = node['style'].match(attr_regex)&.[](2)
           end

data/app/services/lcms/engine/lessons_gdoc_bundler.rb

@@ -67,7 +67,7 @@ module Lcms
 
       def dirname(res)
         subject = res.subject.casecmp('math').zero? ? 'Math' : 'ELA'
-        Breadcrumbs.new(res).short_pieces[1..-1].unshift(subject).join('-')
+        Breadcrumbs.new(res).short_pieces[1..].unshift(subject).join('-')
       end
 
       def drive_id(url)

data/app/services/lcms/engine/material_build_service.rb

@@ -7,10 +7,13 @@ module Lcms
   module Engine
     class MaterialBuildService
       EVENT_BUILT = 'material:built'
-      PDF_EXT_RE = /\.pdf$/
+      PDF_EXT_RE = /\.pdf$/.freeze
+
+      attr_reader :errors
 
       def initialize(credentials, opts = {})
         @credentials = credentials
+        @errors = []
         @options = opts
       end
 
@@ -25,7 +28,7 @@ module Lcms
 
       attr_reader :credentials, :material, :downloader, :options, :url
 
-      def build_from_pdf
+      def build_from_pdf # rubocop:disable Metrics/AbcSize
         @downloader = ::Lt::Lcms::Lesson::Downloader::PDF.new(credentials, url)
         create_material
         title = @downloader.file.name.sub(PDF_EXT_RE, '')
@@ -60,6 +63,7 @@ module Lcms
         create_material
         content = @downloader.download.content
         template = DocTemplate::Template.parse(content, type: :material)
+        @errors = template.metadata_service.errors
 
         metadata = template.metadata_service.options_for(:default)[:metadata]
         material.update!(

data/app/services/lcms/engine/material_preview_generator.rb

@@ -6,8 +6,8 @@ module Lcms
     # Generates and uploads PDF/GDoc files for material
     #
     class MaterialPreviewGenerator
-      GDOC_RE = %r{docs.google.com/document/d/([^/]*)}i
-      GDOC_BROKEN_RE = %r{/open\?id=$}i
+      GDOC_RE = %r{docs.google.com/document/d/([^/]*)}i.freeze
+      GDOC_BROKEN_RE = %r{/open\?id=$}i.freeze
       PDF_S3_FOLDER = 'temp-materials-pdf'
 
       attr_reader :error, :url

data/app/services/lcms/engine/react_materials_resolver.rb

@@ -14,8 +14,9 @@ module Lcms
 
         private
 
-        def replace_react(node, document)
+        def replace_react(node, document) # rubocop:disable Metrics/PerceivedComplexity
           node.remove && return if (data = node.attr('data-react-props')).blank?
+
           raw_props = if data.match?(/^\d+(?:,\s*\d+)*$/)
                         # comma separated list of numbers, i.e: '123' or '123,432' or '123, 42, 12'
                         { 'material_ids' => data.split(',').map(&:strip), 'activity' => {} }
@@ -25,7 +26,7 @@ module Lcms
           node.remove && return if (raw_props['material_ids']).empty?
 
           props = PreviewsMaterialSerializer.new(raw_props, document)
-          node.remove && return if props.data&.empty?
+          node.remove && return if props.data && props.data.empty?
 
           node.replace(component(props, document))
         end

data/app/services/lcms/engine/s3_service.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'aws-sdk-rails'
+require 'aws-sdk-s3'
 
 module Lcms
   module Engine

data/app/uploaders/social_thumbnail_uploader.rb

@@ -4,8 +4,4 @@ class SocialThumbnailUploader < CarrierWave::Uploader::Base
   def store_dir
     "social_thumbnails/#{mounted_as}/#{model.id}"
   end
-
-  # def fog_attributes
-  #   { 'Content-Disposition' => 'attachment' }
-  # end
 end

data/app/views/devise/confirmations/new.html.erb

@@ -12,7 +12,7 @@
           </p>
         <% end %>
 
-        <%= f.submit 'Resend confirmation instructions', class: 'o-btn o-btn--xs-full o-btn--yellow o-btn--xs-full' %>
+        <%= f.submit 'Resend confirmation instructions', class: 'button o-btn--xs-full warning o-btn--xs-full' %>
       <% end %>
 
       <div class="u-margin-bottom--xlarge u-margin-top--xlarge">

data/app/views/devise/passwords/edit.html.erb

@@ -18,7 +18,7 @@
             <%= resource.errors[:password_confirmation].first %>
           </p>
         <% end %>
-        <%= f.submit 'Change my password', class: 'o-btn o-btn--xs-full o-btn--yellow o-btn--xs-full' %>
+        <%= f.submit 'Change my password', class: 'button o-btn--xs-full warning o-btn--xs-full' %>
       <% end %>
     </div>
   </div>

data/app/views/devise/passwords/new.html.erb

@@ -12,7 +12,7 @@
           </p>
         <% end %>
 
-        <%= f.submit 'Send me reset password instructions', class: 'o-btn o-btn--xs-full o-btn--yellow o-btn--xs-full' %>
+        <%= f.submit 'Send me reset password instructions', class: 'button o-btn--xs-full warning o-btn--xs-full' %>
       <% end %>
 
       <div class="u-margin-bottom--xlarge u-margin-top--xlarge">

data/app/views/devise/registrations/new.html.erb

@@ -29,7 +29,7 @@
             <%= resource.errors[:password_confirmation].first %>
           </p>
         <% end %>
-        <%= f.submit 'Register', class: 'o-btn o-btn--xs-full o-btn--yellow o-btn--xs-full' %>
+        <%= f.submit 'Register', class: 'button o-btn--xs-full warning o-btn--xs-full' %>
       <% end %>
 
       <div class="u-margin-bottom--xlarge u-margin-top--xlarge">