onebox 1.8.69 → 1.8.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98a0701ca393ddadda7d9d38abcd9d99b2d9fbdfec7a18643b106adfddf45ad7
-  data.tar.gz: 699090849c9ac55d0362b3785f8d4a447c509bd7a47cc4d2ee6ae79ee0f869db
+  metadata.gz: 99bd6b866e7a0fb25a4d4571d9a5b0f77ab1ef6c191e0e1dd10572a315466d8f
+  data.tar.gz: ea87f0ca618a4d00924a52ed32efe00c922ec8e13d52b443ea230425573754f0
 SHA512:
-  metadata.gz: 3f474fc31092624d6d00062167334fcf2a61fb85b2da6075d73ed74ef34ffbc9561fd74d1d2b467410cec9c72c16f1fad863320646980422da544c40c2c16b67
-  data.tar.gz: 204da8eaac3fa2fef4fdbb39b0b470807eba0c2fa969bcd4d9168739e07fc5ff2e5d9c868632621ff7bdd879c9a0c6d3adeeb2af935e2d996aff4e137723386c
+  metadata.gz: 4a72e75cf77b783ba9c787d8e2f6c95d13d9a0b842ec88e80d6080ef290bb24ee5464d55549c5ba0e4cbfb3d0fd93e12a33eab1e9ff868ee3f0181444db732fc
+  data.tar.gz: 550c34c0dc9fba9ca6b03100721beb1b3b6a5b643fa43d515b947d6cc75f0f46deb3d9a409b4a90cccdaef0e6369feb673eab583575f4b5d497eec695a4045b3

data/lib/onebox/engine/gfycat_onebox.rb

@@ -12,10 +12,6 @@ module Onebox
         1
       end
 
-      def url
-        "https://gfycat.com/cajax/get/#{match[:name]}"
-      end
-
       def to_html
         <<-HTML
           <aside class="onebox gfycat">
@@ -32,14 +28,14 @@ module Onebox
               </h4>
 
               <div class="video">
-                <video controls loop #{data[:autoplay]} muted poster="#{data[:posterUrl]}" style="--aspect-ratio: #{data[:width]}/#{data[:height]}">
+                <video controls loop muted poster="#{data[:posterUrl]}" style="--aspect-ratio: #{data[:width]}/#{data[:height]}">
                   <source id="webmSource" src="#{data[:webmUrl]}" type="video/webm">
                   <source id="mp4Source" src="#{data[:mp4Url]}" type="video/mp4">
                   <img title="Sorry, your browser doesn't support HTML5 video." src="#{data[:posterUrl]}">
                 </video>
               </div>
               <p>
-                <span class="label1">#{data[:tags]}</span>
+                <span class="label1">#{data[:keywords]}</span>
               </p>
 
             </article>
@@ -51,7 +47,7 @@ module Onebox
         <<-HTML
           <a href="#{data[:url]}">
             <img src="#{data[:posterUrl]}" width="#{data[:width]}" height="#{data[:height]}"><br/>
-            #{data[:gfyName]}
+            #{data[:name]}
           </a>
         HTML
       end
@@ -62,27 +58,53 @@ module Onebox
         @match ||= @url.match(/^https?:\/\/gfycat\.com\/(gifs\/detail\/)?(?<name>.+)/)
       end
 
+      def nokogiri_page
+        @nokogiri_page ||= begin
+          response = Onebox::Helpers.fetch_response(url, 10) rescue nil
+          Nokogiri::HTML(response)
+        end
+      end
+
+      def get_og_data
+        og_data = {}
+
+        if json_string = nokogiri_page.at_css('script[type="application/ld+json"]')&.text
+          og_data = Onebox::Helpers.symbolize_keys(::MultiJson.load(json_string))
+        end
+
+        og_data
+      end
+
       def data
+        og_data = get_og_data
 
-        total_tags = [raw['gfyItem']['tags'], raw['gfyItem']['userTags']].flatten.compact
-        tag_links = total_tags.map { |t| "<a href='https://gfycat.com/gifs/search/#{t}'>##{t}</a>" }.join(' ') if total_tags
-        autoplay = raw['gfyItem']['webmSize'].to_i < 10485760 ? 'autoplay' : ''
-
-        {
-          name: raw['gfyItem']['gfyName'],
-          title: raw['gfyItem']['title'] || 'No Title',
-          author: raw['gfyItem']['userName'],
-          tags: tag_links,
-          url: @url,
-          posterUrl: raw['gfyItem']['posterUrl'],
-          webmUrl: raw['gfyItem']['webmUrl'],
-          mp4Url: raw['gfyItem']['mp4Url'],
-          width: raw['gfyItem']['width'],
-          height: raw['gfyItem']['height'],
-          autoplay: autoplay
+        response = {
+          name: match[:name],
+          title: og_data[:headline] || 'No Title',
+          author: og_data[:author],
+          url: @url
         }
-      end
 
+        keywords = og_data[:keywords]&.split(',')
+        if keywords
+          response[:keywords] = keywords.map { |t| "<a href='https://gfycat.com/gifs/search/#{t}'>##{t}</a>" }.join(' ')
+        end
+
+        if og_data[:video]
+          content_url = ::Onebox::Helpers.normalize_url_for_output(og_data[:video][:contentUrl])
+          video_url = Pathname.new(content_url)
+          response[:webmUrl] = video_url.sub_ext(".webm").to_s
+          response[:mp4Url] = video_url.sub_ext(".mp4").to_s
+
+          thumbnail_url = ::Onebox::Helpers.normalize_url_for_output(og_data[:video][:thumbnailUrl])
+          response[:posterUrl] = thumbnail_url
+
+          response[:width] = og_data[:video][:width]
+          response[:height] = og_data[:video][:height]
+        end
+
+        response
+      end
     end
   end
 end

data/lib/onebox/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Onebox
-  VERSION = "1.8.69"
+  VERSION = "1.8.70"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 1.8.69
+  version: 1.8.70
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-13 00:00:00.000000000 Z
+date: 2018-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -414,7 +414,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A gem for generating embeddable HTML previews from URLs.