lcms-engine 0.2.0 → 0.3.0

data/lib/doc_template/tables/activity.rb

@@ -10,10 +10,9 @@ module DocTemplate
 
       def parse(fragment, *args)
         template_type = args.extract_options![:template_type].presence || 'core'
-        path = ".//table/*/tr[1]/td//*[case_insensitive_equals(text(),'#{HEADER_LABEL}')]"
         idx = 0
         [].tap do |result|
-          fragment.xpath(path, XpathFunctions.new).each do |el|
+          fragment.xpath(xpath_meta_headers, XpathFunctions.new).each do |el|
             table = el.ancestors('table').first
             data = fetch table
 

data/lib/doc_template/tables/base.rb

@@ -132,6 +132,10 @@ module DocTemplate
           end
         end
       end
+
+      def xpath_meta_headers
+        ".//table/*/tr[1]/td[1][case_insensitive_equals(normalize-space(),'#{self.class::HEADER_LABEL}')]"
+      end
     end
   end
 end

data/lib/doc_template/tables/section.rb

@@ -9,8 +9,7 @@ module DocTemplate
       MATERIALS_KEY = 'section-materials'
 
       def parse(fragment, *args)
-        path = ".//table/*/tr[1]/td//*[case_insensitive_equals(text(),'#{HEADER_LABEL}')]"
-        section_tables = fragment.xpath(path, XpathFunctions.new)
+        section_tables = fragment.xpath(xpath_meta_headers, XpathFunctions.new)
 
         # # Allows to handle ELA as Math:: inject fake section
         return fake_section(fragment) if section_tables.empty? && args.extract_options![:force_inject]

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

@@ -7,7 +7,6 @@ require 'carrierwave'
 require 'carrierwave/orm/activerecord'
 require 'closure_tree'
 require 'devise'
-require 'heap'
 require 'jquery-rails'
 require 'pdfjs_viewer-rails'
 require 'ransack'
@@ -25,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

data/lib/lcms/engine/version.rb

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

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

@@ -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/spec/controllers/admin/admin_controller_spec.rb

@@ -10,7 +10,7 @@ describe Lcms::Engine::Admin::AdminController do
 
     context 'with host redirect' do
       it 'builds correct path' do
-        expect(subject).to eq "/admin?#{args.to_param}"
+        expect(subject).to eq "/lcms-engine/admin?#{args.to_param}"
       end
     end
 

data/spec/controllers/admin/documents_controller_spec.rb

@@ -8,16 +8,13 @@ describe Lcms::Engine::Admin::DocumentsController do
   before { sign_in user }
 
   describe '#create' do
-    let(:credentials) { double }
     let(:document) { create :document }
     let(:form) { instance_double('Lcms::Engine::DocumentForm', document: document, save: valid) }
-    let(:params) { { link: 'link', link_fs: 'link_fs', reimport: '1' } }
+    let(:link) { 'link' }
+    let(:params) { { link: link, link_fs: 'link_fs', reimport: '1' } }
     let(:valid) { true }
 
-    before do
-      # allow(controller).to receive(:google_credentials).and_return(credentials)
-      allow(Lcms::Engine::DocumentForm).to receive(:new).and_return(form)
-    end
+    before { allow(Lcms::Engine::DocumentForm).to receive(:new).and_return(form) }
 
     subject { post :create, params: { document_form: params } }
 
@@ -37,6 +34,41 @@ describe Lcms::Engine::Admin::DocumentsController do
 
       it { is_expected.to render_template :new }
     end
+
+    context 'when a link to Google Documents folder passed in' do
+      let(:credentials) { double }
+      let(:file_ids) { ['file_id'] }
+      let(:folder_id) { 'folder_id' }
+      let(:link) { 'https://drive.google.com/drive/u/x/folders/fkjsdhfjkshfkjsdhf' }
+
+      before do
+        allow(controller).to receive(:google_credentials).and_return(credentials)
+        allow(::Lt::Google::Api::Drive).to \
+          receive(:folder_id_for).with(link).and_return(folder_id)
+        allow(::Lt::Google::Api::Drive).to \
+          receive_message_chain(:new, :list_file_ids_in, :map).and_return(file_ids)
+      end
+
+      it 'calls batch reimport' do
+        expect(Lcms::Engine::DocumentGenerator).to \
+          receive_message_chain(:document_parse_job, :perform_later).and_return(OpenStruct.new(job_id: 0))
+        subject
+      end
+
+      # TODO: Rails upgrade - move to system spec
+      xit 'renders import template' do
+        expect(subject).to render_template :import
+      end
+
+      context 'and when there are no documents' do
+        let(:file_ids) { [] }
+
+        it 'shows the message' do
+          subject
+          expect(flash[:alert]).to eq I18n.t('lcms.engine.admin.common.empty_folder')
+        end
+      end
+    end
   end
 
   describe '#destroy' do

data/spec/controllers/admin/materials_controller_spec.rb

@@ -7,6 +7,70 @@ describe Lcms::Engine::Admin::MaterialsController do
 
   before { sign_in user }
 
+  describe '#create' do
+    let(:material) { create :material }
+    let(:form) { instance_double('Lcms::Engine::MaterialForm', material: material, save: valid) }
+    let(:link) { 'link' }
+    let(:params) { { link: link, source_type: 'gdoc' } }
+    let(:valid) { true }
+
+    before { allow(Lcms::Engine::MaterialForm).to receive(:new).and_return(form) }
+
+    subject { post :create, params: { material_form: params } }
+
+    it 'creates MaterialForm object' do
+      expect(Lcms::Engine::MaterialForm).to receive(:new).with(hash_including(params))
+      subject
+    end
+
+    it 'redirects to material' do
+      subject
+      expect(response).to redirect_to Lcms::Engine::Admin::AdminController.material_path(material)
+    end
+
+    context 'when there is an error' do
+      let(:valid) { false }
+
+      # TODO: Rails upgrade - move to system spec
+      xit { is_expected.to render_template :new }
+    end
+
+    context 'when a link to Google Documents folder passed in' do
+      let(:credentials) { double }
+      let(:file_ids) { ['file_id'] }
+      let(:folder_id) { 'folder_id' }
+      let(:link) { 'https://drive.google.com/drive/u/x/folders/fkjsdhfjkshfkjsdhf' }
+
+      before do
+        allow(controller).to receive(:google_credentials).and_return(credentials)
+        allow(::Lt::Google::Api::Drive).to \
+          receive(:folder_id_for).with(link).and_return(folder_id)
+        allow(::Lt::Google::Api::Drive).to \
+          receive_message_chain(:new, :list_file_ids_in, :map).and_return(file_ids)
+      end
+
+      it 'calls batch reimport' do
+        expect(Lcms::Engine::DocumentGenerator).to \
+          receive_message_chain(:material_parse_job, :perform_later).and_return(OpenStruct.new(job_id: 0))
+        subject
+      end
+
+      # TODO: Rails upgrade - move to system spec
+      xit 'renders import template' do
+        expect(subject).to render_template :import
+      end
+
+      context 'and when there are no documents' do
+        let(:file_ids) { [] }
+
+        it 'shows the message' do
+          subject
+          expect(flash[:alert]).to eq I18n.t('lcms.engine.admin.common.empty_folder')
+        end
+      end
+    end
+  end
+
   describe '#destroy' do
     let!(:material) { create :material }
 

data/spec/controllers/admin/resources_controller_spec.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Lcms::Engine::Admin::ResourcesController do
+  let(:resource) { create :resource }
+  let(:user) { create :admin }
+
+  before { sign_in user }
+
+  describe '#edit' do
+    subject { get :edit, params: { id: resource.to_param } }
+
+    it { is_expected.to be_success }
+  end
+
+  describe '#index' do
+    subject { get :index }
+
+    it { is_expected.to be_success }
+  end
+
+  describe '#update' do
+    let(:description) { Faker::Lorem.sentence }
+    let(:params) { { description: description, directory: resource.metadata.keys.join(',') } }
+
+    subject { post :update, params: { id: resource.to_param, resource: params } }
+
+    context 'with valid params' do
+      it { is_expected.to redirect_to admin_resources_path }
+
+      it 'passes notice' do
+        subject
+        expect(flash[:notice]).to be_present
+      end
+    end
+
+    context 'with overridden parameters' do
+      let(:extra_param_array) { { extra_array: Faker::Lorem.words } }
+      let(:extra_param_simple) { { extra_simple: Faker::Lorem.word } }
+
+      subject do
+        post :update, params: { id: resource.to_param,
+                                resource: params.merge(**extra_param_simple, **extra_param_array) }
+      end
+
+      before do
+        Lcms::Engine::Resource.class_eval do
+          attr_accessor :extra_array
+          attr_accessor :extra_simple
+        end
+
+        allow_any_instance_of(Lcms::Engine::Admin::ResourcesController).to \
+          receive(:form_params_arrays_override).and_return(extra_param_array.keys[0] => [])
+
+        allow_any_instance_of(Lcms::Engine::Admin::ResourcesController).to \
+          receive(:form_params_simple_override).and_return(extra_param_simple.keys)
+      end
+
+      it 'accepts overridden parameters' do
+        expect { subject }.to_not raise_error
+      end
+
+      after do
+        Lcms::Engine::Resource.class_eval do
+          delete :extra_array
+          delete :extra_simple
+        end
+      end
+    end
+  end
+end

data/spec/dummy/config/lcms-admin.yml

@@ -10,9 +10,9 @@ engine: 'Lcms::Engine::Engine'
 # Redirects
 redirect:
   host:
-    root_path: 'admin_path'
-    document_path: 'document_path'
-    material_path: 'material_path'
+#    root_path: 'admin_path'
+#    document_path: 'document_path'
+#    material_path: 'material_path'
   engine:
     root_path: 'admin_path'
     document_path: 'document_path'

data/spec/dummy/db/schema.rb

@@ -10,13 +10,13 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_04_22_130652) do
+ActiveRecord::Schema.define(version: 2020_04_29_130353) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "hstore"
   enable_extension "plpgsql"
 
-  create_table "access_codes", force: :cascade do |t|
+  create_table "access_codes", id: :serial, force: :cascade do |t|
     t.string "code", null: false
     t.boolean "active", default: true, null: false
     t.datetime "created_at", null: false
@@ -24,14 +24,14 @@ ActiveRecord::Schema.define(version: 2020_04_22_130652) do
     t.index ["code"], name: "index_access_codes_on_code", unique: true
   end
 
-  create_table "authors", force: :cascade do |t|
+  create_table "authors", id: :serial, force: :cascade do |t|
     t.string "name"
     t.string "slug"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
 
-  create_table "copyright_attributions", force: :cascade do |t|
+  create_table "copyright_attributions", id: :serial, force: :cascade do |t|
     t.string "disclaimer"
     t.string "value", null: false
     t.datetime "created_at", null: false
@@ -39,7 +39,7 @@ ActiveRecord::Schema.define(version: 2020_04_22_130652) do
     t.integer "resource_id", null: false
   end
 
-  create_table "curriculums", force: :cascade do |t|
+  create_table "curriculums", id: :serial, force: :cascade do |t|
     t.string "name", null: false
     t.string "slug", null: false
     t.datetime "created_at", null: false
@@ -47,7 +47,7 @@ ActiveRecord::Schema.define(version: 2020_04_22_130652) do
     t.boolean "default", default: false, null: false
   end
 
-  create_table "document_bundles", force: :cascade do |t|
+  create_table "document_bundles", id: :serial, force: :cascade do |t|
     t.string "category", null: false
     t.string "file"
     t.integer "resource_id"
@@ -58,7 +58,7 @@ ActiveRecord::Schema.define(version: 2020_04_22_130652) do
     t.index ["resource_id"], name: "index_document_bundles_on_resource_id"
   end
 
-  create_table "document_parts", force: :cascade do |t|
+  create_table "document_parts", id: :serial, force: :cascade do |t|
     t.text "content"
     t.string "part_type"
     t.boolean "active"
@@ -78,7 +78,7 @@ ActiveRecord::Schema.define(version: 2020_04_22_130652) do
     t.index ["renderer_type", "renderer_id"], name: "index_document_parts_on_renderer_type_and_renderer_id"
   end
 
-  create_table "documents", force: :cascade do |t|
+  create_table "documents", id: :serial, force: :cascade do |t|
     t.string "file_id"
     t.string "name"
     t.datetime "last_modified_at"
@@ -115,7 +115,7 @@ ActiveRecord::Schema.define(version: 2020_04_22_130652) do
     t.index ["material_id"], name: "index_documents_materials_on_material_id"
   end
 
-  create_table "download_categories", force: :cascade do |t|
+  create_table "download_categories", id: :serial, force: :cascade do |t|
     t.string "title", null: false
     t.text "description"
     t.integer "position"
@@ -123,7 +123,7 @@ ActiveRecord::Schema.define(version: 2020_04_22_130652) do
     t.boolean "bundle", default: false, null: false
   end
 
-  create_table "downloads", force: :cascade do |t|
+  create_table "downloads", id: :serial, force: :cascade do |t|
     t.string "filename"
     t.integer "filesize"
     t.string "url"
@@ -135,7 +135,7 @@ ActiveRecord::Schema.define(version: 2020_04_22_130652) do
     t.boolean "main", default: false, null: false
   end
 
-  create_table "leadership_posts", force: :cascade do |t|
+  create_table "leadership_posts", id: :serial, force: :cascade do |t|
     t.string "first_name", null: false
     t.string "last_name", null: false
     t.string "school"
@@ -147,7 +147,7 @@ ActiveRecord::Schema.define(version: 2020_04_22_130652) do
     t.index ["order", "last_name"], name: "index_leadership_posts_on_order_and_last_name"
   end
 
-  create_table "materials", force: :cascade do |t|
+  create_table "materials", id: :serial, force: :cascade do |t|
     t.string "file_id", null: false
     t.string "identifier"
     t.jsonb "metadata", default: {}, null: false
@@ -168,22 +168,14 @@ ActiveRecord::Schema.define(version: 2020_04_22_130652) do
     t.index ["metadata"], name: "index_materials_on_metadata", using: :gin
   end
 
-  create_table "pages", force: :cascade do |t|
-    t.text "body", null: false
-    t.string "title", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.string "slug", null: false
-  end
-
-  create_table "reading_assignment_authors", force: :cascade do |t|
+  create_table "reading_assignment_authors", id: :serial, force: :cascade do |t|
     t.string "name", null: false
     t.datetime "created_at"
     t.datetime "updated_at"
     t.index ["name"], name: "index_reading_assignment_authors_on_name", unique: true
   end
 
-  create_table "reading_assignment_texts", force: :cascade do |t|
+  create_table "reading_assignment_texts", id: :serial, force: :cascade do |t|
     t.string "name", null: false
     t.integer "reading_assignment_author_id", null: false
     t.datetime "created_at"
@@ -192,7 +184,7 @@ ActiveRecord::Schema.define(version: 2020_04_22_130652) do
     t.index ["reading_assignment_author_id"], name: "index_reading_assignment_texts_on_reading_assignment_author_id"
   end
 
-  create_table "resource_additional_resources", force: :cascade do |t|
+  create_table "resource_additional_resources", id: :serial, force: :cascade do |t|
     t.integer "resource_id", null: false
     t.integer "additional_resource_id", null: false
     t.integer "position"
@@ -202,7 +194,7 @@ ActiveRecord::Schema.define(version: 2020_04_22_130652) do
     t.index ["resource_id", "additional_resource_id"], name: "index_resource_additional_resources", unique: true
   end
 
-  create_table "resource_downloads", force: :cascade do |t|
+  create_table "resource_downloads", id: :serial, force: :cascade do |t|
     t.integer "resource_id"
     t.integer "download_id"
     t.datetime "created_at", null: false
@@ -223,14 +215,14 @@ ActiveRecord::Schema.define(version: 2020_04_22_130652) do
     t.index ["descendant_id"], name: "resource_desc_idx"
   end
 
-  create_table "resource_reading_assignments", force: :cascade do |t|
+  create_table "resource_reading_assignments", id: :serial, force: :cascade do |t|
     t.integer "resource_id", null: false
     t.integer "reading_assignment_text_id", null: false
     t.index ["reading_assignment_text_id"], name: "idx_res_rea_asg_rea_asg_txt"
     t.index ["resource_id"], name: "index_resource_reading_assignments_on_resource_id"
   end
 
-  create_table "resource_related_resources", force: :cascade do |t|
+  create_table "resource_related_resources", id: :serial, force: :cascade do |t|
     t.integer "resource_id"
     t.integer "related_resource_id"
     t.integer "position"
@@ -240,7 +232,7 @@ ActiveRecord::Schema.define(version: 2020_04_22_130652) do
     t.index ["resource_id"], name: "index_resource_related_resources_on_resource_id"
   end
 
-  create_table "resource_standards", force: :cascade do |t|
+  create_table "resource_standards", id: :serial, force: :cascade do |t|
     t.integer "resource_id"
     t.integer "standard_id"
     t.datetime "created_at"
@@ -249,7 +241,7 @@ ActiveRecord::Schema.define(version: 2020_04_22_130652) do
     t.index ["standard_id"], name: "index_resource_standards_on_standard_id"
   end
 
-  create_table "resources", force: :cascade do |t|
+  create_table "resources", id: :serial, force: :cascade do |t|
     t.datetime "created_at"
     t.datetime "updated_at"
     t.datetime "indexed_at"
@@ -287,7 +279,7 @@ ActiveRecord::Schema.define(version: 2020_04_22_130652) do
     t.index ["resource_type"], name: "index_resources_on_resource_type"
   end
 
-  create_table "sessions", force: :cascade do |t|
+  create_table "sessions", id: :serial, force: :cascade do |t|
     t.string "session_id", null: false
     t.text "data"
     t.datetime "created_at"
@@ -296,11 +288,11 @@ ActiveRecord::Schema.define(version: 2020_04_22_130652) do
     t.index ["updated_at"], name: "index_sessions_on_updated_at"
   end
 
-  create_table "settings", force: :cascade do |t|
+  create_table "settings", id: :serial, force: :cascade do |t|
     t.jsonb "data", default: {}, null: false
   end
 
-  create_table "social_thumbnails", force: :cascade do |t|
+  create_table "social_thumbnails", id: :serial, force: :cascade do |t|
     t.integer "target_id", null: false
     t.string "target_type", null: false
     t.string "image", null: false
@@ -308,7 +300,7 @@ ActiveRecord::Schema.define(version: 2020_04_22_130652) do
     t.index ["target_type", "target_id"], name: "index_social_thumbnails_on_target_type_and_target_id"
   end
 
-  create_table "staff_members", force: :cascade do |t|
+  create_table "staff_members", id: :serial, force: :cascade do |t|
     t.string "bio", limit: 4096
     t.string "position"
     t.datetime "created_at", null: false
@@ -322,7 +314,7 @@ ActiveRecord::Schema.define(version: 2020_04_22_130652) do
     t.index ["first_name", "last_name"], name: "index_staff_members_on_first_name_and_last_name"
   end
 
-  create_table "standard_links", force: :cascade do |t|
+  create_table "standard_links", id: :serial, force: :cascade do |t|
     t.integer "standard_begin_id", null: false
     t.integer "standard_end_id", null: false
     t.string "link_type", null: false
@@ -332,7 +324,7 @@ ActiveRecord::Schema.define(version: 2020_04_22_130652) do
     t.index ["standard_end_id"], name: "index_standard_links_on_standard_end_id"
   end
 
-  create_table "standards", force: :cascade do |t|
+  create_table "standards", id: :serial, force: :cascade do |t|
     t.string "name", null: false
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -350,7 +342,7 @@ ActiveRecord::Schema.define(version: 2020_04_22_130652) do
     t.index ["subject"], name: "index_standards_on_subject"
   end
 
-  create_table "taggings", force: :cascade do |t|
+  create_table "taggings", id: :serial, force: :cascade do |t|
     t.integer "tag_id"
     t.integer "taggable_id"
     t.string "taggable_type"
@@ -362,13 +354,13 @@ ActiveRecord::Schema.define(version: 2020_04_22_130652) do
     t.index ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context"
   end
 
-  create_table "tags", force: :cascade do |t|
+  create_table "tags", id: :serial, force: :cascade do |t|
     t.string "name"
     t.integer "taggings_count", default: 0
     t.index ["name"], name: "index_tags_on_name", unique: true
   end
 
-  create_table "users", force: :cascade do |t|
+  create_table "users", id: :serial, force: :cascade do |t|
     t.string "name"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false