onebox 1.7.2 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2104fcbe20267fd2a272b43bccaf3ff7c0f4d0c3
-  data.tar.gz: 7292bbe6cf11d62f924272f26089c5e3071c9563
+  metadata.gz: 67ec2675eb6687bee752534aef6d1e610545717b
+  data.tar.gz: cd82452275130c85076cb9078f25650ac9c73444
 SHA512:
-  metadata.gz: 5050d6a43ddb0a98daa8623c5f7d636a63a4642a0a69184c85908f778a89efd49c0655890d1c67f1342b604fd9c7249e774022a896481e9dc2761de012d9c06c
-  data.tar.gz: 09f0001109957fb97fe5a9d69e1ed768c919c6b05bbb0e7e7b7c16a31878463bd20b9b5470f6d68d8ad0ecc6dbe93ef42f2e59aff8b9fa66c5336a88ace99eeb
+  metadata.gz: 557f8fbdfd7e33e247b5cd82ffc89f1484b57ba075e6c1ea412382be1e846c9aaa08e14777dec3799b5ce76dc61881a01909665087b21c4bd1775aa84f18f65b
+  data.tar.gz: 77c61683b419f729ba6d3b506b8c3bd960ae40f5b52662fb8d6e150605caea7f33e83c8aac7a3fdf9f82f4d1c92c045a571e7df2d5633c4457691e0067b735ae

data/lib/onebox/engine.rb

@@ -171,3 +171,5 @@ require_relative "engine/asciinema_onebox"
 require_relative "engine/mixcloud_onebox"
 require_relative "engine/bandcamp_onebox"
 require_relative "engine/coub_onebox"
+require_relative "engine/flickr_onebox"
+require_relative "engine/five_hundred_px_onebox"

data/lib/onebox/engine/bandcamp_onebox.rb

@@ -4,7 +4,7 @@ module Onebox
       include Engine
       include StandardEmbed
 
-      matches_regexp(/^https?:\/\/.*bandcamp\.com\/album\//)
+      matches_regexp(/^https?:\/\/.*\.bandcamp\.com\/album\//)
       always_https
 
       def placeholder_html

data/lib/onebox/engine/five_hundred_px_onebox.rb

@@ -0,0 +1,17 @@
+module Onebox
+  module Engine
+    class FiveHundredPxOnebox
+      include Engine
+      include StandardEmbed
+
+      matches_regexp(/^https?:\/\/500px\.com\/photo\/\d+\//)
+      always_https
+
+      def to_html
+        og = get_opengraph
+        "<img src='#{og[:image]}' width='#{og[:image_width]}' height='#{og[:image_height]}' #{Helpers.title_attr(og)}>"
+      end
+
+    end
+  end
+end

data/lib/onebox/engine/flickr_onebox.rb

@@ -0,0 +1,17 @@
+module Onebox
+  module Engine
+    class FlickrOnebox
+      include Engine
+      include StandardEmbed
+
+      matches_regexp(/^https?:\/\/www\.flickr\.com\/photos\//)
+      always_https
+
+      def to_html
+        og = get_opengraph
+        "<img src='#{og[:image]}' width='#{og[:image_width]}' height='#{og[:image_height]}' #{Helpers.title_attr(og)}>"
+      end
+
+    end
+  end
+end

data/lib/onebox/engine/soundcloud_onebox.rb

@@ -4,7 +4,7 @@ module Onebox
       include Engine
       include StandardEmbed
 
-      matches_regexp(/^https?:\/\/.*soundcloud\.com/)
+      matches_regexp(/^https?:\/\/soundcloud\.com/)
       always_https
 
       def to_html

data/lib/onebox/engine/standard_embed.rb

@@ -1,3 +1,5 @@
+require "cgi"
+
 module Onebox
   module Engine
     module StandardEmbed
@@ -93,14 +95,14 @@ module Onebox
           html_doc.css('meta').each do |m|
             if (m["property"] && m["property"][/^og:(.+)$/i]) || (m["name"] && m["name"][/^og:(.+)$/i])
               value = (m["content"] || m["value"]).to_s
-              og[$1.tr('-:','_').to_sym] ||= value unless Onebox::Helpers::blank?(value)
+              og[$1.tr('-:','_').to_sym] ||= CGI.escapeHTML(value) unless Onebox::Helpers::blank?(value)
             end
           end
 
           # Attempt to retrieve the title from the meta tag
           title_element = html_doc.at_css('title')
           if title_element && title_element.text
-            og[:title] ||= title_element.text unless Onebox::Helpers.blank?(title_element.text)
+            og[:title] ||= CGI.escapeHTML(title_element.text) unless Onebox::Helpers.blank?(title_element.text)
           end
 
           og
@@ -114,7 +116,7 @@ module Onebox
           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)
+              twitter[$1.tr('-:','_').to_sym] ||= CGI.escapeHTML(value) unless Onebox::Helpers::blank?(value)
             end
           end
 

data/lib/onebox/engine/wikipedia_onebox.rb

@@ -5,7 +5,7 @@ module Onebox
       include LayoutSupport
       include HTML
 
-      matches_regexp(/^https?:\/\/.*wikipedia\.(com|org)/)
+      matches_regexp(/^https?:\/\/.*\.wikipedia\.(com|org)/)
       always_https
 
       private
@@ -22,23 +22,23 @@ module Onebox
         end
 
         unless m_url_hash.nil?
-          section_header_title = raw.xpath("//span[@id='#{m_url_hash_name}']") 
+          section_header_title = raw.xpath("//span[@id='#{m_url_hash_name}']")
 
-          if section_header_title.empty? 
+          if section_header_title.empty?
             paras = raw.search("p") #default get all the paras
-          else 
+          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
             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.
             # 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 
+            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
               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 
+              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
                 paras.push(cur_element)
               end
             end
@@ -52,16 +52,16 @@ module Onebox
           while text.length < Onebox::LayoutSupport.max_text && cnt <= 3
             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
               li_index=1
               list_items = []
               paras[cnt].children.css("li").each {|li| list_items.push "#{li_index}." + li.inner_text ; li_index+=1}
               paragraph =  (list_items.join " |\n ")[0..Onebox::LayoutSupport.max_text]
             else
-              paragraph = paras[cnt].inner_text[0..Onebox::LayoutSupport.max_text]  
+              paragraph = paras[cnt].inner_text[0..Onebox::LayoutSupport.max_text]
             end
-            
+
             paragraph.gsub!(/\[\d+\]/mi, "")
             text << paragraph
             cnt += 1

data/lib/onebox/helpers.rb

@@ -4,14 +4,8 @@ module Onebox
       return {} if hash.nil?
 
       hash.inject({}){|result, (key, value)|
-        new_key = case key
-                  when String then key.to_sym
-                  else key
-                  end
-        new_value = case value
-                    when Hash then symbolize_keys(value)
-                    else value
-                    end
+        new_key = key.is_a?(String) ? key.to_sym : key
+        new_value = value.is_a?(Hash) ? symbolize_keys(value) : value
         result[new_key] = new_value
         result
       }

data/lib/onebox/version.rb

@@ -1,3 +1,3 @@
 module Onebox
-  VERSION = "1.7.2"
+  VERSION = "1.7.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.3
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2017-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -321,6 +321,8 @@ files:
 - lib/onebox/engine/bandcamp_onebox.rb
 - lib/onebox/engine/coub_onebox.rb
 - lib/onebox/engine/douban_onebox.rb
+- lib/onebox/engine/five_hundred_px_onebox.rb
+- lib/onebox/engine/flickr_onebox.rb
 - lib/onebox/engine/gfycat_onebox.rb
 - lib/onebox/engine/giphy_onebox.rb
 - lib/onebox/engine/github_blob_onebox.rb