vintage 0.0.1 → 0.0.5

data/History.txt

@@ -2,3 +2,12 @@
 
 * 1 major enhancement:
   * Initial release
+
+== 0.0.5 2008-01-11
+
+* 2 major enhancements:
+  * Support for Thin web server
+  * Cookies support
+* 2 bug fixes
+  * Fixed initial content
+  * Various minor issues...

data/app_generators/vintage_application/templates/index.erb

@@ -16,8 +16,8 @@
       <ul>
         <li>Remote IP: <%= request.remote_ip %></li>
         <li>Referer: <%= request.referer %></li>
-        <li>Requested URI: <%= request.uri %></li>
-        <li>Request method: <%= request.method %></li>
+        <li>Requested URI: <%= request.url %></li>
+        <li>Request method: <%= request.request_method %></li>
         <li>User agent: <%= request.user_agent %></li>
         <li>Query string: <%= request.query_string %></li>
         <li>Parameters: <%= request.params == {} ? "None" : request.params.to_a.map{|k,v| "#{k} = #{v}"}.join(", ") %></li>

data/bin/vintage

@@ -19,7 +19,8 @@ OPTIONS = {
   :config       => 'configuration.yml',
   :templates    => 'erb',
   :mount        => '/',
-  :root         => 'index'
+  :root         => 'index',
+  :server       => 'mongrel'
 }
 MANDATORY_OPTIONS = %w(  )
 
@@ -33,7 +34,12 @@ a new project is generated.  Otherwise, Vintage will start serving
 given the defaults and/or any provided options.
 
 Usage: #{File.basename($0)} [options]
+       
+       To generate an application:
        #{File.basename($0)} [project name]
+       
+       To start your application:
+       #{File.basename($0)} start
 
 Options are:
 BANNER
@@ -56,6 +62,9 @@ BANNER
   opts.on("-r", "--root=template", String,
           "The template to render at the root URL",
           "Default: index") { |OPTIONS[:root]| }
+  opts.on("-s", "--server=server", String,
+          "The server daemon to use (can be mongrel, webrick, cgi, or fastcgi)",
+          "Default: mongrel") { |OPTIONS[:server]| }
   opts.on("-h", "--help",
           "Show this help message.") { puts opts; exit }
   opts.parse!(ARGV)
@@ -65,6 +74,10 @@ if ARGV.empty?
   puts parser
   puts
 elsif ARGV[0] == "start"
+  if OPTIONS[:server] == 'swift'
+    require 'swiftcore/swiftiplied_mongrel'
+  end
+  
   OPTIONS.merge!(YAML::load_file(OPTIONS[:config])) if File.exists?(OPTIONS[:config])
   Vintage::Server.run(OPTIONS)
 else

data/config/hoe.rb

@@ -2,7 +2,7 @@ require 'vintage/version'
 
 AUTHOR = 'Jeremy McAnally'  # can also be an array of Authors
 EMAIL = "jeremymcanally@gmail.com"
-DESCRIPTION = "A super simple web framework"
+DESCRIPTION = "The super slim web framework"
 GEM_NAME = 'vintage' # what ppl will type to install your gem
 RUBYFORGE_PROJECT = 'vintage' # The unix name for your project
 HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
@@ -32,7 +32,6 @@ REV = nil
 # UNCOMMENT IF REQUIRED: 
 # REV = `svn info`.each {|line| if line =~ /^Revision:/ then k,v = line.split(': '); break v.chomp; else next; end} rescue nil
 VERS = Vintage::VERSION::STRING + (REV ? ".#{REV}" : "")
-VERSION = VERS
 RDOC_OPTS = ['--quiet', '--title', 'vintage documentation',
     "--opname", "index.html",
     "--line-numbers", 
@@ -60,7 +59,7 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   
   # == Optional
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  #p.extra_deps = []     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
+  p.extra_deps = [['rubigen', '>= 0.0.0']]     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
   
   #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
   

data/lib/vintage/errors.rb

@@ -2,74 +2,54 @@ module Vintage
   # A class to render the default error pages.  These will
   # not render if error pages are specified in the configuration.
   class ErrorReporter
+    # CSS shared among error templates
+    CSS = """
+      body { margin: 0px; padding: 0px; font-family: sans-serif; }
+      h1 { background: #3E2B09; padding: 45px 10px 10px 10px; color: #6F5E3C;  border: 0px; border-bottom: 2px solid #1C0907; margin: 0px; }
+      h1 span.error { text-shadow: 0.1em 0.1em #333; color: white; }
+      h2 { margin: 0px; padding: 5px 5px 10px 10px; font-size: 14pt !important; }
+      h2 span.where { color: #999; }
+      h3 { margin: 0px; padding: 10px 10px; color: #999;}
+      ul { margin: 0px; }
+      li { margin: 0px; padding: 0px 30px; }
+      pre { padding: 0 30px; margin: 0px; }
+    """
+    
     # Standard template to render for a <tt>500 Internal Server Error</tt>
     def self.internal_error(error, params)
-      """
-      <html>
-        <head>
-          <title>Vintage Error: 500 Internal Server Error</title>
-          <style>
-            body { margin: 0px; padding: 0px; font-family: sans-serif; }
-            h1 { background: #3E2B09; padding: 45px 10px 10px 10px; color: #6F5E3C;  border: 0px; border-bottom: 2px solid #1C0907; margin: 0px; }
-            h1 span.error { text-shadow: 0.1em 0.1em #333; color: white; }
-            h2 { margin: 0px; padding: 5px 5px 10px 10px; font-size: 14pt !important; }
-            h2 span.where { color: #999; }
-            h3 { margin: 0px; padding: 10px 10px; color: #999;}
-            ul { margin: 0px; }
-            li { margin: 0px; padding: 0px 30px; }
-            pre { padding: 0 30px; margin: 0px; }
-          </style>
-        </head>
-
-        <body>
-          <h1><span class='error'>#{error.class}</span> 500 Internal Server Error</h1>
-          <h2>#{error.message} <span class='where'>at #{error.backtrace[0]}</span></h2>
-          <div>
-            <h3>Parameters</h3>
-            <ul>
-              #{params == {} ? "None" : params.to_a.map{|key, val| "<li><b>" + key.to_s + "<b> = " + val.to_s + "</li>"}.join("\n") }
-            </ul>
-            <br />
-            <h3>Backtrace</h3>
-            <pre>#{error.backtrace.join("\n")}</pre>
-          </div>
-        </body>
-      </html>
-      
-      """
+      error_page("500 Internal Server Error", error.class.to_s, "500 Internal Server Error", error.message.to_s, "at #{error.backtrace[0]}", "<h3>Backtrace</h3>\n\t<pre>#{error.backtrace.join('\n')}</pre>", params)
     end
     
     # Standard template to render for a <tt>404 Page Not Found</tt> error
     def self.not_found(url, remote_ip, params)
+      error_page("404 Not Found", "Page Not Found", "404 Not Found", "Request for #{url}", "from #{remote_ip}", params)
+    end
+    
+    private
+    # Standard template to render for a <tt>404 Page Not Found</tt> error
+    def self.error_page(title, h1_primary, h1_secondary, h2_primary, h2_secondary, extra_content = "", params = {})
       """
       <html>
         <head>
-          <title>Vintage Error: 404 Page Not Found</title>
+          <title>Vintage Error: #{title}</title>
           <style>
-            body { margin: 0px; padding: 0px; font-family: sans-serif; }
-            h1 { background: #3E2B09; padding: 45px 10px 10px 10px; color: #6F5E3C;  border: 0px; border-bottom: 2px solid #1C0907; margin: 0px; }
-            h1 span.error { text-shadow: 0.1em 0.1em #333; color: white; }
-            h2 { margin: 0px; padding: 5px 5px 10px 10px; font-size: 14pt !important; }
-            h2 span.where { color: #999; }
-            h3 { margin: 0px; padding: 10px 10px; color: #999;}
-            ul { margin: 0px; }
-            li { margin: 0px; padding: 0px 30px; }
-            pre { padding: 0 30px; margin: 0px; }
+            #{CSS}
           </style>
         </head>
 
         <body>
-          <h1><span class='error'>Page Not Found</span> 404 Not Found</h1>
-          <h2>Request for #{url} <span class='where'>from #{remote_ip}</span></h2>
+          <h1><span class='error'>#{h1_primary}</span> #{h1_secondary}</h1>
+          <h2>#{h2_primary} <span class='where'>#{h2_secondary}</span></h2>
           <div>
             <h3>Parameters</h3>
             <ul>
               #{params == {} ? "None" : params.to_a.map{|key, val| "<li><b>" + key.to_s + "<b> = " + val.to_s + "</li>"}.join("\n") }
             </ul>
+            <br />
+            #{extra_content}
           </div>
         </body>
       </html>
-      
       """
     end
   end

data/lib/vintage/handler.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'mongrel'
 require 'erubis'
 require 'erb'
+
 require 'mime/types'
 
 require 'vintage/renderer'
@@ -10,13 +11,13 @@ require 'vintage/errors'
 
 module Vintage
   # The Mongrel HTTP Handler.  Handles all operations with requests.
-  class Handler < Mongrel::HttpHandler    
+  class Handler   
     def initialize(options)
       # Make our configuration options avialable to the handler
       @options = options
       
       # Setup a DirHandler for sending static files securely
-      @static_handler = Mongrel::DirHandler.new(@options[:static_path], false, nil)
+      @static_handler = Rack::File.new(@options[:static_path])
       
       # Inject our helpers in the RequestContext class to make them
       # available on each request.
@@ -24,19 +25,17 @@ module Vintage
     end
   
     # Main request handler for Mongrel.
-    def process(request, response)
-      # Parse params into a nice Hash
-      handle_params(request.params["QUERY_STRING"])
-      
-      # Setup our request's path
-      @request_path = request.params["PATH_INFO"]
-      
+    def call(env)
       # Setup up the request's context (response and request information)
-      context = RequestContext.new(request, @params, {})
-      
+      request = Rack::Request.new(env)
+      context = RequestContext.new(request)
+
+      # Setup our request's path
+      @request_path = request.path_info
+    
       # Initialize the buffered log entry
       log_entry = ""
-      log_entry << "*** request for [#{request.params['REQUEST_URI']}] from [#{request.params['REMOTE_ADDR']}]\n"
+      log_entry << "*** request for [#{request.url}] from [#{env['REMOTE_ADDR']}]\n"
 
       # If it's a root request, we want to render the template we configured
       @request_path = @options[:root] if @request_path == '/'
@@ -53,64 +52,48 @@ module Vintage
         # Is it a static file?
         if (@request_path =~ /\.(.*)$/)
           # Yes?  Let our static handler take it away!
-          @static_handler.process(request, response)
+          @static_handler.call(env)
         else
           # No!  Render a template...
           content = Renderer.send(@options[:templates].to_sym, File.open("#{@options[:path]}#{@request_path}.#{@options[:templates]}", "r").read, context)
-        end
         
-        # Render (if response is 200) or redirect
-        response.start(context.response.code) do |head, out|
-          # Add any custom headers (e.g., from redirect_to)
-          context.response.headers.each do |k,v|
-            head[k] = v
-          end
-          
           # Set the content type if we're responding with a render
-          head["Content-Type"] = "text/html" if context.response.code == 200
+          context.response.headers["Content-Type"] = "text/html" if context.response.code == 200
+          response = Rack::Response.new(content, context.response.code, {}.merge!(context.response.headers))
+        
+          # Render (if response is 200) or redirect 
+          # Set cookies        
+          if context.response.cookies != {}
+            context.response.cookies.each do |key, value|
+              response.set_cookie(key, value)
+            end
+          end
           
-          # Write out to the response
-          out.write content
+          response.finish
         end
       else
         # Page not found
-        response.start(404) do |head, out|
-          # Log the 404
-          log_entry << "    response: [404]\n"
-          log_entry << "    rendering 'page not found'\n"
-          
-          # Send back the default or a custom template
-          head["Content-Type"] = "text/html"
-          out.write @options[:errors] && @options[:errors][:not_found] ? Renderer.send(@options[:templates].to_sym, File.open("#{@options[:path]}#{@options[:errors][:not_found]}.#{@options[:templates]}", "r").read, context) : ErrorReporter.not_found(@request_path, request.params['REMOTE_ADDR'], @params)
-        end
+        # Log the 404
+        log_entry << "    response: [404]\n"
+        log_entry << "    rendering 'page not found'\n"
+        
+        # Send back the default or a custom template
+        content = @options[:errors] && @options[:errors][:not_found] ? Renderer.send(@options[:templates].to_sym, File.open("#{@options[:path]}#{@options[:errors][:not_found]}.#{@options[:templates]}", "r").read, context) : ErrorReporter.not_found(@request_path, request.params['REMOTE_ADDR'], @params)
+        [context.response.code, {}.merge!(context.response.headers), content]
       end
     rescue StandardError => err
       # OOPS!  Something broke.
-      response.start(500) do |head, out|
-        # Log it and send an error page...
-        log_entry << "\t!!! [500] #{err}\n"
-        head["Content-Type"] = "text/html"
-        out.write @options[:errors] && @options[:errors][:internal_error] ? Renderer.send(@options[:templates].to_sym, File.open("#{@options[:path]}#{@options[:errors][:internal_error]}.#{@options[:templates]}", "r").read, context) : ErrorReporter.internal_error(err, @params)
-      end
+      context.response.code = 500
+
+      # Log it and send an error page...
+      log_entry << "\t!!! [500] #{err}\n"
+      content = @options[:errors] && @options[:errors][:internal_error] ? Renderer.send(@options[:templates].to_sym, File.open("#{@options[:path]}#{@options[:errors][:internal_error]}.#{@options[:templates]}", "r").read, context) : ErrorReporter.internal_error(err, @params)
+      [context.response.code, {}.merge!(context.response.headers), content]
     ensure
       # After every request push the buffered log entry out to the logger
       Log.enter log_entry.to_s + "\n"
     end
     
-    # Parse HTTP params into a +Hash+.
-    def handle_params(params)
-      @params = {}
-      
-      unless params == nil || params == ''
-        # Split the query string and hack it up
-        params.split('&').each do |param|
-          key, val = param.split('=')
-
-          @params[key.to_sym] = val
-        end
-      end
-    end
-    
     # Inject the default helpers and helpers from the 
     # +helpers/+ directory (if available) into the 
     # RequestContext class.

data/lib/vintage/request_context.rb

@@ -1,37 +1,52 @@
-# Class that encapsulates information about the request.
-class Request
-  attr_accessor :remote_ip, :method, :params, :query_string, :uri, :referer, :user_agent
+require 'rack'
+require 'rack/file'
+
+module Vintage
+  # Class that encapsulates the response's headers and
+  # response code.
+  class Response
+    attr_accessor :headers, :code, :cookies
   
-  def initialize(request, param_hash)
-    self.remote_ip = request.params['REMOTE_ADDR']
-    self.referer = request.params['HTTP_REFERER']
-    self.uri = request.params['REQUEST_URI']
-    self.method = request.params['REQUEST_METHOD']
-    self.user_agent = request.params['HTTP_USER_AGENT']
-    self.query_string = request.params['QUERY_STRING']
-    self.params = param_hash
+    def initialize
+      self.headers = {}
+      self.code = 200
+      self.cookies = {}
+    end
   end
-end
 
-# Class that encapsulates the response's headers and
-# response code.
-class Response
-  attr_accessor :headers, :code
+  # A class that creates a context for template
+  # rendering.  Helpers are mixed in here to give
+  # templates access to them.
+  class RequestContext
+    attr_accessor :request, :response
   
-  def initialize(headers)
-    self.headers = headers
-    self.code = 200
+    def initialize(incoming_request)
+      self.request = incoming_request
+      self.response = Vintage::Response.new
+    end
+    
+    def cookies
+      self.request.cookies
+    end
+    
+    def set_cookie(key, val)
+      self.response.cookies[key] = val
+    end
+    
+    # def session
+    #   @env["rack.session"]
+    # end
   end
 end
 
-# A class that creates a context for template
-# rendering.  Helpers are mixed in here to give
-# templates access to them.
-class RequestContext
-  attr_accessor :request, :response
-  
-  def initialize(incoming_request, params, headers)
-    self.request = Request.new(incoming_request, params)
-    self.response = Response.new(headers)
+module Rack
+  class Request
+    def remote_ip
+      @env['REMOTE_ADDR']
+    end
+    
+    def user_agent
+      @env['HTTP_USER_AGENT']
+    end
   end
 end

data/lib/vintage/server.rb

@@ -1,5 +1,4 @@
 require 'rubygems'
-require 'mongrel'
 
 require 'erubis'
 
@@ -7,6 +6,15 @@ require 'vintage/version'
 require 'vintage/log'
 require 'vintage/helpers'
 
+begin
+  require 'swiftcore/evented_mongrel'
+rescue
+  # Don't have it?  No problem!
+end
+
+require 'rack'
+require 'rack/file'
+
 begin
   Dir.entries("helpers/").select{|entry| entry =~ /(.*).rb$/}.each do |helper_file|
     Vintage::Helpers.module_eval(File.open(helper_file).read)
@@ -22,11 +30,32 @@ module Vintage
       Log.enter "- vintage version #{VERSION::STRING}"
       Log.enter "\t starting server on port #{options[:port]}"
       Log.enter
-      
-      h = Mongrel::HttpServer.new("0.0.0.0", options[:port])
-      h.register(options[:mount], Handler.new(options))
-      h.run.join
-    rescue Interrupt
+
+      application = Handler.new(options)
+
+      server = Rack::Handler::Mongrel
+            
+      case options[:server]
+      when "mongrel"
+        server = Rack::Handler::Mongrel
+      when "thin"
+        begin
+          require 'thin'
+          server = Rack::Handler::Thin
+        rescue LoadError
+          puts "You don't have Thin installed!"
+          exit
+        end
+      when "webrick"
+        server = Rack::Handler::WEBrick
+      when "cgi"
+        server = Rack::Handler::CGI
+      when "fastcgi"
+        server = Rack::Handler::FastCGI
+      end
+
+      server.run application, {:Port => options[:port], :Host => "0.0.0.0", :AccessLog => []}
+    rescue Interrupt, Mongrel::StopServer
       Log.enter
       Log.enter "- interrupt signal caught"
       Log.enter "\tshutting server down"

data/lib/vintage/version.rb

@@ -2,7 +2,7 @@ module Vintage #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 1
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: vintage
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.5
 platform: ruby
 authors: 
 - Jeremy McAnally
@@ -9,11 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-05 00:00:00 -05:00
+date: 2008-01-11 00:00:00 -05:00
 default_executable: 
-dependencies: []
-
-description: A super simple web framework
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rubigen
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
+    version: 
+description: The super slim web framework
 email: jeremymcanally@gmail.com
 executables: 
 - vintage
@@ -84,7 +92,7 @@ rubyforge_project: vintage
 rubygems_version: 1.0.1
 signing_key: 
 specification_version: 2
-summary: A super simple web framework
+summary: The super slim web framework
 test_files: 
 - test/test_generator_helper.rb
 - test/test_helper.rb