Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

+ More elegant loading of haml

  • Loading branch information...
commit 50b0ec9b96e59053a38d1ddac26b3c885d2d703b 1 parent 9e4b82e
@kschiess authored
Showing with 10 additions and 3 deletions.
  1. +3 −1 Gemfile.lock
  2. +7 −2 lib/jekyll/site.rb
View
4 Gemfile.lock
@@ -19,6 +19,7 @@ GEM
json (~> 1.4.6)
term-ansicolor (~> 1.0.5)
git (1.2.5)
+ haml (3.0.23)
jeweler (1.4.0)
gemcutter (>= 0.1.0)
git (>= 1.2.5)
@@ -31,7 +32,7 @@ GEM
open4 (1.0.1)
rdiscount (1.6.5)
redgreen (1.2.2)
- rr (1.0.0)
+ rr (1.0.2)
rubyforge (2.0.4)
json_pure (>= 1.1.7)
shoulda (2.11.3)
@@ -46,6 +47,7 @@ DEPENDENCIES
classifier (>= 1.3.1)
cucumber
directory_watcher (>= 1.1.1)
+ haml (>= 2.2.3)
jeweler
liquid (>= 1.9.0)
maruku (>= 0.5.9)
View
9 lib/jekyll/site.rb
@@ -61,12 +61,17 @@ def setup
begin
require 'haml'
require 'jekyll/haml_helpers'
- helpers = File.join(source, '_helpers.rb')
- require helpers if File.exist?(helpers)
puts 'Enabled Haml'
rescue LoadError
puts 'You must have the haml gem installed first'
end
+
+ begin
+ helpers = File.join(source, '_helpers.rb')
+ require helpers if File.exist?(helpers)
+ rescue LoadError => e
+ puts "Error in _helpers.rb, haml might not work: #{e}"
+ end
end
if self.pygments_cache
Please sign in to comment.
Something went wrong with that request. Please try again.