yt 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fe44dc454cc59b8d2d6dbb940704f004208c935
-  data.tar.gz: 155dc1491d986ff2e1299088766e7f25731bf314
+  metadata.gz: adb060424b5ef66ace1e77ddc760ec71bf568c07
+  data.tar.gz: 62e91a94a4e1af527360b217824ac2bdad530c0a
 SHA512:
-  metadata.gz: 09ea630bf75f3d65d83aea52f1c6126bf96e81e9a483c60cf5a575d73b2ff2a57ea879d0d4915479aa158198196684b98ba52f3c9676bf7b985dbc24e44ef124
-  data.tar.gz: 2d842bc0e8c7cc5d522d9dacf482a02e11ec0e761710a05d08f3303a3b4cd35e873f1050771abcd37d80f48fe3a3a92b8df95f080a416691575e2bf863ffbfce
+  metadata.gz: 742c01386c4e89187899dfbf544c34c5f2a4c513001cb03efc46434f03f35c56aa0fb2ea587566aa5b8419112f7aeaec8ad62abe8641e99e07e931ffa4b3f44e
+  data.tar.gz: d438cabdca24c141d39314b88d43453323a0c04a17afd0d6d1378e2f11ed8eb17f8841ae7d8d8597ad1654f7f783c093f4ff3d04a2b13e3370d49172b7e103c3

data/.rspec

@@ -1,2 +1,3 @@
 --format documentation
 --color
+--fail-fast

data/.travis.yml

@@ -1,11 +1,18 @@
 language: ruby
-rvm:
-- 2.0.0
 notifications:
   email: false
+matrix:
+  include:
+  - rvm: 1.9.3
+    gemfile: gemfiles/Gemfile.activesupport-3.x
+    env:
+    - secure: DAvQ18qN71nRGkM+kOklTi6InE3dM98BgQAagve2S8/D76VXc+Hyl1It+/v73CrCuDdKTJpVl2a7pc+W5x+JG+PDo4X4ZXFURyvv417nywJulsda4y/TcTe59WHFGTQ/maj3l5PLPmENpROBU8/2HBGOSny0aNNkbnRXrTx3dU4=
+  - rvm: 2.0.0
+    gemfile: gemfiles/Gemfile.activesupport-4.x
+    env:
+    - secure: D57A44s/W77P3JLarTwELEjIeFtOKVcUtM2M7fKot6qfiDGF3azsWUoW0rrQG6hCUSop32UUeYQdnUmdhqWc89k0jtVKpW1I3UyV36iacKXevsfe/w6Q4CCHCi3udPVsEvt36ZQ2LtGMs0seUxujDaI1sqrfn3zMSXyVcSTjceg=
 env:
   global:
-  - secure: UPTXrTnEtwOW3MZLjGmKmllUflKEQ9ICjELS5j3ucScIyW+q8idf7EEuj03n2FKN/zGNo1BDxLbMxzh+1jBhugGxIF0gmSXQ4tborLMkYtQ07rAWemHGCx3RicDlAWSuqz9tDkMILsasK74LgbfaEeJYI6xfAvOm+em/7jxUk5w=
-  - secure: Gkg2vV9NFxvA6TUpl4d10HZNtYB2j1qP5nwlIWuDwV79Wbst2u+sgUX6nCTcQA1L4EgHQqfXXM6NHUrLevT45kj6DuG2C/sJUudttqfB5VmfK7nNT617BlqgiZuNjNWCnD9CK5zAdHUo2ukxiXKyl/WhYIhBA59fsGbFynbUISM=
-  - secure: RLWA00fvwiyk2JooX+ePrwPfUCWE1aunuA9STogRiwwUYO237lU35hDkuE7+0GMJAtfWDkuG5f4+8oWsOf0sBytebgxhJ25Uxi6uWlsukuXRM028Z8yjMzgLzmke5InICIVKzPWyvjlphB14nP4PoSrPl9RlHgs4LuJ4l/OkbEQ=
-  - secure: RuYxzoTiam6GLIoP3xkhU9eaW3kjyxnOLYqBjjezhEHXrExDQinO5/k2NsHy2Y8iZSlKxMAG+DJJ45WAObNpg3fAPC/ExrzGyNX1u3qCQU481HbVZTJa8vg9IrJsSxCYyawdcbd7tgULiuRZacMmamsXLSJymLofF7LE0jA2KPA=
+  - secure: KFozlRmcSFzZIl8nXPZ5HIf+MAvgK4I7FYsTYyAMW7LsRJJ4NAJJCHAbWZUfmbqygUN188zj2y0TbQUu47lEf7v2XvJu6DFCYw+e4sk6lSW8V5jRzWl1f6DOKb1z+FBpUgJHj9OKykqjdtm3zVLWr56xm3fhB+ULDj8XVOVxyLk=
+  - secure: e/p7BLWhc8BBiXkxM3zXPj3x/8PqUT0ERRfUFYXAnZRZ0gmACtig590nZY7FLeNhBQMORuHt/ZE5DCuNZRaOIdauQqV4rP46U5CJBWe2RNzDi1L+nctUCSKDwVDIVl/r5yEP22om4g5s1xhWfc8wlJF2VEnfLcq80ca1vK+e1ds=
+  - secure: VpOIZVcckArwpoVs/fppUFEJEOI3e6zv2L5rP/vj0Uxl1hOHgg1emedjzM7x2wxKMi/L2g5ot9Oz6H9N1Y0FXzB1L49Hy3hla2nKBcecgvqk1z5InTpx6eiBDQqJAoZurCCmkdfKjVtWfb0CAdOX9Euio5DxqcnIcIVIiWpD5BE=

data/Gemfile

@@ -1,9 +1,4 @@
 source 'https://rubygems.org'
 
-# Add 'binding.pry'_remote to debug your code, then use 'next', 'continue', ...
-gem 'pry', require: 'pry'
-gem 'pry-nav'
-gem 'pry-remote'
-
 # Specify your gem's dependencies in yt.gemspec
 gemspec

data/Gemfile.lock

@@ -1,19 +1,18 @@
 PATH
   remote: .
   specs:
-    yt (0.4.4)
+    yt (0.4.5)
       activesupport
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.0)
+    activesupport (4.1.1)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    coderay (1.1.0)
     coveralls (0.7.0)
       multi_json (~> 1.3)
       rest-client
@@ -24,19 +23,9 @@ GEM
     docile (1.1.3)
     i18n (0.6.9)
     json (1.8.1)
-    method_source (0.8.2)
     mime-types (2.2)
     minitest (5.3.3)
-    multi_json (1.9.2)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    pry-nav (0.2.3)
-      pry (~> 0.9.10)
-    pry-remote (0.1.8)
-      pry (~> 0.9)
-      slop (~> 3.0)
+    multi_json (1.10.0)
     rake (10.3.1)
     rest-client (1.6.7)
       mime-types (>= 1.16)
@@ -53,12 +42,11 @@ GEM
       multi_json
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    slop (3.5.0)
     term-ansicolor (1.3.0)
       tins (~> 1.0)
     thor (0.19.1)
     thread_safe (0.3.3)
-    tins (1.1.0)
+    tins (1.2.0)
     tzinfo (1.1.0)
       thread_safe (~> 0.1)
     yard (0.8.7.4)
@@ -67,11 +55,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.3)
+  bundler
   coveralls
-  pry
-  pry-nav
-  pry-remote
   rake
   rspec
   yard

data/HISTORY.md

@@ -1,8 +1,10 @@
-v0.4.0 - 2014/05/09
+v0.4 - 2014/05/09
 --------------------
 
 * Complete rewrite, using ActiveSupport and separating models and collections
 * New methods to handle annotations, details sets
+* Supports also ActiveSupport 3 and Ruby 1.9.3 (not just AS4 + Ruby 2)
+* Fix parsing annotation and timestamps longer than 1 hour
 
 v0.3.0 - 2014/04/16
 --------------------

data/README.md

@@ -4,12 +4,12 @@ Yt
 Yt helps you write apps that need to interact with the YouTube API V3.
 
 [![Gem Version](https://badge.fury.io/rb/yt.svg)](http://badge.fury.io/rb/yt)
-[![Dependency Status](https://gemnasium.com/fullscreeninc/googol.png)](https://gemnasium.com/fullscreeninc/googol)
-[![Build Status](https://travis-ci.org/fullscreeninc/googol.png?branch=master)](https://travis-ci.org/fullscreeninc/googol)
-[![Coverage Status](https://coveralls.io/repos/fullscreeninc/googol/badge.png)](https://coveralls.io/r/fullscreeninc/googol)
-[![Code Climate](https://codeclimate.com/github/fullscreeninc/googol.png)](https://codeclimate.com/github/fullscreeninc/googol)
+[![Dependency Status](https://gemnasium.com/fullscreeninc/yt.png)](https://gemnasium.com/fullscreeninc/yt)
+[![Build Status](https://travis-ci.org/fullscreeninc/yt.png?branch=master)](https://travis-ci.org/fullscreeninc/yt)
+[![Coverage Status](https://coveralls.io/repos/fullscreeninc/yt/badge.png?)](https://coveralls.io/r/fullscreeninc/yt)
+[![Code Climate](https://codeclimate.com/github/fullscreeninc/yt.png)](https://codeclimate.com/github/fullscreeninc/yt)
 
-After [registering your app], you can run commands like:
+After [registering your app](#registering-your-app), you can run commands like:
 
 ```ruby
 channel = Yt::Channel.new id: 'UCxO1tY8h1AhOz0T4ENwmpow'
@@ -33,7 +33,7 @@ Available resources
 Yt::Account
 -----------
 
-Use [Yt::Account](link to doc) to:
+Use [Yt::Account](http://rubydoc.info/github/fullscreeninc/yt/master/Yt/Account) to:
 
 * authenticate as a YouTube account
 * read attributes of the account
@@ -52,7 +52,7 @@ account.channel #=> #<Yt::Channel @id=...>
 Yt::Channel
 -----------
 
-Use [Yt::Channel](link to doc) to:
+Use [Yt::Channel](http://rubydoc.info/github/fullscreeninc/yt/master/Yt/Channel) to:
 
 * read attributes of a channel
 * access the videos of a channel
@@ -85,7 +85,7 @@ channel.delete_playlists title: 'New playlist' #=> [true]
 Yt::Video
 -----------
 
-Use [Yt::Video](link to doc) to:
+Use [Yt::Video](http://rubydoc.info/github/fullscreeninc/yt/master/Yt/Video) to:
 
 * read attributes of a video
 * access the annotations of a video
@@ -110,7 +110,7 @@ video.like #=> true
 Yt::Playlist
 ------------
 
-Use [Yt::Playlist](link to doc) to:
+Use [Yt::Playlist](http://rubydoc.info/github/fullscreeninc/yt/master/Yt/Playlist) to:
 
 * read attributes of a playlist
 * access the items of a playlist
@@ -126,20 +126,20 @@ playlist.playlist_items.count #=> 1
 playlist.playlist_items.first #=> #<Yt::PlaylistItem @id=...>
 playlist.playlist_items.first.position #=> 0
 playlist.playlist_items.first.video.title #=> "Fullscreen Creator Platform"
-playlist.delete_playlist_items title: 'Fullscreen Creator Platform' #=> [true]
 
 # An OAuth2 prompt will appear before the following commands
 playlist.add_video 'MESycYJytkU'
 playlist.add_videos ['MESycYJytkU', 'MESycYJytkU']
+playlist.delete_playlist_items title: 'Fullscreen Creator Platform' #=> [true]
 ```
 
-*Adding videos requires authentication (see below).*
+*Adding and removing videos/items requires authentication (see below).*
 
 
 Yt::Annotation
 --------------
 
-Use [Yt::Annotation](link to doc) to:
+Use [Yt::Annotation](http://rubydoc.info/github/fullscreeninc/yt/master/Yt/Annotation) to:
 
 * read attributes of an annotation
 
@@ -204,7 +204,7 @@ refresh token, then add the following snippet of code to the initializer of your
 
 ```ruby
 Yt.configure do |config|
-  config.client_id = '1234567890.apps.googleusercontent.com
+  config.client_id = '1234567890.apps.googleusercontent.com'
   config.client_secret = '1234567890'
 end
 ```
@@ -247,7 +247,7 @@ refresh token, then add the following snippet of code to the initializer of your
 ```ruby
 Yt.configure do |config|
   config.scenario = :device_app
-  config.client_id = '1234567890.apps.googleusercontent.com
+  config.client_id = '1234567890.apps.googleusercontent.com'
   config.client_secret = '1234567890'
 end
 ```
@@ -276,7 +276,7 @@ To install on your system, run
 
 To use inside a bundled Ruby project, add this line to the Gemfile:
 
-    gem 'yt', '~> 0.4.4'
+    gem 'yt', '~> 0.4.5'
 
 Since the gem follows [Semantic Versioning](http://semver.org),
 indicating the full version in your Gemfile (~> *major*.*minor*.*patch*)

data/gemfiles/Gemfile.activesupport-3.x

@@ -0,0 +1,4 @@
+source 'http://rubygems.org'
+
+gem 'activesupport', '~> 3.0'
+gemspec path: '../'

data/gemfiles/Gemfile.activesupport-4.x

@@ -0,0 +1,4 @@
+source 'http://rubygems.org'
+
+gem 'activesupport', '~> 4.0'
+gemspec path: '../'

data/lib/yt/actions/delete.rb

@@ -1,4 +1,4 @@
-require 'yt/utils/request'
+require 'yt/actions/request'
 
 module Yt
   module Actions
@@ -14,11 +14,8 @@ module Yt
       end
 
       def delete_params
-        {}.tap do |params|
+        Request.default_params.tap do |params|
           params[:method] = :delete
-          params[:format] = :json
-          params[:host] = 'www.googleapis.com'
-          params[:scope] = 'https://www.googleapis.com/auth/youtube'
           params[:auth] = @auth
         end
       end

data/lib/yt/actions/delete_all.rb

@@ -1,5 +1,5 @@
 require 'yt/actions/list'
-require 'yt/utils/request'
+require 'yt/actions/request'
 
 module Yt
   module Actions
@@ -10,7 +10,6 @@ module Yt
 
       def do_delete_all(params = {})
         where(params).map do |item|
-          yield item if block_given?
           item.delete
         end.tap { @items = [] }
       end

data/lib/yt/actions/insert.rb

@@ -1,4 +1,4 @@
-require 'yt/utils/request'
+require 'yt/actions/request'
 
 module Yt
   module Actions
@@ -15,12 +15,8 @@ module Yt
       end
 
       def insert_params
-        {}.tap do |params|
+        Request.default_params.tap do |params|
           params[:method] = :post
-          params[:format] = :json
-          params[:host] = 'www.googleapis.com'
-          params[:body_type] = :json
-          params[:scope] = 'https://www.googleapis.com/auth/youtube'
           params[:auth] = @auth
         end
       end

data/lib/yt/actions/list.rb

@@ -1,4 +1,4 @@
-require 'yt/utils/request'
+require 'yt/actions/request'
 
 module Yt
   module Actions
@@ -53,10 +53,8 @@ module Yt
       end
 
       def list_params
-        {}.tap do |params|
+        Request.default_params.tap do |params|
           params[:method] = :get
-          params[:format] = :json
-          params[:host] = 'www.googleapis.com'
           params[:auth] = @auth
         end
       end

data/lib/yt/{utils → actions}/request.rb

@@ -1,21 +1,12 @@
-require 'yt/config'
-
-require 'uri' # for URI.json
 require 'net/http' # for Net::HTTP.start
+require 'uri' # for URI.json
 require 'json' # for JSON.parse
-require 'active_support/core_ext/hash/conversions' # for Hash.from_xml
+require 'active_support/core_ext' # for Hash.from_xml, Hash.to_param
 
-module Yt
-  class RequestError < StandardError
-    def reasons
-      error.fetch('errors', []).map{|e| e['reason']}
-    end
-
-    def error
-      eval(message)['error'] rescue {}
-    end
-  end
+require 'yt/actions/request_error'
+require 'yt/config'
 
+module Yt
   class Request
     def initialize(options = {})
       options[:query] ||= options[:params].to_param
@@ -33,10 +24,17 @@ module Yt
       add_authorization_to_request!
       fetch_response.tap do |response|
         response.body = parse_format response.body if response.body
-        unless response.is_a? Net::HTTPSuccess
-          # puts "You can try again running #{to_curl}"
-          raise RequestError, response.body
-        end
+        # puts "You can try again running #{to_curl}"
+        raise RequestError, response.body unless response.is_a? Net::HTTPSuccess
+      end
+    end
+
+    def self.default_params
+      {}.tap do |params|
+        params[:format] = :json
+        params[:host] = 'www.googleapis.com'
+        params[:scope] = 'https://www.googleapis.com/auth/youtube'
+        params[:body_type] = :json
       end
     end
 
@@ -55,19 +53,18 @@ module Yt
     def fetch_response
       Net::HTTP.start(@uri.host, @uri.port, use_ssl: true) do |http|
         klass = "Net::HTTP::#{@method.capitalize}".constantize
-        request = if @body_type == :json
-          klass.new @uri, initheader = {'Content-Type' =>'application/json'}
-        else
-          klass.new @uri
+        request = klass.new @uri.request_uri
+        case @body_type
+        when :json
+          request.initialize_http_header 'Content-Type' => 'application/json'
+          request.initialize_http_header 'Content-length' => '0' unless @body
+          request.body = @body.to_json if @body
+        when :form
+          request.set_form_data @body if @body
         end
         @headers.each{|k,v| request.add_field k, v}
-        case @body_type
-          when :json then request.body = @body.to_json
-          when :form then request.set_form_data @body
-        end if @body
 
         http.request request
-        # NOTE! Here refresh the token if the access is expired
       end
     end
 

data/lib/yt/actions/request_error.rb

@@ -0,0 +1,11 @@
+module Yt
+  class RequestError < StandardError
+    def reasons
+      error.fetch('errors', []).map{|e| e['reason']}
+    end
+
+    def error
+      eval(message)['error'] rescue {}
+    end
+  end
+end

data/lib/yt/actions/update.rb

@@ -1,4 +1,4 @@
-require 'yt/utils/request'
+require 'yt/actions/request'
 
 module Yt
   module Actions
@@ -12,11 +12,8 @@ module Yt
       end
 
       def update_params
-        {}.tap do |params|
+        Request.default_params.tap do |params|
           params[:method] = :put
-          params[:format] = :json
-          params[:host] = 'www.googleapis.com'
-          params[:scope] = 'https://www.googleapis.com/auth/youtube'
           params[:auth] = @auth
         end
       end

data/lib/yt/associations/annotations.rb

@@ -7,7 +7,7 @@ module Yt
     # YouTube resources with annotations are: videos.
     module Annotations
       def annotations
-        @annotations ||= Collections::Annotations.by_video self
+        @annotations ||= Collections::Annotations.of self
       end
     end
   end

data/lib/yt/associations/channels.rb

@@ -13,7 +13,7 @@ module Yt
     private
 
       def channels
-        @channels ||= Collections::Channels.by_account self
+        @channels ||= Collections::Channels.of self
       end
     end
   end

data/lib/yt/associations/details_sets.rb

@@ -13,7 +13,7 @@ module Yt
     private
 
       def details_sets
-        @details_sets ||= Collections::DetailsSets.by_video self
+        @details_sets ||= Collections::DetailsSets.of self
       end
     end
   end

data/lib/yt/associations/playlist_items.rb

@@ -7,7 +7,7 @@ module Yt
     # YouTube resources with playlist items are: playlists.
     module PlaylistItems
       def playlist_items
-        @playlist_items ||= Collections::PlaylistItems.by_playlist self
+        @playlist_items ||= Collections::PlaylistItems.of self
       end
 
       def add_video(video_id)

data/lib/yt/associations/playlists.rb

@@ -7,7 +7,7 @@ module Yt
     # YouTube resources with playlist are: channels.
     module Playlists
       def playlists
-        @playlists ||= Collections::Playlists.by_channel self
+        @playlists ||= Collections::Playlists.of self
       end
 
       def create_playlist(params = {})

data/lib/yt/associations/ratings.rb

@@ -32,7 +32,7 @@ module Yt
     private
 
       def ratings
-        @ratings ||= Collections::Ratings.by_video self
+        @ratings ||= Collections::Ratings.of self
       end
     end
   end

data/lib/yt/associations/snippets.rb

@@ -13,7 +13,7 @@ module Yt
     private
 
       def snippets
-        @snippets ||= Collections::Snippets.by_resource self
+        @snippets ||= Collections::Snippets.of self
       end
     end
   end

data/lib/yt/associations/subscriptions.rb

@@ -7,7 +7,7 @@ module Yt
     # YouTube resources with subscription are: channels.
     module Subscriptions
       def subscriptions
-        @subscriptions ||= Collections::Subscriptions.by_channel self
+        @subscriptions ||= Collections::Subscriptions.of self
       end
 
       def subscribed?

data/lib/yt/associations/user_infos.rb

@@ -13,7 +13,7 @@ module Yt
     private
 
       def user_infos
-        @user_infos ||= Collections::UserInfos.by_account self
+        @user_infos ||= Collections::UserInfos.of self
       end
     end
   end

data/lib/yt/associations/videos.rb

@@ -7,7 +7,7 @@ module Yt
     # YouTube resources with videos are: channels.
     module Videos
       def videos
-        @videos ||= Collections::Videos.by_channel self
+        @videos ||= Collections::Videos.of self
       end
     end
   end

data/lib/yt/collections/annotations.rb

@@ -1,18 +1,9 @@
-require 'yt/collections/base'
+require 'yt/collections/resources'
 require 'yt/models/annotation'
 
 module Yt
   module Collections
-    class Annotations < Base
-
-      def initialize(options = {})
-        @video = options[:video]
-        @auth = options[:auth]
-      end
-
-      def self.by_video(video)
-        new video: video, auth: video.auth
-      end
+    class Annotations < Resources
 
     private
 
@@ -25,7 +16,7 @@ module Yt
           params[:format] = :xml
           params[:host] = 'www.youtube.com'
           params[:path] = '/annotations_invideo'
-          params[:params] = {video_id: @video.id}
+          params[:params] = {video_id: @parent.id}
         end
       end
 

data/lib/yt/collections/channels.rb

@@ -1,18 +1,9 @@
-require 'yt/collections/base'
+require 'yt/collections/resources'
 require 'yt/models/channel'
 
 module Yt
   module Collections
-    class Channels < Base
-
-      def initialize(options = {})
-        @account = options[:account]
-        @auth = options[:auth]
-      end
-
-      def self.by_account(account)
-        new account: account, auth: account.auth
-      end
+    class Channels < Resources
 
     private
 

data/lib/yt/collections/details_sets.rb

@@ -1,18 +1,9 @@
-require 'yt/collections/base'
+require 'yt/collections/resources'
 require 'yt/models/details_set'
 
 module Yt
   module Collections
-    class DetailsSets < Base
-
-      def initialize(options = {})
-        @video = options[:video]
-        @auth = options[:auth]
-      end
-
-      def self.by_video(video)
-        new video: video, auth: video.auth
-      end
+    class DetailsSets < Resources
 
     private
 
@@ -22,7 +13,7 @@ module Yt
 
       def list_params
         super.tap do |params|
-          params[:params] = {maxResults: 50, part: 'contentDetails', id: @video.id}
+          params[:params] = {maxResults: 50, part: 'contentDetails', id: @parent.id}
           params[:scope] = 'https://www.googleapis.com/auth/youtube.readonly'
           params[:path] = '/youtube/v3/videos'
         end

data/lib/yt/collections/playlist_items.rb

@@ -1,24 +1,15 @@
-require 'yt/collections/base'
+require 'yt/collections/resources'
 require 'yt/models/playlist_item'
 
 module Yt
   module Collections
-    class PlaylistItems < Base
-
-      def initialize(options = {})
-        @playlist = options[:playlist]
-        @auth = options[:auth]
-      end
-
-      def self.by_playlist(playlist)
-        new playlist: playlist, auth: playlist.auth
-      end
+    class PlaylistItems < Resources
 
       # options are id and kind
       def insert(options = {}) #
         resource = {kind: "youtube##{options[:kind]}"}
         resource["#{options[:kind]}Id"] = options[:id]
-        snippet = {playlistId: @playlist.id, resourceId: resource}
+        snippet = {playlistId: @parent.id, resourceId: resource}
         do_insert body: {snippet: snippet}, params: {part: 'snippet,status'}
       end
 
@@ -34,7 +25,7 @@ module Yt
 
       def list_params
         super.tap do |params|
-          params[:params] = {maxResults: 50, part: 'snippet,status', playlistId: @playlist.id}
+          params[:params] = {maxResults: 50, part: 'snippet,status', playlistId: @parent.id}
           params[:scope] = 'https://www.googleapis.com/auth/youtube.readonly'
           params[:path] = '/youtube/v3/playlistItems'
         end

data/lib/yt/collections/playlists.rb

@@ -1,18 +1,9 @@
-require 'yt/collections/base'
+require 'yt/collections/resources'
 require 'yt/models/playlist'
 
 module Yt
   module Collections
-    class Playlists < Base
-
-      def initialize(options = {})
-        @channel = options[:channel]
-        @auth = options[:auth]
-      end
-
-      def self.by_channel(channel)
-        new channel: channel, auth: channel.auth
-      end
+    class Playlists < Resources
 
       # Valid body (no defaults) are: title (string), description (string), privacy_status (string),
       # tags (array of strings)
@@ -40,7 +31,7 @@ module Yt
 
       def list_params
         super.tap do |params|
-          params[:params] = {maxResults: 50, part: 'snippet,status', channelId: @channel.id}
+          params[:params] = {maxResults: 50, part: 'snippet,status', channelId: @parent.id}
           params[:scope] = 'https://www.googleapis.com/auth/youtube.readonly'
           params[:path] = '/youtube/v3/playlists'
         end

data/lib/yt/collections/ratings.rb

@@ -1,29 +1,20 @@
-require 'yt/collections/base'
+require 'yt/collections/resources'
 require 'yt/models/rating'
 
 module Yt
   module Collections
-    class Ratings < Base
-
-      def initialize(options = {})
-        @video = options[:video]
-        @auth = options[:auth]
-      end
-
-      def self.by_video(video)
-        new video: video, auth: video.auth
-      end
+    class Ratings < Resources
 
     private
 
       def new_item(data)
-        Yt::Rating.new rating: data['rating'], video_id: @video.id, auth: @auth
+        Yt::Rating.new rating: data['rating'], video_id: @parent.id, auth: @auth
       end
 
       def list_params
         super.tap do |params|
           params[:path] = '/youtube/v3/videos/getRating'
-          params[:params] = {id: @video.id}
+          params[:params] = {id: @parent.id}
           params[:scope] = 'https://www.googleapis.com/auth/youtube'
         end
       end

data/lib/yt/collections/resources.rb

@@ -0,0 +1,16 @@
+require 'yt/collections/base'
+
+module Yt
+  module Collections
+    class Resources < Base
+      def initialize(options = {})
+        @parent = options[:parent]
+        @auth = options[:auth]
+      end
+
+      def self.of(parent)
+        new parent: parent, auth: parent.auth
+      end
+    end
+  end
+end

data/lib/yt/collections/snippets.rb

@@ -1,23 +1,9 @@
-require 'yt/collections/base'
+require 'yt/collections/resources'
 require 'yt/models/snippet'
 
 module Yt
   module Collections
-    class Snippets < Base
-
-      def initialize(options = {})
-        @resource = options[:resource]
-        @auth = options[:auth]
-      end
-
-      # @note Google API must have some caching layer by which if we try to
-      # delete a snippet that we just created, we encounter an error.
-      # To overcome this, if we have just updated the snippet, we must
-      # wait some time before requesting it again.
-      #
-      def self.by_resource(resource)
-        new resource: resource, auth: resource.auth
-      end
+    class Snippets < Resources
 
     private
 
@@ -26,11 +12,11 @@ module Yt
       end
 
       def list_params
-        resources_path = @resource.class.to_s.demodulize.underscore.pluralize
+        parents_path = @parent.class.to_s.demodulize.underscore.pluralize
         super.tap do |params|
-          params[:params] = {id: @resource.id, part: 'snippet'}
+          params[:params] = {id: @parent.id, part: 'snippet'}
           params[:scope] = 'https://www.googleapis.com/auth/youtube.readonly'
-          params[:path] = "/youtube/v3/#{resources_path}"
+          params[:path] = "/youtube/v3/#{parents_path}"
         end
       end
     end

data/lib/yt/collections/subscriptions.rb

@@ -3,16 +3,7 @@ require 'yt/models/subscription'
 
 module Yt
   module Collections
-    class Subscriptions < Base
-
-      def initialize(options = {})
-        @channel = options[:channel]
-        @auth = options[:auth]
-      end
-
-      def self.by_channel(channel)
-        new channel: channel, auth: channel.auth
-      end
+    class Subscriptions < Resources
 
       def insert(options = {})
         throttle
@@ -22,7 +13,8 @@ module Yt
       end
 
       def delete_all(params = {}, options = {})
-        do_delete_all(params) {throttle}
+        throttle
+        do_delete_all params
       end
 
     private
@@ -36,7 +28,7 @@ module Yt
       # To overcome this, if we have just updated the subscription, we must
       # wait some time before requesting it again.
       #
-      def throttle(seconds = 10)
+      def throttle(seconds = 9)
         @last_changed_at ||= Time.now - seconds
         wait = [@last_changed_at - Time.now + seconds, 0].max
         sleep wait
@@ -50,7 +42,7 @@ module Yt
 
       def list_params
         super.tap do |params|
-          params[:params] = {maxResults: 50, forChannelId: @channel.id, mine: true, part: 'snippet'}
+          params[:params] = {maxResults: 50, forChannelId: @parent.id, mine: true, part: 'snippet'}
           params[:scope] = 'https://www.googleapis.com/auth/youtube'
           params[:path] = '/youtube/v3/subscriptions'
         end
@@ -60,7 +52,7 @@ module Yt
         super.tap do |params|
           params[:path] = '/youtube/v3/subscriptions'
           params[:params] = {part: 'snippet'}
-          params[:body] = {snippet: {resourceId: {channelId: @channel.id}}}
+          params[:body] = {snippet: {resourceId: {channelId: @parent.id}}}
         end
       end
     end

data/lib/yt/collections/user_infos.rb

@@ -1,18 +1,9 @@
-require 'yt/collections/base'
+require 'yt/collections/resources'
 require 'yt/models/user_info'
 
 module Yt
   module Collections
-    class UserInfos < Base
-
-      def initialize(options = {})
-        @account = options[:account]
-        @auth = options[:auth]
-      end
-
-      def self.by_account(account)
-        new account: account, auth: account.auth
-      end
+    class UserInfos < Resources
 
     private
 

data/lib/yt/collections/videos.rb

@@ -1,18 +1,9 @@
-require 'yt/collections/base'
+require 'yt/collections/resources'
 require 'yt/models/video'
 
 module Yt
   module Collections
-    class Videos < Base
-
-      def initialize(options = {})
-        @channel = options[:channel]
-        @auth = options[:auth]
-      end
-
-      def self.by_channel(channel)
-        new channel: channel, auth: channel.auth
-      end
+    class Videos < Resources
 
     private
 
@@ -22,8 +13,8 @@ module Yt
 
       def list_params
         super.tap do |params|
-          params[:params] = {channelId: @channel.id, type: :video, maxResults: 50, part: 'snippet'}
-          params[:scope] = 'https://www.googleapis.com/auth/youtube'
+          params[:params] = {channelId: @parent.id, type: :video, maxResults: 50, part: 'snippet'}
+          params[:scope] = 'https://www.googleapis.com/auth/youtube.readonly'
           params[:path] = '/youtube/v3/search'
         end
       end

data/lib/yt/models/annotation.rb

@@ -118,7 +118,12 @@ module Yt
 
     def timestamps
       @timestamps ||= positions.map do |pos|
-        Time.parse(pos['t']) - Time.parse('0:00')
+        regex = %r{(?:|(?<hours>\d*):)(?:|(?<min>\d*):)(?<sec>\d*)\.(?<ms>\d*)}
+        match = pos['t'].match regex
+        hours = (match[:hours] || '0').to_i
+        minutes = (match[:min] || '0').to_i
+        seconds = (match[:sec]).to_i
+        (hours * 60 + minutes) * 60 + seconds
       end
     end
 

data/lib/yt/models/channel.rb

@@ -1,17 +1,9 @@
-require 'yt/models/base'
+require 'yt/models/resource'
 
 module Yt
-  class Channel < Base
-    attr_reader :id, :auth
-    has_one :snippet, delegate: [:title, :description, :thumbnail_url, :published_at]
+  class Channel < Resource
     has_many :subscriptions
     has_many :videos
     has_many :playlists
-
-    def initialize(options = {})
-      @id = options[:id]
-      @auth = options[:auth]
-      @snippet = Snippet.new(data: options[:snippet]) if options[:snippet]
-    end
   end
 end

data/lib/yt/models/details_set.rb

@@ -1,3 +1,5 @@
+require 'yt/models/base'
+
 module Yt
   class DetailsSet < Base
 
@@ -22,10 +24,11 @@ module Yt
     # of minutes (or seconds) of the video. For example, a value of PT15M51S indicates
     # that the video is 15 minutes and 51 seconds long.
     def to_seconds(iso8601_duration)
-      match = iso8601_duration.match %r{^PT(?:|(?<min>\d*?)M)(?:|(?<sec>\d*?)S)$}
+      match = iso8601_duration.match %r{^PT(?:|(?<hours>\d*?)H)(?:|(?<min>\d*?)M)(?:|(?<sec>\d*?)S)$}
+      hours = (match[:hours] || '0').to_i
       minutes = (match[:min] || '0').to_i
       seconds = (match[:sec]).to_i
-      minutes * 60 + seconds
+      (hours * 60 + minutes) * 60 + seconds
     end
   end
 end

data/lib/yt/models/playlist.rb

@@ -1,19 +1,9 @@
-require 'yt/models/base'
+require 'yt/models/resource'
 
 module Yt
-  class Playlist < Base
-    attr_reader :id, :auth
-    has_one :snippet, delegate: [:title, :description, :tags, :thumbnail_url, :published_at]
-    has_one :status, delegate: [:privacy_status, :public?, :private?, :unlisted?]
+  class Playlist < Resource
     has_many :playlist_items
 
-    def initialize(options = {})
-      @id = options[:id]
-      @snippet = Snippet.new(data: options[:snippet]) if options[:snippet]
-      @status = Status.new(data: options[:status]) if options[:status]
-      @auth = options[:auth]
-    end
-
     def delete
       do_delete {@id = nil}
       !exists?

data/lib/yt/models/resource.rb

@@ -0,0 +1,16 @@
+require 'yt/models/base'
+
+module Yt
+  class Resource < Base
+    attr_reader :id, :auth
+    has_one :snippet, delegate: [:title, :description, :thumbnail_url, :published_at]
+    has_one :status, delegate: [:privacy_status, :public?, :private?, :unlisted?]
+
+    def initialize(options = {})
+      @id = options[:id]
+      @auth = options[:auth]
+      @snippet = Snippet.new(data: options[:snippet]) if options[:snippet]
+      @status = Status.new(data: options[:status]) if options[:status]
+    end
+  end
+end

data/lib/yt/models/video.rb

@@ -1,16 +1,9 @@
+require 'yt/models/resource'
+
 module Yt
-  class Video < Base
-    has_many :annotations
+  class Video < Resource
     has_one :details_set, delegate: [:duration]
     has_one :rating
-    has_one :snippet, delegate: [:title, :description, :tags, :thumbnail_url, :published_at]
-
-    attr_reader :id, :auth
-
-    def initialize(options = {})
-      @id = options[:id]
-      @auth = options[:auth]
-      @snippet = Snippet.new(data: options[:snippet]) if options[:snippet]
-    end
+    has_many :annotations
   end
 end

data/lib/yt/version.rb

@@ -1,3 +1,3 @@
 module Yt
-  VERSION = '0.4.4'
+  VERSION = '0.4.5'
 end

data/spec/collections/playlist_items_spec.rb

@@ -3,7 +3,7 @@ require 'yt/models/playlist'
 require 'yt/collections/playlist_items'
 
 describe Yt::Collections::PlaylistItems do
-  subject(:collection) { Yt::Collections::PlaylistItems.new playlist: playlist }
+  subject(:collection) { Yt::Collections::PlaylistItems.new parent: playlist }
   let(:playlist) { Yt::Playlist.new }
 
   describe '#insert' do

data/spec/models/annotation_spec.rb

@@ -107,19 +107,19 @@ describe Yt::Annotation do
   end
 
   describe '#starts_after and #starts_before' do
-    context 'given an annotation with the first timestamp equal to 240 seconds' do
+    context 'given an annotation with the first timestamp equal to 1 hour' do
       let(:xml) { %Q{
         <segment>
         <movingRegion type="rect">
-        <rectRegion d="0" h="17.7779998779" t="0:04.000" w="25.0" x="7.117000103" y="5.07000017166"/>
-        <rectRegion d="0" h="17.7779998779" t="0:05.000" w="25.0" x="7.117000103" y="5.07000017166"/>
+        <rectRegion d="0" h="17.7779998779" t="01:00:01.000" w="25.0" x="7.117000103" y="5.07000017166"/>
+        <rectRegion d="0" h="17.7779998779" t="01:05:56.066" w="25.0" x="7.117000103" y="5.07000017166"/>
         </movingRegion>
         </segment>
       } }
-      it { expect(annotation.starts_after? 230).to be_true }
-      it { expect(annotation.starts_after? 250).to be_false }
-      it { expect(annotation.starts_before? 230).to be_false }
-      it { expect(annotation.starts_before? 250).to be_true }
+      it { expect(annotation.starts_after? 3600).to be_true }
+      it { expect(annotation.starts_after? 3610).to be_false }
+      it { expect(annotation.starts_before? 3600).to be_false }
+      it { expect(annotation.starts_before? 3610).to be_true }
     end
 
     context 'given an annotation without timestamps' do

data/spec/models/details_set_spec.rb

@@ -5,6 +5,11 @@ describe Yt::DetailsSet do
   subject(:details_set) { Yt::DetailsSet.new data: data }
 
   describe '#duration' do
+    context 'given a details_set with duration in hours, minutes, seconds' do
+      let(:data) { {"duration"=>"PT1H18M52S"} }
+      it { expect(details_set.duration).to eq 4732 }
+    end
+
     context 'given a details_set with duration in minutes and seconds' do
       let(:data) { {"duration"=>"PT2M51S"} }
       it { expect(details_set.duration).to eq 171 }

data/yt.gemspec

@@ -14,17 +14,19 @@ Gem::Specification.new do |spec|
   spec.homepage      = "http://github.com/fullscreeninc/yt"
   spec.license       = "MIT"
 
+  spec.required_ruby_version = '>= 1.9.3'
+
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'activesupport' # For Hash.from_xml, String.classify ...
+  spec.add_dependency 'activesupport' # '3 (Ruby 1.9) or 4 (Ruby 2)'
 
   # For development / Code coverage / Documentation
-  spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'yard'
-  spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'bundler' #, '~> 1.0'
+  spec.add_development_dependency 'rspec' #, '~> 2.0'
+  spec.add_development_dependency 'rake' #, '~> 10.0'
+  spec.add_development_dependency 'yard' #, '~> 0.8.0'
+  spec.add_development_dependency 'coveralls' #, '~> 0.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yt
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Claudio Baccigalupo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-10 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -28,16 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -114,11 +114,15 @@ files:
 - Rakefile
 - TODO.md
 - bin/yt
+- gemfiles/Gemfile.activesupport-3.x
+- gemfiles/Gemfile.activesupport-4.x
 - lib/yt.rb
 - lib/yt/actions/delete.rb
 - lib/yt/actions/delete_all.rb
 - lib/yt/actions/insert.rb
 - lib/yt/actions/list.rb
+- lib/yt/actions/request.rb
+- lib/yt/actions/request_error.rb
 - lib/yt/actions/update.rb
 - lib/yt/associations.rb
 - lib/yt/associations/annotations.rb
@@ -139,6 +143,7 @@ files:
 - lib/yt/collections/playlist_items.rb
 - lib/yt/collections/playlists.rb
 - lib/yt/collections/ratings.rb
+- lib/yt/collections/resources.rb
 - lib/yt/collections/snippets.rb
 - lib/yt/collections/subscriptions.rb
 - lib/yt/collections/user_infos.rb
@@ -154,12 +159,12 @@ files:
 - lib/yt/models/playlist.rb
 - lib/yt/models/playlist_item.rb
 - lib/yt/models/rating.rb
+- lib/yt/models/resource.rb
 - lib/yt/models/snippet.rb
 - lib/yt/models/status.rb
 - lib/yt/models/subscription.rb
 - lib/yt/models/user_info.rb
 - lib/yt/models/video.rb
-- lib/yt/utils/request.rb
 - lib/yt/version.rb
 - spec/associations/device_auth/channels_spec.rb
 - spec/associations/device_auth/details_sets_spec.rb
@@ -218,7 +223,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="