onebox 1.8.68 → 1.8.69

data/lib/onebox/engine/standard_embed.rb

@@ -53,77 +53,77 @@ module Onebox
 
       protected
 
-        def html_doc
-          return @html_doc if @html_doc
+      def html_doc
+        return @html_doc if @html_doc
 
-          headers = nil
-          headers = { 'Cookie' => options[:cookie] } if options[:cookie]
+        headers = nil
+        headers = { 'Cookie' => options[:cookie] } if options[:cookie]
 
-          @html_doc = Onebox::Helpers.fetch_html_doc(url, headers)
-        end
+        @html_doc = Onebox::Helpers.fetch_html_doc(url, headers)
+      end
 
-        def get_oembed
-          oembed_url = nil
+      def get_oembed
+        oembed_url = nil
 
-          StandardEmbed.oembed_providers.each do |regexp, endpoint|
-            if url =~ regexp
-              oembed_url = "#{endpoint}?url=#{url}"
-              break
-            end
+        StandardEmbed.oembed_providers.each do |regexp, endpoint|
+          if url =~ regexp
+            oembed_url = "#{endpoint}?url=#{url}"
+            break
           end
+        end
 
-          if html_doc
-            if Onebox::Helpers.blank?(oembed_url)
-              application_json = html_doc.at("//link[@type='application/json+oembed']/@href")
-              oembed_url = application_json.value if application_json
-            end
+        if html_doc
+          if Onebox::Helpers.blank?(oembed_url)
+            application_json = html_doc.at("//link[@type='application/json+oembed']/@href")
+            oembed_url = application_json.value if application_json
+          end
 
-            if Onebox::Helpers.blank?(oembed_url)
-              text_json = html_doc.at("//link[@type='text/json+oembed']/@href")
-              oembed_url ||= text_json.value if text_json
-            end
+          if Onebox::Helpers.blank?(oembed_url)
+            text_json = html_doc.at("//link[@type='text/json+oembed']/@href")
+            oembed_url ||= text_json.value if text_json
           end
+        end
 
-          return {} if Onebox::Helpers.blank?(oembed_url)
+        return {} if Onebox::Helpers.blank?(oembed_url)
 
-          json_response = Onebox::Helpers.fetch_response(oembed_url) rescue "{}"
-          oe = Onebox::Helpers.symbolize_keys(::MultiJson.load(json_response))
+        json_response = Onebox::Helpers.fetch_response(oembed_url) rescue "{}"
+        oe = Onebox::Helpers.symbolize_keys(::MultiJson.load(json_response))
 
-          # never use oembed from WordPress 4.4 (it's broken)
-          oe.delete(:html) if oe[:html] && oe[:html]["wp-embedded-content"]
+        # never use oembed from WordPress 4.4 (it's broken)
+        oe.delete(:html) if oe[:html] && oe[:html]["wp-embedded-content"]
 
-          oe
-        rescue Errno::ECONNREFUSED, Net::HTTPError, Net::HTTPFatalError, MultiJson::LoadError
-          {}
-        end
+        oe
+      rescue Errno::ECONNREFUSED, Net::HTTPError, Net::HTTPFatalError, MultiJson::LoadError
+        {}
+      end
 
-        def get_opengraph
-          ::Onebox::Helpers.extract_opengraph(html_doc)
-        end
+      def get_opengraph
+        ::Onebox::Helpers.extract_opengraph(html_doc)
+      end
 
-        def get_twitter
-          return {} unless html_doc
+      def get_twitter
+        return {} unless html_doc
 
-          twitter = {}
+        twitter = {}
 
-          html_doc.css('meta').each do |m|
-            if (m["property"] && m["property"][/^twitter:(.+)$/i]) || (m["name"] && m["name"][/^twitter:(.+)$/i])
-              value = (m["content"] || m["value"]).to_s
-              twitter[$1.tr('-:' , '_').to_sym] ||= value unless Onebox::Helpers::blank?(value)
-            end
+        html_doc.css('meta').each do |m|
+          if (m["property"] && m["property"][/^twitter:(.+)$/i]) || (m["name"] && m["name"][/^twitter:(.+)$/i])
+            value = (m["content"] || m["value"]).to_s
+            twitter[$1.tr('-:' , '_').to_sym] ||= value unless Onebox::Helpers::blank?(value)
           end
-
-          twitter
         end
 
-        def get_favicon
-          return nil unless html_doc
+        twitter
+      end
 
-          favicon = html_doc.css('link[rel="shortcut icon"], link[rel="icon shortcut"], link[rel="shortcut"], link[rel="icon"]').first
-          favicon = favicon.nil? ? nil : (favicon['href'].nil? ? nil : favicon['href'].strip)
+      def get_favicon
+        return nil unless html_doc
 
-          Onebox::Helpers::get_absolute_image_url(favicon, url)
-        end
+        favicon = html_doc.css('link[rel="shortcut icon"], link[rel="icon shortcut"], link[rel="shortcut"], link[rel="icon"]').first
+        favicon = favicon.nil? ? nil : (favicon['href'].nil? ? nil : favicon['href'].strip)
+
+        Onebox::Helpers::get_absolute_image_url(favicon, url)
+      end
     end
   end
 end

data/lib/onebox/engine/trello_onebox.rb

@@ -18,13 +18,13 @@ module Onebox
       end
 
       private
-        def match
-          return @match if @match
+      def match
+        return @match if @match
 
-          @match = @url.match(%{trello\.com/(?<type>[^/]+)/(?<key>[^/]+)/?\W*})
+        @match = @url.match(%{trello\.com/(?<type>[^/]+)/(?<key>[^/]+)/?\W*})
 
-          @match
-        end
+        @match
+      end
     end
   end
 end

data/lib/onebox/engine/whitelisted_generic_onebox.rb

@@ -254,74 +254,74 @@ module Onebox
 
       private
 
-        def rewrite_https(html)
-          return unless html
-          uri = URI(@url)
-          html.gsub!("http://", "https://") if WhitelistedGenericOnebox.host_matches(uri, WhitelistedGenericOnebox.rewrites)
-          html
-        end
+      def rewrite_https(html)
+        return unless html
+        uri = URI(@url)
+        html.gsub!("http://", "https://") if WhitelistedGenericOnebox.host_matches(uri, WhitelistedGenericOnebox.rewrites)
+        html
+      end
 
-        def generic_html
-          return article_html  if is_article?
-          return video_html    if is_video?
-          return image_html    if is_image?
-          return embedded_html if is_embedded?
-          return article_html  if has_text?
-        end
+      def generic_html
+        return article_html  if is_article?
+        return video_html    if is_video?
+        return image_html    if is_image?
+        return embedded_html if is_embedded?
+        return article_html  if has_text?
+      end
 
-        def is_article?
-          (data[:type] =~ /article/ || data[:asset_type] =~ /article/) &&
-          has_text?
-        end
+      def is_article?
+        (data[:type] =~ /article/ || data[:asset_type] =~ /article/) &&
+        has_text?
+      end
 
-        def has_text?
-          !Onebox::Helpers.blank?(data[:title]) &&
-          !Onebox::Helpers.blank?(data[:description])
-        end
+      def has_text?
+        !Onebox::Helpers.blank?(data[:title]) &&
+        !Onebox::Helpers.blank?(data[:description])
+      end
 
-        def is_image?
-          data[:type] =~ /photo|image/ &&
-          data[:type] !~ /photostream/ &&
-          has_image?
-        end
+      def is_image?
+        data[:type] =~ /photo|image/ &&
+        data[:type] !~ /photostream/ &&
+        has_image?
+      end
 
-        def has_image?
-          !Onebox::Helpers.blank?(data[:image])
-        end
+      def has_image?
+        !Onebox::Helpers.blank?(data[:image])
+      end
 
-        def is_video?
-          data[:type] =~ /^video[\/\.]/ && !Onebox::Helpers.blank?(data[:video])
-        end
+      def is_video?
+        data[:type] =~ /^video[\/\.]/ && !Onebox::Helpers.blank?(data[:video])
+      end
 
-        def is_embedded?
-          data[:html] &&
-          data[:height] &&
-          (
-            data[:html]["iframe"] ||
-            WhitelistedGenericOnebox.html_providers.include?(data[:provider_name])
-          )
-        end
+      def is_embedded?
+        data[:html] &&
+        data[:height] &&
+        (
+          data[:html]["iframe"] ||
+          WhitelistedGenericOnebox.html_providers.include?(data[:provider_name])
+        )
+      end
 
-        def article_html
-          layout.to_html
-        end
+      def article_html
+        layout.to_html
+      end
 
-        def image_html
-          return if Onebox::Helpers.blank?(data[:image])
+      def image_html
+        return if Onebox::Helpers.blank?(data[:image])
 
-          escaped_src = ::Onebox::Helpers.normalize_url_for_output(data[:image])
+        escaped_src = ::Onebox::Helpers.normalize_url_for_output(data[:image])
 
-          alt    = data[:description]  || data[:title]
-          width  = data[:image_width]  || data[:thumbnail_width]  || data[:width]
-          height = data[:image_height] || data[:thumbnail_height] || data[:height]
+        alt    = data[:description]  || data[:title]
+        width  = data[:image_width]  || data[:thumbnail_width]  || data[:width]
+        height = data[:image_height] || data[:thumbnail_height] || data[:height]
 
-          "<img src='#{escaped_src}' alt='#{alt}' width='#{width}' height='#{height}' class='onebox'>"
-        end
+        "<img src='#{escaped_src}' alt='#{alt}' width='#{width}' height='#{height}' class='onebox'>"
+      end
 
-        def video_html
-          escaped_src = ::Onebox::Helpers.normalize_url_for_output(data[:video])
+      def video_html
+        escaped_src = ::Onebox::Helpers.normalize_url_for_output(data[:video])
 
-          <<-HTML
+        <<-HTML
             <video title='#{data[:title]}'
                    width='#{data[:video_width]}'
                    height='#{data[:video_height]}'
@@ -330,20 +330,20 @@ module Onebox
               <source src='#{escaped_src}'>
             </video>
           HTML
-        end
+      end
 
-        def embedded_html
-          fragment = Nokogiri::HTML::fragment(data[:html])
-          fragment.css("img").each { |img| img["class"] = "thumbnail" }
-          if iframe = fragment.at_css("iframe")
-            iframe.remove_attribute("style")
-            iframe["width"] = data[:width] || "100%"
-            iframe["height"] = data[:height]
-            iframe["scrolling"] = "no"
-            iframe["frameborder"] = "0"
-          end
-          fragment.to_html
+      def embedded_html
+        fragment = Nokogiri::HTML::fragment(data[:html])
+        fragment.css("img").each { |img| img["class"] = "thumbnail" }
+        if iframe = fragment.at_css("iframe")
+          iframe.remove_attribute("style")
+          iframe["width"] = data[:width] || "100%"
+          iframe["height"] = data[:height]
+          iframe["scrolling"] = "no"
+          iframe["frameborder"] = "0"
         end
+        fragment.to_html
+      end
     end
   end
 end

data/lib/onebox/engine/wikimedia_onebox.rb

@@ -22,20 +22,20 @@ module Onebox
 
       private
 
-        def match
-          @match ||= @url.match(/^https?:\/\/commons\.wikimedia\.org\/wiki\/(?<name>File:.+)/)
-        end
-
-        def data
-          first_page = raw['query']['pages'].first[1]
-
-          {
-            link: first_page['imageinfo'].first['descriptionurl'],
-            title: first_page['title'],
-            image: first_page['imageinfo'].first['url'],
-            thumbnail: first_page['imageinfo'].first['thumburl']
-          }
-        end
+      def match
+        @match ||= @url.match(/^https?:\/\/commons\.wikimedia\.org\/wiki\/(?<name>File:.+)/)
+      end
+
+      def data
+        first_page = raw['query']['pages'].first[1]
+
+        {
+          link: first_page['imageinfo'].first['descriptionurl'],
+          title: first_page['title'],
+          image: first_page['imageinfo'].first['url'],
+          thumbnail: first_page['imageinfo'].first['thumburl']
+        }
+      end
 
     end
   end

data/lib/onebox/engine/wistia_onebox.rb

@@ -18,15 +18,15 @@ module Onebox
       end
 
       private
-        def oembed_data
-          @oembed_data ||= begin
-            oembed_url = "https://fast.wistia.com/oembed?embedType=iframe&url=#{url}"
-            response = Onebox::Helpers.fetch_response(oembed_url) rescue "{}"
-            Onebox::Helpers.symbolize_keys(::MultiJson.load(response))
-          rescue
-            {}
-          end
+      def oembed_data
+        @oembed_data ||= begin
+          oembed_url = "https://fast.wistia.com/oembed?embedType=iframe&url=#{url}"
+          response = Onebox::Helpers.fetch_response(oembed_url) rescue "{}"
+          Onebox::Helpers.symbolize_keys(::MultiJson.load(response))
+        rescue
+          {}
         end
+      end
     end
   end
 end

data/lib/onebox/engine/xkcd_onebox.rb

@@ -13,18 +13,18 @@ module Onebox
 
       private
 
-        def match
-          @match ||= @url.match(%{xkcd\.com/(?<comic_id>\\d+)})
-        end
+      def match
+        @match ||= @url.match(%{xkcd\.com/(?<comic_id>\\d+)})
+      end
 
-        def data
-          {
-            link: @url,
-            title: raw['safe_title'],
-            image: raw['img'],
-            description: raw['alt']
-          }
-        end
+      def data
+        {
+          link: @url,
+          title: raw['safe_title'],
+          image: raw['img'],
+          description: raw['alt']
+        }
+      end
     end
   end
 end

data/lib/onebox/engine/youtube_onebox.rb

@@ -58,104 +58,104 @@ module Onebox
 
       private
 
-        def video_id
-          @video_id ||= begin
-            # http://youtu.be/afyK1HSFfgw
-            if uri.host["youtu.be"]
-              id = uri.path[/\/([\w\-]+)/, 1]
-              return id if id
-            end
-
-            # https://www.youtube.com/embed/vsF0K3Ou1v0
-            if uri.path["/embed/"]
-              id = uri.path[/\/embed\/([\w\-]+)/, 1]
-              return id if id
-            end
-
-            # https://www.youtube.com/watch?v=Z0UISCEe52Y
-            params['v']
+      def video_id
+        @video_id ||= begin
+          # http://youtu.be/afyK1HSFfgw
+          if uri.host["youtu.be"]
+            id = uri.path[/\/([\w\-]+)/, 1]
+            return id if id
           end
-        end
-
-        def list_id
-          @list_id ||= params['list']
-        end
 
-        def list_thumbnail_url
-          @list_thumbnail_url ||= begin
-            url = "https://www.youtube.com/oembed?format=json&url=https://www.youtube.com/playlist?list=#{list_id}"
-            response = Onebox::Helpers.fetch_response(url) rescue "{}"
-            data = Onebox::Helpers.symbolize_keys(::MultiJson.load(response))
-            data[:thumbnail_url]
-          rescue
-            nil
+          # https://www.youtube.com/embed/vsF0K3Ou1v0
+          if uri.path["/embed/"]
+            id = uri.path[/\/embed\/([\w\-]+)/, 1]
+            return id if id
           end
-        end
 
-        def video_oembed_data
-          url = "https://www.youtube.com/oembed?format=json&url=https://www.youtube.com/watch?v=#{video_id}"
-          response = Onebox::Helpers.fetch_response(url) rescue "{}"
-          Onebox::Helpers.symbolize_keys(::MultiJson.load(response))
+          # https://www.youtube.com/watch?v=Z0UISCEe52Y
+          params['v']
         end
+      end
 
-        def list_oembed_data
+      def list_id
+        @list_id ||= params['list']
+      end
+
+      def list_thumbnail_url
+        @list_thumbnail_url ||= begin
           url = "https://www.youtube.com/oembed?format=json&url=https://www.youtube.com/playlist?list=#{list_id}"
           response = Onebox::Helpers.fetch_response(url) rescue "{}"
-          Onebox::Helpers.symbolize_keys(::MultiJson.load(response))
+          data = Onebox::Helpers.symbolize_keys(::MultiJson.load(response))
+          data[:thumbnail_url]
+        rescue
+          nil
         end
+      end
+
+      def video_oembed_data
+        url = "https://www.youtube.com/oembed?format=json&url=https://www.youtube.com/watch?v=#{video_id}"
+        response = Onebox::Helpers.fetch_response(url) rescue "{}"
+        Onebox::Helpers.symbolize_keys(::MultiJson.load(response))
+      end
 
-        def embed_params
-          p = { 'feature' => 'oembed', 'wmode' => 'opaque' }
+      def list_oembed_data
+        url = "https://www.youtube.com/oembed?format=json&url=https://www.youtube.com/playlist?list=#{list_id}"
+        response = Onebox::Helpers.fetch_response(url) rescue "{}"
+        Onebox::Helpers.symbolize_keys(::MultiJson.load(response))
+      end
 
-          p['list'] = list_id if list_id
+      def embed_params
+        p = { 'feature' => 'oembed', 'wmode' => 'opaque' }
 
-          # Parse timestrings, and assign the result as a start= parameter
-          start = if params['start']
-            params['start']
-          elsif params['t']
-            params['t']
-          elsif uri.fragment && uri.fragment.start_with?('t=')
-            # referencing uri is safe here because any throws were already caught by video_id returning nil
-            # remove the t= from the start
-            uri.fragment[2..-1]
-          end
+        p['list'] = list_id if list_id
 
-          p['start'] = parse_timestring(start)        if start
-          p['end']   = parse_timestring params['end'] if params['end']
+        # Parse timestrings, and assign the result as a start= parameter
+        start = if params['start']
+          params['start']
+        elsif params['t']
+          params['t']
+        elsif uri.fragment && uri.fragment.start_with?('t=')
+          # referencing uri is safe here because any throws were already caught by video_id returning nil
+          # remove the t= from the start
+          uri.fragment[2..-1]
+        end
 
-          # Official workaround for looping videos
-          # https://developers.google.com/youtube/player_parameters#loop
-          # use params.include? so that you can just add "&loop"
-          if params.include?('loop')
-            p['loop'] = 1
-            p['playlist'] = video_id
-          end
+        p['start'] = parse_timestring(start)        if start
+        p['end']   = parse_timestring params['end'] if params['end']
 
-          URI.encode_www_form(p)
+        # Official workaround for looping videos
+        # https://developers.google.com/youtube/player_parameters#loop
+        # use params.include? so that you can just add "&loop"
+        if params.include?('loop')
+          p['loop'] = 1
+          p['playlist'] = video_id
         end
 
-        def parse_timestring(string)
-          if string =~ /(\d+h)?(\d+m)?(\d+s?)?/
-            ($1.to_i * 3600) + ($2.to_i * 60) + $3.to_i
-          end
+        URI.encode_www_form(p)
+      end
+
+      def parse_timestring(string)
+        if string =~ /(\d+h)?(\d+m)?(\d+s?)?/
+          ($1.to_i * 3600) + ($2.to_i * 60) + $3.to_i
         end
+      end
 
-        def params
-          return {} unless uri.query
-          # This mapping is necessary because CGI.parse returns a hash of keys to arrays.
-          # And *that* is necessary because querystrings support arrays, so they
-          # force you to deal with it to avoid security issues that would pop up
-          # if one day it suddenly gave you an array.
-          #
-          # However, we aren't interested. Just take the first one.
-          @params ||= begin
-            p = {}
-            CGI.parse(uri.query).each { |k, v| p[k] = v.first }
-            p
-          end
-        rescue
-          {}
+      def params
+        return {} unless uri.query
+        # This mapping is necessary because CGI.parse returns a hash of keys to arrays.
+        # And *that* is necessary because querystrings support arrays, so they
+        # force you to deal with it to avoid security issues that would pop up
+        # if one day it suddenly gave you an array.
+        #
+        # However, we aren't interested. Just take the first one.
+        @params ||= begin
+          p = {}
+          CGI.parse(uri.query).each { |k, v| p[k] = v.first }
+          p
         end
+      rescue
+        {}
+      end
 
     end
   end