RubyGems - onebox - Versions diffs - 2.2.14 → 2.2.15 - Mend

onebox 2.2.14 → 2.2.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (49) hide show

checksums.yaml +4 -4
data/lib/onebox/engine.rb +6 -10
data/lib/onebox/engine/allowlisted_generic_onebox.rb +0 -9
data/lib/onebox/engine/amazon_onebox.rb +23 -16
data/lib/onebox/engine/flickr_onebox.rb +2 -2
data/lib/onebox/engine/gfycat_onebox.rb +26 -26
data/lib/onebox/engine/github_commit_onebox.rb +1 -1
data/lib/onebox/engine/github_folder_onebox.rb +1 -1
data/lib/onebox/engine/google_docs_onebox.rb +22 -40
data/lib/onebox/engine/google_maps_onebox.rb +10 -6
data/lib/onebox/engine/google_photos_onebox.rb +6 -6
data/lib/onebox/engine/imgur_onebox.rb +2 -2
data/lib/onebox/engine/instagram_onebox.rb +2 -3
data/lib/onebox/engine/pastebin_onebox.rb +11 -15
data/lib/onebox/engine/pdf_onebox.rb +7 -15
data/lib/onebox/engine/pubmed_onebox.rb +16 -12
data/lib/onebox/engine/stack_exchange_onebox.rb +1 -1
data/lib/onebox/engine/standard_embed.rb +0 -3
data/lib/onebox/engine/trello_onebox.rb +3 -6
data/lib/onebox/engine/youku_onebox.rb +0 -6
data/lib/onebox/helpers.rb +2 -1
data/lib/onebox/layout.rb +2 -14
data/lib/onebox/matcher.rb +10 -8
data/lib/onebox/mixins/git_blob_onebox.rb +3 -5
data/lib/onebox/open_graph.rb +4 -4
data/lib/onebox/preview.rb +2 -2
data/lib/onebox/version.rb +1 -1
data/templates/_layout.mustache +6 -2
data/templates/allowlistedgeneric.mustache +8 -9
data/templates/amazon.mustache +5 -2
data/templates/githubblob.mustache +44 -34
data/templates/githubcommit.mustache +1 -3
data/templates/githubfolder.mustache +2 -2
data/templates/githubgist.mustache +9 -6
data/templates/githubissue.mustache +3 -3
data/templates/githubpullrequest.mustache +1 -1
data/templates/gitlabblob.mustache +11 -4
data/templates/googledocs.mustache +2 -2
data/templates/googledrive.mustache +2 -2
data/templates/googleplayapp.mustache +2 -1
data/templates/instagram.mustache +1 -1
data/templates/pastebin.mustache +6 -2
data/templates/pdf.mustache +6 -3
data/templates/stackexchange.mustache +1 -0
data/templates/twitterstatus.mustache +20 -5
data/templates/wikimedia.mustache +2 -2
data/templates/wikipedia.mustache +2 -2
data/templates/xkcd.mustache +2 -2
metadata +2 -2

data/lib/onebox/engine/google_photos_onebox.rb CHANGED Viewed

@@ -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>
@@ -53,7 +53,7 @@ module Onebox
                   <span class='album-title'>#{Onebox::Helpers.truncate(album_title, 80)}</span>
                 </span>
               </span>
-              <img src='#{og.get_secure_image}' #{og.title_attr} height='#{og.image_height}' width='#{og.image_width}'>
+              <img src='#{og.secure_image_url}' #{og.title_attr} height='#{og.image_height}' width='#{og.image_width}'>
             </a>
           </div>
         HTML
@@ -64,7 +64,7 @@ module Onebox
         <<-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}'>
+            <img src='#{og.secure_image_url}' #{og.title_attr} alt='Google Photos' height='#{og.image_height}' width='#{og.image_width}'>
           </a>
         HTML
       end

data/lib/onebox/engine/imgur_onebox.rb CHANGED Viewed

@@ -40,7 +40,7 @@ module Onebox
                     <span class='album-title'>#{album_title}</span>
                   </span>
                 </span>
-                <img src='#{og.get_secure_image}' #{og.title_attr} height='#{og.image_height}' width='#{og.image_width}'>
+                <img src='#{og.secure_image_url}' #{og.title_attr} height='#{og.image_height}' width='#{og.image_width}'>
               </a>
             </div>
           HTML
@@ -58,7 +58,7 @@ module Onebox
         <<-HTML
             <a href='#{escaped_url}' target='_blank' rel='noopener' class="onebox">
-              <img src='#{og.get_secure_image.chomp("?fb")}' #{og.title_attr} alt='Imgur'>
+              <img src='#{og.secure_image_url.chomp("?fb")}' #{og.title_attr} alt='Imgur'>
             </a>
           HTML
       end

data/lib/onebox/engine/instagram_onebox.rb CHANGED Viewed

@@ -18,9 +18,8 @@ module Onebox
         oembed = get_oembed
         raise "No oEmbed data found. Ensure 'facebook_app_access_token' is valid" if oembed.data.empty?
-        permalink = clean_url.gsub("/#{oembed.author_name}/", "/")
-        { link: permalink,
+        {
+          link: clean_url.gsub("/#{oembed.author_name}/", "/"),
           title: "@#{oembed.author_name}",
           image: oembed.thumbnail_url,
           description: Onebox::Helpers.truncate(oembed.title, 250),

data/lib/onebox/engine/pastebin_onebox.rb CHANGED Viewed

@@ -30,29 +30,25 @@ module Onebox
       end
       def lines
-        return @lines if @lines
+        return @lines if defined?(@lines)
         response = Onebox::Helpers.fetch_response("http://pastebin.com/raw/#{paste_key}", redirect_limit: 1) rescue ""
         @lines = response.split("\n")
       end
       def paste_key
-        if uri.path =~ /\/raw\//
-          match = uri.path.match(/\/raw\/([^\/]+)/)
-          return match[1] if match && match[1]
-        elsif uri.path =~ /\/download\//
-          match = uri.path.match(/\/download\/([^\/]+)/)
-          return match[1] if match && match[1]
-        elsif uri.path =~ /\/embed\//
-          match = uri.path.match(/\/embed\/([^\/]+)/)
-          return match[1] if match && match[1]
+        regex = case uri
+                when /\/raw\//
+                  /\/raw\/([^\/]+)/
+                when /\/download\//
+                  /\/download\/([^\/]+)/
+                when /\/embed\//
+                  /\/embed\/([^\/]+)/
         else
-          match = uri.path.match(/\/([^\/]+)/)
-          return match[1] if match && match[1]
+                  /\/([^\/]+)/
         end
-        nil
-      rescue
-        nil
+        match = uri.path.match(regex)
+        match[1] if match && match[1]
       end
     end
   end

data/lib/onebox/engine/pdf_onebox.rb CHANGED Viewed

@@ -12,25 +12,17 @@ module Onebox
       private
       def data
-        pdf_info = get_pdf_info
-        raise "Unable to read pdf file: #{@url}" if pdf_info.nil?
+        begin
+          size = Onebox::Helpers.fetch_content_length(@url)
+        rescue
+          raise "Unable to read pdf file: #{@url}"
+        end
-        result = { link: link,
-                   title: pdf_info[:name],
-                   filesize: pdf_info[:filesize]
-                  }
-        result
-      end
-      def get_pdf_info
-        uri = URI.parse(@url)
-        size = Onebox::Helpers.fetch_content_length(@url)
         {
+          link: link,
+          title: File.basename(uri.path),
           filesize: size ? Onebox::Helpers.pretty_filesize(size.to_i) : nil,
-          name: File.basename(uri.path)
         }
-      rescue
-        nil
       end
     end
   end

data/lib/onebox/engine/pubmed_onebox.rb CHANGED Viewed

@@ -10,13 +10,14 @@ module Onebox
       private
-      def get_xml
+      def xml
+        return @xml if defined?(@xml)
         doc = Nokogiri::XML(URI.open(URI.join(@url, "?report=xml&format=text")))
         pre = doc.xpath("//pre")
-        Nokogiri::XML("<root>" + pre.text + "</root>")
+        @xml = Nokogiri::XML("<root>" + pre.text + "</root>")
       end
-      def authors_of_xml(xml)
+      def authors
         initials = xml.css("Initials").map { |x| x.content }
         last_names = xml.css("LastName").map { |x| x.content }
         author_list = (initials.zip(last_names)).map { |i, l| i + " " + l }
@@ -27,22 +28,25 @@ module Onebox
         author_list.join(", ")
       end
-      def date_of_xml(xml)
-        date_arr = (xml.css("PubDate").children).map { |x| x.content }
-        date_arr = date_arr.select { |s| !s.match(/^\s+$/) }
-        date_arr = (date_arr.map { |s| s.split }).flatten
-        date_arr.sort.reverse.join(" ") # Reverse sort so month before year.
+      def date
+        xml.css("PubDate")
+          .children
+          .map { |x| x.content }
+          .select { |s| !s.match(/^\s+$/) }
+          .map { |s| s.split }
+          .flatten
+          .sort
+          .reverse
+          .join(" ") # Reverse sort so month before year.
       end
       def data
-        xml = get_xml
         {
           title: xml.css("ArticleTitle").text,
-          authors: authors_of_xml(xml),
+          authors: authors,
           journal: xml.css("Title").text,
           abstract: xml.css("AbstractText").text,
-          date: date_of_xml(xml),
+          date: date,
           link: @url,
           pmid: match[:pmid]
         }

data/lib/onebox/engine/stack_exchange_onebox.rb CHANGED Viewed

@@ -25,7 +25,7 @@ module Onebox
       end
       def url
-        domain = URI(@url).host
+        domain = uri.host
         question_id = match[:question_id]
         answer_id = match[:answer_id2] || match[:answer_id1]

data/lib/onebox/engine/standard_embed.rb CHANGED Viewed

@@ -7,7 +7,6 @@ require 'onebox/oembed'
 module Onebox
   module Engine
     module StandardEmbed
       def self.oembed_providers
         @@oembed_providers ||= {}
       end
@@ -117,8 +116,6 @@ module Onebox
         "{}"
       end
-      protected
       def get_oembed_url
         oembed_url = nil

data/lib/onebox/engine/trello_onebox.rb CHANGED Viewed

@@ -11,12 +11,11 @@ module Onebox
       always_https
       def to_html
-        link = "https://trello.com/#{match[:type]}/#{match[:key]}.html"
+        src = "https://trello.com/#{match[:type]}/#{match[:key]}.html"
         height = match[:type] == 'b' ? 400 : 200
         <<-HTML
-          <iframe src="#{link}" width="100%" height="#{height}" frameborder="0" style="border:0"></iframe>
+          <iframe src="#{src}" width="100%" height="#{height}" frameborder="0" style="border:0"></iframe>
         HTML
       end
@@ -25,12 +24,10 @@ module Onebox
       end
       private
       def match
         return @match if defined?(@match)
         @match = @url.match(%{trello\.com/(?<type>[^/]+)/(?<key>[^/]+)/?\W*})
-        @match
       end
     end
   end

data/lib/onebox/engine/youku_onebox.rb CHANGED Viewed

@@ -30,12 +30,6 @@ module Onebox
           ></iframe>
         HTML
       end
-      private
-      def uri
-        @_uri ||= URI(@url)
-      end
     end
   end
 end

data/lib/onebox/helpers.rb CHANGED Viewed

@@ -90,7 +90,8 @@ module Onebox
           code = response.code.to_i
           unless code === 200
-            response.error! unless [301, 302].include?(code)
+            response.error! unless [301, 302, 303, 307, 308].include?(code)
             return fetch_response(
               response['location'],
               redirect_limit: redirect_limit - 1,

data/lib/onebox/layout.rb CHANGED Viewed

@@ -32,19 +32,7 @@ module Onebox
     private
     def uri
-      @uri = URI(link)
-    end
-    def checksum
-      @md5.hexdigest("#{VERSION}:#{link}")
-    end
-    def link
-      ::Onebox::Helpers.normalize_url_for_output(record[:link])
-    end
-    def domain
-      record[:domain] || URI(link || '').host.to_s.sub(/^www\./, '')
+      @uri ||= URI(::Onebox::Helpers.normalize_url_for_output(record[:link]))
     end
     def details
@@ -52,7 +40,7 @@ module Onebox
         link: record[:link],
         title: record[:title],
         favicon: record[:favicon],
-        domain: domain,
+        domain: record[:domain] || uri.host.to_s.sub(/^www\./, ''),
         article_published_time: record[:article_published_time],
         article_published_time_title: record[:article_published_time_title],
         metadata_1_label: record[:metadata_1_label],

data/lib/onebox/matcher.rb CHANGED Viewed

@@ -2,8 +2,12 @@
 module Onebox
   class Matcher
-    def initialize(link, options = {})
-      @url = link
+    def initialize(url, options = {})
+      begin
+        @uri = URI(url)
+      rescue URI::InvalidURIError
+      end
       @options = options
     end
@@ -14,12 +18,10 @@ module Onebox
     end
     def oneboxed
-      uri = URI(@url)
-      return unless uri.port.nil? || Onebox.options.allowed_ports.include?(uri.port)
-      return unless uri.scheme.nil? || Onebox.options.allowed_schemes.include?(uri.scheme)
-      ordered_engines.find { |engine| engine === uri && has_allowed_iframe_origins?(engine) }
-    rescue URI::InvalidURIError
-      nil
+      return if @uri.nil?
+      return if @uri.port && !Onebox.options.allowed_ports.include?(@uri.port)
+      return if @uri.scheme && !Onebox.options.allowed_schemes.include?(@uri.scheme)
+      ordered_engines.find { |engine| engine === @uri && has_allowed_iframe_origins?(engine) }
     end
     def has_allowed_iframe_origins?(engine)

data/lib/onebox/mixins/git_blob_onebox.rb CHANGED Viewed

@@ -25,8 +25,8 @@ module Onebox
       }
       module InstanceMethods
-        def initialize(link, timeout = nil)
-          super link, timeout
+        def initialize(url, timeout = nil)
+          super url, timeout
           # merge engine options from global Onebox.options interface
           # self.options = Onebox.options["GithubBlobOnebox"] #  self.class.name.split("::").last.to_s
           # self.options = Onebox.options[self.class.name.split("::").last.to_s] #We can use this a more generic approach. extract the engine class name automatically
@@ -163,11 +163,9 @@ module Onebox
             @file = m[:file]
             @lang = Onebox::FileTypeFinder.from_file_name(m[:file])
-            if @lang == "stl" && link.match(/^https?:\/\/(www\.)?github\.com.*\/blob\//)
+            if @lang == "stl" && link.match?(/^https?:\/\/(www\.)?github\.com.*\/blob\//)
               @model_file = @lang.dup
               @raw = "https://render.githubusercontent.com/view/solid?url=" + self.raw_template(m)
             else
               contents = URI.open(self.raw_template(m), read_timeout: timeout).read

data/lib/onebox/open_graph.rb CHANGED Viewed

@@ -17,10 +17,10 @@ module Onebox
       !title.nil? ? "title='#{title}'" : ""
     end
-    def get_secure_image
-      secure_link = URI(get(:image))
-      secure_link.scheme = 'https'
-      secure_link.to_s
+    def secure_image_url
+      secure_url = URI(get(:image))
+      secure_url.scheme = 'https'
+      secure_url.to_s
     end
     def method_missing(attr, *args, &block)

data/lib/onebox/preview.rb CHANGED Viewed

@@ -6,8 +6,8 @@ module Onebox
     client_exception = defined?(Net::HTTPClientException) ? Net::HTTPClientException : Net::HTTPServerException
     WEB_EXCEPTIONS ||= [client_exception, OpenURI::HTTPError, Timeout::Error, Net::HTTPError, Errno::ECONNREFUSED]
-    def initialize(link, options = Onebox.options)
-      @url = link
+    def initialize(url, options = Onebox.options)
+      @url = url
       @options = options.dup
       allowed_origins = @options[:allowed_iframe_origins] || Onebox::Engine.all_iframe_origins

data/lib/onebox/version.rb CHANGED Viewed

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

data/templates/_layout.mustache CHANGED Viewed

@@ -3,19 +3,23 @@
     {{#favicon}}
       <img src="{{favicon}}" class="site-icon"/>
     {{/favicon}}
     {{#article_published_time}}
-      <a href="{{link}}" target='_blank' rel='noopener' title="{{article_published_time_title}}">{{domain}} &ndash; {{article_published_time}}</a>
+      <a href="{{link}}" target="_blank" rel="noopener" title="{{article_published_time_title}}">{{domain}} &ndash; {{article_published_time}}</a>
     {{/article_published_time}}
     {{^article_published_time}}
-      <a href="{{link}}" target='_blank' rel='noopener'>{{domain}}</a>
+      <a href="{{link}}" target="_blank" rel="noopener">{{domain}}</a>
     {{/article_published_time}}
   </header>
   <article class="onebox-body">
     {{{view}}}
   </article>
   <div class="onebox-metadata">
     {{#metadata_1_label}}<span style="float: left;">{{metadata_1_label}}: {{metadata_1_value}}</span>{{/metadata_1_label}}
     {{#metadata_2_label}}<span style="float: right;">{{metadata_2_label}}: {{metadata_2_value}}</span>{{/metadata_2_label}}
   </div>
   <div style="clear: both"></div>
 </aside>

data/templates/allowlistedgeneric.mustache CHANGED Viewed

@@ -1,17 +1,16 @@
 {{#image}}<img src="{{image}}" class="thumbnail"/>{{/image}}
-<h3><a href='{{link}}' target="_blank" rel="noopener">{{title}}</a></h3>
+<h3><a href="{{link}}" target="_blank" rel="noopener">{{title}}</a></h3>
 {{#description}}
-<p>{{description}}</p>
+  <p>{{description}}</p>
 {{/description}}
 {{#data_1}}
-  <p><span class="label1">{{label_1}}: {{data_1}}</span>
-  {{#data_2}}
-    <span class="label2">{{label_2}}: {{data_2}}</span></p>
-  {{/data_2}}
-  {{^data_2}}
-    </p>
-  {{/data_2}}
+  <p>
+    <span class="label1">{{label_1}}: {{data_1}}</span>
+    {{#data_2}}
+      <span class="label2">{{label_2}}: {{data_2}}</span>
+    {{/data_2}}
+  </p>
 {{/data_1}}