staticmatic 0.3.0 → 0.7.0

data/lib/staticmatic/base.rb

@@ -18,12 +18,20 @@ module StaticMatic
       'application.sass' => 'stylesheets',
       'index.haml' => 'pages'
     }
-      
+    
     def initialize(base_dir)
       @base_dir = base_dir
       @src_dir = "#{@base_dir}/src"
       @site_dir = "#{@base_dir}/site"
       @templates_dir = File.dirname(__FILE__) + '/templates'
+      @layout = "application"
+      @scope = Object.new
+      @scope.instance_variable_set("@base_dir", @base_dir)
+    end
+    
+    
+    def base_dir
+      @base_dir
     end
   
     def run(command)
@@ -89,20 +97,13 @@ module StaticMatic
       puts "created #{path}"
     end
     
-    # Keeps track of the layout template to use when generating the site
-    #
-    def layout=(name)
-      if name != @layout_name
-        @layout_name = name
-      end
-    end
-    
-    def layout
-      if !@layout_name
-        @layout_name = "application"
+    def source_for_layout
+      layout_template = "#{@src_dir}/layouts/#{@layout}.haml"
+      if File.exists?(layout_template)
+        File.read(layout_template)
+      else
+        raise StaticMatic::Error.new("", layout_template, "Layout not found")
       end
-           
-      File.read("#{@src_dir}/layouts/#{@layout_name}.haml")
     end
     
     # Generate html from source file:
@@ -110,8 +111,15 @@ module StaticMatic
     def generate_html(source_file)
       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
+        page = Haml::Engine.new(File.read(full_file_path), :locals => {:base_dir => base_dir})
+        html = page.render(@scope)
+        
+        # TODO: DRY this up
+        if @scope.instance_variable_get("@layout")
+          @layout = @scope.instance_variable_get("@layout")
+        end
+        
+        html
       rescue Haml::Error => haml_error
         raise StaticMatic::Error.new(haml_error.haml_line, full_file_path, haml_error.message)
       end
@@ -119,16 +127,17 @@ module StaticMatic
     
     def generate_html_with_layout(source)
       begin
-        Haml::Engine.new(layout, :locals => {:base_dir => @base_dir}).to_html { generate_html(source) }
+        generated_content = generate_html(source)
+        Haml::Engine.new(source_for_layout, :locals => {:base_dir => base_dir}).render(@scope) { generated_content }
       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)
+        raise StaticMatic::Error.new(haml_error.haml_line, "Layout: #{@layout}", haml_error.message)
       end
     end
-    
+
     def generate_css(source)
       full_file_path = "#{@src_dir}/stylesheets/#{source}.sass"
       begin
@@ -138,6 +147,7 @@ module StaticMatic
         raise StaticMatic::Error.new(sass_error.sass_line, full_file_path, sass_error.message)
       end
     end
+
   
     def template_exists?(name)
       File.exists?("#{@src_dir}/pages/#{name}.haml") || File.exists?("#{@src_dir}/stylesheets/#{name}.sass")

data/lib/staticmatic/helpers.rb

@@ -1,5 +1,6 @@
-module Haml
+module StaticMatic
   module Helpers
+    self.extend self
     
     # Generates links to all stylesheets in the source directory
     def stylesheets

data/lib/staticmatic.rb

@@ -2,6 +2,11 @@ require 'rubygems'
 require 'haml'
 require 'mongrel'
 require File.dirname(__FILE__) + '/staticmatic/helpers'
+
+Haml::Helpers.class_eval("include StaticMatic::Helpers")
+
 require File.dirname(__FILE__) + '/staticmatic/error'
 require File.dirname(__FILE__) + '/staticmatic/base'
 require File.dirname(__FILE__) + '/staticmatic/server'
+
+

data/test/base_test.rb

@@ -26,18 +26,18 @@ class StaticMaticBaseTest < Test::Unit::TestCase
     end
 
   end
-  
-  def test_should_set_layout_template
-    @staticmatic.layout = "application"
-    assert_match "StaticMatic - Test Site Template", @staticmatic.layout
-  end
 
   def test_should_generate_html_with_layout
     content = @staticmatic.generate_html_with_layout("index")
-    assert_match "StaticMatic - Test Site Template", content
+    assert_match "StaticMatic", content
     assert_match "This is some test content", content
   end
   
+  def test_should_generate_html_with_layout_assigned_in_template
+    content = @staticmatic.generate_html_with_layout("layout_test")
+    assert_match "Alternate Layout", content
+  end
+  
   def test_should_generate_css
     content = @staticmatic.generate_css("application")
   end

data/test/helpers_test.rb

@@ -2,11 +2,10 @@ require 'test/unit'
 require File.dirname(__FILE__) + '/../lib/staticmatic'
 
 class HelpersTest < Test::Unit::TestCase
-  include Haml::Helpers
+  include StaticMatic::Helpers
   
-  # Provide method in place of local variable for the helpers - don'tcha just love ruby?
-  def base_dir
-    File.dirname(__FILE__) + '/sandbox/test_site'
+  def setup
+    @base_dir = File.dirname(__FILE__) + '/sandbox/test_site'
   end
   
   def test_should_generate_stylesheet_links
@@ -38,7 +37,7 @@ class HelpersTest < Test::Unit::TestCase
   end
   
   def test_should_generate_js_links
-    expected_output = %q{<script src="javascripts/test.js" language="javascript"></script>}
+    expected_output = %q{src="javascripts/test.js"}
     assert_match expected_output, javascripts('test')
   end
 end

data/test/sandbox/test_site/src/layouts/alternate_layout.haml

@@ -0,0 +1,3 @@
+%h1 Alternate Layout
+
+= yield

data/test/sandbox/test_site/src/pages/index.haml

@@ -1 +1,3 @@
-%h1 StaticMatic!
+%h1 StaticMatic!
+
+%p This is some test content

data/test/sandbox/test_site/src/pages/layout_test.haml

@@ -0,0 +1,2 @@
+- @layout = "alternate_layout"
+%p This is a layout test

data/test.rb

@@ -0,0 +1,16 @@
+module Blah
+  module Helpers
+  end
+end
+
+module MyBlah
+  module Helpers
+    self.extend self
+    def say(string)
+      puts "You said: #{string}"
+    end
+  end
+end
+
+Blah::Helpers.extend MyBlah::Helpers
+Blah::Helpers.say("hello")

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: staticmatic
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
-date: 2007-07-26 00:00:00 +01:00
+  version: 0.7.0
+date: 2007-08-26 00:00:00 +01:00
 summary: Manage static sites using Haml & Sass
 require_paths: 
 - lib
@@ -74,13 +74,16 @@ files:
 - test/sandbox/test_site/site/stylesheets/application.css
 - test/sandbox/test_site/src
 - test/sandbox/test_site/src/layouts
+- test/sandbox/test_site/src/layouts/alternate_layout.haml
 - test/sandbox/test_site/src/layouts/application.haml
 - test/sandbox/test_site/src/pages
 - test/sandbox/test_site/src/pages/index.haml
+- test/sandbox/test_site/src/pages/layout_test.haml
 - test/sandbox/test_site/src/stylesheets
 - test/sandbox/test_site/src/stylesheets/application.sass
 - test/sandbox/tmp
 - test/server_test.rb
+- test.rb
 test_files: 
 - test/base_test.rb
 - test/helpers_test.rb
@@ -105,3 +108,12 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.0.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: mongrel
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
+    version: