html-pipeline-linkify_github 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7d544ff42bdaed0ad76d2b225dc17eda21a8ce9
-  data.tar.gz: 7ef282549e3dbcdaa6df7fec6b8aa9dccf0d0ba6
+  metadata.gz: 6ffe55eb51973c6e4aeb83b1313e2b59ad71940a
+  data.tar.gz: 8a8edc700201c6ea6f21b9ee819a74d53c239e74
 SHA512:
-  metadata.gz: 9d8d7f78298b42446740ec56ffafbad473c0f7c361a370d9c4b571421f3c278da68f50094df93d004003a855f03aad00f8e0c821c9c1809cd50b135e2a835e76
-  data.tar.gz: 90c5eac937732170879a89d1c59d9cedda236375251e4e867344a21afe9bca021a70d9ae6e954cefdc4761b21aa04daab33fcc76abf5e2dfffa4e9a9021ec780
+  metadata.gz: 5fc7fd9cf12c8a39ecf1a51024ae2264b15a6938e05e568b6f2e01e5b7b042610db7a1caab3328d641fcaa6e82f29bbffde1c38cde14c98eaf61a4f45f533b7a
+  data.tar.gz: 44938bffae471376d7917591f75b3d2737eadd09f16d7941a95b0f7c8ecf2c6c2cf0a20292420dd3ae8b448817eae669fb27558fe402db12d0ee53fd06824783

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 1.0.2 - 2015.10.20
+
+- Fix children tags got removed when converting urls. [#4](https://github.com/jollygoodcode/html-pipeline-linkify_github/pull/4)
+
 ## 1.0.1 - 2015.10.15
 
 - Linkify after markdown generated html. [#3](https://github.com/jollygoodcode/html-pipeline-linkify_github/pull/3/)

data/Gemfile

@@ -7,6 +7,7 @@ group :development do
   gem "rake"
   gem "bundler"
   gem "pry"
+  gem "pry-nav"
   gem "github-markdown"
 end
 

data/lib/html/pipeline/linkify_github.rb

@@ -24,11 +24,12 @@ module HTML
 
       def call
         doc.search("a").each do |element|
+          next if element.blank? || element.comment?
           next if element["href"].to_s.empty?
 
-          text = element.content
+          text = element.inner_html
 
-          element.content = if is_a_pull_request_link? text
+          element.inner_html = if is_a_pull_request_link? text
             replace_pull_request_link(text)
           elsif is_a_issue_link? text
             replace_issue_link(text)
@@ -57,19 +58,19 @@ module HTML
         end
 
         def replace_pull_request_link(text)
-          text.match(PULL_REQUEST_REGEXP) do
+          text.gsub(PULL_REQUEST_REGEXP) do
             pull_request_shorthand($1, $2, $3)
           end
         end
 
         def replace_issue_link(text)
-          text.match(ISSUES_REGEXP) do
+          text.gsub(ISSUES_REGEXP) do
             issue_shorthand($1, $2, $3)
           end
         end
 
         def replace_commit_link(text)
-          text.match(COMMIT_REGEXP) do
+          text.gsub(COMMIT_REGEXP) do
             commit_shorthand($1, $2, $3)
           end
         end
@@ -83,7 +84,7 @@ module HTML
         end
 
         def commit_shorthand(repo, owner, number)
-          "#{repo}/#{owner}@`#{number[0..5]}`"
+          "#{repo}/#{owner}@<code>#{number[0..5]}</code>"
         end
     end
   end

data/lib/html/pipeline/linkify_github/version.rb

@@ -1,7 +1,7 @@
 module HTML
   class Pipeline
     module LinkifyGitHub
-      VERSION = "1.0.1".freeze
+      VERSION = "1.0.2".freeze
     end
   end
 end

data/test/linkify_github_integration_test.rb

@@ -10,6 +10,7 @@ class HTML::Pipeline::LinkifyGitHubIntegrationTest < Minitest::Test
       HTML::Pipeline::LinkifyGitHubFilter
     ]
   end
+
   def test_works_with_markdown_filter
     result = pipeline.call <<-MARKDOWN.strip_heredoc
       https://github.com/rails/rails/pull/21862
@@ -17,7 +18,7 @@ class HTML::Pipeline::LinkifyGitHubIntegrationTest < Minitest::Test
       https://github.com/rails/rails/commit/67597e1719ec6af7e22964603cc77aa5b085a864
     MARKDOWN
 
-    assert_equal "<p><a href=\"https://github.com/rails/rails/pull/21862\">rails/rails#21862</a><br>\n<a href=\"https://github.com/rails/rails/issues/21843\">rails/rails#21843</a><br>\n<a href=\"https://github.com/rails/rails/commit/67597e1719ec6af7e22964603cc77aa5b085a864\">rails/rails@`67597e`</a></p>",
+    assert_equal "<p><a href=\"https://github.com/rails/rails/pull/21862\">rails/rails#21862</a><br>\n<a href=\"https://github.com/rails/rails/issues/21843\">rails/rails#21843</a><br>\n<a href=\"https://github.com/rails/rails/commit/67597e1719ec6af7e22964603cc77aa5b085a864\">rails/rails@<code>67597e</code></a></p>",
                  result[:output].to_html
   end
 
@@ -29,4 +30,13 @@ class HTML::Pipeline::LinkifyGitHubIntegrationTest < Minitest::Test
     assert_equal "<ul>\n<li><a href=\"https://github.com/rails/rails/pull/21862\">rails/rails#21862</a></li>\n</ul>",
                  result[:output].to_html
   end
+
+  def test_preserve_tags_inside_link
+    result = pipeline.call <<-MARKDOWN.strip_heredoc
+      - [**rails/rails#21862**](https://github.com/rails/rails/pull/21862)
+    MARKDOWN
+
+    assert_equal "<ul>\n<li><a href=\"https://github.com/rails/rails/pull/21862\"><strong>rails/rails#21862</strong></a></li>\n</ul>",
+                 result[:output].to_html
+  end
 end

data/test/linkify_github_test.rb

@@ -46,7 +46,7 @@ class HTML::Pipeline::LinkifyGitHubTest < Minitest::Test
     doc  = Nokogiri::HTML::DocumentFragment.parse(body)
 
     res = filter(doc)
-    assert_equal_html %Q(<a href="#{commit_url}">rails/rails@`67597e`</a>),
+    assert_equal_html %Q(<a href="#{commit_url}">rails/rails@<code>67597e</code></a>),
                       res.to_html
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html-pipeline-linkify_github
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Juanito Fatas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html-pipeline