yt 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2401a0d9b81d6da08424943a09b392870081fc6
-  data.tar.gz: b1fd60bb4f1426f34182730f73bdf4641e6025d0
+  metadata.gz: fe0377f41d87e871a3db2e1380356bc53f788fa5
+  data.tar.gz: 8943b3e3187efbe011d4c73b56882daea6d1f94f
 SHA512:
-  metadata.gz: 74acf5be09a43cdbb3f7da60d275c57b5db7fb9336c4f236c0db48257b0120ebb95619a4e5a5ae8eb77a5b6450c600d0cbed14bb015a43e1d2b474c813020caf
-  data.tar.gz: 7daada1a1bc24ddd581cacbb6f2171a5947f9c387b608222dae391b664bb944d1c22a8e6d6cbcfd7df3531ae90622e200eae61eaebfbe8bf00c8e333c0475523
+  metadata.gz: 0825f5187597673a1467626df427092c874961c29b0c8f888dddc424d28a99afedaba755719a1f713e9694a9bb38762e9709d9fa6b4759af0fe83127e17af088
+  data.tar.gz: 6b0a8ab02e131601d729f6b3be3dc97464fe8c4c51f19cf7afac602fa33507b9fdd4ef45f72a2755fba4b27c220b605453969628803a6778d4e67a8d00016eba

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    yt (0.9.6)
+    yt (0.9.7)
       activesupport
 
 GEM

data/HISTORY.md

@@ -9,6 +9,7 @@ v0.9 - 2014/07/28
 * Add actual_start_time, actual_end_time, scheduled_start_time, scheduled_end_time for live-streaming videos
 * Add privacy_status, public_stats_viewable, publish_at to the options that Video#update accepts
 * Allow angle brackets when editing title, description, tags and replace them with similar characters allowed by YouTube
+* Correctly parse duration of videos longer than 24 hours
 
 v0.8 - 2014/07/18
 -----------------

data/README.md

@@ -41,7 +41,7 @@ To install on your system, run
 
 To use inside a bundled Ruby project, add this line to the Gemfile:
 
-    gem 'yt', '~> 0.9.6'
+    gem 'yt', '~> 0.9.7'
 
 Since the gem follows [Semantic Versioning](http://semver.org),
 indicating the full version in your Gemfile (~> *major*.*minor*.*patch*)

data/Rakefile

@@ -17,7 +17,7 @@ require "rspec/core/version"
 #   API to work again.
 desc "Run all examples except ones with access to Content Owner"
 RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = '--tag ~partner'
+  t.rspec_opts = '--tag ~partner --tag ~device_app'
 end
 
 task default: [:spec]

data/lib/yt/models/content_detail.rb

@@ -39,19 +39,35 @@ module Yt
 
     private
 
-      # The duration of the resource as reported by YouTube. The value is an
-      # ISO 8601 duration in the format PT#M#S, in which the letters PT
-      # indicate that the value specifies a period of time, and the letters M
-      # and S refer to length in minutes and seconds, respectively. The #
-      # characters preceding the M and S letters are both integers that specify
-      # the number of minutes (or seconds) of the video. For example, a value
-      # of PT15M51S indicates that the video is 15 minutes and 51 seconds long.
+      # @return [Integer] the duration of the resource as reported by YouTube.
+      # @see https://developers.google.com/youtube/v3/docs/videos
+      #
+      # According to YouTube documentation, the value is an ISO 8601 duration
+      # in the format PT#M#S, in which the letters PT indicate that the value
+      # specifies a period of time, and the letters M and S refer to length in
+      # minutes and seconds, respectively. The # characters preceding the M and
+      # S letters are both integers that specify the number of minutes (or
+      # seconds) of the video. For example, a value of PT15M51S indicates that
+      # the video is 15 minutes and 51 seconds long.
+      #
+      # The ISO 8601 duration standard, though, is not +always+ respected by
+      # the results returned by YouTube API. For instance: video 2XwmldWC_Ls
+      # reports a duration of 'P1W2DT6H21M32S', which is to be interpreted as
+      # 1 week, 2 days, 6 hours, 21 minutes, 32 seconds. Mixing weeks with
+      # other time units is not strictly part of ISO 8601; in this context,
+      # weeks will be interpreted as "the duration of 7 days". Similarly, a
+      # day will be interpreted as "the duration of 24 hours".
+      # Video tPEE9ZwTmy0 reports a duration of 'PT2S'. Skipping time units
+      # such as minutes is not part of the standard either; in this context,
+      # it will be interpreted as "0 minutes and 2 seconds".
       def to_seconds(iso8601_duration)
-        match = iso8601_duration.match %r{^PT(?:|(?<hours>\d*?)H)(?:|(?<min>\d*?)M)(?:|(?<sec>\d*?)S)$}
+        match = iso8601_duration.match %r{^P(?:|(?<weeks>\d*?)W)(?:|(?<days>\d*?)D)(?:|T(?:|(?<hours>\d*?)H)(?:|(?<min>\d*?)M)(?:|(?<sec>\d*?)S))$}
+        weeks = (match[:weeks] || '0').to_i
+        days = (match[:days] || '0').to_i
         hours = (match[:hours] || '0').to_i
         minutes = (match[:min] || '0').to_i
         seconds = (match[:sec]).to_i
-        (hours * 60 + minutes) * 60 + seconds
+        (((((weeks * 7) + days) * 24 + hours) * 60) + minutes) * 60 + seconds
       end
     end
   end

data/lib/yt/version.rb

@@ -1,3 +1,3 @@
 module Yt
-  VERSION = '0.9.6'
+  VERSION = '0.9.7'
 end

data/spec/models/content_detail_spec.rb

@@ -5,6 +5,16 @@ describe Yt::ContentDetail do
   subject(:content_detail) { Yt::ContentDetail.new data: data }
 
   describe '#duration' do
+    context 'given a content_detail with duration in weeks, days, hours, minutes' do
+      let(:data) { {"duration"=>"P1W2DT6H21M32S"}}
+      it { expect(content_detail.duration).to eq 800492 }
+    end
+
+    context 'given a content_detail with duration in days' do
+      let(:data) { {"duration"=>"P1D"}}
+      it { expect(content_detail.duration).to eq 86400 }
+    end
+
     context 'given a content_detail with duration in hours, minutes, seconds' do
       let(:data) { {"duration"=>"PT1H18M52S"} }
       it { expect(content_detail.duration).to eq 4732 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yt
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Claudio Baccigalupo