mikedamage-ruby_tube 0.2.4 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.3.2

data/lib/ruby_tube.rb

@@ -2,6 +2,7 @@ require File.join(File.dirname(__FILE__), "yt_client.rb")
 require File.join(File.dirname(__FILE__), "yt_video.rb")
 require File.join(File.dirname(__FILE__), "yt_comment.rb")
 require File.join(File.dirname(__FILE__), "yt_rating.rb")
+require File.join(File.dirname(__FILE__), "ruby_tube_no_auth.rb")
 
 class RubyTube < YTClient
 	

data/lib/ruby_tube_no_auth.rb

@@ -0,0 +1,72 @@
+class RubyTubeNoAuth
+	attr_accessor :client
+	
+	def initialize(dev_key="")
+		@client = GData::Client::YouTube.new
+		@client.source = "RubyTube"
+		if dev_key
+			@client.developer_key = dev_key
+		end
+	end
+	
+	def find(id)
+		res = @client.get("http://gdata.youtube.com/feeds/api/videos/#{id}")
+		xml = Hpricot.XML(res.body)
+		entry = xml.at("entry")
+		vid = YTVideo.new({
+			:id => (entry/"yt:videoid").text,
+			:title => (entry/"title").text,
+			:description => (entry/"media:description").text,
+			:keywords => (entry/"media:keywords").text,
+			:duration => (entry/"yt:duration").attr("seconds").to_i,
+			:player_uri => (entry/"link[@rel='alternate']").attr("href"),
+			:ratings_uri => (entry/"link[@rel$='ratings']").attr("href"),
+			:comments_uri => (entry/"gd:comments").search("gd:feedlink").attr("href"),
+			:comment_count => (entry/"gd:comments").search("gd:feedlink").attr("countHint").to_i,
+			:published_at => Time.parse((entry/"published").text),
+			:updated_at => Time.parse((entry/"updated").text),
+			:view_count => (entry/"yt:statistics").nil? ? 0 : (entry/"yt:statistics").attr("viewCount"),
+			:favorite_count => (entry/"yt:statistics").nil? ? 0 : (entry/"yt:statistics").attr("favoriteCount"),
+			:comments => comments((entry/"yt:videoid").text),
+			:ratings => ratings((entry/"yt:videoid").text),
+			:status => status,
+			:thumbnails => process_thumbnail_urls(entry)
+		})
+		vid
+	end
+	
+	def comments(id)
+		res = @client.get("http://gdata.youtube.com/feeds/api/videos/#{id}/comments")
+		xml = Hpricot.XML(res.body)
+		comments = Array.new
+		if (xml/"entry").nitems > 0
+			(xml/"entry").each do |entry|
+				cmt = YTComment.new({
+					:title => (entry/"title").text,
+					:content => (entry/"content").text,
+					:author => (entry/"author").search("name").text,
+					:author_uri => (entry/"author").search("uri").text,
+					:video_uri => (entry/"link[@rel='related']").attr("href")
+				})
+				comments << cmt
+			end
+		end
+		comments
+	end
+	
+	def ratings(id)
+		response = Hpricot.XML(@client.get("http://gdata.youtube.com/feeds/api/videos/#{id}").body)
+		ratings = (response/"gd:rating")
+		if ratings.nitems > 0
+			return ratings
+		else
+			return nil
+		end
+	end
+	
+	private
+		def process_thumbnail_urls(hpricot)
+			thumbs = (hpricot/"media:thumbnail")
+			{:big => thumbs.last["url"], :small => thumbs.first["url"]}
+		end
+end

data/lib/yt_client.rb

@@ -28,12 +28,12 @@ class YTClient
 	def all
 		if @all_vids
 			if Time.parse((@all_vids/"updated").text) < (Time.now - @options[:refresh])
-				@all_vids = Hpricot(@client.get(self.class.base_uri + "/users/default/uploads").body)
+				@all_vids = Hpricot.XML(@client.get(self.class.base_uri + "/users/default/uploads").body)
 			else
 				return @all_vids
 			end
 		else
-			@all_vids = Hpricot(@client.get(self.class.base_uri + "/users/default/uploads").body)
+			@all_vids = Hpricot.XML(@client.get(self.class.base_uri + "/users/default/uploads").body)
 		end
 	end
 	
@@ -42,11 +42,11 @@ class YTClient
 	end
 	
 	def check_video(id)
-		Hpricot(@client.get(self.class.base_uri + "/videos/#{id}").body)
+		Hpricot.XML(@client.get(self.class.base_uri + "/videos/#{id}").body)
 	end
 	
 	def ratings(id)
-		response = Hpricot(@client.get(self.class.base_uri + "/videos/#{id}").body)
+		response = Hpricot.XML(@client.get(self.class.base_uri + "/videos/#{id}").body)
 		ratings = (response/"gd:rating")
 		if ratings.nitems > 0
 			return ratings
@@ -56,7 +56,7 @@ class YTClient
 	end
 	
 	def comments(id)
-		Hpricot(@client.get(self.class.base_uri + "/videos/#{id}/comments").body)
+		Hpricot.XML(@client.get(self.class.base_uri + "/videos/#{id}/comments").body)
 	end
 	
 	def upload(file, options={})
@@ -99,7 +99,7 @@ REQDATA
 			'Connection' => 'close'
 		}
 		res = http.post(upload_uri.path, request_data, headers)
-		response = {:code => res.code, :body => Hpricot(res.body)}
+		response = {:code => res.code, :body => Hpricot.XML(res.body)}
 		return response
 	end
 	

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mikedamage-ruby_tube
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.3.2
 platform: ruby
 authors: 
 - Mike Green
@@ -59,6 +59,7 @@ files:
 - Rakefile
 - VERSION
 - lib/ruby_tube.rb
+- lib/ruby_tube_no_auth.rb
 - lib/yt_client.rb
 - lib/yt_comment.rb
 - lib/yt_rating.rb