lcms-engine 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c37201e439f0704a64bb50c1b520eda59af5407d1e76389ec579532142ce08a
-  data.tar.gz: 03d52081094d087b2b3fe1090a86a9e153fdcd6fab33510e19ea1809ff4d7a29
+  metadata.gz: aa522908e0892715f7b2fa01f4563e143f96504d6323a30c44ad136fd35506db
+  data.tar.gz: fcdcffc89fc90071562dfd454ac700b3ffd25906fe9ebe6377475b2a9c5fdbd4
 SHA512:
-  metadata.gz: 5572bde25038a2a11c02380993d600a8ba864d1a4d0f2ca4f4369c9f487e2ccc230c742d3d4ede4eae7a9765b1dda1ca6117ac78528802eabbf64dc3d8ac8b27
-  data.tar.gz: 1310db2346532587a79938b12711e3e7bc844790efe0675ad5aed13c0b8357d441ba37b9b6befe18357f1f4cbfd8fd5ea77702f51466c1b43364b8764b712527
+  metadata.gz: e3670c15ccc335e9a39178446629cd76d52d8df7f0c51540a5eb4d8b1b39fa194bd5df1e025f08005ae63bc7038e05eb7b27be9ec735c7a67ee543fa7acd4a67
+  data.tar.gz: 7766b9cbe3be659ca6ac4ea3b5e0633a99f6ac85347165b9fe5dea07591f2e10d021b6bb5b7fe97d28e0708f1b8ac3146b8cc19ea083581e95acb722b3eab629

data/CHANGELOG.md

@@ -4,7 +4,24 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://github.com/learningtapestry/lcms-engine/compare/v0.4.1...HEAD)
+## [Unreleased](https://github.com/learningtapestry/lcms-engine/compare/v0.5.0...HEAD)
+
+## [0.5.0](https://github.com/learningtapestry/lcms-engine/compare/v0.4.2...v0.5.0) - 2022.10.21
+
+### Changed
+
+- [BREAKING] - Force use jQuery v3.x - [@paranoicsan](https://github.com/paranoicsan)
+- [BREAKING] - Bump CKEditor to v4.20. Changed the behavior how we load ckeditor4 sources from CDN - [@paranoicsan](https://github.com/paranoicsan)
+
+### Fixed
+
+- Fix wrong URL on edit button on Standards index page - [@paranoicsan](https://github.com/paranoicsan)
+
+## [0.4.2](https://github.com/learningtapestry/lcms-engine/compare/v0.4.1...v0.4.2) - 2022.10.18
+
+### Changed
+
+- Allow `ImportStatus` page customization - [@paranoicsan](https://github.com/paranoicsan)
 
 ## [0.4.1](https://github.com/learningtapestry/lcms-engine/compare/v0.4.0...v0.4.1) - 2022.10.13
 

data/Gemfile.lock

@@ -10,7 +10,7 @@ GIT
 PATH
   remote: .
   specs:
-    lcms-engine (0.4.1)
+    lcms-engine (0.4.2)
       active_model_serializers (~> 0.10.10)
       activejob-retry (~> 0.6.3)
       acts-as-taggable-on (~> 7.0)
@@ -162,10 +162,10 @@ GEM
     autoprefixer-rails (9.8.6.5)
       execjs
     aws-eventstream (1.2.0)
-    aws-partitions (1.638.0)
-    aws-record (2.7.0)
+    aws-partitions (1.646.0)
+    aws-record (2.8.0)
       aws-sdk-dynamodb (~> 1.18)
-    aws-sdk-core (3.156.0)
+    aws-sdk-core (3.160.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
@@ -176,7 +176,7 @@ GEM
     aws-sdk-kms (1.58.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-rails (3.6.3)
+    aws-sdk-rails (3.6.4)
       aws-record (~> 2)
       aws-sdk-ses (~> 1)
       aws-sdk-sqs (~> 1)
@@ -196,7 +196,7 @@ GEM
     aws-sessionstore-dynamodb (2.0.1)
       aws-sdk-dynamodb (~> 1)
       rack (~> 2)
-    aws-sigv4 (1.5.1)
+    aws-sigv4 (1.5.2)
       aws-eventstream (~> 1, >= 1.0.2)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
@@ -303,7 +303,7 @@ GEM
     erubi (1.11.0)
     et-orbi (1.2.7)
       tzinfo
-    excon (0.92.5)
+    excon (0.93.0)
     execjs (2.8.1)
     factory_bot (5.2.0)
       activesupport (>= 4.2.0)
@@ -364,7 +364,7 @@ GEM
     google-api-client (0.53.0)
       google-apis-core (~> 0.1)
       google-apis-generator (~> 0.1)
-    google-apis-core (0.9.0)
+    google-apis-core (0.9.1)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -375,10 +375,10 @@ GEM
       webrick
     google-apis-discovery_v1 (0.12.0)
       google-apis-core (>= 0.9.0, < 2.a)
-    google-apis-generator (0.10.0)
+    google-apis-generator (0.11.0)
       activesupport (>= 5.0)
       gems (~> 1.2)
-      google-apis-core (>= 0.9.0, < 2.a)
+      google-apis-core (>= 0.9.1, < 2.a)
       google-apis-discovery_v1 (~> 0.5)
       thor (>= 0.20, < 2.a)
     googleauth (0.17.1)
@@ -484,7 +484,7 @@ GEM
       json (> 1.8.4)
       rails (> 4.2.0)
       sassc-rails (>= 2.1)
-    pg (1.4.3)
+    pg (1.4.4)
     pg_search (2.3.6)
       activerecord (>= 5.2)
       activesupport (>= 5.2)
@@ -504,7 +504,7 @@ GEM
     rack (2.2.4)
     rack-mini-profiler (2.3.4)
       rack (>= 1.2.0)
-    rack-protection (3.0.1)
+    rack-protection (3.0.2)
       rack
     rack-proxy (0.7.4)
       rack
@@ -570,7 +570,7 @@ GEM
       multi_json (~> 1.0)
       redis-namespace (~> 1.6)
       sinatra (>= 0.9.2)
-    resque-scheduler (4.6.0)
+    resque-scheduler (4.7.0)
       mono_logger (~> 1.0)
       redis (>= 3.3)
       resque (>= 1.27)
@@ -663,10 +663,10 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    sinatra (3.0.1)
+    sinatra (3.0.2)
       mustermann (~> 3.0)
       rack (~> 2.2, >= 2.2.4)
-      rack-protection (= 3.0.1)
+      rack-protection (= 3.0.2)
       tilt (~> 2.0)
     spring (2.1.1)
     spring-commands-rspec (1.0.4)

data/app/assets/javascripts/lcms/engine/admin/lcms_engine_application.js

@@ -1,6 +1,5 @@
 //= require turbolinks
-//= require jquery2
-//= require jquery_ujs
+//= require jquery3
 //= require jquery_nested_form
 //= require foundation
 //= require html.sortable.min
@@ -13,4 +12,10 @@ document.addEventListener('turbolinks:load', function () {
     allowEmptyOption: true,
     plugins: ['remove_button'],
   });
+
+  if (typeof CKEDITOR === 'undefined' && document.getElementsByClassName('ckeditor').length) {
+    let script = document.createElement('script');
+    script.src = 'https://cdn.ckeditor.com/4.20.0/standard/ckeditor.js';
+    document.head.append(script);
+  }
 });

data/app/assets/javascripts/lcms/engine/lcms_engine_application.js

@@ -1,6 +1,5 @@
 //= require turbolinks
-//= require jquery2
-//= require jquery_ujs
+//= require jquery3
 //= require foundation
 //= require js-routes
 //= require './initializers/foundation'

data/app/javascript/components/admin/ImportStatus.jsx

@@ -78,12 +78,12 @@ class ImportStatus extends React.Component {
     return _.map(this.links, (link, idx) => (
       <a
         key={`pl-${idx}`}
-        href={linkWithParams(link, { id: job.model.id })}
+        href={typeof job.model === 'undefined' ? link : linkWithParams(link, { id: job.model.id })}
         className="o-adm-materials__resource button primary u-margin-left--small u-margin-bottom--zero"
         target="_blank"
         rel="noreferrer"
       >
-        <i className="fas fa-eye"></i>
+        <i className="fa fa-eye" aria-hidden="true"></i>
       </a>
     ));
   }
@@ -112,7 +112,7 @@ class ImportStatus extends React.Component {
         <li className={`o-adm-materials__result o-adm-materials__result--${status}`} key={key}>
           <div className="u-flex align-justify align-middle">
             <a href={job.link} target="_blank" className="o-adm-materials__link" rel="noreferrer">
-              {job.link}
+              {job.status !== 'done' ? job.text || job.link : 'Done'}
             </a>
             {job.status !== 'done' ? this.spinner() : null}
             {job.status === 'done' && job.ok ? <span>{this.resourceButton(job)}</span> : null}
@@ -149,7 +149,7 @@ class ImportStatus extends React.Component {
 }
 
 ImportStatus.propTypes = {
-  jobs: PropTypes.array,
+  jobs: PropTypes.object,
   links: PropTypes.array,
   type: PropTypes.string,
   path: PropTypes.string,

data/app/views/lcms/engine/admin/resources/_fields.html.erb

@@ -1,7 +1,5 @@
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jstree/3.2.1/themes/default/style.min.css" />
 
-<%= javascript_include_tag Ckeditor.cdn_url %>
-
 <%= f.input :title %>
 
 <%= f.input :short_title %>

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

@@ -1,5 +1,3 @@
-<%= javascript_include_tag Ckeditor.cdn_url %>
-
 <%= simple_form_for @standard, as: :standard, url: lcms_engine.admin_standard_path(@standard), html: { class: 'o-standard-form' } do |f| %>
 
   <div class="row o-admin-standard-readonly">

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

@@ -22,7 +22,7 @@
               <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>
+              <td><%= link_to 'edit', lcms_engine.edit_admin_standard_path(std), class: 'button btn o-btn' %></td>
             </tr>
           <% end %>
         <% end %>

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

@@ -3,7 +3,7 @@
     <span>
       <%= link_to preview_download_path(id: download, slug: resource.slug), class: 'resource-attachment',
         data: { no_turbolink: true }, target: '_blank' do %>
-        <i class="fas fa-eye" aria-hidden="true"></i>
+        <i class="<i class="fa fa-eye" aria-hidden="true"></i>" aria-hidden="true"></i>
       <% end %>
     </span>
   <% end %>

data/config/initializers/ckeditor.rb

@@ -2,5 +2,5 @@
 
 Ckeditor.setup do |config|
   # //cdn.ckeditor.com/<version.number>/<distribution>/ckeditor.js
-  config.cdn_url = '//cdn.ckeditor.com/4.6.1/basic/ckeditor.js'
+  config.cdn_url = '//cdn.ckeditor.com/4.20.0/standard/ckeditor.js'
 end

data/lib/lcms/engine/version.rb

@@ -2,7 +2,7 @@
 
 module Lcms
   module Engine
-    VERSION = '0.4.1'
+    VERSION = '0.5.0'
     RAILS_5_VERSION = 5.2
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lcms-engine
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Alexander Kuznetsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-13 00:00:00.000000000 Z
+date: 2022-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob-retry
@@ -176,22 +176,22 @@ dependencies:
   name: bullet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
@@ -834,62 +834,62 @@ dependencies:
   name: resque
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: resque-scheduler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.4'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.4.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.4'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.4.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.4'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: retriable
   requirement: !ruby/object:Gem::Requirement
@@ -2412,7 +2412,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Rails engine for LCMS applications