lcms-engine 0.1.4 → 0.2.0

data/app/assets/stylesheets/lcms/engine/utils/_mixins.scss

@@ -78,9 +78,9 @@
 
 @mixin txt-heading($element) {
   @include txt-heading-base($element);
-  @each $size, $headers in $header-sizes {
+  @each $size, $headers in $header-styles {
     @include breakpoint($size) {
-      $font-size: map-get($headers, $element);
+      $font-size: map-get(map-get($headers, $element), 'font-size');
       font-size: rem-calc($font-size);
     }
   }

data/app/assets/stylesheets/lcms/engine/vendors/foundation_and_overrides-pdf.scss

@@ -11,7 +11,6 @@
 @include foundation-dropdown-menu;
 @include foundation-menu;
 @include foundation-menu-icon;
-@include foundation-flex-video;
 @include foundation-label;
 @include foundation-media-object;
 @include foundation-table;

data/app/assets/stylesheets/lcms/engine/vendors/foundation_and_overrides.scss

@@ -1,9 +1,18 @@
+@charset "utf-8";
+
 @import 'foundation';
+
+// If you'd like to include motion-ui the foundation-rails gem comes prepackaged with it, uncomment the 3 @imports, if you are not using the gem you need to install the motion-ui sass package.
+//
 @import 'motion-ui/motion-ui';
 
 // We include everything by default.  To slim your CSS, remove components you don't use.
+
 @include foundation-global-styles;
+//@include foundation-xy-grid-classes;
+//@include foundation-grid;
 @include foundation-flex-grid;
+@include foundation-flex-classes;
 @include foundation-typography;
 @include foundation-forms;
 @include foundation-button;
@@ -13,13 +22,14 @@
 @include foundation-breadcrumbs;
 @include foundation-button-group;
 @include foundation-callout;
+@include foundation-card;
 @include foundation-close-button;
 @include foundation-menu;
 @include foundation-menu-icon;
 @include foundation-drilldown-menu;
 @include foundation-dropdown;
 @include foundation-dropdown-menu;
-@include foundation-flex-video;
+@include foundation-responsive-embed;
 @include foundation-label;
 @include foundation-media-object;
 @include foundation-off-canvas;
@@ -38,7 +48,8 @@
 @include foundation-top-bar;
 @include foundation-visibility-classes;
 @include foundation-float-classes;
-@include foundation-flex-classes;
+
+// If you'd like to include motion-ui the foundation-rails gem comes prepackaged with it, uncomment the 3 @imports, if you are not using the gem you need to install the motion-ui sass package.
 
 @include motion-ui-transitions;
 @include motion-ui-animations;

data/app/controllers/lcms/engine/admin/admin_controller.rb

@@ -11,8 +11,6 @@ module Lcms
           materials_query: Lcms::Engine::AdminMaterialsQuery
         }.freeze
 
-        RE_GOOGLE_FOLDER = %r{/drive/(.*/)?folders/}
-
         layout :customized_layout
 
         before_action :authenticate_admin!

data/app/controllers/lcms/engine/admin/association_picker_controller.rb

@@ -13,7 +13,7 @@ module Lcms
         def index
           @items = association_items
           @items = @items.where('name ilike ?', "%#{params[:q]}%") if index_params[:q].present?
-          @items = @items.paginate(page: pagination.params[:page], per_page: 10).order('name asc')
+          @items = @items.paginate(page: params[:page], per_page: 10).order('name asc')
 
           respond_to do |format|
             format.json { render json: pagination.serialize(@items, AssociationItemSerializer) }
@@ -23,19 +23,20 @@ module Lcms
         private
 
         def pagination
-          @pagination ||= Pagination.new(params)
+          @pagination ||= Pagination.new params
         end
 
         def index_params
-          @index_params ||= begin
-            expected_params = params.slice(:association, :q).symbolize_keys
-            index_p = { q: nil }.merge(expected_params)
+          @index_params ||=
+            begin
+              expected_params = params.permit(:association, :q).to_h.symbolize_keys
+              index_p = { q: nil }.merge(expected_params)
 
-            raise StandardError unless VALID_ASSOCIATIONS.include?(index_p[:association])
+              raise StandardError unless VALID_ASSOCIATIONS.include?(index_p[:association])
 
-            index_p[:association] = index_p[:association].to_sym
-            index_p
-          end
+              index_p[:association] = index_p[:association].to_sym
+              index_p
+            end
         end
 
         def association_items

data/app/controllers/lcms/engine/admin/documents_controller.rb

@@ -18,13 +18,9 @@ module Lcms
         end
 
         def create
-          if form_params[:link].match?(RE_GOOGLE_FOLDER)
-            # Import all from a folder
-            file_ids = gdoc_files_from form_params[:link]
-            return bulk_import(file_ids) && render(:import) if file_ids.any?
-
-            flash.now[:alert] = t '.empty_folder'
-            return render(:new)
+          if gdoc_files.size > 1
+            bulk_import gdoc_files
+            return render :import
           end
 
           @document = reimport_lesson
@@ -32,7 +28,7 @@ module Lcms
             redirect_to AdminController.document_path(@document.document),
                         notice: t('.success', name: @document.document.name)
           else
-            render :new
+            render :new, alert: t('.error')
           end
         end
 
@@ -81,17 +77,24 @@ module Lcms
           @documents = Document.where(id: ids)
         end
 
-        def gdoc_files_from(url)
-          folder_id = ::Lt::Google::Api::Drive.folder_id_for(url)
-          ::Lt::Google::Api::Drive.new(google_credentials)
-            .list_file_ids_in(folder_id)
-            .map { |id| ::Lt::Lcms::Lesson::Downloader::Gdoc.gdoc_file_url(id) }
+        def gdoc_files
+          @gdoc_files ||= begin
+            link = form_params[:link]
+            if link.match?(%r{/drive/(.*/)?folders/})
+              folder_id = ::Lt::Google::Api::Drive.folder_id_for(link)
+              ::Lt::Google::Api::Drive.new(google_credentials)
+                .list_file_ids_in(folder_id)
+                .map { |id| Lt::Lcms::Lesson::Downloader::Gdoc.gdoc_file_url(id) }
+            else
+              [link]
+            end
+          end
         end
 
         def form_params
           @form_params ||=
             begin
-              data = params.require(:document_form).permit(:link, :link_fs, :reimport, :with_materials)
+              data = params.require(:document_form).permit(:link, :link_fs, :reimport, :with_materials).to_h
               data.delete(:with_materials) if data[:with_materials].to_i.zero?
               data
             end

data/app/controllers/lcms/engine/admin/materials_controller.rb

@@ -16,21 +16,12 @@ module Lcms
         end
 
         def create
-          @material_form = DocumentGenerator.material_form.new(form_params)
-
-          if form_params[:link].match?(RE_GOOGLE_FOLDER)
-            # Import all from a folder
-            file_ids = gdoc_files_from form_params[:link]
-            return bulk_import(file_ids) && render(:import) if file_ids.any?
-
-            flash.now[:alert] = t '.empty_folder'
-            return render(:new)
-          end
+          return bulk_import(gdoc_files) && render(:import) if gdoc_files.size > 1
 
+          @material_form = DocumentGenerator.material_form.new(form_params)
           if @material_form.save
             material = @material_form.material
-            redirect_to AdminController.material_path(material),
-                        notice: t('.success', name: material.name)
+            redirect_to AdminController.material_path(material.id), notice: t('.success', name: material.name)
           else
             render :new
           end
@@ -83,17 +74,22 @@ module Lcms
           params.require(:material_form).permit(:link, :source_type)
         end
 
-        def gdoc_files_from(url)
-          folder_id = ::Lt::Google::Api::Drive.folder_id_for(url)
-          if form_params[:source_type] == 'pdf'
-            mime_type = Lt::Lcms::Lesson::Downloader::PDF::MIME_TYPE
-            ::Lt::Google::Api::Drive.new(google_credentials)
-              .list_file_ids_in(folder_id, mime_type: mime_type)
-              .map { |id| ::Lt::Lcms::Lesson::Downloader::PDF.gdoc_file_url(id) }
-          else
-            ::Lt::Google::Api::Drive.new(google_credentials)
-              .list_file_ids_in(folder_id)
-              .map { |id| ::Lt::Lcms::Lesson::Downloader::Gdoc.gdoc_file_url(id) }
+        def gdoc_files
+          @gdoc_files ||= begin
+            link = form_params[:link]
+            return [link] unless link =~ %r{/drive/(.*/)?folders/}
+
+            folder_id = ::Lt::Google::Api::Drive.folder_id_for(link)
+            if form_params[:source_type] == 'pdf'
+              mime_type = Lt::Lcms::Lesson::Downloader::PDF::MIME_TYPE
+              ::Lt::Google::Api::Drive.new(google_credentials)
+                .list_file_ids_in(folder_id, mime_type: mime_type)
+                .map { |id| Lt::Lcms::Lesson::Downloader::PDF.gdoc_file_url(id) }
+            else
+              ::Lt::Google::Api::Drive.new(google_credentials)
+                .list_file_ids_in(folder_id)
+                .map { |id| Lt::Lcms::Lesson::Downloader::Gdoc.gdoc_file_url(id) }
+            end
           end
         end
       end

data/app/controllers/lcms/engine/admin/resource_picker_controller.rb

@@ -24,7 +24,7 @@ module Lcms
         def index_params
           @index_params ||= begin
             default_params = { type: nil, subject: nil, grade: nil, q: nil }
-            expected_params = params.slice(:type, :subject, :grade, :q).symbolize_keys
+            expected_params = params.permit(:type, :subject, :grade, :q).to_h.symbolize_keys
             index_p = default_params.merge(expected_params)
 
             grade_ok = index_p[:grade].blank? || Filterbar::GRADES.include?(index_p[:grade])
@@ -38,7 +38,7 @@ module Lcms
         end
 
         def pagination
-          @pagination ||= Pagination.new(params)
+          @pagination ||= Pagination.new params
         end
 
         def grade_name

data/app/controllers/lcms/engine/admin/resources_controller.rb

@@ -40,7 +40,9 @@ module Lcms
 
         def export_to_lti_cc
           # TODO: Later may need to extend this check to allow unit export as well
-          return redirect_to :back, notice: 'Unsupported resource type' unless @resource.module?
+          unless @resource.module?
+            return redirect_back fallback_location: admin_resources_path, notice: 'Unsupported resource type'
+          end
 
           data = LtiExporter.perform @resource
           filename = "#{@resource.slug.parameterize}.zip"
@@ -79,80 +81,6 @@ module Lcms
           redirect_to :admin_resources, notice: t('.success', resource_id: @resource.id)
         end
 
-        protected
-
-        def form_params_arrays
-          download_categories_settings =
-            DownloadCategory.select(:title).map do |category|
-              { category.title.parameterize => %i(show_long_description show_short_description) }
-            end
-          {
-            additional_resource_ids: [],
-            common_core_standard_ids: [],
-            download_categories_settings: download_categories_settings,
-            resource_downloads_attributes: [
-              :_destroy,
-              :description,
-              :id,
-              :download_category_id, { download_attributes: %i(description file main filename_cache id title) }
-            ],
-            related_resource_ids: [],
-            standard_ids: [],
-            new_standard_names: [],
-            topic_ids: [],
-            tag_ids: [],
-            content_source_ids: [],
-            reading_assignment_text_ids: [],
-            new_topic_names: [],
-            new_tag_names: [],
-            new_content_source_names: [],
-            **form_params_arrays_override
-          }
-        end
-
-        #
-        # The result of this method will be splatted into +form_params_ararys+
-        # and will be injected into the final +form_params+ call.
-        #
-        # Should be used to extend the list of permitted parameters
-        #
-        # @return [Hash]
-        def form_params_arrays_override
-          {}
-        end
-
-        def form_params_simple
-          %i(
-            curriculum_type
-            directory
-            parent_id
-            tree
-            description
-            hidden
-            resource_type
-            short_title
-            subtitle
-            title
-            teaser
-            url
-            time_to_teach
-            ell_appropriate
-            image_file
-            opr_description
-          ).concat(form_params_simple_override)
-        end
-
-        #
-        # The result of this method will be added to +form_params_simple+
-        # and will be injected into the final +form_params+ call.
-        #
-        # Should be used to extend the list of permitted parameters
-        #
-        # @return [Array]
-        def form_params_simple_override
-          []
-        end
-
         private
 
         def can_bundle?(resource)
@@ -161,7 +89,6 @@ module Lcms
             .detect { |type| resource.send "#{type}?" }
             .present?
         end
-
         helper_method :can_bundle?
 
         def find_resource
@@ -172,13 +99,51 @@ module Lcms
           params.fetch(:q, {}).fetch(:grades, []).select(&:present?)
         end
 
+        # rubocop:disable Metrics/MethodLength
         def form_params
           @form_params ||=
             begin
+              download_categories_settings =
+                DownloadCategory.select(:title).map do |category|
+                  { category.title.parameterize => %i(show_long_description show_short_description) }
+                end
               ps = params.require(:resource).permit(
-                form_params_simple,
-                form_params_arrays
-              )
+                :curriculum_type,
+                :directory,
+                :parent_id,
+                :tree,
+                :description,
+                :hidden,
+                :resource_type,
+                :short_title,
+                :subtitle,
+                :title,
+                :teaser,
+                :url,
+                :time_to_teach,
+                :ell_appropriate,
+                :image_file,
+                :opr_description,
+                additional_resource_ids: [],
+                common_core_standard_ids: [],
+                download_categories_settings: download_categories_settings,
+                resource_downloads_attributes: [
+                  :_destroy,
+                  :description,
+                  :id,
+                  :download_category_id, { download_attributes: %i(description file main filename_cache id title) }
+                ],
+                related_resource_ids: [],
+                standard_ids: [],
+                new_standard_names: [],
+                topic_ids: [],
+                tag_ids: [],
+                content_source_ids: [],
+                reading_assignment_text_ids: [],
+                new_topic_names: [],
+                new_tag_names: [],
+                new_content_source_names: []
+              ).to_h
               if ps[:download_categories_settings].present?
                 ps[:download_categories_settings].transform_values! do |settings|
                   settings.transform_values! { |x| x == '1' }
@@ -188,6 +153,7 @@ module Lcms
               ps
             end
         end
+        # rubocop:enable Metrics/MethodLength
 
         def metadata(directory)
           return {} unless @resource.present?

data/app/controllers/lcms/engine/admin/sketch_compilers_controller.rb

@@ -15,9 +15,9 @@ module Lcms
 
           if response.success?
             url = DocumentExporter::Gdoc::Base.url_for JSON.parse(response.body)['id']
-            redirect_to :back, notice: t('.success', url: url)
+            redirect_back fallback_location: new_admin_sketch_compiler_path, notice: t('.success', url: url)
           else
-            redirect_to :back, alert: t('.compile_error')
+            redirect_back fallback_location: new_admin_sketch_compiler_path, alert: t('.compile_error')
           end
         end
 

data/app/controllers/lcms/engine/application_controller.rb

@@ -6,12 +6,6 @@ module Lcms
       # store location to use at after sign in or other devise callbacks
       include LocationStorable
 
-      protect_from_forgery with: :exception
-
-      # NOTE: Temporary disabled
-      # require auth for accessing the pilot
-      # before_action :pilot_authentication if Rails.env.production? || Rails.env.production_swap?
-
       before_action :authenticate_user!, unless: :pdf_request?
 
       before_action :check_user_has_survey_filled_in, if: :user_signed_in?, unless: :devise_controller?
@@ -54,15 +48,6 @@ module Lcms
       def after_sign_out_path_for(resource_or_scope)
         session_path(resource_or_scope)
       end
-
-      # NOTE: Temporary disabled
-      # def pilot_authentication
-      #   return unless request.format.html?
-      #
-      #   authenticate_or_request_with_http_basic('Administration') do |username, password|
-      #     username == ENV['HTTP_AUTH_NAME'] && password == ENV['HTTP_AUTH_PASS']
-      #   end
-      # end
     end
   end
 end