Merge remote-tracking branch 'origin/master' into JJ-master

Author: kivikakk

CODE_OF_CONDUCT.md

@@ -0,0 +1,46 @@
+# Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [[email protected]](mailto:[email protected]). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [https://contributor-covenant.org/version/1/4][version]
+
+[homepage]: https://contributor-covenant.org
+[version]: https://contributor-covenant.org/version/1/4/

CONTRIBUTING.md

@@ -2,9 +2,9 @@
 
 Contributions to this project are [released](https://help.github.com/articles/github-terms-of-service/#6-contributions-under-repository-license) to the public under the [project's open source license](LICENSE).
 
-This project adheres to the [Open Code of Conduct][code-of-conduct]. By participating, you are expected to honor this code.
+This project adheres to a [Code of Conduct][code-of-conduct]. By participating, you are expected to honor this code.
 
-[code-of-conduct]: http://todogroup.org/opencodeofconduct/#GitHub%20Markup/[email protected]
+[code-of-conduct]: CODE_OF_CONDUCT.md
 
 This library's only job is to decide which markup format to use and call out to an external library to convert the markup to HTML (see the [README](README.md) for more information on how markup is rendered on GitHub.com).
 

Gemfile

@@ -5,7 +5,7 @@ gem "posix-spawn", :platforms => :ruby
 gem "redcarpet", :platforms => :ruby
 gem "kramdown", :platforms => :jruby
 gem "RedCloth"
-gem "commonmarker", "~> 0.14.12"
+gem "commonmarker", "~> 0.18.1"
 gem "rdoc", "~>3.6"
 gem "org-ruby", "= 0.9.9"
 gem "creole", "~>0.3.6"

HISTORY.md

@@ -1,3 +1,20 @@
+## 3.0.1 - 2018-10-19
+
+* Remove linguist-detected RMarkdown files from the Markdown renderer [#1237](https://github.com/github/markup/pull/1237)
+
+## 3.0.0 - 2018-10-18
+
+* Allow passing options through to CommonMarker [#1236](https://github.com/github/markup/pull/1236)
+* Symlink option is now a keyword arg [#1236](https://github.com/github/markup/pull/1236)
+
+## 2.0.2 - 2018-10-15
+
+* Don't render rmd files as Markdown [#1235](https://github.com/github/markup/pull/1235)
+
+## 2.0.1 - 2018-06-29
+
+* Create anchor for every =item directive in POD files [#1165](https://github.com/github/markup/pull/1165)
+
 ## 2.0.0 - 2018-01-31
 
 * Remove filesystem access [#1157](https://github.com/github/markup/pull/1157)

README.md

@@ -1,12 +1,12 @@
 GitHub Markup
 =============
 
-This library is the first step of a journey that every markup file in a repository goes on before it is rendered on GitHub.com:
+This library is the **first step** of a journey that every markup file in a repository goes on before it is rendered on GitHub.com:
 
-1. This library converts the raw markup to HTML. See the list of [supported markup formats](#markups) below.
-1. The HTML is sanitized, aggressively removing things that could harm you and your kin—such as `script` tags, inline-styles, and `class` or `id` attributes. See the [sanitization filter](https://github.com/jch/html-pipeline/blob/master/lib/html/pipeline/sanitization_filter.rb) for the full whitelist.
+1. `github-markup` selects an _underlying library_ to convert the raw markup to HTML. See the list of [supported markup formats](#markups) below.
+1. The HTML is sanitized, aggressively removing things that could harm you and your kin—such as `script` tags, inline-styles, and `class` or `id` attributes.
 1. Syntax highlighting is performed on code blocks. See [github/linguist](https://github.com/github/linguist#syntax-highlighting) for more information about syntax highlighting.
-1. The HTML is passed through other filters in the [html-pipeline](https://github.com/jch/html-pipeline) that add special sauce, such as [emoji](https://github.com/jch/html-pipeline/blob/master/lib/html/pipeline/emoji_filter.rb), [task lists](https://github.com/github/task_list/blob/master/lib/task_list/filter.rb), [named anchors](https://github.com/jch/html-pipeline/blob/master/lib/html/pipeline/toc_filter.rb), [CDN caching for images](https://github.com/jch/html-pipeline/blob/master/lib/html/pipeline/camo_filter.rb), and  [autolinking](https://github.com/jch/html-pipeline/blob/master/lib/html/pipeline/autolink_filter.rb).
+1. The HTML is passed through other filters that add special sauce, such as emoji, task lists, named anchors, CDN caching for images, and autolinking.
 1. The resulting HTML is rendered on GitHub.com.
 
 Please note that **only the first step** is covered by this gem — the rest happens on GitHub.com.  In particular, `markup` itself does no sanitization of the resulting HTML, as it expects that to be covered by whatever pipeline is consuming the HTML.

lib/github-markup.rb

@@ -1,6 +1,6 @@
 module GitHub
   module Markup
-    VERSION = '2.0.0'
+    VERSION = '3.0.1'
     Version = VERSION
   end
 end

lib/github/commands/pod2html

@@ -7,6 +7,7 @@ my $p = Pod::Simple::XHTML->new;
 $p->html_header('');
 $p->html_footer('');
 $p->perldoc_url_prefix('https://metacpan.org/pod/');
+$p->anchor_items(1);
 $p->strip_verbatim_indent(sub {
     my $lines = shift;
     (my $indent = $lines->[0]) =~ s/\S.*//;

lib/github/markup.rb

@@ -21,50 +21,49 @@ module Markups
     MARKUP_TEXTILE = :textile
     MARKUP_POD6 = :pod6
   end
-  
+
   module Markup
     extend self
-    
+
     @@markups = {}
 
     def markups
       @@markups
     end
-    
+
     def markup_impls
       markups.values
     end
 
     def preload!
-      markup_impls.each do |markup|
-        markup.load
-      end
+      markup_impls.each(&:load)
     end
 
-    def render(filename, content, symlink = false)
-      if impl = renderer(filename, content, symlink)
-        impl.render(filename, content)
+    def render(filename, content, symlink: false, options: {})
+      if (impl = renderer(filename, content, symlink: symlink))
+        impl.render(filename, content, options: options)
       else
         content
       end
     end
-    
+
     def render_s(symbol, content)
-      if content.nil?
-        raise ArgumentError, 'Can not render a nil.'
-      elsif markups.has_key?(symbol)
+      raise ArgumentError, 'Can not render a nil.' if content.nil?
+
+      if markups.key?(symbol)
         markups[symbol].render(nil, content)
       else
         content
       end
     end
 
     def markup(symbol, gem_name, regexp, languages, opts = {}, &block)
-      markup_impl(symbol, GemImplementation.new(regexp, languages, gem_name, &block))
+      impl = GemImplementation.new(regexp, languages, gem_name, &block)
+      markup_impl(symbol, impl)
     end
-    
+
     def markup_impl(symbol, impl)
-      if markups.has_key?(symbol)
+      if markups.key?(symbol)
         raise ArgumentError, "The '#{symbol}' symbol is already defined."
       end
       markups[symbol] = impl
@@ -74,25 +73,27 @@ def command(symbol, command, regexp, languages, name, &block)
       if File.exist?(file = File.dirname(__FILE__) + "/commands/#{command}")
         command = file
       end
-      markup_impl(symbol, CommandImplementation.new(regexp, languages, command, name, &block))
+
+      impl = CommandImplementation.new(regexp, languages, command, name, &block)
+      markup_impl(symbol, impl)
     end
 
-    def can_render?(filename, content, symlink = false)
-      !!renderer(filename, content, symlink)
+    def can_render?(filename, content, symlink: false)
+      renderer(filename, content, symlink: symlink) != nil
     end
 
-    def renderer(filename, content, symlink = false)
-      language = language(filename, content, symlink)
-      markup_impls.find { |impl|
+    def renderer(filename, content, symlink: false)
+      language = language(filename, content, symlink: symlink)
+      markup_impls.find do |impl|
         impl.match?(filename, language)
-      }
+      end
     end
 
-    def language(filename, content, symlink = false)
-      if defined?(::Linguist)
-        blob = Linguist::Blob.new(filename, content, symlink: symlink)
-        return Linguist.detect(blob, allow_empty: true)
-      end
+    def language(filename, content, symlink: false)
+      return unless defined?(::Linguist)
+
+      blob = Linguist::Blob.new(filename, content, symlink: symlink)
+      Linguist.detect(blob, allow_empty: true)
     end
 
     # Define markups

lib/github/markup/command_implementation.rb

@@ -22,7 +22,7 @@ def initialize(regexp, languages, command, name, &block)
         @name = name
       end
 
-      def render(filename, content)
+      def render(filename, content, options: {})
         rendered = execute(command, content)
         rendered = rendered.to_s.empty? ? content : rendered
         call_block(rendered, content)

lib/github/markup/gem_implementation.rb

@@ -12,14 +12,14 @@ def initialize(regexp, languages, gem_name, &renderer)
       end
 
       def load
-        return if @loaded
+        return if defined?(@loaded) && @loaded
         require gem_name
         @loaded = true
       end
 
-      def render(filename, content)
+      def render(filename, content, options: {})
         load
-        renderer.call(filename, content)
+        renderer.call(filename, content, options: options)
       end
 
       def name