qiita-markdown 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 180a959e88bbb1c45168ff83dcf6c3df486f12d7
-  data.tar.gz: b7e6dff4bf6b4810ccdc14fabb1ebb8c4c081053
+  metadata.gz: 55dccd75f5d059bb287b744e1a2a8a458be40856
+  data.tar.gz: 83f59eb94a7f540e7f02ae4c7b663f2d7c3cc323
 SHA512:
-  metadata.gz: c13f02a0d3b10205576e12233a80f880ac6b540897bcc5bc7ab8eefde14a1090055dd8c452ac09bad53e5b6b85e49bef74b1aabe03e2b3df7b87bca5f4babc0e
-  data.tar.gz: 1154d125bf9c9844e61242810b3610ace6b59b197edbd925228435246f0b3a49980686d51270d50ad9966b1449aadb1bb289f81623829f7c43de60b1f6f8b66c
+  metadata.gz: e5f152b00623f29041c972b9211543a6ded0b4d4f693b96668e2fa8f596dd0b15a12878c88dd12885dc9e1192a84320dfc29b7e5d75826f1866818e2e786d2c1
+  data.tar.gz: a110e9774a5be4559477e2495511375d138ee2290fe426ce971c82c54501228c955df713edec26980848016e86de64ee4fea0074357a19c686c7f96bb8f6730f

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Unreleased
 
+## 0.4.0
+- Replace the core renderer redcarpet with greenmat, which is a fork of redcarpet.
+- Fix a bug where mentions with username including underscores (e.g. `@_username_`) was wrongly emphasized.
+
 ## 0.3.0
 - Introduce another processor Qiita::Markdown::SummaryProcessor, which is for rendering a summary of markdown document.
 

data/lib/qiita/markdown.rb

@@ -1,17 +1,17 @@
 require "active_support/core_ext/object/blank"
+require "greenmat"
 require "html/pipeline"
 require "linguist"
 require "mem"
 require "nokogiri"
 require "pygments"
-require "redcarpet"
 require "sanitize"
 
 require "qiita/markdown/filters/checkbox"
 require "qiita/markdown/filters/code"
 require "qiita/markdown/filters/footnote"
+require "qiita/markdown/filters/greenmat"
 require "qiita/markdown/filters/mention"
-require "qiita/markdown/filters/redcarpet"
 require "qiita/markdown/filters/sanitize"
 require "qiita/markdown/filters/simplify"
 require "qiita/markdown/filters/syntax_highlight"

data/lib/qiita/markdown/filters/{redcarpet.rb → greenmat.rb}

@@ -1,21 +1,22 @@
-require "redcarpet"
+require "greenmat"
 
 module Qiita
   module Markdown
     module Filters
-      class Redcarpet < HTML::Pipeline::TextFilter
+      class Greenmat < HTML::Pipeline::TextFilter
         class << self
           # Memoize.
-          # @return [Redcarpet::Markdown]
+          # @return [Greenmat::Markdown]
           def renderer
-            @renderer ||= ::Redcarpet::Markdown.new(
-              ::Redcarpet::Render::HTML.new(
+            @renderer ||= ::Greenmat::Markdown.new(
+              ::Greenmat::Render::HTML.new(
                 hard_wrap: true,
               ),
               autolink: true,
               fenced_code_blocks: true,
               footnotes: true,
               no_intra_emphasis: true,
+              no_mention_emphasis: true,
               strikethrough: true,
               tables: true,
             )

data/lib/qiita/markdown/processor.rb

@@ -6,7 +6,7 @@ module Qiita
       }
 
       DEFAULT_FILTERS = [
-        Filters::Redcarpet,
+        Filters::Greenmat,
         Filters::Footnote,
         Filters::Code,
         Filters::Checkbox,

data/lib/qiita/markdown/summary_processor.rb

@@ -5,7 +5,7 @@ module Qiita
     # specific length without breaking the document structure.
     class SummaryProcessor < Processor
       DEFAULT_FILTERS = [
-        Filters::Redcarpet,
+        Filters::Greenmat,
         Filters::Simplify,
         HTML::Pipeline::EmojiFilter,
         Filters::Mention,

data/lib/qiita/markdown/version.rb

@@ -1,5 +1,5 @@
 module Qiita
   module Markdown
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

data/qiita-markdown.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "html-pipeline"
   spec.add_dependency "mem"
   spec.add_dependency "pygments.rb"
-  spec.add_dependency "redcarpet"
+  spec.add_dependency "greenmat", ">= 3.2.0.2", "< 4"
   spec.add_dependency "rugged", ">= 0.21.1b2"
   spec.add_dependency "sanitize"
   spec.add_development_dependency "bundler", "~> 1.7"

data/spec/qiita/markdown/processor_spec.rb

@@ -274,6 +274,18 @@ describe Qiita::Markdown::Processor do
       end
     end
 
+    context "with mention to user whose name starts and ends with underscore" do
+      let(:markdown) do
+        "@_alice_"
+      end
+
+      it "does not emphasize the name" do
+        should include(<<-EOS.strip_heredoc.rstrip)
+          <a href="/_alice_" class="user-mention" title="_alice_">@_alice_</a>
+        EOS
+      end
+    end
+
     context "with allowed_usernames context" do
       before do
         context[:allowed_usernames] = ["alice"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qiita-markdown
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -95,19 +95,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: greenmat
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
@@ -228,8 +234,8 @@ files:
 - lib/qiita/markdown/filters/checkbox.rb
 - lib/qiita/markdown/filters/code.rb
 - lib/qiita/markdown/filters/footnote.rb
+- lib/qiita/markdown/filters/greenmat.rb
 - lib/qiita/markdown/filters/mention.rb
-- lib/qiita/markdown/filters/redcarpet.rb
 - lib/qiita/markdown/filters/sanitize.rb
 - lib/qiita/markdown/filters/simplify.rb
 - lib/qiita/markdown/filters/syntax_highlight.rb
@@ -262,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Qiita-specified markdown processor.
@@ -270,4 +276,3 @@ test_files:
 - spec/qiita/markdown/processor_spec.rb
 - spec/qiita/markdown/summary_processor_spec.rb
 - spec/spec_helper.rb
-has_rdoc: