onebox 1.5.35 → 1.5.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2536f8a819505d60d5c3af20abdac0bdad30a66
-  data.tar.gz: 868fac1b2221457e904c53b02b4a8bdb5dfaa270
+  metadata.gz: cb07f9ec00a95d8a8247d010c04a22fceb4b242d
+  data.tar.gz: 2cb0aedd6352c878611604c063c87563ef007240
 SHA512:
-  metadata.gz: 2ff16c0bebe5aee99c4d8f6233ec6df20d09cf1a94046116ac4a7abb29b74c2a5bef4d38bbff5d604b83cf651a4c8035e2d72efed3c49eebbc1ea1587ad6b88e
-  data.tar.gz: e3e8cd1d52dd1b2cae80fecac4c1771ce729eb587f49afb41efb9db343a460f7e54c203a2827873c70924338f340072bf950c510dd5bb82119f912d89c23b2f1
+  metadata.gz: 6cd4b8c587b4f6dece85cbdc518c4ecab43d71ca9eaf7059f0761fd76e5f163d09b620b1dfb56cb6b20648ff12cdd2c5dcc809601e251a9bf1d0223f842cfd84
+  data.tar.gz: 9515d8b35ab81a113e1ac8f409639fee03b5eef23b06052bc37a236ae2c2cf417e4f78bd83a755b5da2dfe8018210429ecf1dbc6157f4b493a68d11dbf1a0de7

data/lib/onebox/engine/amazon_onebox.rb

@@ -30,15 +30,18 @@ module Onebox
       end
 
       def image
-        case
-        when raw.css("#main-image").any?
-          ::JSON.parse(
-            raw.css("#main-image").first
-              .attributes["data-a-dynamic-image"]
-              .value
-          ).keys.first
-        when raw.css("#landingImage").any?
-          raw.css("#landingImage").first["src"]
+        if (main_image = raw.css("#main-image")) && main_image.any?
+          attributes = main_image.first.attributes
+
+          return attributes["data-a-hires"] if attributes["data-a-hires"]
+
+          if attributes["data-a-dynamic-image"]
+            return ::JSON.parse(attributes["data-a-dynamic-image"].value).keys.first
+          end
+        end
+
+        if (landing_image = raw.css("#landingImage")) && landing_image.any?
+          landing_image.first["src"]
         end
       end
 
@@ -51,11 +54,14 @@ module Onebox
         result[:by_info] = Onebox::Helpers.clean(result[:by_info].inner_html) if result[:by_info]
 
         # get item price (Amazon markup is inconsistent, deal with it)
-        if raw.css("#priceblock_ourprice .restOfPrice")[0] && raw.css("#priceblock_ourprice .restOfPrice")[0].inner_text
-          result[:price] = "#{raw.css("#priceblock_ourprice .restOfPrice")[0].inner_text}#{raw.css("#priceblock_ourprice .buyingPrice")[0].inner_text}.#{raw.css("#priceblock_ourprice .restOfPrice")[1].inner_text}"
-        else
-          result[:price] = raw.css("#priceblock_ourprice").inner_text
-        end
+        result[:price] =
+          if raw.css("#priceblock_ourprice .restOfPrice")[0] && raw.css("#priceblock_ourprice .restOfPrice")[0].inner_text
+            "#{raw.css("#priceblock_ourprice .restOfPrice")[0].inner_text}#{raw.css("#priceblock_ourprice .buyingPrice")[0].inner_text}.#{raw.css("#priceblock_ourprice .restOfPrice")[1].inner_text}"
+          elsif raw.css("#priceblock_dealprice") && (dealprice = raw.css("#priceblock_dealprice span")[0])
+            dealprice.inner_text
+          else
+            raw.css("#priceblock_ourprice").inner_text
+          end
 
         summary = raw.at("#productDescription")
         result[:description] = summary.inner_text if summary

data/lib/onebox/engine/standard_embed.rb

@@ -19,7 +19,6 @@ module Onebox
       end
 
       # Some oembed providers (like meetup.com) don't provide links to themselves
-      add_oembed_provider /www\.flickr\.com\//, 'http://www.flickr.com/services/oembed.json'
       add_oembed_provider /(.*\.)?gfycat\.com\//, 'http://gfycat.com/cajax/oembed'
       add_oembed_provider /www\.kickstarter\.com\//, 'https://www.kickstarter.com/services/oembed'
       add_oembed_provider /www\.meetup\.com\//, 'http://api.meetup.com/oembed'
@@ -27,7 +26,7 @@ module Onebox
       add_oembed_provider /(.*\.)?vimeo\.com\//, 'http://vimeo.com/api/oembed.json'
 
       # Sites that work better with OpenGraph
-      # add_opengraph_provider /gfycat\.com\//
+      add_opengraph_provider /nytimes\.com\//
 
       def always_https?
         WhitelistedGenericOnebox.host_matches(uri, WhitelistedGenericOnebox.https_hosts)

data/lib/onebox/engine/youku_onebox.rb

@@ -8,8 +8,9 @@ module Onebox
 
       # Try to get the video ID. Works for URLs of the form:
       # * http://v.youku.com/v_show/id_XNjM3MzAxNzc2.html
+      # * http://v.youku.com/v_show/id_XMTQ5MjgyMjMyOA==.html?from=y1.3-tech-index3-232-10183.89969-89963.3-1
       def video_id
-        match = uri.path.match(/\/v_show\/id_([a-zA-Z0-9]*)(\.html)*/)
+        match = uri.path.match(/\/v_show\/id_([a-zA-Z0-9_=\-]+)(\.html)?.*/)
         return match[1] if match && match[1]
 
         nil
@@ -18,7 +19,7 @@ module Onebox
       end
 
       def to_html
-        "<iframe width='480' height='270' src='http://player.youku.com/embed/#{video_id}' frameborder='0' allowfullscreen></iframe>"
+        "<embed width='570' height='360' src='https://players.youku.com/player.php/sid/#{video_id}/v.swf' wmode='transparent' allowFullScreen='true' quality='high' align='middle' allowScriptAccess='always' type='application/x-shockwave-flash'></embed>"
       end
 
       def placeholder_html
@@ -27,7 +28,7 @@ module Onebox
 
       private
 
-      # Note: May throw! Make sure to recue.
+      # Note: May throw! Make sure to rescue.
       def uri
         @_uri ||= URI(@url)
       end

data/lib/onebox/version.rb

@@ -1,3 +1,3 @@
 module Onebox
-  VERSION = "1.5.35"
+  VERSION = "1.5.36"
 end

data/spec/lib/onebox/engine/youku_onebox_spec.rb

@@ -6,8 +6,8 @@ describe Onebox::Engine::YoukuOnebox do
     FakeWeb.register_uri(:get, 'http://v.youku.com/player/getPlayList/VideoIDS/XNjM3MzAxNzc2', body: response('youku-meta'), content_type: 'text/html')
   end
 
-  it 'returns iframe as the placeholder' do
+  it 'returns embed as the placeholder' do
     expect(Onebox.preview('http://v.youku.com/v_show/id_XNjM3MzAxNzc2.html')
-        .placeholder_html).to match(/iframe/)
+        .placeholder_html).to match(/embed/)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 1.5.35
+  version: 1.5.36
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -495,3 +495,4 @@ test_files:
 - spec/lib/onebox_spec.rb
 - spec/spec_helper.rb
 - spec/support/html_spec_helper.rb
+has_rdoc: