onebox 2.2.8 → 2.2.13

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
@@ -31,6 +36,9 @@ module Onebox
 
         ulink = URI(link)
         result['domain'] = "#{ulink.host}/#{ulink.path.split('/')[1]}/#{ulink.path.split('/')[2]}"
+
+        result['body'], result['excerpt'] = compute_body(result['body'])
+
         result
       end
     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

data/lib/onebox/engine/google_calendar_onebox.rb

@@ -5,7 +5,7 @@ module Onebox
     class GoogleCalendarOnebox
       include Engine
 
-      matches_regexp /^(https?:)?\/\/((www|calendar)\.google\.[\w.]{2,}|goo\.gl)\/calendar\/.+$/
+      matches_regexp(/^(https?:)?\/\/((www|calendar)\.google\.[\w.]{2,}|goo\.gl)\/calendar\/.+$/)
       always_https
       requires_iframe_origins "https://calendar.google.com"
 

data/lib/onebox/engine/google_docs_onebox.rb

@@ -19,19 +19,19 @@ module Onebox
         }
       end
 
-      matches_regexp /^(https?:)?\/\/(docs\.google\.com)\/(?<endpoint>(#{supported_endpoints.join('|')}))\/d\/((?<key>[\w-]*)).+$/
+      matches_regexp(/^(https?:)?\/\/(docs\.google\.com)\/(?<endpoint>(#{supported_endpoints.join('|')}))\/d\/((?<key>[\w-]*)).+$/)
       always_https
 
       protected
 
       def data
         og_data = get_og_data
-        result = { link: link,
-                   title: og_data[:title] || "Google #{shorttype.to_s.capitalize}",
-                   description: Onebox::Helpers.truncate(og_data[:description], 250) || "This #{shorttype.to_s.chop.capitalize} is private",
-                   type: shorttype
-                 }
-        result
+        {
+          link: link,
+          title: og_data[:title] || "Google #{shorttype.to_s.capitalize}",
+          description: Onebox::Helpers.truncate(og_data[:description], 250) || "This #{shorttype.to_s.chop.capitalize} is private",
+          type: shorttype
+        }
       end
 
       def doc_type
@@ -47,7 +47,7 @@ module Onebox
       end
 
       def get_og_data
-        response = Onebox::Helpers.fetch_response(url, 10) rescue nil
+        response = Onebox::Helpers.fetch_response(url, redirect_limit: 10) rescue nil
         html = Nokogiri::HTML(response)
         og_data = {}
         html.css('meta').each do |m|

data/lib/onebox/engine/google_drive_onebox.rb

@@ -7,7 +7,7 @@ module Onebox
       include StandardEmbed
       include LayoutSupport
 
-      matches_regexp /^(https?:)?\/\/(drive\.google\.com)\/file\/d\/(?<key>[\w-]*)\/.+$/
+      matches_regexp(/^(https?:)?\/\/(drive\.google\.com)\/file\/d\/(?<key>[\w-]*)\/.+$/)
       always_https
 
       protected
@@ -18,12 +18,12 @@ module Onebox
         title = "#{og_data.title} (video)" if og_data.type =~ /^video[\/\.]/
         description = og_data.description || "Google Drive file."
 
-        result = { link: link,
-                   title: title,
-                   description: Onebox::Helpers.truncate(description, 250),
-                   image: og_data.image
-                 }
-        result
+        {
+          link: link,
+          title: title,
+          description: Onebox::Helpers.truncate(description, 250),
+          image: og_data.image
+        }
       end
     end
   end

data/lib/onebox/engine/google_maps_onebox.rb

@@ -22,7 +22,6 @@ module Onebox
       end
 
       always_https
-
       requires_iframe_origins("https://maps.google.com", "https://google.com")
 
       # Matches shortened Google Maps URLs
@@ -176,7 +175,6 @@ module Onebox
           http.finish rescue nil
         end
       end
-
     end
   end
 end

data/lib/onebox/engine/google_photos_onebox.rb

@@ -46,27 +46,27 @@ module Onebox
         album_title = og.description.nil? ? og.title : "[#{og.description}] #{og.title}"
 
         <<-HTML
-            <div class='onebox google-photos-album'>
-              <a href='#{escaped_url}' target='_blank' rel='noopener'>
-                <span class='outer-box' style='width:#{og.image_width}px'>
-                  <span class='inner-box'>
-                    <span class='album-title'>#{Onebox::Helpers.truncate(album_title, 80)}</span>
-                  </span>
+          <div class='onebox google-photos-album'>
+            <a href='#{escaped_url}' target='_blank' rel='noopener'>
+              <span class='outer-box' style='width:#{og.image_width}px'>
+                <span class='inner-box'>
+                  <span class='album-title'>#{Onebox::Helpers.truncate(album_title, 80)}</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='Google Photos' 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='Google Photos' height='#{og.image_height}' width='#{og.image_width}'>
+          </a>
+        HTML
       end
     end
   end

data/lib/onebox/engine/google_play_app_onebox.rb

@@ -11,24 +11,20 @@ module Onebox
         MAX_DESCRIPTION_CHARS: 500
       }
 
-      matches_regexp Regexp.new("^https?://play\\.(?:(?:\\w)+\\.)?(google)\\.com(?:/)?/store/apps/")
+      matches_regexp(/^https?:\/\/play\.(?:(?:\w)+\.)?(google)\.com(?:\/)?\/store\/apps\//)
       always_https
 
       private
 
       def data
         price = raw.css("meta[itemprop=price]").first["content"] rescue "Free"
-        result = {
+        {
           link: link,
           title: raw.css("meta[property='og:title']").first["content"].gsub(" - Apps on Google Play", ""),
           image: ::Onebox::Helpers.normalize_url_for_output(raw.css("meta[property='og:image']").first["content"]),
           description: raw.css("meta[name=description]").first["content"][0..DEFAULTS[:MAX_DESCRIPTION_CHARS]].chop + "...",
-          price: price
+          price: price == "0" ? "Free" : price
         }
-        if result[:price] == "0"
-          result[:price] = "Free"
-        end
-        result
       end
     end
   end

data/lib/onebox/engine/html.rb

@@ -11,7 +11,11 @@ module Onebox
       end
 
       def raw
-        @raw ||= Onebox::Helpers.fetch_html_doc(url, http_params)
+        @raw ||= Onebox::Helpers.fetch_html_doc(url, http_params, body_cacher)
+      end
+
+      def body_cacher
+        self.options&.[](:body_cacher)
       end
 
       def html?

data/lib/onebox/engine/instagram_onebox.rb

@@ -36,10 +36,10 @@ module Onebox
 
       def get_oembed_url
         if access_token != ''
-          oembed_url = "https://graph.facebook.com/v9.0/instagram_oembed?url=#{clean_url}&access_token=#{access_token}"
+          "https://graph.facebook.com/v9.0/instagram_oembed?url=#{clean_url}&access_token=#{access_token}"
         else
           # The following is officially deprecated by Instagram, but works in some limited circumstances.
-          oembed_url = "https://api.instagram.com/oembed/?url=#{clean_url}"
+          "https://api.instagram.com/oembed/?url=#{clean_url}"
         end
       end
     end

data/lib/onebox/engine/kaltura_onebox.rb

@@ -14,7 +14,7 @@ module Onebox
         og = get_opengraph
 
         <<~HTML
-          <img src="#{og.image_secure_url}" width="#{og.video_width}" height="#{og.video_height}" >
+          <img src="#{og.image_secure_url}" width="#{og.video_width}" height="#{og.video_height}">
         HTML
       end
 
@@ -22,11 +22,13 @@ module Onebox
         og = get_opengraph
 
         <<~HTML
-          <iframe src="#{og.video_secure_url}"
-                  width="#{og.video_width}" height="#{og.video_height}"
-                  frameborder='0'
-                  allowfullscreen >
-          </iframe>
+          <iframe
+            src="#{og.video_secure_url}"
+            width="#{og.video_width}"
+            height="#{og.video_height}"
+            frameborder='0'
+            allowfullscreen
+          ></iframe>
         HTML
       end
     end

data/lib/onebox/engine/opengraph_image.rb

@@ -8,7 +8,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/pastebin_onebox.rb

@@ -31,7 +31,7 @@ module Onebox
 
       def lines
         return @lines if @lines
-        response = Onebox::Helpers.fetch_response("http://pastebin.com/raw/#{paste_key}", 1) rescue ""
+        response = Onebox::Helpers.fetch_response("http://pastebin.com/raw/#{paste_key}", redirect_limit: 1) rescue ""
         @lines = response.split("\n")
       end
 

data/lib/onebox/engine/pubmed_onebox.rb

@@ -6,7 +6,7 @@ module Onebox
       include Engine
       include LayoutSupport
 
-      matches_regexp Regexp.new("^https?://(?:(?:\\w)+\\.)?(www.ncbi.nlm.nih)\\.gov(?:/)?/pubmed/\\d+")
+      matches_regexp(/^https?:\/\/(?:(?:\w)+\.)?(www.ncbi.nlm.nih)\.gov(?:\/)?\/pubmed\/\d+/)
 
       private
 
@@ -35,7 +35,8 @@ module Onebox
       end
 
       def data
-        xml = get_xml()
+        xml = get_xml
+
         {
           title: xml.css("ArticleTitle").text,
           authors: authors_of_xml(xml),

data/lib/onebox/engine/replit_onebox.rb

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

data/lib/onebox/engine/sketchfab_onebox.rb

@@ -15,20 +15,20 @@ module Onebox
         src = og.video_url.gsub("autostart=1", "")
 
         <<-HTML
-          <iframe src="#{src}"
-                  width="#{og.video_width}"
-                  height="#{og.video_height}"
-                  scrolling="no"
-                  frameborder="0"
-                  allowfullscreen>
-          </iframe>
+          <iframe
+            src="#{src}"
+            width="#{og.video_width}"
+            height="#{og.video_height}"
+            scrolling="no"
+            frameborder="0"
+            allowfullscreen
+          ></iframe>
         HTML
       end
 
       def placeholder_html
         "<img src='#{get_opengraph.image}'>"
       end
-
     end
   end
 end

data/lib/onebox/engine/slides_onebox.rb

@@ -11,15 +11,16 @@ module Onebox
 
       def to_html
         <<-HTML
-          <iframe src="https://slides.com#{uri.path}/embed?style=light"
-                  width="576"
-                  height="420"
-                  scrolling="no"
-                  frameborder="0"
-                  webkitallowfullscreen
-                  mozallowfullscreen
-                  allowfullscreen>
-          </iframe>
+          <iframe
+            src="https://slides.com#{uri.path}/embed?style=light"
+            width="576"
+            height="420"
+            scrolling="no"
+            frameborder="0"
+            webkitallowfullscreen
+            mozallowfullscreen
+            allowfullscreen
+          ></iframe>
         HTML
       end
 
@@ -27,7 +28,6 @@ module Onebox
         escaped_src = ::Onebox::Helpers.normalize_url_for_output(raw[:image])
         "<img src='#{escaped_src}'>"
       end
-
     end
   end
 end

data/lib/onebox/engine/soundcloud_onebox.rb

@@ -28,7 +28,6 @@ module Onebox
         oembed_url += "&maxheight=166" unless url["/sets/"]
         oembed_url
       end
-
     end
   end
 end

data/lib/onebox/engine/stack_exchange_onebox.rb

@@ -37,7 +37,7 @@ module Onebox
       end
 
       def data
-        return @data if @data
+        return @data if defined?(@data)
 
         result = raw['items'][0]
         if result
@@ -48,6 +48,7 @@ module Onebox
           result['is_answer'] = result.key?('answer_id')
           result['is_question'] = result.key?('question_id')
         end
+
         @data = result
       end
     end

data/lib/onebox/engine/standard_embed.rb

@@ -37,7 +37,7 @@ module Onebox
       end
 
       def raw
-        return @raw if @raw
+        return @raw if defined?(@raw)
 
         og = get_opengraph
         twitter = get_twitter
@@ -67,7 +67,7 @@ module Onebox
       protected
 
       def html_doc
-        return @html_doc if @html_doc
+        return @html_doc if defined?(@html_doc)
 
         headers = nil
         headers = { 'Cookie' => options[:cookie] } if options[:cookie]

data/lib/onebox/engine/steam_store_onebox.rb

@@ -28,11 +28,12 @@ module Onebox
         escaped_src = ::Onebox::Helpers.normalize_url_for_output(iframe_url)
 
         <<-HTML
-          <iframe src='#{escaped_src}'
-                  frameborder='0'
-                  width='100%'
-                  height='190'>
-          </iframe>
+          <iframe
+            src='#{escaped_src}'
+            frameborder='0'
+            width='100%'
+            height='190'
+          ></iframe>
         HTML
       end
     end