extended-markdown-filter 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ab22b2196b7e2220a61d4ed64cb2cb67a64ae44
-  data.tar.gz: 45d7f1cb486bfc60222eefa01632ed196fdbc55b
+  metadata.gz: d5200188fe9d4b095aa94f5f19e4eb08a391fc18
+  data.tar.gz: daec275fb2ae5afd8d68fdbbc202a8cadf295c3d
 SHA512:
-  metadata.gz: 5ff127883e4653b95fe2f4443d4359fbc87d9b8e83c3e67bee197aba5e9b498a1e2ea8535c71b65fd079fdd0147c05454778887516e7db86d3ce97faa38a487b
-  data.tar.gz: 27cf75701f4c3798a716307f98a380ee9b72a2a06b47142de8634fb46f698e00b735b98b968b6a05bd978ebd3f34e0ced3efe020edc2bf1963ac4b391c8403f1
+  metadata.gz: dd1669f41d01f2e74a6a5613e66a2c1f604f3abccdaad70fa001b1263e23899a77cefbbf4a132f5effb59bec199c7dd991988ea723c3364e616c9dbc6c34714b
+  data.tar.gz: d0b94f8baa1b9c915f28b091788191732ab7fc33d9c1eafb35282039b09aaa77d63546ffed66cb6b9ef0bb9ab201aad93ab9ed931d849d6b7c15fbcaf6804b04

data/extended-markdown-filter.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "extended-markdown-filter"
-  spec.version       = "0.3.6"
+  spec.version       = "0.3.7"
   spec.authors       = ["Garen Torikian"]
   spec.email         = ["gjtorikian@gmail.com"]
   spec.summary       = %q{Add extended markup syntax to the HTML::Pipeline}

data/lib/extended-markdown-filter.rb

@@ -35,6 +35,7 @@ class ExtendedMarkdownFilter < HTML::Pipeline::MarkdownFilter
   end
 
   def self.convert_curly_to_bracket(text)
+    return text if text.nil?
     text = text.gsub(/\{\{\s*#(#{EMF_CURLY_TAGS})\s*\}\}/, '[[#\1]]')
     text = text.gsub(/\{\{\s*\/(#{EMF_CURLY_TAGS})\s*\}\}/, '[[/\1]]')
     text = text.gsub(/\{\{\s*(octicon-\S+\s*[^\}]+)\s*\}\}/,  '[[\1]]')
@@ -42,6 +43,11 @@ class ExtendedMarkdownFilter < HTML::Pipeline::MarkdownFilter
     text
   end
 
+  def self.should_jekyll_replace?(site)
+    html_pipeline_context = site.site_payload["site"]["html_pipeline"] && site.site_payload["site"]["html_pipeline"]["context"]
+    site.site_payload["site"]["markdown"] == "HTMLPipeline" && html_pipeline_context && site.site_payload["site"]["html_pipeline"]["context"][:emf_use_blocks]
+  end
+
   def call
     # initialize HTML::Pipeline::Markdown, then do post-processing
     html = super

data/lib/jekyll-override.rb

@@ -6,11 +6,24 @@ module Jekyll
     alias_method :old_run, :run
 
     def run
-      html_pipeline_context = site.site_payload["site"]["html_pipeline"] && site.site_payload["site"]["html_pipeline"]["context"]
-      if site.site_payload["site"]["markdown"] == "HTMLPipeline" && html_pipeline_context && site.site_payload["site"]["html_pipeline"]["context"][:emf_use_blocks]
+      if ExtendedMarkdownFilter.should_jekyll_replace?(site)
         document.content = ExtendedMarkdownFilter.convert_curly_to_bracket(document.content)
       end
       old_run
     end
+
+  end
+end
+
+module Jekyll
+  class Page
+    alias_method :old_render, :render
+
+    def render(layouts, site_payload)
+      if ExtendedMarkdownFilter.should_jekyll_replace?(site)
+        self.content = ExtendedMarkdownFilter.convert_curly_to_bracket(content)
+      end
+      old_render(layouts, site_payload)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extended-markdown-filter
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Garen Torikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-09 00:00:00.000000000 Z
+date: 2014-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html-pipeline