diff --git a/lib/zencoder/output.rb b/lib/zencoder/output.rb index 09acffb..a3bf37f 100644 --- a/lib/zencoder/output.rb +++ b/lib/zencoder/output.rb @@ -1,6 +1,11 @@ module Zencoder class Output < Base - + + def self.details(output_id, options={}) + params = {:api_key => options.delete(:api_key) || api_key} + HTTP.get("#{options[:base_url] || base_url}/outputs/#{output_id}", merge_params(options, params)) + end + def self.progress(output_id, options={}) params = {:api_key => options.delete(:api_key) || api_key} HTTP.get("#{options[:base_url] || base_url}/outputs/#{output_id}/progress", merge_params(options, params)) diff --git a/lib/zencoder/zencoder.rb b/lib/zencoder/zencoder.rb index 36fc09f..f7a1524 100644 --- a/lib/zencoder/zencoder.rb +++ b/lib/zencoder/zencoder.rb @@ -4,7 +4,7 @@ module Zencoder mattr_writer :base_url self.api_key = nil - self.base_url = 'https://app.zencoder.com/api' + self.base_url = 'https://app.zencoder.com/api/v2' def self.api_key @@api_key || ENV['ZENCODER_API_KEY'] diff --git a/test/zencoder/output_test.rb b/test/zencoder/output_test.rb index 0aa9c04..58339d0 100644 --- a/test/zencoder/output_test.rb +++ b/test/zencoder/output_test.rb @@ -6,7 +6,19 @@ class Zencoder::OutputTest < Test::Unit::TestCase setup do @api_key = 'abc123' end + + context ".details" do + setup do + @output_id = 1 + @url = "#{Zencoder.base_url}/outputs/#{@output_id}" + end + should "GET the correct url and return a response" do + Zencoder::HTTP.stubs(:get).with(@url, {:params => {:api_key => @api_key}}).returns(Zencoder::Response.new) + assert_equal Zencoder::Response, Zencoder::Output.details(@output_id, :api_key => @api_key).class + end + end + context ".progress" do setup do @output_id = 1