onebox 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9568d4cc0a0bf144ffe61a5b97973f44e41c941f
-  data.tar.gz: 098b322abd9e0b5941124a22d14e83be9a29d2e6
+  metadata.gz: 94fc556b352ee73d791b1794fbfbacad4ceb28ba
+  data.tar.gz: ee33834b15da1ec2701a578019b8c5586e4d0f4c
 SHA512:
-  metadata.gz: 801755ee7531576bd9e006f06563d97d2540ed58be765668bef94d7c56a61e345a5579450089c86566cdb2fdd45c62a8c15732a9f5fdc14b8ebc4f27c939fb90
-  data.tar.gz: ed306b576710b9b63a792b8964b2a91ee3b822fc142dd75c71501f9db9216d3e14c5cbf554aa091248d59d1704eab05bf96684f691e1ed51b2cb9f3b7fe9f419
+  metadata.gz: fdcf8a62d60808afc285b24f790730c7a71f0b2638589149c9d50aa610c90b249ac74e48f527da27bad924f8eedfbc157c0c417749831f35997d73133f0fd065
+  data.tar.gz: c41699247ec93be5472e48d2ca39c274499446219bed35257d3e8b97a27bc84d6f0c9b64721be19c3481013a10ec8063dab6ea579da165e04f6e97900395c37a

data/lib/onebox/engine.rb

@@ -21,17 +21,13 @@ module Onebox
 
     def options=(opt)
       return @options if opt.nil? #make sure options provided
-      if opt.instance_of? OpenStruct
-        @options = @options.merge(opt.to_h)
-      else
-       @options =  @options.merge(opt)
-      end
+      opt = opt.to_h  if opt.instance_of?(OpenStruct)
+      @options.merge!(opt)
       @options
     end
 
 
     def initialize(link, cache = nil, timeout = nil)
-
       @options = DEFAULT
       class_name = self.class.name.split("::").last.to_s
       self.options = Onebox.options[class_name] || {} #Set the engine options extracted from global options.
@@ -168,3 +164,5 @@ require_relative "engine/giphy_onebox"
 require_relative "engine/gfycat_onebox"
 require_relative "engine/vimeo_onebox"
 require_relative "engine/steam_store_onebox"
+require_relative "engine/sketchfab_onebox"
+require_relative "engine/audioboom_onebox"

data/lib/onebox/engine/audioboom_onebox.rb

@@ -0,0 +1,27 @@
+module Onebox
+  module Engine
+    class AudioboomOnebox
+      include Engine
+      include StandardEmbed
+
+      matches_regexp(/^https?:\/\/audioboom\.com\/posts\/\d+/)
+      always_https
+
+      def placeholder_html
+        oembed = get_oembed
+
+        # we want the image to have the same dimensions as the embedded html
+
+        <<-HTML
+          <img src="#{oembed[:thumbnail_url]}" style="max-width: #{oembed[:width]}px; max-height: #{oembed[:height]}px;">
+        HTML
+      end
+
+      def to_html
+        oembed = get_oembed
+        oembed[:html]
+      end
+
+    end
+  end
+end

data/lib/onebox/engine/gfycat_onebox.rb

@@ -5,6 +5,7 @@ module Onebox
       include StandardEmbed
 
       matches_regexp(/^https?:\/\/gfycat\.com\//)
+      always_https
 
       def to_html
         oembed = get_oembed

data/lib/onebox/engine/giphy_onebox.rb

@@ -5,6 +5,7 @@ module Onebox
       include StandardEmbed
 
       matches_regexp(/^https?:\/\/(giphy\.com\/gifs|gph\.is)\//)
+      always_https
 
       def to_html
         oembed = get_oembed

data/lib/onebox/engine/sketchfab_onebox.rb

@@ -0,0 +1,33 @@
+module Onebox
+  module Engine
+    class SketchFabOnebox
+      include Engine
+      include StandardEmbed
+
+      matches_regexp(/^https?:\/\/sketchfab\.com\/models\/[a-z0-9]{32}/)
+      always_https
+
+      def to_html
+        opengraph = get_opengraph
+
+        src = opengraph[:video_url].gsub("?autostart=1", "")
+
+        <<-HTML
+          <iframe src="#{src}"
+                  width="#{opengraph[:video_width]}"
+                  height="#{opengraph[:video_height]}"
+                  scrolling="no"
+                  frameborder="0"
+                  allowfullscreen>
+          </iframe>
+        HTML
+      end
+
+      def placeholder_html
+        opengraph = get_opengraph
+        "<img src='#{opengraph[:image]}'>"
+      end
+
+    end
+  end
+end

data/lib/onebox/engine/standard_embed.rb

@@ -22,7 +22,7 @@ module Onebox
       add_oembed_provider(/www\.meetup\.com\//, 'http://api.meetup.com/oembed')
 
       def always_https?
-        WhitelistedGenericOnebox.host_matches(uri, WhitelistedGenericOnebox.https_hosts)
+        WhitelistedGenericOnebox.host_matches(uri, WhitelistedGenericOnebox.https_hosts) || super
       end
 
       def raw

data/lib/onebox/engine/youtube_onebox.rb

@@ -43,7 +43,6 @@ module Onebox
           # for channel pages
           html = Onebox::Engine::WhitelistedGenericOnebox.new(@url, @cache, @timeout).to_html
           return if Onebox::Helpers.blank?(html)
-          html.gsub!("http:", "https:")
           html.gsub!(/['"]\/\//, "https://")
           html
         end

data/lib/onebox/version.rb

@@ -1,3 +1,3 @@
 module Onebox
-  VERSION = "1.6.1"
+  VERSION = "1.6.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -302,6 +302,7 @@ files:
 - lib/onebox/engine.rb
 - lib/onebox/engine/amazon_onebox.rb
 - lib/onebox/engine/audio_onebox.rb
+- lib/onebox/engine/audioboom_onebox.rb
 - lib/onebox/engine/douban_onebox.rb
 - lib/onebox/engine/gfycat_onebox.rb
 - lib/onebox/engine/giphy_onebox.rb
@@ -320,6 +321,7 @@ files:
 - lib/onebox/engine/json.rb
 - lib/onebox/engine/pastebin_onebox.rb
 - lib/onebox/engine/pubmed_onebox.rb
+- lib/onebox/engine/sketchfab_onebox.rb
 - lib/onebox/engine/slides_onebox.rb
 - lib/onebox/engine/soundcloud_onebox.rb
 - lib/onebox/engine/stack_exchange_onebox.rb