return the image url when imagemagick is not available

Benoit Daloze committed Aug 07, 2016

commit a016b415ec595ce54741158c6c8d04fa9c74fc1f

locomotive/steam/liquid/filters/resize.rb b/lib/locomotive/steam/liquid/filters/resize.rb +1 -1

@@	@@ -5,7 +5,7 @@ module Locomotive
	module Resize

	def resize(input, resize_string)
-	@context.registers[:services].image_resizer.resize(input, resize_string) \|\| input
+	@context.registers[:services].image_resizer.resize(input, resize_string)
	end

	end

locomotive/steam/services/image_resizer_service.rb b/lib/locomotive/steam/services/image_resizer_service.rb +1 -1

@@	@@ -6,7 +6,7 @@ module Locomotive
	attr_accessor_initialize :resizer, :asset_path

	def resize(source, geometry)
-	return nil if disabled? \|\| geometry.blank?
+	return get_url_or_path(source) if disabled? \|\| geometry.blank?

	if file = fetch_file(source)
	file.thumb(geometry).url

spec/unit/liquid/filters/resize_spec.rb +17 -0

@@	@@ -29,6 +29,23 @@ describe Locomotive::Steam::Liquid::Filters::Resize do

	it { is_expected.to match /\/steam\/dynamic\/.*\/240px-Metropolitan_railway_steam_locomotive_2781022036.png/ }

+	describe 'when imagemagick is not available' do
+
+	let(:input) {
+	double('image from liquid', url: 'http://upload.wikimedia.org/wikipedia/en/thumb/b/b5/Metropolitan_railway_steam_locomotive_2781022036.png/240px-Metropolitan_railway_steam_locomotive_2781022036.png')
+	}
+
+	before do
+	image_resizer = @context.registers[:services].image_resizer
+	allow(image_resizer).to receive(:disabled?).and_return(true)
+	end
+
+	it 'returns the original url without resizing' do
+	is_expected.to eq 'http://upload.wikimedia.org/wikipedia/en/thumb/b/b5/Metropolitan_railway_steam_locomotive_2781022036.png/240px-Metropolitan_railway_steam_locomotive_2781022036.png'
+	end
+
+	end
+
	end

	end