html-pipeline 2.7.1 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51be736324dd52bf97242e77f261fbbd77f14922
-  data.tar.gz: d3e7b8b65e9c6856e86ea9d287d450b2ddce66ca
+  metadata.gz: 947ea1f82d3c13232378bac704544208961431a4
+  data.tar.gz: f72d0af2a8072741e8e2f993b1aa7c12b99c2faa
 SHA512:
-  metadata.gz: 9a4a67b0002cf54ef1b4983af83682f2cbfb6ec65a7c95bcef5fe4e644798a61f10c61191fb9ae9dd09863c5e3a5a30e9bd65f3b1a7f5232cd777d9eedd7a1bd
-  data.tar.gz: 7ddab3f6d8b59870c12ca8a5cbc449fd9b58cec104897563375da29d43ed6e9301eba92fde400a54eded048ece4659ab093e3c9d50525cc1ea3ae8e50616a770
+  metadata.gz: 566aaf8bf2f3a012e79e1fcd3028a85f4d26c087b63ba48f03ffea3e626a93150d8ab5b642ecdb3f425df9108eb8963b7bdbc0e6fdb067f7b0987347a019a785
+  data.tar.gz: 9fb3b6c03a92fc82649704700a20af03487200bc2096ece6725920c9c54903215aecc153c61a75732f61da839dfe0a6834b00b4de491ee5b8a584ccc2752bb61

data/.travis.yml

@@ -22,8 +22,6 @@ rvm:
   - 2.4.0
   - 2.3.1
   - 2.2.5
-  - 2.1
-  - 2.0
   - ruby-head
 
 matrix:
@@ -31,10 +29,6 @@ matrix:
   allow_failures:
     - rvm: ruby-head
   exclude:
-    - gemfile: gemfiles/rails_5.gemfile
-      rvm: 2.1
-    - gemfile: gemfiles/rails_5.gemfile
-      rvm: 2.0
     - gemfile: gemfiles/rails_4.gemfile
       rvm: 2.4.0
     - gemfile: gemfiles/rails_3.gemfile

data/Appraisals

@@ -1,13 +1,13 @@
-appraise "rails-3" do
-  gem "rack", "< 2"
-  gem "rails", "3.2.22.2"
+appraise 'rails-3' do
+  gem 'rack', '< 2'
+  gem 'rails', '3.2.22.2'
 end
 
-appraise "rails-4" do
-  gem "rack", "< 2"
-  gem "rails", "~> 4.2.6"
+appraise 'rails-4' do
+  gem 'rack', '< 2'
+  gem 'rails', '~> 4.2.6'
 end
 
-appraise "rails-5" do
-  gem "rails", "~> 5.0.0"
+appraise 'rails-5' do
+  gem 'rails', '~> 5.0.0'
 end

data/Gemfile

@@ -1,32 +1,23 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in html-pipeline.gemspec
 gemspec
 
 group :development do
-  gem "bundler"
-  gem "rake"
-  gem "appraisal"
+  gem 'appraisal'
+  gem 'bundler'
+  gem 'rake'
 end
 
 group :test do
-  gem "minitest"
-  gem "rinku",              "~> 1.7",   :require => false
-  gem "gemoji",             "~> 2.0",   :require => false
-  gem "RedCloth",           "~> 4.2.9", :require => false
-  gem "commonmarker",       "~> 0.14",  :require => false
-  gem "email_reply_parser", "~> 0.5",   :require => false
-  gem "sanitize",           "~> 2.0",   :require => false
+  gem 'commonmarker', '~> 0.14', require: false
+  gem 'email_reply_parser', '~> 0.5', require: false
+  gem 'gemoji', '~> 2.0', require: false
+  gem 'minitest'
+  gem 'RedCloth',           '~> 4.2.9', require: false
+  gem 'rinku',              '~> 1.7',   require: false
+  gem 'sanitize',           '~> 2.0',   require: false
 
-  if RUBY_VERSION < "2.1.0"
-    gem "escape_utils",     "~> 0.3",   :require => false
-    gem "github-linguist",  "~> 2.6.2", :require => false
-  else
-    gem "escape_utils",     "~> 1.0",   :require => false
-    gem "github-linguist",  "~> 2.10",  :require => false
-  end
-
-  if RUBY_VERSION < "1.9.3"
-    gem "activesupport", ">= 2", "< 4"
-  end
+  gem 'escape_utils', '~> 1.0', require: false
+  gem 'rouge', '~> 3.1', require: false
 end

data/README.md

@@ -82,7 +82,7 @@ Prints:
 </code></pre>
 ```
 
-To generate CSS for HTML formatted code, use the [pygments.rb](https://github.com/tmm1/pygments.rb#usage) `#css` method. `pygments.rb` is a dependency of the `SyntaxHighlightFilter`.
+To generate CSS for HTML formatted code, use the [Rouge CSS Theme](https://github.com/jneen/rouge#css-theme-options) `#css` method. `rouge` is a dependency of the `SyntaxHighlightFilter`.
 
 Some filters take an optional **context** and/or **result** hash. These are
 used to pass around arguments and metadata between filters in a pipeline. For
@@ -163,7 +163,7 @@ EmojiPipeline = Pipeline.new [
 * `MarkdownFilter` - convert markdown to html
 * `PlainTextInputFilter` - html escape text and wrap the result in a div
 * `SanitizationFilter` - whitelist sanitize user markup
-* `SyntaxHighlightFilter` - [code syntax highlighter](#syntax-highlighting)
+* `SyntaxHighlightFilter` - code syntax highlighter
 * `TextileFilter` - convert textile to html
 * `TableOfContentsFilter` - anchor headings with name attributes and generate Table of Contents html unordered list linking headings
 
@@ -171,12 +171,12 @@ EmojiPipeline = Pipeline.new [
 
 Filter gem dependencies are not bundled; you must bundle the filter's gem
 dependencies. The below list details filters with dependencies. For example,
-`SyntaxHighlightFilter` uses [github-linguist](https://github.com/github/linguist)
+`SyntaxHighlightFilter` uses [rouge](https://github.com/jneen/rouge)
 to detect and highlight languages. For example, to use the `SyntaxHighlightFilter`,
 add the following to your Gemfile:
 
 ```ruby
-gem 'github-linguist'
+gem 'rouge'
 ```
 
 * `AutolinkFilter` - `rinku`
@@ -185,7 +185,7 @@ gem 'github-linguist'
 * `MarkdownFilter` - `commonmarker`
 * `PlainTextInputFilter` - `escape_utils`
 * `SanitizationFilter` - `sanitize`
-* `SyntaxHighlightFilter` - `github-linguist`
+* `SyntaxHighlightFilter` - `rouge`
 * `TextileFilter` - `RedCloth`
 
 _Note:_ See [Gemfile](/Gemfile) `:test` block for version requirements.
@@ -242,7 +242,6 @@ Here are some extensions people have built:
 * [tilt-html-pipeline](https://github.com/bradgessler/tilt-html-pipeline)
 * [html-pipeline-wiki-link'](https://github.com/lifted-studios/html-pipeline-wiki-link) - WikiMedia-style wiki links
 * [task_list](https://github.com/github/task_list) - GitHub flavor Markdown Task List
-* [html-pipeline-rouge_filter](https://github.com/JuanitoFatas/html-pipeline-rouge_filter) - Syntax highlight with [Rouge](https://github.com/jneen/rouge/)
 * [html-pipeline-nico_link](https://github.com/rutan/html-pipeline-nico_link) - An HTML::Pipeline filter for [niconico](http://www.nicovideo.jp) description links
 * [html-pipeline-gitlab](https://gitlab.com/gitlab-org/html-pipeline-gitlab) - This gem implements various filters for html-pipeline used by GitLab
 * [html-pipeline-youtube](https://github.com/st0012/html-pipeline-youtube) - An HTML::Pipeline filter for YouTube links

data/Rakefile

@@ -1,14 +1,14 @@
 #!/usr/bin/env rake
-require "rubygems"
-require "bundler/setup"
+require 'rubygems'
+require 'bundler/setup'
 
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require 'rake/testtask'
 
 Rake::TestTask.new do |t|
-  t.libs << "test"
+  t.libs << 'test'
   t.test_files = FileList['test/**/*_test.rb']
   t.verbose = true
 end
 
-task :default => :test
+task default: :test

data/bin/html-pipeline

@@ -4,23 +4,23 @@ require 'html/pipeline'
 require 'optparse'
 
 # Accept "help", too
-ARGV.map!{|a| a == "help" ? "--help" : a }
+.map! { |a| a == 'help' ? '--help' : a }
 
-OptionParser.new do |opts|
+onParser.new do |opts|
   opts.banner = <<-HELP.gsub(/^    /, '')
     Usage: html-pipeline [-h] [-f]
            html-pipeline [FILTER [FILTER [...]]] < file.md
-           cat file.md | html-pipeline [FILTER [FILTER [...]]]
+       cat file.md | html-pipeline [FILTER [FILTER [...]]]
   HELP
 
-  opts.separator "Options:"
+ opts.separator 'Options:'
 
-  opts.on("-f", "--filters", "List the available filters") do
-    filters = HTML::Pipeline.constants.grep(/\w+Filter$/).
-      map{|f| f.to_s.gsub(/Filter$/,'') }
+  opts.on('-f', '--filters', 'List the available filters') do
+    filters = HTML::Pipeline.constants.grep(/\w+Filter$/)
+                            .map { |f| f.to_s.gsub(/Filter$/, '') }
 
     # Text filter doesn't work, no call method
-    filters -= ["Text"]
+    filters -= ['Text']
 
     abort <<-HELP.gsub(/^      /, '')
       Available filters:
@@ -38,12 +38,12 @@ if ARGV.empty?
     HTML::Pipeline::ImageMaxWidthFilter,
     HTML::Pipeline::EmojiFilter,
     HTML::Pipeline::AutolinkFilter,
-    HTML::Pipeline::TableOfContentsFilter,
+    HTML::Pipeline::TableOfContentsFilter
   ]
 
-  # Add syntax highlighting if linguist is present
+  # Add syntax highlighting if rouge is present
   begin
-    require 'linguist'
+    require 'rouge'
     filters << HTML::Pipeline::SyntaxHighlightFilter
   rescue LoadError
   end
@@ -52,7 +52,7 @@ else
 
   def filter_named(name)
     case name
-    when "Text"
+    when 'Text'
       raise NameError # Text filter doesn't work, no call method
     end
 
@@ -70,9 +70,9 @@ else
 end
 
 context = {
-  :asset_root => "/assets",
-  :base_url   => "/",
-  :gfm        => true
+  asset_root: '/assets',
+  base_url: '/',
+  gfm: true
 }
 
 puts HTML::Pipeline.new(filters, context).call(ARGF.read)[:output]

data/html-pipeline.gemspec

@@ -1,21 +1,21 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path("../lib/html/pipeline/version", __FILE__)
+
+require File.expand_path('../lib/html/pipeline/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.name          = "html-pipeline"
+  gem.name          = 'html-pipeline'
   gem.version       = HTML::Pipeline::VERSION
-  gem.license       = "MIT"
-  gem.authors       = ["Ryan Tomayko", "Jerry Cheung"]
-  gem.email         = ["ryan@github.com", "jerry@github.com"]
-  gem.description   = %q{GitHub HTML processing filters and utilities}
-  gem.summary       = %q{Helpers for processing content through a chain of filters}
-  gem.homepage      = "https://github.com/jch/html-pipeline"
+  gem.license       = 'MIT'
+  gem.authors       = ['Ryan Tomayko', 'Jerry Cheung']
+  gem.email         = ['ryan@github.com', 'jerry@github.com']
+  gem.description   = 'GitHub HTML processing filters and utilities'
+  gem.summary       = 'Helpers for processing content through a chain of filters'
+  gem.homepage      = 'https://github.com/jch/html-pipeline'
 
-  gem.files         = `git ls-files -z`.split("\x0").reject { |f| f =~ %r(^(test|gemfiles|script)/) }
-  gem.require_paths = ["lib"]
+  gem.files         = `git ls-files -z`.split("\x0").reject { |f| f =~ %r{^(test|gemfiles|script)/} }
+  gem.require_paths = ['lib']
 
-  gem.add_dependency "nokogiri", ">= 1.4"
-  gem.add_dependency "activesupport", ">= 2"
+  gem.add_dependency 'activesupport', '>= 2'
+  gem.add_dependency 'nokogiri', '>= 1.4'
 
   gem.post_install_message = <<msg
 -------------------------------------------------

data/lib/html/pipeline.rb

@@ -1,5 +1,5 @@
-require "nokogiri"
-require "active_support/xml_mini/nokogiri" # convert Documents to hashes
+require 'nokogiri'
+require 'active_support/xml_mini/nokogiri' # convert Documents to hashes
 
 module HTML
   # GitHub HTML processing filters and utilities. This module includes a small
@@ -43,12 +43,12 @@ module HTML
     autoload :TableOfContentsFilter, 'html/pipeline/toc_filter'
     autoload :TextFilter,            'html/pipeline/text_filter'
 
-    class MissingDependencyError < LoadError; end
+    class MissingDependencyError < RuntimeError; end
     def self.require_dependency(name, requirer)
       require name
     rescue LoadError => e
       raise MissingDependencyError,
-        "Missing dependency '#{name}' for #{requirer}. See README.md for details.\n#{e.class.name}: #{e}"
+            "Missing dependency '#{name}' for #{requirer}. See README.md for details.\n#{e.class.name}: #{e}"
     end
 
     # Our DOM implementation.
@@ -85,7 +85,7 @@ module HTML
     end
 
     def initialize(filters, default_context = {}, result_class = nil)
-      raise ArgumentError, "default_context cannot be nil" if default_context.nil?
+      raise ArgumentError, 'default_context cannot be nil' if default_context.nil?
       @filters = filters.flatten.freeze
       @default_context = default_context.freeze
       @result_class = result_class || Hash
@@ -108,9 +108,9 @@ module HTML
       context = @default_context.merge(context)
       context = context.freeze
       result ||= @result_class.new
-      payload = default_payload :filters => @filters.map(&:name),
-        :context => context, :result => result
-      instrument "call_pipeline.html_pipeline", payload do
+      payload = default_payload filters: @filters.map(&:name),
+                                context: context, result: result
+      instrument 'call_pipeline.html_pipeline', payload do
         result[:output] =
           @filters.inject(html) do |doc, filter|
             perform_filter(filter, doc, context, result)
@@ -125,9 +125,9 @@ module HTML
     #
     # Returns the result of the filter.
     def perform_filter(filter, doc, context, result)
-      payload = default_payload :filter => filter.name,
-        :context => context, :result => result
-      instrument "call_filter.html_pipeline", payload do
+      payload = default_payload filter: filter.name,
+                                context: context, result: result
+      instrument 'call_filter.html_pipeline', payload do
         filter.call(doc, context, result)
       end
     end
@@ -178,13 +178,13 @@ module HTML
     #
     # Returns a Hash.
     def default_payload(payload = {})
-      {:pipeline => instrumentation_name}.merge(payload)
+      { pipeline: instrumentation_name }.merge(payload)
     end
   end
 end
 
 # XXX nokogiri monkey patches for 1.8
-if not ''.respond_to?(:force_encoding)
+unless ''.respond_to?(:force_encoding)
   class Nokogiri::XML::Node
     # Work around an issue with utf-8 encoded data being erroneously converted to
     # ... some other shit when replacing text nodes. See 'utf-8 output 2' in
@@ -196,8 +196,8 @@ if not ''.respond_to?(:force_encoding)
       replace_without_encoding_fix(replacement)
     end
 
-    alias_method :replace_without_encoding_fix, :replace
-    alias_method :replace, :replace_with_encoding_fix
+    alias replace_without_encoding_fix replace
+    alias replace replace_with_encoding_fix
 
     def swap(replacement)
       replace(replacement)

data/lib/html/pipeline/@mention_filter.rb

@@ -29,9 +29,9 @@ module HTML
       # the original text.
       #
       # Returns a String replaced with the return of the block.
-      def self.mentioned_logins_in(text, username_pattern=UsernamePattern)
+      def self.mentioned_logins_in(text, username_pattern = UsernamePattern)
         text.gsub MentionPatterns[username_pattern] do |match|
-          login = $1
+          login = Regexp.last_match(1)
           yield match, login, MentionLogins.include?(login.downcase)
         end
       end
@@ -57,22 +57,22 @@ module HTML
 
       # List of username logins that, when mentioned, link to the blog post
       # about @mentions instead of triggering a real mention.
-      MentionLogins = %w(
+      MentionLogins = %w[
         mention
         mentions
         mentioned
         mentioning
-      )
+      ].freeze
 
       # Don't look for mentions in text nodes that are children of these elements
-      IGNORE_PARENTS = %w(pre code a style).to_set
+      IGNORE_PARENTS = %w(pre code a style script).to_set
 
       def call
         result[:mentioned_usernames] ||= []
 
         doc.search('.//text()').each do |node|
           content = node.to_html
-          next if !content.include?('@')
+          next unless content.include?('@')
           next if has_ancestor?(node, IGNORE_PARENTS)
           html = mention_link_filter(content, base_url, info_url, username_pattern)
           next if html == content
@@ -103,7 +103,7 @@ module HTML
       #
       # Returns a string with @mentions replaced with links. All links have a
       # 'user-mention' class name attached for styling.
-      def mention_link_filter(text, base_url='/', info_url=nil, username_pattern=UsernamePattern)
+      def mention_link_filter(text, _base_url = '/', info_url = nil, username_pattern = UsernamePattern)
         self.class.mentioned_logins_in(text, username_pattern) do |match, login, is_mentioned|
           link =
             if is_mentioned
@@ -116,22 +116,22 @@ module HTML
         end
       end
 
-      def link_to_mention_info(text, info_url=nil)
+      def link_to_mention_info(text, info_url = nil)
         return "@#{text}" if info_url.nil?
-        "<a href='#{info_url}' class='user-mention'>" +
-        "@#{text}" +
-        "</a>"
+        "<a href='#{info_url}' class='user-mention'>" \
+          "@#{text}" \
+          '</a>'
       end
 
       def link_to_mentioned_user(login)
         result[:mentioned_usernames] |= [login]
 
         url = base_url.dup
-        url << "/" unless url =~ /[\/~]\z/
+        url << '/' unless url =~ /[\/~]\z/
 
-        "<a href='#{url << login}' class='user-mention'>" +
-        "@#{login}" +
-        "</a>"
+        "<a href='#{url << login}' class='user-mention'>" \
+          "@#{login}" \
+          '</a>'
       end
     end
   end

data/lib/html/pipeline/absolute_source_filter.rb

@@ -2,7 +2,6 @@ require 'uri'
 
 module HTML
   class Pipeline
-
     class AbsoluteSourceFilter < Filter
       # HTML Filter for replacing relative and root relative image URLs with
       # fully qualified URLs
@@ -18,31 +17,29 @@ module HTML
       # This filter does not write additional information to the context.
       # This filter would need to be run before CamoFilter.
       def call
-        doc.search("img").each do |element| 
+        doc.search('img').each do |element|
           next if element['src'].nil? || element['src'].empty?
           src = element['src'].strip
-          unless src.start_with? 'http'
-            if src.start_with? '/'
-              base = image_base_url
-            else
-              base = image_subpage_url
-            end
-            element["src"] = URI.join(base, src).to_s
-          end
+          next if src.start_with? 'http'
+          base = if src.start_with? '/'
+                   image_base_url
+                 else
+                   image_subpage_url
+                 end
+          element['src'] = URI.join(base, src).to_s
         end
         doc
       end
-      
+
       # Private: the base url you want to use
       def image_base_url
-        context[:image_base_url] or raise "Missing context :image_base_url for #{self.class.name}"
+        context[:image_base_url] || raise("Missing context :image_base_url for #{self.class.name}")
       end
 
       # Private: the relative url you want to use
       def image_subpage_url
-        context[:image_subpage_url] or raise "Missing context :image_subpage_url for #{self.class.name}"
+        context[:image_subpage_url] || raise("Missing context :image_subpage_url for #{self.class.name}")
       end
-    
     end
   end
-end
+end

data/lib/html/pipeline/autolink_filter.rb

@@ -1,4 +1,4 @@
-HTML::Pipeline.require_dependency("rinku", "AutolinkFilter")
+HTML::Pipeline.require_dependency('rinku', 'AutolinkFilter')
 
 module HTML
   class Pipeline

data/lib/html/pipeline/camo_filter.rb

@@ -24,7 +24,7 @@ module HTML
       def call
         return doc unless asset_proxy_enabled?
 
-        doc.search("img").each do |element|
+        doc.search('img').each do |element|
           original_src = element['src']
           next unless original_src
 
@@ -86,7 +86,7 @@ module HTML
       # Private: helper to hexencode a string. Each byte ends up encoded into
       # two characters, zero padded value in the range [0-9a-f].
       def hexencode(str)
-        str.to_enum(:each_byte).map { |byte| "%02x" % byte }.join
+        str.to_enum(:each_byte).map { |byte| format('%02x', byte) }.join
       end
     end
   end

data/lib/html/pipeline/email_reply_filter.rb

@@ -1,5 +1,5 @@
-HTML::Pipeline.require_dependency("escape_utils", "EmailReplyFilter")
-HTML::Pipeline.require_dependency("email_reply_parser", "EmailReplyFilter")
+HTML::Pipeline.require_dependency('escape_utils', 'EmailReplyFilter')
+HTML::Pipeline.require_dependency('email_reply_parser', 'EmailReplyFilter')
 
 module HTML
   class Pipeline
@@ -17,9 +17,9 @@ module HTML
       EMAIL_QUOTED_HEADER    = %(<div class="email-quoted-reply">).freeze
       EMAIL_SIGNATURE_HEADER = %(<div class="email-signature-reply">).freeze
       EMAIL_FRAGMENT_HEADER  = %(<div class="email-fragment">).freeze
-      EMAIL_HEADER_END       = "</div>".freeze
+      EMAIL_HEADER_END       = '</div>'.freeze
       EMAIL_REGEX            = /[^@\s.][^@\s]*@\[?[a-z0-9.-]+\]?/
-      HIDDEN_EMAIL_PATTERN   = "***@***.***"
+      HIDDEN_EMAIL_PATTERN   = '***@***.***'.freeze
 
       # Scans an email body to determine which bits are quoted and which should
       # be hidden. EmailReplyParser is used to split the comment into an Array

data/lib/html/pipeline/emoji_filter.rb

@@ -1,5 +1,5 @@
-require "cgi"
-HTML::Pipeline.require_dependency("gemoji", "EmojiFilter")
+require 'cgi'
+HTML::Pipeline.require_dependency('gemoji', 'EmojiFilter')
 
 module HTML
   class Pipeline
@@ -11,12 +11,11 @@ module HTML
     #   :ignored_ancestor_tags (optional) - Tags to stop the emojification. Node has matched ancestor HTML tags will not be emojified. Default to pre, code, and tt tags. Extra tags please pass in the form of array, e.g., %w(blockquote summary).
     #   :img_attrs (optional) - Attributes for generated img tag. E.g. Pass { "draggble" => true, "height" => nil } to set draggable attribute to "true" and clear height attribute of generated img tag.
     class EmojiFilter < Filter
-
-      DEFAULT_IGNORED_ANCESTOR_TAGS = %w(pre code tt).freeze
+      DEFAULT_IGNORED_ANCESTOR_TAGS = %w[pre code tt].freeze
 
       def call
         doc.search('.//text()').each do |node|
-          content = node.to_html
+          content = node.text
           next unless content.include?(':')
           next if has_ancestor?(node, ignored_ancestor_tags)
           html = emoji_image_filter(content)
@@ -38,8 +37,8 @@ module HTML
       #
       # Returns a String with :emoji: replaced with images.
       def emoji_image_filter(text)
-        text.gsub(emoji_pattern) do |match|
-          emoji_image_tag($1)
+        text.gsub(emoji_pattern) do |_match|
+          emoji_image_tag(Regexp.last_match(1))
         end
       end
 
@@ -57,9 +56,9 @@ module HTML
       # Returns the context's asset_path or the default path if no context asset_path is given.
       def asset_path(name)
         if context[:asset_path]
-          context[:asset_path].gsub(":file_name", emoji_filename(name))
+          context[:asset_path].gsub(':file_name', emoji_filename(name))
         else
-          File.join("emoji", emoji_filename(name))
+          File.join('emoji', emoji_filename(name))
         end
       end
 
@@ -67,12 +66,12 @@ module HTML
 
       # Build an emoji image tag
       def emoji_image_tag(name)
-        require "active_support/core_ext/hash/indifferent_access"
+        require 'active_support/core_ext/hash/indifferent_access'
         html_attrs =
-          default_img_attrs(name).
-            merge!((context[:img_attrs] || {}).with_indifferent_access).
-            map { |attr, value| !value.nil? && %(#{attr}="#{value.respond_to?(:call) && value.call(name) || value}") }.
-            reject(&:blank?).join(" ".freeze)
+          default_img_attrs(name)
+          .merge!((context[:img_attrs] || {}).with_indifferent_access)
+          .map { |attr, value| !value.nil? && %(#{attr}="#{value.respond_to?(:call) && value.call(name) || value}") }
+          .reject(&:blank?).join(' '.freeze)
 
         "<img #{html_attrs}>"
       end
@@ -80,13 +79,13 @@ module HTML
       # Default attributes for img tag
       def default_img_attrs(name)
         {
-          "class" => "emoji".freeze,
-          "title" => ":#{name}:",
-          "alt" => ":#{name}:",
-          "src" => "#{emoji_url(name)}",
-          "height" => "20".freeze,
-          "width" => "20".freeze,
-          "align" => "absmiddle".freeze,
+          'class' => 'emoji'.freeze,
+          'title' => ":#{name}:",
+          'alt' => ":#{name}:",
+          'src' => emoji_url(name).to_s,
+          'height' => '20'.freeze,
+          'width' => '20'.freeze,
+          'align' => 'absmiddle'.freeze
         }
       end
 

data/lib/html/pipeline/filter.rb

@@ -30,7 +30,7 @@ module HTML
       class InvalidDocumentException < StandardError; end
 
       def initialize(doc, context = nil, result = nil)
-        if doc.kind_of?(String)
+        if doc.is_a?(String)
           @html = doc.to_str
           @doc = nil
         else
@@ -76,8 +76,7 @@ module HTML
       end
 
       # Make sure the context has everything we need. Noop: Subclasses can override.
-      def validate
-      end
+      def validate; end
 
       # The Repository object provided in the context hash, or nil when no
       # :repository was specified.
@@ -116,9 +115,7 @@ module HTML
       # Returns true when the node has a matching ancestor.
       def has_ancestor?(node, tags)
         while node = node.parent
-          if tags.include?(node.name.downcase)
-            break true
-          end
+          break true if tags.include?(node.name.downcase)
         end
       end
 
@@ -134,7 +131,7 @@ module HTML
       # the last filter returns a String.
       def self.to_document(input, context = nil)
         html = call(input, context)
-        HTML::Pipeline::parse(html)
+        HTML::Pipeline.parse(html)
       end
 
       # Like call but guarantees that a string of HTML markup is returned.
@@ -158,7 +155,7 @@ module HTML
 
         if missing.any?
           raise ArgumentError,
-            "Missing context keys for #{self.class.name}: #{missing.map(&:inspect).join ', '}"
+                "Missing context keys for #{self.class.name}: #{missing.map(&:inspect).join ', '}"
         end
       end
     end

data/lib/html/pipeline/https_filter.rb

@@ -7,8 +7,8 @@ module HTML
     #   :http_url - The HTTP url to force HTTPS. Falls back to :base_url
     class HttpsFilter < Filter
       def call
-        doc.css(%Q(a[href^="#{http_url}"])).each do |element|
-          element['href'] = element['href'].sub(/^http:/,'https:')
+        doc.css(%(a[href^="#{http_url}"])).each do |element|
+          element['href'] = element['href'].sub(/^http:/, 'https:')
         end
         doc
       end

data/lib/html/pipeline/image_filter.rb

@@ -9,7 +9,7 @@ module HTML
     class ImageFilter < TextFilter
       def call
         @text.gsub(/(https|http)?:\/\/.+\.(jpg|jpeg|bmp|gif|png)(\?\S+)?/i) do |match|
-        %|<img src="#{match}" alt=""/>|
+          %(<img src="#{match}" alt=""/>)
         end
       end
     end

data/lib/html/pipeline/image_max_width_filter.rb

@@ -17,21 +17,19 @@ module HTML
           # js injection via javascript: urls.
           next if element['src'].to_s.strip =~ /\Ajavascript/i
 
-          element['style'] = "max-width:100%;"
+          element['style'] = 'max-width:100%;'
 
-          if !has_ancestor?(element, %w(a))
-            link_image element
-          end
+          link_image element unless has_ancestor?(element, %w[a])
         end
 
         doc
       end
 
       def link_image(element)
-        link = doc.document.create_element('a', :href => element['src'], :target => '_blank')
+        link = doc.document.create_element('a', href: element['src'], target: '_blank')
         link.add_child(element.dup)
         element.replace(link)
       end
     end
   end
-end
+end

data/lib/html/pipeline/markdown_filter.rb

@@ -1,4 +1,4 @@
-HTML::Pipeline.require_dependency("commonmarker", "MarkdownFilter")
+HTML::Pipeline.require_dependency('commonmarker', 'MarkdownFilter')
 
 module HTML
   class Pipeline
@@ -15,7 +15,7 @@ module HTML
     class MarkdownFilter < TextFilter
       def initialize(text, context = nil, result = nil)
         super text, context, result
-        @text = @text.gsub "\r", ''
+        @text = @text.delete "\r"
       end
 
       # Convert Markdown to HTML using the best available implementation
@@ -25,7 +25,8 @@ module HTML
         options << :HARDBREAKS if context[:gfm] != false
         extensions = context.fetch(
           :commonmarker_extensions,
-          [:table, :strikethrough, :tagfilter, :autolink])
+          %i[table strikethrough tagfilter autolink]
+        )
         html = CommonMarker.render_html(@text, options, extensions)
         html.rstrip!
         html

data/lib/html/pipeline/plain_text_input_filter.rb

@@ -1,4 +1,4 @@
-HTML::Pipeline.require_dependency("escape_utils", "PlainTextInputFilter")
+HTML::Pipeline.require_dependency('escape_utils', 'PlainTextInputFilter')
 
 module HTML
   class Pipeline

data/lib/html/pipeline/sanitization_filter.rb

@@ -1,4 +1,4 @@
-HTML::Pipeline.require_dependency("sanitize", "SanitizationFilter")
+HTML::Pipeline.require_dependency('sanitize', 'SanitizationFilter')
 
 module HTML
   class Pipeline
@@ -21,16 +21,16 @@ module HTML
     #
     # This filter does not write additional information to the context.
     class SanitizationFilter < Filter
-      LISTS     = Set.new(%w(ul ol).freeze)
+      LISTS     = Set.new(%w[ul ol].freeze)
       LIST_ITEM = 'li'.freeze
 
       # List of table child elements. These must be contained by a <table> element
       # or they are not allowed through. Otherwise they can be used to break out
       # of places we're using tables to contain formatted user content (like pull
       # request review comments).
-      TABLE_ITEMS = Set.new(%w(tr td th).freeze)
+      TABLE_ITEMS = Set.new(%w[tr td th].freeze)
       TABLE = 'table'.freeze
-      TABLE_SECTIONS = Set.new(%w(thead tbody tfoot).freeze)
+      TABLE_SECTIONS = Set.new(%w[thead tbody tfoot].freeze)
 
       # These schemes are the only ones allowed in <a href> attributes by default.
       ANCHOR_SCHEMES = ['http', 'https', 'mailto', :relative, 'github-windows', 'github-mac'].freeze
@@ -38,77 +38,80 @@ module HTML
       # The main sanitization whitelist. Only these elements and attributes are
       # allowed through by default.
       WHITELIST = {
-        :elements => %w(
+        elements: %w[
           h1 h2 h3 h4 h5 h6 h7 h8 br b i strong em a pre code img tt
           div ins del sup sub p ol ul table thead tbody tfoot blockquote
           dl dt dd kbd q samp var hr ruby rt rp li tr td th s strike summary details
-        ),
-        :remove_contents => ['script'],
-        :attributes => {
+        ],
+        remove_contents: ['script'],
+        attributes: {
           'a'          => ['href'],
-          'img'        => ['src', 'longdesc'],
-          'div'        => ['itemscope', 'itemtype'],
+          'img'        => %w[src longdesc],
+          'div'        => %w[itemscope itemtype],
           'blockquote' => ['cite'],
           'del'        => ['cite'],
           'ins'        => ['cite'],
           'q'          => ['cite'],
-          :all         => ['abbr', 'accept', 'accept-charset',
-                           'accesskey', 'action', 'align', 'alt', 'axis',
-                           'border', 'cellpadding', 'cellspacing', 'char',
-                           'charoff', 'charset', 'checked',
-                           'clear', 'cols', 'colspan', 'color',
-                           'compact', 'coords', 'datetime', 'dir',
-                           'disabled', 'enctype', 'for', 'frame',
-                           'headers', 'height', 'hreflang',
-                           'hspace', 'ismap', 'label', 'lang',
-                           'maxlength', 'media', 'method',
-                           'multiple', 'name', 'nohref', 'noshade',
-                           'nowrap', 'open', 'prompt', 'readonly', 'rel', 'rev',
-                           'rows', 'rowspan', 'rules', 'scope',
-                           'selected', 'shape', 'size', 'span',
-                           'start', 'summary', 'tabindex', 'target',
-                           'title', 'type', 'usemap', 'valign', 'value',
-                           'vspace', 'width', 'itemprop']
+         :all => ['abbr', 'accept', 'accept-charset',
+                  'accesskey', 'action', 'align', 'alt', 'axis',
+                  'border', 'cellpadding', 'cellspacing', 'char',
+                  'charoff', 'charset', 'checked',
+                  'clear', 'cols', 'colspan', 'color',
+                  'compact', 'coords', 'datetime', 'dir',
+                  'disabled', 'enctype', 'for', 'frame',
+                  'headers', 'height', 'hreflang',
+                  'hspace', 'ismap', 'label', 'lang',
+                  'maxlength', 'media', 'method',
+                  'multiple', 'name', 'nohref', 'noshade',
+                  'nowrap', 'open', 'prompt', 'readonly', 'rel', 'rev',
+                  'rows', 'rowspan', 'rules', 'scope',
+                  'selected', 'shape', 'size', 'span',
+                  'start', 'summary', 'tabindex', 'target',
+                  'title', 'type', 'usemap', 'valign', 'value',
+                  'vspace', 'width', 'itemprop']
         },
-        :protocols => {
-          'a'          => {'href' => ANCHOR_SCHEMES},
-          'blockquote' => {'cite' => ['http', 'https', :relative]},
-          'del'        => {'cite' => ['http', 'https', :relative]},
-          'ins'        => {'cite' => ['http', 'https', :relative]},
-          'q'          => {'cite' => ['http', 'https', :relative]},
+        protocols: {
+          'a'          => { 'href' => ANCHOR_SCHEMES },
+          'blockquote' => { 'cite' => ['http', 'https', :relative] },
+          'del'        => { 'cite' => ['http', 'https', :relative] },
+          'ins'        => { 'cite' => ['http', 'https', :relative] },
+          'q'          => { 'cite' => ['http', 'https', :relative] },
           'img'        => {
             'src'      => ['http', 'https', :relative],
             'longdesc' => ['http', 'https', :relative]
           }
         },
-        :transformers => [
+        transformers: [
           # Top-level <li> elements are removed because they can break out of
           # containing markup.
           lambda { |env|
-            name, node = env[:node_name], env[:node]
-            if name == LIST_ITEM && !node.ancestors.any?{ |n| LISTS.include?(n.name) }
+            name = env[:node_name]
+            node = env[:node]
+            if name == LIST_ITEM && node.ancestors.none? { |n| LISTS.include?(n.name) }
               node.replace(node.children)
             end
           },
 
           # Table child elements that are not contained by a <table> are removed.
           lambda { |env|
-            name, node = env[:node_name], env[:node]
-            if (TABLE_SECTIONS.include?(name) || TABLE_ITEMS.include?(name)) && !node.ancestors.any? { |n| n.name == TABLE }
+            name = env[:node_name]
+            node = env[:node]
+            if (TABLE_SECTIONS.include?(name) || TABLE_ITEMS.include?(name)) && node.ancestors.none? { |n| n.name == TABLE }
               node.replace(node.children)
             end
           }
         ]
-      }
+      }.freeze
 
       # A more limited sanitization whitelist. This includes all attributes,
       # protocols, and transformers from WHITELIST but with a more locked down
       # set of allowed elements.
       LIMITED = WHITELIST.merge(
-        :elements => %w(b i strong em a pre code img ins del sup sub p ol ul li))
+        elements: %w[b i strong em a pre code img ins del sup sub p ol ul li]
+      )
 
       # Strip all HTML tags from the document.
-      FULL = { :elements => [] }
+      FULL = { elements: [] }.freeze
 
       # Sanitize markup using the Sanitize library.
       def call

data/lib/html/pipeline/syntax_highlight_filter.rb

@@ -1,10 +1,15 @@
-HTML::Pipeline.require_dependency("linguist", "SyntaxHighlightFilter")
+HTML::Pipeline.require_dependency('rouge', 'SyntaxHighlightFilter')
 
 module HTML
   class Pipeline
     # HTML Filter that syntax highlights code blocks wrapped
     # in <pre lang="...">.
     class SyntaxHighlightFilter < Filter
+      def initialize(*args)
+        super(*args)
+        @formatter = Rouge::Formatters::HTML.new
+      end
+
       def call
         doc.search('pre').each do |node|
           default = context[:highlight] && context[:highlight].to_s
@@ -12,27 +17,26 @@ module HTML
           next unless lexer = lexer_for(lang)
           text = node.inner_text
 
-          html = highlight_with_timeout_handling(lexer, text)
+          html = highlight_with_timeout_handling(text, lang)
           next if html.nil?
 
-          if (node = node.replace(html).first)
-            klass = node["class"]
-            klass = [klass, "highlight-#{lang}"].compact.join " "
+          next unless (node = node.replace(html).first)
+          klass = node['class']
+          klass = [klass, "highlight-#{lang}"].compact.join ' '
 
-            node["class"] = klass
-          end
+          node['class'] = klass
         end
         doc
       end
 
-      def highlight_with_timeout_handling(lexer, text)
-        lexer.highlight(text)
-      rescue Timeout::Error => boom
+      def highlight_with_timeout_handling(text, lang)
+        Rouge.highlight(text, lang, @formatter)
+      rescue Timeout::Error => _
         nil
       end
 
       def lexer_for(lang)
-        (Linguist::Language[lang] && Linguist::Language[lang].lexer) || Pygments::Lexer[lang]
+        Rouge::Lexer.find(lang)
       end
     end
   end

data/lib/html/pipeline/text_filter.rb

@@ -4,11 +4,11 @@ module HTML
       attr_reader :text
 
       def initialize(text, context = nil, result = nil)
-        raise TypeError, "text cannot be HTML" if text.is_a?(DocumentFragment)
+        raise TypeError, 'text cannot be HTML' if text.is_a?(DocumentFragment)
         # Ensure that this is always a string
         @text = text.respond_to?(:to_str) ? text.to_str : text.to_s
         super nil, context, result
       end
     end
   end
-end
+end

data/lib/html/pipeline/textile_filter.rb

@@ -1,4 +1,4 @@
-HTML::Pipeline.require_dependency("redcloth", "RedCloth")
+HTML::Pipeline.require_dependency('redcloth', 'RedCloth')
 
 module HTML
   class Pipeline

data/lib/html/pipeline/toc_filter.rb

@@ -23,35 +23,35 @@ module HTML
     #  result[:output].to_s
     #  # => "<h1>\n<a id=\"ice-cube\" class=\"anchor\" href=\"#ice-cube\">..."
     class TableOfContentsFilter < Filter
-      PUNCTUATION_REGEXP = RUBY_VERSION > "1.9" ? /[^\p{Word}\- ]/u : /[^\w\- ]/
+      PUNCTUATION_REGEXP = RUBY_VERSION > '1.9' ? /[^\p{Word}\- ]/u : /[^\w\- ]/
 
       # The icon that will be placed next to an anchored rendered markdown header
       def anchor_icon
-        context[:anchor_icon] || "<span aria-hidden=\"true\" class=\"octicon octicon-link\"></span>"
+        context[:anchor_icon] || '<span aria-hidden="true" class="octicon octicon-link"></span>'
       end
 
       def call
-        result[:toc] = ""
+        result[:toc] = ''
 
         headers = Hash.new(0)
         doc.css('h1, h2, h3, h4, h5, h6').each do |node|
           text = node.text
           id = ascii_downcase(text)
           id.gsub!(PUNCTUATION_REGEXP, '') # remove punctuation
-          id.gsub!(' ', '-') # replace spaces with dash
+          id.tr!(' ', '-') # replace spaces with dash
 
-          uniq = (headers[id] > 0) ? "-#{headers[id]}" : ''
+          uniq = headers[id] > 0 ? "-#{headers[id]}" : ''
           headers[id] += 1
           if header_content = node.children.first
-            result[:toc] << %Q{<li><a href="##{id}#{uniq}">#{text}</a></li>\n}
-            header_content.add_previous_sibling(%Q{<a id="#{id}#{uniq}" class="anchor" href="##{id}#{uniq}" aria-hidden="true">#{anchor_icon}</a>})
+            result[:toc] << %(<li><a href="##{id}#{uniq}">#{text}</a></li>\n)
+            header_content.add_previous_sibling(%(<a id="#{id}#{uniq}" class="anchor" href="##{id}#{uniq}" aria-hidden="true">#{anchor_icon}</a>))
           end
         end
-        result[:toc] = %Q{<ul class="section-nav">\n#{result[:toc]}</ul>} unless result[:toc].empty?
+        result[:toc] = %(<ul class="section-nav">\n#{result[:toc]}</ul>) unless result[:toc].empty?
         doc
       end
 
-      if RUBY_VERSION >= "2.4"
+      if RUBY_VERSION >= '2.4'
         def ascii_downcase(str)
           str.downcase(:ascii)
         end

data/lib/html/pipeline/version.rb

@@ -1,5 +1,5 @@
 module HTML
   class Pipeline
-    VERSION = "2.7.1"
+    VERSION = '2.7.2'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: html-pipeline
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.2
 platform: ruby
 authors:
 - Ryan Tomayko
@@ -9,36 +9,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-21 00:00:00.000000000 Z
+date: 2018-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.4'
 description: GitHub HTML processing filters and utilities
 email:
 - ryan@github.com