Skip to content

Commit

Permalink
added gerrits #thumbnail fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@kbingman
kbingman committed Jul 10, 2009
2 parents 08581bd + dd09602 commit bb79377
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 137 deletions.
2 changes: 1 addition & 1 deletion app/models/asset_tags.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ class TagError < StandardError; end
attributes = options.inject('') { |s, (k, v)| s << %{#{k.downcase}="#{v}" } }.strip
attributes = " #{attributes}" unless attributes.empty?
text = tag.double? ? tag.expand : text
url = asset.image? ? asset.thumbnail(size) : asset.asset.url
url = asset.thumbnail(size)
%{<a href="#{url }#{anchor}"#{attributes}>#{text}</a>} rescue nil
end

Expand Down
137 changes: 1 addition & 136 deletions spec/models/asset_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,142 +23,6 @@ def create_asset(overrides={})
create_asset.should be_valid
end

describe 'content types' do
describe 'images' do
['image/jpeg', 'image/pjpeg', 'image/gif', 'image/png', 'image/x-png', 'image/jpg'].each do |mime|
it "should be an image if it has a content type of #{mime}" do
new_asset(:asset_content_type => mime).should be_image
end
(Asset.known_types - [:image]).each do |other|
it "should not be #{other}" do
new_asset(:asset_content_type => mime).send("#{other}?").should_not be_true
end
end
end

describe 'scope' do
it 'should only return image assets' do
jpeg = create_asset :asset_content_type => 'image/jpeg'
gif = create_asset :asset_content_type => 'image/gif'
pdf = create_asset :asset_content_type => 'application/pdf'
Asset.images.should == [jpeg, gif]
end
end
end

describe 'audio' do
it 'should be audio when its an mp3' do
new_asset(:asset_content_type => 'audio/mpeg').should be_audio
end

it 'should be audio when its a windows media audio file' do
new_asset(:asset_content_type => 'audio/x-ms-wma').should be_audio
end

it 'should be audio when its an ogg file' do
new_asset(:asset_content_type => 'application/ogg').should be_audio
end

describe 'scope' do
it 'should only return audio files' do
qt = create_asset :asset_content_type => 'video/quicktime'
mp3 = create_asset :asset_content_type => 'audio/mpeg'
ogg = create_asset :asset_content_type => 'application/ogg'
pdf = create_asset :asset_content_type => 'application/pdf'
Asset.audios.should == [mp3, ogg]
end
end
end

describe 'movies' do
it 'should be movie when it has video/* content-type' do
new_asset(:asset_content_type => 'video/quicktime').should be_movie
end
it 'should be movie when it has flash content type' do
new_asset(:asset_content_type => 'application/x-shockwave-flash').should be_movie
end
describe 'scope' do
it 'should return swf and video assets, not others' do
create_asset :asset_content_type => 'audio/mpeg'
qt = create_asset :asset_content_type => 'video/quicktime'
create_asset :asset_content_type => 'application/pdf'
swf = create_asset :asset_content_type => 'application/x-shockwave-flash'
Asset.movies.should == [qt, swf]
end
end
end

describe 'flash' do
it 'should be swf when it has flash content type' do
new_asset(:asset_content_type => 'application/x-shockwave-flash').should be_swf
end

describe 'scope' do
it 'should only return swf assets' do
gif = create_asset :asset_content_type => 'image/gif'
pdf = create_asset :asset_content_type => 'application/pdf'
swf = create_asset :asset_content_type => 'application/x-shockwave-flash'
Asset.swfs.should == [swf]
end
end
end

describe 'video' do
it 'should be video when it has a quicktime content-type' do
new_asset(:asset_content_type => 'video/quicktime').should be_video
end

describe 'scope' do
it 'should only return video assets' do
qt = create_asset :asset_content_type => 'video/quicktime'
pdf = create_asset :asset_content_type => 'application/pdf'
swf = create_asset :asset_content_type => 'application/x-shockwave-flash'
Asset.videos.should == [qt]
end
end
end

describe 'pdf' do
it 'should be pdf when it has pdf content-type' do
new_asset(:asset_content_type => 'application/pdf').should be_pdf
end

describe 'scope' do
it 'should only return pdf assets' do
gif = create_asset :asset_content_type => 'image/gif'
pdf = create_asset :asset_content_type => 'application/pdf'
swf = create_asset :asset_content_type => 'application/x-shockwave-flash'
Asset.pdfs.should == [pdf]
end
end
end

describe 'other' do
it 'text document should be other' do
new_asset(:asset_content_type => 'text/plain').should be_other
end

it 'binary should be other' do
new_asset(:asset_content_type => 'application/octet-stream').should be_other
end

describe 'scope' do
it 'should only return types not covered by other scopes' do
# create_asset :asset_content_type => 'application/pdf'
create_asset :asset_content_type => 'application/x-shockwave-flash'
txt = create_asset :asset_content_type => 'text/plain'
create_asset :asset_content_type => 'image/gif'
create_asset :asset_content_type => 'video/quicktime'
create_asset :asset_content_type => 'audio/mpeg'
bin = create_asset :asset_content_type => 'application/octet-stream'
create_asset :asset_content_type => 'application/ogg'

Asset.others.should == [txt, bin]
end
end
end
end

describe '#thumbnail' do
describe 'without argument' do
it 'should return paperclip asset url for image' do
Expand Down Expand Up @@ -200,5 +64,6 @@ def create_asset(overrides={})
image.thumbnail('thumbnail').should == "/images/assets/pdf_thumbnail.png"
end
end
>>>>>>> dd09602a1ff50a836b9f26300e4bd7c6f1e9471d:spec/models/asset_spec.rb

end

0 comments on commit bb79377

Please sign in to comment.