onebox 2.2.10 → 2.2.15

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

@@ -1,13 +1,16 @@
 # 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/")
+      matches_regexp(/^https?:\/\/(?:www\.)?(?:(?:\w)+\.)?(github)\.com(?:\/)?(?:.)*\/commit\//)
       always_https
 
       def url
@@ -17,36 +20,30 @@ 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
 
       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/engine/github_folder_onebox.rb

@@ -7,7 +7,7 @@ module Onebox
       include StandardEmbed
       include LayoutSupport
 
-      matches_regexp Regexp.new(/^https?:\/\/(?:www\.)?(?:(?:\w)+\.)?(github)\.com[\:\d]*(\/[^\/]+){2}/)
+      matches_regexp(/^https?:\/\/(?:www\.)?(?:(?:\w)+\.)?(github)\.com[\:\d]*(\/[^\/]+){2}/)
       always_https
 
       def self.priority

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
@@ -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

@@ -4,61 +4,43 @@ module Onebox
   module Engine
     class GoogleDocsOnebox
       include Engine
+      include StandardEmbed
       include LayoutSupport
 
-      def self.supported_endpoints
-        %w(spreadsheets document forms presentation)
-      end
-
-      def self.short_types
-        @shorttypes ||= {
-          spreadsheets: :sheets,
-          document: :docs,
-          presentation: :slides,
-          forms: :forms,
-        }
-      end
+      SUPPORTED_ENDPOINTS = %w(spreadsheets document forms presentation)
+      SHORT_TYPES = {
+        spreadsheets: :sheets,
+        document: :docs,
+        presentation: :slides,
+        forms: :forms,
+      }
 
-      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
+      private
 
       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
-      end
+        og_data = get_opengraph
+        short_type = SHORT_TYPES[match[:endpoint].to_sym]
 
-      def doc_type
-        @doc_type ||= match[:endpoint].to_sym
-      end
+        description = if Onebox::Helpers.blank?(og_data.description)
+          "This #{short_type.to_s.chop.capitalize} is private"
+        else
+          Onebox::Helpers.truncate(og_data.description, 250)
+        end
 
-      def shorttype
-        GoogleDocsOnebox.short_types[doc_type]
+        {
+          link: link,
+          title: og_data.title || "Google #{short_type.to_s.capitalize}",
+          description: description,
+          type: short_type
+        }
       end
 
       def match
         @match ||= @url.match(@@matcher)
       end
-
-      def get_og_data
-        response = Onebox::Helpers.fetch_response(url, redirect_limit: 10) rescue nil
-        html = Nokogiri::HTML(response)
-        og_data = {}
-        html.css('meta').each do |m|
-          if m.attribute('property') && m.attribute('property').to_s.match(/^og:/i)
-            m_content = m.attribute('content').to_s.strip
-            m_property = m.attribute('property').to_s.gsub('og:', '')
-            og_data[m_property.to_sym] = m_content
-          end
-        end
-        og_data
-      end
     end
   end
 end

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
@@ -120,8 +119,6 @@ module Onebox
           @placeholder = "https://maps.googleapis.com/maps/api/streetview?size=690x400&location=#{lon},#{lat}&pano=#{panoid}&fov=#{zoom}&heading=#{heading}&pitch=#{pitch}&sensor=false"
 
         when :canonical
-          uri = URI(@url)
-
           query = URI::decode_www_form(uri.query).to_h
           if !query.has_key?("ll")
             raise ArgumentError, "canonical url lacks location argument" unless query.has_key?("sll")
@@ -164,19 +161,24 @@ module Onebox
       end
 
       def follow_redirect!
-        uri = URI(@url)
         begin
-          http = Net::HTTP.start(uri.host, uri.port,
-            use_ssl: uri.scheme == 'https', open_timeout: timeout, read_timeout: timeout)
-          response = http.head(uri.path)
+          http = Net::HTTP.start(
+            uri.host,
+            uri.port,
+            use_ssl: uri.scheme == 'https',
+            open_timeout: timeout,
+            read_timeout: timeout
+          )
 
+          response = http.head(uri.path)
           raise "unexpected response code #{response.code}" unless %w(200 301 302).include?(response.code)
+
           @url = response.code == "200" ? uri.to_s : response["Location"]
+          @uri = URI(@url)
         ensure
           http.finish rescue nil
         end
       end
-
     end
   end
 end

data/lib/onebox/engine/google_photos_onebox.rb

@@ -11,9 +11,9 @@ module Onebox
 
       def to_html
         og = get_opengraph
-        return video_html(og) if !og.video_secure_url.nil?
-        return album_html(og) if !og.type.nil? && og.type == "google_photos:photo_album"
-        return image_html(og) if !og.image.nil?
+        return video_html(og) if og.video_secure_url
+        return album_html(og) if og.type == "google_photos:photo_album"
+        return image_html(og) if og.image
         nil
       end
 
@@ -32,7 +32,7 @@ module Onebox
               <h3><a href="#{escaped_url}" target="_blank" rel="nofollow ugc noopener">#{og.title}</a></h3>
               <div class="aspect-image-full-size">
                 <a href="#{escaped_url}" target="_blank" rel="nofollow ugc noopener">
-                  <img src="#{og.get_secure_image}" class="scale-image"/>
+                  <img src="#{og.secure_image_url}" class="scale-image"/>
                   <span class="instagram-video-icon"></span>
                 </a>
               </div>
@@ -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.secure_image_url}' #{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.secure_image_url}' #{og.title_attr} alt='Google Photos' height='#{og.image_height}' width='#{og.image_width}'>
+          </a>
+        HTML
       end
     end
   end