content-pipeline 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99982146710eb42b199f6f0d9af72351654c2477
-  data.tar.gz: 93180e18ff0229a46cd1d21cc78ddf42b4d4e780
+  metadata.gz: 7f5f5bbc2443cdb2521b738fae3f0541548103ae
+  data.tar.gz: 04a7408dd1fd130cee92d2475c920e806279acd8
 SHA512:
-  metadata.gz: 24cef63ca9907370b1f6809eef8464806e75a97df2370100681d33aac94245d31108623f9db673ed7353f6849468de1c8bbd98351df59c71a249c29b85877210
-  data.tar.gz: bf3541baf1aa6e64118515e75a3e17b2ec18acc2d5c5cdf3c35bdd1f3b00161c20b60bf32d3e498de548bee18632ccc9540e0949832bf35258760c0d3d459542
+  metadata.gz: c443550d1219ab09e0f0df54c7f050ab4e87b4a269f789b3b1127d19e9e8d174f0ed9702f1818b3838b0bf78b0ccc2ac8ce9614a1088a56a1a817dce46c48afd
+  data.tar.gz: cc77fd8d041ed307b516a25ccf8c1a8671b63550459a5eb445805933e4057686f0f3ee6848d9feb8c6f98cd6dae6b7979c64245e83f015a2ce1de003e3e9e04c

data/Readme.md

@@ -59,10 +59,10 @@ Content::Pipeline.new.filter('# Markdown')
 ```
 
 * Supports global options with overrides.
-* By default uses `CodeHighlight`, `Markdown`, `Gemoji`.
+* By default uses only `Markdown`.
 * Supports multiple Markdowns.
 
-*It should be noted that if you send a list of filters you wish to use, it will not use the default filters at all.  So where you see `[ MyFilter ]` that will be the only filter that is ran, since it automatically assumes this is the pipeline you wish to use.*
+*It should be noted that if you send a list of filters you wish to use, it will not use the default filter at all.  So where you see `[ MyFilter ]` that will be the only filter that is ran, since it automatically assumes this is the pipeline you wish to use.*
 
 ### Filter Options
 

data/lib/content/pipeline/filters/code_highlight.rb

@@ -41,9 +41,11 @@ class Content::Pipeline::Filters::CodeHighlight < Content::Pipeline::Filter
   private
   def highlight
     @str = @str.to_nokogiri_fragment
-    @str.search("pre").each do |node|
-      lang = node[:lang] || @opts[:default] || "ruby"
-      node.replace Templates[:wrap] % wrap(pygments(node.inner_text, lang), lang)
+    @str.search("pre>code").each do |node|
+      lang = node[:class] || node.parent[:lang] || @opts[:default] || "ruby"
+      node.parent.replace(
+        Templates[:wrap] % wrap(pygments(node.inner_text, lang), lang)
+      )
     end
   end
 

data/lib/content/pipeline/filters/markdown.rb

@@ -12,7 +12,7 @@ class Content::Pipeline::Filters::Markdown < Content::Pipeline::Filter
 
   private
   def default
-    jruby? ? :kramdown : :gfm
+    jruby? ? :kramdown : :redcarpet
   end
 
   private
@@ -51,7 +51,8 @@ class Content::Pipeline::Filters::Markdown < Content::Pipeline::Filter
   private
   def parse_github
     require "github/markdown"
-    GitHub::Markdown.to_html(@str, @type).strip
+    type = @type == :github ? :gfm : @type
+    GitHub::Markdown.to_html(@str, type).strip
   end
 
   private

data/lib/content/pipeline/version.rb

@@ -1,5 +1,5 @@
 module Content
   class Pipeline
-    VERSION = "1.3.0"
+    VERSION = "1.3.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: content-pipeline
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Jordon Bedwell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Adds a pipeline for your content.