extended-markdown-filter 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7a84876c5077a91dd3c996a22c2146dda7bcc2d
-  data.tar.gz: 6b34189241a09b08fa663af8f8e5e7c698733464
+  metadata.gz: 60df9d0ebe97519c31fe1f520a9c658cbd32cf93
+  data.tar.gz: 67ec9948aa8298368c111d4da11ecbf497a74fa0
 SHA512:
-  metadata.gz: 66aa616925154d409791007ac40cf067d3e7b7e53f69bfea81046fabe2c1004be89747c4dde07fc129b0a76ad795da1b3578be7795cb69968e428d349db2069b
-  data.tar.gz: b6a62afa12a8ca3d8df0ce5a079c459ce7ea5e8cf83a2e3a5ea27f15c31a849333d48e2d7aad0009e703e23efbf9f6fd3c4a2f75c3c306ea22e7c57148865f6d
+  metadata.gz: 8778d83a3f69f24d3d5a403f99059408f5818ae0e140ff51e057d388c5a4377cf7649de55c2dd59c26d7da22cfa72f62d7375eac1a4682b4370151e2c6ec717e
+  data.tar.gz: 3959bc0a0c111971292dba01716ca020494445543d66b53527071941e006398efbee2e956e3ef32376911162b5ad436d825e4bf244afeb94567107e0d0e45344

data/extended-markdown-filter.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "extended-markdown-filter"
-  spec.version       = "0.2.1"
+  spec.version       = "0.3.0"
   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

@@ -36,6 +36,8 @@ class ExtendedMarkdownFilter < HTML::Pipeline::MarkdownFilter
   def self.convert_curly_to_bracket(text)
     text = text.gsub(/\{\{\s*#(#{AMF_CURLY_TAGS})\s*\}\}/, '[[#\1]]')
     text = text.gsub(/\{\{\s*\/(#{AMF_CURLY_TAGS})\s*\}\}/, '[[/\1]]')
+    text = text.gsub(/\{\{\s*(octicon-\S+\s*[^\}]+)\s*\}\}/,  '[[\1]]')
+
     text
   end
 
@@ -45,7 +47,8 @@ class ExtendedMarkdownFilter < HTML::Pipeline::MarkdownFilter
 
     format_intro!           html
     format_os_blocks!       html
-    format_admonition!      html
+    format_admonitions!     html
+    format_octicons!        html
 
     html
   end

data/lib/filters/filters.rb

@@ -20,4 +20,8 @@ module Filters
   end
   module_function :end_wrap
 
+  def wrap_symbol
+    (context[:amf_use_blocks] == true) ? "\\]" : "}"
+  end
+  module_function :wrap_symbol
 end

data/lib/filters/post/admonition.rb

@@ -1,6 +1,6 @@
 module Filters
   module PostFilter
-    def format_admonition!(html)
+    def format_admonitions!(html)
       html.gsub!(/<p>#{Filters.front_wrap}\s*#tip\s*#{Filters.end_wrap}<\/p>/,     '<div class="alert tip">')
       html.gsub!(/<p>#{Filters.front_wrap}\s*#warning\s*#{Filters.end_wrap}<\/p>/, '<div class="alert warning">')
       html.gsub!(/<p>#{Filters.front_wrap}\s*#error\s*#{Filters.end_wrap}<\/p>/,   '<div class="alert error">')

data/lib/filters/post/octicon.rb

@@ -0,0 +1,8 @@
+module Filters
+  module PostFilter
+    def format_octicons!(html)
+      html.gsub!(/#{Filters.front_wrap}\s*octicon-(\S+)\s*([^\\#{Filters.wrap_symbol}]+)\s*#{Filters.end_wrap}/, %|<span class="octicon \\1" aria-label="\\2" title="\\2"></span>|)
+    end
+  end
+end
+

data/test/fixtures/block_octicon.md

@@ -0,0 +1,5 @@
+[[ octicon-cat This is a cat]]
+
+[[ octicon dog This is nothing. ]]
+
+[Click [[ octicon-gear Settings ]]](http://alink.com)

data/test/fixtures/octicon.md

@@ -0,0 +1,5 @@
+{{ octicon-cat This is a cat}}
+
+{{ octicon dog This is nothing. }}
+
+[Click {{ octicon-gear Settings }}](http://alink.com)

data/test/test_extended_markdown_filter.rb

@@ -127,4 +127,32 @@ class HTML::Pipeline::ExtendedMarkdownFilterTest < Minitest::Test
     assert_equal 1, doc.css('strong').size
     assert_equal 1, doc.css('del').size
   end
+
+  def test_octicon
+    doc = ExtendedMarkdownFilter.to_document(fixture("octicon.md"), {})
+    assert doc.kind_of?(HTML::Pipeline::DocumentFragment)
+
+    assert_equal 1, doc.css('span.cat').size
+    assert_match "{{ octicon dog", doc.to_s
+    assert_match '<p><a href="http://alink.com">Click <span class="octicon gear" aria-label="Settings " title="Settings "></span></a></p>', doc.to_s
+  end
+
+  def test_block_octicon
+    doc = ExtendedMarkdownFilter.to_document(fixture("block_octicon.md"), {:amf_use_blocks => true})
+    assert doc.kind_of?(HTML::Pipeline::DocumentFragment)
+
+    assert_equal 1, doc.css('span.cat').size
+    assert_match "[[ octicon dog", doc.to_s
+    assert_match '<p><a href="http://alink.com">Click <span class="octicon gear" aria-label="Settings " title="Settings "></span></a></p>', doc.to_s
+  end
+
+  def test_oction_conversion
+    doc = ExtendedMarkdownFilter.to_document(fixture("octicon.md"), {:amf_use_blocks => true})
+    assert doc.kind_of?(HTML::Pipeline::DocumentFragment)
+
+    assert_equal 1, doc.css('span.cat').size
+    assert_match "{{ octicon dog", doc.to_s
+    assert_match '<p><a href="http://alink.com">Click <span class="octicon gear" aria-label="Settings " title="Settings "></span></a></p>', doc.to_s
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extended-markdown-filter
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Garen Torikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-02 00:00:00.000000000 Z
+date: 2014-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html-pipeline
@@ -98,6 +98,7 @@ files:
 - lib/filters/filters.rb
 - lib/filters/post/admonition.rb
 - lib/filters/post/intro.rb
+- lib/filters/post/octicon.rb
 - lib/filters/post/os-blocks.rb
 - lib/filters/pre/command-line.rb
 - lib/filters/pre/helper.rb
@@ -105,10 +106,12 @@ files:
 - test/fixtures/admonition.md
 - test/fixtures/block_admonition.md
 - test/fixtures/block_intro.md
+- test/fixtures/block_octicon.md
 - test/fixtures/block_os_blocks.md
 - test/fixtures/command_line.md
 - test/fixtures/helper.md
 - test/fixtures/intro.md
+- test/fixtures/octicon.md
 - test/fixtures/os_blocks.md
 - test/test_extended_markdown_filter.rb
 - test/test_helper.rb
@@ -140,10 +143,12 @@ test_files:
 - test/fixtures/admonition.md
 - test/fixtures/block_admonition.md
 - test/fixtures/block_intro.md
+- test/fixtures/block_octicon.md
 - test/fixtures/block_os_blocks.md
 - test/fixtures/command_line.md
 - test/fixtures/helper.md
 - test/fixtures/intro.md
+- test/fixtures/octicon.md
 - test/fixtures/os_blocks.md
 - test/test_extended_markdown_filter.rb
 - test/test_helper.rb