simple_youtube 3.0.1 → 4.0.1

data/README.markdown

@@ -2,7 +2,7 @@ simple_youtube works with the YouTube v2 API to...
 
 1) Read(:get) YouTube data with no API Key
 
-2) Update(:put) YouTube video data using your Gdata API Key and OAuth. Pass in your OAuth token/secret. Watch Ryan B's great [Simple OmniAuth screencast](http://railscasts.com/episodes/241-simple-omniauth) for OAuth set up in Rails. Beforehand you'll also need to [authenticate and authorize your host to use the Google APIs](http://code.google.com/apis/accounts/docs/RegistrationForWebAppsAuto.html) to get a developer(x_gdata_key) key and host(host_secret) key
+2) Update(:put) YouTube video data using your Gdata API Key and OAuth2(v3 of this gem uses OAuth1). Pass in your OAuth2 access token, created using the [omniauth-youtube](https://github.com/jamiew/omniauth-youtube) OAuth2 set up in Rails. Beforehand you'll also need to [authenticate and authorize your host to use the Google APIs](https://developers.google.com/youtube/registering_an_application) to set up the correct keys
 
 3) Currently no Create or Delete functionality.
 
@@ -28,8 +28,8 @@ I have tried to cover most of the examples from the [YouTube API reference](http
     video_search.entry.size             # => 5
     video_search.title                  # => "YouTube Videos matching query: ruby on rails"
     video_search.entry[3].link[1].href  # => http://gdata.youtube.com/feeds/api/videos/UCB57Npj9U0/responses?v=2
-    
-   
+
+
 ### :get related videos
 
 [http://gdata.youtube.com/feeds/api/videos/rFVHjZYoq4Q/related?v=2](http://gdata.youtube.com/feeds/api/videos/rFVHjZYoq4Q/related?v=2)
@@ -37,7 +37,7 @@ I have tried to cover most of the examples from the [YouTube API reference](http
     video_related = Youtube::Video.find(:scope => 'rFVHjZYoq4Q', :type => 'related', :params => {:v => '2'})
     video_related.entry.size            # => 25
     video_related.entry[24].author.uri  # => http://gdata.youtube.com/feeds/api/users/neodracco
-    
+
 
 ### :get video responses
 
@@ -45,7 +45,7 @@ I have tried to cover most of the examples from the [YouTube API reference](http
 
     video_responses = Youtube::Video.find(:scope => 'rFVHjZYoq4Q', :type => 'responses', :params => {:v => '2'})
     video_responses.entry[1].group.category  # => Music
-    
+
 
 ### :get video comments
 
@@ -53,7 +53,7 @@ I have tried to cover most of the examples from the [YouTube API reference](http
 
     video_comments = Youtube::Video.find(:scope => 'rFVHjZYoq4Q', :type => 'comments', :params => {:v => '2'})
     video_comments.entry[0].content         # => Come up to my first ever e on this about 14-15 years ago, ahh too long...
-    
+
 
 ### :get top 11 videos in Comedy category/tag
 
@@ -63,7 +63,7 @@ I have tried to cover most of the examples from the [YouTube API reference](http
     video_category.entry.size  # => 11
     video_category.entry[9].category[2].term  # => Harry Potter
     video_category.entry[0].category[1].term  # => Comedy
-    
+
 
 ### :get top 5 videos in Comedy category/tag, excluding Film category/tag
 
@@ -72,7 +72,7 @@ I have tried to cover most of the examples from the [YouTube API reference](http
     video_category_comedy_exclude_film = Youtube::Video.find(:params => {:category => 'Comedy,-Film', :"max-results" => '5', :v => '2'})
     video_category_comedy_exclude_film.entry[1].category.size  # => 18
     video_category_comedy_exclude_film.entry[1].category.each { |category| puts 'film' if category.term.eql?('Film') }  #=> nil
-    
+
 
 ### :get videos in david, beckham,(News or Sports) category/tags
 
@@ -81,30 +81,27 @@ I have tried to cover most of the examples from the [YouTube API reference](http
     video_category_david_beckham_news_or_sports = Youtube::Video.find(:params => {:category => 'david,beckham,News|Sports', :v => '2'})
     video_category_david_beckham_news_or_sports.entry[7].category[1].label  # => Sports
     video_category_david_beckham_news_or_sports.entry[7].category[2].term   # => david
-    
+
 ### :put an updated video
 
     video_uid = "video_uid"
     user_name = "user_name"
     update_xml = IO.read('fixture/video_update.xml')
     oauth_token = "oauth_token"
-    oauth_token_secret = "oauth_token_secret"
     x_gdata_key = "x_gdata_key"
-    host = "www.host.com"
-    host_secret = "host_secret"
-    
+
     response = Youtube::Video.update(video_uid, user_name, update_xml, oauth_token, oauth_token_secret, x_gdata_key, host, host_secret)
-    response.code # => 200    
-    
+    response.code # => 200
+
 ## Standardfeed
-    
+
 ### :get top rated videos from today
 
 [http://gdata.youtube.com/feeds/api/standardfeeds/top_rated?time=today&v=2](http://gdata.youtube.com/feeds/api/standardfeeds/top_rated?time=today&v=2)
 
     standardfeed_topratedtoday = Youtube::Standardfeed.find(:type => 'top_rated', :params => {:time => 'today', :v => '2'})
     standardfeed_topratedtoday.entry[16].author.name = "ZOMGitsCriss"
-  
+
 ### :get top rated videos from jp
 
 [http://gdata.youtube.com/feeds/api/standardfeeds/JP/top_rated?v=2](http://gdata.youtube.com/feeds/api/standardfeeds/JP/top_rated?v=2)
@@ -112,57 +109,57 @@ I have tried to cover most of the examples from the [YouTube API reference](http
     standardfeed_toprated_jp = Youtube::Standardfeed.find(:scope => 'JP', :type => 'top_rated', :params => {:v => '2'})
     standardfeed_toprated_jp.id = "tag:youtube.com,2008:standardfeed:jp:top_rated"
     standardfeed_toprated_jp.entry[1].link[4].href = "http://gdata.youtube.com/feeds/api/standardfeeds/jp/top_rated/v/BQ9YtJC-Kd8?v=2"
-  
-  
+
+
 ### :get top rated comedy videos from jp
-    
+
 [http://gdata.youtube.com/feeds/api/standardfeeds/JP/top_rated?category=Comedy&max-results=11&v=2]("http://gdata.youtube.com/feeds/api/standardfeeds/jp/top_rated/v/7hYGkqc1gqE?v=2")
 
     standardfeed_toprated_jp_comedy = Youtube::Standardfeed.find(:scope => 'JP', :type => 'top_rated', :params => {:category => 'Comedy', :"max-results" => '11', :v => '2'})
     standardfeed_toprated_jp_comedy.entry[1].link[4].href = "http://gdata.youtube.com/feeds/api/standardfeeds/jp/top_rated/v/7hYGkqc1gqE?v=2"
 
 
-## User 
+## User
 
 ### :get a single user
 
 [http://gdata.youtube.com/feeds/api/users/neodracco](http://gdata.youtube.com/feeds/api/users/neodracco)
-    
+
     user_search = Youtube::User.find(:scope => 'neodracco')
     user_search.entry.size => 1
 
 ### :get ionysis favourite videos
-    
+
 [http://gdata.youtube.com/feeds/api/users/ionysis/favorites?v=2](http://gdata.youtube.com/feeds/api/users/ionysis/favorites?v=2)
 
     user_ionysis_favourites = Youtube::User.find(:scope => 'ionysis', :type => 'favorites', :params => {:v => '2'})
     user_ionysis_favourites.entry[7].statistics.favoriteCount) = "9586"
     user_ionysis_favourites.entry[7].rating[1].numLikes) = "2568"
-  
+
 ### :get cyanure1982 playlists
 
 [http://gdata.youtube.com/feeds/api/users/cyanure1982/playlists?v=2](http://gdata.youtube.com/feeds/api/users/cyanure1982/playlists?v=2)
 
     user_cyanure1982_playlists = Youtube::User.find(:scope => 'cyanure1982', :type => 'playlists', :params => {:v => '2'})
     user_cyanure1982_playlists.entry[2].title) = "shinnenkai"
-  
+
 ### :get ionysis subscriptions
 
 [http://gdata.youtube.com/feeds/api/users/ionysis/subscriptions?v=2](http://gdata.youtube.com/feeds/api/users/ionysis/subscriptions?v=2)
 
     user_ionysis_subscriptions = Youtube::User.find(:scope => 'ionysis', :type => 'subscriptions', :params => {:v => '2'})
     user_ionysis_subscriptions.entry[0].title) = "Videos published by : vinyljunkie07"
-  
+
 ### :get vinyljunkie07 contacts
 
 [http://gdata.youtube.com/feeds/api/users/vinyljunkie07/contacts?v=2](http://gdata.youtube.com/feeds/api/users/vinyljunkie07/contacts?v=2)
 
     user_vinyljunkie07_contacts = Youtube::User.find(:scope => 'vinyljunkie07', :type => 'contacts', :params => {:v => '2'})
     user_vinyljunkie07_contacts.entry[18].id) "tag:youtube.com,2008:user:vinyljunkie07:contact:CrackerSchool"
-    
 
-## Playlist 
-   
+
+## Playlist
+
 ### :get the cyanure1982 playlist - shinnenkai(D00BDE6AA710D50C)
 
 [http://gdata.youtube.com/feeds/api/playlists/D00BDE6AA710D50C?max-results=14&v=2](http://gdata.youtube.com/feeds/api/playlists/D00BDE6AA710D50C?max-results=14&v=2)
@@ -170,9 +167,9 @@ I have tried to cover most of the examples from the [YouTube API reference](http
     playlist_cyanure1982 = Youtube::Playlist.find(:scope => 'D00BDE6AA710D50C', :params => {:"max-results" => '14', :v => '2'})
     playlist_cyanure1982.entry.size = 14
     playlist_cyanure1982.entry[7].group.keywords = "nu, jazz, club, house, Jazztronik, dj, Yukihiro, Fukutomi, Mondo, Grosso, Daishi, Dance, FreeTEMPO, FPM, KJM, Kentaro, Takizawa"
-    
+
 simple_youtube is derived from the active_youtube gem from the [Quark ruby blog](http://www.quarkruby.com/2008/2/12/active-youtube)
-    
+
 Big Thanks to the Quark crew for the inspiration!!!
 
 

data/lib/simple_youtube.rb

@@ -1,3 +1,5 @@
+require 'rest-client'
+
 module SimpleYoutube
   ROOT = File.dirname(__FILE__) + '/..'
 end

data/lib/simple_youtube/version.rb

@@ -1,4 +1,4 @@
 module SimpleYoutube
-  VERSION = '3.0.1'
+  VERSION = '4.0.1'
 end
 

data/lib/simple_youtube/youtube.rb

@@ -2,15 +2,16 @@ require 'oauth'
 
 #### Create classes for YouTube resources.
 module Youtube
-
   class Video < ActiveYoutube
-
-    def self.update scope, user_name, update_xml, oauth_token, oauth_token_secret, x_gdata_key, host, host_secret
-      consumer = OAuth::Consumer.new(host, host_secret, {:site=>"https://www.google.com", :request_token_path=>"/accounts/OAuthGetRequestToken", :authorize_path=>"/accounts/OAuthAuthorizeToken", :access_token_path=>"/accounts/OAuthGetAccessToken"})
-      access_token = OAuth::AccessToken.new(consumer, oauth_token, oauth_token_secret)
-      access_token.put("http://gdata.youtube.com/feeds/api/users/#{user_name}/uploads/#{scope}", update_xml, {'Accept' => 'application/atom+xml', 'Content-Type' => 'application/atom+xml', 'X-GData-Key' => "key=#{x_gdata_key}" })
+    def self.update scope, user_name, update_xml, oauth_token, x_gdata_key
+      RestClient.put(
+        "http://gdata.youtube.com/feeds/api/users/#{user_name}/uploads/#{scope}",
+        update_xml,
+        { 'Authorization' => "Bearer #{oauth_token}",
+          'Content-Type'  => 'application/atom+xml',
+          'GData-Version' => '2',
+          'X-GData-Key'   => "key=#{x_gdata_key}" })
     end
-
   end
 
   class User < ActiveYoutube
@@ -21,5 +22,4 @@ module Youtube
 
   class Playlist < ActiveYoutube
   end
-
 end

data/simple_youtube.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'activeresource', '~> 3.1'
   s.add_dependency 'oauth', '~> 0.4'
+  s.add_dependency 'rest-client'
 
   s.add_development_dependency 'fakeweb', '~> 1.3'
   s.add_development_dependency 'rspec', '~> 2.6'

data/spec/youtube_update_spec.rb

@@ -2,49 +2,29 @@ require 'spec_helper'
 
 describe 'YoutubeUpdateSpec' do
   it 'updates a video on youtube' do
-    consumer = double('consumer')
+
     access_token = double('access_token')
-    host = 'www.host.com'
-    host_secret = 'host_secret'
     oauth_token = 'oauth_token'
-    oauth_token_secret = "oauth_token_secret"
     x_gdata_key = 'x_gdata_key'
     video_uid = 'video_uid'
     user_name = 'user_name'
     update_xml = IO.read(SimpleYoutube::ROOT + '/spec/fixture/video_update.xml')
 
-    OAuth::Consumer.should_receive(:new).
-      with(
-        host,
-        host_secret,
-        { :site => 'https://www.google.com',
-          :request_token_path => '/accounts/OAuthGetRequestToken',
-          :authorize_path => '/accounts/OAuthAuthorizeToken',
-          :access_token_path => '/accounts/OAuthGetAccessToken' }).
-      and_return(consumer)
-
-    OAuth::AccessToken.should_receive(:new).
-      with(consumer, oauth_token, oauth_token_secret).
-      and_return(access_token)
-
-    access_token.should_receive(:put).
-      with(
+    RestClient.should_receive(:put).with(
         "http://gdata.youtube.com/feeds/api/users/#{user_name}/uploads/#{video_uid}",
         update_xml,
-        { 'Accept' => 'application/atom+xml',
-          'Content-Type' => 'application/atom+xml',
-          'X-GData-Key' => "key=#{x_gdata_key}" }).
-      and_return(Net::HTTPResponse.new(1.0, 200, 'OK'))
+        { 'Authorization' => "Bearer #{oauth_token}",
+          'Content-Type'  => 'application/atom+xml',
+          'GData-Version' => '2',
+          'X-GData-Key'   => "key=#{x_gdata_key}" }).
+      and_return(Net::HTTPResponse.new(1.1, 200, 'OK'))
 
     response = Youtube::Video.update(
       video_uid,
       user_name,
       update_xml,
       oauth_token,
-      oauth_token_secret,
-      x_gdata_key,
-      host,
-      host_secret)
+      x_gdata_key)
 
     response.code.should == 200
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_youtube
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 4.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-13 00:00:00.000000000Z
+date: 2013-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: &70351174725400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70351174725400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &70351174724540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,31 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70351174724540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70351174723540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +69,15 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70351174723540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70351174722920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +85,15 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70351174722920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &70351174722260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70351174722260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70351174721180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +117,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70351174721180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ActiveResource extension to Gdata Youtube API, anonymous Reads, Updates
   using your API key and OAuth, no Create or Delete access.
 email:
@@ -133,7 +179,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4037484550341055447
+      hash: -62510107833783057
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -142,10 +188,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4037484550341055447
+      hash: -62510107833783057
 requirements: []
 rubyforge_project: simple_youtube
-rubygems_version: 1.8.15
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: ActiveResource extension to Gdata Youtube API.