onebox 1.8.20 → 1.8.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0d747ccf49e968f722763eca04698951e5c7e68
-  data.tar.gz: 35af72508f38423f9967f3eef0d1e91a13a5dbb7
+  metadata.gz: eafb5f0b66a7560af96e2b5edb0457514d181968
+  data.tar.gz: 9ecbf40e30463e624df105d5ef1643a6421875a2
 SHA512:
-  metadata.gz: 461d1871c66df3448f96e8a6283bea3be8476cae3352b25708913734dd3af2ecd93eee2f413b0459a3a25bb3ed7f984644fda7825cbef147a9b27f1bc4403629
-  data.tar.gz: 5751126eacb1be8122f6ff008fb981a6e38ec00fb4c02586a6662a28ad817d9e65d666fb3d279c51bb53f221f25717ff9bf3b1531a9110c43270c6d8c1baebba
+  metadata.gz: 87bfa72f7fbc7fbf6971d955fa9f87515f7eaaf80f4d4ea009c34cd1970d5fb03964adef45e4d4b9e29a6877189a017a80fc8e2ff03a7a0597141a016745cc76
+  data.tar.gz: 9954790f0a61a7394935346249bf11a43d3e118890d7a6ca8629fd39c59ae2d063311242e7469998275ec5321fce11a2740cc94ca907dfb6f93833fe0f204942

data/lib/onebox/engine/twitch_stream_onebox.rb

@@ -3,7 +3,7 @@ require_relative '../mixins/twitch_onebox'
 class Onebox::Engine::TwitchStreamOnebox
 
   def self.twitch_regexp
-    /^https?:\/\/(?:www\.)?twitch\.tv\/(?!directory)([a-zA-Z0-9_]{4,25})$/
+    /^https?:\/\/(?:www\.|go\.)?twitch\.tv\/(?!directory)([a-zA-Z0-9_]{4,25})$/
   end
   include Onebox::Mixins::TwitchOnebox
 

data/lib/onebox/engine/whitelisted_generic_onebox.rb

@@ -217,10 +217,10 @@ module Onebox
           d[:video] = d[:video_secure_url] || d[:video_url] || d[:video]
 
           # Twitter labels
-          d[:label1] = Sanitize.fragment(Onebox::Helpers.truncate(d[:label1].strip))
-          d[:data1] = Sanitize.fragment(Onebox::Helpers.truncate(d[:data1].strip))
-          d[:label2] = Sanitize.fragment(Onebox::Helpers.truncate(d[:label2].strip))
-          d[:data2] = Sanitize.fragment(Onebox::Helpers.truncate(d[:data2].strip))
+          d[:label1] = Sanitize.fragment(Onebox::Helpers.truncate(d[:label1].strip)) unless Onebox::Helpers.blank?(d[:label1])
+          d[:data1] = Sanitize.fragment(Onebox::Helpers.truncate(d[:data1].strip)) unless Onebox::Helpers.blank?(d[:data1])
+          d[:label2] = Sanitize.fragment(Onebox::Helpers.truncate(d[:label2].strip)) unless Onebox::Helpers.blank?(d[:label2])
+          d[:data2] = Sanitize.fragment(Onebox::Helpers.truncate(d[:data2].strip)) unless Onebox::Helpers.blank?(d[:data2])
 
           d
         end

data/lib/onebox/version.rb

@@ -1,3 +1,3 @@
 module Onebox
-  VERSION = "1.8.20"
+  VERSION = "1.8.21"
 end

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

@@ -7,4 +7,9 @@ describe Onebox::Engine::TwitchStreamOnebox do
 
   end
 
+  it "works in the twitch new interface/url" do
+    expect(Onebox.preview('https://go.twitch.tv/admiralbulldog').to_s).to match(/<iframe src="\/\/player\.twitch\.tv\/\?channel=admiralbulldog/)
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 1.8.20
+  version: 1.8.21
 platform: ruby
 authors:
 - Joanna Zeta