Ruby 3.2 upgrade

.codeclimate.yml

@@ -15,7 +15,7 @@ checks:
   method-complexity:
     enabled: true
     config:
-      threshold: 20
+      threshold: 30
   method-count:
     enabled: true
     config:
@@ -74,6 +74,7 @@ ratings:
 exclude_paths:
   - app/assets/javascripts/lcms/engine/vendor/**/*
   - features/**/*
+  - public/lcms-engine-assets/**/*.map
   - spec/**/*
   - vendor/**/*
   - node_modules/**/*

.codeship/setup.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+gem update --system 3.4.12
+gem install bundler:2.4.12
+
+bundle _2.4.12_ install
+
+rbs collection install
+rbs collection update
+
+bin/overcommit --sign
+if ! [email protected] GIT_AUTHOR_NAME='ci user' bundle exec overcommit --run; then
+  exit 1
+fi
+
+# Setup environment
+echo -e 'APPLICATION_DOMAIN=example.org' > .env
+RAILS_ENV="test" bin/rails db:create
+RAILS_ENV="test" bin/rails db:schema:load
+RAILS_ENV="test" bin/rails db:migrate

.codeship/tests.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+RAILS_ENV="test" bundle exec rspec

.dockerignore

@@ -19,7 +19,6 @@ pdfs
 .DS_Store
 .generators
 .rakeTasks
-public/lcms_engine_packs
 yarn-debug.log*
 yarn-integrity
 yarn-error.log

.env.template

@@ -13,13 +13,11 @@ POSTGRESQL_DATABASE=
 POSTGRESQL_USERNAME=
 POSTGRESQL_PASSWORD=
 POSTGRESQL_PORT=
-WEBPACKER_CHECK_YARN=
 WKHTMLTOPDF_PATH=
 
 # OTHER VARIABLES
 AIR_BRAKE_PROJECT_ID=
 AIR_BRAKE_PROJECT_KEY=
-BITLY_API_TOKEN=
 ENABLE_BASE64_CACHING=
 GOOGLE_APPLICATION_FOLDER_ID=
 GOOGLE_APPLICATION_PREVIEW_FOLDER_ID=
@@ -32,3 +30,4 @@ GOOGLE_API_CLIENT_UPLOAD_TIMEOUT=
 PUPPETEER_TIMEOUT=
 RESQUE_NAMESPACE=
 WORKERS_COUNT=
+API_SECRET_KEY=

.eslintrc

@@ -10,9 +10,7 @@
   "globals": {
     "$": false,
     "ga": false,
-    "Foundation": false,
-    "Modernizr": false,
-    "Routes": false
+    "Modernizr": false
   },
   "plugins": ["react", "jsx-a11y", "prettier"],
   "settings": {

.gitignore

@@ -25,3 +25,6 @@ spec/dummy/public/assets/
 
 coverage
 /yarn-error.log
+/.gem_rbs_collection/
+
+docker-compose.personal.yml

.nvmrc

@@ -1 +1 @@
-14.17.0
+18.15.0

.overcommit.yml

@@ -13,15 +13,16 @@ PreCommit:
   BundleCheck:
     enabled: true
 
-  BundleOutdated:
-    enabled: true
+#  BundleOutdated:
+#    enabled: true
 
   LocalPathsInGemfile:
     enabled: true
 
   ExecutePermissions:
     enabled: true
     exclude:
+    - .codeship/*
     - bin/*
     - spec/dummy/bin/*
 
@@ -36,6 +37,16 @@ PreCommit:
   TrailingWhitespace:
     enabled: true
 
+  TypeCheck:
+    enabled: true
+    description: RBS check
+    command: [ 'steep', 'check' ]
+
+  ShellCheck:
+    enabled: true
+    exclude:
+      - node_modules/**/*
+
 PostCheckout:
   ALL:
     quiet: true # Change all post-checkout hooks to only display output on failure

.rubocop.yml

@@ -15,8 +15,13 @@ AllCops:
     - spec/dummy/db/schema.rb
     - spec/dummy/bin/*
     - templates/*
+    - config/initializers/simple_form_bootstrap.rb
+    - Steepfile
   NewCops: enable
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.2
+
+Gemspec/DevelopmentDependencies:
+  EnforcedStyle: gemspec
 
 Layout/LineLength:
   Max: 120
@@ -38,7 +43,6 @@ Metrics/BlockLength:
     - '**/*_spec.rb'
     - 'config/routes.rb'
     - 'lcms-engine.gemspec'
-    - 'lib/tasks/elasticsearch.rake'
   AllowedMethods: ['guard', 'included', 'class_eval']
 
 Metrics/ClassLength:

.ruby-version

@@ -1 +1 @@
-2.7.4
+3.2.1

.stylelintignore

@@ -1,7 +1,6 @@
 docs
 coverage
 app/assets/stylesheets/lcms/engine/vendors/*
-app/assets/stylesheets/lcms/engine/utils/_styles_override.scss
 app/assets/stylesheets/lcms/engine/utils/_mixins.scss
 app/assets/stylesheets/lcms/engine/base/_typography.scss
 app/assets/stylesheets/lcms/engine/print/_typography.scss

CHANGELOG.md

@@ -6,6 +6,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased](https://github.com/learningtapestry/lcms-engine/compare/v0.5.4...HEAD)
 
+### Added
+
+- Parse error propagation: errors in tags and inside metadata tables are now displayed after import - [@paranoicsan](https://github.com/paranoicsan)
+
+### Changed
+
+- [BREAKING] Update CKEditor version (see [CKEditor usage](docs/ckeditor-usage.md)) - [@paranoicsan](https://github.com/paranoicsan)
+- [BREAKING] Refactor query handling in admin controllers - [@paranoicsan](https://github.com/paranoicsan)
+- [BREAKING] Rename `import_status_for` to `import_status_for_nested` inside `Lcms::Engine::NestedReimportable` - [@paranoicsan](https://github.com/paranoicsan)
+- Normalize metadata search in Resource model - [@paranoicsan](https://github.com/paranoicsan)
+
 ## [0.5.4](https://github.com/learningtapestry/lcms-engine/compare/v0.5.3...v0.5.4) - 2022.12.30
 
 ### Changed

Dockerfile

@@ -1,27 +1,57 @@
-FROM ruby:2.7.7
+FROM ruby:3.2.1
 
-ENV APP_PATH /app/
-ENV LANG C.UTF-8
+ENV APP_PATH=/app/
+ENV LANG=C.UTF-8
 
 WORKDIR $APP_PATH
 
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
-    && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list  \
-    && curl -sL https://deb.nodesource.com/setup_14.x | bash - \
+RUN apt-get autoclean \
+    && apt-get clean \
     && apt-get update -qqy \
-    && apt-get install -y --no-install-recommends nodejs yarn \
-    && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
+    && apt-get install -y --no-install-recommends \
+      build-essential \
+      chromium-driver \
+      postgresql-client-13 \
+      shellcheck \
+      tzdata \
+    && rm -r /var/lib/apt/lists/* /var/cache/apt/*
+
+# install specific wkhtmltopdf binary
+RUN apt-get update -qqy \
+    && WK_VERSION=0.12.6.1-2 \
+    && ARCH=$(dpkg --print-architecture) \
+    && CODENAME=$(. /etc/os-release; echo $VERSION_CODENAME) \
+    && curl -LSfso wkhtmltopdf.deb https://github.com/wkhtmltopdf/packaging/releases/download/$WK_VERSION/wkhtmltox_$WK_VERSION.${CODENAME}_$ARCH.deb \
+    && apt-get install -qy xfonts-75dpi xfonts-base ./wkhtmltopdf.deb \
+    && rm wkhtmltopdf.deb \
+    && rm -r /var/lib/apt/lists/* /var/cache/apt/*
 
 # Add codebase
 COPY . $APP_PATH
 
 # Install gems
-RUN gem install bundler:2.4.8 \
+RUN gem update --system 3.4.12 \
+    && gem install bundler:2.4.12 \
     && bundle install --jobs `expr $(cat /proc/cpuinfo | grep -c "cpu cores") - 1` --retry 3 \
     && rm -rf /usr/local/bundle/cache/*.gem \
     && find /usr/local/bundle/gems/ -name "*.c" -delete \
     && find /usr/local/bundle/gems/ -name "*.o" -delete
 
-# Install yarn packages
+# install nvm & yarn & packages
+COPY .nvmrc $APP_PATH
 COPY package.json yarn.lock $APP_PATH
-RUN yarn install
+
+ENV NVM_DIR=/usr/local/nvm
+ENV NODE_VERSION=18.15.0
+ENV NODE_PATH=$NVM_DIR/v$NODE_VERSION/lib/node_modules
+ENV PATH=$NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH
+
+SHELL ["/bin/bash", "--login", "-i", "-c"]
+RUN mkdir -p /usr/local/nvm \
+    && curl https://raw.githubusercontent.com/creationix/nvm/master/install.sh | bash \
+    && source $NVM_DIR/nvm.sh \
+    && nvm install $NODE_VERSION \
+    && nvm alias default $NODE_VERSION \
+    && nvm use default \
+    && npm install -g yarn \
+    && yarn install

Gemfile

@@ -16,6 +16,14 @@ gemspec
 # To use a debugger
 # gem 'byebug', group: [:development, :test]
 
-gem 'wicked_pdf', git: 'https://github.com/learningtapestry/wicked_pdf.git',
+gem 'lt-google-api', github: 'learningtapestry/lt-google-api',
+                     branch: 'ruby-3-upgrade',
+                     ref: '3dd76b6'
+
+gem 'lt-lcms', github: 'learningtapestry/lt-lcms',
+               branch: 'ruby-3-upgrade',
+               ref: '9394667'
+
+gem 'wicked_pdf', github: 'learningtapestry/wicked_pdf',
                   branch: 'puppeteer-support',
-                  ref: '964a090'
+                  ref: '50d961e'