lcms-engine 0.1.4 → 0.2.0

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.to_s
+        layout(context_type).content
       end
     end
   end

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

@@ -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,7 +3,6 @@
 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

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

@@ -143,6 +143,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

@@ -10,7 +10,7 @@ module Lcms
       GDOC_REMOVE_EMPTY_SELECTOR = '.o-ld-activity'
       LINK_UNDERLINE_REGEX = /text-decoration\s*:\s*underline/i
       SKIP_P_CHECK = %w(ul ol table).freeze
-      STRIP_ELEMENTS = %w(a div h1 h2 h3 h4 h5 h6 p span table text).freeze
+      STRIP_ELEMENTS = %w(a div h1 h2 h3 h4 h5 h6 p span table).freeze
 
       class << self
         def clean_content(html, context_type)
@@ -35,7 +35,7 @@ module Lcms
         # Removes all empty nodes before first one filled in
         #
         def strip_content(nodes)
-          nodes.children.each do |node|
+          nodes.xpath('./*').each do |node|
             break if keep_node?(node)
 
             node.remove

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/layouts/lcms/engine/admin.html.erb

@@ -13,7 +13,7 @@
     <%= csrf_meta_tags %>
     <%# NOTE: JS served via Assets pipeline should be added first %>
     <%= javascript_include_tag 'lcms/engine/admin/application', 'data-turbolinks-track' => 'reload' %>
-    <%= lcms_engine_javascript_pack_tag 'admin' %>
+    <%= javascript_pack_tag 'admin' %>
   </head>
   <body>
     <%= render partial: 'lcms/engine/shared/unsupported' %>

data/app/views/lcms/engine/admin/access_codes/index.html.erb

@@ -1,7 +1,7 @@
 <div class=o-page>
   <div class=clearfix>
     <div class=pull-right>
-      <%= link_to t('.new_access_code'), :new_admin_access_code, class: 'btn btn-success', 'data-turbolinks' => false %>
+      <%= link_to t('.new_access_code'), :new_admin_access_code, class: 'button success', 'data-turbolinks' => false %>
     </div>
   </div>
 
@@ -17,13 +17,15 @@
         </tr>
 
         <% @access_codes.each do |access_code| %>
-          <tr id="access_code_<%= access_code.id %>">
-            <td><%= link_to access_code.code, edit_admin_access_code_path(access_code) %>
-            <td><%= access_code.active ? 'YES' : 'NO' %>
-            <td>
-              <%= button_to t('ui.delete'), admin_access_code_path(access_code), class: 'btn btn-danger', data: { confirm: t('ui.are_you_sure') }, form_class: 'inline', method: :delete %>
-            </td>
-          </tr>
+          <% cache access_code do %>
+            <tr id="access_code_<%= access_code.id %>">
+              <td><%= link_to access_code.code, edit_admin_access_code_path(access_code) %>
+              <td><%= access_code.active ? 'YES' : 'NO' %>
+              <td>
+                <%= button_to t('ui.delete'), admin_access_code_path(access_code), class: 'button alert', data: { confirm: t('ui.are_you_sure') }, form_class: 'inline', method: :delete %>
+              </td>
+            </tr>
+          <% end %>
         <% end %>
       </table>
     </div>

data/app/views/lcms/engine/admin/documents/index.html.erb

@@ -34,7 +34,7 @@
         <th>Title</th>
         <th>File Name</th>
         <th>Materials</th>
-        <th>Last Update</th>
+        <th>Reimported at</th>
         <th>Status</th>
         <th></th>
       </tr>
@@ -60,7 +60,7 @@
             <% end %>
           </td>
           <td><%= render partial: 'lcms/engine/admin/documents/materials_links', locals: { lesson: lesson } %></td>
-          <td class="u-text--small"><%= lesson.updated_at.to_s %></td>
+          <td class="u-txt--small"><%= lesson.reimported_at.to_s.presence || lesson.updated_at.to_s %>
           <td class="lessons-table__status">
             <%= lesson.active? ? 'active' : 'inactive' %>
             <% unless lesson.reimported %>

data/app/views/lcms/engine/admin/materials/index.html.erb

@@ -44,7 +44,7 @@
           <th>Name-Date
           <th>Header-Footer
           <th>Connected Lessons
-          <th>Last Update
+          <th>Reimported at
           <th>
         </tr>
 
@@ -71,7 +71,7 @@
                   <% lesson = ::Lcms::Engine::DocumentGenerator.document_presenter.new lesson %>
                   <li class="u-text--small">
                     <a href="<%= lesson.file_url%>" target="_blank" class="materials-table__lessons--file"><i class="ub-icon ub-file-gdoc"></i></a>
-                    <%= link_to lesson.title, ::Lcms::Engine::Admin::AdminController.document_path(lesson, request.query_parameters), target: '_blank' %>
+                    <%= link_to lesson.title, lesson, target: '_blank' %>
                   </li>
                 <% end %>
               </ul>

data/app/views/lcms/engine/admin/pages/index.html.erb

@@ -1,6 +1,6 @@
 <div class=o-page>
   <div class=pull-right>
-    <%= link_to t('.new_page'), :new_admin_page, class: 'btn btn-success' %>
+    <%= link_to t('.new_page'), :new_admin_page, class: 'button success' %>
   </div>
 
   <h2 class=text-center><%= t('.page_title') %></h2>
@@ -17,8 +17,8 @@
         <td><%= page.id %>
         <td><%= page.title %>
         <td>
-          <%= link_to t('ui.edit'), edit_admin_page_path(page), class: 'btn btn-default' %>
-          <%= button_to t('ui.delete'), admin_page_path(page), class: 'btn btn-danger', data: { confirm: t('ui.are_you_sure') }, form_class: 'inline', method: :delete %>
+          <%= link_to t('ui.edit'), edit_admin_page_path(page), class: 'button primary' %>
+          <%= button_to t('ui.delete'), admin_page_path(page), class: 'button alert', data: { confirm: t('ui.are_you_sure') }, form_class: 'inline', method: :delete %>
       </tr>
     <% end %>
   </table>

data/app/views/lcms/engine/admin/standards/index.html.erb

@@ -16,13 +16,15 @@
         </tr>
 
         <% @standards.each do |std| %>
-          <tr id="std<%= std.id %>">
-            <td><b><%= std.name %></b></td>
-            <td><%= std.subject %></td>
-            <td><%= std.grades.join(', ') %></td>
-            <td><%= std.alt_names.join(' / ') %></td>
-            <td><%= link_to 'edit', edit_admin_standard_path(std), class: 'button btn o-btn' %></td>
-          </tr>
+          <% cache std do %>
+            <tr id="std<%= std.id %>">
+              <td><b><%= std.name %></b></td>
+              <td><%= std.subject %></td>
+              <td><%= std.grades.join(', ') %></td>
+              <td><%= std.alt_names.join(' / ') %></td>
+              <td><%= link_to 'edit', edit_admin_standard_path(std), class: 'button btn o-btn' %></td>
+            </tr>
+          <% end %>
         <% end %>
       </table>
     </div>

data/app/views/lcms/engine/admin/users/index.html.erb

@@ -7,7 +7,7 @@
 
   <div class="row">
     <div class="flex-pull-right">
-      <%= link_to t('.new_user'), :new_admin_user, class: 'button primary' %>
+      <%= link_to t('.new_user'), :new_admin_user, class: 'button success' %>
     </div>
     <table class="table">
       <tr>
@@ -25,19 +25,21 @@
       </tr>
 
       <% @users.each do |user| %>
-        <tr id="user_<%= user.id %>">
-          <td><%= link_to user.id, edit_admin_user_path(user) %>
-          <td><%= link_to user.survey&.fetch('first_name', nil) || user.name, edit_admin_user_path(user) %>
-          <td><%= raw user.survey&.fetch('last_name', nil) %>
-          <td><%= user.email %>
-          <td><%= user.role %>
-          <td><%= user.access_code.presence || '-' %>
-          <td><%= user.confirmed? ? 'YES' : 'NO' %>
-          <td class="u-txt--small"><%= user.created_at.to_s %>
-          <td><%= link_to content_tag(:i, nil, class: 'fa fa-pencil').html_safe, edit_admin_user_path(user), class: 'button small primary' %>
-          <td><%= button_to t('.reset_password_btn'), reset_password_admin_user_path(user), class: 'button small', data: { confirm: t('ui.are_you_sure') }, form_class: 'inline', method: :post %>
-          <td><%= button_to t('ui.delete'), admin_user_path(user), class: 'button small alert', data: { confirm: t('ui.are_you_sure') }, form_class: 'inline', method: :delete %></td>
-        </tr>
+        <% cache user do %>
+          <tr id="user_<%= user.id %>">
+            <td><%= link_to user.id, edit_admin_user_path(user) %>
+            <td><%= link_to user.survey&.fetch('first_name', nil) || user.name, edit_admin_user_path(user) %>
+            <td><%= raw user.survey&.fetch('last_name', nil) %>
+            <td><%= user.email %>
+            <td><%= user.role %>
+            <td><%= user.access_code.presence || '-' %>
+            <td><%= user.confirmed? ? 'YES' : 'NO' %>
+            <td class="u-txt--small"><%= user.created_at.to_s %>
+            <td><%= link_to content_tag(:i, nil, class: 'fas fa-pencil-alt').html_safe, edit_admin_user_path(user), class: 'button small primary' %>
+            <td><%= button_to t('.reset_password_btn'), reset_password_admin_user_path(user), class: 'button small', data: { confirm: t('ui.are_you_sure') }, form_class: 'inline', method: :post %>
+            <td><%= button_to t('ui.delete'), admin_user_path(user), class: 'button small alert', data: { confirm: t('ui.are_you_sure') }, form_class: 'inline', method: :delete %></td>
+          </tr>
+        <% end %>
       <% end %>
     </table>
   </div>

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

@@ -4,7 +4,7 @@
   <ul class="o-resource__list o-resource__list--icons o-resource__list--<%= color_code %>">
     <% resource.children.each do |item| %>
       <li>
-        <i class="fa fa-square"></i>
+        <i class="far fa-square"></i>
         <span>
           <% title = "#{item.short_title}: " %>
           <% if item.document.present? %>

data/app/views/lcms/engine/shared/_social_sharing_menu.html.erb

@@ -2,7 +2,7 @@
   <li class="<%= cls %>__submenu-link">
     <a class="addthis_button_twitter" rel="nofollow" data-turbolinks="false" addthis:title="<%= social_media.twitter.title %>" addthis:description="<%= social_media.twitter.description %>" addthis:media="<%= social_media.twitter.image %>">
       <span class="fa-stack">
-        <i class="fa fa-circle fa-stack-2x fa-header-bg"></i>
+        <i class="far fa-circle fa-stack-2x fa-header-bg"></i>
         <i class="fa-2x ub-twitter fa-stack-1x"></i>
       </span>
     </a>
@@ -10,7 +10,7 @@
   <li class="<%= cls %>__submenu-link">
     <a class="addthis_button_facebook" rel="nofollow" data-turbolinks="false" addthis:title="<%= social_media.facebook.title %>" addthis:description="<%= social_media.facebook.description %>" addthis:media="<%= social_media.facebook.image %>">
       <span class="fa-stack">
-        <i class="fa fa-circle fa-stack-2x fa-header-bg"></i>
+        <i class="far fa-circle fa-stack-2x fa-header-bg"></i>
         <i class="fa-2x ub-facebook fa-stack-1x"></i>
       </span>
     </a>
@@ -18,7 +18,7 @@
   <li class="<%= cls %>__submenu-link">
     <a class="addthis_button_pinterest_share" rel="nofollow" data-turbolinks="false" addthis:title="<%= social_media.pinterest.title %>" addthis:description="<%= social_media.pinterest.description %>" addthis:media="<%= social_media.pinterest.image %>">
       <span class="fa-stack">
-        <i class="fa fa-circle fa-stack-2x fa-header-bg"></i>
+        <i class="far fa-circle fa-stack-2x fa-header-bg"></i>
         <i class="fa-2x ub-pinterest fa-stack-1x"></i>
       </span>
     </a>
@@ -26,7 +26,7 @@
   <li class="<%= cls %>__submenu-link">
     <a class="addthis_button_email" rel="nofollow" data-turbolinks="false">
       <span class="fa-stack">
-        <i class="fa fa-circle fa-stack-2x fa-header-bg"></i>
+        <i class="far fa-circle fa-stack-2x fa-header-bg"></i>
         <i class="fa-2x ub-arrow-share fa-stack-1x"></i>
       </span>
     </a>

data/config/initializers/carrier_wave.rb

@@ -4,7 +4,6 @@ CarrierWave.configure do |config|
   if (Rails.env.development? && ENV['AWS_ACCESS_KEY_ID'].blank?) || Rails.env.test?
     config.storage = :file
   else
-    config.fog_provider = 'fog/aws'
     config.fog_credentials = {
       provider: 'AWS',
       aws_access_key_id: ENV['AWS_ACCESS_KEY_ID'],

data/config/locales/admin/en.yml

@@ -214,7 +214,6 @@ en:
             title: Lesson Manager
             unit_bundles: Generate Unit Bundles
           create:
-            empty_folder: Google Documents folder is empty
             error: Error
             success: Lesson %{name} parsed successfully.
           new:
@@ -229,7 +228,6 @@ en:
         materials:
           create:
             bulk_import: Imported %{count} Materials from %{folder}
-            empty_folder: Google Documents folder is empty
             error: Error
             success: Material %{name} parsed successfully.
           destroy:

data/db/migrate/20200422130652_add_reimported_at_to_documents.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddReimportedAtToDocuments < ActiveRecord::Migration[5.2]
+  def change
+    add_column :documents, :reimported_at, :datetime
+  end
+end