mango 0.5.0.beta1 → 0.5.0.beta2

data/.rspec

@@ -0,0 +1 @@
+--colour

data/.yardopts

@@ -2,5 +2,4 @@
 --markup markdown
 -
 LICENSE
-doc/HISTORY.mdown
-doc/ROAD-MAP.mdown
+CHANGES.mdown

data/{doc/HISTORY.mdown → CHANGES.mdown}

@@ -1,11 +1,35 @@
-Mango release 0.5.0 (September 12, 2010)
-========================================
+Mango release 0.5.0.beta2 (October 21, 2010)
+============================================
 
+### Features
+
+  * Mango has been split into two pieces!
+    1. A web framework, distributed as a Ruby gem, that is completely abstracted away from application code.
+    2. A `mango` command-line tool that generates a [demo Mango application](http://mango-fireworks.heroku.com/).
+  * Mango now supports theme-switching!
+    * For example, add `class Mango::Application; set :theme, "theme_name"; end` to your application's config.ru.
+  * As a result of the new command-line application generator, all embedded application code has been removed.
+  * Now routes like `GET /images/` return a 200 response if the `themes/default/public/images/index.html` file is exists.
+
+### Dependencies
+
+  * Updated [Bundler](http://gembundler.com/) to 1.0.3
+  * Updated [Haml](http://haml-lang.com/) to 3.0.22
+  * Updated [Sass](http://sass-lang.com/) to 3.0.22 (bundled with Haml)
+  * Updated [BlueCloth](http://deveiate.org/projects/BlueCloth) to 2.0.9
+  * Updated [Rack::Test](http://github.com/brynary/rack-test) to 0.5.6
+  * Updated [RSpec](http://rspec.info/) to 2.0.1
+  * Updated [YARD](http://yardoc.org/) to 0.5.8
+  * Updated [YARD::Sinatra](http://github.com/rkh/yard-sinatra) to 0.5.1
+
+### Bugs
+
+  * The NOT_FOUND handler no longer renders the 404 template within a layout template.
 
 Mango release 0.4.0 (August 30, 2010)
 =====================================
 
-### New Features:
+### Features
 
   * Added the beginnings of a default theme titled "Smashing Mangos".
   * Added `Mango::Rack::Debugger` to the middleware stack (Only loads in the `:development` rack environment).
@@ -13,7 +37,7 @@ Mango release 0.4.0 (August 30, 2010)
   * Refactored `Mango::Application` to utilize `Mango::ContentPage`.  Now views have access to a `@content_page` instance variable.
   * Added `Mango::FlavoredMarkdown`, a subset of [GithubFlavoredMarkdown](http://github.github.com/github-flavored-markdown/), into the Markdown-to-HTML conversion.
 
-### Dependencies:
+### Dependencies
 
   * Updated [Haml](http://haml-lang.com/) to 3.0.18
   * Updated [YARD::Sinatra](http://github.com/rkh/yard-sinatra) to 0.5.0
@@ -22,19 +46,19 @@ Mango release 0.4.0 (August 30, 2010)
 Mango release 0.3.0 (June 25, 2010)
 ===================================
 
-### New Features:
+### Features
 
   * Added a route handler that renders [Sass](http://sass-lang.com/) templates to CSS!
   * Refactored tests for better spec coverage of route handling
   * Massive rewrite of internal documentation thanks to the [YARD::Sinatra (modified)](http://github.com/ryansobol/yard-sinatra)
   * Uploaded developer documentation to [http://yardoc.org/docs/ryansobol-mango](http://yardoc.org/docs/ryansobol-mango)
 
-### Dependencies:
+### Dependencies
 
   * Updated [Haml](http://haml-lang.com/) to 3.0.13
   * Added [YARD::Sinatra](http://github.com/rkh/yard-sinatra) 0.4.0.1 [(modified)](http://github.com/ryansobol/yard-sinatra)
 
-### Bug fixes:
+### Bugs
 
   * Fixed Regex when parsing LoadError messages on missing development dependencies
   * Fixed rspec gem name detection when requiring spec/rake/spectask in the Rakefile

data/README.mdown

@@ -2,14 +2,14 @@
 
 Image courtesy of [B.C. Tree Fruits LTD.](http://www.bctree.com/products/sourced/mango.php)
 
-Mango release 0.5.0 (September 12, 2010)
-========================================
+Mango release 0.5.0.beta2 (October 21, 2010)
+============================================
 
 Copyright (c) 2010 Ryan Sobol. Licensed under the MIT license.  Please see the {file:LICENSE} for more information.
 
 * **Source Code**: [http://github.com/ryansobol/mango](http://github.com/ryansobol/mango)
 * **Documentation**: [http://rubydoc.info/github/ryansobol/mango](http://rubydoc.info/github/ryansobol/mango)
-* **Bug Tracker**: [http://github.com/ryansobol/mango/issues](http://github.com/ryansobol/mango/issues)
+* **Issue Tracker**: [http://github.com/ryansobol/mango/issues](http://github.com/ryansobol/mango/issues)
 * **Wiki**: [http://wiki.github.com/ryansobol/mango](http://wiki.github.com/ryansobol/mango)
 
 **Mango respects [Semantic Versioning](http://semver.org/)!**
@@ -17,21 +17,32 @@ Copyright (c) 2010 Ryan Sobol. Licensed under the MIT license.  Please see the {
 WHAT'S NEW?
 -----------
 
-### New Features:
+### Features
 
-  * Added the beginnings of a default theme titled "Smashing Mangos".
-  * Added `Mango::Rack::Debugger` to the middleware stack (Only loads in the `:development` rack environment).
-  * Added a `Mango::ContentPage` model to convert user-generated content into HTML.  Supports either [Haml](http://haml-lang.com/) or [Markdown](http://daringfireball.net/projects/markdown/syntax) formatted content.
-  * Refactored `Mango::Application` to utilize `Mango::ContentPage`.  Now views have access to a `@content_page` instance variable.
-  * Added `Mango::FlavoredMarkdown`, a subset of [GithubFlavoredMarkdown](http://github.github.com/github-flavored-markdown/), into the Markdown-to-HTML conversion.
+  * Mango has been split into two pieces!
+    1. A web framework, distributed as a Ruby gem, that is completely abstracted away from application code.
+    2. A `mango` command-line tool that generates a [demo Mango application](http://mango-fireworks.heroku.com/).
+  * Mango now supports theme-switching!
+    * For example, add `class Mango::Application; set :theme, "theme_name"; end` to your application's config.ru.
+  * As a result of the new command-line application generator, all embedded application code has been removed.
+  * Now routes like `GET /images/` return a 200 response if the `themes/default/public/images/index.html` file is exists.
 
-### Dependencies:
+### Dependencies
 
-  * Updated [Haml](http://haml-lang.com/) to 3.0.18
-  * Updated [YARD::Sinatra](http://github.com/rkh/yard-sinatra) to 0.5.0
-  * Added [BlueCloth](http://deveiate.org/projects/BlueCloth) 2.0.7 as a required dependency
+  * Updated [Bundler](http://gembundler.com/) to 1.0.3
+  * Updated [Haml](http://haml-lang.com/) to 3.0.22
+  * Updated [Sass](http://sass-lang.com/) to 3.0.22 (bundled with Haml)
+  * Updated [BlueCloth](http://deveiate.org/projects/BlueCloth) to 2.0.9
+  * Updated [Rack::Test](http://github.com/brynary/rack-test) to 0.5.6
+  * Updated [RSpec](http://rspec.info/) to 2.0.1
+  * Updated [YARD](http://yardoc.org/) to 0.5.8
+  * Updated [YARD::Sinatra](http://github.com/rkh/yard-sinatra) to 0.5.1
 
-Please see {file:doc/HISTORY.mdown} for the historical overview of the project.
+### Bugs
+
+  * The NOT_FOUND handler no longer renders the 404 template within a layout template.
+
+Please see {file:CHANGES.mdown} for the historical overview of the project.
 
 SYNOPSIS
 --------
@@ -61,20 +72,21 @@ REQUIREMENTS
 **Required dependencies**
 
   * [Ruby](http://www.ruby-lang.org/) 1.9.1
+  * [Bundler](http://gembundler.com/) 1.0.3
   * [Rack](http://rack.rubyforge.org/) 1.2.1
   * [Sinatra](http://www.sinatrarb.com/) 1.0
-  * [Haml](http://haml-lang.com/) 3.0.18
-  * [Sass](http://sass-lang.com/) 3.0.18 (bundled with Haml)
-  * [BlueCloth](http://deveiate.org/projects/BlueCloth) 2.0.7
+  * [Haml](http://haml-lang.com/) 3.0.22
+  * [Sass](http://sass-lang.com/) 3.0.22 (bundled with Haml)
+  * [BlueCloth](http://deveiate.org/projects/BlueCloth) 2.0.9
 
 **Optional development dependencies**
 
   * [Rake](http://rake.rubyforge.org/) 0.8.7 (bundled with Ruby)
-  * [Rack::Test](http://github.com/brynary/rack-test) 0.5.4
-  * [RSpec](http://rspec.info/) 1.3.0
+  * [Rack::Test](http://github.com/brynary/rack-test) 0.5.6
+  * [RSpec](http://rspec.info/) 2.0.1
   * [YARD](http://yardoc.org/) 0.5.8
-  * [YARD::Sinatra](http://github.com/rkh/yard-sinatra) 0.5.0
-  * [BlueCloth](http://deveiate.org/projects/BlueCloth) 2.0.7
+  * [YARD::Sinatra](http://github.com/rkh/yard-sinatra) 0.5.1
+  * [BlueCloth](http://deveiate.org/projects/BlueCloth) 2.0.9
 
 INSTALLING
 ----------

data/Rakefile

@@ -5,9 +5,9 @@ Mango::Dependencies.warn_at_exit
 ###################################################################################################
 
 begin
-  require "spec/rake/spectask"
+  require "rspec/core/rake_task"
   require "rack/test" # for Rack support
-  Spec::Rake::SpecTask.new(:spec)
+  RSpec::Core::RakeTask.new(:spec)
   task :default => :spec
 rescue LoadError => e
   Mango::Dependencies.create_warning_for(e)

data/VERSION

@@ -1 +1 @@
-0.5.0.beta1
+0.5.0.beta2

data/lib/mango/application.rb

@@ -114,6 +114,10 @@ module Mango
     set :styles, lambda { File.join(root, "themes", theme, "styles") }
     set :content, lambda { File.join(root, "content") }
 
+    configure :development do
+      use Mango::Rack::Debugger
+    end
+
     # Renders the `404.haml` template found within `settings.views` and sends it with 404 HTTP
     # response.
     #

data/lib/mango/dependencies.rb

@@ -41,11 +41,11 @@ module Mango
 
     # bluecloth is a hidden yard dependency for markdown support
     DEVELOPMENT_GEMS = {
-      :"rack-test"    => "0.5.4",
-      :rspec          => "1.3.0",
+      :"rack-test"    => "0.5.6",
+      :rspec          => "2.0.1",
       :yard           => "0.5.8",
-      :"yard-sinatra" => "0.5.0",
-      :bluecloth      => "2.0.7"
+      :"yard-sinatra" => "0.5.1",
+      :bluecloth      => "2.0.9"
     }
 
     FILE_NAME_TO_GEM_NAME = {
@@ -87,9 +87,9 @@ module Mango
     # @example Sample warning message
     #   The following development gem dependencies could not be found. Without them, some available development features are missing:
     #   jeweler --version "1.4.0"
-    #   rspec --version "1.3.0"
+    #   rspec --version "2.0.1"
     #   yard --version "0.5.3"
-    #   bluecloth --version "2.0.7"
+    #   bluecloth --version "2.0.9"
     def self.render_warnings
       unless @@warnings_cache.empty?
         message = []

data/lib/mango/runner.rb

@@ -13,6 +13,7 @@ module Mango
       "Creates a new Mango application with a default directory structure and configuration at the path you specify."
     def create(destination)
       self.destination_root = destination
+      copy_file(".gitignore", File.join(self.destination_root, ".gitignore"))
       copy_file("config.ru", File.join(self.destination_root, "config.ru"))
       copy_file("Gemfile", File.join(self.destination_root, "Gemfile"))
       copy_file("README.md", File.join(self.destination_root, "README.md"))

data/lib/mango/templates/.gitignore

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

data/lib/mango/templates/Gemfile

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 source "http://rubygems.org"
 
-gem "mango", "0.5.0.beta1"
+gem "mango", "0.5.0.beta2"

data/lib/mango/templates/config.ru

@@ -1,4 +1,3 @@
 # encoding: UTF-8
 require "mango"
-use Mango::Rack::Debugger if ENV["RACK_ENV"].to_sym == :development
 run Mango::Application

data/lib/mango/version.rb

@@ -2,5 +2,5 @@
 
 module Mango
   # Current stable released version
-  VERSION = "0.5.0.beta1"
+  VERSION = "0.5.0.beta2"
 end

data/mango.gemspec

@@ -14,18 +14,18 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.7"
   s.rubyforge_project         = "mango"
 
-  s.add_runtime_dependency "bundler",   "~> 1.0.0"
+  s.add_runtime_dependency "bundler",   "~> 1.0.3"
   s.add_runtime_dependency "rack",      "~> 1.2.1"
   s.add_runtime_dependency "sinatra",   "~> 1.0"
-  s.add_runtime_dependency "haml",      "~> 3.0.18"
-  s.add_runtime_dependency "bluecloth", "~> 2.0.7"
-  s.add_runtime_dependency "thor",      "~> 0.14.0"
+  s.add_runtime_dependency "haml",      "~> 3.0.22"
+  s.add_runtime_dependency "bluecloth", "~> 2.0.9"
+  s.add_runtime_dependency "thor",      "~> 0.14.3"
 
-  s.add_development_dependency "rspec",         "~> 1.3.0"
-  s.add_development_dependency "rack-test",     "~> 0.5.4"
+  s.add_development_dependency "rspec",         "~> 2.0.1"
+  s.add_development_dependency "rack-test",     "~> 0.5.6"
   s.add_development_dependency "yard",          "~> 0.5.8"
-  s.add_development_dependency "bluecloth",     "~> 2.0.7"
-  s.add_development_dependency "yard-sinatra",  "~> 0.5.0"
+  s.add_development_dependency "bluecloth",     "~> 2.0.9"
+  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/mango/application/routing_content_pages_spec.rb

@@ -16,15 +16,15 @@ describe Mango::Application do
       get ""
     end
 
-    it "should return 200 status code" do
+    it "returns 200 status code" do
       last_response.should be_ok
     end
 
-    it "should send the correct Content-Type header" do
+    it "sends the correct Content-Type header" do
       last_response["Content-Type"] == "text/html"
     end
 
-    it "should send the correct body content" do
+    it "sends the correct body content" do
       last_response.body.should == <<-EXPECTED
 <!DOCTYPE html>
 <html>
@@ -50,15 +50,15 @@ describe Mango::Application do
       get "/"
     end
 
-    it "should return 200 status code" do
+    it "returns 200 status code" do
       last_response.should be_ok
     end
 
-    it "should send the correct Content-Type header" do
+    it "sends the correct Content-Type header" do
       last_response["Content-Type"] == "text/html"
     end
 
-    it "should send the correct body content" do
+    it "sends the correct body content" do
       last_response.body.should == <<-EXPECTED
 <!DOCTYPE html>
 <html>
@@ -84,15 +84,15 @@ describe Mango::Application do
       get "/index"
     end
 
-    it "should return 200 status code" do
+    it "returns 200 status code" do
       last_response.should be_ok
     end
 
-    it "should send the correct Content-Type header" do
+    it "sends the correct Content-Type header" do
       last_response["Content-Type"] == "text/html"
     end
 
-    it "should send the correct body content" do
+    it "sends the correct body content" do
       last_response.body.should == <<-EXPECTED
 <!DOCTYPE html>
 <html>
@@ -118,15 +118,15 @@ describe Mango::Application do
       get "/index?foo=bar"
     end
 
-    it "should return 200 status code" do
+    it "returns 200 status code" do
       last_response.should be_ok
     end
 
-    it "should send the correct Content-Type header" do
+    it "sends the correct Content-Type header" do
       last_response["Content-Type"] == "text/html"
     end
 
-    it "should send the correct body content" do
+    it "sends the correct body content" do
       last_response.body.should == <<-EXPECTED
 <!DOCTYPE html>
 <html>
@@ -152,15 +152,15 @@ describe Mango::Application do
       get "/about/"
     end
 
-    it "should return 200 status code" do
+    it "returns 200 status code" do
       last_response.should be_ok
     end
 
-    it "should send the correct Content-Type header" do
+    it "sends the correct Content-Type header" do
       last_response["Content-Type"] == "text/html"
     end
 
-    it "should send the correct body content" do
+    it "sends the correct body content" do
       last_response.body.should == <<-EXPECTED
 <!DOCTYPE html>
 <html>
@@ -186,15 +186,15 @@ describe Mango::Application do
       get "/about/index"
     end
 
-    it "should return 200 status code" do
+    it "returns 200 status code" do
       last_response.should be_ok
     end
 
-    it "should send the correct Content-Type header" do
+    it "sends the correct Content-Type header" do
       last_response["Content-Type"] == "text/html"
     end
 
-    it "should send the correct body content" do
+    it "sends the correct body content" do
       last_response.body.should == <<-EXPECTED
 <!DOCTYPE html>
 <html>
@@ -220,15 +220,15 @@ describe Mango::Application do
       get "/about/us"
     end
 
-    it "should return 200 status code" do
+    it "returns 200 status code" do
       last_response.should be_ok
     end
 
-    it "should send the correct Content-Type header" do
+    it "sends the correct Content-Type header" do
       last_response["Content-Type"] == "text/html"
     end
 
-    it "should send the correct body content" do
+    it "sends the correct body content" do
       last_response.body.should == <<-EXPECTED
 <!DOCTYPE html>
 <html>
@@ -254,15 +254,15 @@ describe Mango::Application do
       get "/turner%2Bhooch"
     end
 
-    it "should return 200 status code" do
+    it "returns 200 status code" do
       last_response.should be_ok
     end
 
-    it "should send the correct Content-Type header" do
+    it "sends the correct Content-Type header" do
       last_response["Content-Type"] == "text/html"
     end
 
-    it "should send the correct body content" do
+    it "sends the correct body content" do
       last_response.body.should == <<-EXPECTED
 <!DOCTYPE html>
 <html>
@@ -288,15 +288,15 @@ describe Mango::Application do
       get "/page_not_found"
     end
 
-    it "should return 404 status code" do
+    it "returns 404 status code" do
       last_response.should be_not_found
     end
 
-    it "should send the correct Content-Type header" do
+    it "sends the correct Content-Type header" do
       last_response["Content-Type"] == "text/html"
     end
 
-    it "should send the correct body content" do
+    it "sends the correct body content" do
       last_response.body.should == <<-EXPECTED
 <!DOCTYPE html>
 <html>
@@ -315,7 +315,7 @@ describe Mango::Application do
   #################################################################################################
 
   describe "GET /page_with_missing_view" do
-    it "should raise RuntimeError" do
+    it "raises RuntimeError" do
       path = File.join(SPEC_APP_ROOT, "themes", "default", "views", "missing_view_template.haml")
       lambda {
         get "/page_with_missing_view"
@@ -330,15 +330,15 @@ describe Mango::Application do
       get "/../security_hole"
     end
 
-    it "should return 404 status code" do
+    it "returns 404 status code" do
       last_response.should be_not_found
     end
 
-    it "should send the correct Content-Type header" do
+    it "sends the correct Content-Type header" do
       last_response["Content-Type"] == "text/html"
     end
 
-    it "should send the correct body content" do
+    it "sends the correct body content" do
       last_response.body.should == <<-EXPECTED
 <!DOCTYPE html>
 <html>