lcms-engine 0.3.0 → 0.4.0

data/lib/tasks/cloud66.rake

@@ -20,29 +20,31 @@ namespace :cloud66 do # rubocop:disable Metrics/BlockLength
   end
 
   namespace :swap do
-    SWAP_FILE = Rails.root.join 'export-swap.sql'
+    def swap_file
+      Rails.root.join 'export-swap.sql'
+    end
 
     desc 'Exports tables to be synced'
     task export: :environment do
       cmd = <<-BASH
-        pg_dump -U #{ENV['POSTGRESQL_USERNAME']} #{ENV['POSTGRESQL_DATABASE']} \
+        pg_dump -U #{ENV.fetch('POSTGRESQL_USERNAME', nil)} #{ENV.fetch('POSTGRESQL_DATABASE', nil)} \
           --no-owner \
           --table=users \
           --table=access_codes \
-          --file=#{SWAP_FILE}
+          --file=#{swap_file}
       BASH
       system cmd
     end
 
     desc 'Deletes existing tables and creates new one'
     task import: :environment do
-      raise 'No data file. Please execute `cloud66:swap:export` prior loading the data.' unless File.exist?(SWAP_FILE)
+      raise 'No data file. Please execute `cloud66:swap:export` prior loading the data.' unless File.exist?(swap_file)
 
-      cmd = "psql -U #{ENV['POSTGRESQL_USERNAME']} #{ENV['POSTGRESQL_DATABASE']}"
+      cmd = "psql -U #{ENV.fetch('POSTGRESQL_USERNAME', nil)} #{ENV.fetch('POSTGRESQL_DATABASE', nil)}"
       # Drops old tables
       system "#{cmd} -c 'drop table access_codes, users;'"
       # Create new and load the data
-      system "#{cmd} < #{SWAP_FILE}"
+      system "#{cmd} < #{swap_file}"
     end
   end
 end

data/lib/tasks/document.rake

@@ -12,21 +12,21 @@ namespace :document do
     hierarchy = {}
 
     documents.each do |document|
-      grade_key = 'grade-' + document.metadata['grade']
+      grade_key = "grade-#{document.metadata['grade']}"
       hierarchy[grade_key] ||= {}
       grade = hierarchy[grade_key]
 
       grade['subject'] ||= 'math'
       grade['modules'] ||= {}
 
-      module_key = 'module-' + document.metadata['unit']
+      module_key = "module-#{document.metadata['unit']}"
       grade['modules'][module_key] ||= {}
       module_ = grade['modules'][module_key]
 
       module_['name'] ||= '[name]'
       module_['topics'] ||= {}
 
-      topic_key = 'topic-' + document.metadata['topic']
+      topic_key = "topic-#{document.metadata['topic']}"
       module_['topics'][topic_key] ||= {}
       topic = module_['topics'][topic_key]
 
@@ -39,10 +39,10 @@ namespace :document do
       topic['lessons'].push(
         'file_name' => file_name,
         'identifier' => 'ENY-' \
-          "G#{grade_key.split('-').last}-" \
-          "M#{module_key.split('-').last}-" \
-          "T#{topic_key.split('-').last}-" \
-          "L#{lesson_number}",
+                        "G#{grade_key.split('-').last}-" \
+                        "M#{module_key.split('-').last}-" \
+                        "T#{topic_key.split('-').last}-" \
+                        "L#{lesson_number}",
         'name' => document.metadata['title_text'],
         'standards' => document.metadata['standard'],
         'description' => Nokogiri::HTML(document.metadata['description']).text,

data/lib/tasks/google.rake

@@ -4,22 +4,37 @@ require 'googleauth'
 require 'googleauth/stores/file_token_store'
 require 'lt/google/api/auth/cli'
 
-OOB_URI = 'urn:ietf:wg:oauth:2.0:oob'
-
 namespace :google do
-  desc 'set up google credentials'
-  task setup_auth: :environment do
+  desc 'Set up google credentials. Specify `domain` argument which will be used as a base for redirect URI'
+  task :setup_auth, [:domain] => [:environment] do |_task, args|
     service = ::Lt::Google::Api::Auth::Cli.new
-    if service.credentials.nil?
-      authorizer = service.authorizer
-      url = authorizer.get_authorization_url(base_url: OOB_URI)
-      puts "Open \n>> #{url}\n in your browser and enter the resulting code:"
-      code = STDIN.gets.strip
-      authorizer.get_and_store_credentials_from_code(
-        user_id: ::Lt::Google::Api::Auth::Cli::USER_ID, code: code, base_url: OOB_URI
-      )
-    else
-      puts 'No need in action, everything is already set up'
+
+    # Check if there is existing auth token
+    if service.credentials.present?
+      puts <<~TEXT
+        Auth token already exists. Do you want to request new one?
+        Type Y for Yes, N for No
+      TEXT
+      next unless $stdin.gets.to_s.strip.downcase == 'y'
     end
+
+    authorizer = service.authorizer
+    url = authorizer.get_authorization_url(base_url: args[:domain])
+
+    puts <<~TEXT
+      Open this URL in your browser:
+      >>>>>
+      #{url}
+      >>>>>
+      Copy auth code and paste it below.
+    TEXT
+
+    code = $stdin.gets.to_s.strip
+
+    authorizer.get_and_store_credentials_from_code(
+      user_id: ::Lt::Google::Api::Auth::Cli::USER_ID,
+      code: code,
+      base_url: args[:domain]
+    )
   end
 end

data/lib/tasks/lcms/engine_tasks.rake

@@ -70,7 +70,7 @@ def enhance_assets_precompile
 end
 
 # Compile packs after we've compiled all other assets during precompilation
-skip_webpacker_precompile = %w(no false n f).include?(ENV['WEBPACKER_PRECOMPILE'])
+skip_webpacker_precompile = %w(no false n f).include?(ENV.fetch('WEBPACKER_PRECOMPILE', nil))
 
 unless skip_webpacker_precompile
   if Rake::Task.task_defined?('assets:precompile')

data/package.json

@@ -5,30 +5,52 @@
   "dependencies": {
     "@babel/core": "^7.6.0",
     "@babel/preset-react": "^7.0.0",
-    "@rails/webpacker": "~4",
+    "@rails/webpacker": "~5.4.3",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
     "classnames": "^2.2.6",
+    "foundation-sites": "^6.7.4",
+    "jquery": "^3.6.0",
+    "lodash": "^4.17.21",
     "prop-types": "^15.7.2",
     "react": "^16.9.0",
     "react-dom": "^16.9.0",
-    "react_ujs": "^2.6.0"
+    "react-tagsinput": "^3.19.0",
+    "react_ujs": "^2.6.0",
+    "webpack": "^4.46.0",
+    "webpack-cli": "^3.3.12"
   },
   "devDependencies": {
-    "eslint": "^6.5.1",
-    "eslint-plugin-import": "^2.18.2",
-    "eslint-plugin-react": "^7.16.0",
-    "webpack": "~4",
-    "webpack-dev-server": "^3.8.1"
+    "babel-eslint": "^10.1.0",
+    "eslint": "^7.23.0",
+    "eslint-config-prettier": "^8.1.0",
+    "eslint-config-react-app": "^6.0.0",
+    "eslint-plugin-flowtype": "^5.6.0",
+    "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-jsx-a11y": "^6.4.1",
+    "eslint-plugin-prettier": "^3.3.1",
+    "eslint-plugin-react": "^7.23.1",
+    "eslint-plugin-react-hooks": "^4.2.0",
+    "prettier": "^2.2.1",
+    "stylelint": "^13.12.0",
+    "stylelint-config-prettier": "^8.0.2",
+    "stylelint-config-sass-guidelines": "^8.0.0",
+    "stylelint-prettier": "^1.2.0",
+    "stylelint-selector-bem-pattern": "^2.1.0",
+    "webpack-dev-server": "^3"
   },
   "scripts": {
-    "lint:scss": "sass-lint '**/*.scss' -v -q"
+    "lint": "eslint --ext .js --ext .jsx app/javascript && stylelint 'app/assets/stylesheets/**/*.{css,scss}' --quiet",
+    "lint:js": "eslint --ext .js --ext .jsx app/javascript",
+    "lint:js:fix": "eslint --ext .js --ext .jsx app/javascript --quiet --fix",
+    "lint:scss": "stylelint 'app/assets/stylesheets/**/*.{css,scss}' --quiet",
+    "lint:scss:fix": "stylelint 'app/assets/stylesheets/**/*.{css,scss}' --quiet --fix"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/learningtapestry/lcms-engine.git"
   },
   "engines": {
-    "node": ">=10.16.1",
+    "node": ">=14.17.0",
     "yarn": ">=1.17.1"
   },
   "author": "Alexander Kuznetsov <paranoic.san@gmail.com>",

data/postcss.config.js

@@ -0,0 +1,12 @@
+module.exports = {
+  plugins: [
+    require('postcss-import'),
+    require('postcss-flexbugs-fixes'),
+    require('postcss-preset-env')({
+      autoprefixer: {
+        flexbox: 'no-2009'
+      },
+      stage: 3
+    })
+  ]
+}

data/spec/controllers/admin/association_picker_controller_spec.rb

@@ -3,19 +3,17 @@
 require 'rails_helper'
 
 describe Lcms::Engine::Admin::AssociationPickerController do
-  ASSOCIATIONS = %w(content_sources tags grades topics reading_assignment_authors
-                    reading_assignment_texts standards).freeze
-
   let(:user) { create :admin }
 
   before { sign_in user }
 
   describe '#index' do
-    ASSOCIATIONS.each do |assoc|
-      it "list #{assoc} association items" do
-        get :index, params: { association: assoc, format: :json }
-        expect(response).to be_successful
+    %w(content_sources tags grades topics reading_assignment_authors reading_assignment_texts standards)
+      .each do |assoc|
+        it "list #{assoc} association items" do
+          get :index, params: { association: assoc, format: :json }
+          expect(response).to be_successful
+        end
       end
-    end
   end
 end

data/spec/controllers/admin/curriculums_controller_spec.rb

@@ -12,4 +12,27 @@ describe Lcms::Engine::Admin::CurriculumsController do
 
     it { is_expected.to be_successful }
   end
+
+  describe '#children' do
+    let(:id) { resource.id }
+    let(:resource) { create(:resource, :module) }
+    let!(:children) { create_list(:resource, 3, parent: resource) }
+
+    subject { get :children, params: { id: id } }
+
+    it 'returns children of the requested resource' do
+      JSON.parse(subject.body).each do |data|
+        child = ::Lcms::Engine::Resource.find(data['id'])
+        expect(child.parent_id).to eq id
+      end
+    end
+
+    context 'when # is requested' do
+      let(:id) { '#' }
+
+      it 'returns root resources' do
+        expect(JSON.parse(subject.body).first['id']).to eq resource.id
+      end
+    end
+  end
 end

data/spec/controllers/admin/documents_controller_spec.rb

@@ -9,7 +9,9 @@ describe Lcms::Engine::Admin::DocumentsController do
 
   describe '#create' do
     let(:document) { create :document }
-    let(:form) { instance_double('Lcms::Engine::DocumentForm', document: document, save: valid) }
+    let(:form) do
+      instance_double('Lcms::Engine::DocumentForm', document: document, save: valid, service_errors: [])
+    end
     let(:link) { 'link' }
     let(:params) { { link: link, link_fs: 'link_fs', reimport: '1' } }
     let(:valid) { true }
@@ -25,7 +27,7 @@ describe Lcms::Engine::Admin::DocumentsController do
 
     it 'redirects to document' do
       subject
-      expect(response).to redirect_to Lcms::Engine::Admin::AdminController.document_path(document)
+      expect(response).to redirect_to document_path(document)
     end
 
     # TODO: Rails upgrade - move to system spec
@@ -51,7 +53,7 @@ describe Lcms::Engine::Admin::DocumentsController do
 
       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))
+          receive_message_chain(:document_parse_job, :perform_later).and_return(double('response', job_id: 0))
         subject
       end
 
@@ -69,6 +71,18 @@ describe Lcms::Engine::Admin::DocumentsController do
         end
       end
     end
+
+    context 'when asynchronous import was requested' do
+      let(:link) { 'https://google.com/somefile' }
+      let(:params) { { async: '1', link: link } }
+
+      before { allow(controller).to receive(:bulk_import) }
+
+      it 'calls bulk import for that particular document' do
+        expect(controller).to receive(:bulk_import).with(Array.wrap(link))
+        subject
+      end
+    end
   end
 
   describe '#destroy' do
@@ -79,6 +93,14 @@ describe Lcms::Engine::Admin::DocumentsController do
     it 'deletes the document' do
       expect { subject }.to change(Lcms::Engine::Document, :count).by(-1)
     end
+
+    context 'when there was custom filter' do
+      let(:query) { { course: 'value' } }
+
+      subject { delete :destroy, params: { id: document.id, query: query } }
+
+      it { is_expected.to redirect_to "/lcms-engine/admin/documents?#{{ query: query }.to_param}" }
+    end
   end
 
   describe '#new' do

data/spec/controllers/admin/materials_controller_spec.rb

@@ -3,6 +3,8 @@
 require 'rails_helper'
 
 describe Lcms::Engine::Admin::MaterialsController do
+  include Lcms::Engine::PathHelper
+
   let(:user) { create :admin }
 
   before { sign_in user }
@@ -25,7 +27,7 @@ describe Lcms::Engine::Admin::MaterialsController do
 
     it 'redirects to material' do
       subject
-      expect(response).to redirect_to Lcms::Engine::Admin::AdminController.material_path(material)
+      expect(response).to redirect_to material_path(material)
     end
 
     context 'when there is an error' do
@@ -51,7 +53,7 @@ describe Lcms::Engine::Admin::MaterialsController do
 
       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))
+          receive_message_chain(:material_parse_job, :perform_later).and_return(double('response', job_id: 0))
         subject
       end
 
@@ -69,6 +71,17 @@ describe Lcms::Engine::Admin::MaterialsController do
         end
       end
     end
+
+    context 'when asynchronous import was requested' do
+      let(:params) { { async: '1', link: link } }
+
+      before { allow(controller).to receive(:bulk_import) }
+
+      it 'calls bulk import for that particular document' do
+        expect(controller).to receive(:bulk_import).with(Array.wrap(link))
+        subject
+      end
+    end
   end
 
   describe '#destroy' do
@@ -79,11 +92,11 @@ describe Lcms::Engine::Admin::MaterialsController do
     it { expect { subject }.to change { Lcms::Engine::Material.count }.by(-1) }
 
     context 'when there was custom filter' do
-      let(:query) { 'filter' }
+      let(:query) { { course: 'value' } }
 
       subject { delete :destroy, params: { id: material.id, query: query } }
 
-      it { is_expected.to redirect_to admin_materials_path(query: query) }
+      it { is_expected.to redirect_to "/lcms-engine/admin/materials?#{{ query: query }.to_param}" }
     end
   end
 

data/spec/controllers/admin/resource_bulk_edit_controller_spec.rb

@@ -22,7 +22,7 @@ describe Lcms::Engine::Admin::ResourceBulkEditsController do
       grades = resources.flat_map { |r| r.grades.list }
       expect(grades).to_not include('grade 11')
       post :create, params: { ids: ids, resource: { grades: ['grade 11'] } }
-      expect(response).to redirect_to(:admin_resources)
+      expect(response).to redirect_to(lcms_engine(admin_resources_path))
       resources.each do |r|
         expect(r.reload.grades.list).to include('grade 11')
       end

data/spec/controllers/admin/resources_controller_spec.rb

@@ -11,13 +11,13 @@ describe Lcms::Engine::Admin::ResourcesController do
   describe '#edit' do
     subject { get :edit, params: { id: resource.to_param } }
 
-    it { is_expected.to be_success }
+    it { is_expected.to be_successful }
   end
 
   describe '#index' do
     subject { get :index }
 
-    it { is_expected.to be_success }
+    it { is_expected.to be_successful }
   end
 
   describe '#update' do
@@ -27,7 +27,7 @@ describe Lcms::Engine::Admin::ResourcesController do
     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 { is_expected.to redirect_to lcms_engine(admin_resources_path) }
 
       it 'passes notice' do
         subject

data/spec/controllers/admin/settings_controller_spec.rb

@@ -11,6 +11,6 @@ describe Lcms::Engine::Admin::SettingsController do
     expect(Lcms::Engine::Settings[:editing_enabled]).to be true
     patch :toggle_editing_enabled
     expect(Lcms::Engine::Settings[:editing_enabled]).to be false
-    expect(response).to redirect_to(:admin_resources)
+    expect(response).to redirect_to(lcms_engine(admin_resources_path))
   end
 end

data/spec/controllers/admin/standards_controller_spec.rb

@@ -60,7 +60,7 @@ describe Lcms::Engine::Admin::StandardsController do
     subject { post :update, params: { id: standard.to_param, standard: params } }
 
     context 'with valid params' do
-      it { is_expected.to redirect_to admin_standards_path }
+      it { is_expected.to redirect_to lcms_engine(admin_standards_path) }
 
       it 'passes notice' do
         subject

data/spec/controllers/admin/welcome_controller_spec.rb

@@ -5,17 +5,19 @@ require 'rails_helper'
 describe Lcms::Engine::Admin::WelcomeController do
   let(:user) { create :admin }
 
-  describe 'requires admin user' do
-    before { get :index }
-    it { expect(response).to redirect_to new_user_session_path }
-  end
-
-  describe 'allow admin' do
-    before do
-      sign_in user
-      get :index
+  describe 'GET index' do
+    context 'requires admin user' do
+      before { get :index }
+      it { expect(response).to redirect_to lcms_engine(new_user_session_path) }
     end
 
-    it { expect(response).to be_successful }
+    context 'allow admin' do
+      before do
+        sign_in user
+        get :index
+      end
+
+      it { expect(response).to be_successful }
+    end
   end
 end

data/spec/controllers/resources_controller_spec.rb

@@ -49,19 +49,19 @@ xdescribe Lcms::Engine::ResourcesController do
     context 'with id' do
       before { get :show, id: resource.id }
 
-      it { expect(response).to redirect_to("/#{resource.slug}") }
+      it { expect(response).to redirect_to("/lcms-engine#{resource.slug}") }
     end
 
     context 'grade' do
       let(:resource) { create(:resource, :grade) }
       before { get :show, slug: resource.slug }
-      it { expect(response).to redirect_to explore_curriculum_index_path(p: resource.slug, e: 1) }
+      it { expect(response).to redirect_to lcms_engine(explore_curriculum_index_path(p: resource.slug, e: 1)) }
     end
 
     context 'module' do
       let(:resource) { create(:resource, :module) }
       before { get :show, slug: resource.slug }
-      it { expect(response).to redirect_to explore_curriculum_index_path(p: resource.slug, e: 1) }
+      it { expect(response).to redirect_to lcms_engine(explore_curriculum_index_path(p: resource.slug, e: 1)) }
     end
   end
 end

data/spec/controllers/welcome_controller_spec.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Lcms::Engine::WelcomeController do
+  #
+  # In the Host application should be a proxy which will redirect
+  # request inside mounted engine
+  #
+  describe 'GET oauth2callback' do
+    let(:code) { Faker::Lorem.words.join }
+
+    before { request.env['HTTP_REFERER'] = Lcms::Engine::WelcomeController::OAUTH_REFERER }
+
+    subject { get :oauth2callback, params: { code: code } }
+
+    it 'skips authorization' do
+      subject
+      expect(response).to be_successful
+    end
+
+    it 'renders passed in params as JSON' do
+      subject
+      result = JSON.parse(response.body)
+      expect(result['text']).to eq Lcms::Engine::WelcomeController::OAUTH_MESSAGE
+      expect(result['code']).to eq code
+    end
+
+    context 'when referer is not a Google service' do
+      before { request.env['HTTP_REFERER'] = 'test.com' }
+
+      it 'returns 404' do
+        subject
+        expect(response).to have_http_status(404)
+      end
+    end
+  end
+end

data/spec/dummy/.env.docker

@@ -0,0 +1,5 @@
+GIT_AUTHOR_EMAIL=joe@doe.com
+GIT_AUTHOR_NAME="Joe Doe"
+POSTGRESQL_ADDRESS=db
+POSTGRESQL_USERNAME=postgres
+POSTGRESQL_PASSWORD=

data/spec/dummy/.traceroute.yaml

@@ -6,11 +6,9 @@ ignore_unreachable_actions:
   - lcms_engine
   - rails_info
   - rails_mailers
-  - whoami$
 ignore_unused_routes:
   - ^lcms/engine/admin/access_codes#edit # accessed via `edit_admin_access_code_path`
   - ^lcms/engine/admin\/reading_assignment_texts # accessed via `association_picker_field` helper
   - ^devise
   - ^lcms/engine/pages#forthcoming # Used by `LinkTag`
   - ^pdfjs_viewer
-  - whoami$

data/spec/dummy/bin/webpack

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
+ENV["NODE_ENV"]  ||= "development"
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "bundler/setup"
+
+require "webpacker"
+require "webpacker/webpack_runner"
+
+APP_ROOT = File.expand_path("..", __dir__)
+Dir.chdir(APP_ROOT) do
+  Webpacker::WebpackRunner.run(ARGV)
+end

data/spec/dummy/bin/webpack-dev-server

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
+ENV["NODE_ENV"]  ||= "development"
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "bundler/setup"
+
+require "webpacker"
+require "webpacker/dev_server_runner"
+
+APP_ROOT = File.expand_path("..", __dir__)
+Dir.chdir(APP_ROOT) do
+  Webpacker::DevServerRunner.run(ARGV)
+end

data/spec/dummy/config/application.rb

@@ -17,7 +17,7 @@ require 'lcms/engine'
 module Dummy
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 5.2
+    config.load_defaults 6.1
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration can go into files in config/initializers

data/spec/dummy/config/environments/production.rb

@@ -87,7 +87,7 @@ Rails.application.configure do
   # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
 
   if ENV['RAILS_LOG_TO_STDOUT'].present?
-    logger = ActiveSupport::Logger.new(STDOUT)
+    logger = ActiveSupport::Logger.new($stdout)
     logger.formatter = config.log_formatter
     config.logger = ActiveSupport::TaggedLogging.new(logger)
   end

data/spec/dummy/config/environments/test.rb

@@ -7,7 +7,7 @@ Rails.application.configure do
   # test suite. You never need to work with it otherwise. Remember that
   # your test database is "scratch space" for the test suite and is wiped
   # and recreated between test runs. Don't rely on the data there!
-  config.cache_classes = true
+  config.cache_classes = false
 
   # Do not eager load code on boot. This avoids loading your whole application
   # just for the purpose of running a single test. If you are using a tool that

data/spec/dummy/config/initializers/assets.rb

@@ -14,3 +14,9 @@ Rails.application.config.assets.version = '1.0'
 # application.js, application.css, and all non-JS/CSS in the app/assets
 # folder are already added.
 # Rails.application.config.assets.precompile += %w( admin.js admin.css )
+
+# To prevent Sass errors
+# See https://github.com/rails/sprockets/issues/581
+Rails.application.config.assets.configure do |env|
+  env.export_concurrent = false
+end