tdiary-style-markdown 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b824c99bcc7050d699d17c4e8812cd3488555683
-  data.tar.gz: 49ecbb1e5c0dbf016d5a619b74f53724ab25bea9
+SHA256:
+  metadata.gz: 1c4c0647ba29b7435e29efffc592a11e7885dca1a28426458a375959118fafe3
+  data.tar.gz: d744678fe37f65b2d570d0d5f7b5f222224e82a62b73717dbb79ff3bfa219e34
 SHA512:
-  metadata.gz: 66f698b1cb223940d81722c3ba26672ae30798231b8ce6e3dfc0f39cb2a227eea01cb17206e0cc6553b09a0c0a585cce9d99c7a94f19d40c12c2ccafb46f630e
-  data.tar.gz: 11665f3157974f4c4f6bceb867f72664863b4e5e917efe27f856f409a2cfee629e88a70dac703f4e4c6217eb6df2bbfc28551ae5d8c7f9dfcfbc1294ec31e8b3
+  metadata.gz: c9b603ca9f4f3c2687c51aa49affcd7fdc1d39fed76d5d28e2f957e999bdbb72b3d0792a9727817c6735b628f050a619656e53f8a6b38821fcd88be3f8b8f882
+  data.tar.gz: a34aa52f756993863a47b38de47cfe81acf865fe2eac30e01a415054170e7f02946a73e5d638a85301711f6652ca70289bb04ec004cc904fbffe4c41963df463

data/lib/tdiary/style/markdown.rb

@@ -62,7 +62,8 @@ module TDiary
 
 				# 2. Apply markdown conversion
 				extensions = [:autolink, :table]
-				renderer = HTMLwithRouge.new(extensions: extensions)
+				options = [:HARDBREAKS, :UNSAFE]
+				renderer = HTMLwithRouge.new(options: options, extensions: extensions)
 				doc = CommonMarker.render_doc(r, :DEFAULT, extensions)
 				r = renderer.render(doc)
 
@@ -80,8 +81,12 @@ module TDiary
 				end
 
 				# 4. Convert miscellaneous
-				if pre_tag_stashes.none? && code_tag_stashes.none?
-					r = Twitter::Autolink.auto_link_usernames_or_lists(r)
+				r.gsub!(/>(.+?)</) do
+					if $1.include?("<a ")
+						">#{$1}<"
+					else
+						">#{Twitter::TwitterText::Autolink.auto_link_usernames_or_lists($1)}<"
+					end
 				end
 
 				r = r.emojify

data/lib/tdiary/style/markdown/version.rb

@@ -1,7 +1,7 @@
 module TDiary
   module Style
     module Markdown
-      VERSION = "0.5.1"
+      VERSION = "0.6.0"
     end
   end
 end

data/tdiaty-style-markdown.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'commonmarker'
   spec.add_dependency 'rouge'
-  spec.add_dependency 'twitter-text'
+  spec.add_dependency 'twitter-text', '~> 3.0.0'
   spec.add_dependency 'gemoji'
 
   spec.add_development_dependency "bundler", "~> 1.3"

data/test/tdiary/style/markdown-test.rb

@@ -322,7 +322,7 @@ p :some_code
 <h3><%= subtitle_proc( Time.at( 1041346800 ), "subTitle" ) %></h3>
 <pre class="highlight ruby"><code><span class="nb">p</span> <span class="ss">:some_code</span>
 </code></pre>
-<p>@a_matsuda is amatsuda</p>
+<p>@<a class="tweet-url username" href="https://twitter.com/a_matsuda" rel="nofollow">a_matsuda</a> is amatsuda</p>
 <%=section_leave_proc( Time.at( 1041346800 ) )%>
 </div>
       EOF
@@ -344,7 +344,105 @@ p :some_code
 <%=section_enter_proc( Time.at( 1041346800 ) )%>
 <h3><%= subtitle_proc( Time.at( 1041346800 ), "subTitle" ) %></h3>
 <p><code>:some_code</code></p>
-<p>@a_matsuda is amatsuda</p>
+<p>@<a class="tweet-url username" href="https://twitter.com/a_matsuda" rel="nofollow">a_matsuda</a> is amatsuda</p>
+<%=section_leave_proc( Time.at( 1041346800 ) )%>
+</div>
+      EOF
+      assert_equal(@html, @diary.to_html)
+    end
+
+    def test_twitter_username_with_code_and_username
+      source = <<-'EOF'
+# subTitle
+
+`:some_code` @a_matsuda is amatsuda
+      EOF
+      @diary.append(source)
+
+      @html = <<-'EOF'
+<div class="section">
+<%=section_enter_proc( Time.at( 1041346800 ) )%>
+<h3><%= subtitle_proc( Time.at( 1041346800 ), "subTitle" ) %></h3>
+<p><code>:some_code</code> @<a class="tweet-url username" href="https://twitter.com/a_matsuda" rel="nofollow">a_matsuda</a> is amatsuda</p>
+<%=section_leave_proc( Time.at( 1041346800 ) )%>
+</div>
+      EOF
+      assert_equal(@html, @diary.to_html)
+    end
+
+    def test_twitter_username_with_code_and_username_without_space
+      source = <<-'EOF'
+# subTitle
+
+`:some_code`@a_matsuda is amatsuda
+      EOF
+      @diary.append(source)
+
+      @html = <<-'EOF'
+<div class="section">
+<%=section_enter_proc( Time.at( 1041346800 ) )%>
+<h3><%= subtitle_proc( Time.at( 1041346800 ), "subTitle" ) %></h3>
+<p><code>:some_code</code>@a_matsuda is amatsuda</p>
+<%=section_leave_proc( Time.at( 1041346800 ) )%>
+</div>
+      EOF
+      assert_equal(@html, @diary.to_html)
+    end
+
+    def test_twitter_username_with_code_tag
+      source = <<-'EOF'
+# subTitle
+
+<code>@a_matsuda</code> is amatsuda
+      EOF
+      @diary.append(source)
+
+      @html = <<-'EOF'
+<div class="section">
+<%=section_enter_proc( Time.at( 1041346800 ) )%>
+<h3><%= subtitle_proc( Time.at( 1041346800 ), "subTitle" ) %></h3>
+<p><code>@a_matsuda</code> is amatsuda</p>
+<%=section_leave_proc( Time.at( 1041346800 ) )%>
+</div>
+      EOF
+      assert_equal(@html, @diary.to_html)
+    end
+
+    def test_twitter_username_in_link_text
+      source = <<-'EOF'
+# subTitle
+
+[@a_matsuda is amatsuda](https://example.com)
+      EOF
+      @diary.append(source)
+
+      @html = <<-'EOF'
+<div class="section">
+<%=section_enter_proc( Time.at( 1041346800 ) )%>
+<h3><%= subtitle_proc( Time.at( 1041346800 ), "subTitle" ) %></h3>
+<p><a href="https://example.com">@a_matsuda is amatsuda</a></p>
+<%=section_leave_proc( Time.at( 1041346800 ) )%>
+</div>
+      EOF
+      assert_equal(@html, @diary.to_html)
+    end
+
+    def test_twitter_username_in_sourcecode
+      source = <<-'EOF'
+# subTitle
+
+```ruby
+@a_matsuda = "amatsuda"
+```
+      EOF
+      @diary.append(source)
+
+      @html = <<-'EOF'
+<div class="section">
+<%=section_enter_proc( Time.at( 1041346800 ) )%>
+<h3><%= subtitle_proc( Time.at( 1041346800 ), "subTitle" ) %></h3>
+<pre class="highlight ruby"><code><span class="vi">@a_matsuda</span> <span class="o">=</span> <span class="s2">"amatsuda"</span>
+</code></pre>
 <%=section_leave_proc( Time.at( 1041346800 ) )%>
 </div>
       EOF

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdiary-style-markdown
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Kenji Okimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-25 00:00:00.000000000 Z
+date: 2018-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commonmarker
@@ -42,16 +42,16 @@ dependencies:
   name: twitter-text
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: gemoji
   requirement: !ruby/object:Gem::Requirement
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Markdown Style for tDiary