@@ -353,10 +353,13 @@ class Video < SimpleDB::Base # API # === + # Hash of paramenters for video and encodings when video.xml/yaml requested. + # + # See the specs for an example of what this returns + # def show_response - # :filename, :original_filename, :parent, :status, :duration, :container, :width, :height, :video_codec, :video_bitrate, :fps, :audio_codec, :audio_bitrate, :audio_sample_rate, :profile, :profile_title, :player, :encoding_time, :encoded_at, :updated_at, :created_at - - r = {:video => { + r = { + :video => { :id => self.key, :status => self.status } @@ -364,7 +367,11 @@ class Video < SimpleDB::Base # Common attributes for originals and encodings if self.status == 'original' or self.encoding? - r[:video].merge!([:filename, :original_filename, :screenshot, :thumbnail, :width, :height, :duration].map_to_hash {|k| {k => self.send(k)} }) + [:filename, :original_filename, :width, :height, :duration].each do |k| + r[:video][k] = self.send(k) + end + r[:video][:screenshot] = self.clipping.filename(:screenshot) + r[:video][:thumbnail] = self.clipping.filename(:thumbnail) end # If the video is a parent, also return the data for all its encodings @@ -374,7 +381,9 @@ class Video < SimpleDB::Base # Reutrn extra attributes if the video is an encoding if self.encoding? - r[:video].merge!([:parent, :profile, :profile_title, :encoded_at, :encoding_time].map_to_hash {|k| {k => self.send(k)} }) + r[:video].merge! \ + [:parent, :profile, :profile_title, :encoded_at, :encoding_time]. + map_to_hash { |k| {k => self.send(k)} } end return r app/models/video.rb @@ -373,8 +373,44 @@ describe Video do @video.add_to_queue end - - # def show_response + + describe "show_response" do + before :each do + @encoding = Video.new + @encoding.filename = 'abc.flv' + @encoding.key = '1234' + + @video.stub!(:encodings).and_return([]) + end + + it "should contain a hash of parameters for the video" do + @video.show_response.should == { + :video => { + :thumbnail=>"abc.mov_50_thumb.jpg", + :height=>360, + :filename=>"abc.mov", + :screenshot=>"abc.mov_50.jpg", + :status=>"original", + :duration=>100, + :original_filename=>"original_filename.mov", + :width=>480, + :encodings=> [], + :id=>"abc" + } + } + end + + it "should contain an array of encodings if defined" do + @video.stub!(:encodings).and_return([@encoding]) + + @video.show_response[:video][:encodings].first.should == { + :video => { + :status=>nil, + :id=>"1234" + } + } + end + end it "should return correct API create response hash" do @video.create_response.should == {:video => {:id => 'abc'}} spec/models/video_spec.rb fcf08b342b45452e9c034ca5e0bc9c48b912ef6d Martyn Loughran martyn@new-bamboo.co.uk http://github.com/reddavis/panda/commit/d3a2e8c76c66e2553e22d55fd7e93ab5524762d4 d3a2e8c76c66e2553e22d55fd7e93ab5524762d4 2008-10-20T12:34:57-07:00 2008-10-20T12:32:37-07:00 Fixed video.(xml/yaml): Test and fix a bug in the show_response method. 4cf9e48213c92d23def3264f52ea01c3214acec4 Martyn Loughran martyn@new-bamboo.co.uk