0
@@ -53,7 +53,7 @@ class PagesController < ApplicationController
0
       else
0
         format.html do
0
           flash[:error] = @page.errors.full_messages
0
-          render :action => 'edit'
0
+          render :action => 'edit', :layout => 'pages/edit_layout.html.haml'
0
         end
0
         format.json { render :json => { :errors => @page.errors.full_messages }, :status => :unprocessable_entity }
0
       end

0
@@ -20,7 +20,7 @@ class Page < ActiveRecord::Base
0
   validates_exclusion_of  :path, :in => %w( pages sections parsers )
0
   validates_associated    :section, :allow_nil => true
0
 
0
-  before_validation :render
0
+  #before_validation :render
0
   
0
   acts_as_versioned
0
   
0
@@ -50,6 +50,11 @@ class Page < ActiveRecord::Base
0
     end
0
   end
0
 
0
+  def validate
0
+    # TODO: decouple rendering and parser validations
0
+    render
0
+  end
0
+
0
   def parser
0
     self[:parser] || 'markdown'
0
   end
0
@@ -88,9 +93,21 @@ class Page < ActiveRecord::Base
0
       parts.each do |part|
0
         if part =~ /^\-:.*$/ # part is a code block
0
           syntax, code, check = part.scan(/^\-:(.*?)\n(.*\n)\-:(.*?)$/m)[0]
0
-          code_blocks << (block = CodeBlock.new(syntax, code))
0
-          body_parts << "<p class=\"code_stamp\"><span class=\"syntax\">#{syntax.humanize}</span><a href=\"/#{path}/code/#{code_blocks.length-1}\">View Source</a></p>"
0
-          body_parts << block.highlight(CODE_THEME)
0
+          if syntax == check
0
+            code_blocks << (block = CodeBlock.new(syntax, code))
0
+            body_parts << "<p class=\"code_stamp\"><span class=\"syntax\">#{syntax.humanize}</span><a href=\"/#{path}/code/#{code_blocks.length-1}\">View Source</a></p>"
0
+            begin
0
+              body_parts << block.highlight(CODE_THEME) 
0
+            rescue NoMethodError => e
0
+              if e.message =~ /nil\.parse/
0
+                self.errors.add(:body, "references unknown code highlighter '#{syntax}'")
0
+              else
0
+                raise e
0
+              end
0
+            end
0
+          else
0
+            self.errors.add(:body, "has mismatched code highlighter block ('#{syntax}' and '#{check}')")
0
+          end
0
         else
0
           body_parts << Page.render(part, parser)
0
         end

0
@@ -168,19 +168,20 @@ table.versions
0
     :background-color #afa
0
     
0
 // page edit ==================================================================
0
-body.pages.edit
0
-  form.edit_page
0
-    input#page_title
0
-      :font-weight normal
0
-      :font-size 2.0em
0
-      :width 500px
0
-    textarea
0
+body.pages
0
+  &.edit, &.update
0
+    form.edit_page
0
+      input#page_title
0
+        :font-weight normal
0
+        :font-size 2.0em
0
+        :width 500px
0
+      textarea
0
+        :margin-top 10px
0
+        :height 500px
0
+        :width 670px
0
+    #page_submit
0
+      :display block
0
       :margin-top 10px
0
-      :height 500px
0
-      :width 670px
0
-  #page_submit
0
-    :display block
0
-    :margin-top 10px
0
 
0
 // page show ==================================================================
0
 body.pages.show

0
@@ -66,7 +66,7 @@ describe Page do
0
     
0
     describe "parsing" do
0
       before :each do
0
-        @page = Page.new :title => 'foo', :body => '*foo bar*', :parser => 'markdown'
0
+        @page = Page.new :title => 'foo', :body => '*foo bar*'
0
       end
0
       
0
       it "should render the contents of the page" do
0
@@ -86,7 +86,7 @@ describe Page do
0
       end
0
 
0
       it "should render the contents of the page using html_parser" do
0
-        @page.parser = nil
0
+        @page.parser = 'html'
0
         @page.save!
0
         @page.rendered.should eql('*foo bar*')
0
       end
0
@@ -131,6 +131,26 @@ describe Page do
0
         @page.rendered.should =~ /<em>bing bang boom<\/em>/
0
       end
0
       
0
+      describe "with invalid syntax highlighter block" do
0
+        before :each do
0
+          @page.body += [
0
+            "\n-:foo",
0
+            "  foo",
0
+            "-:foo\n"
0
+          ].join("\n")
0
+        end
0
+        
0
+        it "should not raise error with invalid syntax given" do
0
+          lambda {
0
+            @page.save
0
+          }.should_not raise_error
0
+        end
0
+      
0
+        it "should not save the page with invalid syntax given" do
0
+          @page.save.should be_false
0
+        end
0
+      end
0
+      
0
       describe "with multiple code blocks and text" do
0
         before :each do
0
         end
0
@@ -196,7 +216,6 @@ describe Page do
0
     
0
     describe "validating" do
0
       before :each do
0
-        pending "don't really care about this yet..."
0
         # this is built in an array to avoid extra spacing which has meaning to
0
         # the parser
0
         body = [
0
@@ -214,6 +233,7 @@ describe Page do
0
       end
0
       
0
       it "should have an error on the body about mismatched tags" do
0
+        @page.save
0
         @page.errors.on(:body).should =~ /mismatched/
0
       end
0
     end