mango 0.6.1 → 0.6.2

data/CHANGES.md

@@ -1,5 +1,31 @@
 # CHANGES
 
+## v0.6.2 / 2011-06-06
+
+[Full changes](https://github.com/ryansobol/mango/compare/v0.6.1...v0.6.2)
+
+## Bugs
+
+  * Allow view templates nested within directories [GH#65](https://github.com/ryansobol/mango/issues/65)
+  * Pass to next matching route for all get route handlers [GH#64](https://github.com/ryansobol/mango/issues/64)
+
+## Dependencies
+
+  * Update rack to ~> 1.2.3 [GH#63](https://github.com/ryansobol/mango/issues/63)
+  * Add therubyracer-heroku = 0.8.1.pre3 [GH#59](https://github.com/ryansobol/mango/issues/59)
+
+## Chores
+
+  * Remove rspec task from Rakefile [GH51](https://github.com/ryansobol/mango/issues/51)
+
+## Documentation
+
+  * Touch up the README.md [GH#62](https://github.com/ryansobol/mango/issues/62)
+
+## Legal
+
+  * Update copyright to 2011 in README.md [GH#60](https://github.com/ryansobol/mango/issues/60)
+
 ## v0.6.1 / 2011-05-29
 
 [Full changes](https://github.com/ryansobol/mango/compare/v0.6.0...v0.6.1)

data/Gemfile.lock

@@ -1,15 +1,16 @@
 PATH
   remote: .
   specs:
-    mango (0.6.0)
+    mango (0.6.2)
       bluecloth (~> 2.1.0)
       bundler (~> 1.0.7)
       coffee-script (~> 2.2.0)
       haml (~> 3.1.1)
       liquid (~> 2.2.2)
-      rack (~> 1.2.2)
+      rack (~> 1.2.3)
       sass (~> 3.1.1)
       sinatra (~> 1.2.6)
+      therubyracer-heroku (= 0.8.1.pre3)
       thor (~> 0.14.6)
 
 GEM
@@ -41,6 +42,7 @@ GEM
     sinatra (1.2.6)
       rack (~> 1.1)
       tilt (>= 1.2.2, < 2.0)
+    therubyracer-heroku (0.8.1.pre3)
     thor (0.14.6)
     tilt (1.3.2)
     yard (0.7.1)
@@ -55,10 +57,11 @@ DEPENDENCIES
   haml (~> 3.1.1)
   liquid (~> 2.2.2)
   mango!
-  rack (~> 1.2.2)
+  rack (~> 1.2.3)
   rack-test (~> 0.6.0)
   rspec (~> 2.6.0)
   sass (~> 3.1.1)
   sinatra (~> 1.2.6)
+  therubyracer-heroku (= 0.8.1.pre3)
   thor (~> 0.14.6)
   yard (~> 0.7.1)

data/README.md

@@ -1,7 +1,7 @@
-Mango release 0.6.1 (May 29, 2011)
+Mango release 0.6.2 (June 6, 2011)
 ==================================
 
-Copyright (c) 2010 Ryan Sobol. Licensed under the MIT license.  Please see the {file:LICENSE} for more information.
+Copyright (c) 2011 Ryan Sobol. Licensed under the MIT license.  Please see the {file:LICENSE} for more information.
 
   * **Demo Application** : [http://mango-fireworks.heroku.com/](http://mango-fireworks.heroku.com/)
   * **Source Code**: [https://github.com/ryansobol/mango](https://github.com/ryansobol/mango)
@@ -82,22 +82,21 @@ REQUIREMENTS
   * [Ruby](http://www.ruby-lang.org/) ~> 1.9.2 ([RVM](http://rvm.beginrescueend.com/) recommended)
   * [RubyGems](https://rubygems.org/) >= 1.3.7 (bundled with Ruby)
   * [Bundler](http://gembundler.com/) ~> 1.0.7
-  * [Rack](http://rack.rubyforge.org/) ~> 1.2.2
+  * [Thor](https://github.com/wycats/thor) ~> 0.14.6
+  * [Rack](http://rack.rubyforge.org/) ~> 1.2.3
   * [Sinatra](http://www.sinatrarb.com/) ~> 1.2.6
   * [Haml](http://haml-lang.com/) ~> 3.1.1
   * [Sass](http://sass-lang.com/) ~> 3.1.1
   * [BlueCloth](http://deveiate.org/projects/BlueCloth) ~> 2.1.0
   * [Liquid](http://www.liquidmarkup.org/) ~> 2.2.2
   * [CoffeeScript](http://jashkenas.github.com/coffee-script/) ~> 2.2.0
-  * [Thor](https://github.com/wycats/thor) ~> 0.14.6
+  * [TheRubyRacer for Heroku](https://github.com/pwim/therubyracer-heroku) = 0.8.1.pre3
 
 ### Optional development dependencies
 
-  * [Rake](http://rake.rubyforge.org/) ~> 0.8.7 (bundled with Ruby)
   * [Rack::Test](https://github.com/brynary/rack-test) ~> 0.6.0
   * [RSpec](http://rspec.info/) ~> 2.6.0
   * [YARD](http://yardoc.org/) ~> 0.7.1
-  * [YARD::Sinatra](https://github.com/rkh/yard-sinatra) ~> 0.5.1
   * [BlueCloth](http://deveiate.org/projects/BlueCloth) ~> 2.1.0
 
 INSTALLING
@@ -108,7 +107,7 @@ INSTALLING
 I highly recommend [RVM](http://rvm.beginrescueend.com/) by Wayne E. Seguin.  It trivializes managing multiple versions of Ruby on one machine.
 
     $ ruby -v
-    ruby 1.9.2p0 (2010-08-18 revision 29036) [x86_64-darwin10.4.0]
+    ruby 1.9.2p180 (2011-02-18 revision 30909) [x86_64-darwin10.7.0]
 
 **TIP:** The revision and arch-type may differ on your machine.
 
@@ -128,7 +127,7 @@ Simply edit the gem version in your application's `Gemfile` and re-install with
     $ cat Gemfile
     # encoding: UTF-8
     source "http://rubygems.org"
-    gem "mango", "~> 0.6.1"
+    gem "mango", "~> 0.6.2"
     $ bundle install
 
 **TIP:** If you're working in the insolation of an [RVM gemset](http://rvm.beginrescueend.com/gemsets/basics/), type `gem clean` to uninstall outdated gems.
@@ -208,7 +207,8 @@ Now that the newly generated Mango application is running, here's how the applic
     * For routes ending in `.js`, Mango searches for a stylesheet template in `themes/javascripts/`.
     * For routes ending in `.css`, Mango searches for a stylesheet template in `themes/stylesheets/`.
     * For all other routes, Mango searches for a content page in `content/` and wraps it within a view template in `themes/default/views`.
-  * If no static or template file is found, Mango routes unknown HTTP requests to a customizable 404 page found in either `themes/default/public` or `themes/default/views`.
+  * If no static or template file is found, Mango tries to route the request to a custom route handler if one exists.
+  * Finally, Mango routes unknown HTTP requests to a customizable 404 page found in either `themes/default/public` or `themes/default/views`.
 
 WRITING
 -------

data/Rakefile

@@ -1,19 +1,5 @@
 # encoding: UTF-8
 require File.expand_path("lib/mango", File.dirname(__FILE__))
-Mango::Dependencies.warn_at_exit
-
-###################################################################################################
-
-begin
-  require "rspec/core/rake_task"
-  require "rack/test" # for Rack support
-  RSpec::Core::RakeTask.new(:spec)
-  task :default => :spec
-rescue LoadError => e
-  Mango::Dependencies.create_warning_for(e)
-end
-
-###################################################################################################
 
 namespace :gem do
   desc "Builds a gem from the current project's Gem::Specification"

data/lib/mango/application.rb

@@ -18,7 +18,7 @@ module Mango
   #
   # In addition to serving static assets, the application has these dynamic route handlers:
   #
-  #   * Content page templates with `GET *`
+  #   * Content page templates with `GET /*`
   #   * JavaScript templates with `GET /javascripts/*.js`
   #   * Stylesheet templates with `GET /stylesheets/*.css`
   #
@@ -50,9 +50,9 @@ module Mango
   #
   #     GET /../security_hole.txt  => pass to NOT_FOUND error handler
   #
-  # # Content page templates with `GET *`
+  # # Content page templates with `GET /*`
   #
-  # ### Example `GET *` requests routed to content page templates
+  # ### Example `GET /*` requests routed to content page templates
   #
   #     |-- content
   #     |   |-- about
@@ -71,8 +71,10 @@ module Mango
   #     GET /about/us              => 200 content/about/us.haml
   #     GET /turner%2Bhooch        => 200 content/turner+hooch.haml
   #
-  #     GET /page_not_found        => pass to NOT_FOUND error handler
-  #     GET /../security_hole      => pass to NOT_FOUND error handler
+  #     GET /page_not_found        => pass to another matching route or to the NOT_FOUND error
+  #                                   handler if none exists
+  #     GET /../security_hole      => pass to another matching route or to the NOT_FOUND error
+  #                                   handler if none exists
   #
   # # JavaScript templates with `GET /javascripts/*.js`
   #
@@ -102,9 +104,12 @@ module Mango
   #     GET /root.js                      => 200 themes/default/public/root.js
   #     GET /javascripts/math/opposite.js => 200 themes/default/public/javascripts/math/opposite.js
   #
-  #     GET /javascripts/not_found.js        => pass to NOT_FOUND error handler
-  #     GET /siblings.js                     => pass to NOT_FOUND error handler
-  #     GET /javascripts/../security_hole.js => pass to NOT_FOUND error handler
+  #     GET /javascripts/not_found.js        => pass to another matching route or to the NOT_FOUND
+  #                                             error handler if none exists
+  #     GET /siblings.js                     => pass to another matching route or to the NOT_FOUND
+  #                                             error handler if none exists
+  #     GET /javascripts/../security_hole.js => pass to another matching route or to the NOT_FOUND
+  #                                             error handler if none exists
   #
   # # Stylesheet templates with `GET /stylesheets/*.css`
   #
@@ -134,15 +139,18 @@ module Mango
   #     GET /default.css                  => 200 themes/default/public/default.css
   #     GET /stylesheets/folder/print.css => 200 themes/default/public/stylesheets/folder/print.css
   #
-  #     GET /stylesheets/not_found.css        => pass to NOT_FOUND error handler
-  #     GET /screen.css                       => pass to NOT_FOUND error handler
-  #     GET /stylesheets/../security_hole.css => pass to NOT_FOUND error handler
+  #     GET /stylesheets/not_found.css        => pass to another matching route or to the NOT_FOUND
+  #                                              error handler if none exists
+  #     GET /screen.css                       => pass to another matching route or to the NOT_FOUND
+  #                                              error handler if none exists
+  #     GET /stylesheets/../security_hole.css => pass to another matching route or to the NOT_FOUND
+  #                                              error handler if none exists
   #
   # # 404 Page Not Found with `NOT_FOUND`
   #
-  # When a requested URI path cannot be matched with a public file or template file, the error
-  # handler attempts to send a 404 public file or a rendered a 404 template with a 404 HTTP
-  # response.
+  # When a requested URI path cannot be matched with a public file or template file, and cannot be
+  # matched to another route, the error handler attempts to send a 404 public file or a rendered a
+  # 404 template file with a 404 HTTP response.
   #
   # ### Example `GET /page_not_found` request routed to a 404 public file
   #
@@ -336,8 +344,8 @@ module Mango
     # **It's intended that requests to public JavaScript files and requests to JavaScript templates
     # share the `/javascripts/` prefix.**
     #
-    # Finally, if no matches are found, the route handler passes execution to the `NOT_FOUND` error
-    # handler.
+    # Finally, if no matches are found, execution is passed to the next matching route handler if
+    # one exists.  Otherwise, execution is passed to the `NOT_FOUND` error handler.
     #
     # @macro [attach] sinatra.get
     #   @overload get "$1"
@@ -346,7 +354,7 @@ module Mango
     #
     get "/javascripts/*.js" do |uri_path|
       render_javascript_template! uri_path
-      not_found
+      pass
     end
 
     # Given a URI path, attempts to render a JavaScript template, if it exists, and halt
@@ -409,14 +417,14 @@ module Mango
     # **It's intended that requests to public stylesheet files and requests to stylesheet templates
     # share the `/stylesheets/` prefix.**
     #
-    # Finally, if no matches are found, the route handler passes execution to the `NOT_FOUND` error
-    # handler.
+    # Finally, if no matches are found, execution is passed to the next matching route handler if
+    # one exists.  Otherwise, execution is passed to the `NOT_FOUND` error handler.
     #
     # @method get_css
     #
     get "/stylesheets/*.css" do |uri_path|
       render_stylesheet_template! uri_path
-      not_found
+      pass
     end
 
     # Given a URI path, attempts to render a stylesheet template, if it exists, and halt
@@ -488,15 +496,15 @@ module Mango
     #                       themes/default/views/page.haml +
     #                       themes/default/views/layout.haml
     #
-    # Finally, if no matches are found, the route handler passes execution to the `NOT_FOUND` error
-    # handler.
+    # Finally, if no matches are found, execution is passed to the next matching route handler if
+    # one exists.  Otherwise, execution is passed to the `NOT_FOUND` error handler.
     #
     # @method get_all
     #
     get "/*" do |uri_path|
       render_index_file! uri_path
       render_content_page! uri_path
-      not_found
+      pass
     end
 
     # Given a URI path, attempts to send an index.html file, if it exists, and halt

data/lib/mango/core_ext/string.rb

@@ -6,11 +6,14 @@ class String
   # Convert a file name to a Sinatra-compliant template name
   #
   # @example
-  #   "blog.haml".templatize  #=> :blog
+  #   "blog.haml".templatize              #=> :blog
+  #   "blog/home.erb".templatize          #=> :"blog/home"
+  #   "page.html.liquid".templatize       #=> :"page.html"
+  #   "article/post.html.haml".templatize #=> :"article/post.html"
   #
   # @return [Symbol] A Sinatra-compliant template name
   #
   def templatize
-    File.basename(self, '.*').to_sym
+    self.rpartition(".").shift.to_sym
   end
 end

data/lib/mango/dependencies.rb

@@ -1,41 +1,15 @@
 # encoding: UTF-8
 
 module Mango
-  # `Mango::Dependencies` is a module that performs two types of depedency checking:
-  #
-  #   * Strict parse-time version checking of Ruby
-  #   * Lenient run-time handling of missing development RubyGems
-  #
-  # `Mango::Dependencies` automatically enforces a strict parse-time check for the
+  # `Mango::Dependencies` is a module that automatically enforces a strict parse-time check for the
   # `SUPPORTED_RUBY_VERSIONS` on both application and development processes for the Mango
-  # library. (i.e. `bin/mango`, `rake`, `spec`, `rackup`, etc)  Because of this,
+  # library. (i.e. `bin/mango`, `rake`, `rspec`, `rackup`, etc)  Because of this,
   # `Mango::Dependencies` is syntactically compatible with Ruby 1.8.7 or higher.
   #
-  # `Mango::Dependencies` is also a lenient, run-time handler used in the `Rakefile` to build
-  # developer-friendly warnings from rescued `LoadError` exceptions raised by missing
-  # development RubyGem dependencies.
-  #
-  # @example Simple usage with the rspec-core gem
-  #   Mango::Dependencies.warn_at_exit
-  #   begin
-  #     require "rspec/core/rake_task"
-  #     RSpec::Core::RakeTask.new(:spec)
-  #   rescue LoadError => e
-  #     Mango::Dependencies.create_warning_for(e)
-  #   end
-  #
-  # @see Mango::Dependencies.create_warning_for
-  # @see Mango::Dependencies.warn_at_exit
   module Dependencies
     # A short list of supported Ruby versions
     SUPPORTED_RUBY_VERSIONS = ["1.9.2"]
 
-    # Maps file names to gem name
-    FILE_NAME_TO_GEM_NAME = {
-      :"rack/test"            => :"rack-test",
-      :"rspec/core/rake_task" => :"rspec-core",
-    }
-
     # Checks that the version of the current Ruby process matches the one of the
     # `SUPPORTED_RUBY_VERSIONS`. This method is automatically invoked at the first time this class
     # is required, ensuring the correct Ruby version at parse-time.
@@ -51,47 +25,8 @@ http://rvm.beginrescueend.com/
         ERROR
       end
     end
-    check_ruby_version
-
-    # Empties the warnings cache.  This method is called when the class is required.
-    def self.destroy_warnings
-      @@warnings_cache = []
-    end
-    destroy_warnings
-
-    # Creates and caches a warning from a `LoadError` exception.
-    #
-    # @param [LoadError] error A rescued exception
-    def self.create_warning_for(error)
-      pattern = %r{no such file to load -- ([\w\-\\/]*)}
-      error.message.match(pattern) do |match_data|
-        file_name = match_data[1].to_sym
-        gem_name  = if FILE_NAME_TO_GEM_NAME.has_key?(file_name)
-          FILE_NAME_TO_GEM_NAME[file_name]
-        else
-          file_name
-        end
-
-        @@warnings_cache << gem_name
-      end
-    end
-
-    # Displays a warning message to the user on the standard output channel if there are warnings
-    # to render.
-    def self.render_warnings
-      unless @@warnings_cache.empty?
-        puts <<-EOS
-
-Could not require the following RubyGems: #{@@warnings_cache.join(", ")}
-Please run "bundle install" to access all development features.
-
-        EOS
-      end
-    end
 
-    # Attaches a call to `render_warnings` to `Kernel#at_exit`
-    def self.warn_at_exit
-      at_exit { render_warnings }
-    end
+    # Automatic enforcement
+    check_ruby_version
   end
 end

data/lib/mango/templates/Gemfile

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

data/lib/mango/version.rb

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

data/mango.gemspec

@@ -15,18 +15,19 @@ 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.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_runtime_dependency "bundler",             "~> 1.0.7"
+  s.add_runtime_dependency "thor",                "~> 0.14.6"
+  s.add_runtime_dependency "rack",                "~> 1.2.3"
+  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 "therubyracer-heroku", "= 0.8.1.pre3"
 
-  s.add_development_dependency "rspec",         "~> 2.6.0"
   s.add_development_dependency "rack-test",     "~> 0.6.0"
+  s.add_development_dependency "rspec",         "~> 2.6.0"
   s.add_development_dependency "yard",          "~> 0.7.1"
   s.add_development_dependency "bluecloth",     "~> 2.1.0"
 

data/spec/fixture/content/articles/index.md

@@ -0,0 +1,5 @@
+---
+view: articles/page.erb
+---
+
+### /articles/index.md

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

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

data/spec/lib/application/routing_content_pages_spec.rb

@@ -256,6 +256,43 @@ describe Mango::Application do
 
   #################################################################################################
 
+  describe "GET /articles/index" do
+    before(:all) do
+      get "/articles/index"
+    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">articles/page.erb</p>
+
+<div id="content">
+  <h3>/articles/index.md</h3>
+</div>
+  </body>
+</html>
+      EXPECTED
+    end
+  end
+
+  #################################################################################################
+
   describe "GET /turner%2Bhooch" do
     before(:all) do
       get "/turner%2Bhooch"
@@ -631,4 +668,32 @@ describe Mango::Application do
       EXPECTED
     end
   end
+
+  #################################################################################################
+
+  context "given an additional GET route handler to Mango::Application" do
+    class Mango::Application
+      get "/route/addition" do
+        "/route/addition isolated and handled"
+      end
+    end
+
+    describe "GET /route/addition" do
+      before(:all) do
+        get "/route/addition"
+      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 == "/route/addition isolated and handled"
+      end
+    end
+  end
 end

data/spec/lib/application/routing_javascript_templates_spec.rb

@@ -275,4 +275,32 @@ if (opposite) {
       EXPECTED
     end
   end
+
+  #################################################################################################
+
+  context "given an additional GET route handler to Mango::Application" do
+    class Mango::Application
+      get "/javascripts/addition.js" do
+        "/javascripts/addition.js isolated and handled"
+      end
+    end
+
+    describe "GET /javascripts/addition.js" do
+      before(:all) do
+        get "/javascripts/addition.js"
+      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 == "/javascripts/addition.js isolated and handled"
+      end
+    end
+  end
 end

data/spec/lib/application/routing_stylesheet_templates_spec.rb

@@ -318,4 +318,32 @@ time, mark, audio, video {
       EXPECTED
     end
   end
+
+  #################################################################################################
+
+  context "given an additional GET route handler to Mango::Application" do
+    class Mango::Application
+      get "/stylesheets/addition.css" do
+        "/stylesheets/addition.css isolated and handled"
+      end
+    end
+
+    describe "GET /stylesheets/addition.css" do
+      before(:all) do
+        get "/stylesheets/addition.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/html;charset=utf-8"
+      end
+
+      it "sends the correct body content" do
+        last_response.body.should == "/stylesheets/addition.css isolated and handled"
+      end
+    end
+  end
 end

data/spec/lib/core_ext/string_spec.rb

@@ -2,11 +2,35 @@
 require "spec_helper"
 
 describe String, "#templatize" do
-  context "given a file name" do
+  context "given a file name with 1 extension" do
     let(:file_name) { "blog.haml" }
 
     it "converts it to a Sinatra-compliant template name" do
       file_name.templatize.should eq(:blog)
     end
   end
+
+  context "given a nested file name with 1 extension" do
+    let(:file_name) { "blog/home.erb" }
+
+    it "converts it to a Sinatra-compliant template name" do
+      file_name.templatize.should eq(:"blog/home")
+    end
+  end
+
+  context "given a file name with 2 extensions" do
+    let(:file_name) { "page.html.liquid" }
+
+    it "converts it to a Sinatra-compliant template name" do
+      file_name.templatize.should eq(:"page.html")
+    end
+  end
+
+  context "given a nested file name with 2 extensions" do
+    let(:file_name) { "article/post.html.haml" }
+
+    it "converts it to a Sinatra-compliant template name" do
+      file_name.templatize.should eq(:"article/post.html")
+    end
+  end
 end

data/spec/lib/dependencies_spec.rb

@@ -9,18 +9,6 @@ describe Mango::Dependencies do
     it "supports ruby 1.9.2" do
       Mango::Dependencies::SUPPORTED_RUBY_VERSIONS.should == ["1.9.2"]
     end
-
-    it "file name to gem name look-up table should be correct" do
-      expected = {
-        :"rack/test"            => :"rack-test",
-        :"rspec/core/rake_task" => :"rspec-core",
-      }
-      Mango::Dependencies::FILE_NAME_TO_GEM_NAME.should == expected
-    end
-
-    it "warnings cache should be empty" do
-      Mango::Dependencies.class_variable_get(:@@warnings_cache).should be_empty
-    end
   end
 
   #################################################################################################
@@ -77,75 +65,4 @@ http://rvm.beginrescueend.com/
       }.should_not raise_exception(SystemExit, expected_message(version))
     end
   end
-
-  #################################################################################################
-
-  context "given three load errors" do
-    before(:each) do
-      ["rspec/core/rake_task", "yard", "bluecloth"].each do |file|
-        load_error = LoadError.new("no such file to load -- #{file}")
-        Mango::Dependencies.create_warning_for(load_error)
-      end
-    end
-
-    after(:each) do
-      Mango::Dependencies.destroy_warnings
-    end
-
-    describe ".destroy_warnings" do
-      it "empties the warnings cache" do
-        Mango::Dependencies.class_variable_get(:@@warnings_cache).should_not be_empty
-        Mango::Dependencies.destroy_warnings
-        Mango::Dependencies.class_variable_get(:@@warnings_cache).should be_empty
-      end
-    end
-
-    ###############################################################################################
-
-    describe ".create_warning_for" do
-      it "creates and caches three warnings" do
-        expected = [:"rspec-core", :yard, :bluecloth]
-        Mango::Dependencies.class_variable_get(:@@warnings_cache).should == expected
-      end
-    end
-
-    ###############################################################################################
-
-    describe ".render_warnings" do
-      before(:each) do
-        $stdout = StringIO.new
-      end
-
-      after(:each) do
-        $stdout = STDOUT
-      end
-
-      it "displays a warning message to the user on the standard output channel" do
-        Mango::Dependencies.render_warnings
-        $stdout.string.should == <<-MESSAGE
-
-Could not require the following RubyGems: rspec-core, yard, bluecloth
-Please run "bundle install" to access all development features.
-
-        MESSAGE
-      end
-
-      it "doesn't display a warning message to the user if there are no warnings in the cache" do
-        Mango::Dependencies.destroy_warnings
-        Mango::Dependencies.render_warnings
-        $stdout.string.should be_empty
-      end
-    end
-  end
-
-  #################################################################################################
-
-  describe ".warn_at_exit" do
-    it "ensures Kernel#at_exit is invoked with a block" do
-      Mango::Dependencies.should_receive(:at_exit)
-      # TODO how to specify that #at_exit receives a block?
-      # maybe i can intercept the block, execute it and test the output?
-      Mango::Dependencies.warn_at_exit
-    end
-  end
 end

data/spec/lib/runner_spec.rb

@@ -81,7 +81,7 @@ run Mango::Application
       File.read(expected).should == <<-EOS
 # encoding: UTF-8
 source "http://rubygems.org"
-gem "mango", "~> 0.6.1"
+gem "mango", "~> 0.6.2"
       EOS
     end
 

data/spec/lib/version_spec.rb

@@ -4,7 +4,7 @@ require "spec_helper"
 describe Mango do
   describe "version synchronizing" do
     before(:all) do
-      @expected = "0.6.1"
+      @expected = "0.6.2"
     end
 
     it "is correct for Mango::VERSION" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - Ryan Sobol
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-29 00:00:00 -07:00
+date: 2011-06-06 00:00:00 -04:00
 default_executable: mango
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,9 +33,24 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rack
+  name: thor
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 14
+        - 6
+        version: 0.14.6
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rack
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -43,14 +58,14 @@ dependencies:
         segments: 
         - 1
         - 2
-        - 2
-        version: 1.2.2
+        - 3
+        version: 1.2.3
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: sinatra
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -61,11 +76,11 @@ dependencies:
         - 6
         version: 1.2.6
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: haml
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -76,11 +91,11 @@ dependencies:
         - 1
         version: 3.1.1
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: sass
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -91,11 +106,11 @@ dependencies:
         - 1
         version: 3.1.1
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: liquid
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -106,11 +121,11 @@ dependencies:
         - 2
         version: 2.2.2
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: bluecloth
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -121,11 +136,11 @@ dependencies:
         - 0
         version: 2.1.0
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: coffee-script
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -136,56 +151,57 @@ dependencies:
         - 0
         version: 2.2.0
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: thor
+  name: therubyracer-heroku
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 14
-        - 6
-        version: 0.14.6
+        - 8
+        - 1
+        - pre3
+        version: 0.8.1.pre3
   type: :runtime
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rack-test
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 2
+        - 0
         - 6
         - 0
-        version: 2.6.0
+        version: 0.6.0
   type: :development
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: rack-test
+  name: rspec
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 0
+        - 2
         - 6
         - 0
-        version: 0.6.0
+        version: 2.6.0
   type: :development
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: yard
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -196,11 +212,11 @@ dependencies:
         - 1
         version: 0.7.1
   type: :development
-  version_requirements: *id012
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: bluecloth
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -211,7 +227,7 @@ dependencies:
         - 0
         version: 2.1.0
   type: :development
-  version_requirements: *id013
+  version_requirements: *id014
 description: Mango is a dynamic, database-free, and open source website framework that is designed to make life easier for small teams of designers, developers, and content writers.
 email: contact@ryansobol.com
 executables: 
@@ -261,6 +277,7 @@ files:
 - spec/bin/mango_spec.rb
 - spec/fixture/content/about/index.haml
 - spec/fixture/content/about/us.haml
+- spec/fixture/content/articles/index.md
 - spec/fixture/content/engines/erb.erb
 - spec/fixture/content/engines/haml.haml
 - spec/fixture/content/engines/liquid.liquid
@@ -301,6 +318,7 @@ files:
 - spec/fixture/themes/default/views/404.erb
 - spec/fixture/themes/default/views/404.haml
 - spec/fixture/themes/default/views/404.liquid
+- spec/fixture/themes/default/views/articles/page.erb
 - spec/fixture/themes/default/views/layout.erb
 - spec/fixture/themes/default/views/layout.haml
 - spec/fixture/themes/default/views/layout.liquid
@@ -365,6 +383,7 @@ test_files:
 - spec/bin/mango_spec.rb
 - spec/fixture/content/about/index.haml
 - spec/fixture/content/about/us.haml
+- spec/fixture/content/articles/index.md
 - spec/fixture/content/engines/erb.erb
 - spec/fixture/content/engines/haml.haml
 - spec/fixture/content/engines/liquid.liquid
@@ -405,6 +424,7 @@ test_files:
 - spec/fixture/themes/default/views/404.erb
 - spec/fixture/themes/default/views/404.haml
 - spec/fixture/themes/default/views/404.liquid
+- spec/fixture/themes/default/views/articles/page.erb
 - spec/fixture/themes/default/views/layout.erb
 - spec/fixture/themes/default/views/layout.haml
 - spec/fixture/themes/default/views/layout.liquid