staticmatic 0.2.0 → 0.2.1

data/lib/staticmatic/base.rb

@@ -1,7 +1,5 @@
 module StaticMatic
   class Base
-    VERSION = '0.2.0'
-
     # Directories generated for a new site setup
     @@base_dirs = %w{
       site/
@@ -110,17 +108,35 @@ module StaticMatic
     # Generate html from source file:
     # generate_html("index.haml")
     def generate_html(source_file)
-      page = Haml::Engine.new(File.read("#{@src_dir}/pages/#{source_file}.haml"), :locals => {:base_dir => @base_dir})
-      page.render
+      full_file_path = "#{@src_dir}/pages/#{source_file}.haml"
+      begin
+        page = Haml::Engine.new(File.read(full_file_path), :locals => {:base_dir => @base_dir})
+        page.render
+      rescue Haml::Error => haml_error
+        raise StaticMatic::Error.new(haml_error.haml_line, full_file_path, haml_error.message)
+      end
     end
     
     def generate_html_with_layout(source)
-      Haml::Engine.new(layout, :locals => {:base_dir => @base_dir}).to_html { generate_html(source) }
+      begin
+        Haml::Engine.new(layout, :locals => {:base_dir => @base_dir}).to_html { generate_html(source) }
+      rescue StaticMatic::Error => staticmatic_error
+        # Catch any errors from the actual template - otherwise the error will be assumed to be from the
+        # layout
+        raise staticmatic_error
+      rescue Haml::Error => haml_error
+        raise StaticMatic::Error.new(haml_error.haml_line, "Layout: #{@layout_name}", haml_error.message)
+      end
     end
     
     def generate_css(source)
-      stylesheet = Sass::Engine.new(File.read("#{@src_dir}/stylesheets/#{source}.sass"))
-      stylesheet.to_css
+      full_file_path = "#{@src_dir}/stylesheets/#{source}.sass"
+      begin
+        stylesheet = Sass::Engine.new(File.read(full_file_path))
+        stylesheet.to_css
+      rescue Sass::Error => sass_error
+        raise StaticMatic::Error.new(sass_error.sass_line, full_file_path, sass_error.message)
+      end
     end
   
     def template_exists?(name)

data/lib/staticmatic/error.rb

@@ -0,0 +1,17 @@
+module StaticMatic
+  class Error < StandardError
+    attr_reader :line
+
+    attr_reader :filename
+    
+    def initialize(lineno, filename, message)
+      @line = lineno
+      @filename = filename
+      @message = message
+    end
+    
+    def message
+      "#{@filename}, line #{@line}: #{@message}"
+    end
+  end
+end

data/lib/staticmatic/server.rb

@@ -28,10 +28,14 @@ module StaticMatic
           output = ""
           
           if @staticmatic.template_exists?(file_name)
-            if file_ext == "html"
-              output = @staticmatic.generate_html_with_layout("#{file_name}")
-            elsif file_ext == "css"
-              output = @staticmatic.generate_css("#{file_name}")
+            begin
+              if file_ext == "html"
+                output = @staticmatic.generate_html_with_layout("#{file_name}")
+              elsif file_ext == "css"
+                output = @staticmatic.generate_css("#{file_name}")
+              end
+            rescue StaticMatic::Error => e
+              output = e.message
             end
           else
             output = "File not Found"

data/lib/staticmatic.rb

@@ -2,5 +2,6 @@ require 'rubygems'
 require 'haml'
 require 'mongrel'
 require File.dirname(__FILE__) + '/staticmatic/helpers'
+require File.dirname(__FILE__) + '/staticmatic/error'
 require File.dirname(__FILE__) + '/staticmatic/base'
-require File.dirname(__FILE__) + '/staticmatic/server'
+require File.dirname(__FILE__) + '/staticmatic/server'

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: staticmatic
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 date: 2007-06-10 00:00:00 +01:00
 summary: Manage static sites using Haml & Sass
 require_paths: 
@@ -34,6 +34,7 @@ files:
 - lib
 - RakeFile
 - README
+- staticmatic-0.2.0.gem
 - test
 - bin/staticmatic
 - example/site
@@ -54,6 +55,7 @@ files:
 - lib/staticmatic
 - lib/staticmatic.rb
 - lib/staticmatic/base.rb
+- lib/staticmatic/error.rb
 - lib/staticmatic/helpers.rb
 - lib/staticmatic/server.rb
 - lib/staticmatic/templates