mango 0.5.4 → 0.6.0

data/lib/mango/templates/.gitignore

@@ -1,3 +1,2 @@
 .DS_Store
-.rvmrc
 .bundle

data/lib/mango/templates/Gemfile

@@ -1,3 +1,3 @@
 # encoding: UTF-8
 source "http://rubygems.org"
-gem "mango", "~> 0.5.4"
+gem "mango", "~> 0.6.0"

data/lib/mango/templates/content/index.erb

@@ -0,0 +1,6 @@
+---
+title: Congratulations!
+---
+<h1><%= page.title %></h1>
+
+<h2>You did it!</h2>

data/lib/mango/templates/themes/default/javascripts/timer.coffee

@@ -0,0 +1,6 @@
+fire = ->
+  gap = Math.floor(Math.random() * 1201) + 600
+  setTimeout(fire, gap)
+  createFirework(30,125,7,5,null,null,null,null,false,true)
+
+window.onload = fire

data/lib/mango/templates/themes/default/public/{styles → stylesheets}/reset.css

@@ -1,5 +1,3 @@
-@charset "UTF-8";
-
 /* v1.0 | 20080212 */
 
 html, body, div, span, applet, object, iframe,

data/lib/mango/templates/themes/default/{styles → stylesheets}/screen.sass

@@ -1,5 +1,3 @@
-@charset "UTF-8"
-
 body
   background-color: #D05C12
   font-family: "Lobster", arial, serif

data/lib/mango/templates/themes/default/views/layout.haml

@@ -2,14 +2,14 @@
 %html
   %head
     %meta{ :charset => "utf-8" }
-    %title= "Mango: #{@content_page.title}"
+    %title= "Mango: #{page.title}"
     %link{ :rel => "stylesheet", :type => "text/css", :media => "screen", :href => "http://fonts.googleapis.com/css?family=Lobster" }
-    %link{ :rel => "stylesheet", :type => "text/css", :media => "screen", :href => "/styles/reset.css" }
-    %link{ :rel => "stylesheet", :type => "text/css", :media => "screen", :href => "/styles/screen.css" }
-    %link{ :rel => "stylesheet", :type => "text/css", :media => "screen", :href => "/styles/fireworks.css" }
+    %link{ :rel => "stylesheet", :type => "text/css", :media => "screen", :href => "/stylesheets/reset.css" }
+    %link{ :rel => "stylesheet", :type => "text/css", :media => "screen", :href => "/stylesheets/screen.css" }
+    %link{ :rel => "stylesheet", :type => "text/css", :media => "screen", :href => "/stylesheets/fireworks.css" }
     %script{ :type => "text/javascript", :src => "/javascripts/fireworks.js"}
     %script{ :type => "text/javascript", :src => "/javascripts/timer.js"}
-  %body{ :onload => "fire();" }
+  %body
     %div#fireworks-template
       %div#fw.firework
       %div#fp.fireworkParticle

data/lib/mango/templates/themes/default/views/page.haml

@@ -1,3 +1 @@
-%h1= @content_page.title
-
-= @content_page.to_html
+= page.content

data/lib/mango/version.rb

@@ -2,5 +2,5 @@
 
 module Mango
   # Current stable released version
-  VERSION = "0.5.4"
+  VERSION = "0.6.0"
 end

data/mango.gemspec

@@ -15,18 +15,20 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.7"
   s.rubyforge_project         = "mango"
 
-  s.add_runtime_dependency "bundler",   "~> 1.0.7"
-  s.add_runtime_dependency "rack",      "~> 1.2.2"
-  s.add_runtime_dependency "sinatra",   "~> 1.1.4"
-  s.add_runtime_dependency "haml",      "~> 3.0.25"
-  s.add_runtime_dependency "bluecloth", "~> 2.1.0"
-  s.add_runtime_dependency "thor",      "~> 0.14.6"
+  s.add_runtime_dependency "bundler",       "~> 1.0.7"
+  s.add_runtime_dependency "rack",          "~> 1.2.2"
+  s.add_runtime_dependency "sinatra",       "~> 1.2.6"
+  s.add_runtime_dependency "haml",          "~> 3.1.1"
+  s.add_runtime_dependency "sass",          "~> 3.1.1"
+  s.add_runtime_dependency "liquid",        "~> 2.2.2"
+  s.add_runtime_dependency "bluecloth",     "~> 2.1.0"
+  s.add_runtime_dependency "coffee-script", "~> 2.2.0"
+  s.add_runtime_dependency "thor",          "~> 0.14.6"
 
-  s.add_development_dependency "rspec",         "~> 2.5.0"
-  s.add_development_dependency "rack-test",     "~> 0.5.7"
-  s.add_development_dependency "yard",          "~> 0.6.8"
+  s.add_development_dependency "rspec",         "~> 2.6.0"
+  s.add_development_dependency "rack-test",     "~> 0.6.0"
+  s.add_development_dependency "yard",          "~> 0.7.1"
   s.add_development_dependency "bluecloth",     "~> 2.1.0"
-  s.add_development_dependency "yard-sinatra",  "~> 0.5.1"
 
   s.files              = `git ls-files`.split("\n")
   s.test_files         = `git ls-files -- spec/*`.split("\n")

data/spec/fixture/content/engines/erb.erb

@@ -0,0 +1,7 @@
+---
+categories:
+  engines
+  erb
+---
+<p><%= page.categories %></p>
+<p><%= "/engines/erb.erb" %></p>

data/spec/fixture/content/engines/haml.haml

@@ -1,7 +1,7 @@
 ---
-title: Haml!
-category:
-  - content
-  - engine
+categories:
+  engines
+  haml
 ---
+%p= page.categories
 %p /engines/haml.haml

data/spec/fixture/content/engines/liquid.liquid

@@ -0,0 +1,7 @@
+---
+categories:
+  engines
+  liquid
+---
+<p>{{ page.categories }}</p>
+<p>{{ "/engines/liquid.liquid" }}</p>

data/spec/fixture/content/engines/markdown.markdown

@@ -1,7 +1 @@
----
-title: Markdown!
-category:
-  - content
-  - engine
----
 ### /engines/markdown.markdown

data/spec/fixture/content/engines/md.md

@@ -1,7 +1 @@
----
-title: Markdown!
-category:
-  - content
-  - engine
----
 ### /engines/md.md

data/spec/fixture/content/engines/mkd.mkd

@@ -0,0 +1 @@
+### /engines/mkd.mkd

data/spec/fixture/content/page_with_missing_view.haml

@@ -1,4 +1,4 @@
 ---
-view: missing_view_template
+view: missing.haml
 ---
-%p /attributes.haml
+%p /page_with_missing_view.haml

data/spec/fixture/content/page_with_unregistered_view.haml

@@ -0,0 +1,4 @@
+---
+view: unregistered.extension
+---
+%p /page_with_unregistered_view.haml

data/spec/fixture/content/view_engines/erb.haml

@@ -0,0 +1,4 @@
+---
+view: page.erb
+---
+%p /view_engines/erb.haml

data/spec/fixture/content/view_engines/liquid.haml

@@ -0,0 +1,4 @@
+---
+view: page.liquid
+---
+%p /view_engines/liquid.haml

data/spec/fixture/themes/default/javascripts/override.coffee

@@ -0,0 +1 @@
+singers = {Jagger: "Rock", Elvis: "Roll"}

data/spec/fixture/themes/default/javascripts/siblings.coffee

@@ -0,0 +1,7 @@
+kids =
+  brother:
+    name: "Max"
+    age:  11
+  sister:
+    name: "Ida"
+    age:  9

data/spec/fixture/themes/default/javascripts/songs/happy.coffee

@@ -0,0 +1,5 @@
+if happy and knowsIt
+  clapsHands()
+  chaChaCha()
+else
+  showIt()

data/spec/fixture/themes/default/public/404.html

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset='utf-8' />
+    <title>404 Page</title>
+  </head>
+  <body>
+    <h1>Page not found</h1>
+    <p id='template'>404.html</p>
+  </body>
+</html>

data/spec/fixture/themes/default/public/javascripts/econ.js

@@ -0,0 +1,8 @@
+if (this.studyingEconomics) {
+  while (supply > demand) {
+    buy();
+  }
+  while (!(supply > demand)) {
+    sell();
+  }
+}

data/spec/fixture/themes/default/public/javascripts/math/opposite.js

@@ -0,0 +1,6 @@
+var number, opposite;
+number = 42;
+opposite = true;
+if (opposite) {
+  number = -42;
+}

data/spec/fixture/themes/default/public/javascripts/override.js

@@ -0,0 +1 @@
+var bitlist = [1, 0, 1, 0, 0, 1, 1, 1, 0];

data/spec/fixture/themes/default/public/root.js

@@ -0,0 +1,5 @@
+var yearsOld = {
+  max: 10,
+  ida: 9,
+  tim: 11
+};

data/spec/fixture/themes/default/security_hole.js

@@ -0,0 +1 @@
+This file should *not* be accessible to a browser.

data/spec/fixture/themes/default/{styles/screen.sass → stylesheets/sass.sass}

@@ -1,7 +1,9 @@
-@charset "UTF-8"
-
 $blue: #3bbfce
 $margin: 16px
+$template: "sass.sass"
+
+.main
+  background-image: url($template)
 
 .content-navigation
   border-color: $blue

data/spec/fixture/themes/default/stylesheets/scss.scss

@@ -0,0 +1,19 @@
+$blue: #3bbfce;
+$margin: 16px;
+$template: "scss.scss";
+
+.main {
+  background-image: url($template);
+}
+
+.content-navigation {
+  border-color: $blue;
+  color:
+    darken($blue, 9%);
+}
+
+.border {
+  padding: $margin / 2;
+  margin: $margin / 2;
+  border-color: $blue;
+}

data/spec/fixture/themes/default/{styles → stylesheets}/subfolder/screen.sass

@@ -1,5 +1,3 @@
-@charset "UTF-8"
-
 table.hl
   margin: 2em 0
   td.ln

data/spec/fixture/themes/default/views/404.erb

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset='utf-8' />
+    <title>404 Page</title>
+  </head>
+  <body>
+    <h1>Page not found</h1>
+    <p id='template'><%= "404.erb" %></p>
+  </body>
+</html>

data/spec/fixture/themes/default/views/404.haml

@@ -5,3 +5,4 @@
     %title 404 Page
   %body
     %h1 Page not found
+    %p#template 404.haml

data/spec/fixture/themes/default/views/404.liquid

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset='utf-8' />
+    <title>404 Page</title>
+  </head>
+  <body>
+    <h1>Page not found</h1>
+    <p id='template'>{{ "404.liquid" }}</p>
+  </body>
+</html>

data/spec/fixture/themes/default/views/layout.erb

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset='utf-8' />
+    <title>layout.erb</title>
+  </head>
+  <body>
+<%= yield %>
+  </body>
+</html>

data/spec/fixture/themes/default/views/layout.haml

@@ -2,6 +2,6 @@
 %html
   %head
     %meta{ :charset => "utf-8" }
-    %title App Root Page
+    %title layout.haml
   %body
     = yield

data/spec/fixture/themes/default/views/layout.liquid

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset='utf-8' />
+    <title>layout.liquid</title>
+  </head>
+  <body>
+{{ yield }}
+  </body>
+</html>

data/spec/fixture/themes/default/views/page.erb

@@ -0,0 +1,7 @@
+<h1>Welcome to Mango!</h1>
+
+<p id="template">page.erb</p>
+
+<div id="content">
+  <%= page.content %>
+</div>

data/spec/fixture/themes/default/views/page.haml

@@ -1,4 +1,6 @@
 %h1 Welcome to Mango!
 
+%p#template page.haml
+
 %div#content
-  = @content_page.to_html
+  = page.content

data/spec/fixture/themes/default/views/page.liquid

@@ -0,0 +1,7 @@
+<h1>Welcome to Mango!</h1>
+
+<p id="template">page.liquid</p>
+
+<div id="content">
+  {{ page.content }}
+</div>

data/spec/lib/application/routing_content_pages_spec.rb

@@ -12,7 +12,7 @@ describe Mango::Application do
   #################################################################################################
 
   describe "GET (empty String)" do
-    before(:each) do
+    before(:all) do
       get ""
     end
 
@@ -30,10 +30,11 @@ describe Mango::Application do
 <html>
   <head>
     <meta charset='utf-8' />
-    <title>App Root Page</title>
+    <title>layout.haml</title>
   </head>
   <body>
     <h1>Welcome to Mango!</h1>
+    <p id='template'>page.haml</p>
     <div id='content'>
       <p>/index.haml</p>
     </div>
@@ -46,7 +47,7 @@ describe Mango::Application do
   #################################################################################################
 
   describe "GET /" do
-    before(:each) do
+    before(:all) do
       get "/"
     end
 
@@ -64,10 +65,11 @@ describe Mango::Application do
 <html>
   <head>
     <meta charset='utf-8' />
-    <title>App Root Page</title>
+    <title>layout.haml</title>
   </head>
   <body>
     <h1>Welcome to Mango!</h1>
+    <p id='template'>page.haml</p>
     <div id='content'>
       <p>/index.haml</p>
     </div>
@@ -80,7 +82,7 @@ describe Mango::Application do
   #################################################################################################
 
   describe "GET /index" do
-    before(:each) do
+    before(:all) do
       get "/index"
     end
 
@@ -98,10 +100,11 @@ describe Mango::Application do
 <html>
   <head>
     <meta charset='utf-8' />
-    <title>App Root Page</title>
+    <title>layout.haml</title>
   </head>
   <body>
     <h1>Welcome to Mango!</h1>
+    <p id='template'>page.haml</p>
     <div id='content'>
       <p>/index.haml</p>
     </div>
@@ -114,7 +117,7 @@ describe Mango::Application do
   #################################################################################################
 
   describe "GET /index?foo=bar" do
-    before(:each) do
+    before(:all) do
       get "/index?foo=bar"
     end
 
@@ -132,10 +135,11 @@ describe Mango::Application do
 <html>
   <head>
     <meta charset='utf-8' />
-    <title>App Root Page</title>
+    <title>layout.haml</title>
   </head>
   <body>
     <h1>Welcome to Mango!</h1>
+    <p id='template'>page.haml</p>
     <div id='content'>
       <p>/index.haml</p>
     </div>
@@ -148,7 +152,7 @@ describe Mango::Application do
   #################################################################################################
 
   describe "GET /about/" do
-    before(:each) do
+    before(:all) do
       get "/about/"
     end
 
@@ -166,10 +170,11 @@ describe Mango::Application do
 <html>
   <head>
     <meta charset='utf-8' />
-    <title>App Root Page</title>
+    <title>layout.haml</title>
   </head>
   <body>
     <h1>Welcome to Mango!</h1>
+    <p id='template'>page.haml</p>
     <div id='content'>
       <p>/about/index.haml</p>
     </div>
@@ -182,7 +187,7 @@ describe Mango::Application do
   #################################################################################################
 
   describe "GET /about/index" do
-    before(:each) do
+    before(:all) do
       get "/about/index"
     end
 
@@ -200,10 +205,11 @@ describe Mango::Application do
 <html>
   <head>
     <meta charset='utf-8' />
-    <title>App Root Page</title>
+    <title>layout.haml</title>
   </head>
   <body>
     <h1>Welcome to Mango!</h1>
+    <p id='template'>page.haml</p>
     <div id='content'>
       <p>/about/index.haml</p>
     </div>
@@ -216,7 +222,7 @@ describe Mango::Application do
   #################################################################################################
 
   describe "GET /about/us" do
-    before(:each) do
+    before(:all) do
       get "/about/us"
     end
 
@@ -234,10 +240,11 @@ describe Mango::Application do
 <html>
   <head>
     <meta charset='utf-8' />
-    <title>App Root Page</title>
+    <title>layout.haml</title>
   </head>
   <body>
     <h1>Welcome to Mango!</h1>
+    <p id='template'>page.haml</p>
     <div id='content'>
       <p>/about/us.haml</p>
     </div>
@@ -250,7 +257,7 @@ describe Mango::Application do
   #################################################################################################
 
   describe "GET /turner%2Bhooch" do
-    before(:each) do
+    before(:all) do
       get "/turner%2Bhooch"
     end
 
@@ -268,10 +275,11 @@ describe Mango::Application do
 <html>
   <head>
     <meta charset='utf-8' />
-    <title>App Root Page</title>
+    <title>layout.haml</title>
   </head>
   <body>
     <h1>Welcome to Mango!</h1>
+    <p id='template'>page.haml</p>
     <div id='content'>
       <p>/turner+hooch.haml</p>
     </div>
@@ -283,8 +291,85 @@ describe Mango::Application do
 
   #################################################################################################
 
+  describe "GET /view_engines/erb" do
+    before(:all) do
+      get "/view_engines/erb"
+    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/html;charset=utf-8"
+    end
+
+    it "sends the correct body content" do
+      last_response.body.should == <<-EXPECTED
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset='utf-8' />
+    <title>layout.erb</title>
+  </head>
+  <body>
+<h1>Welcome to Mango!</h1>
+
+<p id="template">page.erb</p>
+
+<div id="content">
+  <p>/view_engines/erb.haml</p>
+
+</div>
+  </body>
+</html>
+      EXPECTED
+    end
+  end
+
+  #################################################################################################
+
+  describe "GET /view_engines/liquid" do
+    before(:all) do
+      get "/view_engines/liquid"
+    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/html;charset=utf-8"
+    end
+
+    it "sends the correct body content" do
+      last_response.body.should == <<-EXPECTED
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset='utf-8' />
+    <title>layout.liquid</title>
+  </head>
+  <body>
+<h1>Welcome to Mango!</h1>
+
+<p id="template">page.liquid</p>
+
+<div id="content">
+  <p>/view_engines/liquid.haml</p>
+
+</div>
+
+  </body>
+</html>
+      EXPECTED
+    end
+  end
+
+  #################################################################################################
+
   describe "GET /page_not_found" do
-    before(:each) do
+    before(:all) do
       get "/page_not_found"
     end
 
@@ -306,6 +391,7 @@ describe Mango::Application do
   </head>
   <body>
     <h1>Page not found</h1>
+    <p id='template'>404.html</p>
   </body>
 </html>
       EXPECTED
@@ -314,19 +400,32 @@ describe Mango::Application do
 
   #################################################################################################
 
+  describe "GET /page_with_unregistered_view" do
+    it "raises an exception" do
+      path    = FIXTURE_ROOT + "themes/default/views/unregistered.extension"
+      message = "Cannot find registered engine for view template file -- #{path}"
+      lambda {
+        get "/page_with_unregistered_view"
+      }.should raise_exception(Mango::Application::RegisteredEngineNotFound, message)
+    end
+  end
+
+  #################################################################################################
+
   describe "GET /page_with_missing_view" do
-    it "raises RuntimeError" do
-      path = FIXTURE_ROOT + "themes/default/views/missing_view_template.haml"
+    it "raises an exception" do
+      path    = FIXTURE_ROOT + "themes/default/views/missing.haml"
+      message = "Cannot find view template file -- #{path}"
       lambda {
         get "/page_with_missing_view"
-      }.should raise_exception(RuntimeError, "Unable to find a view template file -- #{path}")
+      }.should raise_exception(Mango::Application::ViewTemplateNotFound, message)
     end
   end
 
   #################################################################################################
 
   describe "GET /../security_hole" do
-    before(:each) do
+    before(:all) do
       get "/../security_hole"
     end
 
@@ -348,10 +447,188 @@ describe Mango::Application do
   </head>
   <body>
     <h1>Page not found</h1>
+    <p id='template'>404.html</p>
+  </body>
+</html>
+      EXPECTED
+    end
+  end
+
+  #################################################################################################
+
+  describe "GET /engines/haml" do
+    before(:all) do
+      get "/engines/haml"
+    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/html;charset=utf-8"
+    end
+
+    it "sends the correct body content" do
+      last_response.body.should == <<-EXPECTED
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset='utf-8' />
+    <title>layout.haml</title>
+  </head>
+  <body>
+    <h1>Welcome to Mango!</h1>
+    <p id='template'>page.haml</p>
+    <div id='content'>
+      <p>engines haml</p>
+      <p>/engines/haml.haml</p>
+    </div>
   </body>
 </html>
       EXPECTED
     end
   end
 
+  #################################################################################################
+
+  describe "GET /engines/md" do
+    before(:all) do
+      get "/engines/md"
+    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/html;charset=utf-8"
+    end
+
+    it "sends the correct body content" do
+      last_response.body.should == <<-EXPECTED
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset='utf-8' />
+    <title>layout.haml</title>
+  </head>
+  <body>
+    <h1>Welcome to Mango!</h1>
+    <p id='template'>page.haml</p>
+    <div id='content'>
+      <h3>/engines/md.md</h3>
+    </div>
+  </body>
+</html>
+      EXPECTED
+    end
+  end
+
+  #################################################################################################
+
+  describe "GET /engines/mkd" do
+    before(:all) do
+      get "/engines/mkd"
+    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/html;charset=utf-8"
+    end
+
+    it "sends the correct body content" do
+      last_response.body.should == <<-EXPECTED
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset='utf-8' />
+    <title>layout.haml</title>
+  </head>
+  <body>
+    <h1>Welcome to Mango!</h1>
+    <p id='template'>page.haml</p>
+    <div id='content'>
+      <h3>/engines/mkd.mkd</h3>
+    </div>
+  </body>
+</html>
+      EXPECTED
+    end
+  end
+
+  #################################################################################################
+
+  describe "GET /engines/erb" do
+    before(:all) do
+      get "/engines/erb"
+    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/html;charset=utf-8"
+    end
+
+    it "sends the correct body content" do
+      last_response.body.should == <<-EXPECTED
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset='utf-8' />
+    <title>layout.haml</title>
+  </head>
+  <body>
+    <h1>Welcome to Mango!</h1>
+    <p id='template'>page.haml</p>
+    <div id='content'>
+      <p>engines erb</p>
+      <p>/engines/erb.erb</p>
+    </div>
+  </body>
+</html>
+      EXPECTED
+    end
+  end
+
+  #################################################################################################
+
+  describe "GET /engines/liquid" do
+    before(:all) do
+      get "/engines/liquid"
+    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/html;charset=utf-8"
+    end
+
+    it "sends the correct body content" do
+      last_response.body.should == <<-EXPECTED
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset='utf-8' />
+    <title>layout.haml</title>
+  </head>
+  <body>
+    <h1>Welcome to Mango!</h1>
+    <p id='template'>page.haml</p>
+    <div id='content'>
+      <p>engines liquid</p>
+      <p>/engines/liquid.liquid</p>
+    </div>
+  </body>
+</html>
+      EXPECTED
+    end
+  end
 end