onebox 1.9.23 → 1.9.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c59fdb0a75faf98373d219999658d29423c81273fc2540b288721e083261d000
-  data.tar.gz: 842cfdd7957c5fd862ec7ed7931d5d61adf96656577bb2fe3c837dff436e4e57
+  metadata.gz: bf558389e0bd7431942769ee39ee40f770245463e97e25400accfe3a130af77f
+  data.tar.gz: 23d64fbf25b722401c33aac9f0230a1d9d904d9db13794041b744c7d43165bec
 SHA512:
-  metadata.gz: 67c38c486f923c0dece67558435c43b0f80759e5020a360a726087b211eb17ffe932df872fd1d61f615935e32559ad895f7dcf05c48820d1720efd0b14b821d7
-  data.tar.gz: 3dff1e9e38bf2a4a9940688f5399e851ce9ee5607ab917caf41a2435e01cfccda13808959fd8e804e3e1c39a3cef4579bd85f2ddfc68ac02bc129dd4a33053e5
+  metadata.gz: 06dfe747b8a6408ef1a34c07410f32baf4d94d1cf986edee4e5267daa2eb81278569e1263bc2c9565f20ac123f93c5ca35d324f3eba6140044cfb6169b499652
+  data.tar.gz: 1e6c04cea5599d7d1121c7e6ff502ca0d723fd3037e1955289ff26dce5eb74350db399ffa9293d7f9286971ef9b3cf5e88409ef30eeb454675b738c8924e1c64

data/lib/onebox/engine/pastebin_onebox.rb

@@ -52,7 +52,7 @@ module Onebox
 
         nil
       rescue
-        return nil
+        nil
       end
     end
   end

data/lib/onebox/engine/pdf_onebox.rb

@@ -25,7 +25,7 @@ module Onebox
       def get_pdf_info
         uri = URI.parse(@url)
         size = Onebox::Helpers.fetch_content_length(@url)
-        return {
+        {
           filesize: size ? Onebox::Helpers.pretty_filesize(size.to_i) : nil,
           name: File.basename(uri.path)
         }

data/lib/onebox/engine/vimeo_onebox.rb

@@ -6,24 +6,23 @@ module Onebox
       include Engine
       include StandardEmbed
 
-      # only match private Vimeo video links
-      matches_regexp(/^https?:\/\/(www\.)?vimeo\.com\/\d+\/[^\/]+?$/)
+      matches_regexp(/^https?:\/\/(www\.)?vimeo\.com\/\d+/)
       always_https
 
       WIDTH  ||= 640
       HEIGHT ||= 360
 
       def placeholder_html
-        image_src = og_data.image_secure_url || og_data.image_url
-        "<img src='#{image_src}' width='#{WIDTH}' height='#{HEIGHT}' #{og_data.title_attr}>"
+        ::Onebox::Helpers.video_placeholder_html
       end
 
       def to_html
-        video_src = og_data.video_secure_url || og_data.video_url
-        if video_src.nil?
-          id = uri.path[/\/(\d+)/, 1]
-          video_src = "https://player.vimeo.com/video/#{id}"
+        video_id = oembed_data[:video_id]
+        if video_id.nil?
+          # for private videos
+          video_id = uri.path[/\/(\d+)/, 1]
         end
+        video_src = "https://player.vimeo.com/video/#{video_id}"
         video_src = video_src.gsub('autoplay=1', '').chomp("?")
         <<-HTML
           <iframe width="#{WIDTH}"
@@ -38,6 +37,13 @@ module Onebox
 
       private
 
+      def oembed_data
+        response = Onebox::Helpers.fetch_response("https://vimeo.com/api/oembed.json?url=#{url}")
+        @oembed_data = Onebox::Helpers.symbolize_keys(::MultiJson.load(response))
+      rescue
+        "{}"
+      end
+
       def og_data
         @og_data = get_opengraph
       end

data/lib/onebox/engine/wechat_mp_onebox.rb

@@ -26,7 +26,7 @@ module Onebox
       def extract_script_value(var_name)
         if (script_elem = raw.css("script").select { |script| script.inner_text.include? "var #{var_name} = " }) && script_elem.any?
           e = Nokogiri::HTML(script_elem[0].inner_text.match(/var\s+#{Regexp.quote(var_name)}\s+=\s+"(.*?)";/)[1])
-          return CGI::unescapeHTML(e.text.scan(/(?:\\x([a-f0-9]{2}))|(.)/i).map { |x| x[0] ? [x[0].to_i(16)].pack('U') : x[1] }.join)
+          CGI::unescapeHTML(e.text.scan(/(?:\\x([a-f0-9]{2}))|(.)/i).map { |x| x[0] ? [x[0].to_i(16)].pack('U') : x[1] }.join)
         end
       end
 

data/lib/onebox/helpers.rb

@@ -132,7 +132,7 @@ module Onebox
         end
       end
       ndx = 7
-      return "#{'%.2f' % (size / (scale**(ndx - 1)))} #{conv[ndx - 1]}"
+      "#{'%.2f' % (size / (scale**(ndx - 1)))} #{conv[ndx - 1]}"
     end
 
     def self.click_to_scroll_div(width = 690, height = 400)

data/lib/onebox/version.rb

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

data/onebox.gemspec

@@ -32,7 +32,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'fakeweb', '~> 1.3'
   spec.add_development_dependency 'pry', '~> 0.10'
   spec.add_development_dependency 'mocha', '~> 1.1'
-  spec.add_development_dependency 'rubocop', '~> 0.50'
+  spec.add_development_dependency 'rubocop', '~> 0.69.0'
+  spec.add_development_dependency 'rubocop-discourse', '~> 1.0.1'
   spec.add_development_dependency 'twitter', '~> 4.8'
   spec.add_development_dependency 'guard-rspec', '~> 4.2.8'
   spec.add_development_dependency 'sinatra', '~> 1.4'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 1.9.23
+  version: 1.9.24
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-20 00:00:00.000000000 Z
+date: 2019-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -172,14 +172,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.50'
+        version: 0.69.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.50'
+        version: 0.69.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-discourse
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: twitter
   requirement: !ruby/object:Gem::Requirement
@@ -407,7 +421,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: A gem for generating embeddable HTML previews from URLs.