github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix issue #373

Browse Source
This commit is contained in:
Didier Lafforgue 2012-04-20 15:42:10 +02:00
parent fa6e62dd84
commit d6059c2a9b
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/locomotive/dragonfly.rb
View File

@ -7,6 +7,8 @@ module Locomotive
if source.is_a?(String) || source.is_a?(Hash) # simple string or theme asset
source = source['url'] if source.is_a?(Hash)
source.strip!
if source =~ /^http/
file = self.app.fetch_url(source)
else

16
spec/lib/locomotive/liquid/filters/resize_spec.rb
View File

@ -17,13 +17,19 @@ describe Locomotive::Liquid::Filters::Resize do
@template = Liquid::Template.parse('{{ asset_url | resize: "40x30" }}')
end
it 'should return the location of the resized image' do
it 'returns the location of the resized image' do
@template.render(@context).should =~ /images\/dynamic\/.*\/5k.png/
end
it 'should use the path in the public folder to generate a location' do
it 'uses the path in the public folder to generate a location' do
@template.render(@context).should == Locomotive::Dragonfly.resize_url(@asset_path, '40x30')
end
it 'accepts strings with leading and trailing empty characters' do
@context['asset_url'] = " \t #{@context['asset_url']} \n\n "
@template.render(@context).should == Locomotive::Dragonfly.resize_url(@asset_path, '40x30')
end
end
context 'when a theme asset is given' do
@ -31,11 +37,11 @@ describe Locomotive::Liquid::Filters::Resize do
@template = Liquid::Template.parse("{{ theme_asset | resize: '300x400' }}")
end
it 'should return the location of the resized image' do
it 'returns the location of the resized image' do
@template.render(@context).should =~ /images\/dynamic\/.*\/5k.png/
end
it 'should use the path of the theme asset to generate a location' do
it 'uses the path of the theme asset to generate a location' do
@template.render(@context).should == Locomotive::Dragonfly.resize_url(@theme_asset_path, '300x400')
end
end
@ -45,7 +51,7 @@ describe Locomotive::Liquid::Filters::Resize do
@template = Liquid::Template.parse('{{ asset | resize: }}')
end
it 'should return a liquid error' do
it 'returns a liquid error' do
@template.render(@context).should include 'Liquid error: wrong number of arguments'
end
end