onebox 2.2.12 → 2.2.17

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/imgur_onebox.rb

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

@@ -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),
@@ -36,10 +35,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

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

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

@@ -6,17 +6,18 @@ 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
 
-      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,21 +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/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

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

@@ -7,7 +7,6 @@ require 'onebox/oembed'
 module Onebox
   module Engine
     module StandardEmbed
-
       def self.oembed_providers
         @@oembed_providers ||= {}
       end
@@ -37,7 +36,7 @@ module Onebox
       end
 
       def raw
-        return @raw if @raw
+        return @raw if defined?(@raw)
 
         og = get_opengraph
         twitter = get_twitter
@@ -67,7 +66,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]
@@ -117,8 +116,6 @@ module Onebox
         "{}"
       end
 
-      protected
-
       def get_oembed_url
         oembed_url = nil
 

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

data/lib/onebox/engine/trello_onebox.rb

@@ -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 @match
 
+      def match
+        return @match if defined?(@match)
         @match = @url.match(%{trello\.com/(?<type>[^/]+)/(?<key>[^/]+)/?\W*})
-
-        @match
       end
     end
   end

data/lib/onebox/engine/twitch_clips_onebox.rb

@@ -3,12 +3,11 @@
 require_relative '../mixins/twitch_onebox'
 
 class Onebox::Engine::TwitchClipsOnebox
-
   def self.twitch_regexp
     /^https?:\/\/clips\.twitch\.tv\/([a-zA-Z0-9_]+\/?[^#\?\/]+)/
   end
-  include Onebox::Mixins::TwitchOnebox
 
+  include Onebox::Mixins::TwitchOnebox
   requires_iframe_origins "https://clips.twitch.tv"
 
   def query_params
@@ -18,5 +17,4 @@ class Onebox::Engine::TwitchClipsOnebox
   def base_url
     "clips.twitch.tv/embed?"
   end
-
 end