merb 0.0.1 → 0.0.2

data/doc/rdoc/rdoc-style.css

@@ -0,0 +1,208 @@
+
+body {
+    font-family: Verdana,Arial,Helvetica,sans-serif;
+    font-size:   90%;
+    margin: 0;
+    margin-left: 40px;
+    padding: 0;
+    background: white;
+}
+
+h1,h2,h3,h4 { margin: 0; color: #efefef; background: transparent; }
+h1 { font-size: 150%; }
+h2,h3,h4 { margin-top: 1em; }
+
+a { background: #eef; color: #039; text-decoration: none; }
+a:hover { background: #039; color: #eef; }
+
+/* Override the base stylesheet's Anchor inside a table cell */
+td > a {
+  background: transparent;
+  color: #039;
+  text-decoration: none;
+}
+
+/* and inside a section title */
+.section-title > a {
+  background: transparent;
+  color: #eee;
+  text-decoration: none;
+}
+
+/* === Structural elements =================================== */
+
+div#index {
+    margin: 0;
+    margin-left: -40px;
+    padding: 0;
+    font-size: 90%;
+}
+
+
+div#index a {
+    margin-left: 0.7em;
+}
+
+div#index .section-bar {
+   margin-left: 0px;
+   padding-left: 0.7em;
+   background: #ccc;
+   font-size: small;
+}
+
+
+div#classHeader, div#fileHeader {
+    width: auto;
+    color: white;
+    padding: 0.5em 1.5em 0.5em 1.5em;
+    margin: 0;
+    margin-left: -40px;
+    border-bottom: 3px solid #006;
+}
+
+div#classHeader a, div#fileHeader a {
+    background: inherit;
+    color: white;
+}
+
+div#classHeader td, div#fileHeader td {
+    background: inherit;
+    color: white;
+}
+
+
+div#fileHeader {
+    background: #057;
+}
+
+div#classHeader {
+    background: #048;
+}
+
+
+.class-name-in-header {
+  font-size:  180%;
+  font-weight: bold;
+}
+
+
+div#bodyContent {
+    padding: 0 1.5em 0 1.5em;
+}
+
+div#description {
+    padding: 0.5em 1.5em;
+    background: #efefef;
+    border: 1px dotted #999;
+}
+
+div#description h1,h2,h3,h4,h5,h6 {
+    color: #125;;
+    background: transparent;
+}
+
+div#validator-badges {
+    text-align: center;
+}
+div#validator-badges img { border: 0; }
+
+div#copyright {
+    color: #333;
+    background: #efefef;
+    font: 0.75em sans-serif;
+    margin-top: 5em;
+    margin-bottom: 0;
+    padding: 0.5em 2em;
+}
+
+
+/* === Classes =================================== */
+
+table.header-table {
+    color: white;
+    font-size: small;
+}
+
+.type-note {
+    font-size: small;
+    color: #DEDEDE;
+}
+
+.xxsection-bar {
+    background: #eee;
+    color: #333;
+    padding: 3px;
+}
+
+.section-bar {
+   color: #333;
+   border-bottom: 1px solid #999;
+    margin-left: -20px;
+}
+
+
+.section-title {
+    background: #79a;
+    color: #eee;
+    padding: 3px;
+    margin-top: 2em;
+    margin-left: -30px;
+    border: 1px solid #999;
+}
+
+.top-aligned-row {  vertical-align: top }
+.bottom-aligned-row { vertical-align: bottom }
+
+/* --- Context section classes ----------------------- */
+
+.context-row { }
+.context-item-name { font-family: monospace; font-weight: bold; color: black; }
+.context-item-value { font-size: small; color: #448; }
+.context-item-desc { color: #333; padding-left: 2em; }
+
+/* --- Method classes -------------------------- */
+.method-detail {
+    background: #efefef;
+    padding: 0;
+    margin-top: 0.5em;
+    margin-bottom: 1em;
+    border: 1px dotted #ccc;
+}
+.method-heading {
+  color: black;
+  background: #ccc;
+  border-bottom: 1px solid #666;
+  padding: 0.2em 0.5em 0 0.5em;
+}
+.method-signature { color: black; background: inherit; }
+.method-name { font-weight: bold; }
+.method-args { font-style: italic; }
+.method-description { padding: 0 0.5em 0 0.5em; }
+
+/* --- Source code sections -------------------- */
+
+a.source-toggle { font-size: 90%; }
+div.method-source-code {
+    background: #262626;
+    color: #ffdead;
+    margin: 1em;
+    padding: 0.5em;
+    border: 1px dashed #999;
+    overflow: hidden;
+}
+
+div.method-source-code pre { color: #ffdead; overflow: hidden; }
+
+/* --- Ruby keyword styles --------------------- */
+
+.standalone-code { background: #221111; color: #ffdead; overflow: hidden; }
+
+.ruby-constant  { color: #7fffd4; background: transparent; }
+.ruby-keyword { color: #00ffff; background: transparent; }
+.ruby-ivar    { color: #eedd82; background: transparent; }
+.ruby-operator  { color: #00ffee; background: transparent; }
+.ruby-identifier { color: #ffdead; background: transparent; }
+.ruby-node    { color: #ffa07a; background: transparent; }
+.ruby-comment { color: #b22222; font-weight: bold; background: transparent; }
+.ruby-regexp  { color: #ffa07a; background: transparent; }
+.ruby-value   { color: #7fffd4; background: transparent; }

data/examples/sample_app/app/controllers/noroutefound.rb

@@ -4,4 +4,8 @@ class Noroutefound < Merb::Controller
     "<html><body><h1>No Matching Route</h1></body></html>"    
   end  
   
+  def to_s
+    "<html><body><h1>No Matching Route s</h1></body></html>"    
+  end
+  
 end  

data/examples/sample_app/app/controllers/posts.rb

@@ -0,0 +1,27 @@
+
+class Posts < Merb::Controller
+  template_dir :posts
+
+  def new(args={})
+    unless @params.to_s.empty?
+      @post = Post.create( :title => @params[:title], :body => @params[:body])
+      render 'show'
+    else
+      render
+    end
+  end  
+  
+  def show(args={})
+    @post = Post.find @params[:id]
+    render
+  end
+  
+  def list(args={})
+    @posts = Post.find :all
+    render
+  end  
+  
+  def to_s
+    "<html><body>Post controller, no mathing action</body></html>"
+  end
+end

data/examples/sample_app/app/models/post.rb

@@ -0,0 +1,2 @@
+class Post < ActiveRecord::Base  
+end

data/examples/sample_app/app/views/posts/list.rhtml

@@ -0,0 +1,13 @@
+ <html>
+ <head>
+  <title>New Post</title>
+ </head>
+ <body>
+	<p><%= @params.inspect%></p>
+
+<% @posts.each do |p| %>
+  <h2><%= p.title %></h2>
+  <p><%= p.body %></p>
+<% end %>
+</body>
+</html>

data/examples/sample_app/app/views/posts/new.rhtml

@@ -0,0 +1,36 @@
+ <html>
+ <head>
+  <title>New Post</title>
+ </head>
+ <body>
+
+
+<h2>Make a post doofus.</h2>
+
+<form action="/posts/new" method="post">
+
+	<p>
+	<label for="post_title">
+
+	Title
+
+	</label>
+	<input type="text" size="30" name="title" id="post_title" />
+	</p>
+	
+	<p>
+	<label for="post_body">
+
+	Body
+
+	</label>
+	<textarea cols="20" id="post_body" name="body" rows="20"></textarea>
+	</p>
+
+
+  <p>
+    <input name="commit" type="submit" value="Upload Asset" />
+  </p>
+</form>
+</body>
+</html>

data/examples/sample_app/app/views/posts/show.rhtml

@@ -0,0 +1,12 @@
+ <html>
+ <head>
+  <title>New Post</title>
+ </head>
+ <body>
+	<p><%= @params.inspect%></p>
+
+<h2><%= @post.title %></h2>
+<p><%= @post.body %></p>
+
+</body>
+</html>

data/examples/sample_app/conf/merb_init.rb

@@ -1,3 +1,14 @@
 puts "merb init called"
 
-# add your own ruby code here for app initialization and load path stuff
+# add your own ruby code here for app initialization and load path stuff
+
+require 'active_record'
+
+ActiveRecord::Base.establish_connection(
+  :adapter => 'mysql',
+  :username => 'root',
+  :password => 'xxxxxxx',
+  :database => 'merb'
+)
+
+Dir[Merb::Server.config[:merb_root]+"/app/models/*.rb"].each { |m| require m } 

data/examples/sample_app/conf/router.rb

@@ -1,7 +1,13 @@
+puts "Compiling routes: \n"
+
 Merb::RouteMatcher.prepare do |r|
   r.add '/foo/:bar/baz/:id', :class => 'Test', :method => 'foo'
   r.add '/hey/:there/you/:guys', :class => 'Test', :method => 'hello'
+  r.add '/upload/start', :class => 'Upload', :method => 'start'
+  r.add '/posts/:method', :class => 'Posts'
   r.add '/:class/:method/:id', {}
   r.add '/:class/:method', {}
-  r.add '.*', {:class => 'NoRouteFound', :method => 'noroute'}
-end
+end
+
+m = Merb::RouteMatcher.new
+puts m.compiled_statement

data/lib/merb.rb

@@ -6,7 +6,7 @@ require 'merb_config'
 require 'active_support'
 
 module Merb
-  VERSION='0.0.1' unless defined?VERSION
+  VERSION='0.0.2' unless defined?VERSION
 end
 
 lib = File.join(File.dirname(__FILE__), 'merb')

data/lib/merb/merb_controller.rb

@@ -1,11 +1,9 @@
 module Merb
   
   class Controller
-    attr_accessor :response_code, :content_type
+    attr_accessor :status, :headers
     # Stolen from Camping without a twinge of remorse ;)
     def initialize(req, env, method=(env['REQUEST_METHOD']||"GET")) #:nodoc:
-      @response_code = 200
-      @content_type = 'text/html'
       env = MerbHash[env.to_hash]
       puts env.inspect if $DEBUG
       puts req.inspect if $DEBUG

data/lib/merb/merb_handler.rb

@@ -1,11 +1,12 @@
 class MerbHandler < Mongrel::HttpHandler
-
+  
   def process(request, response)
     if response.socket.closed?
       return
     end
-    controller, method, args = handle(request)
+    
     begin
+      controller, method, args = handle(request)
       output = if (controller && controller.kind_of?(Merb::Controller))
         if method
           ( args ? controller.send( method, args ) : controller.send(method) )
@@ -13,21 +14,50 @@ class MerbHandler < Mongrel::HttpHandler
           controller.to_s
         end  
       else
-        response_code = 500
-        "<html><body>Error: no merb controller found for this url.</body></html>"
+        nil
       end
-      response_code = controller.response_code
-      content_type = controller.content_type
     rescue Exception => e
-      response_code = 500
-      output = "<html><h2>Merb Error!</h2><pre>#{ e.message } - (#{ e.class })" << 
+      response.start(500) do |head,out|
+        head["Content-Type"] = "text/html"
+        out <<"<html><h2>Merb Error!</h2><pre>#{ e.message } - (#{ e.class })" << 
         "\n" << "#{(e.backtrace or []).join('\n')}</pre></html>"
+      end  
+      return
     end  
-    response.start(response_code||200) do |head,out|
-      head["Content-Type"] = content_type || "text/html"
-      out << output
-    end 
-  end
+    
+    unless output
+      response.start(404) do |head,out|
+        head["Content-Type"] = "text/html"
+        out << "<html><body>Error: no merb controller found for this url.</body></html>"
+      end
+      return
+    end  
+    
+    sendfile, clength = nil
+    response.status = controller.status
+    controller.headers.each do |k, v|
+      if k =~ /^X-SENDFILE$/i
+        sendfile = v
+      elsif k =~ /^CONTENT-LENGTH$/i
+        clength = v.to_i
+      else
+        [*v].each do |vi|
+          response.header[k] = vi
+        end
+      end
+    end
+
+    if sendfile
+      response.send_status(File.size(sendfile))
+      response.send_header
+      response.send_file(sendfile)
+    else
+      response.send_status(output.length)
+      response.send_header
+      response.write(output)
+    end
+    
+  end  
   
   def handle(request)
     path = request.params["PATH_INFO"].sub(/\/+/, '/')