youtube_it 2.3.2 → 2.4.0

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+2.3.x 2013-xx-xx
+----------------
+
+Changes:
+- All YouTubeIt errors are now defined under the YouTubeIt namespace and inherit from YouTubeIt::Error
+- All 404 responses from the YouTube api now raise YouTubeIt::ResourceNotFoundError instead of UploadError
+
+Improvements:
+- Added this CHANGELOG

data/README.rdoc

@@ -93,6 +93,7 @@ Standard Queries:
   $ client.videos_by(:most_linked, :page => 3)
   $ client.videos_by(:top_rated, :time => :today)
   $ client.get_all_videos(:top_rated, :time => :today)
+  $ client.videos_by(:top_rated,  :region => "RU", :category => "News")
 Advanced Queries (with boolean operators OR (either), AND (include), NOT (exclude)):
   $ client.videos_by(:categories => { :either => [:news, :sports], :exclude => [:comedy] }, :tags => { :include => ['football'], :exclude => ['soccer'] })
 
@@ -112,8 +113,8 @@ Fields Parameter(experimental features):
   $ client.videos_by(:fields => {:view_count => "1000"})
 
   Filter by date
-  $ client.videos_by(:fields => {:published  => ((Date.today)})
-  $ client.videos_by(:fields => {:recorded   => ((Date.today)})  
+  $ client.videos_by(:fields => {:published  => (Date.today)})
+  $ client.videos_by(:fields => {:recorded   => (Date.today)})  
 
   Filter by date with range
   $ client.videos_by(:fields => {:published  => ((Date.today - 30)..(Date.today))})
@@ -130,6 +131,10 @@ Note: YouTube account, OAuth or AuthSub enables video management.
 Upload Video:
   $ client.video_upload(File.open("test.mov"), :title => "test",:description => 'some description', :category => 'People',:keywords => %w[cool blah test])
 
+Upload Remote Video:
+  $ client.video_upload("http://url/myvideo.mp4", :title => "test",:description => 'some description', :category => 'People',:keywords => %w[cool blah test])
+
+
 Upload Video With A Developer Tag (Note the tags are not immediately available):
   $ client.video_upload(File.open("test.mov"), :title => "test",:description => 'some description', :category => 'People',:keywords => %w[cool blah test], :dev_tag => 'tagdev')
 
@@ -319,7 +324,8 @@ Note: you can specify width or just use the default of 1280.
 Now you can embed videos without use flash using html5, usefull for mobiles that not support flash but has html5 browser
 
 You can specify these options
-  $ video.embed_html5({:class => 'video-player', :id => 'my-video', :width => '425', :height => '350', :frameborder => '1', :url_params => {:option_one => "value", :option_two => "value"}})
+  $ video.embed_html5({:class => 'video-player', :id => 'my-video', :width => '425', :height => '350', :frameborder => '1', :url_params => {:option_one => "value", :option_two => "value"},
+  fullscreen: true, :sandbox => "value"})
 
 or just use with default options
   $ video.embed_html5 #default: width: 425, height: 350, frameborder: 0

data/lib/youtube_it.rb

@@ -11,15 +11,6 @@ require 'faraday'
 class YouTubeIt
   API_VERSION = "2.1"
 
-  # Base error class for the extension
-  class Error < RuntimeError
-    attr_reader :code
-    def initialize(msg, code = 0)
-      super(msg)
-      @code = code
-    end
-  end
-
   def self.esc(s) #:nodoc:
     CGI.escape(s.to_s)
   end

data/lib/youtube_it/client.rb

@@ -465,9 +465,9 @@ class YouTubeIt
       if (response_code / 10).to_i == 20 # success
         Nokogiri::XML(profile.body).at("//yt:username").text
       elsif response_code == 403 || response_code == 401 # auth failure
-        raise YouTubeIt::Upload::AuthenticationError.new(profile.inspect, response_code)
+        raise AuthenticationError.new(profile.inspect, response_code)
       else
-        raise YouTubeIt::Upload::UploadError.new(profile.inspect, response_code)
+        raise UploadError.new(profile.inspect, response_code)
       end
     end
 
@@ -526,9 +526,9 @@ class YouTubeIt
       if (response_code / 10).to_i == 20 # success
         Nokogiri::XML(profile.body).at("//yt:username").text
       elsif response_code == 403 || response_code == 401 # auth failure
-        raise YouTubeIt::Upload::AuthenticationError.new(profile.inspect, response_code)
+        raise AuthenticationError.new(profile.inspect, response_code)
       else
-        raise YouTubeIt::Upload::UploadError.new(profile.inspect, response_code)
+        raise UploadError.new(profile.inspect, response_code)
       end
     end
 

data/lib/youtube_it/middleware/faraday_youtubeit.rb

@@ -1,6 +1,22 @@
 module Faraday
   class Response::YouTubeIt < Response::Middleware
-    def parse_upload_error_from(string)
+    def on_complete(env) #this method is called after finish request
+      msg = parse_error_from(env[:body])
+      if env[:status] == 404
+        raise ::YouTubeIt::ResourceNotFoundError.new(msg)
+      elsif env[:status] == 403 || env[:status] == 401
+        raise ::YouTubeIt::AuthenticationError.new(msg, env[:status])
+      elsif (env[:status] / 10).to_i != 20
+        raise ::YouTubeIt::UploadError.new(msg, env[:status])
+      end
+    end
+
+    private
+    def parse_error_from(string)
+      return "" unless string
+
+      string.gsub!("\n", "")
+
       xml = Nokogiri::XML(string).at('errors')
       if xml
         xml.css("error").inject('') do |all_faults, error|
@@ -18,14 +34,5 @@ module Faraday
         string[/<TITLE>(.+)<\/TITLE>/, 1] || string
       end
     end
-
-    def on_complete(env) #this method is called after finish request
-      msg = env[:body] ? parse_upload_error_from((env[:body] || '').gsub(/\n/, '')) : ''
-      if env[:status] == 403 || env[:status] == 401
-        raise ::AuthenticationError.new(msg, env[:status])
-      elsif (env[:status] / 10).to_i != 20
-        raise ::UploadError.new(msg, env[:status])
-      end
-    end
   end
 end

data/lib/youtube_it/model/comment.rb

@@ -5,6 +5,8 @@ class YouTubeIt
 
       # YouTubeIt::Model::Author:: Information about the YouTube user who owns a piece of video content.
       attr_reader :author
+      attr_reader :channel_id
+      attr_reader :gp_user_id
 
       # unique ID of the comment.
       def unique_id

data/lib/youtube_it/model/subscription.rb

@@ -1,7 +1,7 @@
 class YouTubeIt
   module Model
     class Subscription < YouTubeIt::Record
-      attr_reader :id, :title, :published
+      attr_reader :id, :title, :published, :youtube_user_name
     end
   end
 end

data/lib/youtube_it/model/user.rb

@@ -29,6 +29,7 @@ class YouTubeIt
       attr_reader :view_count
       attr_reader :avatar
       attr_reader :insight_uri
+      attr_reader :channel_uri
     end
   end
 end

data/lib/youtube_it/model/video.rb

@@ -247,24 +247,26 @@ class YouTubeIt
 EDOC
       end
 
-            # Gives you the HTML 5 to embed the video on your website.
-            # Usefull for mobile that not support flash but has html5 browser
-            # === Returns
-            #   String: The HTML for embedding the video on your website.
-            def embed_html5(params = {})
-              opts = {:class  => params[:class]  || "",
-                      :id     => params[:id]     || "",
-                      :width  => params[:width]  || "425",
-                      :height => params[:height] || "350",
-                      :protocol => params[:protocol] || "http",
-                      :frameborder => params[:frameborder] || "0",
-                      :url_params => params[:url_params] || {}
-                      }
-              url_opts = opts[:url_params].empty? ? "" : "?#{Rack::Utils::build_query(opts[:url_params])}"
-              <<EDOC
-<iframe class="#{opts[:class]}" id="#{opts[:id]}" type="text/html" width="#{opts[:width]}" height="#{opts[:height]}" src="#{opts[:protocol]}://www.youtube.com/embed/#{unique_id}#{url_opts}" frameborder="#{opts[:frameborder]}"></iframe>
+      # Gives you the HTML 5 to embed the video on your website.
+      # Usefull for mobile that not support flash but has html5 browser
+      # === Returns
+      #   String: The HTML for embedding the video on your website.
+      def embed_html5(params = {})
+        opts = {:class  => params[:class]  || "",
+                :id     => params[:id]     || "",
+                :width  => params[:width]  || "425",
+                :height => params[:height] || "350",
+                :protocol => params[:protocol] || "http",
+                :frameborder => params[:frameborder] || "0",
+                :url_params => params[:url_params] || {},
+                :sandbox => params[:sandbox] || false,
+                :fullscreen => params[:fullscreen] || false,
+                }
+        url_opts = opts[:url_params].empty? ? "" : "?#{Rack::Utils::build_query(opts[:url_params])}"
+        <<EDOC
+<iframe class="#{opts[:class]}" id="#{opts[:id]}" type="text/html" width="#{opts[:width]}" height="#{opts[:height]}" src="#{opts[:protocol]}://www.youtube.com/embed/#{unique_id}#{url_opts}" frameborder="#{opts[:frameborder]}" #{" sandbox=\"#{opts[:sandbox]}\" " if opts[:sandbox]} #{"allowfullscreen" if opts[:fullscreen]}></iframe>
 EDOC
-            end
+      end
 
       # Gives you the HTML to embed the video on your website.
       #

data/lib/youtube_it/parser.rb

@@ -62,7 +62,9 @@ class YouTubeIt
             :title     => remove_bom(entry.at("title").text),
             :updated   => entry.at("updated").text,
             :url       => entry.at("id").text,
-            :reply_to  => parse_reply(entry)
+            :reply_to  => parse_reply(entry),
+            :channel_id => (entry.at("yt|channelId").text rescue nil),
+            :gp_user_id => (entry.at("yt|googlePlusUserId").text rescue nil)
           )
         end
 
@@ -320,7 +322,8 @@ class YouTubeIt
           :videos_watched => entry.at_xpath("yt:statistics")["videoWatchCount"],
           :view_count     => entry.at_xpath("yt:statistics")["viewCount"],
           :upload_views   => entry.at_xpath("yt:statistics")["totalUploadViews"],
-          :insight_uri    => (entry.at_xpath('xmlns:link[@rel="http://gdata.youtube.com/schemas/2007#insight.views"]')['href'] rescue nil)
+          :insight_uri    => (entry.at_xpath('xmlns:link[@rel="http://gdata.youtube.com/schemas/2007#insight.views"]')['href'] rescue nil),
+          :channel_uri    => (entry.at_xpath('xmlns:link[@rel="alternate"]')['href'] rescue nil),
         )
       end
     end
@@ -360,7 +363,8 @@ class YouTubeIt
         YouTubeIt::Model::Subscription.new(
           :title        => entry.at("title").text,
           :id           => entry.at("id").text[/subscription([^<]+)/, 1].sub(':',''),
-          :published    => entry.at("published") ? entry.at("published").text : nil
+          :published    => entry.at("published") ? entry.at("published").text : nil,
+          :youtube_user_name  => entry.to_s.split(/\<|\>/)[-4]
         )
       end
     end
@@ -574,7 +578,7 @@ class YouTubeIt
 
       def parse_media_content (elem)
         content_url = elem["url"]
-        format_code = elem["format"].to_i
+        format_code = elem["yt:format"].to_i
         format = YouTubeIt::Model::Video::Format.by_code(format_code)
         duration = elem["duration"].to_i
         mime_type = elem["type"]

data/lib/youtube_it/request/error.rb

@@ -1,15 +1,21 @@
-class UploadError < YouTubeIt::Error
-  attr_reader :code
-  def initialize(msg, code = 0)
-    super(msg)
-    @code = code
+class YouTubeIt
+  class Error < RuntimeError
+    attr_reader :code
+    def initialize(msg, code = 0)
+      super(msg)
+      @code = code
+    end
+  end
+
+  class ResourceNotFoundError < Error
+    def initialize(msg)
+      super(msg, 404)
+    end
   end
-end
 
-class AuthenticationError < YouTubeIt::Error
-  attr_reader :code
-  def initialize(msg, code = 0)
-    super(msg)
-    @code = code
+  class UploadError < Error
   end
-end
+
+  class AuthenticationError < Error
+  end
+end

data/lib/youtube_it/request/remote_file.rb

@@ -6,10 +6,12 @@ class YouTubeIt
 
 
     class RemoteFile
-      def initialize( url)
+      def initialize(url, opts)
         @pos = 0
         @url = url
         @uri = URI(@url)
+        
+        @content_length = opts[:content_length]
 
         @fiber = Fiber.new do |first|
 

data/lib/youtube_it/request/standard_search.rb

@@ -5,6 +5,8 @@ class YouTubeIt
       attr_reader :order_by                        # orderby, ([relevance], viewCount, published, rating)
       attr_reader :offset                          # start-index
       attr_reader :time                            # time
+      attr_reader :region                          # region
+      attr_reader :category                        # category
 
       TYPES = [ :top_rated, :top_favorites, :most_viewed, :most_popular,
                 :most_recent, :most_discussed, :most_linked, :most_responded,
@@ -15,7 +17,11 @@ class YouTubeIt
         if TYPES.include?(type)
           @max_results, @order_by, @offset, @time = nil
           set_instance_variables(options)
-          @url = base_url + type.to_s << build_query_params(to_youtube_params)
+          @url = base_url
+          @url << @region << "/" if @region
+          @url << type.to_s
+          @url << "_" << @category if @category
+          @url << build_query_params(to_youtube_params)
         else
           raise "Invalid type, must be one of: #{ TYPES.map { |t| t.to_s }.join(", ") }"
         end

data/lib/youtube_it/request/video_upload.rb

@@ -1,10 +1,5 @@
 class YouTubeIt
   module Upload
-
-    class UploadError < YouTubeIt::Error; end
-
-    class AuthenticationError < YouTubeIt::Error; end
-
     # Implements video uploads/updates/deletions
     #
     #   require 'youtube_it'
@@ -82,7 +77,7 @@ class YouTubeIt
       def upload(video_data, opts = {})
 
         if video_data.is_a?(String) && uri?(video_data)
-          data = YouTubeIt::Upload::RemoteFile.new(video_data)
+          data = YouTubeIt::Upload::RemoteFile.new(video_data, opts)
         else
           data = video_data
         end
@@ -590,7 +585,7 @@ class YouTubeIt
           http  = Faraday.new("https://www.google.com", :ssl => {:verify => false})
           body = "Email=#{YouTubeIt.esc @user}&Passwd=#{YouTubeIt.esc @password}&service=youtube&source=#{YouTubeIt.esc @client_id}"
           response = http.post("/accounts/ClientLogin", body, "Content-Type" => "application/x-www-form-urlencoded")
-          raise ::AuthenticationError.new(response.body[/Error=(.+)/,1], response.status.to_i) if response.status.to_i != 200
+          raise ::YouTubeIt::AuthenticationError.new(response.body[/Error=(.+)/,1], response.status.to_i) if response.status.to_i != 200
           @auth_token = response.body[/Auth=(.+)/, 1]
         end
       end

data/lib/youtube_it/version.rb

@@ -1,4 +1,4 @@
 class YouTubeIt
-  VERSION = '2.3.2'
+  VERSION = '2.4.0'
 end
 

data/youtube_it.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.summary     = "The most complete Ruby wrapper for youtube api's"
   s.homepage    = "http://github.com/kylejginavan/youtube_it"
 
-  s.add_runtime_dependency("nokogiri", "~> 1.5.2")
+  s.add_runtime_dependency("nokogiri", "~> 1.6.0")
   s.add_runtime_dependency("oauth", "~> 0.4.4")
   s.add_runtime_dependency("oauth2", "~> 0.6")
   s.add_runtime_dependency("simple_oauth", ">= 0.1.5")
@@ -22,9 +22,9 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("builder", ">= 0")
   s.add_runtime_dependency("webmock")
   s.add_runtime_dependency("excon")
-  s.add_runtime_dependency("json", "~> 1.8.0")
+  s.add_runtime_dependency("json", "~> 1.7.7")
   s.files = Dir.glob("lib/**/*") + %w(README.rdoc youtube_it.gemspec)
 
-  s.extra_rdoc_files = %w(README.rdoc)
+  s.extra_rdoc_files = %w(README.rdoc CHANGELOG.md)
 end
 

metadata

@@ -2,7 +2,7 @@
 name: youtube_it
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.3.2
+  version: 2.4.0
 platform: ruby
 authors: 
   - kylejginavan
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-28 00:00:00 Z
+date: 2013-11-15 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: nokogiri
@@ -21,7 +21,7 @@ dependencies:
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 1.5.2
+            version: 1.6.0
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
@@ -109,7 +109,7 @@ dependencies:
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 1.8.0
+            version: 1.7.7
     type: :runtime
     version_requirements: *id009
 description: Upload, delete, update, comment on youtube videos all from one gem.
@@ -122,6 +122,7 @@ extensions: []
 
 extra_rdoc_files: 
   - README.rdoc
+  - CHANGELOG.md
 files: 
   - lib/youtube_it.rb
   - lib/youtube_it/chain_io.rb
@@ -157,6 +158,7 @@ files:
   - lib/youtube_it/response/video_search.rb
   - README.rdoc
   - youtube_it.gemspec
+  - CHANGELOG.md
 homepage: http://github.com/kylejginavan/youtube_it
 licenses: []