lt-lcms 0.1.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59af00db8e2e7e35cb72345b9194d013caf031764dc8d1d326c53ed38c51f970
-  data.tar.gz: 9d49f1e203df39afe5ec9768a1ed41d57e78f9aa295acfee50f85734ddf67996
+  metadata.gz: 4ee5ceb78c88d8edd335cdcfa87c86d1ff18d55a137a4135d55c8dd735666c7c
+  data.tar.gz: 3c3f299638cf297e03893b4ba8f83de1d5c1c0930ed0903f3dd808b87dfa12d5
 SHA512:
-  metadata.gz: c2200f66051030cf3876f4ac410db1703ea8df8bdc1047456a6c99845a9859d74607962845f0340a11f9948fd49e194ce612de41ad118fcd63e1c5f674a1624e
-  data.tar.gz: f9b4c0e6f535bb16cef6fd2d15b37345e027f1275c8b74fc7c693ea4fbb0cafe874436ac0818b87f4e077fed7c7a21550d9a8bd7331240866bbe99be74f99f22
+  metadata.gz: 7accbcb946a8cd4a6a4ff80c9978c420d42a6e06d862369226a489839e858739516407041beae29fca4314380012bb102cb5aa7a0f508e3af1d58352249e8299
+  data.tar.gz: bc2cbb61996319098999abf33a6c44a1b33a1ca75017e00ddca0f5228cc3f01df72dccf2634bb35c2d67c98ee03dbd388c5152f44883c2bc043a1158974a327a

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: push
+
+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 --version 0.4.0 --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

@@ -1,11 +1,47 @@
-# Change log
+# Changelog
+All notable changes to this project will be documented in this file.
 
-## 0.1.1 (2019-06-10)
+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).
 
-### Bug fixes
+## [0.4.1](https://github.com/learningtapestry/lt-lcms/compare/v0.4.0...v0.4.1) - 2020-10-19
 
-* [#3](https://github.com/learningtapestry/lt-lcms/issues/3): Retrieve Google credentials token correctly ([@paranoicsan][])
+### Added
 
-## 0.1.0 (2019-03-12)
+- Bump lt-google-api to 0.2.1 ([#13](https://github.com/learningtapestry/lt-lcms/pull/13))
 
-* Initial release
+## [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
+- Add DPI param support for Google Drawings [@shlag3n](https://github.com/shlag3n)
+
+## [0.2.0](https://github.com/learningtapestry/lt-lcms/compare/v0.1.1...v0.2.0) - 2020-01-13
+
+### Added
+
+- Support for download google slides content [@shlag3n](https://github.com/shlag3n)
+
+### Security
+
+- Upgrade `rubyzip` gem to avoid security vulnerabilities [@paranoicsan](https://github.com/paranoicsan)
+
+## [0.1.1](https://github.com/learningtapestry/lt-lcms/compare/v0.1.0...v0.1.1) - 2019-06-10
+
+### Fixed
+
+- [#3](https://github.com/learningtapestry/lt-lcms/issues/3): Retrieve Google credentials token correctly [@paranoicsan](https://github.com/paranoicsan)
+
+## [0.1.0] - 2019-03-12
+
+- Initial release

data/Gemfile.lock

@@ -0,0 +1,109 @@
+PATH
+  remote: .
+  specs:
+    lt-lcms (0.4.0)
+      google-api-client (~> 0.38)
+      httparty (~> 0.18)
+      lt-google-api (~> 0.2, >= 0.2.1)
+      nokogiri (~> 1.10, >= 1.10.8)
+      rubyzip (~> 2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    ast (2.4.1)
+    childprocess (4.0.0)
+    declarative (0.0.20)
+    declarative-option (0.1.0)
+    faraday (1.1.0)
+      multipart-post (>= 1.2, < 3)
+      ruby2_keywords
+    google-api-client (0.46.1)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (~> 0.9)
+      httpclient (>= 2.8.1, < 3.0)
+      mini_mime (~> 1.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.0)
+      rexml
+      signet (~> 0.12)
+    googleauth (0.14.0)
+      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)
+    iniparse (1.5.0)
+    jwt (2.2.2)
+    lt-google-api (0.2.1)
+      google-api-client
+      googleauth
+    memoist (0.16.2)
+    mime-types (3.3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2020.0512)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    multi_json (1.15.0)
+    multi_xml (0.6.0)
+    multipart-post (2.1.1)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
+    os (1.1.1)
+    overcommit (0.57.0)
+      childprocess (>= 0.6.3, < 5)
+      iniparse (~> 1.4)
+    parallel (1.19.2)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
+    public_suffix (4.0.6)
+    rainbow (3.0.0)
+    rake (13.0.1)
+    regexp_parser (1.8.2)
+    representable (3.0.4)
+      declarative (< 0.1.0)
+      declarative-option (< 0.2.0)
+      uber (< 0.2.0)
+    retriable (3.1.2)
+    rexml (3.2.4)
+    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 (0.8.0)
+      parser (>= 2.7.1.5)
+    ruby-progressbar (1.10.1)
+    ruby2_keywords (0.0.2)
+    rubyzip (2.3.0)
+    signet (0.14.0)
+      addressable (~> 2.3)
+      faraday (>= 0.17.3, < 2.0)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
+    uber (0.1.0)
+    unicode-display_width (1.7.0)
+
+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
@@ -48,7 +48,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,13 +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))
 
@@ -30,16 +46,29 @@ module Lt
             headers = { 'Authorization' => "Bearer #{bearer}" }
 
             match.to_a.uniq.each do |url|
-              response = HTTParty.get CGI.unescapeHTML(url), headers: headers
+              upd_url = updated_drawing_url_for(url)
+              response = HTTParty.get CGI.unescapeHTML(upd_url), headers: headers
 
               next unless response.code == 200
 
-              new_src = "data:#{response.content_type};base64, #{Base64.encode64(response)}\" drawing_url=\"#{url}"
+              new_src = "data:#{response.content_type};base64, #{Base64.encode64(response)}\" drawing_url=\"#{upd_url}"
               html = html.gsub(url, new_src)
             end
 
             html
           end
+
+          # Update drawing url w/h parameters to download in better quality than default 72 dpi
+          def updated_drawing_url_for(url)
+            return url unless options[:dpi].present?
+
+            dpi_ratio = options[:dpi].to_f / BASE_DPI
+            uri = URI.parse(url)
+            query = CGI.parse(uri.query).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
+          end
         end
       end
     end

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'zip'
+
+module Lt
+  module Lcms
+    module Lesson
+      module Downloader
+        class Gslide < Lt::Lcms::Lesson::Downloader::Base
+          MIME_TYPE = 'application/vnd.google-apps.presentation'
+          MIME_TYPE_EXPORT = 'application/vnd.openxmlformats-officedocument.presentationml.presentation'
+
+          def self.gdoc_file_url(id)
+            "https://docs.google.com/presentation/d/#{id}"
+          end
+
+          def initialize(credentials, file_url, opts = {})
+            super
+            @service = opts[:service]
+          end
+
+          def file_id
+            return super if @file_url.include?('/')
+
+            @file_id ||= @file_url
+          end
+        end
+      end
+    end
+  end
+end

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.1.1'
+    VERSION = '0.4.1'
   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'
-  spec.add_dependency 'httparty'
-  spec.add_dependency 'lt-google-api', '~> 0.1'
-  spec.add_dependency 'rubyzip', '~> 1.2.2'
+  spec.add_dependency 'google-api-client', '~> 0.38'
+  spec.add_dependency 'httparty', '~> 0.18'
+  spec.add_dependency 'lt-google-api', '~> 0.2', '>= 0.2.1'
+  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.46'
-  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,141 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: lt-lcms
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.4.1
 platform: ruby
 authors:
 - Alexander Kuznetsov
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-06-10 00:00:00.000000000 Z
+date: 2020-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.38'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.38'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        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.1
   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.1
 - !ruby/object:Gem::Dependency
-  name: rubyzip
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.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: 1.2.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.46'
+        version: '0.57'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.46'
+        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
@@ -162,6 +176,7 @@ files:
 - lib/lt/lcms/lesson/downloader.rb
 - lib/lt/lcms/lesson/downloader/base.rb
 - lib/lt/lcms/lesson/downloader/gdoc.rb
+- lib/lt/lcms/lesson/downloader/gslide.rb
 - lib/lt/lcms/lesson/downloader/gspreadsheet.rb
 - lib/lt/lcms/lesson/downloader/pdf.rb
 - lib/lt/lcms/lesson/uploader/gdoc.rb
@@ -172,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
@@ -180,16 +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: []
-rubyforge_project: 
-rubygems_version: 2.7.9
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: Contains set of classes to work with Google Docs based lesson objects
 test_files: []