serve 1.5.0.pre4 → 1.5.0.pre5

data/Gemfile

@@ -1,16 +1,17 @@
-source "http://rubygems.org"
+source :rubygems
 
-gem 'rake',             '~> 0.9.0'
-gem 'rack',             '~> 1.2.1'
-gem 'rack-test',        '~> 0.5.7'
-gem 'tilt',             '~> 1.3.1'
-gem 'activesupport',    '~> 3.0.7'
-gem 'tzinfo',           '~> 0.3.23'
-gem 'i18n',             '~> 0.5.0'
+gem 'rack',              '~> 1.2'
+gem 'rack-test',         '~> 0.5'
+gem 'tilt',              '~> 1.3'
+gem 'activesupport',     '~> 3.0'
+gem 'tzinfo'
+gem 'i18n'
 
 group :development do
+  gem 'rake',           '~> 0.9.0'
+  gem 'rdoc',           '~> 3.8.0'
   gem 'rspec',          '~> 2.6.0'
-  gem 'jeweler',        '~> 1.4.0'
+  gem 'jeweler',        '~> 1.6.4'
   gem 'haml',           '~> 3.1.1'
   gem 'sass',           '~> 3.1.1'
   gem 'compass',        '~> 0.11.1'
@@ -20,4 +21,11 @@ group :development do
   gem 'erubis',         '~> 2.7.0'
   gem 'less',           '~> 1.2.21'
   gem 'radius',         '~> 0.6.1'
+  gem 'coffee-script',  '~> 2.2.0'
+end
+
+group :website do
+  gem 'serve',          '~> 1.5.0.pre4'
+  gem 'css_parser',     '~> 1.1.9'
+  gem 'maruku',         '~> 0.6.0'
 end

data/Gemfile.lock

@@ -2,74 +2,94 @@ GEM
   remote: http://rubygems.org/
   specs:
     RedCloth (4.2.7)
-    activesupport (3.0.7)
+    activesupport (3.0.9)
     chunky_png (1.2.0)
-    compass (0.11.1)
-      chunky_png (~> 1.1)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.1.1)
+    compass (0.11.4)
+      chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
+    css_parser (1.1.9)
     diff-lcs (1.1.2)
     erubis (2.7.0)
+    execjs (1.2.0)
+      multi_json (~> 1.0)
     fssm (0.2.7)
-    gemcutter (0.6.1)
     git (1.2.5)
-    haml (3.1.1)
+    haml (3.1.2)
     i18n (0.5.0)
-    jeweler (1.4.0)
-      gemcutter (>= 0.1.0)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
-      rubyforge (>= 2.0.0)
-    json_pure (1.4.6)
+      rake
     less (1.2.21)
       mutter (>= 0.4.2)
       treetop (>= 1.4.2)
+    maruku (0.6.0)
+      syntax (>= 1.0.0)
+    multi_json (1.0.3)
     mutter (0.5.3)
     polyglot (0.3.1)
     rack (1.2.3)
     rack-test (0.5.7)
       rack (>= 1.0)
     radius (0.6.1)
-    rake (0.9.0)
+    rake (0.9.2)
     rdiscount (1.6.8)
+    rdoc (3.8)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
       rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.3)
+    rspec-core (2.6.4)
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    rubyforge (2.0.4)
-      json_pure (>= 1.1.7)
-    sass (3.1.1)
+    sass (3.1.4)
+    serve (1.5.0.pre4)
+      activesupport (~> 3.0.7)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.1)
+      rack-test (~> 0.5.7)
+      tilt (~> 1.3.1)
+      tzinfo (~> 0.3.23)
     slim (0.9.4)
       temple (~> 0.3.0)
       tilt (~> 1.2)
-    temple (0.3.0)
-    tilt (1.3.1)
+    syntax (1.0.0)
+    temple (0.3.2)
+    tilt (1.3.2)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.27)
+    tzinfo (0.3.29)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   RedCloth (~> 4.2.7)
-  activesupport (~> 3.0.7)
+  activesupport (~> 3.0)
+  coffee-script (~> 2.2.0)
   compass (~> 0.11.1)
+  css_parser (~> 1.1.9)
   erubis (~> 2.7.0)
   haml (~> 3.1.1)
-  i18n (~> 0.5.0)
-  jeweler (~> 1.4.0)
+  i18n
+  jeweler (~> 1.6.4)
   less (~> 1.2.21)
-  rack (~> 1.2.1)
-  rack-test (~> 0.5.7)
+  maruku (~> 0.6.0)
+  rack (~> 1.2)
+  rack-test (~> 0.5)
   radius (~> 0.6.1)
   rake (~> 0.9.0)
   rdiscount (~> 1.6.8)
+  rdoc (~> 3.8.0)
   rspec (~> 2.6.0)
   sass (~> 3.1.1)
+  serve (~> 1.5.0.pre4)
   slim (~> 0.9.4)
-  tilt (~> 1.3.1)
-  tzinfo (~> 0.3.23)
+  tilt (~> 1.3)
+  tzinfo

data/LICENSE

@@ -1,5 +1,6 @@
 Copyright (c) 2007-2011 John W. Long and Adam I. Williams
-Portions contributed by Robert Evans and others
+Portions contributed by Robert Evans and others. Some view helpers
+have been extracted from Rails.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -1,4 +1,4 @@
-= Serve - Easy ERB, Haml, and Sass
+= Serve - Delicious ERB, Haml, and Sass
 
 link:../../downloads/jlong/serve/logo-hifi-3.png
 
@@ -10,15 +10,7 @@ This makes Serve an ideal framework for prototyping Rails applications or
 creating simple websites. Serve has full support for Rails-style partials
 and layouts.
 
-If you use a "Design First" approach to Web application development, you may
-find Serve especially useful. Create a separate "prototype" project for your
-application (using Serve) and copy views over into actual application when
-they are ready to go. This workflow can allow the designer to focus on
-presentation and flow, while the developer can focus on implementation. One
-benefit to this approach is that the designer can identify and fix a large
-number of problems before a feature is ever touched by the developer. Once a
-feature has been completed in the prototype project it can also be estimated
-with a high degree of accuracy.
+Serve is made with Rack & Tilt.
 
 
 == Installation
@@ -36,11 +28,11 @@ If you are new to the command prompt and are a Mac user see:
 
 http://wiseheartdesign.com/articles/2010/11/12/the-designers-guide-to-the-osx-command-prompt/
 
-Google "command prompt windows" if you are on a PC to find a simple
+Search Google for "command prompt windows" if you are on a PC to find a simple
 tutorial.
 
 
-== Usage
+== Basic Usage
 
 Once the gem is installed the `serve` command will be available from the
 command prompt. To launch Serve, just type the command and press enter:
@@ -53,241 +45,85 @@ at the following address:
   http://localhost:4000
 
 Once the server is going it will output a running log of its activity. To
-stop the server at any time, type CTRL+C at the command prompt. By default the
-serve command serves up files from the current directory. To change this
-behavior, `cd` to the appropriate directory before starting serve or pass the
-directory as the final parameter to the command:
+stop the server at any time, type CTRL+C at the command prompt.
 
-  serve project_directory
+Learn more: http://get-serve.com/documentation/usage
 
-The `serve` command automatically binds to 0.0.0.0 (localhost) and uses port
-4000 by default. To serve files over a different IP (that is bound to your
-computer) or port specify those options on the command line:
 
-  serve 4000               # a custom port
-  
-  serve 192.168.1.6        # a custom IP
-  
-  serve 192.168.1.6:4000   # a custom IP and port
+== Creating a Structured Serve Project
 
-For your convenience if the file "script/server" exists in the current
-directory the serve command will start that instead of launching a Ruby Web
-server. You can specify the environment that you want to start the server with
-as an option on the command line:
+For simple projects, you don't need to structure your files in a specific
+way. All ERB, Haml, and Sass files will be processed wherever they are found
+in the project root. But for more complex projects you may want add a bit of structure.
 
-  serve production         # start script/server in production mode
+To create a structured Serve project in the "project" directory, type the
+following on the command line:
 
+  serve create project   # create a new project in the project directory
 
-== Creating a New Serve Project
+Lear more: http://get-serve.com/documentation/create
 
-For simple projects, you don't need to structure your files in a specific
-way. All ERB, Haml, and Sass files will be processed wherever they are found
-in the project root. But for more complex projects you may want to use Serve
-with a `config.ru` file so that you can take advantage of other Rack
-middleware and structure the project in a Rack compatible way.
 
-To create a new Rack-based Serve project in the "mockups" directory, type the
-following on the command line:
+== Layouts & Partials
 
-  serve create mockups   # create a new project in the mockups directory
-
-This will create a new project with the following directory structure:
-
-  mockups/
-    |
-    +-- config.ru              # Rack configuration file
-    |
-    +-- compass.config         # Compass configuration file
-    |
-    +-- public/                # Directories for static assets
-    |    |
-    |    +-- stylesheets/      # Compiled stylesheets
-    |    |
-    |    +-- images/
-    |    |
-    |    `-- javascripts/
-    |
-    +-- stylesheets/           # Sass and SCSS source files
-    |    |
-    |    `-- application.scss  # Example SCSS file for application
-    |
-    +-- tmp/                   # Needed for Passenger (mod_passenger)
-    |    |
-    |    `-- restart.txt
-    |
-    `-- views/                 # Store your ERB, Haml, etc. here
-         |
-         +-- _layout.html.erb  # Example layout
-         |
-         +-- hello.html.erb    # Example view
-         |
-         +-- index.redirect    # Example redirect
-         |
-         `-- view_helpers.rb   # Example view helpers
-
-If you would like to generate the project with a specific JavaScript framework
-you can do so with the <tt>-j</tt> flag:
-
-  serve create mockups -j prototype
-
-Available frameworks are: <tt>jquery</tt>, <tt>jquery-ui</tt>,
-<tt>mootools</tt>, <tt>prototype</tt>, and <tt>scriptaculous</tt>.
-
-The `serve create` command can be executed multiple times or on an existing
-project without negative consequences.
-
-
-== Upgrading a Compass Project to a Serve Project
-
-If you are a Compass user you can convert an existing Compass project to a
-Serve project with the "convert" sub-command:
-
-  serve convert mockups
-
-This will rename and move a number of files for you and will turn your Compass
-project into a Serve project.
-
-Note that after upgrading a Compass project, you will no longer need to use
-the `compass watch` command to generate your stylesheets. Your stylesheets
-will be compiled on the fly with Serve.
-
-
-== Layouts
-
-In Serve layouts work a little differently than they do in Rails. Because there are no
-controllers to derive layout names from, Serve relies on the directory structure to
-determine the layout associated with a specific view. Serve layouts are stored in
-"_layout.erb" or "_layout.haml" files. Serve searches for a layout file in the same
-directory as the view. If it fails to find one there, it traverses up the directory
-tree searching each parent directory until it finds the "nearest" layout.
-
-For example, assuming following directory structure:
-
-        views/
-          |
-  A)      +-- _layout.erb
-          |
-          +-- index.erb
-          |
-          `-- about/
-                |
-  B)            +-- _layout.erb
-                |
-                `-- index.erb
-
-For "views/about/index.erb" Serve will use layout B. If layout B did not exist,
-Serve would go up the directory tree and discover layout A which it would use to
-render the view.
-
-For "views/index.erb" Serve would immediately discover and use layout A because it
-is in the same directory.
-
-So Serve searches up the directory tree for the nearest layout file, and uses that
-file to render the view. This is convenient because it allows you to structure your
-Serve project in a way that allows entire "branches" of to share the same layout
-and "branches" lower down can override the layout used.
-
-
-== Partials
-
-Partials in Serve work much like they do in Rails. Prefix your partials with an
-underscore ("_") and use the <tt>render</tt> helper method in your views to render
-the partial:
+Serve has full support for Rails-style layouts and partials.
 
-  <%= render "footer" %>
+Serve layouts are stored in "_layout.erb" or "_layout.haml" files in the same directory as the page they are rendering.
+
+Learn more: http://get-serve.com/documentation/layouts
 
-Or,
+Serve partials (much like PHP includes) are rendered using the familiar render syntax:
 
-  <%= render "/shared/footer" %>
+  <%= render "footer" %>
+
+Learn more: http://get-serve.com/documentation/partials
 
 
 == View Helpers
 
 If you drop a file called "view_helpers.rb" in your views directory, you can
 define custom helpers for your Haml and ERB views. Just create a ViewHelpers
-module and define your helper methods there:
+module and define your custom helper methods there:
 
   module ViewHelpers
-    def custom_method
-      "Request object: #{request.headers['user-agent']}"
+    
+    # Calculate the years for a copyright
+    def copyright_years(start_year)
+      end_year = Date.today.year
+      if start_year == end_year
+        start_year
+      else
+        start_year.to_s + "&#8211;" + end_year.to_s
+      end
     end
+    
   end
 
-Helpers have full access to the request and response objects so you can easily
-read and manipulate headers or do other fancy tricks.
-
-Serve provides a number of stock helpers to make it easier for you to 
-prototype Rails applications:
+You can then use your custom helper methods inside a view or layout:
 
-  # Escape Helpers
-  html_escape(string)              # escape HTML in string
-  h(string)                        # alias for html_escape
-  json_escape(string)              # escape invalid JSON characters in string
-  j(string)                        # alias for json_escape
-  
-  # Content Helpers
-  capture(&block)                  # Capture a block inside of a view or layout
-  content_for(symbol, &block)      # Capture a block and store it by symbol
-  content_for?(symbol)             # Has content been captured for symbol?
-  get_content_for(symbol)          # Retrieve content for symbol (equivalent to `yield symbol`)
-  set_content_for(symbol, string)  # Set content for symbol to string
-  
-  # Flash Helpers
-  flash                            # fake flash for request
-  
-  # Param Helpers
-  params                           # access params for request
-  boolean_param(key)               # retrieve value of a boolean param (true/false)
-  
-  # Render Helpers
-  render(partial)                  # Render a partial
-  
-  # Tag Helpers
-  content_tag(name, content, ...)  # a double HTML tag
-  tag(name, ...)                   # a single HTML tag
-  image_tag(src, ...)              # an HTML image tag
-  image(name, ...)                 # shorthand for standard image tag
-  javascript_tag(...)              # a javascript tag
-  link_to(name, href, ...)         # a link to name at href
-  link_to_function(name, ...)      # a link to a function
-  mail_to(email_address, ...)      # a mailto link
+  <%= copyright_years(2010) %>
 
-For more information, see:
+Serve also provides a number of stock helpers methods that are very similar to their Rails counter parts.
 
-https://github.com/jlong/serve/blob/master/lib/serve/view_helpers.rb
+Learn more: http://get-serve.com/documentation/view-helpers
 
 
-== File Types
+== "Design First" Prototyping
 
-Serve does special processing for files with following extensions:
-
-textile :: Evaluates the document as Textile (requires the Redcloth gem) 
-markdown :: Evaluates the document as Markdown (requires the Bluecloth gem)
-erb :: Evaluates the document as ERB
-haml :: Evaluates the document as Haml (requires the Haml gem)
-slim :: Evaluates the document using the Slim template language (requires the Slim gem)
-sass :: Evaluates the document as Sass (requires the Haml gem)
-scss :: Evaluates the document as SCSS (requires the Haml gem)
-email :: Evaluates the document as if it is an e-mail message; the format is identical to a plain/text e-mail message's source
-redirect :: Redirects to the URL contained on the last line of the file
-
-
-== Exporting a Serve Project
-
-The edge version of Serve now has limited support for exporting your Serve 
-project to HTML. To get started with the prerelease version:
-
-  gem install --pre serve
-
-To export your project, use the new "export" command:
+If you use a "Design First" methodology, you may find Serve especially useful
+for prototyping your applications. Create a separate "prototype" project for
+your application (using Serve) and copy views over into actual application
+when they are ready to go. This workflow allows the designer to focus on
+presentation and flow, while the developer can focuses on implementation. One
+benefit to this approach is that the designer can identify and fix a large
+number of design-related problems before a feature is ever touched by the
+developer. Once a feature has been completed in the prototype project it can
+also be estimated with a high degree of accuracy.
 
-  serve export project output
 
-Where "project" is the path to the project and "output" is the path to the
-directory where you would like your HTML and CSS generated.
+== Website & Documentation
 
-Please note! This feature is in beta. If you have issues with this approach,
-please post them to the GitHub issue tracker.
+Detailed documentation is available on the Serve website: http://get-serve.com
 
 
 == Mailing List
@@ -297,16 +133,8 @@ Have questions? Please don't be ashamed to ask. Post them on the mailing list:
 http://groups.google.com/group/serve-users
 
 
-== More Information
-
-You can find more information about Serve, including a detailed screencast, on
-the GitHub wiki:
-
-http://wiki.github.com/jlong/serve
-
-
 == License
 
-Serve is released under the MIT license and is copyright (c) 2007-2011
+Serve is released under a MIT-style license and is copyright (c) 2007-2011
 John W. Long and Adam I. Williams. Portions have been contributed by Robert
-Evans and others. A copy of the MIT license can be found in the LICENSE file.
+Evans and others. A copy of the license can be found in the LICENSE file.

data/Rakefile

@@ -1,4 +1,12 @@
 require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
 require 'rake'
 
 load 'tasks/jeweler.rake'

data/VERSION

@@ -1 +1 @@
-1.5.0.pre4
+1.5.0.pre5

data/lib/serve/application.rb

@@ -82,12 +82,12 @@ module Serve
         "  #{program} command [arguments] [options]",
         "  ",
         "Examples:",
-        "  #{program}                       # launch server in current directory",
-        "  #{program} 2100                  # launch server on port 2100",
-        "  #{program} mockups               # launch server for mockups directory",
-        "  #{program} create mockups        # create a new project in mockups dir",
-        "  #{program} convert mockups       # convert a Compass project in mockups",
-        "  #{program} export mockups:output # export mockups to output dir",
+        "  #{program}                        # launch server in current directory",
+        "  #{program} 2100                   # launch server on port 2100",
+        "  #{program} mockups                # launch server for mockups directory",
+        "  #{program} create project         # new structured project in project dir",
+        "  #{program} convert project        # convert a Compass project in directory",
+        "  #{program} export project output  # export project to output directory",
         "  ",
         "Description:",
         "  Starts a web server on the specified address and port with its document root ",
@@ -124,6 +124,9 @@ module Serve
         "  convert",
         "    Converts an existing Compass project into a Rack-based Serve project.",
         "   ",
+        "  export",
+        "    Exports a Serve project to regular HTML and CSS.",
+        "   ",
         "Options:",
         "  -j, --javascript  The name of the JavaScript Framework you'd like to use.",
         "                    (Only valid for create and convert commands.)",
@@ -131,7 +134,7 @@ module Serve
         "  -v, --version     Show the program version number and quit.",
         "  ",
         "Further information:",
-        "  http://github.com/jlong/serve/blob/master/README.rdoc"
+        "  http://get-serve.com/documentation"
       ].join("\n")
     end
     

data/lib/serve/project.rb

@@ -72,6 +72,7 @@ module Serve #:nodoc:
           tmp
           views
         ).each { |path| make_path path }
+        create_file 'Gemfile',         read_template('Gemfile')
         create_file 'config.ru',       read_template('config.ru')
         create_file '.gitignore',      read_template('gitignore')
         create_file 'compass.config',  read_template('compass.config')

data/lib/serve/templates/Gemfile

@@ -0,0 +1,26 @@
+source :rubygems
+
+gem 'serve', '#{Serve.version}'
+
+# Use edge instead:
+# gem 'serve', :get => 'git://github.com/jlong/serve.git'
+
+# Use Compass and Sass
+gem 'compass'
+
+# Markdown and Textile
+# gem 'rdiscount'
+# gem 'RedCloth'
+
+# Other templating languages
+# gem 'erubis'
+# gem 'haml'
+# gem 'slim'
+# gem 'radius'
+# gem 'less'
+
+# Coffee Script
+# gem 'coffee-script'
+
+# Use mongrel for the Web server
+# gem 'mongrel'

data/lib/serve/templates/config.ru

@@ -1,6 +1,14 @@
 #\\ -p 4000
 
-gem 'serve'
+require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
 
 require 'serve'
 require 'serve/rack'

metadata

@@ -1,14 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: serve
 version: !ruby/object:Gem::Version 
-  hash: -1876988217
-  prerelease: true
-  segments: 
-  - 1
-  - 5
-  - 0
-  - pre4
-  version: 1.5.0.pre4
+  prerelease: 6
+  version: 1.5.0.pre5
 platform: ruby
 authors: 
 - John W. Long
@@ -18,121 +12,229 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-05 00:00:00 -04:00
+date: 2011-07-11 00:00:00 -04:00
 default_executable: serve
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 2
-        - 1
-        version: 1.2.1
+        version: "1.2"
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rack-test
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 5
-        - 7
-        version: 0.5.7
+        version: "0.5"
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: tilt
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 3
-        - 1
-        version: 1.3.1
+        version: "1.3"
   type: :runtime
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 3
-        - 0
-        - 7
-        version: 3.0.7
+        version: "3.0"
   type: :runtime
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: tzinfo
-  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 61
-        segments: 
-        - 0
-        - 3
-        - 23
-        version: 0.3.23
+        version: "0"
   type: :runtime
+  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: i18n
-  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 5
-        - 0
-        version: 0.5.0
+        version: "0"
   type: :runtime
+  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
+  name: rake
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
-        version: 2.6.0
+        version: 0.9.0
   type: :development
+  prerelease: false
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 3.8.0
+  type: :development
+  prerelease: false
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.6.0
+  type: :development
+  prerelease: false
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.6.4
+  type: :development
+  prerelease: false
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: haml
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 3.1.1
+  type: :development
+  prerelease: false
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: sass
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 3.1.1
+  type: :development
+  prerelease: false
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: compass
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.11.1
+  type: :development
+  prerelease: false
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  name: slim
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.9.4
+  type: :development
+  prerelease: false
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  name: rdiscount
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.6.8
+  type: :development
+  prerelease: false
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
+  name: RedCloth
+  requirement: &id016 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 4.2.7
+  type: :development
+  prerelease: false
+  version_requirements: *id016
+- !ruby/object:Gem::Dependency 
+  name: erubis
+  requirement: &id017 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.7.0
+  type: :development
+  prerelease: false
+  version_requirements: *id017
+- !ruby/object:Gem::Dependency 
+  name: less
+  requirement: &id018 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.2.21
+  type: :development
+  prerelease: false
+  version_requirements: *id018
+- !ruby/object:Gem::Dependency 
+  name: radius
+  requirement: &id019 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.6.1
+  type: :development
+  prerelease: false
+  version_requirements: *id019
+- !ruby/object:Gem::Dependency 
+  name: coffee-script
+  requirement: &id020 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.2.0
+  type: :development
+  prerelease: false
+  version_requirements: *id020
 description: Serve is a small Rack-based web server that makes it easy to serve ERB or HAML from any directory. Serve is an ideal tool for building HTML prototypes of Rails applications. Serve can also handle SASS, Textile, and Markdown if the appropriate gems are installed.
 email: me@johnwlong.com
 executables: 
@@ -147,7 +249,6 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE
-- QUICKSTART.rdoc
 - README.rdoc
 - Rakefile
 - VERSION
@@ -167,6 +268,7 @@ files:
 - lib/serve/project.rb
 - lib/serve/rack.rb
 - lib/serve/router.rb
+- lib/serve/templates/Gemfile
 - lib/serve/templates/README.markdown
 - lib/serve/templates/_layout.html.erb
 - lib/serve/templates/application.scss
@@ -197,8 +299,8 @@ post_install_message: |-
   
   Serve doesn't install these dependencies by default, so that you can
   make your own decisions about what you want to use.
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -206,7 +308,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 1813519296002584178
       segments: 
       - 0
       version: "0"
@@ -215,21 +317,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
       version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Serve is a small web server that makes it easy to serve ERB or HAML from any directory.
-test_files: 
-- spec/application_spec.rb
-- spec/project_spec.rb
-- spec/router_spec.rb
-- spec/spec_helper.rb
+test_files: []
+

data/QUICKSTART.rdoc

@@ -1,241 +0,0 @@
-= Serve Quickstart - Prototyping Rails Applications
-
-
-<b>This is tutorial is incomplete. Help us finish it!</b>
-
-Serve is a rapid prototyping framework for Rails applications. It is designed to compliment Rails development and enforce a strict separation of concerns between designer and developer. Using Serve with Rails allows the designer to happily work in his own space creating an HTML prototype of the application, while the developer works on the Rails application and copies over HTML from the prototype as needed. This allows the designer to focus on presentation and flow while the developer can focus on the implementation.
-
-Let's have a look at how it all works.
-
-
-== Installation
-
-To get started we need to download and install the Ruby gem for Serve:
-
- $ sudo gem install serve
-
-After we've done that it's probably a good idea to install a couple of additional gems so that Serve will play nicely with HAML, Markdown, and Textile:
-
- $ sudo gem install haml BlueCloth RedCloth
-
-
-== Project Directory Structure
-
-Once we have everything installed the next thing to do is setup the project directory. I like to setup my projects with the following directory structure:
-
-artwork      :: Logos and other identity design files go here
-mockups      :: Fireworks or Photoshop web app mockups go here
-prototype    :: The HTML prototype for the web app goes here
-application  :: The actual Rails application is here
-
-Let's go ahead and setup the directory for the prototype. We'll use the `serve create` command to create the initial project directory and files:
-
- $ serve create prototype
-
-This should output:
-
- create  prototype
- create  prototype/public
- create  prototype/tmp
- create  prototype/views
- create  prototype/config.ru
- create  prototype/LICENSE
- create  prototype/.gitignore
- create  prototype/compass.config
- create  prototype/README.markdown
- create  prototype/public/images
- create  prototype/public/javascripts
- create  prototype/public/stylesheets
- create  prototype/sass
- create  prototype/sass/application.sass
- create  prototype/views/_layout.html.erb
- create  prototype/views/hello.html.erb
- create  prototype/views/view_helpers.rb
- create  prototype/views/index.redirect
-
-You'll note that the `serve create` command creates a directory structure that is somewhat similar to a Rails project:
-
-  prototype/
-    |
-    +-- config.ru              # Rack configuration file
-    |
-    +-- compass.config         # Compass configuration file
-    |
-    +-- public/                # Directories for static assets
-    |    |
-    |    +-- stylesheets/      # Compiled stylesheets
-    |    |
-    |    +-- images/
-    |    |
-    |    `-- javascripts/
-    |
-    +-- sass/                  # Store Sass source files here
-    |    |
-    |    `-- application.sass  # Example Sass file for application
-    |
-    +-- tmp/                   # Needed for Passenger (mod_passenger)
-    |    |
-    |    `-- restart.txt
-    |
-    `-- views/                 # Store your ERB, Haml, etc. here
-         |
-         +-- _layout.html.erb  # Example layout
-         |
-         +-- hello.html.erb    # Example view
-         |
-         `-- view_helpers.rb   # Example view helpers
-
-Views and layouts for your prototype application belong in the "views" directory. The "public" directory is for static assets -- resources like images or javascripts that don't need server side processing. The "sass" directory is the place where you should store Sass source files (if you use those). Serve will automatically compile Sass and SCSS files stored here into <tt>public/stylesheets</tt> directory.
-
-
-== Creating Our First Screen
-
-Now that we have the prototype directory set up, let's create our first page so that you can get a feel for how Serve works. This will be a simple HTML login page for our application.
-
-In the "views" directory, create a file named "login.html.erb" and insert the following source code:
-
- <form action="/dashboard/" method="put">
-   <p>
-     <label for="username">Username</label>
-     <input type="text" name="username" id="username" />
-   </p>
-   <p>
-     <label for="password">Password</label>
-     <input type="password" name="password" id="password" />
-   </p>
-   <p>
-     <input type="submit" value="Login" />
-   </p>
- </form>
-
-
-== Starting Serve
-
-To view our login page in a Web browser, we need to start up Serve in the directory where we are building the prototype:
-
- % cd prototype
- % serve
- [2008-02-23 15:19:05] INFO  WEBrick 1.3.1
- [2008-02-23 15:19:05] INFO  ruby 1.8.6 (2007-09-24) [universal-darwin9.0]
- [2008-02-23 15:19:05] INFO  Serve::Server#start: pid=5087 port=4000
- ...
-
-Once you execute the `serve` command it will launch a mini Web server for the prototype and will output a noisy log of any activity. (To stop the command at any point simply switch back to the command line and press Ctrl+C.)
-
-By default the `serve` command automatically serves files from the directory that it is started in over port 4000 on your local machine. To access the the prototype in your Web browser go to:
-
- http://localhost:4000
-
-Now navigate to the following URL:
-
-  http://localhost:4000/login/
-
-You should see the contents of the login page. Note that Serve allows you to refer to pages without their extension. This allows you to use URLs in your documents that correspond to the URLs that Rails uses by default.
-
-
-== Layouts
-
-One thing to note about the source that I gave you for the login page. I intentionally left out the <html>, <head>, and <body> tags because they belong a layout---not the source file. Let's go ahead and define that layout now.
-
-Replace the contents of the file named "_layout.html.erb" in the "views" directory of your prototype with the following:
-
- <html>
-   <head>
-     <title><%= @title %></title>
-   </head>
-   <body>
-     <h1><%= @title %>/h1>
-     <%= yield %>
-   </body>
- </html>
-
-This layout includes a small amount of ERB. ERB stands for Embedded Ruby. ERB allows you to embed Ruby code into a web page to dynamically render content. In our case, we are using it in the layout to indicate the title of the web page and to insert the content of the page at the appropriate point. You can use ERB in layout or view files.
-
-Embedded Ruby is delineated with the opening and closing sequence <% and %> respectively. Sequences that begin with an addition equals sign insert their output directly into the HTML. In this case we want to render the @title variable as the title in the head and as the first heading in the document body. The `yield` keyword is used to insert the content of the page at that point.
-
-We need to make one small change to our login page before continuing. Insert the following line at the top of login.html.erb file:
-
- <% @title = "Login" %>
-
-This will set the @title variable for the login page. Now, switch back to your Web browser and navigate to:
-
- http://localhost:4000/login/
-
-The page should now have a title and heading that both read "Login".
-
-== Content regions with `content_for`
-
-Let's add a sidebar to the login page. To do this in a layout friendly way, we will use the `content_for` helper method to define the sidebar.
-
-Add the following code to the bottom of login.html.erb:
-
- <% content_for :sidebar do %>
-   <h3>New Around Here?</h3>
-   <p>No problem! Just <a href="/signup/">create an account</a>.</p>
- <% end %>
-
-This defines a new content region of the page that we can render wherever we want in the layout. The :sidebar symbol defines the name of the content region.
-
-Now to modify the layout to work with this new content region. In _layout.html.erb replace the code:
-
- <h1><%= @title %>/h1>
- <%= yield %>
-
-With the following:
- 
- <div id="content">
-   <h1><%= @title %>/h1>
-   <%= yield %>
- </div>
- <div id="sidebar">
-   <%= yield :sidebar %>
- </div>
-
-This defines two new divs for the content and sidebar portions of the document. The first call to `yield` renders the content portion of a view (everything apart from regions defined by calls to `content_for`). The second call to `yield` passes the name of our content region as a symbol. When yield is called with a symbol, it renders the associated content region. In our case `yield :sidebar` causes Serve to render the content that we defined for the :sidebar region at that point in the layout.
-
-Now add a block for inline styles to the "head" of the layout:
-
- <styles>
-   #content { float: left;  width: 60%; }
-   #sidebar { float: right; width: 40%; }
- </styles>
-
-We could certainly put this in it's own file (in the public/stylesheets directory), but for the purposes of this demonstration, it works just as well in the head of the document.
-
-The full layout file should now look like this:
-
- <html>
-   <head>
-     <title><%= @title %></title>
-     <styles>
-        #content { float: left;  width: 60%; }
-        #sidebar { float: right; width: 40%; }
-      </styles>
-   </head>
-   <body>
-     <div id="content">
-       <h1><%= @title %>/h1>
-       <%= yield %>
-     </div>
-     <div id="sidebar">
-       <%= yield :sidebar %>
-     </div>
-   </body>
- </html>
-
-Now switch back to your Web browser at:
-
-  http://localhost:4000/login/
-
-And check out the new multi-column layout on the login page.
-
-
-== Partials
-
-<%= render 'footer' %>
-
-== View Helpers
-
-view_helpers.rb
-
-This tutorial is incomplete. Patches are welcome!