From 1d9396dbd94ecb3bbaf19c22b1363a7ff3892c52 Mon Sep 17 00:00:00 2001
From: Joseph Wynn <joseph@wildlyinaccurate.com>
Date: Sun, 7 Dec 2014 22:33:14 +0000
Subject: [PATCH] Properly handle nil image path

---
 features/responsive-image-block.feature        | 10 ++++++++++
 features/step_definitions/jekyll_steps.rb      |  6 ++++++
 lib/jekyll/responsive_image/image_processor.rb |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/features/responsive-image-block.feature b/features/responsive-image-block.feature
index 2603e9c..871cddf 100644
--- a/features/responsive-image-block.feature
+++ b/features/responsive-image-block.feature
@@ -38,3 +38,13 @@ Feature: Jekyll responsive_image_block tag
       """
     When I run Jekyll
     Then I should see "<img alt=\"Lorem ipsum\" src=\"/assets/test.png\"" in "_site/index.html"
+
+  Scenario: Handling a nil path
+    Given I have a responsive_image configuration with "template" set to "_includes/responsive-image.html"
+    And I have a file "index.html" with:
+      """
+      {% responsive_image_block %}
+          path: {{ path }}
+      {% endresponsive_image_block %}
+      """
+    Then Jekyll should throw a "SyntaxError"
diff --git a/features/step_definitions/jekyll_steps.rb b/features/step_definitions/jekyll_steps.rb
index 7541bd6..80ab0a9 100644
--- a/features/step_definitions/jekyll_steps.rb
+++ b/features/step_definitions/jekyll_steps.rb
@@ -1,7 +1,13 @@
+include Test::Unit::Assertions
+
 When /^I run Jekyll$/ do
   run_jekyll
 end
 
+Then /^Jekyll should throw a "(.+)"$/ do |error_class|
+  assert_raise(Object.const_get(error_class)) { run_jekyll }
+end
+
 Given /^I have a responsive_image configuration with:$/ do |config|
   write_file('_config.yml', "responsive_image:\n#{config}")
 end
diff --git a/lib/jekyll/responsive_image/image_processor.rb b/lib/jekyll/responsive_image/image_processor.rb
index 184fb8f..5c42b32 100644
--- a/lib/jekyll/responsive_image/image_processor.rb
+++ b/lib/jekyll/responsive_image/image_processor.rb
@@ -4,7 +4,7 @@ module Jekyll
       include ResponsiveImage::Utils
 
       def process(image_path, config)
-        raise SyntaxError.new('Invalid image path specified') unless File.exists?(image_path)
+        raise SyntaxError.new('Invalid image path specified') unless File.exists?(image_path.to_s)
 
         resize_handler = ResizeHandler.new
         img = Magick::Image::read(image_path).first