staticmatic 0.11.0.alpha.4 → 0.11.0.alpha.5

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 0
 :minor: 11
 :patch: 0
-:build: alpha.4
+:build: alpha.5

data/lib/staticmatic/base.rb

@@ -24,10 +24,10 @@ module StaticMatic
       @site_dir = File.join(@base_dir, "site")
       
       if File.exists?(File.join(@src_dir, "layouts", "application.haml"))
-        puts "DEPRECATION: layouts/application.haml will be renamed to layouts/default.haml in the 0.12.0"
-        @layout = "application"
+        puts "DEPRECATION: layouts/application.haml will be renamed to layouts/default.haml in 0.12.0"
+        @default_layout = "application"
       else
-        @layout = "default"
+        @default_layout = "default"
       end
       
       @scope = Object.new
@@ -53,7 +53,6 @@ module StaticMatic
       
     # TODO: DRY this _exists? section up
     def template_exists?(name, dir = '')
-      
       File.exists?(File.join(@src_dir, 'pages', dir, "#{name}.haml")) || File.exists?(File.join(@src_dir, 'stylesheets', "#{name}.sass")) || File.exists?(File.join(@src_dir, 'stylesheets', "#{name}.scss"))
     end
     

data/lib/staticmatic/mixins/render.rb

@@ -1,10 +1,18 @@
 module StaticMatic::RenderMixin
   
+  # clear all scope variables except @staticmatic
+  def clear_template_variables!
+    
+    @scope.instance_variables.each do |var|
+      @scope.instance_variable_set(var, nil) unless var == '@staticmatic' || var == :@staticmatic
+    end
+  end
+  
   def source_for_layout
-    if layout_exists?(@layout)
-      File.read(full_layout_path(@layout))
+    if layout_exists?(determine_layout)
+      File.read(full_layout_path(determine_layout))
     else
-      raise StaticMatic::Error.new("", full_layout_path(@layout), "Layout not found")
+      raise StaticMatic::Error.new("", full_layout_path(determine_layout), "Layout not found")
     end
   end
 
@@ -14,13 +22,8 @@ module StaticMatic::RenderMixin
     full_file_path = File.join(@src_dir, 'pages', source_dir, "#{source_file}.haml")
 
     begin
-      # clear all scope variables except @staticmatic
-      @scope.instance_variables.each do |var|
-        @scope.instance_variable_set(var, nil) unless var == '@staticmatic' || var == :@staticmatic
-      end
+
       html = generate_html_from_template_source(File.read(full_file_path))
-  
-      @layout = determine_layout(source_dir)
     rescue StaticMatic::TemplateError => e
       raise e # re-raise inline errors
     rescue Exception => e
@@ -35,11 +38,11 @@ module StaticMatic::RenderMixin
     @current_file_stack.unshift(File.join(source_dir, "#{source}.haml"))
     begin 
       template_content = generate_html(source, source_dir)
-      @layout = determine_layout(source_dir)
       generate_html_from_template_source(source_for_layout) { template_content }
     rescue Exception => e
       render_rescue_from_error(e)
     ensure
+      clear_template_variables!
       @current_page = nil
       @current_file_stack.shift
     end
@@ -106,7 +109,7 @@ module StaticMatic::RenderMixin
   end
 
   def determine_layout(dir = '')
-    layout_name = @layout
+    layout_name ||= @default_layout
   
     if @scope.instance_variable_get("@layout")
       layout_name = @scope.instance_variable_get("@layout")
@@ -119,7 +122,7 @@ module StaticMatic::RenderMixin
       end
     end
 
-    layout_name
+    layout_name 
   end
     
   # Returns a raw template name from a source file path:

data/spec/render_spec.rb

@@ -34,4 +34,11 @@ describe "StaticMatic::Render" do
     end
   end
   
+  it "should clear template variables" do
+    @staticmatic.generate_html("page_one")
+    @staticmatic.clear_template_variables!
+    output = @staticmatic.generate_html("page_two")
+    output.should match(/The variable is/)
+    output.should_not match(/hello/)
+  end
 end

data/spec/sandbox/test_site/src/pages/page_one.haml

@@ -0,0 +1,3 @@
+- @a_variable = "hello!"
+
+= @a_variable

data/spec/sandbox/test_site/src/pages/page_two.haml

@@ -0,0 +1,2 @@
+The variable is:
+= @a_variable

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 11
   - 0
   - alpha
-  - 4
-  version: 0.11.0.alpha.4
+  - 5
+  version: 0.11.0.alpha.5
 platform: ruby
 authors: 
 - Stephen Bartholomew
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-22 00:00:00 +01:00
+date: 2010-05-24 00:00:00 +01:00
 default_executable: staticmatic
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -125,6 +125,8 @@ files:
 - spec/sandbox/test_site/src/pages/hello_world.erb
 - spec/sandbox/test_site/src/pages/index.haml
 - spec/sandbox/test_site/src/pages/layout_test.haml
+- spec/sandbox/test_site/src/pages/page_one.haml
+- spec/sandbox/test_site/src/pages/page_two.haml
 - spec/sandbox/test_site/src/pages/page_with_error.haml
 - spec/sandbox/test_site/src/pages/page_with_partial_error.haml
 - spec/sandbox/test_site/src/partials/menu.haml