jekyll-commonmark 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c7fa262bbb8c204258512eae201ef6fd2102378c
-  data.tar.gz: 99d43b95c8a8151360285bce64dc6263cc799b15
+SHA256:
+  metadata.gz: f8f2b667d4e48524510c2fc1d13be5074e1e62a3e3699df727a5b9aa676eb687
+  data.tar.gz: ef8ab723faad439a0e717bd6251066127b2b3c22eb098c90f0f0b4305f084d64
 SHA512:
-  metadata.gz: a80334dc9f6498dddd27e5e84834cf606f839651f0cc0f354bbe95fa867b7f1f81f799d65ce6888aed7e35182fd8a59bb19053c3b114c188e7bf240f96775659
-  data.tar.gz: 2ee960a701c99be7368fd048e1abc6cf1689776168da923b49a3056c682dccdffcc3b7ca15b21bdf0179b27a43eb0c53a4350caf15f319c5f52ada15a0f3b130
+  metadata.gz: 789df562b30e53e50af25079dea399e06e3605e8b92a6fc2fb6a5de8507de79625f19f6f9105cb984183d7d616b0bb583487e48e1bcaf1b5036df9584ac448eb
+  data.tar.gz: dfb2879c01320367d9ea4809cb1ea184138c8bfc1b6ba8ac0666d33839db5d11df21c39c0b78306c74085777f45f09d1bac4bfe63bf699ff10423e6a87b22477

data/.rubocop.yml

@@ -1,27 +1,12 @@
+inherit_from: .rubocop_todo.yml
+
+require: rubocop-jekyll
+
 inherit_gem:
-  jekyll: .rubocop.yml
+  rubocop-jekyll: .rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.4
   Exclude:
+    - script/**/*
     - vendor/**/*
-
-Metrics/AbcSize:
-  Exclude:
-    - lib/jekyll-commonmark.rb
-
-Metrics/MethodLength:
-  Exclude:
-    - lib/jekyll-commonmark.rb
-
-Metrics/LineLength:
-  Exclude:
-    - lib/jekyll-commonmark.rb
-
-Lint/Debugger:
-  Exclude:
-    - script/console
-
-Metrics/BlockLength:
-  Exclude:
-    - spec/**/*

data/.rubocop_todo.yml

@@ -0,0 +1,39 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2019-01-03 13:58:24 +0100 using RuboCop version 0.62.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+# Configuration parameters: Max.
+Metrics/AbcSize:
+  Exclude:
+    - 'lib/jekyll-commonmark.rb'
+
+# Offense count: 1
+# Configuration parameters: CountComments, Max, ExcludedMethods.
+# ExcludedMethods: refine
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/jekyll_commonmark_spec.rb'
+
+# Offense count: 1
+# Configuration parameters: Max.
+Metrics/CyclomaticComplexity:
+  Exclude:
+    - 'lib/jekyll-commonmark.rb'
+
+# Offense count: 1
+# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Exclude:
+    - 'lib/jekyll-commonmark.rb'
+
+# Offense count: 1
+# Configuration parameters: CountComments, Max, ExcludedMethods.
+Metrics/MethodLength:
+  Exclude:
+    - 'lib/jekyll-commonmark.rb'

data/.travis.yml

@@ -1,13 +1,10 @@
 language: ruby
 cache: bundler
-sudo: false
 rvm:
-  - 2.5
+  - 2.6
   - 2.4
-  - 2.3
-  - 2.2
 git:
-  depth: 1
+  depth: 3
 
 # we need a more recent cmake than travis/linux provides (at least 2.8.9):
 addons:
@@ -18,7 +15,11 @@ addons:
       - cmake
 
 before_install:
+  - gem update --system
   - gem install bundler
-
 before_script: bundle update
 script: script/cibuild
+
+env:
+  global:
+  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true

data/Gemfile

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
 source "https://rubygems.org"
-
 gemspec
+
+gem "jekyll", "~> #{ENV["JEKYLL_VERSION"]}" if ENV["JEKYLL_VERSION"]

data/History.markdown

@@ -1,3 +1,12 @@
+## 1.3.0 / 2019-03-22
+
+### Development Fixes
+
+  * Allow Jekyll v4 (still alpha)
+  * Drop Ruby < 2.4
+  * chore(deps): rubocop-jekyll 0.3.0 (#25)
+  * Target Ruby 2.4 (#30)
+
 ## 1.2.0 / 2018-03-29
 
 ### Minor Enhancements

data/Readme.md

@@ -7,7 +7,10 @@
 [![Windows Build status](https://img.shields.io/appveyor/ci/pathawks/jekyll-commonmark/master.svg?label=Windows%20build)](https://ci.appveyor.com/project/pathawks/jekyll-commonmark)
 [![Dependency Status](https://img.shields.io/gemnasium/pathawks/jekyll-commonmark.svg)](https://gemnasium.com/pathawks/jekyll-commonmark)
 
-Jekyll Markdown converter that uses [libcmark](https://github.com/jgm/CommonMark), the reference parser for CommonMark.
+Jekyll Markdown converter that uses [libcmark](https://github.com/jgm/CommonMark), the reference parser for CommonMark. 
+As a result, it is faster than Kramdown.
+
+GitHub Pages supports CommonMark through https://github.com/github/jekyll-commonmark-ghpages
 
 ## Installation
 
@@ -24,3 +27,14 @@ and modify your `_config.yml` to use **CommonMark** as your Markdown converter
 ```yaml
 markdown: CommonMark
 ```
+
+## Configuration
+
+To specify [extensions](https://github.com/gjtorikian/commonmarker#extensions) and [options](https://github.com/gjtorikian/commonmarker#options) for use in converting Markdown to HTML, supply options to the Markdown converter:
+
+```yaml
+commonmark:
+  options: ["SMART", "FOOTNOTES"]
+  extensions: ["strikethrough", "autolink", "table"]
+ ```
+ 

data/appveyor.yml

@@ -8,11 +8,9 @@ install:
 
 environment:
   matrix:
+    - RUBY_FOLDER_VER: "25"
+    - RUBY_FOLDER_VER: "25-x64"
     - RUBY_FOLDER_VER: "24"
-    - RUBY_FOLDER_VER: "24-x64"
-    - RUBY_FOLDER_VER: "23"
-    - RUBY_FOLDER_VER: "22"
-    - RUBY_FOLDER_VER: "21"
 
 test_script:
   - ruby --version

data/jekyll-commonmark.gemspec

@@ -17,11 +17,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r!^(test|spec|features)/!)
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = ">= 2.4.0"
+
   spec.add_runtime_dependency "commonmarker", "~> 0.14"
-  spec.add_runtime_dependency "jekyll", [">= 3.0", "< 4.0"]
+  spec.add_runtime_dependency "jekyll", ">= 3.7", "< 5.0"
 
-  spec.add_development_dependency "bundler", "~> 1.15"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rubocop", "~> 0.52.0"
+  spec.add_development_dependency "rubocop-jekyll", "~> 0.5"
 end

data/lib/jekyll-commonmark.rb

@@ -2,46 +2,50 @@
 
 module Jekyll
   module Converters
-    class Markdown::CommonMark
-      def initialize(config)
-        Jekyll::External.require_with_graceful_fail "commonmarker"
-        begin
-          options = config["commonmark"]["options"].collect { |e| e.upcase.to_sym }
-        rescue NoMethodError
-          options = []
-        else
-          valid_opts = Set.new(CommonMarker::Config::Parse.keys + CommonMarker::Config::Render.keys)
-          options.reject! do |e|
-            next if valid_opts.include? e
-            Jekyll.logger.warn "CommonMark:", "#{e} is not a valid option"
-            Jekyll.logger.info "Valid options:", valid_opts.to_a.join(", ")
-            true
+    class Markdown
+      class CommonMark
+        def initialize(config)
+          Jekyll::External.require_with_graceful_fail "commonmarker"
+          begin
+            options = config["commonmark"]["options"].collect { |e| e.upcase.to_sym }
+          rescue NoMethodError
+            options = []
+          else
+            valid_opts = Set.new(CommonMarker::Config::Parse.keys + CommonMarker::Config::Render.keys)
+            options.reject! do |e|
+              next if valid_opts.include? e
+
+              Jekyll.logger.warn "CommonMark:", "#{e} is not a valid option"
+              Jekyll.logger.info "Valid options:", valid_opts.to_a.join(", ")
+              true
+            end
           end
-        end
-        begin
-          @extensions = config["commonmark"]["extensions"].collect(&:to_sym)
-        rescue NoMethodError
-          @extensions = []
-        else
-          @extensions.reject! do |e|
-            next if CommonMarker.extensions.include? e.to_s
-            Jekyll.logger.warn "CommonMark:", "#{e} is not a valid extension"
-            Jekyll.logger.info "Valid extensions:", CommonMarker.extensions.join(", ")
-            true
+          begin
+            @extensions = config["commonmark"]["extensions"].collect(&:to_sym)
+          rescue NoMethodError
+            @extensions = []
+          else
+            @extensions.reject! do |e|
+              next if CommonMarker.extensions.include? e.to_s
+
+              Jekyll.logger.warn "CommonMark:", "#{e} is not a valid extension"
+              Jekyll.logger.info "Valid extensions:", CommonMarker.extensions.join(", ")
+              true
+            end
           end
-        end
 
-        options_set = Set.new(options).freeze
-        @parse_options = (options_set & CommonMarker::Config::Parse.keys).to_a
-        @render_options = (options_set & CommonMarker::Config::Render.keys).to_a
+          options_set = Set.new(options).freeze
+          @parse_options = (options_set & CommonMarker::Config::Parse.keys).to_a
+          @render_options = (options_set & CommonMarker::Config::Render.keys).to_a
 
-        @parse_options = :DEFAULT if @parse_options.empty?
-        @render_options = :DEFAULT if @render_options.empty?
-      end
+          @parse_options = :DEFAULT if @parse_options.empty?
+          @render_options = :DEFAULT if @render_options.empty?
+        end
 
-      def convert(content)
-        CommonMarker.render_doc(content, @parse_options, @extensions)
-          .to_html(@render_options, @extensions)
+        def convert(content)
+          CommonMarker.render_doc(content, @parse_options, @extensions)
+            .to_html(@render_options, @extensions)
+        end
       end
     end
   end

data/lib/jekyll-commonmark/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module CommonMark
-    VERSION = "1.2.0".freeze
+    VERSION = "1.3.0"
   end
 end

data/script/console

@@ -21,11 +21,11 @@ def dest_dir(*files)
 end
 
 def config(overrides = {})
-  Jekyll.configuration({
+  Jekyll.configuration(
     "source"      => source_dir,
     "destination" => dest_dir,
-    "url"         => "http://example.org",
-  }).merge(overrides)
+    "url"         => "http://example.org"
+  ).merge(overrides)
 end
 
 def site(configuration = config)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-commonmark
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Pat Hawks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-30 00:00:00.000000000 Z
+date: 2019-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commonmarker
@@ -30,34 +30,34 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.7'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.7'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -87,19 +87,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.0
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.0
+        version: '0.5'
 description: 
 email: pat@pathawks.com
 executables: []
@@ -109,6 +109,7 @@ files:
 - ".github/stale.yml"
 - ".gitignore"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - Gemfile
 - History.markdown
@@ -138,15 +139,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: CommonMark generator for Jekyll