onebox 2.2.12 → 2.2.13

data/lib/onebox/engine/vimeo_onebox.rb

@@ -25,14 +25,16 @@ module Onebox
         end
         video_src = "https://player.vimeo.com/video/#{video_id}"
         video_src = video_src.gsub('autoplay=1', '').chomp("?")
+
         <<-HTML
-          <iframe width="#{WIDTH}"
-                  height="#{HEIGHT}"
-                  src="#{video_src}"
-                  data-original-href="#{link}"
-                  frameborder="0"
-                  allowfullscreen>
-          </iframe>
+          <iframe
+            width="#{WIDTH}"
+            height="#{HEIGHT}"
+            src="#{video_src}"
+            data-original-href="#{link}"
+            frameborder="0"
+            allowfullscreen
+          ></iframe>
         HTML
       end
 

data/lib/onebox/engine/wikimedia_onebox.rb

@@ -7,7 +7,7 @@ module Onebox
       include LayoutSupport
       include JSON
 
-      matches_regexp /^https?:\/\/commons\.wikimedia\.org\/wiki\/(File:.+)/
+      matches_regexp(/^https?:\/\/commons\.wikimedia\.org\/wiki\/(File:.+)/)
       always_https
 
       def self.priority
@@ -38,7 +38,6 @@ module Onebox
           thumbnail: first_page['imageinfo'].first['thumburl']
         }
       end
-
     end
   end
 end

data/lib/onebox/engine/wikipedia_onebox.rb

@@ -16,10 +16,10 @@ module Onebox
         paras = []
         text = ""
 
-        # Detect section Hash in the url and retrive the related paragraphs.  if no hash provided the first few paragraphs will be used
+        # Detect section Hash in the url and retrive the related paragraphs. if no hash provided the first few paragraphs will be used
         # Author Lidlanca
         # Date 9/8/2014
-        if (m_url_hash = @url.match(/#([^\/?]+)/)) #extract url hash
+        if (m_url_hash = @url.match(/#([^\/?]+)/)) # extract url hash
           m_url_hash_name = m_url_hash[1]
         end
 
@@ -27,17 +27,17 @@ module Onebox
           section_header_title = raw.xpath("//span[@id='#{m_url_hash_name}']")
 
           if section_header_title.empty?
-            paras = raw.search("p") #default get all the paras
+            paras = raw.search("p") # default get all the paras
           else
             section_title_text = section_header_title.inner_text
-            section_header = section_header_title[0].parent #parent element of the section span element should be an <h3> node
+            section_header = section_header_title[0].parent # parent element of the section span element should be an <h3> node
             cur_element = section_header
 
-            # p|text|div covers the general case. We assume presence of atleast 1 P node. if section has no P node we may end up with a P node from the next section.
+            # p|text|div covers the general case. We assume presence of at least 1 P node. if section has no P node we may end up with a P node from the next section.
             # div tag is commonly used as an assets wraper in an article section. often as the first element holding an image.
             # ul support will imporve the output generated for a section with a list as the main content (for example: an Author Bibliography, A musician Discography, etc)
             first_p_found = nil
-            while (((next_sibling = cur_element.next_sibling).name =~ /p|text|div|ul/) || first_p_found.nil?) do  #from section header get the next sibling until it is a breaker tag
+            while (((next_sibling = cur_element.next_sibling).name =~ /p|text|div|ul/) || first_p_found.nil?) do  # from section header get the next sibling until it is a breaker tag
               cur_element = next_sibling
               if (cur_element.name == "p" || cur_element.name == "ul") #we treat a list as we detect a p to avoid showing
                 first_p_found = true
@@ -46,7 +46,7 @@ module Onebox
             end
           end
         else # no hash found in url
-          paras = raw.search("p") #default get all the paras
+          paras = raw.search("p") # default get all the paras
         end
 
         unless paras.empty?
@@ -55,7 +55,7 @@ module Onebox
             break if cnt >= paras.size
             text += " " unless cnt == 0
 
-            if paras[cnt].name == "ul" #Handle UL tag. Generate a textual ordered list (1.item | 2.item | 3.item). Unfourtently no newline allowed in output
+            if paras[cnt].name == "ul" # Handle UL tag. Generate a textual ordered list (1.item | 2.item | 3.item). Unfortunately no newline allowed in output
               li_index = 1
               list_items = []
               paras[cnt].children.css("li").each { |li| list_items.push "#{li_index}." + li.inner_text ; li_index += 1 }
@@ -69,13 +69,17 @@ module Onebox
             cnt += 1
           end
         end
+
         text = "#{text[0..Onebox::LayoutSupport.max_text]}..." if text.length > Onebox::LayoutSupport.max_text
+
         result = {
           link: link,
           title: raw.css("html body h1").inner_text + (section_title_text ? " | " + section_title_text : ""),  #if a section sub title exists add it to the main article title
           description: text
         }
+
         img = raw.css(".image img")
+
         if img && img.size > 0
           img.each do |i|
             src = i["src"]

data/lib/onebox/engine/youku_onebox.rb

@@ -21,12 +21,13 @@ module Onebox
 
       def to_html
         <<~HTML
-          <iframe src="https://player.youku.com/embed/#{video_id}"
-                  width="640"
-                  height="430"
-                  frameborder='0'
-                  allowfullscreen>
-          </iframe>
+          <iframe
+            src="https://player.youku.com/embed/#{video_id}"
+            width="640"
+            height="430"
+            frameborder='0'
+            allowfullscreen
+          ></iframe>
         HTML
       end
 
@@ -35,7 +36,6 @@ module Onebox
       def uri
         @_uri ||= URI(@url)
       end
-
     end
   end
 end

data/lib/onebox/engine/youtube_onebox.rb

@@ -51,21 +51,23 @@ module Onebox
       def to_html
         if video_id
           <<-HTML
-            <iframe width="#{WIDTH}"
-                    height="#{HEIGHT}"
-                    src="https://www.youtube.com/embed/#{video_id}?#{embed_params}"
-                    frameborder="0"
-                    allowfullscreen>
-            </iframe>
+            <iframe
+              src="https://www.youtube.com/embed/#{video_id}?#{embed_params}"
+              width="#{WIDTH}"
+              height="#{HEIGHT}"
+              frameborder="0"
+              allowfullscreen
+            ></iframe>
           HTML
         elsif list_id
           <<-HTML
-            <iframe width="#{WIDTH}"
-                    height="#{HEIGHT}"
-                    src="https://www.youtube.com/embed/videoseries?list=#{list_id}&wmode=transparent&rel=0&autohide=1&showinfo=1&enablejsapi=1"
-                    frameborder="0"
-                    allowfullscreen>
-            </iframe>
+            <iframe
+              src="https://www.youtube.com/embed/videoseries?list=#{list_id}&wmode=transparent&rel=0&autohide=1&showinfo=1&enablejsapi=1"
+              width="#{WIDTH}"
+              height="#{HEIGHT}"
+              frameborder="0"
+              allowfullscreen
+            ></iframe>
           HTML
         else
           # for channel pages
@@ -166,7 +168,6 @@ module Onebox
       rescue
         {}
       end
-
     end
   end
 end

data/lib/onebox/file_type_finder.rb

@@ -2,7 +2,6 @@
 
 module Onebox
   module FileTypeFinder
-
     # In general, most of file extension names would be recognized
     # by Highlights.js.  However, some need to be checked in other
     # ways, either because they just aren't included, because they

data/lib/onebox/helpers.rb

@@ -127,10 +127,10 @@ module Onebox
 
         http.request_head([uri.path, uri.query].join("?")) do |response|
           code = response.code.to_i
-          unless code === 200 || Onebox::Helpers.blank?(response.header['content-length'])
+          unless code === 200 || Onebox::Helpers.blank?(response.content_length)
             return nil
           end
-          return response.header['content-length']
+          return response.content_length
         end
       end
     end

data/lib/onebox/mixins/git_blob_onebox.rb

@@ -33,6 +33,10 @@ module Onebox
 
           self.options = DEFAULTS
 
+          @selected_lines_array = nil
+          @selected_one_liner = 0
+          @model_file = nil
+
           # Define constant after merging options set in Onebox.options
           # We can define constant automatically.
           options.each_pair do |constant_name, value|
@@ -47,8 +51,6 @@ module Onebox
         end
 
         private
-        @selected_lines_array = nil
-        @selected_one_liner = 0
 
         def calc_range(m, contents_lines_size)
           truncated = false
@@ -150,7 +152,7 @@ module Onebox
         end
 
         def raw
-          return @raw if @raw
+          return @raw if defined?(@raw)
 
           m = @url.match(self.raw_regexp)
 

data/lib/onebox/mixins/github_body.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Onebox
+  module Mixins
+    module GithubBody
+      def self.included(klass)
+        klass.include(Onebox::Engine)
+        klass.include(InstanceMethods)
+      end
+
+      module InstanceMethods
+        GITHUB_COMMENT_REGEX = /(<!--.*?-->\r\n)/
+        MAX_BODY_LENGTH = 80
+        def compute_body(body)
+          body = body.dup
+          excerpt = nil
+
+          body = (body || '').gsub(GITHUB_COMMENT_REGEX, '')
+          body = body.length > 0 ? body : nil
+          if body && body.length > MAX_BODY_LENGTH
+            excerpt = body[MAX_BODY_LENGTH..body.length].rstrip
+            body = body[0..MAX_BODY_LENGTH - 1]
+          end
+
+          [body, excerpt]
+        end
+      end
+    end
+  end
+end

data/lib/onebox/mixins/twitch_onebox.rb

@@ -3,7 +3,6 @@
 module Onebox
   module Mixins
     module TwitchOnebox
-
       def self.included(klass)
         klass.include(Onebox::Engine)
         klass.matches_regexp(klass.twitch_regexp)

data/lib/onebox/preview.rb

@@ -2,7 +2,6 @@
 
 module Onebox
   class Preview
-
     # see https://bugs.ruby-lang.org/issues/14688
     client_exception = defined?(Net::HTTPClientException) ? Net::HTTPClientException : Net::HTTPServerException
     WEB_EXCEPTIONS ||= [client_exception, OpenURI::HTTPError, Timeout::Error, Net::HTTPError, Errno::ECONNREFUSED]
@@ -85,7 +84,7 @@ module Onebox
 
     def engine
       return nil unless @engine_class
-      return @engine if @engine
+      return @engine if defined?(@engine)
 
       @engine = @engine_class.new(@url)
       @engine.options = @options

data/lib/onebox/version.rb

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

data/templates/github/github_body.mustache

@@ -0,0 +1,3 @@
+{{#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>
+{{/body}}

data/templates/githubissue.mustache

@@ -26,15 +26,13 @@
         </a>
       </div>
     </div>
-  </div>
-</div>
 
-<div class="github-row">
-  <p class='github-content'>{{content}}</p>
-</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>
-  {{/labels}}
+    <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>
+      {{/labels}}
+    </div>
+  </div>
 </div>

data/templates/githubpullrequest.mustache

@@ -4,22 +4,9 @@
   </div>
 
   <div class="github-info-container">
-    {{^body}}
-      <h4>
-        <a href="{{html_url}}" target="_blank" rel="noopener">{{title}}</a>
-      </h4>
-    {{/body}}
-
-    {{#body}}
-      <details class="onebox-details">
-        <summary class="onebox-details-summary">
-          <h4>
-            <a href="{{html_url}}" target="_blank" rel="noopener">{{title}}</a>
-          </h4>
-        </summary>
-        <p class="onebox-details-body">{{body}}</p>
-      </details>
-    {{/body}}
+    <h4>
+      <a href="{{html_url}}" target="_blank" rel="noopener">{{title}}</a>
+    </h4>
 
     <div class="branches">
       <code>{{base.label}}</code> ← <code>{{head.label}}</code>
@@ -45,5 +32,6 @@
       </div>
     </div>
 
+    {{> github/github_body}}
   </div>
 </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 2.2.12
+  version: 2.2.13
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-12 00:00:00.000000000 Z
+date: 2021-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -367,6 +367,7 @@ files:
 - lib/onebox/layout_support.rb
 - lib/onebox/matcher.rb
 - lib/onebox/mixins/git_blob_onebox.rb
+- lib/onebox/mixins/github_body.rb
 - lib/onebox/mixins/twitch_onebox.rb
 - lib/onebox/oembed.rb
 - lib/onebox/open_graph.rb
@@ -382,6 +383,7 @@ files:
 - templates/_layout.mustache
 - templates/allowlistedgeneric.mustache
 - templates/amazon.mustache
+- templates/github/github_body.mustache
 - templates/githubblob.mustache
 - templates/githubcommit.mustache
 - templates/githubfolder.mustache