onebox 1.6.9 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36f15273d10858172cd6d0b0668c25395658e891
-  data.tar.gz: 7d0c3595d380b65c8d9295af3bf7e7776a880130
+  metadata.gz: da1cb3e58693506b68988b477855a2058bf0b878
+  data.tar.gz: 81f59c2fee6f69e6903a4d928d4eafa2ab784026
 SHA512:
-  metadata.gz: cfba0462966d9fe253e909068eb9f0d44544241e9e5cfc854f88559aa05d798b3dbe0e6780df4a2a77809de1532c343579edeb237e1dfa23f335fa11748016a5
-  data.tar.gz: be7b95948b00676be78a720158ed51fe446ec845c4f7a4e04e4959299d2050f2a013c2843ed76630f96f1ecf4ff4e8619c562b23c30496ea4fc79cc70e1b27c5
+  metadata.gz: 5ccc65c55cf7a0b6b6caf8249db8c998e53eb27d40fe3f06e54a51977a8d3b7d856d6a058615f4e85c6e040fe3f8efe79abde319228a93a006b7bbc425ad8400
+  data.tar.gz: 09cbb07a7b3275dffb6ddb076f07b04b806474e682c9aabd7311d9400fc280b0daa2bd4787d9be5a3f1970403aebb5c6c0baaf6f36e811e821b74454bf7e63ef

data/lib/onebox.rb

@@ -33,8 +33,7 @@ module Onebox
   end
 
   def self.has_matcher?(url)
-    result = Matcher.new(url).oneboxed
-    !!result
+    !!Matcher.new(url).oneboxed
   end
 
   def self.options=(options)

data/lib/onebox/engine.rb

@@ -168,3 +168,6 @@ require_relative "engine/sketchfab_onebox"
 require_relative "engine/audioboom_onebox"
 require_relative "engine/replit_onebox"
 require_relative "engine/asciinema_onebox"
+require_relative "engine/mixcloud_onebox"
+require_relative "engine/bandcamp_onebox"
+require_relative "engine/coub_onebox"

data/lib/onebox/engine/bandcamp_onebox.rb

@@ -0,0 +1,32 @@
+module Onebox
+  module Engine
+    class BandCampOnebox
+      include Engine
+      include StandardEmbed
+
+      matches_regexp(/^https?:\/\/.*bandcamp\.com\/album\//)
+      always_https
+
+      def placeholder_html
+        og = get_opengraph
+        "<img src='#{og[:image]}' height='#{og[:video_height]}' #{Helpers.title_attr(og)}>"
+      end
+
+      def to_html
+        og = get_opengraph
+        src = og[:video_secure_url] || og[:video]
+
+        <<-HTML
+          <iframe src="#{src}"
+                  width="#{og[:video_width]}"
+                  height="#{og[:video_height]}"
+                  scrolling="no"
+                  frameborder="0"
+                  allowfullscreen>
+          </iframe>
+        HTML
+      end
+
+    end
+  end
+end

data/lib/onebox/engine/coub_onebox.rb

@@ -0,0 +1,21 @@
+module Onebox
+  module Engine
+    class CoubOnebox
+      include Engine
+      include StandardEmbed
+
+      matches_regexp(/^https?:\/\/coub\.com\/view\//)
+      always_https
+
+      def placeholder_html
+        oembed = get_oembed
+        "<img src='#{oembed[:thumbnail_url]}' height='#{oembed[:thumbnail_height]}' width='#{oembed[:thumbnail_width]}' #{Helpers.title_attr(oembed)}>"
+      end
+
+      def to_html
+        get_oembed[:html]
+      end
+
+    end
+  end
+end

data/lib/onebox/engine/mixcloud_onebox.rb

@@ -0,0 +1,20 @@
+module Onebox
+  module Engine
+    class MixcloudOnebox
+      include Engine
+      include StandardEmbed
+
+      matches_regexp(/^https?:\/\/www\.mixcloud\.com\//)
+      always_https
+
+      def placeholder_html
+        oembed = get_oembed
+        "<img src='#{oembed[:image]}' height='#{oembed[:height]}' #{Helpers.title_attr(oembed)}>"
+      end
+
+      def to_html
+        get_oembed[:html]
+      end
+    end
+  end
+end

data/lib/onebox/engine/standard_embed.rb

@@ -22,6 +22,8 @@ module Onebox
       add_oembed_provider(/www\.meetup\.com\//, 'http://api.meetup.com/oembed')
       # In order to support Private Videos
       add_oembed_provider(/vimeo\.com\//, 'https://vimeo.com/api/oembed.json')
+      # NYT requires login so use oembed only
+      add_oembed_provider(/nytimes\.com\//, 'https://www.nytimes.com/svc/oembed/json/')
 
       def always_https?
         WhitelistedGenericOnebox.host_matches(uri, WhitelistedGenericOnebox.https_hosts) || super
@@ -46,9 +48,7 @@ module Onebox
       protected
 
         def html_doc
-          return @html_doc if @html_doc
-          response = Onebox::Helpers.fetch_response(url)
-          @html_doc = Nokogiri::HTML(response.body)
+          @html_doc ||= Nokogiri::HTML(Onebox::Helpers.fetch_response(url).body) rescue nil
         end
 
         def get_oembed
@@ -79,11 +79,13 @@ module Onebox
           oe.delete(:html) if oe[:html] && oe[:html]["wp-embedded-content"]
 
           oe
-        rescue Errno::ECONNREFUSED, Net::HTTPError, MultiJson::LoadError
+        rescue Errno::ECONNREFUSED, Net::HTTPError, Net::HTTPFatalError, MultiJson::LoadError
           {}
         end
 
         def get_opengraph
+          return {} unless html_doc
+
           og = {}
 
           html_doc.css('meta').each do |m|
@@ -103,6 +105,8 @@ module Onebox
         end
 
         def get_twitter
+          return {} unless html_doc
+
           twitter = {}
 
           html_doc.css('meta').each do |m|

data/lib/onebox/engine/whitelisted_generic_onebox.rb

@@ -177,11 +177,9 @@ module Onebox
       end
 
       def self.===(other)
-        if other.kind_of?(URI)
-          host_matches(other, whitelist) || probable_wordpress(other) || probable_discourse(other)
-        else
+        other.kind_of?(URI) ?
+          host_matches(other, whitelist) || probable_wordpress(other) || probable_discourse(other) :
           super
-        end
       end
 
       def to_html
@@ -199,16 +197,25 @@ module Onebox
         @data ||= begin
           html_entities = HTMLEntities.new
           d = { link: link }.merge(raw)
+
           if !Onebox::Helpers.blank?(d[:title])
             d[:title] = html_entities.decode(Onebox::Helpers.truncate(d[:title].strip, 80))
           end
+
+          d[:description] ||= d[:summary]
           if !Onebox::Helpers.blank?(d[:description])
             d[:description] = html_entities.decode(Onebox::Helpers.truncate(d[:description].strip, 250))
           end
+
           if !Onebox::Helpers.blank?(d[:domain])
             d[:domain] = "http://#{d[:domain]}" unless d[:domain] =~ /^https?:\/\//
             d[:domain] = URI(d[:domain]).host.to_s.sub(/^www\./, '')
           end
+
+          # prefer secure URLs
+          d[:image] = d[:image_secure_url] || d[:image_url] || d[:thumbnail_url] || d[:image]
+          d[:video] = d[:video_secure_url] || d[:video_url] || d[:video]
+
           d
         end
       end
@@ -226,8 +233,8 @@ module Onebox
           return article_html  if is_article?
           return video_html    if is_video?
           return image_html    if is_image?
-          return article_html  if has_text?
           return embedded_html if is_embedded?
+          return article_html  if has_text?
         end
 
         def is_article?
@@ -247,8 +254,7 @@ module Onebox
         end
 
         def has_image?
-          !Onebox::Helpers.blank?(data[:image]) ||
-          !Onebox::Helpers.blank?(data[:thumbnail_url])
+          !Onebox::Helpers.blank?(data[:image])
         end
 
         def is_video?
@@ -269,17 +275,15 @@ module Onebox
         end
 
         def image_html
-          src = data[:image] || data[:thumbnail_url]
-          return if Onebox::Helpers.blank?(src)
+          return if Onebox::Helpers.blank?(data[:image])
 
           alt    = data[:description]  || data[:title]
           width  = data[:image_width]  || data[:thumbnail_width]
           height = data[:image_height] || data[:thumbnail_height]
-          "<img src='#{src}' alt='#{alt}' width='#{width}' height='#{height}'>"
+          "<img src='#{data[:image]}' alt='#{alt}' width='#{width}' height='#{height}'>"
         end
 
         def video_html
-          video_url = !Onebox::Helpers.blank?(data[:video_secure_url]) ? data[:video_secure_url] : data[:video]
           if data[:video_type] == "video/mp4"
             <<-HTML
               <video title='#{data[:title]}'
@@ -287,12 +291,12 @@ module Onebox
                      height='#{data[:video_height]}'
                      style='max-width:100%'
                      controls=''>
-                <source src='#{video_url}'>
+                <source src='#{data[:video]}'>
               </video>
             HTML
           else
             <<-HTML
-              <iframe src='#{video_url}'
+              <iframe src='#{data[:video]}'
                       title='#{data[:title]}'
                       width='#{data[:video_width]}'
                       height='#{data[:video_height]}'

data/lib/onebox/matcher.rb

@@ -12,15 +12,8 @@ module Onebox
 
     def oneboxed
       uri = URI(@url)
-
-      # A onebox needs a path, query or fragment string to be considered
-      return if (uri.query.nil? || uri.query.size == 0) &&
-                (uri.fragment.nil? || uri.fragment.size == 0) &&
-                (uri.path.size == 0 || uri.path == "/")
-
       ordered_engines.find { |engine| engine === uri }
     rescue URI::InvalidURIError
-      # If it's not a valid URL, don't even match
       nil
     end
   end

data/lib/onebox/version.rb

@@ -1,3 +1,3 @@
 module Onebox
-  VERSION = "1.6.9"
+  VERSION = "1.7.0"
 end

data/lib/onebox/web.rb

@@ -11,6 +11,9 @@ module Onebox
     set :root, File.expand_path(File.dirname(__FILE__) + "/../../web")
     set :public_folder, Proc.new { "#{root}/assets" }
     set :views, Proc.new { "#{root}/views" }
+    configure :development do
+      enable :logging
+    end
 
     helpers WebHelpers
 

data/spec/lib/onebox/matcher_spec.rb

@@ -26,7 +26,7 @@ describe Onebox::Matcher do
 
       it "doesn't find an engine" do
         matcher.stubs(:ordered_engines).returns([TestEngine])
-        expect(matcher.oneboxed).to be_nil
+        expect(matcher.oneboxed).not_to be_nil
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 1.6.9
+  version: 1.7.0
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-03 00:00:00.000000000 Z
+date: 2017-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -318,6 +318,8 @@ files:
 - lib/onebox/engine/asciinema_onebox.rb
 - lib/onebox/engine/audio_onebox.rb
 - lib/onebox/engine/audioboom_onebox.rb
+- lib/onebox/engine/bandcamp_onebox.rb
+- lib/onebox/engine/coub_onebox.rb
 - lib/onebox/engine/douban_onebox.rb
 - lib/onebox/engine/gfycat_onebox.rb
 - lib/onebox/engine/giphy_onebox.rb
@@ -334,6 +336,7 @@ files:
 - lib/onebox/engine/image_onebox.rb
 - lib/onebox/engine/imgur_onebox.rb
 - lib/onebox/engine/json.rb
+- lib/onebox/engine/mixcloud_onebox.rb
 - lib/onebox/engine/pastebin_onebox.rb
 - lib/onebox/engine/pubmed_onebox.rb
 - lib/onebox/engine/replit_onebox.rb
@@ -466,7 +469,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A gem for turning URLs into previews.