html-pipeline 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35aa83bb8902a72b012f930cafe924e7177a6d80
-  data.tar.gz: 808e09472fdeaf1cf294bf4715e6754b38b0157b
+  metadata.gz: 1c0ef5f710331e4cbd96e8052870c185b069ec6c
+  data.tar.gz: 268a8be42428bf687f3f7a7a5ee12311f91be04b
 SHA512:
-  metadata.gz: 214b479a825e9b5199e2e0c38a3d73519c56df8950786f12b2c5a35107081ffdec9a3fedcdbe1903428e276bfb2b893f353462e0acdf116f7fb2bfb53dd7c4bd
-  data.tar.gz: b0868ef474821065d9f4feb9c3769e66ccded085435931f2cbcdb03ddf66f42a4b469f60f8cd5719580f368a9d04316780581a157d481eca0a1d60dd0af51e35
+  metadata.gz: 82fc8239a1783aea4c6f6e270a19efb56ffc6ed7cf4fae61924b9de1391dc9822b4134c00bb41fa2bf7f6052b568b40410b6fc2dbbb68d38be93ed2856e5a33b
+  data.tar.gz: e857252f6362ac78b3213cb4ca98ed614c647ec911b210205b33d01fd644378885beffae2b44071545164ad7e1e0c7b419019f7e7b8ff80067b7a034d9c2403f

data/.travis.yml

@@ -1,21 +1,32 @@
 language: ruby
 sudo: false
+cache: bundler
 
 addons:
   apt:
     sources:
       - libicu-dev
 
-script: "bundle exec rake"
+script: bundle exec rake
+
+gemfile:
+  - gemfiles/rails_5.gemfile
+  - gemfiles/rails_4.gemfile
+  - gemfiles/rails_3.gemfile
 
 rvm:
-  - 2.0
+  - 2.3.1
+  - 2.2.5
   - 2.1
-  - 2.2
-  - 2.3.0
+  - 2.0
   - ruby-head
 
 matrix:
   fast_finish: true
   allow_failures:
     - rvm: ruby-head
+  exclude:
+    - gemfile: gemfiles/rails_5.gemfile
+      rvm: 2.1
+    - gemfile: gemfiles/rails_5.gemfile
+      rvm: 2.0

data/Appraisals

@@ -0,0 +1,13 @@
+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"
+end
+
+appraise "rails-5" do
+  gem "rails", "~> 5.0.0"
+end

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 2.4.2
+
+* Make EmojiFilter generated img tag HTML attributes configurable [#258](https://github.com/jch/html-pipeline/pull/258)
+
 ## 2.4.1
 
 * Regression in EmailReplyPipeline: unfiltered content is being ommitted [#253](https://github.com/jch/html-pipeline/pull/253)

data/Gemfile

@@ -6,10 +6,11 @@ gemspec
 group :development do
   gem "bundler"
   gem "rake"
+  gem "appraisal"
 end
 
 group :test do
-  gem "minitest",           "~> 5.3"
+  gem "minitest"
   gem "rinku",              "~> 1.7",   :require => false
   gem "gemoji",             "~> 2.0",   :require => false
   gem "RedCloth",           "~> 4.2.9", :require => false

data/Rakefile

@@ -1,4 +1,7 @@
 #!/usr/bin/env rake
+require "rubygems"
+require "bundler/setup"
+
 require "bundler/gem_tasks"
 require 'rake/testtask'
 
@@ -8,4 +11,4 @@ Rake::TestTask.new do |t|
   t.verbose = true
 end
 
-task :default => :test
+task :default => :test

data/html-pipeline.gemspec

@@ -11,12 +11,11 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{Helpers for processing content through a chain of filters}
   gem.homepage      = "https://github.com/jch/html-pipeline"
 
-  gem.files         = `git ls-files`.split $/
-  gem.test_files    = gem.files.grep(%r{^test})
+  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", "< 5"]
+  gem.add_dependency "activesupport", ">= 2"
 
   gem.post_install_message = <<msg
 -------------------------------------------------

data/lib/html/pipeline/emoji_filter.rb

@@ -14,6 +14,7 @@ module HTML
     #   :asset_root (required) - base url to link to emoji sprite
     #   :asset_path (optional) - url path to link to emoji sprite. :file_name can be used as a placeholder for the sprite file name. If no asset_path is set "emoji/:file_name" is used.
     #   :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
@@ -71,7 +72,27 @@ module HTML
 
       # Build an emoji image tag
       def emoji_image_tag(name)
-        "<img class='emoji' title=':#{name}:' alt=':#{name}:' src='#{emoji_url(name)}' height='20' width='20' align='absmiddle' />"
+        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)
+
+        "<img #{html_attrs}>"
+      end
+
+      # 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,
+        }
       end
 
       def emoji_url(name)

data/lib/html/pipeline/version.rb

@@ -1,5 +1,5 @@
 module HTML
   class Pipeline
-    VERSION = "2.4.1"
+    VERSION = "2.4.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: html-pipeline
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Ryan Tomayko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-11 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -32,9 +32,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,9 +39,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
 description: GitHub HTML processing filters and utilities
 email:
 - ryan@github.com
@@ -55,6 +49,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- Appraisals
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -83,26 +78,6 @@ files:
 - lib/html/pipeline/textile_filter.rb
 - lib/html/pipeline/toc_filter.rb
 - lib/html/pipeline/version.rb
-- script/changelog
-- script/package
-- script/release
-- test/helpers/mocked_instrumentation_service.rb
-- test/html/pipeline/absolute_source_filter_test.rb
-- test/html/pipeline/autolink_filter_test.rb
-- test/html/pipeline/camo_filter_test.rb
-- test/html/pipeline/email_reply_filter_test.rb
-- test/html/pipeline/emoji_filter_test.rb
-- test/html/pipeline/https_filter_test.rb
-- test/html/pipeline/image_filter_test.rb
-- test/html/pipeline/image_max_width_filter_test.rb
-- test/html/pipeline/markdown_filter_test.rb
-- test/html/pipeline/mention_filter_test.rb
-- test/html/pipeline/plain_text_input_filter_test.rb
-- test/html/pipeline/sanitization_filter_test.rb
-- test/html/pipeline/syntax_highlight_filter_test.rb
-- test/html/pipeline/toc_filter_test.rb
-- test/html/pipeline_test.rb
-- test/test_helper.rb
 homepage: https://github.com/jch/html-pipeline
 licenses:
 - MIT
@@ -133,21 +108,4 @@ rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Helpers for processing content through a chain of filters
-test_files:
-- test/helpers/mocked_instrumentation_service.rb
-- test/html/pipeline/absolute_source_filter_test.rb
-- test/html/pipeline/autolink_filter_test.rb
-- test/html/pipeline/camo_filter_test.rb
-- test/html/pipeline/email_reply_filter_test.rb
-- test/html/pipeline/emoji_filter_test.rb
-- test/html/pipeline/https_filter_test.rb
-- test/html/pipeline/image_filter_test.rb
-- test/html/pipeline/image_max_width_filter_test.rb
-- test/html/pipeline/markdown_filter_test.rb
-- test/html/pipeline/mention_filter_test.rb
-- test/html/pipeline/plain_text_input_filter_test.rb
-- test/html/pipeline/sanitization_filter_test.rb
-- test/html/pipeline/syntax_highlight_filter_test.rb
-- test/html/pipeline/toc_filter_test.rb
-- test/html/pipeline_test.rb
-- test/test_helper.rb
+test_files: []

data/script/changelog

@@ -1,47 +0,0 @@
-#!/bin/bash
-# Usage: script/changelog [-r <repo>] [-b <base>] [-h <head>]
-#
-#  repo: base string of GitHub repository url. e.g. "user_or_org/repository". Defaults to git remote url.
-#  base: git ref to compare from. e.g. "v1.3.1". Defaults to latest git tag.
-#  head: git ref to compare to. Defaults to "HEAD".
-#
-# Generate a changelog preview from pull requests merged between `base` and
-# `head`.
-#
-# https://github.com/jch/release-scripts/blob/master/changelog
-set -e
-
-[ $# -eq 0 ] && set -- --help
-while [[ $# > 1 ]]
-do
-  key="$1"
-  case $key in
-    -r|--repo)
-    repo="$2"
-    shift
-    ;;
-    -b|--base)
-    base="$2"
-    shift
-    ;;
-    -h|--head)
-    head="$2"
-    shift
-    ;;
-    *)
-    ;;
-  esac
-  shift
-done
-
-repo="${repo:-$(git remote -v | grep push | awk '{print $2}' | cut -d'/' -f4- | sed 's/\.git//')}"
-base="${base:-$(git tag -l | sort -t. -k 1,1n -k 2,2n -k 3,3n | tail -n 1)}"
-head="${head:-HEAD}"
-api_url="https://api.github.com"
-
-# get merged PR's. Better way is to query the API for these, but this is easier
-for pr in $(git log --oneline $base..$head | grep "Merge pull request" | awk '{gsub("#",""); print $5}')
-do
-  # frustrated with trying to pull out the right values, fell back to ruby
-  curl -s "$api_url/repos/$repo/pulls/$pr" | ruby -rjson -e 'pr=JSON.parse(STDIN.read); puts "* #{pr[%q(title)]} [##{pr[%q(number)]}](#{pr[%q(html_url)]})"'
-done

data/script/package

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-# Usage: script/gem
-# Updates the gemspec and builds a new gem in the pkg directory.
-
-mkdir -p pkg
-gem build *.gemspec
-mv *.gem pkg

data/script/release

@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-# Usage: script/release
-# Build the package, tag a commit, push it to origin, and then release the
-# package publicly.
-
-set -e
-
-version="$(script/package | grep Version: | awk '{print $2}')"
-[ -n "$version" ] || exit 1
-
-echo $version
-git commit --allow-empty -a -m "Release $version"
-git tag "v$version"
-git push origin
-git push origin "v$version"
-gem push pkg/*-${version}.gem

data/test/helpers/mocked_instrumentation_service.rb

@@ -1,17 +0,0 @@
-class MockedInstrumentationService
-  attr_reader :events
-  def initialize(event = nil, events = [])
-    @events = events
-    subscribe event
-  end
-  def instrument(event, payload = nil)
-    payload ||= {}
-    res = yield payload
-    events << [event, payload, res] if @subscribe == event
-    res
-  end
-  def subscribe(event)
-    @subscribe = event
-    @events
-  end
-end

data/test/html/pipeline/absolute_source_filter_test.rb

@@ -1,55 +0,0 @@
-require "test_helper"
-
-class HTML::Pipeline::AbsoluteSourceFilterTest < Minitest::Test
-  AbsoluteSourceFilter = HTML::Pipeline::AbsoluteSourceFilter
-
-  def setup
-    @image_base_url = 'http://assets.example.com'
-    @image_subpage_url = 'http://blog.example.com/a/post'
-    @options = {
-      :image_base_url    => @image_base_url,
-      :image_subpage_url => @image_subpage_url
-    }
-  end
-
-  def test_rewrites_root_urls
-    orig = %(<p><img src="/img.png"></p>)
-    assert_equal "<p><img src=\"#{@image_base_url}/img.png\"></p>",
-      AbsoluteSourceFilter.call(orig, @options).to_s
-  end
-
-  def test_rewrites_relative_urls
-    orig = %(<p><img src="post/img.png"></p>)
-    assert_equal "<p><img src=\"#{@image_subpage_url}/img.png\"></p>",
-      AbsoluteSourceFilter.call(orig, @options).to_s
-  end
-
-  def test_does_not_rewrite_absolute_urls
-    orig = %(<p><img src="http://other.example.com/img.png"></p>)
-    result = AbsoluteSourceFilter.call(orig, @options).to_s
-    refute_match /@image_base_url/, result
-    refute_match /@image_subpage_url/, result
-  end
-
-  def test_fails_when_context_is_missing
-    assert_raises RuntimeError do
-      AbsoluteSourceFilter.call("<img src=\"img.png\">", {})
-    end
-    assert_raises RuntimeError do
-      AbsoluteSourceFilter.call("<img src=\"/img.png\">", {})
-    end
-  end
-  
-  def test_tells_you_where_context_is_required
-    exception = assert_raises(RuntimeError) { 
-      AbsoluteSourceFilter.call("<img src=\"img.png\">", {}) 
-    }
-    assert_match 'HTML::Pipeline::AbsoluteSourceFilter', exception.message
-
-    exception = assert_raises(RuntimeError) { 
-      AbsoluteSourceFilter.call("<img src=\"/img.png\">", {}) 
-    }
-    assert_match 'HTML::Pipeline::AbsoluteSourceFilter', exception.message
-  end
-
-end

data/test/html/pipeline/autolink_filter_test.rb

@@ -1,35 +0,0 @@
-require "test_helper"
-
-AutolinkFilter = HTML::Pipeline::AutolinkFilter
-
-class HTML::Pipeline::AutolinkFilterTest < Minitest::Test
-  def test_uses_rinku_for_autolinking
-    # just try to parse a complicated piece of HTML
-    # that Rails auto_link cannot handle
-    assert_equal '<p>"<a href="http://www.github.com">http://www.github.com</a>"</p>',
-      AutolinkFilter.to_html('<p>"http://www.github.com"</p>')
-  end
-
-  def test_autolink_option
-    assert_equal '<p>"http://www.github.com"</p>',
-      AutolinkFilter.to_html('<p>"http://www.github.com"</p>', :autolink => false)
-  end
-
-  def test_autolink_link_attr
-    assert_equal '<p>"<a href="http://www.github.com" target="_blank">http://www.github.com</a>"</p>',
-      AutolinkFilter.to_html('<p>"http://www.github.com"</p>', :link_attr => 'target="_blank"')
-  end
-
-  def test_autolink_flags
-    assert_equal '<p>"<a href="http://github">http://github</a>"</p>',
-      AutolinkFilter.to_html('<p>"http://github"</p>', :flags => Rinku::AUTOLINK_SHORT_DOMAINS)
-  end
-
-  def test_autolink_skip_tags
-    assert_equal '<code>"http://github.com"</code>',
-      AutolinkFilter.to_html('<code>"http://github.com"</code>')
-
-    assert_equal '<code>"<a href="http://github.com">http://github.com</a>"</code>',
-      AutolinkFilter.to_html('<code>"http://github.com"</code>', :skip_tags => %w(kbd script))
-  end
-end