yt-annotations 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b11e5000de51c3368ae436830f73718c62ee3c79
-  data.tar.gz: 9c423d7614330f65be5dc065c773929219612162
+  metadata.gz: 5af7335a71c02853df3dc551ac1644636fbfeb08
+  data.tar.gz: 972ddc78ffc07d534dc907218a3187bcb8bc0b89
 SHA512:
-  metadata.gz: 6627dc40354ae491ee2db22b372f6ef5dd610a70112838066bdd12e2af703cc3338378d589dd7ccaa1bb7410930d00af60ddad392c9f73e7407c333a379022c8
-  data.tar.gz: 267e86f1fbb728fa20d9059cf2cbdbd639d0045287261059160989f74eaf6c12781839a9f5365883221e5ade4258ca888557eafac2b33028e3212ee042cb6040
+  metadata.gz: ab38e436b2323ee00fbd2d9643c44138f9c4b3dabbb7f12ae787a2ab47002b44eafc19765519559954f49bdbe43b685939a5886f63239b248c76f3f7258efc48
+  data.tar.gz: 72cc855dea18be49d1a17db7662eecbd6874c5cb536936847d3a72900e4639fb569462e599dd06332fbce59b04824d1e1b3a0c19208314473391ad35a7748421

data/CHANGELOG.md

@@ -7,6 +7,10 @@ For more information about changelogs, check
 [Vandamme](http://tech-angels.github.io/vandamme).
 
 
+## 1.4.1 - 2017.03.31
+
+* [BUGFIX] Change `EndScreen` according to its endpoint change on YouTube
+
 ## 1.4.0 - 2017.01.13
 
 * [FEATURE] Add End Screens

data/lib/yt/annotations/end_screen.rb

@@ -7,8 +7,8 @@ module Yt
       # @param [Hash] data the Hash representation of the XML data returned by
       #   YouTube for each end screen of a video.
       def initialize(json = {})
-        @text = json['title']
-        @starts_at = json['startMs'] / 1000.0
+        @text = json['title']['runs'][0]['text']
+        @starts_at = json['startMs'].to_i / 1000.0
         @ends_at = ends_at_in json
         @link = to_link json
       end
@@ -16,25 +16,45 @@ module Yt
     private
 
       def ends_at_in(json)
-        (json['startMs'] + json['durationMs']) / 1000.0
+        json['endMs'].to_i / 1000.0
       end
 
       def to_link(json)
+        target_url = case json['style']
+          when 'WEBSITE'
+            json['endpoint']['urlEndpoint']['url']
+          when 'PLAYLIST'
+            "https://www.youtube.com/watch?v=" +
+            json['endpoint']['watchEndpoint']['videoId'] +
+            "&list=" +
+            json['endpoint']['watchEndpoint']['playlistId']
+          when 'VIDEO'
+            "https://www.youtube.com/watch?v=" +
+            json['endpoint']['watchEndpoint']['videoId']
+          when 'CHANNEL'
+            if json['isSubscribe']
+              "https://www.youtube.com/channel/" +
+              json['hovercardButton']['subscribeButtonRenderer']['channelId']
+            else
+              "https://www.youtube.com/channel/" +
+              json['endpoint']['browseEndpoint']["browseId"]
+            end
+          end
         {
-          url: json['targetUrl'], new_window: new_window(json['type']), 
+          url: target_url, new_window: new_window(json['style']),
           type: link_type(json)
         }
       end
-      
+
       def link_type(json)
-        case json['type']
+        case json['style']
           when 'WEBSITE' then :website
           when 'PLAYLIST' then :playlist
           when 'VIDEO' then :video
           when 'CHANNEL' then (json['isSubscribe'] ? :subscribe : :channel)
         end
       end
-      
+
       def new_window(type)
         %w(WEBSITE CHANNEL).include? type
       end

data/lib/yt/annotations/for.rb

@@ -46,7 +46,7 @@ module Yt
 
       def json_to_annotations(json)
         annotations = json['elements']
-        annotations.map{|data| Annotations::EndScreen.new data}
+        annotations.map{|data| Annotations::EndScreen.new data['endscreenElementRenderer']}
       end
 
       def annotation_class(data)

data/lib/yt/annotations/version.rb

@@ -1,5 +1,5 @@
 module Yt
   module Annotations
-    VERSION = '1.4.0'
+    VERSION = '1.4.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yt-annotations
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - claudiob
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-13 00:00:00.000000000 Z
+date: 2017-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Fetch annotations and cards from YouTube videos.