jekyll-gdocfilter 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 691d15c67635094f9f17bc10f9ca3e0a8863e3534f313032ed92dc09414a3951
-  data.tar.gz: 3924781db4b1a46668e32dd06ab469997ed6800a6da0a1e0449973d60758da19
+  metadata.gz: 12544ae2377380a82f397663b3af1af168adb1b38bb24fa26e379b479174082b
+  data.tar.gz: '069975564a087ea50af0170eae98adcfe26c118e86fa51489d5d3683967ba5a8'
 SHA512:
-  metadata.gz: ba60208effacc68530a7aaef10514e541a555c0e44ad0873f79d2c6b266160e694f861f9c1d4889307aee83ac5e62f0532b1ab4bd42cb1edacb8a62692f7f3a6
-  data.tar.gz: e6db91665907ea9c239f37721504ad1456d1b0f240504372e6cbab2bdaddc0cbb3642b47d1d11e717abb0d66ee3ba205eb3abd39f8a07a4fcd584d1bbfc25f17
+  metadata.gz: c0008fffdcd51b1bd186bf9d445a62179e9668f8520c299c8694db4fedd3044532033e7961069ede907f0f9e7f293554521618803058e597108868486de63830
+  data.tar.gz: bd9109d4350ad4e5b0fef44aa31809fbb9061918832a86e261fe9949df1fb7097a5d39d9f9204a3808b62b9bbe3e2dd7a0f7017bcad53450a00850b30e691ad3

data/.rubocop.yml

@@ -1,5 +1,10 @@
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
+  NewCops: enable
+  SuggestExtensions: false
+  Exclude:
+    - 'example/**/*'
+    - 'vendor/**/*'
 
 Style/StringLiterals:
   Enabled: true

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## [Unreleased]
 
+### [0.1.2](https://www.github.com/tippingpointuk/jekyll-gdocfilter/compare/v0.1.1...v0.1.2) (2022-11-14)
+
+
+### Bug Fixes
+
+* minor bug fixes ([cf900ee](https://www.github.com/tippingpointuk/jekyll-gdocfilter/commit/cf900ee2e63994789ec0e6f8567d31a953bfc3f4))
+
 ### [0.1.1](https://www.github.com/tippingpointuk/jekyll-gdocfilter/compare/v0.1.0...v0.1.1) (2022-04-01)
 
 

data/Gemfile.lock

@@ -0,0 +1,126 @@
+PATH
+  remote: .
+  specs:
+    jekyll-gdocfilter (0.1.1)
+      css_parser (= 1.11.0)
+      jekyll (>= 3.7, < 5.0)
+      nokogiri (>= 1.11.0, <= 1.13.3)
+      open-uri (= 0.2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    ast (2.4.2)
+    colorator (1.1.0)
+    concurrent-ruby (1.1.10)
+    css_parser (1.11.0)
+      addressable
+    date (3.2.2)
+    diff-lcs (1.5.0)
+    em-websocket (0.5.3)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0)
+    eventmachine (1.2.7)
+    ffi (1.15.5)
+    forwardable-extended (2.6.0)
+    http_parser.rb (0.8.0)
+    i18n (1.10.0)
+      concurrent-ruby (~> 1.0)
+    jekyll (4.2.2)
+      addressable (~> 2.4)
+      colorator (~> 1.0)
+      em-websocket (~> 0.5)
+      i18n (~> 1.0)
+      jekyll-sass-converter (~> 2.0)
+      jekyll-watch (~> 2.0)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.0)
+      liquid (~> 4.0)
+      mercenary (~> 0.4.0)
+      pathutil (~> 0.9)
+      rouge (~> 3.0)
+      safe_yaml (~> 1.0)
+      terminal-table (~> 2.0)
+    jekyll-sass-converter (2.2.0)
+      sassc (> 2.0.1, < 3.0)
+    jekyll-watch (2.2.1)
+      listen (~> 3.0)
+    kramdown (2.3.2)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    liquid (4.0.3)
+    listen (3.7.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    mercenary (0.4.0)
+    nokogiri (1.13.3-x86_64-linux)
+      racc (~> 1.4)
+    open-uri (0.2.0)
+      stringio
+      time
+      uri
+    parallel (1.22.1)
+    parser (3.1.1.0)
+      ast (~> 2.4.1)
+    pathutil (0.16.2)
+      forwardable-extended (~> 2.6)
+    public_suffix (4.0.6)
+    racc (1.6.0)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    rb-fsevent (0.11.1)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    regexp_parser (2.2.1)
+    rexml (3.2.5)
+    rouge (3.28.0)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.26.1)
+      parallel (~> 1.10)
+      parser (>= 3.1.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.16.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.16.0)
+      parser (>= 3.1.1.0)
+    ruby-progressbar (1.11.0)
+    safe_yaml (1.0.5)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    stringio (3.0.1)
+    terminal-table (2.0.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    time (0.2.0)
+      date
+    unicode-display_width (1.8.0)
+    uri (0.11.0)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  jekyll-gdocfilter!
+  rake (~> 13.0)
+  rspec (~> 3.0)
+  rubocop (~> 1.7)
+
+BUNDLED WITH
+   2.2.21

data/example/Gemfile

@@ -16,7 +16,7 @@ gem "minima", "~> 2.5"
 # If you have any plugins, put them here!
 group :jekyll_plugins do
   gem "jekyll-feed", "~> 0.12"
-  gem "jekyll-gdocfilter", path: "../" 
+  gem "jekyll-gdocfilter"
 end
 
 # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem

data/example/Gemfile.lock

@@ -1,12 +1,3 @@
-PATH
-  remote: ..
-  specs:
-    jekyll-gdocfilter (0.1.0)
-      css_parser (= 1.11.0)
-      jekyll (>= 3.7, < 5.0)
-      nokogiri (>= 1.11.0, <= 1.13.3)
-      open-uri (= 0.2.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -43,6 +34,11 @@ GEM
       terminal-table (~> 2.0)
     jekyll-feed (0.16.0)
       jekyll (>= 3.7, < 5.0)
+    jekyll-gdocfilter (0.1.1)
+      css_parser (= 1.11.0)
+      jekyll (>= 3.7, < 5.0)
+      nokogiri (>= 1.11.0, <= 1.13.3)
+      open-uri (= 0.2.0)
     jekyll-sass-converter (2.2.0)
       sassc (> 2.0.1, < 3.0)
     jekyll-seo-tag (2.8.0)
@@ -94,7 +90,7 @@ PLATFORMS
 DEPENDENCIES
   jekyll (~> 4.2.0)
   jekyll-feed (~> 0.12)
-  jekyll-gdocfilter!
+  jekyll-gdocfilter
   minima (~> 2.5)
   tzinfo (~> 1.2)
   tzinfo-data

data/jekyll-gdocfilter.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
                         and returns HTML with basic styling to put on your pages"
   spec.homepage      = "https://github.com/tippingpointuk/jekyll-gdocfilter"
   spec.license       = "MIT"
-  spec.required_ruby_version = ">= 2.4.0"
+  spec.required_ruby_version = ">= 2.5.0"
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
 
@@ -31,11 +31,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Uncomment to register a new dependency of your gem
+  spec.add_dependency "css_parser", "1.11.0"
   spec.add_dependency "jekyll", ">= 3.7", "< 5.0"
   spec.add_dependency "nokogiri", ">=1.11.0", "<=1.13.3"
-  spec.add_dependency "css_parser", "1.11.0"
   spec.add_dependency "open-uri", "0.2.0"
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html
+  spec.metadata["rubygems_mfa_required"] = "true"
 end

data/lib/jekyll/gdocfilter/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module Gdocfilter
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/lib/jekyll/gdocfilter.rb

@@ -1,64 +1,63 @@
 # frozen_string_literal: true
 
 require_relative "gdocfilter/version"
-require 'nokogiri'
-require 'open-uri'
-require 'css_parser'
+require "nokogiri"
+require "open-uri"
+require "css_parser"
+require "liquid"
 
 module Jekyll
+  ##
+  # Parses a google doc link to neatly embedable html,
+  # using the +google_doc+ method.
   module Gdocfilter
     class Error < StandardError; end
-    ##
-    # Parses a google doc link to neatly embedable html,
-    # using the +google_doc+ method.
+
+    def get_query_from_link(link)
+      return unless link
+
+      href = URI(link)
+      return link unless href.query
+
+      query = CGI.parse(href.query)
+      return href unless query["q"][0]
+
+      query["q"][0]
+    end
 
     def replace_links(html)
       # Removes the google.com proxy from links in the doc
-      html.css('a').each do |link|
-        href = URI(link.attributes["href"].value)
-        next unless href.query
-        query = CGI.parse(href.query)
-        next unless query['q'][0]
-        link.attributes['href'].value = query['q'][0]
+      html.css("a").each do |link|
+        next unless link.attributes["href"]
+
+        href = link.attributes["href"].value
+        link.attributes["href"].value = get_query_from_link(href)
       end
       @html = html
     end
+
     def reduce_styles(css)
       # Extract basic styling from the <style> tag at top of document
       # ie. bold, colours
       # But not any of the layout/spacing/font-type styles
-      allowed_rules = [
-        'font-weight',
-        # 'color',
-        'font-style',
-        'text-decoration'
-      ]
-
+      allowed_rules = %w[font-weight font-style text-decoration]
       parser_css.add_block! css
-
       parser_css.each_rule_set do |rule_set|
-        # puts rule_set['declarations']['declarations']
         rule_set.each_declaration do |d|
           rule_set.remove_declaration! d unless allowed_rules.include? d
         end
       end
-
-      # parser_css.each_selector do |selector, declarations, specificity|
-      #   next unless selector =~ /^[\d\w\s\#\.\-]*$/ # Check if is real selector
-      #
-      #
-      # end
-
       @parser_css
     end
 
     def inline_styles(html)
-      css = reduce_styles html.css('style').inner_html
-      css.each_selector do |selector, declarations, specificity|
-        next unless selector =~ /^[\d\w\s\#\.\-]*$/ # Check if is real selector
+      css = reduce_styles html.css("style").inner_html
+      css.each_selector do |selector, declarations, _specificity|
+        next unless selector =~ /^[\d\w\s\#.\-]*$/ # Check if is real selector
+
         elements = html.css(selector)
         elements.each do |e|
-          e['style'] = [e["style"], declarations].compact.join(" ")
+          e["style"] = [e["style"], declarations].compact.join(" ")
         end
       end
       @html = html
@@ -69,15 +68,11 @@ module Jekyll
       # Downsize headings by 1
       (5).downto(1) do |n|
         heading = html.at_css "h#{n}"
-        if heading
-          heading.name = "h#{n + 1}"
-        end
+        heading.name = "h#{n + 1}" if heading
       end
 
-      title = html.at_css 'p.title'
-      if title
-        title.name = 'h1'
-      end
+      title = html.at_css "p.title"
+      title.name = "h1" if title
 
       @html = html
     end
@@ -86,17 +81,40 @@ module Jekyll
       @parser_css ||= CssParser::Parser.new
     end
 
-    def google_doc(link)
-      # TODO:
-      # * Properly nest lists
+    def get_html(link)
       ids = /[-\w]{25,}/.match(link)
       return unless ids
-      f = URI.open "https://docs.google.com/feeds/download/documents/export/Export?id=#{ids[0]}&exportFormat=html"
+
+      @url = URI(link)
+      return unless @url.host == "docs.google.com"
+
+      link = "https://docs.google.com/feeds/download/documents/export/Export?id=#{ids[0]}&exportFormat=html"
+
+      f = get_file(link)
+      return unless f
+
       @html = Nokogiri::HTML.parse f
+    end
+
+    def get_file(url)
+      begin
+        f = URI.open url
+      rescue OpenURI::HTTPError
+        return
+      end
+      return unless f.status[1] == "OK"
+
+      f
+    end
+
+    def google_doc(link)
+      return unless get_html(link)
+
       replace_links @html
       inline_styles @html
       convert_headings @html
-      @html.css('body').inner_html
+      # TODO: Properly nest lists
+      @html.css("body").inner_html
     end
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-gdocfilter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - joe-irving
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-01 00:00:00.000000000 Z
+date: 2022-11-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: css_parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.11.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
@@ -50,20 +64,6 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: 1.13.3
-- !ruby/object:Gem::Dependency
-  name: css_parser
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.11.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: open-uri
   requirement: !ruby/object:Gem::Requirement
@@ -95,6 +95,7 @@ files:
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -118,6 +119,7 @@ metadata:
   homepage_uri: https://github.com/tippingpointuk/jekyll-gdocfilter
   source_code_uri: https://github.com/tippingpointuk/jekyll-gdocfilter/
   changelog_uri: https://github.com/tippingpointuk/jekyll-gdocfilter/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -126,14 +128,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A simple filter to turn a Google Doc into readable HTML