RubyGems - mango - Versions diffs - 0.5.4 → 0.6.0 - Mend

mango 0.5.4 → 0.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (83) hide show

data/.gitignore +1 -2
data/.rvmrc +1 -0
data/.yardopts +1 -3
data/{CHANGES.mdown → CHANGES.md} +40 -0
data/Gemfile.lock +35 -23
data/LICENSE +1 -1
data/{README.mdown → README.md} +38 -27
data/Rakefile +0 -13
data/lib/mango.rb +5 -0
data/lib/mango/application.rb +361 -129
data/lib/mango/content_page.rb +89 -115
data/lib/mango/core_ext/string.rb +16 -0
data/lib/mango/core_ext/uri.rb +14 -0
data/lib/mango/dependencies.rb +5 -4
data/lib/mango/flavored_markdown.rb +7 -0
data/lib/mango/rack/debugger.rb +20 -0
data/lib/mango/runner.rb +33 -50
data/lib/mango/templates/.gitignore +0 -1
data/lib/mango/templates/Gemfile +1 -1
data/lib/mango/templates/content/index.erb +6 -0
data/lib/mango/templates/themes/default/javascripts/timer.coffee +6 -0
data/lib/mango/templates/themes/default/public/javascripts/fireworks.js +0 -0
data/lib/mango/templates/themes/default/public/{styles → stylesheets}/fireworks.css +0 -0
data/lib/mango/templates/themes/default/public/{styles → stylesheets}/reset.css +0 -2
data/lib/mango/templates/themes/default/{styles → stylesheets}/screen.sass +0 -2
data/lib/mango/templates/themes/default/views/layout.haml +5 -5
data/lib/mango/templates/themes/default/views/page.haml +1 -3
data/lib/mango/version.rb +1 -1
data/mango.gemspec +12 -10
data/spec/fixture/content/engines/erb.erb +7 -0
data/spec/fixture/content/engines/haml.haml +4 -4
data/spec/fixture/content/engines/liquid.liquid +7 -0
data/spec/fixture/content/engines/markdown.markdown +0 -6
data/spec/fixture/content/engines/md.md +0 -6
data/spec/fixture/content/engines/mkd.mkd +1 -0
data/spec/fixture/content/page_with_missing_view.haml +2 -2
data/spec/fixture/content/page_with_unregistered_view.haml +4 -0
data/spec/fixture/content/view_engines/erb.haml +4 -0
data/spec/fixture/content/view_engines/liquid.haml +4 -0
data/spec/fixture/themes/default/javascripts/override.coffee +1 -0
data/spec/fixture/themes/default/javascripts/siblings.coffee +7 -0
data/spec/fixture/themes/default/javascripts/songs/happy.coffee +5 -0
data/spec/fixture/themes/default/public/404.html +11 -0
data/spec/fixture/themes/default/public/javascripts/econ.js +8 -0
data/spec/fixture/themes/default/public/javascripts/math/opposite.js +6 -0
data/spec/fixture/themes/default/public/javascripts/override.js +1 -0
data/spec/fixture/themes/default/public/root.js +5 -0
data/spec/fixture/themes/default/public/{styles → stylesheets}/override.css +0 -0
data/spec/fixture/themes/default/public/{styles → stylesheets}/reset.css +0 -0
data/spec/fixture/themes/default/public/{styles → stylesheets}/subfolder/another.css +0 -0
data/spec/fixture/themes/default/security_hole.js +1 -0
data/spec/fixture/themes/default/{styles → stylesheets}/override.sass +0 -0
data/spec/fixture/themes/default/{styles/screen.sass → stylesheets/sass.sass} +4 -2
data/spec/fixture/themes/default/stylesheets/scss.scss +19 -0
data/spec/fixture/themes/default/{styles → stylesheets}/subfolder/screen.sass +0 -2
data/spec/fixture/themes/default/views/404.erb +11 -0
data/spec/fixture/themes/default/views/404.haml +1 -0
data/spec/fixture/themes/default/views/404.liquid +11 -0
data/spec/fixture/themes/default/views/layout.erb +10 -0
data/spec/fixture/themes/default/views/layout.haml +1 -1
data/spec/fixture/themes/default/views/layout.liquid +10 -0
data/spec/fixture/themes/default/views/page.erb +7 -0
data/spec/fixture/themes/default/views/page.haml +3 -1
data/spec/fixture/themes/default/views/page.liquid +7 -0
data/spec/lib/application/routing_content_pages_spec.rb +298 -21
data/spec/lib/application/routing_javascript_templates_spec.rb +278 -0
data/spec/lib/application/routing_not_found_spec.rb +254 -0
data/spec/lib/application/routing_public_files_spec.rb +9 -8
data/spec/lib/application/{routing_style_sheets_spec.rb → routing_stylesheet_templates_spec.rb} +61 -24
data/spec/lib/application_spec.rb +31 -2
data/spec/lib/content_page/initializing_spec.rb +399 -126
data/spec/lib/content_page_spec.rb +23 -19
data/spec/lib/core_ext/string_spec.rb +12 -0
data/spec/lib/core_ext/uri_spec.rb +42 -0
data/spec/lib/dependencies_spec.rb +0 -1
data/spec/lib/flavored_markdown_spec.rb +18 -3
data/spec/lib/runner_spec.rb +40 -39
data/spec/lib/version_spec.rb +4 -4
metadata +145 -64
data/lib/mango/templates/content/index.md +0 -5
data/lib/mango/templates/themes/default/public/javascripts/timer.js +0 -5
data/spec/fixture/content/engines/mdown.mdown +0 -7
data/spec/lib/content_page/finding_spec.rb +0 -213

data/spec/lib/application/routing_public_files_spec.rb CHANGED

@@ -12,7 +12,7 @@ describe Mango::Application do
   #################################################################################################
   describe "GET /robots.txt" do
-    before(:each) do
+    before(:all) do
       get "/robots.txt"
     end
@@ -35,7 +35,7 @@ Disallow: /cgi-bin/
   #################################################################################################
   describe "GET /images/" do
-    before(:each) do
+    before(:all) do
       get "/images/"
     end
@@ -66,7 +66,7 @@ Disallow: /cgi-bin/
   #################################################################################################
   describe "GET /" do
-    before(:each) do
+    before(:all) do
       @file_name     = File.join(Mango::Application.public, "index.html")
       @expected_body = <<-EXPECTED
 <!DOCTYPE html>
@@ -86,7 +86,7 @@ Disallow: /cgi-bin/
       get "/"
     end
-    after(:each) do
+    after(:all) do
       File.delete(@file_name)
     end
@@ -106,7 +106,7 @@ Disallow: /cgi-bin/
   #################################################################################################
   describe "GET /images/ripe-mango.jpg" do
-    before(:each) do
+    before(:all) do
       get "/images/ripe-mango.jpg"
     end
@@ -127,7 +127,7 @@ Disallow: /cgi-bin/
   #################################################################################################
   describe "GET /override" do
-    before(:each) do
+    before(:all) do
       get "/override"
     end
@@ -159,7 +159,7 @@ Disallow: /cgi-bin/
   # see http://bit.ly/9kLBDx
   describe "GET /images/" do
-    before(:each) do
+    before(:all) do
       get "/images/"
     end
@@ -190,7 +190,7 @@ Disallow: /cgi-bin/
   #################################################################################################
   describe "GET /../security_hole.txt" do
-    before(:each) do
+    before(:all) do
       get "/../security_hole.txt"
     end
@@ -212,6 +212,7 @@ Disallow: /cgi-bin/
   </head>
   <body>
     <h1>Page not found</h1>
+    <p id='template'>404.html</p>
   </body>
 </html>
       EXPECTED

data/spec/lib/application/{routing_style_sheets_spec.rb → routing_stylesheet_templates_spec.rb} RENAMED

@@ -11,9 +11,9 @@ describe Mango::Application do
   #################################################################################################
-  describe "GET /styles/screen.css" do
-    before(:each) do
-      get "/styles/screen.css"
+  describe "GET /stylesheets/sass.css" do
+    before(:all) do
+      get "/stylesheets/sass.css"
     end
     it "returns 200 status code" do
@@ -26,6 +26,9 @@ describe Mango::Application do
     it "sends the correct body content" do
       last_response.body.should == <<-EXPECTED
+.main {
+  background-image: url("sass.sass"); }
 .content-navigation {
   border-color: #3bbfce;
   color: #2ca2af; }
@@ -40,9 +43,41 @@ describe Mango::Application do
   #################################################################################################
-  describe "GET /styles/subfolder/screen.css" do
-    before(:each) do
-      get "/styles/subfolder/screen.css"
+  describe "GET /stylesheets/scss.css" do
+    before(:all) do
+      get "/stylesheets/scss.css"
+    end
+    it "returns 200 status code" do
+      last_response.should be_ok
+    end
+    it "sends the correct Content-Type header" do
+      last_response["Content-Type"].should == "text/css;charset=utf-8"
+    end
+    it "sends the correct body content" do
+      last_response.body.should == <<-EXPECTED
+.main {
+  background-image: url("scss.scss"); }
+.content-navigation {
+  border-color: #3bbfce;
+  color: #2ca2af; }
+.border {
+  padding: 8px;
+  margin: 8px;
+  border-color: #3bbfce; }
+      EXPECTED
+    end
+  end
+  #################################################################################################
+  describe "GET /stylesheets/subfolder/screen.css" do
+    before(:all) do
+      get "/stylesheets/subfolder/screen.css"
     end
     it "returns 200 status code" do
@@ -70,9 +105,9 @@ li {
   #################################################################################################
-  describe "GET /styles/reset.css" do
-    before(:each) do
-      get "/styles/reset.css"
+  describe "GET /stylesheets/reset.css" do
+    before(:all) do
+      get "/stylesheets/reset.css"
     end
     it "returns 200 status code" do
@@ -118,9 +153,9 @@ time, mark, audio, video {
   #################################################################################################
-  describe "GET /styles/override.css" do
-    before(:each) do
-      get "/styles/override.css"
+  describe "GET /stylesheets/override.css" do
+    before(:all) do
+      get "/stylesheets/override.css"
     end
     it "returns 200 status code" do
@@ -143,7 +178,7 @@ time, mark, audio, video {
   #################################################################################################
   describe "GET /default.css" do
-    before(:each) do
+    before(:all) do
       get "/default.css"
     end
@@ -166,9 +201,9 @@ time, mark, audio, video {
   #################################################################################################
-  describe "GET /styles/subfolder/another.css" do
-    before(:each) do
-      get "/styles/subfolder/another.css"
+  describe "GET /stylesheets/subfolder/another.css" do
+    before(:all) do
+      get "/stylesheets/subfolder/another.css"
     end
     it "returns 200 status code" do
@@ -190,9 +225,9 @@ time, mark, audio, video {
   #################################################################################################
-  describe "GET /styles/style_not_found.css" do
-    before(:each) do
-      get "/styles/style_not_found.css"
+  describe "GET /stylesheets/not_found.css" do
+    before(:all) do
+      get "/stylesheets/not_found.css"
     end
     it "returns 404 status code" do
@@ -213,6 +248,7 @@ time, mark, audio, video {
   </head>
   <body>
     <h1>Page not found</h1>
+    <p id='template'>404.html</p>
   </body>
 </html>
       EXPECTED
@@ -222,7 +258,7 @@ time, mark, audio, video {
   #################################################################################################
   describe "GET /screen.css" do
-    before(:each) do
+    before(:all) do
       get "/screen.css"
     end
@@ -244,6 +280,7 @@ time, mark, audio, video {
   </head>
   <body>
     <h1>Page not found</h1>
+    <p id='template'>404.html</p>
   </body>
 </html>
       EXPECTED
@@ -252,9 +289,9 @@ time, mark, audio, video {
   #################################################################################################
-  describe "GET /styles/../security_hole.css" do
-    before(:each) do
-      get "/styles/../security_hole.css"
+  describe "GET /stylesheets/../security_hole.css" do
+    before(:all) do
+      get "/stylesheets/../security_hole.css"
     end
     it "returns 404 status code" do
@@ -275,10 +312,10 @@ time, mark, audio, video {
   </head>
   <body>
     <h1>Page not found</h1>
+    <p id='template'>404.html</p>
   </body>
 </html>
       EXPECTED
     end
   end
 end

data/spec/lib/application_spec.rb CHANGED

@@ -19,12 +19,41 @@ describe Mango::Application do
       Mango::Application.public.should == (FIXTURE_ROOT + "themes/default/public").to_s
     end
-    it "styles should be app_root/themes/default/styles/" do
-      Mango::Application.styles.should == (FIXTURE_ROOT + "themes/default/styles").to_s
+    it "styles should be app_root/themes/default/stylesheets/" do
+      Mango::Application.stylesheets.should == (FIXTURE_ROOT + "themes/default/stylesheets").to_s
+    end
+    it "styles should be app_root/themes/default/javascripts/" do
+      Mango::Application.javascripts.should == (FIXTURE_ROOT + "themes/default/javascripts").to_s
     end
     it "content should be app_root/content/" do
       Mango::Application.content.should == (FIXTURE_ROOT + "content").to_s
     end
   end
+  #################################################################################################
+  describe "constants" do
+    it "defines JAVASCRIPT_TEMPLATE_ENGINES" do
+      Mango::Application::JAVASCRIPT_TEMPLATE_ENGINES.should == {
+        Tilt::CoffeeScriptTemplate => :coffee
+      }
+    end
+    it "defines STYLESHEET_TEMPLATE_ENGINES" do
+      Mango::Application::STYLESHEET_TEMPLATE_ENGINES.should == {
+        Tilt::ScssTemplate => :scss,
+        Tilt::SassTemplate => :sass
+      }
+    end
+    it "defines VIEW_TEMPLATE_ENGINES" do
+      Mango::Application::VIEW_TEMPLATE_ENGINES.should == {
+        Tilt::HamlTemplate   => :haml,
+        Tilt::ERBTemplate    => :erb,
+        Tilt::LiquidTemplate => :liquid
+      }
+    end
+  end
 end

data/spec/lib/content_page/initializing_spec.rb CHANGED

@@ -2,277 +2,550 @@
 require "spec_helper"
 describe Mango::ContentPage do
+  describe "given data with header and Haml body, using the Haml engine" do
+    before(:all) do
+      @expected_data = <<-EOS
+---
+title: Delicious Cake
+view: blog.haml
+engine: Will not persist
+data: Will not persist
+content: Will also not persist
+---
+%h1= page.title
+%p So delicious!
+%p= page.view
+%p= page.engine
+%p= page.content
+%p= page.data
+%p= page.body
+      EOS
+      @expected_engine = Tilt::HamlTemplate
+      @page = Mango::ContentPage.new(:data => @expected_data, :engine => @expected_engine)
+    end
+    it "has the correct number of attributes" do
+      @page.attributes.should have(6).items
+    end
+    it "has the correct title attribute" do
+      @page.title.should == "Delicious Cake"
+    end
+    it "has the correct view attribute" do
+      @page.view.should == "blog.haml"
+    end
+    it "has the correct engine attribute" do
+      @page.engine.should == @expected_engine
+    end
+    it "has the correct data attribute" do
+      @page.data.should == @expected_data
+    end
+    it "has the correct body attribute" do
+      @page.body.should == <<-EOS
+%h1= page.title
+%p So delicious!
+%p= page.view
+%p= page.engine
+%p= page.content
+%p= page.data
+%p= page.body
+      EOS
+    end
+    it "has the correct content attribute" do
+      @page.content.should == <<-EOS
+<h1>Delicious Cake</h1>
+<p>So delicious!</p>
+<p>blog.haml</p>
+<p>#{@expected_engine}</p>
+<p></p>
+<p>
+  ---
+  title: Delicious Cake
+  view: blog.haml
+  engine: Will not persist
+  data: Will not persist
+  content: Will also not persist
+  ---
+  %h1= page.title
+  %p So delicious!
+  %p= page.view
+  %p= page.engine
+  %p= page.content
+  %p= page.data
+  %p= page.body
+</p>
+<p>
+  %h1= page.title
+  %p So delicious!
+  %p= page.view
+  %p= page.engine
+  %p= page.content
+  %p= page.data
+  %p= page.body
+</p>
+      EOS
+    end
+  end
   #################################################################################################
-  describe "initializing with attributes and Haml body" do
+  describe "given data with header and Markdown body, using the Markdown engine" do
     before(:all) do
       @expected_data = <<-EOS
 ---
-title: Delicious Cake!
-view: blog
+title: Chocolate Pie
+view: blog.haml
 ---
-%p So delicious!
-EOS
-      @expected_content_engine = :haml
-      @page = Mango::ContentPage.new(@expected_data, :content_engine => @expected_content_engine)
+### Sweet and crumbly!
+      EOS
+      @expected_engine = Tilt::BlueClothTemplate
+      @page = Mango::ContentPage.new(:data => @expected_data, :engine => @expected_engine)
     end
-    it "saves the data" do
-      @page.data.should == @expected_data
+    it "has the correct number of attributes" do
+      @page.attributes.should have(6).items
+    end
+    it "has the correct title attribute" do
+      @page.title.should == "Chocolate Pie"
     end
-    it "uses default content engine" do
-      @page.content_engine.should == @expected_content_engine
+    it "has the correct view attribute" do
+      @page.view.should == "blog.haml"
     end
-    it "loads the attributes" do
-      @page.attributes.should have(2).items
-      @page.attributes.should include("title" => "Delicious Cake!")
-      @page.attributes.should include("view" => "blog")
+    it "has the correct engine attribute" do
+      @page.engine.should == @expected_engine
     end
-    it "loads the body" do
-      @page.body.should == "%p So delicious!\n"
+    it "has the correct data attribute" do
+      @page.data.should == @expected_data
     end
-    it "converts to HTML" do
-      @page.to_html.should == "<p>So delicious!</p>\n"
+    it "has the correct body attribute" do
+      @page.body.should == "### Sweet and crumbly!\n"
     end
-    it "determines the view template's base file name" do
-      @page.view.should == :blog
+    it "has the correct content attribute" do
+      @page.content.should == "<h3>Sweet and crumbly!</h3>"
     end
   end
   #################################################################################################
-  describe "initializing with attributes and Markdown body" do
+  describe "given data with header and ERB body, using the ERB engine" do
     before(:all) do
       @expected_data = <<-EOS
 ---
-title: Chocolate Pie!
-view: blog
+title: Cake Pops
+view: blog.haml
 ---
-### Sweet and crumbly!
-EOS
-      @expected_content_engine = :markdown
-      @page = Mango::ContentPage.new(@expected_data, :content_engine => @expected_content_engine)
+<h1><%= page.title %></h1>
+<p>Did you mean <%= 'crack' %> pops?</p>
+<p><%= page.view %></p>
+<p><%= page.content %></p>
+<pre>
+<%= page.data %>
+</pre>
+<pre>
+<%= page.body %>
+</pre>
+      EOS
+      @expected_engine = Tilt::ERBTemplate
+      @page = Mango::ContentPage.new(:data => @expected_data, :engine => @expected_engine)
     end
-    it "saves the data" do
+    it "has the correct number of attributes" do
+      @page.attributes.should have(6).items
+    end
+    it "has the correct title attribute" do
+      @page.title.should == "Cake Pops"
+    end
+    it "has the correct view attribute" do
+      @page.view.should == "blog.haml"
+    end
+    it "has the correct engine attribute" do
+      @page.engine.should == @expected_engine
+    end
+    it "has the correct data attribute" do
       @page.data.should == @expected_data
     end
-    it "uses default content engine" do
-      @page.content_engine.should == @expected_content_engine
+    it "has the correct body attribute" do
+      @page.body.should == <<-EOS
+<h1><%= page.title %></h1>
+<p>Did you mean <%= 'crack' %> pops?</p>
+<p><%= page.view %></p>
+<p><%= page.content %></p>
+<pre>
+<%= page.data %>
+</pre>
+<pre>
+<%= page.body %>
+</pre>
+      EOS
     end
-    it "loads the attributes" do
-      @page.attributes.should have(2).items
-      @page.attributes.should include("title" => "Chocolate Pie!")
-      @page.attributes.should include("view" => "blog")
+    it "has the correct content attribute" do
+      @page.content.should == <<-EOS
+<h1>Cake Pops</h1>
+<p>Did you mean crack pops?</p>
+<p>blog.haml</p>
+<p></p>
+<pre>
+---
+title: Cake Pops
+view: blog.haml
+---
+<h1><%= page.title %></h1>
+<p>Did you mean <%= 'crack' %> pops?</p>
+<p><%= page.view %></p>
+<p><%= page.content %></p>
+<pre>
+<%= page.data %>
+</pre>
+<pre>
+<%= page.body %>
+</pre>
+</pre>
+<pre>
+<h1><%= page.title %></h1>
+<p>Did you mean <%= 'crack' %> pops?</p>
+<p><%= page.view %></p>
+<p><%= page.content %></p>
+<pre>
+<%= page.data %>
+</pre>
+<pre>
+<%= page.body %>
+</pre>
+</pre>
+      EOS
     end
+  end
-    it "loads the body" do
-      @page.body.should == "### Sweet and crumbly!\n"
+  #################################################################################################
+  describe "given data with header and Liquid body, using the Liquid engine" do
+    before(:all) do
+      @expected_data = <<-EOS
+---
+title: Cake Pops
+view: blog.liquid
+---
+<h1>{{ page.title }}</h1>
+<p>Did you mean {{ 'crack' }} pops?</p>
+<p>{{ page.view }}</p>
+<p>{{ page.content }}</p>
+<pre>
+{{ page.data }}
+</pre>
+<pre>
+{{ page.body }}
+</pre>
+      EOS
+      @expected_engine = Tilt::LiquidTemplate
+      @page = Mango::ContentPage.new(:data => @expected_data, :engine => @expected_engine)
+    end
+    it "has the correct number of attributes" do
+      @page.attributes.should have(6).items
+    end
+    it "converts itself to liquid format" do
+      @page.attributes.should == @page.to_liquid
+    end
+    it "has the correct title attribute" do
+      @page.title.should == "Cake Pops"
+    end
+    it "has the correct view attribute" do
+      @page.view.should == "blog.liquid"
+    end
+    it "has the correct engine attribute" do
+      @page.engine.should == @expected_engine
+    end
+    it "has the correct data attribute" do
+      @page.data.should == @expected_data
     end
-    it "converts to HTML" do
-      @page.to_html.should == "<h3>Sweet and crumbly!</h3>"
+    it "has the correct body attribute" do
+      @page.body.should == <<-EOS
+<h1>{{ page.title }}</h1>
+<p>Did you mean {{ 'crack' }} pops?</p>
+<p>{{ page.view }}</p>
+<p>{{ page.content }}</p>
+<pre>
+{{ page.data }}
+</pre>
+<pre>
+{{ page.body }}
+</pre>
+      EOS
     end
-    it "determines the view template's base file name" do
-      @page.view.should == :blog
+    it "has the correct content attribute" do
+      @page.content.should == <<-EOS
+<h1>Cake Pops</h1>
+<p>Did you mean crack pops?</p>
+<p>blog.liquid</p>
+<p></p>
+<pre>
+---
+title: Cake Pops
+view: blog.liquid
+---
+<h1>{{ page.title }}</h1>
+<p>Did you mean {{ 'crack' }} pops?</p>
+<p>{{ page.view }}</p>
+<p>{{ page.content }}</p>
+<pre>
+{{ page.data }}
+</pre>
+<pre>
+{{ page.body }}
+</pre>
+</pre>
+<pre>
+<h1>{{ page.title }}</h1>
+<p>Did you mean {{ 'crack' }} pops?</p>
+<p>{{ page.view }}</p>
+<p>{{ page.content }}</p>
+<pre>
+{{ page.data }}
+</pre>
+<pre>
+{{ page.body }}
+</pre>
+</pre>
+      EOS
     end
   end
   #################################################################################################
-  describe "initializing with just attributes" do
+  describe "given data with header only, using the default engine" do
     before(:all) do
       @expected_data = <<-EOS
 ---
-title: Delicious Cake!
+title: Delicious Cake
 view: blog.haml
 ---
-EOS
-      @page = Mango::ContentPage.new(@expected_data)
+      EOS
+      @page = Mango::ContentPage.new(:data => @expected_data)
     end
-    it "saves the data" do
-      @page.data.should == @expected_data
+    it "has the correct number of attributes" do
+      @page.attributes.should have(6).items
     end
-    it "uses default content engine" do
-      @page.content_engine.should == Mango::ContentPage::DEFAULT[:content_engine]
+    it "has the correct title attribute" do
+      @page.title.should == "Delicious Cake"
     end
-    it "loads the attributes" do
-      @page.attributes.should have(2).items
-      @page.attributes.should include("title" => "Delicious Cake!")
-      @page.attributes.should include("view" => "blog.haml")
+    it "has the correct view attribute" do
+      @page.view.should == "blog.haml"
     end
-    it "loads the body" do
-      @page.body.should be_empty
+    it "has the correct engine attribute" do
+      @page.engine.should == Mango::ContentPage::DEFAULT_ATTRIBUTES["engine"]
+    end
+    it "has the correct data attribute" do
+      @page.data.should == @expected_data
     end
-    it "converts to HTML" do
-      @page.to_html.should be_empty
+    it "has the correct body attribute" do
+      @page.body.should be_empty
     end
-    it "determines the view template's base file name" do
-      @page.view.should == :blog
+    it "has the correct content attribute" do
+      @page.content.should be_empty
     end
   end
   #################################################################################################
-  describe "initializing with just body using the default content engine" do
+  describe "given data with Markdown body only, using the default engine" do
     before(:all) do
       @expected_data = <<-EOS
 ### So delicious!
 EOS
-      @page = Mango::ContentPage.new(@expected_data)
+      @page = Mango::ContentPage.new(:data => @expected_data)
     end
-    it "saves the data" do
-      @page.data.should == @expected_data
+    it "has the correct number of attributes" do
+      @page.attributes.should have(5).items
     end
-    it "uses default content engine" do
-      @page.content_engine.should == Mango::ContentPage::DEFAULT[:content_engine]
+    it "has the correct view attribute" do
+      @page.view.should == "page.haml"
     end
-    it "loads the attributes" do
-      @page.attributes.should have(1).items
-      @page.attributes.should include("view" => :page)
+    it "has the correct engine attribute" do
+      @page.engine.should == Mango::ContentPage::DEFAULT_ATTRIBUTES["engine"]
     end
-    it "loads the body" do
-      @page.body.should == "### So delicious!\n"
+    it "has the correct data attribute" do
+      @page.data.should == @expected_data
     end
-    it "converts to HTML" do
-      @page.to_html.should == "<h3>So delicious!</h3>"
+    it "has the correct body attribute" do
+      @page.body.should == @expected_data
     end
-    it "determines the view template's base file name" do
-      @page.view.should == :page
+    it "has the correct content attribute" do
+      @page.content.should == "<h3>So delicious!</h3>"
     end
   end
   #################################################################################################
-  describe "initializing with empty attributes and body" do
+  describe "given data with empty header only, using the default engine" do
     before(:all) do
       @expected_data = <<-EOS
 ---
 ---
 EOS
-      @page = Mango::ContentPage.new(@expected_data)
+      @page = Mango::ContentPage.new(:data => @expected_data)
     end
     it "saves the data" do
       @page.data.should == @expected_data
     end
-    it "uses default content engine" do
-      @page.content_engine.should == Mango::ContentPage::DEFAULT[:content_engine]
+    it "has the correct number of attributes" do
+      @page.attributes.should have(5).items
     end
-    it "loads the attributes" do
-      @page.attributes.should have(1).items
-      @page.attributes.should include("view" => :page)
+    it "has the correct view attribute" do
+      @page.view.should == "page.haml"
     end
-    it "loads the body" do
-      @page.body.should be_empty
+    it "has the correct engine attribute" do
+      @page.engine.should == Mango::ContentPage::DEFAULT_ATTRIBUTES["engine"]
     end
-    it "converts to HTML" do
-      @page.to_html.should be_empty
+    it "has the correct data attribute" do
+      @page.data.should == @expected_data
     end
-    it "determines the view template's base file name" do
-      @page.view.should == :page
+    it "has the correct body attribute" do
+      @page.body.should be_empty
+    end
+    it "has the correct content attribute" do
+      @page.content.should be_empty
     end
   end
   #################################################################################################
-  describe "initializing with nil" do
+  describe "given no data" do
     before(:all) do
-      @expected_data = nil
-      @page = Mango::ContentPage.new(@expected_data)
+      @page = Mango::ContentPage.new
     end
     it "saves the data" do
-      @page.data.should == @expected_data
+      @page.data.should == ""
     end
-    it "uses default content engine" do
-      @page.content_engine.should == Mango::ContentPage::DEFAULT[:content_engine]
+    it "has the correct number of attributes" do
+      @page.attributes.should have(5).items
     end
-    it "loads the attributes" do
-      @page.attributes.should have(1).items
-      @page.attributes.should include("view" => :page)
+    it "has the correct view attribute" do
+      @page.view.should == "page.haml"
     end
-    it "loads the body" do
-      @page.body.should be_empty
+    it "has the correct engine attribute" do
+      @page.engine.should == Mango::ContentPage::DEFAULT_ATTRIBUTES["engine"]
+    end
+    it "has the correct data attribute" do
+      @page.data.should be_empty
     end
-    it "converts to HTML" do
-      @page.to_html.should be_empty
+    it "has the correct body attribute" do
+      @page.body.should be_empty
     end
-    it "determines the view template's base file name" do
-      @page.view.should == :page
+    it "has the correct content attribute" do
+      @page.content.should be_empty
     end
   end
   #################################################################################################
-  describe "initializing with unknown content engine" do
+  describe "given data with an invalid title attribute within the header" do
     before(:all) do
-      @expected_data = ""
-      @expected_content_engine = :unknown
-      @page = Mango::ContentPage.new(@expected_data, :content_engine => @expected_content_engine)
+      @expected_data = <<-EOS
+---
+title: WARNING: This needs quotes
+---
+EOS
     end
-    it "saves the data" do
-      @page.data.should == @expected_data
+    it "raises an exception" do
+      expected_message = "syntax error on line 1, col 15: `title: WARNING: This needs quotes'"
+      lambda {
+        Mango::ContentPage.new(:data => @expected_data)
+      }.should raise_exception(Mango::ContentPage::InvalidHeaderError, expected_message)
     end
+  end
-    it "uses unknown content engine" do
-      @page.content_engine.should == @expected_content_engine
-    end
+  #################################################################################################
-    it "loads the attributes" do
-      @page.attributes.should have(1).items
-      @page.attributes.should include("view" => :page)
+  describe "given data with an invalid header" do
+    before(:all) do
+      @expected_data = <<-EOS
+---
+This is not a Hash
+---
+EOS
     end
-    it "loads the body" do
-      @page.body.should be_empty
+    it "raises an exception" do
+      expected_message = 'Cannot parse header -- "This is not a Hash"'
+      lambda {
+        Mango::ContentPage.new(:data => @expected_data)
+      }.should raise_exception(Mango::ContentPage::InvalidHeaderError, expected_message)
     end
+  end
-    it "raises a RuntimeError when converting to HTML" do
-      lambda { @page.to_html }.should raise_exception(RuntimeError,"Unknown content engine -- unknown")
+  #################################################################################################
+  describe "given no data, using an unknown engine" do
+    before(:all) do
+      @unknown_engine = :unknown
     end
-    it "determines the view template's base file name" do
-      @page.view.should == :page
+    it "raises an exception" do
+      expected_message = "Cannot find registered content engine -- unknown"
+      lambda {
+        Mango::ContentPage.new(:engine => @unknown_engine)
+      }.should raise_exception(ArgumentError, expected_message)
     end
   end
   #################################################################################################
-  describe "initializing with seasonable Markdown body" do
-    it "seasons the rendered markup with Mango::FlavoredMarkdown" do
+  describe "given data with seasonable Markdown body, using the default engine" do
+    before(:all) do
       data = <<-EOS
 Mango is like a drug.
 You must have more and more and more of the Mango
@@ -280,8 +553,10 @@ until there is no Mango left.
 Not even for Mango!
       EOS
-      page = Mango::ContentPage.new(data, :content_engine => :markdown)
+      @page = Mango::ContentPage.new(:data => data)
+    end
+    it "seasons the data before rendering the content" do
       expected = <<-EOS
 <p>Mango is like a drug.<br/>
 You must have more and more and more of the Mango<br/>
@@ -289,9 +564,7 @@ until there is no Mango left.<br/>
 Not even for Mango!</p>
       EOS
-      page.to_html.should == expected.strip
+      @page.content.should == expected.strip
     end
   end
 end