onebox 2.2.12 → 2.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdbe1e67e709c8a2c8179a7118f4b51447a15a1bf1b56619fc601d3a9486123e
-  data.tar.gz: 8a72a7fc2152789c4103de330b7dcd69ec9a9c487fdc499a6068bdd0840e2e26
+  metadata.gz: ee0229502d76efea853fff81a0e756e33867b7034219bb56805dcf891ab42207
+  data.tar.gz: 9e6f581f0dd784f0edb841c05f4faa785bae4cfaf4ac2c482050034ead36b912
 SHA512:
-  metadata.gz: 3fe9a20e93b0aea3a3a7362bb5e9f026ddb63ab0c7edb64f5b7a1d9831fa76d001314ea0fdf07c92daefe95fc096e8068d28e3e6f5c7860689e5545646031084
-  data.tar.gz: 4e2e19424dab311c7a56feec82486333520f72575f95acccd1a11b8419616d2ea895e02472542d6bcdce7c5d6fbf72f887eab3941f67dd546762349bec3b66a9
+  metadata.gz: 7139dd42d40ebf30b4228c41018db4408fd53c196838c0b8d94afae27ba30d1ba258fc57fbea7ff432619f473a2e22c86b62251c094591f9a9ec90693b768655
+  data.tar.gz: 69d506c95f5fbf5526967195ce5f9c1224c1af71f72f0477063e4a8a0e59b8ab4300270cc28aae2cfc74f5e41187b3e3aed11b1656e83c0e766293eb932ca84a

data/.rspec

@@ -1,5 +1 @@
 --color
---format documentation
---fail-fast
---backtrace
-

data/lib/onebox/engine.rb

@@ -136,7 +136,7 @@ module Onebox
       end
 
       def always_https?
-        @https
+        defined?(@https) ? @https : false
       end
     end
   end

data/lib/onebox/engine/allowlisted_generic_onebox.rb

@@ -374,15 +374,17 @@ module Onebox
         escaped_image_src = ::Onebox::Helpers.normalize_url_for_output(data[:image])
 
         <<-HTML
-            <video title='#{data[:title]}'
-                   width='#{data[:video_width]}'
-                   height='#{data[:video_height]}'
-                   style='max-width:100%'
-                   poster='#{escaped_image_src}'
-                   controls=''>
-              <source src='#{escaped_video_src}'>
-            </video>
-          HTML
+          <video
+            title='#{data[:title]}'
+            width='#{data[:video_width]}'
+            height='#{data[:video_height]}'
+            style='max-width:100%'
+            poster='#{escaped_image_src}'
+            controls=''
+          >
+            <source src='#{escaped_video_src}'>
+          </video>
+        HTML
       end
 
       def embedded_html

data/lib/onebox/engine/amazon_onebox.rb

@@ -14,6 +14,8 @@ module Onebox
       matches_regexp(/^https?:\/\/(?:www\.)?(?:smile\.)?(amazon|amzn)\.(?<tld>com|ca|de|it|es|fr|co\.jp|co\.uk|cn|in|com\.br|com\.mx|nl|pl|sa|sg|se|com\.tr|ae)\//)
 
       def url
+        @raw ||= nil
+
         # If possible, fetch the cached HTML body immediately so we can
         # try to grab the canonical URL from that document,
         # rather than guess at the best URL structure to use
@@ -36,7 +38,7 @@ module Onebox
       end
 
       def tld
-        @tld || @@matcher.match(@url)["tld"]
+        @tld ||= @@matcher.match(@url)["tld"]
       end
 
       def http_params

data/lib/onebox/engine/asciinema_onebox.rb

@@ -7,7 +7,6 @@ module Onebox
       include StandardEmbed
 
       always_https
-
       matches_regexp(/^https?:\/\/asciinema\.org\/a\/[\p{Alnum}_\-]+$/)
 
       def to_html

data/lib/onebox/engine/audioboom_onebox.rb

@@ -13,14 +13,17 @@ module Onebox
         oembed = get_oembed
 
         <<-HTML
-          <img src="#{oembed.thumbnail_url}" style="max-width: #{oembed.width}px; max-height: #{oembed.height}px;" #{oembed.title_attr}>
+          <img
+            src="#{oembed.thumbnail_url}"
+            style="max-width: #{oembed.width}px; max-height: #{oembed.height}px;"
+            #{oembed.title_attr}
+          >
         HTML
       end
 
       def to_html
         get_oembed.html
       end
-
     end
   end
 end

data/lib/onebox/engine/bandcamp_onebox.rb

@@ -20,16 +20,16 @@ module Onebox
         escaped_src = og.video_secure_url || og.video
 
         <<-HTML
-          <iframe src="#{escaped_src}"
-                  width="#{og.video_width}"
-                  height="#{og.video_height}"
-                  scrolling="no"
-                  frameborder="0"
-                  allowfullscreen>
-          </iframe>
+          <iframe
+            src="#{escaped_src}"
+            width="#{og.video_width}"
+            height="#{og.video_height}"
+            scrolling="no"
+            frameborder="0"
+            allowfullscreen
+          ></iframe>
         HTML
       end
-
     end
   end
 end

data/lib/onebox/engine/cloudapp_onebox.rb

@@ -25,28 +25,28 @@ module Onebox
 
       def link_html(og)
         <<-HTML
-            <a href='#{og.url}' target='_blank' rel='noopener'>
-              #{og.title}
-            </a>
-          HTML
+          <a href='#{og.url}' target='_blank' rel='noopener'>
+            #{og.title}
+          </a>
+        HTML
       end
 
       def video_html(og)
         direct_src = ::Onebox::Helpers.normalize_url_for_output("#{og.get(:url)}/#{og.title}")
 
         <<-HTML
-            <video width='480' height='360' #{og.title_attr} controls loop>
-              <source src='#{direct_src}' type='video/mp4'>
-            </video>
-          HTML
+          <video width='480' height='360' #{og.title_attr} controls loop>
+            <source src='#{direct_src}' type='video/mp4'>
+          </video>
+        HTML
       end
 
       def image_html(og)
         <<-HTML
-            <a href='#{og.url}' target='_blank' class='onebox' rel='noopener'>
-              <img src='#{og.image}' #{og.title_attr} alt='CloudApp' width='480'>
-            </a>
-          HTML
+          <a href='#{og.url}' target='_blank' class='onebox' rel='noopener'>
+            <img src='#{og.image}' #{og.title_attr} alt='CloudApp' width='480'>
+          </a>
+        HTML
       end
     end
   end

data/lib/onebox/engine/coub_onebox.rb

@@ -17,7 +17,6 @@ module Onebox
       def to_html
         get_oembed.html
       end
-
     end
   end
 end

data/lib/onebox/engine/facebook_media_onebox.rb

@@ -14,13 +14,14 @@ module Onebox
         metadata = get_twitter
         if metadata.present? && metadata[:card] == "player" && metadata[:player].present?
           <<-HTML
-            <iframe src="#{metadata[:player]}"
-                    width="#{metadata[:player_width]}"
-                    height="#{metadata[:player_height]}"
-                    scrolling="no"
-                    frameborder="0"
-                    allowfullscreen>
-            </iframe>
+            <iframe
+              src="#{metadata[:player]}"
+              width="#{metadata[:player_width]}"
+              height="#{metadata[:player_height]}"
+              scrolling="no"
+              frameborder="0"
+              allowfullscreen
+            ></iframe>
           HTML
         else
           html = Onebox::Engine::AllowlistedGenericOnebox.new(@url, @timeout).to_html

data/lib/onebox/engine/five_hundred_px_onebox.rb

@@ -13,7 +13,6 @@ module Onebox
         og = get_opengraph
         "<img src='#{og.image}' width='#{og.image_width}' height='#{og.image_height}' class='onebox' #{og.title_attr}>"
       end
-
     end
   end
 end

data/lib/onebox/engine/flickr_onebox.rb

@@ -25,29 +25,28 @@ module Onebox
         album_title = "[Album] #{og.title}"
 
         <<-HTML
-            <div class='onebox flickr-album'>
-              <a href='#{escaped_url}' target='_blank' rel='noopener'>
-                <span class='outer-box' style='max-width:#{og.image_width}px'>
-                  <span class='inner-box'>
-                    <span class='album-title'>#{album_title}</span>
-                  </span>
+          <div class='onebox flickr-album'>
+            <a href='#{escaped_url}' target='_blank' rel='noopener'>
+              <span class='outer-box' style='max-width:#{og.image_width}px'>
+                <span class='inner-box'>
+                  <span class='album-title'>#{album_title}</span>
                 </span>
-                <img src='#{og.get_secure_image}' #{og.title_attr} height='#{og.image_height}' width='#{og.image_width}'>
-              </a>
-            </div>
-          HTML
+              </span>
+              <img src='#{og.get_secure_image}' #{og.title_attr} height='#{og.image_height}' width='#{og.image_width}'>
+            </a>
+          </div>
+        HTML
       end
 
       def image_html(og)
         escaped_url = ::Onebox::Helpers.normalize_url_for_output(url)
 
         <<-HTML
-            <a href='#{escaped_url}' target='_blank' rel='noopener' class="onebox">
-              <img src='#{og.get_secure_image}' #{og.title_attr} alt='Imgur' height='#{og.image_height}' width='#{og.image_width}'>
-            </a>
-          HTML
+          <a href='#{escaped_url}' target='_blank' rel='noopener' class="onebox">
+            <img src='#{og.get_secure_image}' #{og.title_attr} alt='Imgur' height='#{og.image_height}' width='#{og.image_width}'>
+          </a>
+        HTML
       end
-
     end
   end
 end

data/lib/onebox/engine/giphy_onebox.rb

@@ -18,7 +18,6 @@ module Onebox
           </a>
         HTML
       end
-
     end
   end
 end

data/lib/onebox/engine/github_blob_onebox.rb

@@ -8,17 +8,21 @@ module Onebox
       def self.git_regexp
         /^https?:\/\/(www\.)?github\.com.*\/blob\//
       end
+
       def self.onebox_name
         "githubblob"
       end
 
       include Onebox::Mixins::GitBlobOnebox
+
       def raw_regexp
         /github\.com\/(?<user>[^\/]+)\/(?<repo>[^\/]+)\/blob\/(?<sha1>[^\/]+)\/(?<file>[^#]+)(#(L(?<from>[^-]*)(-L(?<to>.*))?))?/mi
       end
+
       def raw_template(m)
         "https://raw.githubusercontent.com/#{m[:user]}/#{m[:repo]}/#{m[:sha1]}/#{m[:file]}"
       end
+
       def title
         Sanitize.fragment(Onebox::Helpers.uri_unencode(link).sub(/^https?\:\/\/github\.com\//, ''))
       end

data/lib/onebox/engine/github_commit_onebox.rb

@@ -17,11 +17,10 @@ module Onebox
       private
 
       def match
-        return @match if @match
+        return @match if defined?(@match)
 
         @match = @url.match(%{github\.com/(?<owner>[^/]+)/(?<repository>[^/]+)/commit/(?<sha>[^/]+)})
-
-        @match = @url.match(%{github\.com/(?<owner>[^/]+)/(?<repository>[^/]+)/pull/(?<pr>[^/]+)/commit/(?<sha>[^/]+)}) if @match.nil?
+        @match ||= @url.match(%{github\.com/(?<owner>[^/]+)/(?<repository>[^/]+)/pull/(?<pr>[^/]+)/commit/(?<sha>[^/]+)})
 
         @match
       end

data/lib/onebox/engine/github_gist_onebox.rb

@@ -9,7 +9,7 @@ module Onebox
 
       MAX_FILES = 3
 
-      matches_regexp Regexp.new("^http(?:s)?://gist\\.(?:(?:\\w)+\\.)?(github)\\.com(?:/)?")
+      matches_regexp(/^http(?:s)?:\/\/gist\.(?:(?:\w)+\.)?(github)\.com(?:\/)?/)
       always_https
 
       def url
@@ -76,7 +76,6 @@ module Onebox
           @lines ||= @json["content"].split("\n")
         end
       end
-
     end
   end
 end

data/lib/onebox/engine/github_issue_onebox.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative '../mixins/github_body'
+
 module Onebox
   module Engine
     class GithubIssueOnebox
@@ -7,7 +9,9 @@ module Onebox
       include Engine
       include LayoutSupport
       include JSON
-      matches_regexp Regexp.new("^https?:\/\/(?:www\.)?(?:(?:\w)+\.)?github\.com\/(?<org>.+)\/(?<repo>.+)\/issues\/([[:digit:]]+)")
+      include Onebox::Mixins::GithubBody
+
+      matches_regexp(/^https?:\/\/(?:www\.)?(?:(?:\w)+\.)?github\.com\/(?<org>.+)\/(?<repo>.+)\/issues\/([[:digit:]]+)/)
       always_https
 
       def url
@@ -22,32 +26,26 @@ module Onebox
       end
 
       def data
-        @raw ||= ::MultiJson.load(URI.open(url, "Accept" => "application/vnd.github.v3.text+json", read_timeout: timeout)) #custom Accept header so we can get body as text.
-        body_text = @raw["body_text"]
-
-        content_words = body_text.gsub("\n\n", "\n").gsub("\n", "<br>").split(" ") #one pass of removing double newline, then we change \n to <br> and later on we revert it back to \n this is a workaround to avoid losing newlines after we join it back.
-        max_words = 20
-        short_content =  content_words[0..max_words].join(" ")
-        short_content += "..." if content_words.length > max_words
-
-        created_at = Time.parse(@raw['created_at'])
-        closed_at = Time.parse(@raw['closed_at']) if @raw['closed_at']
-
+        created_at = Time.parse(raw['created_at'])
+        closed_at = Time.parse(raw['closed_at']) if raw['closed_at']
+        body, excerpt = compute_body(raw['body'])
         ulink = URI(link)
+
         {
           link: @url,
-          title: @raw["title"],
-          content: short_content.gsub("<br>", "\n"),
-          labels: @raw["labels"],
-          user: @raw['user'],
+          title: raw["title"],
+          body: body,
+          excerpt: excerpt,
+          labels: raw["labels"],
+          user: raw['user'],
           created_at: created_at.strftime("%I:%M%p - %d %b %y %Z"),
           created_at_date: created_at.strftime("%F"),
           created_at_time: created_at.strftime("%T"),
           closed_at: closed_at&.strftime("%I:%M%p - %d %b %y %Z"),
           closed_at_date: closed_at&.strftime("%F"),
           closed_at_time: closed_at&.strftime("%T"),
-          closed_by: @raw['closed_by'],
-          avatar: "https://avatars1.githubusercontent.com/u/#{@raw['user']['id']}?v=2&s=96",
+          closed_by: raw['closed_by'],
+          avatar: "https://avatars1.githubusercontent.com/u/#{raw['user']['id']}?v=2&s=96",
           domain: "#{ulink.host}/#{ulink.path.split('/')[1]}/#{ulink.path.split('/')[2]}",
         }
       end

data/lib/onebox/engine/github_pullrequest_onebox.rb

@@ -1,13 +1,18 @@
 # frozen_string_literal: true
 
+require_relative '../mixins/github_body'
+
 module Onebox
   module Engine
     class GithubPullRequestOnebox
       include Engine
       include LayoutSupport
       include JSON
+      include Onebox::Mixins::GithubBody
+
+      GITHUB_COMMENT_REGEX = /(<!--.*?-->\r\n)/
 
-      matches_regexp Regexp.new("^https?://(?:www\\.)?(?:(?:\\w)+\\.)?(github)\\.com(?:/)?(?:.)*/pull/")
+      matches_regexp(/^https?:\/\/(?:www\.)?(?:(?:\w)+\.)?(github)\.com(?:\/)?(?:.)*\/pull/)
       always_https
 
       def url
@@ -20,7 +25,6 @@ module Onebox
         @match ||= @url.match(%r{github\.com/(?<owner>[^/]+)/(?<repository>[^/]+)/pull/(?<number>[^/]+)})
       end
 
-      GITHUB_COMMENT_REGEX = /(<!--.*?-->\r\n)/
       def data
         result = raw.clone
         result['link'] = link
@@ -33,8 +37,7 @@ module Onebox
         ulink = URI(link)
         result['domain'] = "#{ulink.host}/#{ulink.path.split('/')[1]}/#{ulink.path.split('/')[2]}"
 
-        body = (result['body'] || '').gsub(GITHUB_COMMENT_REGEX, '')
-        result['body'] = body.present? ? body : nil
+        result['body'], result['excerpt'] = compute_body(result['body'])
 
         result
       end

data/lib/onebox/engine/gitlab_blob_onebox.rb

@@ -8,17 +8,21 @@ module Onebox
       def self.git_regexp
         /^https?:\/\/(www\.)?gitlab\.com.*\/blob\//
       end
+
       def self.onebox_name
         "gitlabblob"
       end
 
       include Onebox::Mixins::GitBlobOnebox
+
       def raw_regexp
         /gitlab\.com\/(?<user>[^\/]+)\/(?<repo>[^\/]+)\/blob\/(?<sha1>[^\/]+)\/(?<file>[^#]+)(#(L(?<from>[^-]*)(-L(?<to>.*))?))?/mi
       end
+
       def raw_template(m)
         "https://gitlab.com/#{m[:user]}/#{m[:repo]}/raw/#{m[:sha1]}/#{m[:file]}"
       end
+
       def title
         Sanitize.fragment(Onebox::Helpers.uri_unencode(link).sub(/^https?\:\/\/gitlab\.com\//, ''))
       end