html-pipeline 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 283d2eec685e3f57e423f5ef348389a7f5d29f90
-  data.tar.gz: a007485225e182efd0a158bf59c9e4df08da49f6
+  metadata.gz: b0bdbb5edcf3fe65badad9351ff3d8a09fe2e12b
+  data.tar.gz: 159fcac5e236a176e81fa14f267810cc2a61d6aa
 SHA512:
-  metadata.gz: 98e70609b064b690455547da4f61f9746f36fd3fc2b06ea8e4e5a1cd15fb75b3294d466c2336f36b3c650c1cca298cabd430fb39a65cbbf92040e1adb8ef0815
-  data.tar.gz: 24ccfcf8af8ce40388ece52e15bfc0eb3a81b699f8d8043e420f050b1fdba8b1bae3b4df9ecc5c3181dcad4319b4e81bcca542ee3c87dce92ea8189a6e3eb960
+  metadata.gz: 8ada148d84bdec400671449581e17e0fbe7df5899cbc12827a8550f8404c17fec4bc1e52b3d9d912933fe0ab6c2d6e7de4082e8d0b133c8e27293932a1fc0f21
+  data.tar.gz: 0660e087d3b251ed047a27e847fb6147ef6a59b0ee773996c9f69c6fba2fc3be4f9b0e4846b61f1141981e7bed20ba47b5b371cd6bb86699f234972bab2cbe63

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 1.6.0
+
+  * Doc update for syntax highlighting #108 simeonwillbanks
+  * Add missing dependency for EmailReplyFilter #110 foca
+  * Fix deprecation warning for Digest::Digest #103 chrishunt
+
 ## 1.5.0
 
   * More flexible whitelist configuration for SanitizationFilter #98 aroben

data/Gemfile

@@ -9,12 +9,13 @@ group :development do
 end
 
 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 "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 < "1.9.2"
     gem "sanitize", ">= 2", "< 2.0.4", :require => false

data/README.md

@@ -71,6 +71,8 @@ Prints:
 </div>
 ```
 
+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`.
+
 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
 example, if you want don't want to use GitHub formatted Markdown, you can
@@ -111,7 +113,7 @@ gem 'github-linguist'
 ```
 
 * `AutolinkFilter` - `rinku`
-* `EmailReplyFilter` - `escape_utils`
+* `EmailReplyFilter` - `escape_utils`, `email_reply_parser`
 * `EmojiFilter` - `gemoji`
 * `MarkdownFilter` - `github-markdown`
 * `PlainTextInputFilter` - `escape_utils`

data/lib/html/pipeline/camo_filter.rb

@@ -22,7 +22,7 @@ module HTML
       # Hijacks images in the markup provided, replacing them with URLs that
       # go through the github asset proxy.
       def call
-        return unless asset_proxy_enabled?
+        return doc unless asset_proxy_enabled?
 
         doc.search("img").each do |element|
           original_src = element['src']
@@ -56,8 +56,7 @@ module HTML
 
       # Private: calculate the HMAC digest for a image source URL.
       def asset_url_hash(url)
-        digest = OpenSSL::Digest::Digest.new('sha1')
-        OpenSSL::HMAC.hexdigest(digest, asset_proxy_secret_key, url)
+        OpenSSL::HMAC.hexdigest('sha1', asset_proxy_secret_key, url)
       end
 
       # Private: Return true if asset proxy filter should be enabled

data/lib/html/pipeline/email_reply_filter.rb

@@ -4,6 +4,12 @@ rescue LoadError => _
   abort "Missing dependency 'escape_utils' for EmailReplyFilter. See README.md for details."
 end
 
+begin
+  require "email_reply_parser"
+rescue LoadError => _
+  abort "Missing dependency 'email_reply_parser' for EmailReplyFilter. See README.md for details."
+end
+
 module HTML
   class Pipeline
     # HTML Filter that converts email reply text into an HTML DocumentFragment.

data/lib/html/pipeline/version.rb

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

data/test/html/pipeline/camo_filter_test.rb

@@ -13,6 +13,12 @@ class HTML::Pipeline::CamoFilterTest < Test::Unit::TestCase
     }
   end
 
+  def test_asset_proxy_disabled
+    orig = %(<p><img src="http://twitter.com/img.png"></p>)
+    assert_equal orig,
+      CamoFilter.call(orig, @options.merge(:disable_asset_proxy => true)).to_s
+  end
+
   def test_camouflaging_http_image_urls
     orig = %(<p><img src="http://twitter.com/img.png"></p>)
     assert_equal %(<p><img src="https//assets.example.org/a5ad43494e343b20d745586282be61ff530e6fa0/687474703a2f2f747769747465722e636f6d2f696d672e706e67" data-canonical-src="http://twitter.com/img.png"></p>),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: html-pipeline
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Ryan Tomayko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri