onebox 1.9.28 → 1.9.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f75f019a1f1010a08e3f1e054f571364f34258849587b38cc87f325df8cbb16
-  data.tar.gz: 3e51c2164d33a7e0e093745c2e36a841946fee472da1790f8bb1dc6ceca63649
+  metadata.gz: c996c2a3781e2a1d668b65673e7ac68ff530354a6290b83a135fc4e9994525b1
+  data.tar.gz: 3b2b00129314e9dcfc1cc4acaeb8b3455e675f5eeefae1d732c18cf9d80cbd7c
 SHA512:
-  metadata.gz: ae466b4cad8aaf006383e2a6e8426e383170344272ce8a80ba2752a49461bf0acd71b02e976566cb6ed5f449e7903ea534e4895a8a991a1672319593aee53ba7
-  data.tar.gz: ed6f0545e705ca84509affc4a0f532cc95e24b9cb0ca83cc2e8a7160d4e253b32adf4d11e05f377796f23a0ac3ddb3201670cf7397effe2914b9381818775100
+  metadata.gz: d99a41fe572876a523e9abec9319db2abb929745ed33570c814cdf7715378e75a1ad9e8f24d4ede3106a8b86b47dbccddef31e056b3f2561728eec5f6f3baa74
+  data.tar.gz: 7ea34a65e1424176cea0711ca4c2421e6e38ec4cd2b2d1830ca254e98cfb36d1039ba33cba169874ea83a0cde65171b4a7a6d75ceede019bbf11109c6cc74bd7

data/.rubocop.yml

@@ -1 +1,2 @@
-inherit_from: https://raw.githubusercontent.com/discourse/discourse/master/.rubocop.yml
+inherit_gem:
+  rubocop-discourse: default.yml

data/README.md

@@ -46,6 +46,14 @@ preview = Onebox.preview(url)
 "#{preview}" == preview.to_s #=> true
 ```
 
+### Twitch Onebox
+
+To be able to embed Twitch video and clips, pass `hostname` in the options to `Onebox.preview`
+
+```ruby
+preview = Onebox.preview(url, hostname: 'www.example.com')
+```
+
 Ruby Support
 ------------
 

data/lib/onebox/engine/instagram_onebox.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'htmlentities'
-
 module Onebox
   module Engine
     class InstagramOnebox
@@ -9,25 +7,28 @@ module Onebox
       include StandardEmbed
       include LayoutSupport
 
-      matches_regexp(/^https?:\/\/(?:www\.)?(?:instagram\.com|instagr\.am)\/?(?:.*)\/p\//)
+      matches_regexp(/^https?:\/\/(?:www\.)?(?:instagram\.com|instagr\.am)\/?(?:.*)\/p\/[a-zA-Z\d_-]+/)
       always_https
 
-      def data
-        og = get_opengraph
-        title = og.title.split(":")[0].strip.gsub(" on Instagram", "")
-
-        json_data = html_doc.xpath('//script[contains(text(),"window._sharedData")]').text.to_s
-        title = "[Album] #{title}" if json_data =~ /"edge_sidecar_to_children"/
+      def clean_url
+        url.scan(/^https?:\/\/(?:www\.)?(?:instagram\.com|instagr\.am)\/?(?:.*)\/p\/[a-zA-Z\d_-]+/).flatten.first
+      end
 
-        result = { link: og.url,
-                   title: Onebox::Helpers.truncate(title, 80),
-                   description: og.description(250)
-                  }
+      def data
+        oembed = get_oembed
+        permalink = clean_url.gsub("/#{oembed.author_name}/", "/")
+
+        { link: permalink,
+          title: "@#{oembed.author_name}",
+          image: "#{permalink}/media/?size=l",
+          description: Onebox::Helpers.truncate(oembed.title, 250)
+        }
+      end
 
-        result[:image] = og.image if !og.image.nil?
-        result[:video_link] = og.url if !og.video_secure_url.nil?
+      protected
 
-        result
+      def get_oembed_url
+        oembed_url = "https://api.instagram.com/oembed/?url=#{clean_url}"
       end
     end
   end

data/lib/onebox/engine/reddit_media_onebox.rb

@@ -37,7 +37,7 @@ module Onebox
                 <div class="aspect-image-full-size">
                   <a href="#{raw[:url]}" target="_blank" rel="nofollow ugc noopener">
                     <img src="#{raw[:image]}" class="scale-image"/>
-                    <span class="reddit-video-icon"></span>
+                    <span class="instagram-video-icon"></span>
                   </a>
                 </div>
                 <div class="description"><p>#{raw[:description]}</p></div>

data/lib/onebox/engine/twitter_status_onebox.rb

@@ -10,10 +10,14 @@ module Onebox
       matches_regexp(/^https?:\/\/(mobile\.|www\.)?twitter\.com\/.+?\/status(es)?\/\d+(\/(video|photo)\/\d?+)?+(\/?\?.*)?\/?$/)
       always_https
 
+      def http_params
+        { 'User-Agent' => 'DiscourseBot/1.0' }
+      end
+
       private
 
       def get_twitter_data
-        response = Onebox::Helpers.fetch_response(url) rescue nil
+        response = Onebox::Helpers.fetch_response(url, nil, nil, http_params) rescue nil
         html = Nokogiri::HTML(response)
         twitter_data = {}
         html.css('meta').each do |m|

data/lib/onebox/mixins/twitch_onebox.rb

@@ -24,7 +24,9 @@ module Onebox
         end
 
         def to_html
-          "<iframe src=\"//#{base_url}#{query_params}&autoplay=false\" width=\"620\" height=\"378\" frameborder=\"0\" style=\"overflow: hidden;\" scrolling=\"no\" allowfullscreen=\"allowfullscreen\"></iframe>"
+          <<~HTML
+          <iframe src="//#{base_url}#{query_params}&parent=#{options[:hostname]}&autoplay=false" width="620" height="378" frameborder="0" style="overflow: hidden;" scrolling="no" allowfullscreen="allowfullscreen"></iframe>
+          HTML
         end
       end
     end

data/lib/onebox/version.rb

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

data/onebox.gemspec

@@ -33,8 +33,7 @@ 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.78.0'
-  spec.add_development_dependency 'rubocop-discourse', '~> 1.0.1'
+  spec.add_development_dependency 'rubocop-discourse', '~> 2.1.2'
   spec.add_development_dependency 'twitter', '~> 4.8'
   spec.add_development_dependency 'guard-rspec', '~> 4.2.8'
   spec.add_development_dependency 'sinatra', '~> 1.4'

data/templates/instagram.mustache

@@ -2,9 +2,9 @@
 
 {{#image}}
   <div class="instagram-images">
-    {{#video_link}} <a href="{{{video_link}}}" target="_blank" rel="noopener"> {{/video_link}}
+    <a href="{{{link}}}" target="_blank" rel="noopener">
       <img class="instagram-image" src="{{{image}}}"/>
-    {{#video_link}} <span class="instagram-video-icon"></span></a> {{/video_link}}
+    </a>
   </div>
 {{/image}}
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 1.9.28
+  version: 1.9.29
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-06 00:00:00.000000000 Z
+date: 2020-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -180,34 +180,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.78.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.78.0
 - !ruby/object:Gem::Dependency
   name: rubocop-discourse
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 2.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: twitter
   requirement: !ruby/object:Gem::Requirement
@@ -434,7 +420,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A gem for generating embeddable HTML previews from URLs.