lcms-engine 0.1.2 → 0.3.1

data/lib/tasks/cloud66.rake

@@ -20,7 +20,9 @@ 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
@@ -29,20 +31,20 @@ namespace :cloud66 do # rubocop:disable Metrics/BlockLength
           --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']}"
       # 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]
 

data/lib/tasks/google.rake

@@ -14,7 +14,7 @@ namespace :google do
       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
+      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
       )

data/package.json

@@ -8,6 +8,7 @@
     "@rails/webpacker": "~4",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
     "classnames": "^2.2.6",
+    "lodash": "^4.17.20",
     "prop-types": "^15.7.2",
     "react": "^16.9.0",
     "react-dom": "^16.9.0",

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/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, association: assoc, format: :json
-        expect(response).to be_success
+    %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

@@ -10,7 +10,6 @@ describe Lcms::Engine::Admin::CurriculumsController do
   describe '#edit' do
     subject { get :edit }
 
-    it { is_expected.to be_success }
-    it { is_expected.to render_template :edit }
+    it { is_expected.to be_successful }
   end
 end

data/spec/controllers/admin/documents_controller_spec.rb

@@ -8,18 +8,17 @@ 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(: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 }
 
-    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, document_form: params }
+    subject { post :create, params: { document_form: params } }
 
     it 'creates DocumentForm object' do
       expect(Lcms::Engine::DocumentForm).to receive(:new).with(params)
@@ -31,17 +30,53 @@ describe Lcms::Engine::Admin::DocumentsController do
       expect(response).to redirect_to Lcms::Engine::Admin::AdminController.document_path(document)
     end
 
-    context 'when there is an error' do
+    # TODO: Rails upgrade - move to system spec
+    xcontext 'when there is an error' do
       let(:valid) { false }
 
       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
     let!(:document) { create :document }
 
-    subject { delete :destroy, id: document.id }
+    subject { delete :destroy, params: { id: document.id } }
 
     it 'deletes the document' do
       expect { subject }.to change(Lcms::Engine::Document, :count).by(-1)
@@ -56,6 +91,7 @@ describe Lcms::Engine::Admin::DocumentsController do
       subject
     end
 
-    it { is_expected.to render_template :new }
+    # TODO: Rails upgrade - move to system spec
+    xit { is_expected.to render_template :new }
   end
 end

data/spec/controllers/admin/materials_controller_spec.rb

@@ -7,17 +7,81 @@ 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 }
 
-    subject { delete :destroy, id: material.id }
+    subject { delete :destroy, params: { id: material.id } }
 
     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, id: material.id, query: query }
+      subject { delete :destroy, params: { id: material.id, query: query } }
 
       it { is_expected.to redirect_to admin_materials_path(query: query) }
     end
@@ -26,9 +90,10 @@ describe Lcms::Engine::Admin::MaterialsController do
   describe '#index' do
     subject { get :index }
 
-    it { is_expected.to be_success }
+    it { is_expected.to be_successful }
 
-    it { is_expected.to render_template :index }
+    # TODO: Rails upgrade - move to system spec
+    xit { is_expected.to render_template :index }
   end
 
   describe '#new' do
@@ -39,6 +104,7 @@ describe Lcms::Engine::Admin::MaterialsController do
       subject
     end
 
-    it { is_expected.to render_template :new }
+    # TODO: Rails upgrade - move to system spec
+    xit { is_expected.to render_template :new }
   end
 end

data/spec/controllers/admin/resource_bulk_edit_controller_spec.rb

@@ -13,15 +13,15 @@ describe Lcms::Engine::Admin::ResourceBulkEditsController do
   end
 
   describe '#new' do
-    subject { get :new, ids: ids }
-    it { is_expected.to be_success }
+    subject { get :new, params: { ids: ids } }
+    it { is_expected.to be_successful }
   end
 
   describe '#create' do
     it 'updates resources' do
       grades = resources.flat_map { |r| r.grades.list }
       expect(grades).to_not include('grade 11')
-      post :create, ids: ids, resource: { grades: ['grade 11'] }
+      post :create, params: { ids: ids, resource: { grades: ['grade 11'] } }
       expect(response).to redirect_to(:admin_resources)
       resources.each do |r|
         expect(r.reload.grades.list).to include('grade 11')

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_successful }
+  end
+
+  describe '#index' do
+    subject { get :index }
+
+    it { is_expected.to be_successful }
+  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/controllers/admin/sketch_compilers_controller_spec.rb

@@ -12,12 +12,12 @@ describe Lcms::Engine::Admin::SketchCompilersController do
     let(:url) { 'url' }
     let(:version) { 'v1' }
 
-    subject { post :compile, params }
+    subject { post :compile, params: params }
 
     context 'with valid params' do
       let(:api_response) { double }
       let(:compiler) { instance_double(Lcms::Engine::SketchCompiler, compile: api_response) }
-      let(:ip) { '127.0.0.1' }
+      let(:ip) { '0.0.0.0' }
 
       before do
         allow(Lcms::Engine::SketchCompiler).to receive_message_chain(:new, :compile).and_return(api_response)
@@ -62,7 +62,8 @@ describe Lcms::Engine::Admin::SketchCompilersController do
   describe '#new' do
     subject { get :new }
 
-    context 'with google credentials' do
+    # TODO: Rails upgrade - move to system spec
+    xcontext 'with google credentials' do
       let(:credentials) { 'credentials' }
 
       before { allow(controller).to receive(:google_credentials).and_return(credentials) }
@@ -77,7 +78,7 @@ describe Lcms::Engine::Admin::SketchCompilersController do
       context 'when version has been passed in' do
         let(:version) { 'v2' }
 
-        before { get :new, version: version }
+        before { get :new, params: { version: version } }
 
         it 'uses passed in version' do
           expect(assigns(:version)).to eq version