onebox 2.2.13 → 2.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee0229502d76efea853fff81a0e756e33867b7034219bb56805dcf891ab42207
-  data.tar.gz: 9e6f581f0dd784f0edb841c05f4faa785bae4cfaf4ac2c482050034ead36b912
+  metadata.gz: 0b9626bc9bec1d423e617a946df2e4be0334cf6f7693056dc79865b50f127e26
+  data.tar.gz: 9fc7c684bc99a33d356cfbf0c1a085e5dc1531aa6a6a3028670afb05406c4448
 SHA512:
-  metadata.gz: 7139dd42d40ebf30b4228c41018db4408fd53c196838c0b8d94afae27ba30d1ba258fc57fbea7ff432619f473a2e22c86b62251c094591f9a9ec90693b768655
-  data.tar.gz: 69d506c95f5fbf5526967195ce5f9c1224c1af71f72f0477063e4a8a0e59b8ab4300270cc28aae2cfc74f5e41187b3e3aed11b1656e83c0e766293eb932ca84a
+  metadata.gz: 2a3f999936fbfe289e07b58b424e735d13c2e3132beffb16c41a6094fa42aa0dd1018d544175eba1f1ad7552b26cade7096d72ff286268a097230835d8f9c99d
+  data.tar.gz: 1effdda4c94dc9dbded959fc3acf0a51d6efd09629cccd2e9c2c1df74d637c9b8cb577be7fb79dc90b3ba42125af6dfde0c56e33cb8b31f6d4a72d0090a0fded

data/lib/onebox/engine/github_commit_onebox.rb

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
+require_relative '../mixins/github_body'
+
 module Onebox
   module Engine
     class GithubCommitOnebox
       include Engine
       include LayoutSupport
       include JSON
+      include Onebox::Mixins::GithubBody
 
       matches_regexp Regexp.new("^https?://(?:www\.)?(?:(?:\w)+\.)?(github)\.com(?:/)?(?:.)*/commit/")
       always_https
@@ -27,25 +30,20 @@ module Onebox
 
       def data
         result = raw.clone
-        result['link'] = link
-        result['title'] = result['commit']['message'].split("\n").first
 
-        if result['commit']['message'].lines.count > 1
-          message = result['commit']['message'].split("\n", 2).last.strip
+        lines = result['commit']['message'].split("\n")
+        result['title'] = lines.first
+        result['body'], result['excerpt'] = compute_body(lines[1..lines.length].join("\n"))
 
-          message_words = message.gsub("\n\n", "\n").gsub("\n", "<br>").split(" ")
-          max_words = 20
-          result['message'] =  message_words[0..max_words].join(" ")
-          result['message'] += "..." if message_words.length > max_words
-          result['message'] = result['message'].gsub("<br>", "\n")
-        end
-
-        ulink = URI(link)
         committed_at = Time.parse(result['commit']['author']['date'])
         result['committed_at'] = committed_at.strftime("%I:%M%p - %d %b %y %Z")
         result['committed_at_date'] = committed_at.strftime("%F")
         result['committed_at_time'] = committed_at.strftime("%T")
+
+        result['link'] = link
+        ulink = URI(link)
         result['domain'] = "#{ulink.host}/#{ulink.path.split('/')[1]}/#{ulink.path.split('/')[2]}"
+
         result
       end
     end

data/lib/onebox/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Onebox
-  VERSION = "2.2.13"
+  VERSION = "2.2.14"
 end

data/templates/github/github_body.mustache

@@ -1,3 +1,5 @@
 {{#body}}
-  <p class="github-body-container">{{body}}{{#excerpt}}<span class="show-more-container"><a href="{{html_url}}" target="_blank" rel="noopener" class="show-more">…</a>{{/excerpt}}</span>{{#excerpt}}<span class="excerpt hidden">{{excerpt}}</span>{{/excerpt}}</p>
+  <div class="github-row">
+    <p class="github-body-container">{{body}}{{#excerpt}}<span class="show-more-container"><a href="{{html_url}}" target="_blank" rel="noopener" class="show-more">…</a>{{/excerpt}}</span>{{#excerpt}}<span class="excerpt hidden">{{excerpt}}</span>{{/excerpt}}</p>
+  </div>
 {{/body}}

data/templates/githubcommit.mustache

@@ -18,7 +18,7 @@
           <img alt="{{author.login}}" src="{{author.avatar_url}}" class="onebox-avatar-inline" width="20" height="20">
           {{author.login}}
         </a>
-        
+
       </div>
 
       <div class="lines" title="changed {{files.length}} files with {{stats.additions}} additions and {{stats.deletions}} deletions">
@@ -32,10 +32,4 @@
   </div>
 </div>
 
-
-{{#message}}
-  <div class="github-row">
-    <pre class="github-content" style="white-space: normal;">{{message}}</pre>
-  </div>
-{{/message}}
-
+{{> github/github_body}}

data/templates/githubissue.mustache

@@ -27,8 +27,6 @@
       </div>
     </div>
 
-    {{> github/github_body}}
-
     <div class='labels'>
       {{#labels}}
         <span style="display:inline-block;margin-top:2px;background-color: #B8B8B8;padding: 2px;border-radius: 4px;color: #fff;margin-left: 3px;">{{name}}</span>
@@ -36,3 +34,5 @@
     </div>
   </div>
 </div>
+
+{{> github/github_body}}

data/templates/githubpullrequest.mustache

@@ -31,7 +31,7 @@
         </a>
       </div>
     </div>
-
-    {{> github/github_body}}
   </div>
 </div>
+
+{{> github/github_body}}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 2.2.13
+  version: 2.2.14
 platform: ruby
 authors:
 - Joanna Zeta
 - Vyki Englert
 - Robin Ward
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
 date: 2021-04-15 00:00:00.000000000 Z
@@ -407,7 +407,7 @@ homepage: https://github.com/discourse/onebox
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -423,7 +423,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key:
+signing_key: 
 specification_version: 4
 summary: A gem for generating embeddable HTML previews from URLs.
 test_files: []