lib/viddler/multipart_params.rb @@ -1,3 +1,2 @@ doc log/*.log -test/viddler.yml .gitignore @@ -2,7 +2,7 @@ require 'fileutils' include FileUtils require 'rubygems' -%w[rake hoe newgem rubigen active_support curb].each do |req_gem| +%w[rake hoe newgem rubigen active_support rest_client mime/types].each do |req_gem| begin require req_gem rescue LoadError config/requirements.rb @@ -4,13 +4,13 @@ $:.unshift(File.dirname(__FILE__)) unless require 'rubygems' require 'active_support' require 'ostruct' -require 'curb' require 'ext/open_struct' require 'ext/hash' require 'ext/array' require 'viddler/api_spec' require 'viddler/base' +require 'viddler/multipart_params' require 'viddler/request' require 'viddler/video' require 'viddler/comment' @@ -18,4 +18,4 @@ require 'viddler/user' # Module to encapsule the Viddler API. module Viddler -end +end \ No newline at end of file lib/viddler.rb @@ -1,3 +1,5 @@ +require 'rest_client' + module Viddler # Raised when response from Viddler contains absolutely no data @@ -15,14 +17,16 @@ module Viddler class Request #:nodoc: API_URL = 'http://api.viddler.com/rest/v1/' + DEFAULT_HEADERS = {:accept => 'application/xml', :content_type => 'application/x-www-form-urlencoded'} - attr_accessor :url, :http_method, :response - attr_reader :params + attr_accessor :url, :http_method, :response, :body + attr_reader :headers, :params def initialize(http_method, method) #:nodoc: @http_method = http_method.to_s @url = API_URL self.params = {:method => viddlerize(method)} + self.headers = DEFAULT_HEADERS end # Use this method to setup your request's payload and headers. @@ -49,35 +53,22 @@ module Viddler if block_given? set(:params, &block) end - - c = Curl::Easy.new(url) - c.headers['Accept'] = 'application/xml' if post? and multipart? - c.multipart_form_post = true - c.http_post(*build_params) + put_multipart_params_into_body else - c.url = url_with_params - c.perform - end - - self.response = parse_response(c.body_str) + put_params_into_url + end + request = RestClient::Request.execute( + :method => http_method, + :url => url, + :headers => headers, + :payload => body + ) + self.response = parse_response(request) end private - - def build_params - f = [] - t = [] - params.each do |key, value| - if value.is_a? File - f << Curl::PostField.file(key.to_s, value.path, File.basename(value.path)) - else - t << Curl::PostField.content(key.to_s, value.to_s) - end - end - t + f - end def parse_response(raw_response) raise EmptyResponseError if raw_response.blank? @@ -88,8 +79,14 @@ module Viddler response_hash end - def url_with_params - self.url + '?' + params.to_query + def put_multipart_params_into_body + multiparams = MultipartParams.new(params) + self.body = multiparams.body + self.headers = {:content_type => multiparams.content_type} + end + + def put_params_into_url + self.url = self.url + '?' + params.to_query end def viddlerize(name) @@ -105,6 +102,11 @@ module Viddler @params.update(hash) end + def headers=(hash) #:nodoc: + @headers ||= Hash.new + @headers.update(hash) + end + def multipart? #:nodoc: if params.find{|k,v| v.is_a?(File)} then true else false end end lib/viddler/request.rb @@ -1,4 +1,2 @@ require 'test/unit' -require 'ruby_debug' require 'viddler' -require 'yaml' test/test_helper.rb @@ -1,27 +1,45 @@ require File.dirname(__FILE__) + '/test_helper.rb' class ViddlerTest < Test::Unit::TestCase - - TEST_VIDEO_FILE_PATH = '/home/petyo/Test/sample.vob' + class KeyRequired < Exception + def message + 'In order to run this test, insert working Viddler API key inside API_KEY constant.' + end + end + + class CredentialsRequired < Exception + def message + 'In order to run this test, insert working Viddler username and password inside LOGIN and PASSWORD constants.' + end + end + + # In order to run the tests you need a working Viddler account and an API key. + API_KEY = nil + LOGIN = nil + PASSWORD = nil + TEST_VIDEO_FILE_PATH = '/path/to/video' def setup - config = YAML.load_file File.join(File.dirname(__FILE__), 'viddler.yml') rescue "you need test/viddler.yml, check viddler.yml.example for credentals." - @viddler = Viddler::Base.new(config['api_key'], config['login'], config['password']) + raise KeyRequired unless API_KEY + @viddler = Viddler::Base.new(API_KEY, LOGIN, PASSWORD) end def test_should_authenticate + credentials_required @viddler.authenticate assert @viddler.authenticated? end def test_should_get_record_token + credentials_required token = @viddler.get_record_token assert_kind_of String, token end def test_should_upload_video + credentials_required file = File.open(TEST_VIDEO_FILE_PATH) - video = @viddler.upload_video(:file => file, :title => 'Testing', :description => 'Bla', :tags => 'one, two, three', :make_public => '1') + video = @viddler.upload_video(:file => file, :title => 'Testing', :description => 'Bla', :tags => 'one, two, three') end def test_should_find_profile @@ -30,6 +48,7 @@ class ViddlerTest < Test::Unit::TestCase end def test_should_update_profile + credentials_required user = @viddler.update_profile(:first_name => 'Ilya', :last_name => 'Sabanin', :about_me => 'A guy', @@ -41,14 +60,13 @@ class ViddlerTest < Test::Unit::TestCase end def test_should_update_account + credentials_required assert @viddler.update_account(:show_account => '0') end -=begin def test_should_get_video_status - assert @viddler.get_video_status('6b0b9af1') + assert @viddler.get_video_status('f8605d95') end -=end def test_should_find_video_by_id video = @viddler.find_video_by_id('6b0b9af1') @@ -80,5 +98,11 @@ class ViddlerTest < Test::Unit::TestCase videos = @viddler.find_all_featured_videos assert_kind_of Viddler::Video, videos.first end + + private + + def credentials_required + raise CredentialsRequired unless LOGIN and PASSWORD + end end test/test_viddler.rb test/viddler.yml.sample 6ed9839fa0328909cf04c5a05abc127babab99a0 Petyo Ivanov underlog@gmail.com http://github.com/iSabanin/viddler/commit/21737aa5aa8ade11278d6f6ee219b36c611e9a20 21737aa5aa8ade11278d6f6ee219b36c611e9a20 2009-04-11T07:56:17-07:00 2009-04-11T07:56:17-07:00 Oops, this is not ready for master branch yet. Revert "Swapped rest-client and homecooked multipart with curb, which uses C bindings to curl... Maybe it will be faster." This reverts commit 6ed9839fa0328909cf04c5a05abc127babab99a0. afdff76c86a87824bb8e2c623363a8271bd545f7 Petyo Ivanov underlog@gmail.com