qiita-markdown 0.11.2 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c616ac60e98b103ea1923bfb61a2b8dba81a8360
-  data.tar.gz: 4437c013d34d01d707597071dc8881e70d095c43
+  metadata.gz: 30c863a25be5728522fd0748c93b43e52671a87e
+  data.tar.gz: 27b24fc7b69ab3e61b3e47548d398c737ac8b40e
 SHA512:
-  metadata.gz: 39edeccac9b7c4b68c7f2d098753e188869fefe42f0ed8e999775d7db4cd05015943db2f64452c7d4341bbafeb4d1c1f31fed606a3c0264d3002d36809e4ba51
-  data.tar.gz: 91c31e3751ccae3c4f248ea74e1aaed8a9126d0b8eda1949042e196ee3d9b56f9fc091dd09afed92a68da6f6c190df5a0de143467eb19d441e1358cf2851860c
+  metadata.gz: 51f484782bbbd640d5f0f985bf494280f0b7e28f0b82ab88a0983a8c24f8b201278d780a090afede93c1a99bcd299506c2787333ac8bc2bee194bbc89a7c2ead
+  data.tar.gz: 362eed29b7aa60c05900135593163d3def6dbc2d47a42c509259a50bf2772198cbffdc7da9141c630f45caee8ea7ecd1e1e592c1a96c039ec3d791b319ee1594

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.11.3
+- Ignore menton in blockquote element
+
 ## 0.11.2
 - Support video element on `SCRIPTABLE_RULE`
 

data/lib/qiita/markdown/filters/mention.rb

@@ -6,6 +6,8 @@ module Qiita
       #
       # You can pass :allowed_usernames context to limit mentioned usernames.
       class Mention < HTML::Pipeline::MentionFilter
+        IGNORE_PARENTS = ::HTML::Pipeline::MentionFilter::IGNORE_PARENTS + Set["blockquote"]
+
         MentionPattern = /
           (?:^|\W)
           @((?>[\w][\w-]{0,30}\w(?:@github)?))
@@ -18,6 +20,21 @@ module Qiita
           )
         /ix
 
+        # @note Override to use another IGNORE_PARENTS
+        def call
+          result[:mentioned_usernames] ||= []
+
+          doc.search(".//text()").each do |node|
+            content = node.to_html
+            next unless content.include?("@")
+            next if has_ancestor?(node, IGNORE_PARENTS)
+            html = mention_link_filter(content, base_url, info_url, username_pattern)
+            next if html == content
+            node.replace(html)
+          end
+          doc
+        end
+
         # @note Override to use customized MentionPattern and allowed_usernames logic.
         def mention_link_filter(text, _, _, _)
           text.gsub(MentionPattern) do |match|

data/lib/qiita/markdown/version.rb

@@ -1,5 +1,5 @@
 module Qiita
   module Markdown
-    VERSION = "0.11.2"
+    VERSION = "0.11.3"
   end
 end

data/spec/qiita/markdown/processor_spec.rb

@@ -345,6 +345,20 @@ describe Qiita::Markdown::Processor do
       end
     end
 
+    context "with mention in blockquote" do
+      let(:markdown) do
+        "> @alice"
+      end
+
+      it "does not replace mention with link" do
+        should include(<<-EOS.strip_heredoc.rstrip)
+          <blockquote>
+          <p>@alice</p>
+          </blockquote>
+        EOS
+      end
+    end
+
     context "with mention to user whose name starts and ends with underscore" do
       let(:markdown) do
         "@_alice_"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qiita-markdown
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.3
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2016-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gemoji