staticmatic2 2.0.2 → 2.1.0

data/lib/staticmatic/mixins/render.rb

@@ -8,145 +8,103 @@ module StaticMatic::RenderMixin
     end
   end
   
-  def source_for_layout
-    if layout_exists?(determine_layout)
-      File.read(full_layout_path(determine_layout))
-    else
-      raise StaticMatic::Error.new("", full_layout_path(determine_layout), "Layout not found")
-    end
-  end
-
   # Generate html from source file:
-  # generate_html("index")
-  def generate_html(source_file, source_dir = '')
-    full_file_path = File.join(@src_dir, source_dir, "#{source_file}.haml")
-
+  # render_template("index.haml")
+  def render_template(file_path)
+    @current_file_stack.push(file_path)
     begin
-
-      html = generate_html_from_template_source(File.read(full_file_path))
+      tilt_template(file_path)
     rescue StaticMatic::TemplateError => e
       raise e # re-raise inline errors
     rescue Exception => e
-      raise StaticMatic::TemplateError.new(full_file_path, e)
+      raise StaticMatic::TemplateError.new(file_path, e)
+    ensure
+      @current_file_stack.pop
     end
-
-    html
   end
 
-  def generate_html_with_layout(source, source_dir = '')
-    @current_page = File.join(source_dir, "#{source}.html")
-    @current_file_stack.unshift(File.join(source_dir, "#{source}.haml"))
+  def render_template_with_layout(file_path)
+    @current_file_stack.push(file_path)
     begin 
-      template_content = generate_html(source, source_dir)
-      generate_html_from_template_source(source_for_layout) { template_content }
+      rendered_file_content = render_template(file_path)
+      tilt_template_with_layout(fetch_layout_path) { rendered_file_content }
     rescue Exception => e
       render_rescue_from_error(e)
     ensure
-      clear_template_variables!
-      @current_page = nil
-      @current_file_stack.shift
+      @current_file_stack.pop
     end
   end
 
   def generate_partial(name, options = {})
-    partial_dir, partial_name = '', name
-    partial_dir, partial_name = File.split(name) if name.index('/')
-    partial_type = partial_name[/(\.haml|\.html)$/]
-    
+    partial_dir, partial_name, partial_ext = expand_path name
     partial_name = "_#{partial_name}"
-    partial_name += ".haml" unless partial_type
 
-    partial_path = File.join(@src_dir, File.dirname(self.current_file), partial_dir, partial_name)
-    unless File.exists?(partial_path)
-      # couldn't find it in the pages subdirectory tree, so try the partials folder
-      partial_dir = File.join '_partials', partial_dir
+    context = File.join File.dirname(self.current_file), partial_dir
+    partial_path = determine_template_path(partial_name, partial_ext, context)
+
+    unless partial_path && File.exists?(partial_path)
+      # partial not found in the current file's directory, so try the _partials folder
+      context = File.join @src_dir, '_partials', partial_dir
       partial_name.sub! /^_/, ''
-      partial_path = File.join(@src_dir, partial_dir, partial_name)
+      partial_path = determine_template_path(partial_name, partial_ext, context)
     end
   
-    if File.exists?(partial_path)
-      partial_rel_path = "/#{partial_dir}/#{partial_name}".gsub(/\/+/, '/')
-      @current_file_stack.unshift(partial_rel_path)
-      begin
-        if partial_type == '.html'
-          File.read(partial_path)
-        else
-          generate_html_from_template_source(File.read(partial_path), options)
-        end
-      rescue Exception => e
-        raise StaticMatic::TemplateError.new(partial_path, e)
-      ensure
-        @current_file_stack.shift
-      end
+    if partial_path && File.exists?(partial_path)
+      return render_template partial_path
     else
       raise StaticMatic::Error.new("", name, "Partial not found")
     end
   end
 
-  def generate_css(source, source_dir = '')
-    full_file_path = Dir[File.join(@src_dir, source_dir, "#{source}.{sass,scss}")].first
+  def fetch_layout_path(dir = nil)
+    layout_path = File.join(@src_dir, "_layouts")
+    declared_layout_name = @scope.instance_variable_get("@layout")
 
-    if full_file_path && File.exist?(full_file_path)
-      begin
-        sass_options = { :load_paths => [ @src_dir ] }.merge(self.configuration.sass_options)
-      
-        if File.extname(full_file_path) == ".scss"
-          sass_options[:syntax] = :scss
-        end
-      
-        stylesheet = Sass::Engine.new(File.read(full_file_path), sass_options)
-        stylesheet.to_css
-      rescue Exception => e
-        render_rescue_from_error(StaticMatic::TemplateError.new(full_file_path, e))
+    if declared_layout_name
+      path = determine_template_path declared_layout_name, '', layout_path
+      unless path
+        error_path = File.join(layout_path, declared_layout_name)
+        raise StaticMatic::Error.new("", error_path, "Layout not found")
       end
-    else
-      raise StaticMatic::Error.new("", source, "Stylesheet not found")
     end
+
+    if dir
+      dir_layout_name = dir.split("/")[1]
+      path ||= determine_template_path dir_layout_name, '', layout_path
+    end
+    path ||= determine_template_path @default_layout_name, '', layout_path
+
+    unless path
+      error_path = File.join(layout_path, @default_layout_name)
+      raise StaticMatic::Error.new("", error_path, "No default layout could be found")
+    end
+
+    return path
   end
 
-  def generate_js(source, source_dir = '')
-    full_file_path = File.join(@src_dir, source_dir, "#{source}.coffee")
+  private
 
-    coffee_options = "#{self.configuration.coffee_options} -p"
-    javascript = `coffee #{coffee_options} #{full_file_path}`
+  # TODO: more code reuse. needs some ruby &block and yield sorcery.
+  def tilt_template(file_path)
+    options = get_engine_options(file_path)
+    Tilt.new(file_path, options).render(@scope)
   end
 
-  # Generates html from the passed source string
-  #
-  # generate_html_from_template_source("%h1 Welcome to My Site") -> "<h1>Welcome to My Site</h1>"
-  #
-  # Pass a block containing a string to yield within in the passed source:
-  #
-  # generate_html_from_template_source("content:\n= yield") { "blah" } -> "content: blah"
-  #
-  def generate_html_from_template_source(source, options = {})
-    html = Haml::Engine.new(source, self.configuration.haml_options.merge(options))
-    locals = options[:locals] || {}
-    html.render(@scope, locals) { yield }
+  def tilt_template_with_layout(file_path)
+    options = get_engine_options(file_path)
+    Tilt.new(file_path, options).render(@scope) { yield }
   end
 
-  def determine_layout(dir = '')
-    layout_name ||= @default_layout
-  
-    if @scope.instance_variable_get("@layout")
-      layout_name = @scope.instance_variable_get("@layout")
-    elsif dir
-      dirs = dir.split("/")
-      dir_layout_name = dirs[1]
-    
-      if layout_exists?(dir_layout_name)
-        layout_name = dir_layout_name
-      end
-    end
+  def get_engine_options(file_path)
+    ext = File.extname(file_path).sub(/^\./, '')
+    options = configuration.engine_options[ext] || {}
+    preview_options = configuration.preview_engine_options[ext] || {}
 
-    layout_name 
-  end
-    
-  # Returns a raw template name from a source file path:
-  # source_template_from_path("/path/to/site/src/stylesheets/application.sass")  ->  "application"
-  def source_template_from_path(path)
-    file_dir, file_name = File.split(path)
-    file_name.chomp!(File.extname(file_name))
-    [ file_dir, file_name ]
+    if @mode == :preview
+      options.merge preview_options
+    else
+      options
+    end
   end
+
 end

data/lib/staticmatic/mixins/rescue.rb

@@ -7,6 +7,6 @@ module StaticMatic::RescueMixin
     
     @scope.instance_variable_set("@exception", exception)
     
-    generate_html_from_template_source(File.read(error_template_path))
+    render_template(error_template_path)
   end
 end

data/lib/staticmatic/server.rb

@@ -3,36 +3,37 @@ module StaticMatic
     def initialize(staticmatic, default = nil)
       @files = default || Rack::File.new(staticmatic.src_dir)
       @staticmatic = staticmatic
-      
-
     end
 
     def call(env)
       @staticmatic.load_helpers
       path_info = env["PATH_INFO"]
 
-      file_dir, file_name, file_ext = expand_path(path_info)
+      file_dir, file_name, file_ext = @staticmatic.expand_path(path_info)
       
       file_dir = CGI::unescape(file_dir)
       file_name = CGI::unescape(file_name)
 
       unless file_ext && ["html", "css", "js"].include?(file_ext) &&
-          @staticmatic.template_exists?(file_name, file_ext, file_dir) &&
-          File.basename(file_name) !~ /^\_/
+          File.basename(file_name) !~ /^\_/ &&
+          (template_path = @staticmatic.determine_template_path file_name, file_ext, file_dir)
         return @files.call(env)
       end
 
       res = Rack::Response.new
-      res.header["Content-Type"] = "text/#{file_ext}"
 
       begin
+        @staticmatic.clear_template_variables!
+
         if file_ext == "css"
-          res.write @staticmatic.generate_css(file_name, file_dir)
+          res.header["Content-Type"] = "text/css"
+          res.write @staticmatic.render_template(template_path)
         elsif file_ext == "js"
           res.header["Content-Type"] = "text/javascript"
-          res.write @staticmatic.generate_js(file_name, file_dir)
+          res.write @staticmatic.render_template(template_path)
         else
-          res.write @staticmatic.generate_html_with_layout(file_name, file_dir)
+          res.header["Content-Type"] = "text/html"
+          res.write @staticmatic.render_template_with_layout(template_path)
         end
       rescue StaticMatic::Error => e
         res.write e.message
@@ -62,25 +63,5 @@ module StaticMatic
       Rack::Handler::WEBrick.run(app, :Port => port, :Host => host)
     end
 
-    private
-
-    def expand_path(path_info)
-      dirname, basename = File.split(path_info)
-
-      extname = File.extname(path_info).sub(/^\./, '')
-      filename = basename.chomp(".#{extname}")
-
-      if extname.empty?
-        dir = File.join(dirname, filename)
-        is_dir = path_info[-1, 1] == '/'
-        if is_dir
-          dirname = dir
-          filename = 'index'
-        end
-        extname = 'html'
-      end
-
-      [ dirname, filename, extname ]
-    end
   end
 end

data/lib/staticmatic/templates/rescues/default.haml

@@ -1,6 +1,6 @@
 %h1= @exception.class.name
 
-%p= @exception.message
+%p= @exception.message.gsub /\n/, '<br />'
 
 %h2 Stack Trace
 

data/lib/staticmatic.rb

@@ -3,6 +3,7 @@ require 'compass'
 require 'haml'
 require 'sass'
 require 'sass/plugin'
+require 'tilt'
 require 'rack'
 require 'rack/handler/webrick'
 require 'cgi'
@@ -10,16 +11,12 @@ require 'fileutils'
 
 
 module StaticMatic
-  VERSION = "0.11.0"
 end
 
 ["render", "build", "setup", "server", "helpers", "rescue"].each do |mixin|
   require File.join(File.dirname(__FILE__), "staticmatic", "mixins", mixin)
 end
 
-["base", "configuration", "error", "server", "helpers", "template_error", "compass"].each do |lib|
+["base", "configuration", "error", "server", "helpers", "template_error", "ambiguous_template_error", "compass"].each do |lib|
   require File.join(File.dirname(__FILE__), "staticmatic", lib)
 end
-
-Haml::Helpers.class_eval("include StaticMatic::Helpers")
-

data/spec/base_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/spec_helper"
+require "spec_helper"
 
 describe "StaticMatic::Base" do
   before do
@@ -10,4 +10,4 @@ describe "StaticMatic::Base" do
     @staticmatic.configuration.preview_server_port.should == 3000
   end
 
-end
+end

data/spec/compass_integration_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/spec_helper"
+require "spec_helper"
 
 describe "Compass integration" do
   context "with the default staticmatic configuration" do 
@@ -7,6 +7,7 @@ describe "Compass integration" do
     end
   
     it "should configure compass" do
+      pending "Compass config not quite right yet"
       Compass.configuration.project_path.should == TEST_SITE_PATH
       Compass.configuration.sass_dir.should == File.join("src", "stylesheets")
       Compass.configuration.css_dir.should == File.join("site", "stylesheets")
@@ -24,4 +25,4 @@ describe "Compass integration" do
       Compass.configuration.http_path.should == "http://a.test.host"
     end
   end
-end
+end

data/spec/helpers/asset_helper_spec.rb

@@ -1,5 +1,5 @@
 
-require File.dirname(__FILE__) + "/../spec_helper"
+require "spec_helper"
 
 describe "Helpers:" do
   include StaticMatic::Helpers::AssetsHelper
@@ -7,7 +7,6 @@ describe "Helpers:" do
   include StaticMatic::Helpers::TagHelper
   before do
     setup_staticmatic
-    @staticmatic.instance_variable_set("@current_page", "")
   end
   
   context "When using the stylesheet helper" do
@@ -32,7 +31,6 @@ describe "Helpers:" do
   
   context "When using the stylesheet helper from a sub page" do
     before do
-      @staticmatic.instance_variable_set("@current_page", "/sub/index.html")
       @links = stylesheets
     end
     

data/spec/helpers/custom_helper_spec.rb

@@ -1,5 +1,5 @@
 
-require File.dirname(__FILE__) + "/../spec_helper"
+require "spec_helper"
 
 describe "Helpers:" do
   include StaticMatic::Helpers::AssetsHelper
@@ -7,7 +7,6 @@ describe "Helpers:" do
   include StaticMatic::Helpers::TagHelper
   before do
     setup_staticmatic
-    @staticmatic.instance_variable_set("@current_page", "")
   end
   
   it "should include custom helper" do

data/spec/render_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/spec_helper"
+require "spec_helper"
 
 describe "StaticMatic::Render" do
   before do
@@ -17,7 +17,7 @@ describe "StaticMatic::Render" do
   end
   
   it "generate css" do
-    content = @staticmatic.generate_css("application")
+    content = @staticmatic.generate_css("stylesheets/application")
   end
   
   it "find source filename from path" do
@@ -30,7 +30,7 @@ describe "StaticMatic::Render" do
   
   context "handling scss" do
     it "should generate css from scss" do
-      @staticmatic.generate_css("sassy").should match(/color\: \#3bbfce\;/)
+      @staticmatic.generate_css("stylesheets/sassy").should match(/color\: \#3bbfce\;/)
     end
   end
   
@@ -41,4 +41,4 @@ describe "StaticMatic::Render" do
     output.should match(/The variable is/)
     output.should_not match(/hello/)
   end
-end
+end

data/spec/rescue_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/spec_helper"
+require "spec_helper"
 
 describe "StaticMatic::Rescue" do
   before do
@@ -11,7 +11,7 @@ describe "StaticMatic::Rescue" do
   end
   
   it "catch sass template errors" do
-    output = @staticmatic.generate_css("css_with_error")
+    output = @staticmatic.generate_css("stylesheets/css_with_error")
     output.should match(/StaticMatic::TemplateError/)
   end
   
@@ -33,4 +33,4 @@ describe "StaticMatic::Rescue" do
     output.should match(/Exception/)
     output.should match(/This is an exception/)
   end
-end
+end

data/spec/sandbox/test_site/site/sub_folder/another_sub_folder/index.html

@@ -0,0 +1 @@
+Sub sub folder test

data/spec/sandbox/test_site/site/sub_folder/another_sub_folder/index.html.html

@@ -0,0 +1 @@
+Sub sub folder test

data/spec/sandbox/test_site/site/sub_folder/index.html

@@ -0,0 +1 @@
+An index of a sub folder

data/spec/server_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/spec_helper"
+require "spec_helper"
 
 describe "StaticMatic::Server" do
   before do

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'stringio'
 require 'spec'
 
-require 'lib/staticmatic'
+require 'staticmatic'
 
 TEST_SITE_PATH = File.expand_path(File.join(File.dirname(__FILE__), "sandbox", "test_site"))
 

data/spec/template_error_spec.rb

@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + "/spec_helper"
+require "spec_helper"
 
 describe "StaticMatic::Template" do
   before do
     setup_staticmatic
     
-    template_file = File.join(TEST_SITE_PATH, "src", "pages", "page_with_error.haml")
+    template_file = File.join(TEST_SITE_PATH, "src", "page_with_error.haml")
     
     begin
       @staticmatic.generate_html_from_template_source(File.read(template_file))
@@ -20,4 +20,4 @@ describe "StaticMatic::Template" do
   it "extract line number from backtrace" do
     @template_error.line_number.should == "3"
   end
-end
+end