lt-lcms 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5e933c5e37f0d126011fd282627b7e32ce6b7161479dd9a6c9fb3f175b4dbad
-  data.tar.gz: 44e7764f8a516e049a4a937d0ca0167f82f303d31abda8dbd2c3fa3eb168caf9
+  metadata.gz: 70d21ae84e0b9051f300e4c9595f0bad46a22ff9ec4c5683a2053aba1a10c200
+  data.tar.gz: 0bb19d2c3d28e4a0de61865afd41d2e44c77aaa2f97859f90b7b2ce7ba9241ef
 SHA512:
-  metadata.gz: b4f08ae299d437e8434f2f854b87b1bec0dccec89988b58aae298cbe5859fc9ee54b5f99f6a5d313e5120d8bf9bf9ccd5ebca80bb7659dcdfdf1e9bbbef4589b
-  data.tar.gz: 67871dac1055d75a8e460f8ffd58a36cc92d9d2ea640e8d2286f57130c264812f60201ee317ec2fb7dd65b7ec516b861089ca570d08ca78fde695fcb9f98b7b8
+  metadata.gz: 44a449fd0698fa5f4829b5800c6f7175de65945999d407807932f9293ec4afa83dcf2f5630356c2c8d09362fad8ae2c44b7e8ded39f134ebff9f57c35d7458cf
+  data.tar.gz: 034f7d256026c7e0e49ad29b07e514563022bc32ca9e3e51550e654e80caf661774da7cf17c8ac01ce1e2d6bedf7f97467b34af9078cb2819dbf14d16437a68d

data/.dockerignore

@@ -0,0 +1,15 @@
+/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+
+# Ignore IDE specific files
+.idea/
+
+# Misc
+.DS_Store
+.gem_rbs_collection/

data/.gitignore

@@ -7,3 +7,4 @@
 
 # Misc
 .DS_Store
+.gem_rbs_collection/

data/.overcommit.yml

@@ -30,6 +30,11 @@ PreCommit:
   TrailingWhitespace:
     enabled: true
 
+  TypeCheck:
+    enabled: true
+    description: RBS check
+    command: [ 'steep', 'check' ]
+
 PostCheckout:
   ALL:
     quiet: true # Change all post-checkout hooks to only display output on failure

data/.rubocop.yml

@@ -13,7 +13,10 @@ AllCops:
     - db/schema.rb
     - node_modules/**/*
   NewCops: enable
-  TargetRubyVersion: 3.2
+  TargetRubyVersion: 2.7
+
+Gemspec/DevelopmentDependencies:
+  EnforcedStyle: gemspec
 
 Layout/LineLength:
   Max: 120
@@ -31,7 +34,7 @@ Metrics/BlockLength:
   Exclude:
   - '**/*_spec.rb'
   - 'config/routes.rb'
-  ExcludedMethods: ['guard', 'included']
+  AllowedMethods: ['guard', 'included']
 
 Metrics/ClassLength:
   Max: 250

data/.ruby-version

@@ -1 +1 @@
-3.2.1
+2.7.7

data/CHANGELOG.md

@@ -4,7 +4,19 @@ 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.5.0...HEAD)
+## [Unreleased](https://github.com/learningtapestry/lcms-engine/compare/v0.6.0...HEAD)
+
+## [0.6.0](https://github.com/learningtapestry/lt-lcms/compare/v0.5.0...v0.6.0) - 2023-12-23
+### Added
+
+- Added Docker support [@paranoicsan](https://github.com/paranoicsan)
+- Added RBS support [@paranoicsan](https://github.com/paranoicsan)
+
+### Changed
+
+- Updated dependencies [@paranoicsan](https://github.com/paranoicsan)
+- Ruby updated to 2.7.7 [@shlag3n](https://github.com/shlag3n) at the main branch, 3.x version will be at separate branch ruby-3-upgrade
+- Bump lt-google-api to 0.3.0 to upgrade google api to 0.11 [@shlag3n](https://github.com/shlag3n)
 
 ## [0.5.0](https://github.com/learningtapestry/lt-lcms/compare/v0.4.4...v0.5.0) - 2023-07-07
 

data/Dockerfile

@@ -0,0 +1,17 @@
+FROM ruby:2.7.7
+
+ENV APP_PATH /app/
+ENV LANG C.UTF-8
+ENV GIT_AUTHOR_NAME "Joe Doe"
+ENV GIT_AUTHOR_EMAIL joe@doe.com
+
+WORKDIR $APP_PATH
+
+COPY . $APP_PATH
+
+ENV BUNDLER_VERSION 2.4.22
+RUN gem install bundler:"$BUNDLER_VERSION" \
+    && 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

data/Gemfile.lock

@@ -1,50 +1,37 @@
 PATH
   remote: .
   specs:
-    lt-lcms (0.4.4)
-      google-api-client (~> 0.38)
+    lt-lcms (0.6.0)
+      google-apis-core (~> 0.11, >= 0.11.1)
       httparty (~> 0.18)
-      lt-google-api (~> 0.2, >= 0.2.4)
+      lt-google-api (~> 0.3)
       nokogiri (~> 1.10, >= 1.10.8)
       rubyzip (~> 2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4)
+    activesupport (7.0.7.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
+    base64 (0.1.1)
     childprocess (4.1.0)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.2.2)
+    csv (3.2.7)
     declarative (0.0.20)
-    faraday (1.5.1)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      faraday-patron (~> 1.0)
-      multipart-post (>= 1.2, < 3)
+    faraday (2.7.12)
+      base64
+      faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    gems (1.2.0)
-    google-api-client (0.53.0)
-      google-apis-core (~> 0.1)
-      google-apis-generator (~> 0.1)
-    google-apis-core (0.4.0)
+    faraday-net_http (3.0.2)
+    ffi (1.15.5)
+    fileutils (1.7.1)
+    google-apis-core (0.11.2)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -53,47 +40,44 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-discovery_v1 (0.6.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-generator (0.4.0)
-      activesupport (>= 5.0)
-      gems (~> 1.2)
-      google-apis-core (>= 0.4, < 2.a)
-      google-apis-discovery_v1 (~> 0.5)
-      thor (>= 0.20, < 2.a)
-    googleauth (0.16.2)
-      faraday (>= 0.17.3, < 2.0)
+    google-apis-drive_v3 (0.46.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-cloud-env (2.1.0)
+      faraday (>= 1.0, < 3.a)
+    googleauth (1.9.1)
+      faraday (>= 1.0, < 3.a)
+      google-cloud-env (~> 2.1)
       jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
-      signet (~> 0.14)
-    httparty (0.18.1)
-      mime-types (~> 3.0)
+      signet (>= 0.16, < 2.a)
+    httparty (0.21.0)
+      mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
-    i18n (1.8.10)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     iniparse (1.5.0)
     json (2.6.3)
-    jwt (2.2.3)
+    jwt (2.7.1)
     language_server-protocol (3.17.0.3)
-    lt-google-api (0.2.4)
-      google-api-client (~> 0.46)
-      googleauth (~> 0.14)
-    memoist (0.16.2)
-    mime-types (3.3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0704)
-    mini_mime (1.1.0)
-    minitest (5.14.4)
+    listen (3.8.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    logger (1.5.3)
+    lt-google-api (0.3.0)
+      google-apis-drive_v3 (~> 0.46)
+      googleauth (~> 1.9)
+    mini_mime (1.1.5)
+    minitest (5.19.0)
     multi_json (1.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.1.1)
-    nokogiri (1.15.3-x86_64-linux)
+    nokogiri (1.15.4-aarch64-linux)
       racc (~> 1.4)
-    os (1.1.1)
-    overcommit (0.58.0)
+    nokogiri (1.15.4-x86_64-linux)
+      racc (~> 1.4)
+    os (1.1.4)
+    overcommit (0.60.0)
       childprocess (>= 0.6.3, < 5)
       iniparse (~> 1.4)
       rexml (~> 3.2)
@@ -101,18 +85,23 @@ GEM
     parser (3.2.2.3)
       ast (~> 2.4.1)
       racc
-    public_suffix (4.0.6)
+    public_suffix (5.0.4)
     racc (1.7.1)
     rainbow (3.1.1)
-    rake (13.0.3)
+    rake (13.0.6)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rbs (3.1.3)
     regexp_parser (2.8.1)
-    representable (3.1.1)
+    representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.5)
-    rubocop (1.54.1)
+    rexml (3.2.6)
+    rubocop (1.56.2)
+      base64 (~> 0.1.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -120,7 +109,7 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.0, < 2.0)
+      rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.29.0)
@@ -128,29 +117,48 @@ GEM
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
-    signet (0.15.0)
-      addressable (~> 2.3)
-      faraday (>= 0.17.3, < 2.0)
+    securerandom (0.2.2)
+    signet (0.18.0)
+      addressable (~> 2.8)
+      faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    thor (1.1.0)
-    trailblazer-option (0.1.1)
-    tzinfo (2.0.4)
+    steep (1.5.3)
+      activesupport (>= 5.1)
+      concurrent-ruby (>= 1.1.10)
+      csv (>= 3.0.9)
+      fileutils (>= 1.1.0)
+      json (>= 2.1.0)
+      language_server-protocol (>= 3.15, < 4.0)
+      listen (~> 3.0)
+      logger (>= 1.3.0)
+      parser (>= 3.1)
+      rainbow (>= 2.2.2, < 4.0)
+      rbs (>= 3.1.0)
+      securerandom (>= 0.1)
+      strscan (>= 1.0.0)
+      terminal-table (>= 2, < 4)
+    strscan (3.0.6)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    trailblazer-option (0.1.2)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
     unicode-display_width (2.4.2)
-    webrick (1.7.0)
-    zeitwerk (2.4.2)
+    webrick (1.8.1)
 
 PLATFORMS
+  aarch64-linux
   x86_64-linux
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 2.4)
   lt-lcms!
-  overcommit (~> 0.57)
+  overcommit (~> 0.60)
   rake (~> 13.0)
   rubocop (~> 1.54)
+  steep (~> 1.5.3)
 
 BUNDLED WITH
-   2.4.6
+   2.4.22

data/README.md

@@ -34,6 +34,32 @@ After checking out the repo, run `bin/setup` to install dependencies. You can al
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+### Docker
+
+```shell
+docker buildx build --platform linux/arm64/v8,linux/amd64 -t learningtapestry/lt-lcms --push .
+```
+
+### Type checking
+
+Install existing collections:
+
+```shell
+rbs collection install
+```
+
+Validate installation
+
+```shell
+rbs validate
+```
+
+Check types
+
+```shell
+steep check
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/learningtapestry/lt-lcms.

data/Steepfile

@@ -0,0 +1,30 @@
+# D = Steep::Diagnostic
+#
+ target :lib do
+   signature "sig", "vendor/rbs"
+
+   check "lib"                       # Directory name
+#   # check "Gemfile"                   # File name
+#   check "app/models/**/*.rb"        # Glob
+#   # ignore "lib/templates/*.rb"
+#
+#   # library "pathname"              # Standard libraries
+#   # library "strong_json"           # Gems
+   library "cgi", "rbs", "tempfile"
+#
+#   # configure_code_diagnostics(D::Ruby.default)      # `default` diagnostics setting (applies by default)
+#   # configure_code_diagnostics(D::Ruby.strict)       # `strict` diagnostics setting
+#   # configure_code_diagnostics(D::Ruby.lenient)      # `lenient` diagnostics setting
+#   # configure_code_diagnostics(D::Ruby.silent)       # `silent` diagnostics setting
+#   # configure_code_diagnostics do |hash|             # You can setup everything yourself
+#   #   hash[D::Ruby::NoMethod] = :information
+#   # end
+ end
+
+# target :test do
+#   signature "sig", "sig-private"
+#
+#   check "test"
+#
+#   # library "pathname"              # Standard libraries
+# end

data/docker-entrypoint.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+set -e
+exec "$@"

data/lib/lt/lcms/lesson/downloader/base.rb

@@ -36,6 +36,8 @@ module Lt
             self
           rescue ::Google::Apis::RateLimitError
             raise unless options[:import_retry]
+
+            retry_attempt = retry_attempt.to_i
             raise if retry_attempt >= MAX_RETRY_COUNT
 
             sleep RETRY_DELAYES[retry_attempt] * rand(1.0..5.0)

data/lib/lt/lcms/lesson/downloader/gdoc.rb

@@ -43,15 +43,15 @@ module Lt
             return html unless (match = html.scan(GOOGLE_DRAWING_RE))
 
             bearer = @credentials.fetch_access_token!['access_token']
-            headers = { 'Authorization' => "Bearer #{bearer}" }
 
             match.to_a.uniq.each do |url|
               upd_url = updated_drawing_url_for(url)
-              response = HTTParty.get CGI.unescapeHTML(upd_url), headers: headers
+              response = HTTParty.get CGI.unescapeHTML(upd_url), headers: { 'Authorization' => "Bearer #{bearer}" }
 
               next unless response.code == 200
 
-              new_src = "data:#{response.content_type};base64, #{Base64.encode64(response)}\" drawing_url=\"#{upd_url}"
+              new_src =
+                "data:#{response.content_type};base64, #{Base64.encode64(response.to_s)}\" drawing_url=\"#{upd_url}"
               html = html.gsub(url, new_src)
             end
 
@@ -64,7 +64,7 @@ module Lt
 
             dpi_ratio = options[:dpi].to_f / BASE_DPI
             uri = URI.parse(url)
-            query = CGI.parse(uri.query).transform_values(&:first)
+            query = CGI.parse(uri.query.to_s).transform_values(&:first)
             query['w'] = (query['w'].to_i * dpi_ratio).round.to_s
             query['h'] = (query['h'].to_i * dpi_ratio).round.to_s
             URI::HTTPS.build(host: uri.host, path: uri.path, query: query.to_query).to_s

data/lib/lt/lcms/lesson/uploader/gdoc.rb

@@ -14,7 +14,7 @@ module Lt
               name: name,
               mime_type: Lt::Google::Api::Drive::MIME_FILE
             }
-            file_metadata[:parents] = [parent_folder_id] if parent_folder_id.present?
+            file_metadata[:parents] = Array.wrap(parent_folder_id) unless parent_folder_id.nil?
             file = service.create_file(
               file_metadata,
               fields: 'id',

data/lib/lt/lcms/version.rb

@@ -2,6 +2,6 @@
 
 module Lt
   module Lcms
-    VERSION = '0.5.0'
+    VERSION = '0.6.0'
   end
 end

data/lt-lcms.gemspec

@@ -15,15 +15,16 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.description = ''
   spec.license     = 'Apache-2.0'
 
-  spec.required_ruby_version = '>= 3.2'
+  spec.required_ruby_version = '>= 2.7'
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   if spec.respond_to?(:metadata)
     spec.metadata['allowed_push_host'] = 'https://rubygems.org'
+    spec.metadata['rubygems_mfa_required'] = 'true'
   else
     raise 'RubyGems 2.0 or newer is required to protect against ' \
-      'public gem pushes.'
+          'public gem pushes.'
   end
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
@@ -33,14 +34,15 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'google-api-client', '~> 0.38'
+  spec.add_dependency 'google-apis-core', '~> 0.11', '>= 0.11.1'
   spec.add_dependency 'httparty', '~> 0.18'
-  spec.add_dependency 'lt-google-api', '~> 0.2', '>= 0.2.4'
+  spec.add_dependency 'lt-google-api', '~> 0.3'
   spec.add_dependency 'nokogiri', '~> 1.10', '>= 1.10.8'
   spec.add_dependency 'rubyzip', '~> 2'
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_development_dependency 'overcommit', '~> 0.57'
+  spec.add_development_dependency 'bundler', '~> 2.4'
+  spec.add_development_dependency 'overcommit', '~> 0.60'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rubocop', '~> 1.54'
+  spec.add_development_dependency 'steep', '~> 1.5.3'
 end