youtube_it 2.1.3 → 2.1.4

data/Gemfile

@@ -1,12 +1,12 @@
 source 'http://rubygems.org'
 
-gem 'rake', '0.8.7'
-gem 'oauth', '0.4.4'
-gem 'oauth2', '0.5.2'
-gem 'simple_oauth', '0.1.5'
-gem 'faraday', '0.7.3'
+gem 'oauth', '~> 0.4.4'
+gem 'oauth2', '~> 0.5.2'
+gem 'simple_oauth', '~> 0.1.5'
+gem 'faraday', '~> 0.7.3'
+gem 'jeweler', '~> 1.8.3'
 gem 'builder'
 
 group :test do
-  gem 'webmock'
+  gem 'webmock', '~> 1.7.10'
 end

data/Gemfile.lock

@@ -1,21 +1,30 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.6)
+    addressable (2.2.7)
     builder (3.0.0)
     crack (0.3.1)
-    faraday (0.7.3)
-      addressable (~> 2.2.6)
-      multipart-post (~> 1.1.0)
-      rack (>= 1.1.0, < 2)
+    faraday (0.7.6)
+      addressable (~> 2.2)
+      multipart-post (~> 1.1)
+      rack (~> 1.1)
+    git (1.2.5)
+    jeweler (1.8.3)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+      rdoc
+    json (1.6.5)
     multi_json (1.0.4)
-    multipart-post (1.1.4)
-    oauth (0.4.4)
+    multipart-post (1.1.5)
+    oauth (0.4.5)
     oauth2 (0.5.2)
       faraday (~> 0.7)
       multi_json (~> 1.0)
     rack (1.4.1)
-    rake (0.8.7)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
     simple_oauth (0.1.5)
     webmock (1.7.10)
       addressable (~> 2.2, > 2.2.5)
@@ -26,9 +35,9 @@ PLATFORMS
 
 DEPENDENCIES
   builder
-  faraday (= 0.7.3)
-  oauth (= 0.4.4)
-  oauth2 (= 0.5.2)
-  rake (= 0.8.7)
-  simple_oauth (= 0.1.5)
-  webmock
+  faraday (~> 0.7.3)
+  jeweler (~> 1.8.3)
+  oauth (~> 0.4.4)
+  oauth2 (~> 0.5.2)
+  simple_oauth (~> 0.1.5)
+  webmock (~> 1.7.10)

data/README.rdoc

@@ -1,3 +1,12 @@
+== DONATION
+
+  YOUTUBE_IT is developed by many contributors who are passioned about opensource projects 
+  and selflessly donate their time and work. Following that spirit your donations to this project 
+  will be destined to the Tuquito Libre Foundation(http://fundacion.tuquito.org.ar) for developing 
+  technology projects intended to close the digital gap in Latin America.
+
+{<img src=https://www.pledgie.com/campaigns/16746.png?skin_name=chrome>}[http://www.pledgie.com/campaigns/16746]
+
 == DESCRIPTION
 
   youtube_it is the most complete Ruby client for the YouTube GData API. It provides an easy
@@ -43,7 +52,7 @@ Client with OAuth:
   $ client.authorize_from_access("access_token", "access_secret")
 
 Client with OAuth2:
-  $ client = YouTubeIt::OAuth2Client.new(client_access_token: "access_token", client_refresh_token: "refresh_token", client_id: "client_id", client_secret: "client_secret", dev_key: "dev_key")
+  $ client = YouTubeIt::OAuth2Client.new(client_access_token: "access_token", client_refresh_token: "refresh_token", client_id: "client_id", client_secret: "client_secret", dev_key: "dev_key", expires_at: "expiration time")
 
 If your access token is still valid (be careful, access tokens may only be valid for about 1 hour), you can use the client directly. If you want to refresh the access token using the refresh token just do:
 

data/Rakefile

@@ -1,26 +1,28 @@
+# encoding: utf-8
+
 require 'rubygems'
-gem 'rake', '0.9.2.2'
+require 'bundler'
+begin
+  Bundler.setup(:default, :test)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
 require 'rake'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "youtube_it"
-    gem.summary = %Q{The most complete Ruby wrapper for youtube api's}
-    gem.description = %Q{Upload, delete, update, comment on youtube videos all from one gem.}
-    gem.email = "kylejginavan@gmail.com"
-    gem.homepage = "http://github.com/kylejginavan/youtube_it"
-    gem.add_dependency('oauth','>=0.4.4')
-    gem.add_dependency('oauth2','>=0.5.2')
-    gem.add_dependency('simple_oauth', '>=0.1.5')    
-    gem.add_dependency('faraday','>=0.7.3')    
-    gem.add_dependency('builder')
-    gem.authors = ["kylejginavan","chebyte", "mseppae"]
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "youtube_it (or a dependency) not available. Install it with: gem install youtube_it"
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+  gem.name = "youtube_it"
+  gem.summary = %Q{The most complete Ruby wrapper for youtube api's}
+  gem.description = %Q{Upload, delete, update, comment on youtube videos all from one gem.}
+  gem.email = "kylejginavan@gmail.com"
+  gem.homepage = "http://github.com/kylejginavan/youtube_it"
+  gem.authors = ["kylejginavan","chebyte", "mseppae"]
+  # dependencies defined in Gemfile
 end
+Jeweler::RubygemsDotOrgTasks.new
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|

data/VERSION

@@ -1 +1 @@
-2.1.3
+2.1.4

data/lib/youtube_it/client.rb

@@ -407,11 +407,12 @@ class YouTubeIt
 
   class OAuth2Client < YouTubeIt::Client
     def initialize(options)
-      @client_id            = options[:client_id]
-      @client_secret        = options[:client_secret]
-      @client_access_token  = options[:client_access_token]
-      @client_refresh_token = options[:client_refresh_token]
-      @dev_key              = options[:dev_key]
+      @client_id               = options[:client_id]
+      @client_secret           = options[:client_secret]
+      @client_access_token     = options[:client_access_token]
+      @client_refresh_token    = options[:client_refresh_token]
+      @client_token_expires_at = options[:client_token_expires_at]
+      @dev_key                 = options[:dev_key]
     end
 
     def oauth_client
@@ -422,7 +423,7 @@ class YouTubeIt
     end
     
     def access_token
-      @access_token ||= ::OAuth2::AccessToken.new(oauth_client, @client_access_token, :refresh_token => @client_refresh_token)
+      @access_token ||= ::OAuth2::AccessToken.new(oauth_client, @client_access_token, :refresh_token => @client_refresh_token, :expires_at => @client_token_expires_at)
     end
 
     def refresh_access_token!

data/lib/youtube_it/model/video.rb

@@ -149,7 +149,7 @@ class YouTubeIt
       # === Returns
       #   String: The Youtube video id.
       def unique_id
-        video_id[/videos\/([^<]+)/, 1] || video_id[/video\:([^<]+)/, 1]
+        @unique_id || video_id[/videos\/([^<]+)/, 1] || video_id[/video\:([^<]+)/, 1]
       end
 
       # Allows you to check whether the video can be embedded on a webpage.

data/lib/youtube_it/parser.rb

@@ -374,6 +374,11 @@ class YouTubeIt
         end
         media_group = entry.elements["media:group"]
 
+        ytid = nil
+        unless media_group.elements["yt:videoid"].nil?
+          ytid = media_group.elements["yt:videoid"].text
+        end        
+
         # if content is not available on certain region, there is no media:description, media:player or yt:duration
         description = ""
         unless media_group.elements["media:description"].nil?
@@ -482,7 +487,8 @@ class YouTubeIt
           :position       => position,
           :latitude       => latitude,
           :longitude      => longitude,
-          :state          => state)
+          :state          => state,
+          :unique_id      => ytid)
       end
 
       def parse_media_content (media_content_element)

data/test/test_client.rb

@@ -253,6 +253,16 @@ class TestClient < Test::Unit::TestCase
     assert @client.delete_playlist(playlist.playlist_id)
   end
   
+  def test_should_return_unique_id_from_playlist
+    playlist = @client.add_playlist(:title => "youtube_it test!", :description => "test playlist")
+    video = @client.add_video_to_playlist(playlist.playlist_id,"CE62FSEoY28")
+  
+    assert_equal "CE62FSEoY28", playlist.videos.last.unique_id
+  
+    assert @client.delete_video_from_playlist(playlist.playlist_id, video[:playlist_entry_id])
+    assert @client.delete_playlist(playlist.playlist_id)
+  end
+  
   def test_should_add_and_delete_new_playlist
     result = @client.add_playlist(:title => "youtube_it test4!", :description => "test playlist")
     assert result.title, "youtube_it test!"
@@ -314,21 +324,24 @@ class TestClient < Test::Unit::TestCase
   
   def test_should_subscribe_to_channel
    r = @client.subscribe_channel("TheWoWArthas")
+   sleep(4)
    assert_equal r[:code], 201
-   assert_equal @client.subscriptions.first.title, "Videos published by : TheWoWArthas"
+   assert_equal @client.subscriptions.first.title, "Videos published by: TheWoWArthas"
    @client.unsubscribe_channel(@client.subscriptions.first.id)
   end
   
   def test_should_unsubscribe_to_channel
    @client.subscribe_channel("TheWoWArthas")
+   sleep(4)
    r = @client.unsubscribe_channel(@client.subscriptions.first.id)
    assert_equal r[:code], 200
   end
   
   def test_should_list_subscriptions
    @client.subscribe_channel("TheWoWArthas")
+   sleep(4)
    assert @client.subscriptions.count == 1
-   assert_equal @client.subscriptions.first.title, "Videos published by : TheWoWArthas"
+   assert_equal @client.subscriptions.first.title, "Videos published by: TheWoWArthas"
    @client.unsubscribe_channel(@client.subscriptions.first.id)
   end
      

data/youtube_it.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{youtube_it}
-  s.version = "2.1.3"
+  s.version = "2.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kylejginavan", "chebyte", "mseppae"]
-  s.date = %q{2012-02-06}
+  s.date = %q{2012-02-23}
   s.description = %q{Upload, delete, update, comment on youtube videos all from one gem.}
   s.email = %q{kylejginavan@gmail.com}
   s.extra_rdoc_files = [
@@ -73,41 +73,26 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rake>, ["= 0.8.7"])
-      s.add_runtime_dependency(%q<oauth>, ["= 0.4.4"])
-      s.add_runtime_dependency(%q<oauth2>, ["= 0.5.2"])
-      s.add_runtime_dependency(%q<simple_oauth>, ["= 0.1.5"])
-      s.add_runtime_dependency(%q<faraday>, ["= 0.7.3"])
-      s.add_runtime_dependency(%q<builder>, [">= 0"])
-      s.add_runtime_dependency(%q<oauth>, [">= 0.4.4"])
-      s.add_runtime_dependency(%q<oauth2>, [">= 0.5.2"])
-      s.add_runtime_dependency(%q<simple_oauth>, [">= 0.1.5"])
-      s.add_runtime_dependency(%q<faraday>, [">= 0.7.3"])
+      s.add_runtime_dependency(%q<oauth>, ["~> 0.4.4"])
+      s.add_runtime_dependency(%q<oauth2>, ["~> 0.5.2"])
+      s.add_runtime_dependency(%q<simple_oauth>, ["~> 0.1.5"])
+      s.add_runtime_dependency(%q<faraday>, ["~> 0.7.3"])
+      s.add_runtime_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_runtime_dependency(%q<builder>, [">= 0"])
     else
-      s.add_dependency(%q<rake>, ["= 0.8.7"])
-      s.add_dependency(%q<oauth>, ["= 0.4.4"])
-      s.add_dependency(%q<oauth2>, ["= 0.5.2"])
-      s.add_dependency(%q<simple_oauth>, ["= 0.1.5"])
-      s.add_dependency(%q<faraday>, ["= 0.7.3"])
-      s.add_dependency(%q<builder>, [">= 0"])
-      s.add_dependency(%q<oauth>, [">= 0.4.4"])
-      s.add_dependency(%q<oauth2>, [">= 0.5.2"])
-      s.add_dependency(%q<simple_oauth>, [">= 0.1.5"])
-      s.add_dependency(%q<faraday>, [">= 0.7.3"])
+      s.add_dependency(%q<oauth>, ["~> 0.4.4"])
+      s.add_dependency(%q<oauth2>, ["~> 0.5.2"])
+      s.add_dependency(%q<simple_oauth>, ["~> 0.1.5"])
+      s.add_dependency(%q<faraday>, ["~> 0.7.3"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_dependency(%q<builder>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rake>, ["= 0.8.7"])
-    s.add_dependency(%q<oauth>, ["= 0.4.4"])
-    s.add_dependency(%q<oauth2>, ["= 0.5.2"])
-    s.add_dependency(%q<simple_oauth>, ["= 0.1.5"])
-    s.add_dependency(%q<faraday>, ["= 0.7.3"])
-    s.add_dependency(%q<builder>, [">= 0"])
-    s.add_dependency(%q<oauth>, [">= 0.4.4"])
-    s.add_dependency(%q<oauth2>, [">= 0.5.2"])
-    s.add_dependency(%q<simple_oauth>, [">= 0.1.5"])
-    s.add_dependency(%q<faraday>, [">= 0.7.3"])
+    s.add_dependency(%q<oauth>, ["~> 0.4.4"])
+    s.add_dependency(%q<oauth2>, ["~> 0.5.2"])
+    s.add_dependency(%q<simple_oauth>, ["~> 0.1.5"])
+    s.add_dependency(%q<faraday>, ["~> 0.7.3"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
     s.add_dependency(%q<builder>, [">= 0"])
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: youtube_it
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: 
   segments: 
   - 2
   - 1
-  - 3
-  version: 2.1.3
+  - 4
+  version: 2.1.4
 platform: ruby
 authors: 
 - kylejginavan
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-06 00:00:00 -06:00
+date: 2012-02-23 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,23 +25,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
-  name: rake
-  version_requirements: *id001
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 7
         segments: 
@@ -50,14 +34,14 @@ dependencies:
         - 4
         version: 0.4.4
   name: oauth
-  version_requirements: *id002
+  version_requirements: *id001
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 15
         segments: 
@@ -66,14 +50,14 @@ dependencies:
         - 2
         version: 0.5.2
   name: oauth2
-  version_requirements: *id003
+  version_requirements: *id002
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 17
         segments: 
@@ -82,14 +66,14 @@ dependencies:
         - 5
         version: 0.1.5
   name: simple_oauth
-  version_requirements: *id004
+  version_requirements: *id003
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 5
         segments: 
@@ -98,89 +82,27 @@ dependencies:
         - 3
         version: 0.7.3
   name: faraday
-  version_requirements: *id005
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: builder
-  version_requirements: *id006
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 4
-        - 4
-        version: 0.4.4
-  name: oauth
-  version_requirements: *id007
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 5
-        - 2
-        version: 0.5.2
-  name: oauth2
-  version_requirements: *id008
+  version_requirements: *id004
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 49
         segments: 
-        - 0
         - 1
-        - 5
-        version: 0.1.5
-  name: simple_oauth
-  version_requirements: *id009
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 7
+        - 8
         - 3
-        version: 0.7.3
-  name: faraday
-  version_requirements: *id010
+        version: 1.8.3
+  name: jeweler
+  version_requirements: *id005
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -190,7 +112,7 @@ dependencies:
         - 0
         version: "0"
   name: builder
-  version_requirements: *id011
+  version_requirements: *id006
   prerelease: false
 description: Upload, delete, update, comment on youtube videos all from one gem.
 email: kylejginavan@gmail.com