lt-lcms 0.3.0 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b12fd4f69d31ee5b9f655a281b1b0bdb81cd94be792971a647d18bbbb8ccd0f9
-  data.tar.gz: 353f480467a3508873833ef7a00e495f68bb87e19772340bfdd2d34195f0ae2a
+  metadata.gz: e473a918ee10abd3c4678e8aacb8226ca766c0873f1bd2eb7378ed0a945bed46
+  data.tar.gz: f79e8bb554d732aff1f349a26c77a659031b142dd40ff72b65ca533d5e1f52c7
 SHA512:
-  metadata.gz: a0032513cb0cfb940ae7762e20ee04167df2b7daac2a7159b16aced33c5b61fd3bca98c85948354b366e74e60fd19ef4796f3e1f535d58833071aeff86d9d975
-  data.tar.gz: 3ba9532a34597760113c383404eabd8a57af3d9309d7796d91654ae33e7aff3b6fdb0b3aa6bfccb003295acef24d63c07f1f5bc791fae425910ddb74eda6e597
+  metadata.gz: bb088eeeda2fd4692b95103f24bff729dcb3417d5526a89fa8cac514288e25af4b047e1893d3b7006cdd1f91a00ae79e8c876849ffee78ccb60744ca144ef699
+  data.tar.gz: ef35fbbc8e83170464f3b78511a6423dcbcb84fcc619d1922fb0ed7ae61dff02a33bd8af5a56a7e79320f4b0074a3ba9c59fc527f08d0b330227ed0be3f738af

data/.codeclimate.yml

@@ -58,7 +58,7 @@ engines:
     # Style and quality checks for Ruby code.
     # Includes support for modern Rubies (2.2+).
     enabled: true
-    channel: rubocop-0-59
+    channel: rubocop-0-93
     exclude_paths:
       - vendor/
 ratings:

data/.github/workflows/rubocop-analysis.yml

@@ -0,0 +1,41 @@
+name: "Rubocop"
+
+on: pull_request
+
+jobs:
+  rubocop:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      # If running on a self-hosted runner, check it meets the requirements
+      # listed at https://github.com/ruby/setup-ruby#using-self-hosted-runners
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.6
+
+      - name: Intall legacy bundler version
+        run: gem install bundler -v 1.17.3
+
+      # This step is not necessary if you add the gem to your Gemfile
+      - name: Install Code Scanning integration
+        run: bundle _1.17.3_ add code-scanning-rubocop --skip-install
+
+      - name: Install dependencies
+        run: bundle _1.17.3_ install
+
+      - name: Rubocop run
+        run: |
+          bash -c "
+            bundle exec rubocop --require code_scanning --format CodeScanning::SarifFormatter -o rubocop.sarif
+            [[ $? -ne 2 ]]
+          "
+      - name: Upload Sarif output
+        uses: github/codeql-action/upload-sarif@v1
+        with:
+          sarif_file: rubocop.sarif

data/.gitignore

@@ -10,5 +10,4 @@
 # Ignore IDE specific files
 .idea/
 
-Gemfile.lock
 .DS_Store

data/.rubocop.yml

@@ -12,7 +12,11 @@ AllCops:
     - bin/*
     - db/schema.rb
     - node_modules/**/*
-  TargetRubyVersion: 2.5
+  NewCops: enable
+  TargetRubyVersion: 2.6
+
+Layout/LineLength:
+  Max: 120
 
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented_relative_to_receiver
@@ -35,16 +39,13 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Max: 9
 
-Metrics/LineLength:
-  Max: 120
-
 Metrics/MethodLength:
   Max: 50
 
 Metrics/PerceivedComplexity:
   Max: 9
 
-Naming/UncommunicativeMethodParamName:
+Naming/MethodParameterName:
   MinNameLength: 2
 
 Style/AndOr:

data/.ruby-version

@@ -1 +1 @@
-2.5.2
+2.6.5

data/CHANGELOG.md

@@ -4,6 +4,37 @@ 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.3...HEAD)
+
+## [0.4.3](https://github.com/learningtapestry/lt-lcms/compare/v0.4.2...v0.4.3) - 2021-07-02
+
+### Added
+
+- Bump lt-google-api to 0.2.3 ([#17](https://github.com/learningtapestry/lt-lcms/pull/17))
+
+## [0.4.2](https://github.com/learningtapestry/lt-lcms/compare/v0.4.1...v0.4.2) - 2021-06-21
+
+### Fixed
+
+- Remove intermediate `encode('ASCII-8BIT')` call for downloaded file content
+
+## [0.4.1](https://github.com/learningtapestry/lt-lcms/compare/v0.4.0...v0.4.1) - 2020-10-19
+
+### Added
+
+- Bump lt-google-api to 0.2.1 ([#13](https://github.com/learningtapestry/lt-lcms/pull/13))
+
+## [0.4.0](https://github.com/learningtapestry/lt-lcms/compare/v0.3.1...v0.4.0)
+
+### Added
+
+- Add support for Google Shared Drives ([#12](https://github.com/learningtapestry/lt-lcms/pull/12))
+
+## [0.3.0](https://github.com/learningtapestry/lt-lcms/compare/v0.3.0...v0.3.1)
+
+### Fixed
+- Fix the URLs inside links in the downloaded GDoc ([#9](https://github.com/learningtapestry/lt-lcms/pull/9))
+
 ## [0.3.0](https://github.com/learningtapestry/lt-lcms/compare/v0.2.0...v0.3.0)
 
 ### Added

data/Gemfile.lock

@@ -0,0 +1,147 @@
+PATH
+  remote: .
+  specs:
+    lt-lcms (0.4.3)
+      google-api-client (~> 0.38)
+      httparty (~> 0.18)
+      lt-google-api (~> 0.2, >= 0.2.3)
+      nokogiri (~> 1.10, >= 1.10.8)
+      rubyzip (~> 2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (6.1.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    ast (2.4.2)
+    childprocess (4.1.0)
+    concurrent-ruby (1.1.9)
+    declarative (0.0.20)
+    faraday (1.4.3)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
+      multipart-post (>= 1.2, < 3)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.1.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)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (>= 0.16.2, < 2.a)
+      httpclient (>= 2.8.1, < 3.a)
+      mini_mime (~> 1.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.a)
+      rexml
+      webrick
+    google-apis-discovery_v1 (0.5.0)
+      google-apis-core (>= 0.3, < 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)
+      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)
+      multi_xml (>= 0.5.2)
+    httpclient (2.8.3)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
+    iniparse (1.5.0)
+    jwt (2.2.3)
+    lt-google-api (0.2.3)
+      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.0225)
+    mini_mime (1.1.0)
+    minitest (5.14.4)
+    multi_json (1.15.0)
+    multi_xml (0.6.0)
+    multipart-post (2.1.1)
+    nokogiri (1.11.7-x86_64-darwin)
+      racc (~> 1.4)
+    os (1.1.1)
+    overcommit (0.58.0)
+      childprocess (>= 0.6.3, < 5)
+      iniparse (~> 1.4)
+      rexml (~> 3.2)
+    parallel (1.20.1)
+    parser (3.0.1.1)
+      ast (~> 2.4.1)
+    public_suffix (4.0.6)
+    racc (1.5.2)
+    rainbow (3.0.0)
+    rake (13.0.3)
+    regexp_parser (2.1.1)
+    representable (3.1.1)
+      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 (0.93.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.1.5)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8)
+      rexml
+      rubocop-ast (>= 0.6.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (1.7.0)
+      parser (>= 3.0.1.1)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.4)
+    rubyzip (2.3.0)
+    signet (0.15.0)
+      addressable (~> 2.3)
+      faraday (>= 0.17.3, < 2.0)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
+    thor (1.1.0)
+    trailblazer-option (0.1.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    uber (0.1.0)
+    unicode-display_width (1.7.0)
+    webrick (1.7.0)
+    zeitwerk (2.4.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.16)
+  lt-lcms!
+  overcommit (~> 0.57)
+  rake (~> 13.0)
+  rubocop (~> 0.93.1)
+
+BUNDLED WITH
+   1.17.3

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

@@ -12,8 +12,8 @@ module Lt
           MIME_TYPE_EXPORT = 'text/plain'
 
           def self.file_id_for(url)
-            url.scan(%r{/d/([^\/]+)/?}).first.try(:first) ||
-              url.scan(%r{/open\?id=([^\/]+)/?}).first.try(:first)
+            url.scan(%r{/d/([^/]+)/?}).first.try(:first) ||
+              url.scan(%r{/open\?id=([^/]+)/?}).first.try(:first)
           end
 
           attr_reader :content
@@ -26,10 +26,7 @@ module Lt
 
           def download(mime_type: self.class::MIME_TYPE_EXPORT)
             retry_attempt ||= 0
-            raw_content = service
-                            .export_file(file_id, mime_type)
-                            .encode('ASCII-8BIT')
-                            .force_encoding('UTF-8')
+            raw_content = service.export_file(file_id, mime_type)&.force_encoding('UTF-8')
             @content =
               if block_given?
                 yield raw_content
@@ -48,7 +45,9 @@ module Lt
 
           def file
             @file ||= service.get_file(
-              file_id, fields: 'lastModifyingUser,modifiedTime,name,version'
+              file_id,
+              fields: 'lastModifyingUser,modifiedTime,name,version',
+              supports_all_drives: true
             )
           end
 

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

@@ -7,7 +7,8 @@ module Lt
     module Lesson
       module Downloader
         class Gdoc < Base
-          GOOGLE_DRAWING_RE = %r{https?://docs\.google\.com/?[^"]*/drawings/[^"]*}i
+          GOOGLE_DRAWING_RE = %r{https?://docs\.google\.com/?[^"]*/drawings/[^"]*}i.freeze
+          GOOGLE_URL_RE = %r{https://www\.google\.com/url\?q=([^&]*)&?.*}i.freeze
           MIME_TYPE = 'application/vnd.google-apps.document'
           MIME_TYPE_EXPORT = 'text/html'
 
@@ -16,15 +17,28 @@ module Lt
           end
 
           def download
-            super(&method(:handle_google_drawings))
+            super do |html|
+              fix_links handle_google_drawings(html)
+            end
           end
 
           private
 
           attr_reader :options
+
           BASE_DPI = 72.0
           private_constant :BASE_DPI
 
+          def fix_links(html)
+            doc = Nokogiri::HTML(html)
+            doc.css('a').each do |link|
+              next if link['href'].blank?
+
+              link['href'] = CGI.unescape_html(link['href']).gsub GOOGLE_URL_RE, '\1'
+            end
+            doc.to_s
+          end
+
           def handle_google_drawings(html)
             return html unless (match = html.scan(GOOGLE_DRAWING_RE))
 

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

@@ -12,7 +12,7 @@ module Lt
           end
 
           def pdf_content
-            service.get_file(file_id, download_dest: StringIO.new).string
+            service.get_file(file_id, download_dest: StringIO.new, supports_all_drives: true).string
           end
         end
       end

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

@@ -19,7 +19,8 @@ module Lt
               file_metadata,
               fields: 'id',
               upload_source: StringIO.new(content),
-              content_type: content_type
+              content_type: content_type,
+              supports_all_drives: true
             )
             file.id
           end

data/lib/lt/lcms/version.rb

@@ -2,6 +2,6 @@
 
 module Lt
   module Lcms
-    VERSION = '0.3.0'
+    VERSION = '0.4.3'
   end
 end

data/lt-lcms.gemspec

@@ -15,6 +15,8 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.description = ''
   spec.license     = 'Apache-2.0'
 
+  spec.required_ruby_version = '>= 2.6'
+
   # 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)
@@ -31,14 +33,14 @@ 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.36'
-  spec.add_dependency 'httparty', '~> 0.17'
-  spec.add_dependency 'lt-google-api', '~> 0.1'
+  spec.add_dependency 'google-api-client', '~> 0.38'
+  spec.add_dependency 'httparty', '~> 0.18'
+  spec.add_dependency 'lt-google-api', '~> 0.2', '>= 0.2.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 'bundler-audit'
-  spec.add_development_dependency 'overcommit', '~> 0.49.1'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rubocop', '~> 0.59.2'
+  spec.add_development_dependency 'overcommit', '~> 0.57'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rubocop', '~> 0.93.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lt-lcms
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.3
 platform: ruby
 authors:
 - Alexander Kuznetsov
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-05 00:00:00.000000000 Z
+date: 2021-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
@@ -16,126 +16,138 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.36'
+        version: '0.38'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.36'
+        version: '0.38'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: lt-google-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
-  name: rubyzip
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.10.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.10.8
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
+        version: '2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: bundler-audit
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: overcommit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: '0.57'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: '0.57'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.59.2
+        version: 0.93.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.59.2
+        version: 0.93.1
 description: ''
 email:
 - alexander@learningtapeestry.com
@@ -145,6 +157,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".github/workflows/rubocop-analysis.yml"
 - ".gitignore"
 - ".overcommit.yml"
 - ".rubocop.yml"
@@ -152,6 +165,7 @@ files:
 - ".ruby-version"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -173,7 +187,7 @@ licenses:
 - Apache-2.0
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -181,15 +195,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.21
+signing_key:
 specification_version: 4
 summary: Contains set of classes to work with Google Docs based lesson objects
 test_files: []