youtube_it 2.1.1 → 2.1.2

data/Gemfile

@@ -1,10 +1,11 @@
 source 'http://rubygems.org'
 
-gem 'oauth'
-gem 'simple_oauth'
+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 'builder'
-gem 'faraday'
-gem 'nokogiri'
 
 group :test do
   gem 'webmock'

data/Gemfile.lock

@@ -4,16 +4,20 @@ GEM
     addressable (2.2.6)
     builder (3.0.0)
     crack (0.3.1)
-    faraday (0.7.5)
+    faraday (0.7.3)
       addressable (~> 2.2.6)
-      multipart-post (~> 1.1.3)
+      multipart-post (~> 1.1.0)
       rack (>= 1.1.0, < 2)
+    multi_json (1.0.4)
     multipart-post (1.1.4)
-    nokogiri (1.5.0)
-    oauth (0.4.5)
-    rack (1.3.5)
+    oauth (0.4.4)
+    oauth2 (0.5.2)
+      faraday (~> 0.7)
+      multi_json (~> 1.0)
+    rack (1.4.1)
+    rake (0.8.7)
     simple_oauth (0.1.5)
-    webmock (1.7.7)
+    webmock (1.7.10)
       addressable (~> 2.2, > 2.2.5)
       crack (>= 0.1.7)
 
@@ -22,8 +26,9 @@ PLATFORMS
 
 DEPENDENCIES
   builder
-  faraday
-  nokogiri
-  oauth
-  simple_oauth
+  faraday (= 0.7.3)
+  oauth (= 0.4.4)
+  oauth2 (= 0.5.2)
+  rake (= 0.8.7)
+  simple_oauth (= 0.1.5)
   webmock

data/Manifest.txt

@@ -10,6 +10,7 @@ lib/youtube_it/model/author.rb
 lib/youtube_it/model/category.rb
 lib/youtube_it/model/contact.rb
 lib/youtube_it/model/content.rb
+lib/youtube_it/model/message.rb
 lib/youtube_it/model/playlist.rb
 lib/youtube_it/model/rating.rb
 lib/youtube_it/model/thumbnail.rb

data/README.rdoc

@@ -42,6 +42,13 @@ Client with OAuth:
   $ client = YouTubeIt::OAuthClient.new("consumer_key", "consumer_secret", "youtube_username", "developer_key")
   $ 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")
+
+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:
+
+  $ client.refresh_access_token!
+
 == VIDEO QUERIES
 
 Note:  Each type of client enables searching capabilities.
@@ -49,6 +56,7 @@ Note:  Each type of client enables searching capabilities.
 Basic Queries:
   $ client.videos_by(:query => "penguin")
   $ client.videos_by(:query => "penguin", :page => 2, :per_page => 15)
+  $ client.videos_by(:query => "penguin", :restriction => "DE")
   $ client.videos_by(:tags => ['tiger', 'leopard'])
   $ client.videos_by(:categories => [:news, :sports])
   $ client.videos_by(:categories => [:news, :sports], :tags => ['soccer', 'football'])

data/Rakefile

@@ -1,4 +1,5 @@
 require 'rubygems'
+gem 'rake', '0.9.2.2'
 require 'rake'
 
 begin
@@ -10,6 +11,7 @@ begin
     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')

data/VERSION

@@ -1 +1 @@
-2.1.1
+2.1.2

data/lib/youtube_it.rb

@@ -33,6 +33,14 @@ class YouTubeIt
     @logger ||= create_default_logger
   end
 
+  def self.adapter=(faraday_adapter)
+    @adapter = faraday_adapter
+  end
+  
+  def self.adapter
+    @adapter ||= Faraday.default_adapter
+  end
+  
   # Gets mixed into the classes to provide the logger method
   module Logging #:nodoc:
 
@@ -60,6 +68,7 @@ end
   model/comment
   model/contact
   model/content
+  model/message
   model/playlist
   model/rating
   model/subscription
@@ -76,6 +85,7 @@ end
   response/video_search
   middleware/faraday_authheader.rb
   middleware/faraday_oauth.rb
+  middleware/faraday_oauth2.rb
   middleware/faraday_youtubeit.rb
   chain_io
 ).each{|m| require File.dirname(__FILE__) + '/youtube_it/' + m }

data/lib/youtube_it/client.rb

@@ -85,7 +85,7 @@ class YouTubeIt
     # YouTubeIt::Model::Video
     def video_by(video)
       vid = nil
-      vid_regex = /(?:youtube.com|youtu.be).*(?:\/|v=)(\w+)/
+      vid_regex = /(?:youtube.com|youtu.be).*(?:\/|v=)([\w-]+)/
       if video =~ vid_regex
         vid = $1
       else
@@ -113,6 +113,10 @@ class YouTubeIt
     def video_delete(video_id)
       client.delete(video_id)
     end
+    
+    def message_delete(message_id)
+      client.delete_message(message_id)
+    end
 
     def upload_token(options, nexturl = "http://www.youtube.com/my_videos")
       client.get_upload_token(options, nexturl)
@@ -228,6 +232,16 @@ class YouTubeIt
     def my_contacts(opts = {})
       client.get_my_contacts(opts)
     end
+    
+    # Send vedio message
+    def send_message(opts = {})
+      client.send_message(opts)
+    end
+    
+    # Get's all of the user's messages/inbox. 
+    def my_messages(opts = {})
+      client.get_my_messages(opts)
+    end
 
     private
 
@@ -390,5 +404,48 @@ class YouTubeIt
     end
 
   end
-end
 
+  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]
+    end
+
+    def oauth_client
+      @oauth_client ||= ::OAuth2::Client.new(@client_id, @client_secret,
+                                             :site => "https://accounts.google.com",
+                                             :authorize_url => '/o/oauth2/auth',
+                                             :token_url => '/o/oauth2/token')
+    end
+    
+    def access_token
+      @access_token ||= ::OAuth2::AccessToken.new(oauth_client, @client_access_token, :refresh_token => @client_refresh_token)
+    end
+
+    def refresh_access_token!
+      @access_token = access_token.refresh!
+    end
+
+    def current_user
+      profile = access_token.get("http://gdata.youtube.com/feeds/api/users/default")
+      response_code = profile.status
+
+      if response_code/10 == 20 # success
+        REXML::Document.new(profile.body).elements["entry"].elements['author'].elements['name'].text
+      elsif response_code == 403 || response_code == 401 # auth failure
+        raise YouTubeIt::Upload::AuthenticationError.new(profile.inspect, response_code)
+      else
+        raise YouTubeIt::Upload::UploadError.new(profile.inspect, response_code)
+      end
+    end
+    
+    private
+
+    def client
+      @client ||= YouTubeIt::Upload::VideoUpload.new(:username => current_user, :access_token => access_token, :dev_key => @dev_key)
+    end
+  end
+end

data/lib/youtube_it/middleware/faraday_authheader.rb

@@ -21,4 +21,4 @@ module Faraday
       @app, @headers = app, headers
     end
   end
-end
+end

data/lib/youtube_it/middleware/faraday_oauth2.rb

@@ -0,0 +1,13 @@
+module Faraday
+  class Request::OAuth2 < Faraday::Middleware
+    def call(env)
+      env[:request_headers]['Authorization'] = "Bearer #{@access_token.token}"
+
+      @app.call(env)
+    end
+
+    def initialize(app, access_token)
+      @app, @access_token = app, access_token
+    end
+  end
+end

data/lib/youtube_it/model/message.rb

@@ -0,0 +1,12 @@
+class YouTubeIt
+  module Model
+    class Message < YouTubeIt::Record
+      attr_reader :id, :name, :title, :summary, :published
+      
+      def content
+        # This tag contains the same value as the <summary> tag.
+        self.summary
+      end
+    end
+  end
+end

data/lib/youtube_it/parser.rb

@@ -247,6 +247,33 @@ class YouTubeIt
         return contacts
       end
     end
+    
+    # Returns an array of the user's messages
+    class MessagesParser < FeedParser
+      def parse_content(content)
+        doc = REXML::Document.new(content.body)
+        puts content.body
+        puts "doc..."
+        puts doc.inspect
+        feed = doc.elements["feed"]
+        
+        messages = []
+        feed.elements.each("entry") do |entry|
+          author = entry.elements["author"]
+          temp_message = YouTubeIt::Model::Message.new(
+            :id  => entry.elements["id"] ? entry.elements["id"].text.gsub(/.+:inbox:/, "") : nil, 
+            :title    => entry.elements["title"] ? entry.elements["title"].text : nil,
+            :name => author && author.elements["name"] ? author.elements["name"].text : nil,
+            :summary   => entry.elements["summary"] ? entry.elements["summary"].text : nil,
+            :published   => entry.elements["published"] ? entry.elements["published"].text : nil
+          )
+          
+          messages << temp_message
+        end
+        
+        return messages
+      end
+    end
 
     class ProfileFeedParser < FeedParser #:nodoc:
       def parse_content(content)

data/lib/youtube_it/request/video_search.rb

@@ -17,7 +17,9 @@ class YouTubeIt
       attr_reader :racy                            # racy ([exclude], include)
       attr_reader :author
       attr_reader :lang                            # lt
-
+      attr_reader :restriction
+      
+      
       def initialize(params={})
         # Initialize our various member data to avoid warnings and so we'll
         # automatically fall back to the youtube api defaults
@@ -62,6 +64,7 @@ class YouTubeIt
           'format' => @video_format,
           'racy' => @racy,
           'author' => @author,
+          'restriction' => @restriction,
           'lr' => @lang
         }
       end

data/lib/youtube_it/request/video_upload.rb

@@ -124,6 +124,24 @@ class YouTubeIt
         
         return YouTubeIt::Parser::ContactsParser.new(response).parse
       end
+      
+      def send_message(opts)
+        message_body = message_xml_for(opts)
+        message_url  = "/feeds/api/users/%s/inbox" % opts[:recipient_id]
+        response     = yt_session.post(message_url, message_body)
+        
+        return {:code => response.status, :body => response.body}
+      end
+      
+      # Fetches the currently authenticated user's messages (i.e. inbox).
+      # When the authentication credentials are incorrect, an AuthenticationError will be raised.
+      def get_my_messages(opts)
+        messages_url = "/feeds/api/users/default/inbox"
+        messages_url << opts.collect { |k,p| [k,p].join '=' }.join('&')
+        response = yt_session.get(messages_url)
+        
+        return YouTubeIt::Parser::MessagesParser.new(response).parse
+      end
 
       # Fetches the data of a video, which may be private. The video must be owned by this user.
       # When the authentication credentials are incorrect, an AuthenticationError will be raised.
@@ -152,6 +170,14 @@ class YouTubeIt
 
         return true
       end
+      
+      # Delete a video message
+      def delete_message(message_id)
+        delete_url = "/feeds/api/users/default/inbox/%s" % message_id
+        response   = yt_session.delete(delete_url)
+
+        return true
+      end
 
       def get_upload_token(options, nexturl)
         @opts      = options
@@ -450,6 +476,16 @@ class YouTubeIt
           end
         end.to_s
       end
+      
+      def message_xml_for(data)
+        b = Builder::XmlMarkup.new
+        b.instruct!
+        b.entry(:xmlns => "http://www.w3.org/2005/Atom", 'xmlns:yt' => "http://gdata.youtube.com/schemas/2007") do | m |
+          m.id(data[:vedio_id]) #if data[:vedio_id]
+          m.title(data[:title]) if data[:title]
+          m.summary(data[:message])
+        end.to_s
+      end
 
       def video_xml_for_playlist(data)
         b = Builder::XmlMarkup.new
@@ -485,10 +521,16 @@ class YouTubeIt
 
       def yt_session(url = nil)
         Faraday.new(:url => (url ? url : base_url), :ssl => {:verify => false}) do |builder|
-          builder.use Faraday::Request::OAuth, @config_token if @config_token
+          if @access_token
+            if @config_token
+              builder.use Faraday::Request::OAuth, @config_token
+            else
+              builder.use Faraday::Request::OAuth2, @access_token
+            end
+          end
           builder.use Faraday::Request::AuthHeader, authorization_headers
           builder.use Faraday::Response::YouTubeIt 
-          builder.adapter Faraday.default_adapter 
+          builder.adapter YouTubeIt.adapter
           
         end
       end

data/test/helper.rb

@@ -3,7 +3,6 @@ require 'date'
 require 'test/unit'
 require 'pp'
 require 'open-uri'
-require 'nokogiri'
 require File.dirname(__FILE__) + '/../lib/youtube_it'
 
 YouTubeIt.logger.level = Logger::ERROR

data/test/test_client.rb

@@ -50,7 +50,7 @@ class TestClient < Test::Unit::TestCase
     assert_equal 25, response.max_result_count
     assert_equal 1, response.offset
   
-      response = @client.videos_by(:query => "penguin", :page => 2)
+    response = @client.videos_by(:query => "penguin", :page => 2)
     assert_equal "tag:youtube.com,2008:videos", response.feed_id
     assert_equal 25, response.max_result_count
     assert_equal 26, response.offset
@@ -217,16 +217,16 @@ class TestClient < Test::Unit::TestCase
   def test_should_denied_comments
     video     = @client.video_upload(File.open("test/test.mov"), OPTIONS.merge(:comment => "denied"))
     assert_valid_video video
-    doc = Nokogiri::HTML(open("http://www.youtube.com/watch?v=#{video.unique_id}"))
-    doc.css('.comments-disabled-message').each{|tag| assert (tag.content.strip == "Adding comments has been disabled for this video.")}
+    doc = open("http://www.youtube.com/watch?v=#{video.unique_id}").read
+    assert "Adding comments has been disabled for this video.", doc.match("Adding comments has been disabled for this video.")[0]
     @client.video_delete(video.unique_id)
   end
   
   def test_should_denied_rate
     video  = @client.video_upload(File.open("test/test.mov"), OPTIONS.merge(:rate => "denied"))
     assert_valid_video video
-    doc = Nokogiri::HTML(open("http://www.youtube.com/watch?v=#{video.unique_id}"))
-    doc.css('#watch-like').each{|tag|; assert (tag.attributes["title"].to_s == "Ratings have been disabled for this video.")}
+    doc = open("http://www.youtube.com/watch?v=#{video.unique_id}").read
+    assert "Ratings have been disabled for this video.", doc.match("Ratings have been disabled for this video.")[0]
     @client.video_delete(video.unique_id)
   end
   
@@ -359,7 +359,13 @@ class TestClient < Test::Unit::TestCase
     video = @client.video_by("https://www.youtube.com/watch?v=EkF4JD2rO3Q")
     assert_valid_video video
   end
-
+  
+  def test_configure_faraday_adapter
+    assert YouTubeIt.adapter == Faraday.default_adapter
+    YouTubeIt.adapter = :net_http
+    assert YouTubeIt.adapter == :net_http
+  end
+  
   private
   
     def assert_valid_video (video)

data/test/test_video.rb

@@ -17,7 +17,7 @@ class TestVideo < Test::Unit::TestCase
 
     assert_equal "tag:youtube.com,2008:video:BDqs-OZWw9o:related", response.feed_id
     assert_equal 25, response.max_result_count
-    assert_equal 23, response.videos.length
+    assert_equal 20, response.videos.length
     assert_equal 1, response.offset
     assert(response.total_result_count > 0)
     assert_instance_of Time, response.updated_at

data/test/test_video_search.rb

@@ -137,5 +137,11 @@ class TestVideoSearch < Test::Unit::TestCase
     request = YouTubeIt::Request::UserSearch.new(:favorites, :user => 'liz', :offset => 20, :max_results => 10)
     assert_equal "http://gdata.youtube.com/feeds/api/users/liz/favorites?max-results=10&start-index=20&v=2", request.url
   end
-
+  
+  # -- Queries with restrictions ---------------------------------------------------------------------------------
+  
+  def test_should_build_basic_query_url_with_restriction
+    request = YouTubeIt::Request::VideoSearch.new(:query => "penguin", :restriction => "DE")
+    assert_equal "http://gdata.youtube.com/feeds/api/videos?q=penguin&restriction=DE&v=2", request.url
+  end
 end

data/youtube_it.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{youtube_it}
-  s.version = "2.1.1"
+  s.version = "2.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kylejginavan", "chebyte", "mseppae"]
-  s.date = %q{2011-12-19}
+  s.date = %q{2012-02-05}
   s.description = %q{Upload, delete, update, comment on youtube videos all from one gem.}
   s.email = %q{kylejginavan@gmail.com}
   s.extra_rdoc_files = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
     "lib/youtube_it/client.rb",
     "lib/youtube_it/middleware/faraday_authheader.rb",
     "lib/youtube_it/middleware/faraday_oauth.rb",
+    "lib/youtube_it/middleware/faraday_oauth2.rb",
     "lib/youtube_it/middleware/faraday_youtubeit.rb",
     "lib/youtube_it/model/activity.rb",
     "lib/youtube_it/model/author.rb",
@@ -34,6 +35,7 @@ Gem::Specification.new do |s|
     "lib/youtube_it/model/comment.rb",
     "lib/youtube_it/model/contact.rb",
     "lib/youtube_it/model/content.rb",
+    "lib/youtube_it/model/message.rb",
     "lib/youtube_it/model/playlist.rb",
     "lib/youtube_it/model/rating.rb",
     "lib/youtube_it/model/subscription.rb",
@@ -71,33 +73,39 @@ 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<oauth>, [">= 0"])
-      s.add_runtime_dependency(%q<simple_oauth>, [">= 0"])
+      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<faraday>, [">= 0"])
-      s.add_runtime_dependency(%q<nokogiri>, [">= 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<builder>, [">= 0"])
     else
-      s.add_dependency(%q<oauth>, [">= 0"])
-      s.add_dependency(%q<simple_oauth>, [">= 0"])
+      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<faraday>, [">= 0"])
-      s.add_dependency(%q<nokogiri>, [">= 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<builder>, [">= 0"])
     end
   else
-    s.add_dependency(%q<oauth>, [">= 0"])
-    s.add_dependency(%q<simple_oauth>, [">= 0"])
+    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<faraday>, [">= 0"])
-    s.add_dependency(%q<nokogiri>, [">= 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<builder>, [">= 0"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: youtube_it
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 2
   - 1
-  - 1
-  version: 2.1.1
+  - 2
+  version: 2.1.2
 platform: ruby
 authors: 
 - kylejginavan
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-19 00:00:00 -06:00
+date: 2012-02-05 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,13 +25,15 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 49
         segments: 
         - 0
-        version: "0"
-  name: oauth
+        - 8
+        - 7
+        version: 0.8.7
+  name: rake
   version_requirements: *id001
   prerelease: false
 - !ruby/object:Gem::Dependency 
@@ -39,13 +41,15 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
         - 0
-        version: "0"
-  name: simple_oauth
+        - 4
+        - 4
+        version: 0.4.4
+  name: oauth
   version_requirements: *id002
   prerelease: false
 - !ruby/object:Gem::Dependency 
@@ -53,13 +57,15 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
         - 0
-        version: "0"
-  name: builder
+        - 5
+        - 2
+        version: 0.5.2
+  name: oauth2
   version_requirements: *id003
   prerelease: false
 - !ruby/object:Gem::Dependency 
@@ -67,18 +73,36 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 17
         segments: 
         - 0
-        version: "0"
-  name: faraday
+        - 1
+        - 5
+        version: 0.1.5
+  name: simple_oauth
   version_requirements: *id004
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 7
+        - 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: 
     - - ">="
@@ -87,12 +111,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: nokogiri
-  version_requirements: *id005
+  name: builder
+  version_requirements: *id006
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -104,11 +128,27 @@ dependencies:
         - 4
         version: 0.4.4
   name: oauth
-  version_requirements: *id006
+  version_requirements: *id007
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  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
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -120,11 +160,11 @@ dependencies:
         - 5
         version: 0.1.5
   name: simple_oauth
-  version_requirements: *id007
+  version_requirements: *id009
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -136,11 +176,11 @@ dependencies:
         - 3
         version: 0.7.3
   name: faraday
-  version_requirements: *id008
+  version_requirements: *id010
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -150,7 +190,7 @@ dependencies:
         - 0
         version: "0"
   name: builder
-  version_requirements: *id009
+  version_requirements: *id011
   prerelease: false
 description: Upload, delete, update, comment on youtube videos all from one gem.
 email: kylejginavan@gmail.com
@@ -172,6 +212,7 @@ files:
 - lib/youtube_it/client.rb
 - lib/youtube_it/middleware/faraday_authheader.rb
 - lib/youtube_it/middleware/faraday_oauth.rb
+- lib/youtube_it/middleware/faraday_oauth2.rb
 - lib/youtube_it/middleware/faraday_youtubeit.rb
 - lib/youtube_it/model/activity.rb
 - lib/youtube_it/model/author.rb
@@ -179,6 +220,7 @@ files:
 - lib/youtube_it/model/comment.rb
 - lib/youtube_it/model/contact.rb
 - lib/youtube_it/model/content.rb
+- lib/youtube_it/model/message.rb
 - lib/youtube_it/model/playlist.rb
 - lib/youtube_it/model/rating.rb
 - lib/youtube_it/model/subscription.rb