html-pipeline 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0bdbb5edcf3fe65badad9351ff3d8a09fe2e12b
-  data.tar.gz: 159fcac5e236a176e81fa14f267810cc2a61d6aa
+  metadata.gz: 6e3b868abc13fac903776f091b0e0e5111c3f2fb
+  data.tar.gz: 52048ee1cf9300f16e37c1a4b11c009a8dabf441
 SHA512:
-  metadata.gz: 8ada148d84bdec400671449581e17e0fbe7df5899cbc12827a8550f8404c17fec4bc1e52b3d9d912933fe0ab6c2d6e7de4082e8d0b133c8e27293932a1fc0f21
-  data.tar.gz: 0660e087d3b251ed047a27e847fb6147ef6a59b0ee773996c9f69c6fba2fc3be4f9b0e4846b61f1141981e7bed20ba47b5b371cd6bb86699f234972bab2cbe63
+  metadata.gz: b51c354c77f8e6f25f7e25a512e1b4d93274b447597929d9562dedc3537b4b94c02f5b5adbfa48e75a592b200fd5bb542c412100f61df569b8faf6054dd9ce39
+  data.tar.gz: 308a373470a7f7f935df533e99a045d1b47c02805d70a2f14983a7844cb8a71760c33420287d3b012e2aeb891563f7b4e41606c94d5edb8a81b73c20daa7882a

data/.travis.yml

@@ -10,4 +10,5 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.1
   - ree

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 1.7.0
+
+  * SanitizationFilter whitelists <s> and <strike> elements #120 charliesome
+  * ruby 2.1.1 support #119 simeonwillbanks
+
 ## 1.6.0
 
   * Doc update for syntax highlighting #108 simeonwillbanks

data/CONTRIBUTING.md

@@ -0,0 +1,60 @@
+# Contributing
+
+Thanks for using and improving `HTML::Pipeline`!
+
+- [Submitting a New Issue](#submitting-a-new-issue)
+- [Sending a Pull Request](#sending-a-pull-request)
+
+## Submitting a New Issue
+
+If there's an idea you'd like to propose, or a design change, feel free to file a new issue. 
+
+If you have an implementation question or believe you've found a bug, please provide as many details as possible:
+
+- Input document
+- Output HTML document
+- the exact `HTML::Pipeline` code you are using
+- output of the following from your project
+
+```
+ruby -v
+bundle exec nokogiri -v
+```
+
+## Sending a Pull Request
+
+[Pull requests][pr] are always welcome!
+
+Check out [the project's issues list][issues] for ideas on what could be improved.
+
+Before sending, please add tests and ensure the test suite passes.
+
+### Running the Tests
+
+To run the full suite:
+
+  `bundle exec rake`
+
+To run a specific test file:
+
+  `bundle exec ruby -Itest test/html/pipeline_test.rb`
+
+To run a specific test:
+
+  `bundle exec ruby -Itest test/html/pipeline/markdown_filter_test.rb -n test_disabling_gfm`  
+
+To run the full suite with all [supported rubies][travisyaml] in bash:
+
+```bash
+rubies=(ree-1.8.7-2011.03 1.9.2-p290 1.9.3-p429 2.0.0-p247)
+for r in ${rubies[*]} 
+do 
+  rbenv local $r # switch to your version manager of choice
+  bundle install 
+  bundle exec rake 
+done
+```
+
+[issues]: https://github.com/jch/html-pipeline/issues
+[pr]: https://help.github.com/articles/using-pull-requests
+[travisyaml]: https://github.com/jch/html-pipeline/blob/master/.travis.yml

data/Gemfile

@@ -12,11 +12,17 @@ group :test do
   gem "rinku",              "~> 1.7",   :require => false
   gem "gemoji",             "~> 1.0",   :require => false
   gem "RedCloth",           "~> 4.2.9", :require => false
-  gem "escape_utils",       "~> 0.3",   :require => false
-  gem "github-linguist",    "~> 2.6.2", :require => false
   gem "github-markdown",    "~> 0.5",   :require => false
   gem "email_reply_parser", "~> 0.5",   :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.2"
     gem "sanitize", ">= 2", "< 2.0.4", :require => false
   else

data/README.md

@@ -281,6 +281,14 @@ bundle
 rake test
 ```
 
+## Releasing a new version
+
+This section is for gem maintainers to cut a new version of the gem.
+
+* update lib/html/pipeline/version.rb to next version number X.X.X following [semver](http://semver.org).
+* update CHANGELOG.md. Get latest changes with `git log --oneline vLAST_RELEASE..HEAD | grep Merge`
+* on the master branch, run `script/release`
+
 ## Contributing
 
 1. [Fork it](https://help.github.com/articles/fork-a-repo)

data/lib/html/pipeline/sanitization_filter.rb

@@ -45,7 +45,7 @@ module HTML
         :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
+          dl dt dd kbd q samp var hr ruby rt rp li tr td th s strike
         ),
         :remove_contents => ['script'],
         :attributes => {

data/lib/html/pipeline/version.rb

@@ -1,5 +1,5 @@
 module HTML
   class Pipeline
-    VERSION = "1.6.0"
+    VERSION = "1.7.0"
   end
 end

data/script/package

@@ -0,0 +1,7 @@
+#!/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

@@ -0,0 +1,16 @@
+#!/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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: html-pipeline
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Ryan Tomayko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-14 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -50,6 +50,7 @@ files:
 - .gitignore
 - .travis.yml
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
@@ -75,6 +76,8 @@ files:
 - lib/html/pipeline/textile_filter.rb
 - lib/html/pipeline/toc_filter.rb
 - lib/html/pipeline/version.rb
+- 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