git-commit-mailer 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c8f402644de43c9b76f2631aef1603d127d3f12
-  data.tar.gz: 8306e844d78ee136b1d499f9b9a73d033dcf83c5
+  metadata.gz: 50d31e3b90e4835ed78e0fa0ce384d0a49923ec0
+  data.tar.gz: 2f1ed65269c3bb8ca435994a888e2a505e30000e
 SHA512:
-  metadata.gz: f1a33c639872bbc62c88c86cc4300bba9e6e4e9dcb8c6c32f1acfd619c43dbfc9d3258862a0619d9372f3369e890595f0a9378a56fe7e7dd2deb021673d9085a
-  data.tar.gz: 223867affd7a3ab35163af1d1528cb19d9c2ad480dd3d0f3d7c2a29ac1dcc76dfe881d1177cd203b842e167ad5671ffeb02391b620a89824e73707abf32674f9
+  metadata.gz: 4f16915e4b9a8110cff707dfec33a6f7bcc7a70cfd08085f8c8afd9a9f36a7644eba3bf2ff4ef2cd9cc626e709467f240a314c8777ad9df3d822326ecaa58161
+  data.tar.gz: 3ebf21638075b42e1c4b7d02bd2e4a00599ebb9f22b65b90c45d31345f6927b47d782aa633af36faf9982a255f422324e0117af5b00ad03347e242f562dda248

data/.gitignore

@@ -2,3 +2,4 @@
 /Gemfile.lock
 /vendor/
 /test/tmp/
+/pkg/

data/doc/text/news.md

@@ -1,5 +1,19 @@
 # News
 
+## 1.0.2 - 2015-06-09 {#version-1-0-2}
+
+GitHub support improvement release!
+
+### Improvements
+
+  * Supported GitHub mention link by `@XXX` form in commit message.
+  * Supported GitHub commit link by `HHHHHHH` form in commit message.
+
+### Fixes
+
+  * Fixed a bug that single quote in commit message is treated as
+    GitHub issue link.
+
 ## 1.0.1 - 2015-06-09 {#version-1-0-1}
 
 GitHub support improvement release!

data/lib/git-commit-mailer/html-mail-body-formatter.rb

@@ -214,19 +214,59 @@ class GitCommitMailer
     def format_summary(summary)
       case @mailer.repository_browser
       when "github"
-        linked_summary = h(summary).gsub(/\#(\d+)/) do
-          %Q(<a href="#{github_issue_url($1)}">\##{$1}</a>)
-        end
-        pre(linked_summary)
+        format_summary_github(summary)
       else
         pre(h(summary))
       end
     end
 
+    GITHUB_MARKUP_PATTERN_ISSUE = /\#\d+/
+    GITHUB_MARKUP_PATTERN_COMMIT = /[\da-fA-F]{7,}/
+    GITHUB_MARKUP_PATTERN_MENTION = /@[\da-zA-Z\-]+/
+    def format_summary_github(summary)
+      formatted_summary = summary.gsub(/
+                                         ['&\"<>]|
+                                         #{GITHUB_MARKUP_PATTERN_ISSUE}|
+                                         #{GITHUB_MARKUP_PATTERN_COMMIT}|
+                                         #{GITHUB_MARKUP_PATTERN_MENTION}
+                                       /x) do |matched|
+        case matched
+        when /\A#{GITHUB_MARKUP_PATTERN_ISSUE}\z/
+          issue_number = matched.gsub(/\A\#/, "")
+          tag("a",
+              {
+                "href" => github_issue_url(issue_number),
+              },
+              h(matched))
+        when /\A#{GITHUB_MARKUP_PATTERN_COMMIT}\z/
+          revision = matched
+          tag("a",
+              {
+                "href" => commit_url_github(revision),
+              },
+              h(matched))
+        when /\A#{GITHUB_MARKUP_PATTERN_MENTION}\z/
+          user_name = matched.gsub(/\A@/, "")
+          tag("a",
+              {
+                "href" => user_url_github(user_name),
+              },
+              h(matched))
+        else
+          h(matched)
+        end
+      end
+      pre(formatted_summary)
+    end
+
     def github_issue_url(id)
       "#{@mailer.github_base_url}/#{@mailer.github_user}/#{@mailer.github_repository}/issues/#{id}"
     end
 
+    def user_url_github(name)
+      "#{@mailer.github_base_url}/#{name}"
+    end
+
     def tag_start(name, attributes)
       start_tag = "<#{name}"
       unless attributes.empty?

data/lib/git-commit-mailer/mail-body-formatter.rb

@@ -31,12 +31,8 @@ class GitCommitMailer
     def commit_url
       case @mailer.repository_browser
       when "github"
-        user = @mailer.github_user
-        repository = @mailer.github_repository
-        return nil if user.nil? or repository.nil?
-        base_url = @mailer.github_base_url
         revision = @info.revision
-        "#{base_url}/#{user}/#{repository}/commit/#{revision}"
+        commit_url_github(revision)
       when "github-wiki"
         file = (@info.updated_files + @info.added_files).first
         commit_file_url_github_wiki(file)
@@ -49,6 +45,15 @@ class GitCommitMailer
       end
     end
 
+    def commit_url_github(revision)
+      user = @mailer.github_user
+      repository = @mailer.github_repository
+      return nil if user.nil? or repository.nil?
+
+      base_url = @mailer.github_base_url
+      "#{base_url}/#{user}/#{repository}/commit/#{revision}"
+    end
+
     def commit_file_url_github_wiki(file)
       return nil if file.nil?
 

data/lib/git-commit-mailer/version.rb

@@ -1,4 +1,4 @@
 class GitCommitMailer
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
   URL = "https://github.com/clear-code/git-commit-mailer"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-commit-mailer
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ryo Onodera