From ba48870eadd48cdd2e2981a5904e164e915b2320 Mon Sep 17 00:00:00 2001 From: Eric Theise Date: Thu, 10 Jan 2013 12:29:04 -0800 Subject: [PATCH 1/4] outputting full path when file does not parse --- lib/jekyll/convertible.rb | 4 ++-- test/test_convertible.rb | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb index dab0545c..26f7a0c9 100644 --- a/lib/jekyll/convertible.rb +++ b/lib/jekyll/convertible.rb @@ -33,9 +33,9 @@ module Jekyll self.data = YAML.load($1) end rescue => e - puts "Error reading file #{name}: #{e.message}" + puts "Error reading file #{File.join(base,name)}: #{e.message}" rescue SyntaxError => e - puts "YAML Exception reading #{name}: #{e.message}" + puts "YAML Exception reading #{File.join(base,name)}: #{e.message}" end self.data ||= {} diff --git a/test/test_convertible.rb b/test/test_convertible.rb index b9a9e41c..3ad3c817 100644 --- a/test/test_convertible.rb +++ b/test/test_convertible.rb @@ -20,20 +20,26 @@ class TestConvertible < Test::Unit::TestCase end should "not parse if there is syntax error in front-matter" do + @name = 'broken_front_matter2.erb' out = capture_stdout do - ret = @convertible.read_yaml(@base, 'broken_front_matter2.erb') + ret = @convertible.read_yaml(@base, @name) assert_equal({}, ret) end assert_match(/YAML Exception|syntax error/, out) + assert_match(/#{@base}/, out) + assert_match(/#{@name}/, out) end if RUBY_VERSION >= '1.9.2' should "not parse if there is encoding error in file" do + @name = 'broken_front_matter3.erb' out = capture_stdout do - ret = @convertible.read_yaml(@base, 'broken_front_matter3.erb') + ret = @convertible.read_yaml(@base, @name) assert_equal({}, ret) end assert_match(/invalid byte sequence in UTF-8/, out) + assert_match(/#{@base}/, out) + assert_match(/#{@name}/, out) end end end From 3e7f00ae1967c9f342e4b0c81707c1ab857f52a6 Mon Sep 17 00:00:00 2001 From: Eric Theise Date: Thu, 10 Jan 2013 13:01:50 -0800 Subject: [PATCH 2/4] test the path, not the parts --- test/test_convertible.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/test_convertible.rb b/test/test_convertible.rb index 3ad3c817..80353a9d 100644 --- a/test/test_convertible.rb +++ b/test/test_convertible.rb @@ -26,8 +26,7 @@ class TestConvertible < Test::Unit::TestCase assert_equal({}, ret) end assert_match(/YAML Exception|syntax error/, out) - assert_match(/#{@base}/, out) - assert_match(/#{@name}/, out) + assert_match(/#{File.join(@base,@name)}/, out) end if RUBY_VERSION >= '1.9.2' @@ -38,8 +37,7 @@ class TestConvertible < Test::Unit::TestCase assert_equal({}, ret) end assert_match(/invalid byte sequence in UTF-8/, out) - assert_match(/#{@base}/, out) - assert_match(/#{@name}/, out) + assert_match(/#{File.join(@base,@name)}/, out) end end end From cf42c566308c3473f0188e2f28e1250f1bb657a2 Mon Sep 17 00:00:00 2001 From: Eric Theise Date: Thu, 10 Jan 2013 14:07:10 -0800 Subject: [PATCH 3/4] stick to good coding standards --- test/test_convertible.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test_convertible.rb b/test/test_convertible.rb index 80353a9d..b5afa86f 100644 --- a/test/test_convertible.rb +++ b/test/test_convertible.rb @@ -26,7 +26,7 @@ class TestConvertible < Test::Unit::TestCase assert_equal({}, ret) end assert_match(/YAML Exception|syntax error/, out) - assert_match(/#{File.join(@base,@name)}/, out) + assert_match(/#{File.join(@base, @name)}/, out) end if RUBY_VERSION >= '1.9.2' @@ -37,7 +37,7 @@ class TestConvertible < Test::Unit::TestCase assert_equal({}, ret) end assert_match(/invalid byte sequence in UTF-8/, out) - assert_match(/#{File.join(@base,@name)}/, out) + assert_match(/#{File.join(@base, @name)}/, out) end end end From a5c908ac3f3d55bf6ed25695831f9e5affbde0c4 Mon Sep 17 00:00:00 2001 From: Eric Theise Date: Thu, 10 Jan 2013 14:13:11 -0800 Subject: [PATCH 4/4] no good reason for making 'name' an instance variable --- test/test_convertible.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/test_convertible.rb b/test/test_convertible.rb index b5afa86f..82e4d27f 100644 --- a/test/test_convertible.rb +++ b/test/test_convertible.rb @@ -20,24 +20,24 @@ class TestConvertible < Test::Unit::TestCase end should "not parse if there is syntax error in front-matter" do - @name = 'broken_front_matter2.erb' + name = 'broken_front_matter2.erb' out = capture_stdout do - ret = @convertible.read_yaml(@base, @name) + ret = @convertible.read_yaml(@base, name) assert_equal({}, ret) end assert_match(/YAML Exception|syntax error/, out) - assert_match(/#{File.join(@base, @name)}/, out) + assert_match(/#{File.join(@base, name)}/, out) end if RUBY_VERSION >= '1.9.2' should "not parse if there is encoding error in file" do - @name = 'broken_front_matter3.erb' + name = 'broken_front_matter3.erb' out = capture_stdout do - ret = @convertible.read_yaml(@base, @name) + ret = @convertible.read_yaml(@base, name) assert_equal({}, ret) end assert_match(/invalid byte sequence in UTF-8/, out) - assert_match(/#{File.join(@base, @name)}/, out) + assert_match(/#{File.join(@base, name)}/, out) end end end