RubyGems - merb - Versions diffs - 0.0.2 → 0.0.3 - Mend

merb 0.0.2 → 0.0.3

Files changed (29) hide show

data/Rakefile +3 -3
data/examples/sample_app/app/controllers/posts.rb +3 -3
data/examples/sample_app/app/controllers/test.rb +2 -2
data/examples/sample_app/app/controllers/upload.rb +4 -4
data/examples/sample_app/app/views/posts/list.rhtml +1 -1
data/examples/sample_app/app/views/posts/show.rhtml +1 -1
data/examples/sample_app/app/views/test/hello.rhtml +1 -1
data/examples/sample_app/app/views/upload/upload.rhtml +2 -2
data/examples/sample_app/conf/router.rb +13 -4
data/lib/merb/merb_controller.rb +20 -1
data/lib/merb/merb_daemon.rb +1 -1
data/lib/merb/merb_handler.rb +94 -45
data/lib/merb/merb_router.rb +25 -30
data/lib/merb.rb +1 -1
metadata +2 -21
data/doc/rdoc/classes/Merb/Config.html +0 -159
data/doc/rdoc/classes/Merb.html +0 -128
data/doc/rdoc/created.rid +0 -1
data/doc/rdoc/files/LICENSE.html +0 -129
data/doc/rdoc/files/README.html +0 -297
data/doc/rdoc/files/lib/merb_config_rb.html +0 -101
data/doc/rdoc/files/lib/merb_rb.html +0 -113
data/doc/rdoc/files/server_rb.html +0 -122
data/doc/rdoc/fr_class_index.html +0 -28
data/doc/rdoc/fr_file_index.html +0 -31
data/doc/rdoc/fr_method_index.html +0 -27
data/doc/rdoc/index.html +0 -24
data/doc/rdoc/rdoc-style.css +0 -208
data/server.rb +0 -13

data/Rakefile CHANGED Viewed

@@ -7,7 +7,7 @@ require 'fileutils'
 include FileUtils
 NAME = "merb"
-VERS = "0.0.2"
+VERS = "0.0.3"
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']
 RDOC_OPTS = ['--quiet', '--title', "Merb Documentation",
   "--opname", "index.html",
@@ -26,7 +26,7 @@ Rake::RDocTask.new do |rdoc|
   rdoc.options += RDOC_OPTS
   rdoc.main = "README"
   rdoc.title = "Merb Documentation"
-  rdoc.rdoc_files.add ['README', 'LICENSE', 'lib/*.rb', 'server.rb']
+  rdoc.rdoc_files.add ['README', 'LICENSE', 'lib/*.rb']
 end
 spec = Gem::Specification.new do |s|
@@ -47,7 +47,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('mongrel')
   s.required_ruby_version = '>= 1.8.4'
-  s.files = %w(LICENSE README Rakefile server.rb) + Dir.glob("{app,bin,doc,test,lib,examples}/**/*")
+  s.files = %w(LICENSE README Rakefile) + Dir.glob("{app,bin,doc,test,lib,examples}/**/*")
   s.require_path = "lib"
   s.bindir = "bin"

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

@@ -3,8 +3,8 @@ class Posts < Merb::Controller
   template_dir :posts
   def new(args={})
-    unless @params.to_s.empty?
-      @post = Post.create( :title => @params[:title], :body => @params[:body])
+    unless params.to_s.empty?
+      @post = Post.create( :title => params[:title], :body => params[:body])
       render 'show'
     else
       render
@@ -12,7 +12,7 @@ class Posts < Merb::Controller
   end
   def show(args={})
-    @post = Post.find @params[:id]
+    @post = Post.find args[:id]
     render
   end

data/examples/sample_app/app/controllers/test.rb CHANGED Viewed

@@ -2,13 +2,13 @@
 class Test < Merb::Controller
   template_dir :test
-  def hello(args)
+  def hello(args={})
     # Assign the parameter to an instance variable
     @name = args[:id]
     render
   end
-  def foo(args)
+  def foo(args={})
     @args = args
     render

data/examples/sample_app/app/controllers/upload.rb CHANGED Viewed

@@ -1,16 +1,16 @@
 class Upload < Merb::Controller
   template_dir :upload
-  def start(*args)
+  def start(args={})
     # Assign the parameter to an instance variable
     @args = args
     render
   end
-  def upload(*args)
-    puts @params[:file].inspect
+  def upload(args={})
+    puts params[:file].inspect
-    FileUtils.mv @params[:file][:tempfile].path, ::Merb::Server.config[:merb_root]+"/public/files/#{@params[:file][:filename]}"
+    FileUtils.mv params[:file][:tempfile].path, ::Merb::Server.config[:merb_root]+"/public/files/#{params[:file][:filename]}"
     render
   end

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

@@ -3,7 +3,7 @@
   <title>New Post</title>
  </head>
  <body>
-	<p><%= @params.inspect%></p>
+	<p><%= params.inspect%></p>
 <% @posts.each do |p| %>
   <h2><%= p.title %></h2>

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

@@ -3,7 +3,7 @@
   <title>New Post</title>
  </head>
  <body>
-	<p><%= @params.inspect%></p>
+	<p><%= params.inspect%></p>
 <h2><%= @post.title %></h2>
 <p><%= @post.body %></p>

data/examples/sample_app/app/views/test/hello.rhtml CHANGED Viewed

@@ -3,7 +3,7 @@
   <title>Hello, <%= @name %></title>
  </head>
  <body>
- <h1><%= @params.inspect %></h1>
+ <h1><%= params.inspect %></h1>
  <% 5.times do %>
  <h1>Hello, <%= @name %>!</h1>
  <% end %>

data/examples/sample_app/app/views/upload/upload.rhtml CHANGED Viewed

@@ -1,4 +1,4 @@
 <h2>File uploaded successfully</h2>
-<p>params for @params[:file].inspect</p>
-<%=@params[:file].inspect %>
+<p>params for params[:file].inspect</p>
+<%=params[:file].inspect %>

data/examples/sample_app/conf/router.rb CHANGED Viewed

@@ -1,10 +1,19 @@
-puts "Compiling routes: \n"
+# Merb::RouteMatcher is the request routing mapper for the merb framework.
+# You can define placeholder parts of the url with the :smbol notation.
+# so r.add '/foo/:bar/baz/:id', :class => 'Bar', :method => 'foo'
+# will match against a request to /foo/123/baz/456. It will then
+# use the class Bar as your merb controller and call the foo method on it.
+# the foo method will recieve a hash with {:bar => '123', :id => '456'}
+# as the content. So the :placeholders sections of your routes become
+# a hash of arguments to your controller methods. These two methods map
+# the default /controller/action and /controller/action/id urls you will
+# use so you will want these two by default, in this order:
+# r.add '/:class/:method/:id', {}
+# r.add '/:class/:method', {}
+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', {}
 end

data/lib/merb/merb_controller.rb CHANGED Viewed

@@ -1,7 +1,14 @@
 module Merb
+  # controller class for the merb pocket-framework. All of your
+  # controllers will inherit from Merb::Controller. This superclass
+  # takes care of parsing the incoming headers and body into params
+  # and cookies and headers. If the request is a file upload it will
+  # stream it into a tempfile and pass in the filename and tempfile object
+  # to your controller via params. It also parses the ?query=string and
+  # puts that into params as well.
   class Controller
-    attr_accessor :status, :headers
+    attr_accessor :status
     # Stolen from Camping without a twinge of remorse ;)
     def initialize(req, env, method=(env['REQUEST_METHOD']||"GET")) #:nodoc:
       env = MerbHash[env.to_hash]
@@ -50,6 +57,18 @@ module Merb
       @cookies, @params = @k.dup, qs.dup
     end
+    def params
+      @params
+    end
+    def cookies
+      @cookies
+    end
+    def headers
+      @headers
+    end
     def query_parse(qs, d = '&;')
       m = proc {|_,o,n|o.update(n,&m)rescue([*o]<<n)}
       (qs||'').split(/[#{d}] */n).inject(MerbHash[]) { |h,p|

data/lib/merb/merb_daemon.rb CHANGED Viewed

@@ -63,7 +63,7 @@ class Merb::Server
       h = Mongrel::HttpServer.new((@@merb_opts[:host]||"0.0.0.0"), (@@merb_opts[:port]||4000), (@@merb_opts[:numprocs]||40))
-      h.register("/", MerbHandler.new)
+      h.register("/", MerbHandler.new(@@merb_opts[:merb_root]+'/public'))
       h.register("/favicon.ico", Mongrel::Error404Handler.new(""))
       h.run.join

data/lib/merb/merb_handler.rb CHANGED Viewed

@@ -1,64 +1,109 @@
 class MerbHandler < Mongrel::HttpHandler
+  @@file_only_methods = ["GET","HEAD"]
+  # take the name of a directory and use that as the doc root or public
+  # directory of your site. This is set to the root of your merb app + '/public'
+  # by default. See merb_daemon.rb if you want to change this.
+  def initialize(dir, opts = {})
+    @files = Mongrel::DirHandler.new(dir,false)
+  end
+  # process incoming http requests and do a number of things
+  # 1. check for rails style cached pages. add .html to the
+  # url and see if there is a static file in public that matches.
+  # serve that file directly without invoking Merb and be done with it.
+  # 2. Serve static asset and html files directly from public/ if
+  # they exist and fall back to Merb otherwise
+  # 3. If none of the above apply, we take apart the request url
+  # and feed it into Merb::RouteMatcher to let it decide which
+  # controller and method will serve the request.
+  # 4. after the controller has done its thing, we check for the
+  # X-SENDFILE header. if you set this header to the path to a file
+  # in your controller then mongrel will serve the file directly
+  # and your controller can go on processing other requests.
   def process(request, response)
     if response.socket.closed?
       return
     end
-    begin
-      controller, method, args = handle(request)
-      output = if (controller && controller.kind_of?(Merb::Controller))
-        if method
-          ( args ? controller.send( method, args ) : controller.send(method) )
+    # Rails style page caching. Check the public dir first for
+    # .html pages and serve directly. Otherwise fall back to Merb
+    # routing and request dispatching.
+    path_info = request.params[Mongrel::Const::PATH_INFO]
+    page_cached = path_info + ".html"
+    get_or_head = @@file_only_methods.include? request.params[Mongrel::Const::REQUEST_METHOD]
+    if get_or_head and @files.can_serve(path_info)
+      # File exists as-is so serve it up
+      @files.process(request,response)
+    elsif get_or_head and @files.can_serve(page_cached)
+      # Possible cached page, serve it up
+      request.params[Mongrel::Const::PATH_INFO] = page_cached
+      @files.process(request,response)
+    else
+      begin
+        controller, method, args = handle(request)
+        output = if (controller && controller.kind_of?(Merb::Controller))
+          if method
+            ( args ? controller.send( method, args ) : controller.send(method) )
+          else
+            controller.to_s
+          end
         else
-          controller.to_s
+          nil
+        end
+      rescue Exception => e
+        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
-      else
-        nil
-      end
-    rescue Exception => e
-      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>"
+        return
       end
-      return
-    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>"
+      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
+      # check for the X-SENDFILE heaqder from your Merb::Controller
+      # and serve the file directly instead of buffering.
+      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
-      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
+      if sendfile
+        # send X-SENDFILE header to mongrel
+        response.send_status(File.size(sendfile))
+        response.send_header
+        response.send_file(sendfile)
       else
-        [*v].each do |vi|
-          response.header[k] = vi
-        end
+        # render response from successful controller
+        response.send_status(output.length)
+        response.send_header
+        response.write(output)
       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
+  # This is where we grab the incoming request PATH_INFO
+  # and use that in the merb routematcher to determine
+  # which controller and method to run.
   def handle(request)
     path = request.params["PATH_INFO"].sub(/\/+/, '/')
     path = path[0..-2] if (path[-1] == ?/)
@@ -72,6 +117,10 @@ class MerbHandler < Mongrel::HttpHandler
     end
   end
+  # take a controller class name string and reload or require
+  # the right controller file then upcase the first letter and
+  # trun it into a new object p[assing in the request and response.
+  # this is where your Merb::Controller is instantiated.
   def instantiate_controller(controller_name, req, env)
     if !File.exist?(Merb::Server.config[:merb_root]+"/app/controllers/#{controller_name}.rb")
       return Object.const_get(:Noroutefound).new(req, env)

data/lib/merb/merb_router.rb CHANGED Viewed

@@ -1,5 +1,30 @@
 module Merb
+  # Merb::RouteMatcher is the request routing mapper for the merb framework.
+  # You can define placeholder parts of the url with the :smbol notation.
+  # so r.add '/foo/:bar/baz/:id', :class => 'Bar', :method => 'foo'
+  # will match against a request to /foo/123/baz/456. It will then
+  # use the class Bar as your merb controller and call the foo method on it.
+  # the foo method will recieve a hash with {:bar => '123', :id => '456'}
+  # as the content. So the :placeholders sections of your routes become
+  # a hash of arguments to your controller methods. These two methods map
+  # the default /controller/action and /controller/action/id urls you will
+  # use so you will want these two by default, in this order:
+  # r.add '/:class/:method/:id', {}
+  # r.add '/:class/:method', {}
+  #
+  # This is what a route prepare definition looks like. I have added
+  # code that will spit out the compiled routing lambda so you can see
+  # what is generated:
+  #
+  # puts "Compiling routes: \n"
+  # Merb::RouteMatcher.prepare do |r|
+  #   r.add '/foo/:bar/baz/:id', :class => 'Test', :method => 'foo'
+  #   r.add '/:class/:method/:id', {}
+  #   r.add '/:class/:method', {}
+  # end
+  # m = Merb::RouteMatcher.new
+  # puts m.compiled_statement
   class RouteMatcher
     attr_accessor :sections
@@ -55,33 +80,3 @@ module Merb
   end
 end
-=begin
-if __FILE__ == $0
-  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 '/these/:routes/are/:sweet', :class => 'Upload', :method => 'start'
-    r.add '/h/:a/b/:c/d/:f/g/:id', :class => 'Test'
-    r.add '/:class/:method/:id', {}
-    r.add '/:class/:method', {}
-  end
-  routes = Merb::RouteMatcher.new
-  puts routes.compiled_statement
-  p routes.route_request( "/foo/234/baz/dsdsd")
-  routes = Merb::RouteMatcher.new
-  p routes.route_request( "/hey/jon/you/girls")
-  routes = Merb::RouteMatcher.new
-  p routes.route_request( "/upload/test/12")
-  routes = Merb::RouteMatcher.new
-  p routes.route_request( "/these/234/are/yup")
-  routes = Merb::RouteMatcher.new
-  p routes.route_request( '/h/12/b/red/d/blue/g/12')
-  routes = Merb::RouteMatcher.new
-  p routes.route_request( '/hdsfvsdfsdfdsf')
-  p routes.routes
-end
-=end

data/lib/merb.rb CHANGED Viewed

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

metadata CHANGED Viewed

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: merb
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-date: 2006-10-16 00:00:00 -07:00
+  version: 0.0.3
+date: 2006-10-17 00:00:00 -07:00
 summary: Merb == Mongrel + Erb. Pocket rocket web framework.
 require_paths:
 - lib
@@ -32,26 +32,7 @@ files:
 - LICENSE
 - README
 - Rakefile
-- server.rb
 - bin/merb
-- doc/rdoc
-- doc/rdoc/classes
-- doc/rdoc/created.rid
-- doc/rdoc/files
-- doc/rdoc/fr_class_index.html
-- doc/rdoc/fr_file_index.html
-- doc/rdoc/fr_method_index.html
-- doc/rdoc/index.html
-- doc/rdoc/rdoc-style.css
-- doc/rdoc/classes/Merb
-- doc/rdoc/classes/Merb.html
-- doc/rdoc/classes/Merb/Config.html
-- doc/rdoc/files/lib
-- doc/rdoc/files/LICENSE.html
-- doc/rdoc/files/README.html
-- doc/rdoc/files/server_rb.html
-- doc/rdoc/files/lib/merb_config_rb.html
-- doc/rdoc/files/lib/merb_rb.html
 - test/test_helper.rb
 - test/unit
 - test/unit/route_matcher_test.rb

data/doc/rdoc/classes/Merb/Config.html DELETED Viewed

@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>Class: Merb::Config</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <meta http-equiv="Content-Script-Type" content="text/javascript" />
-  <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
-  <script type="text/javascript">
-  // <![CDATA[
-  function popupCode( url ) {
-    window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
-  }
-  function toggleCode( id ) {
-    if ( document.getElementById )
-      elem = document.getElementById( id );
-    else if ( document.all )
-      elem = eval( "document.all." + id );
-    else
-      return false;
-    elemStyle = elem.style;
-    if ( elemStyle.display != "block" ) {
-      elemStyle.display = "block"
-    } else {
-      elemStyle.display = "none"
-    }
-    return true;
-  }
-  // Make codeblocks hidden by default
-  document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" )
-  // ]]>
-  </script>
-</head>
-<body>
-    <div id="classHeader">
-        <table class="header-table">
-        <tr class="top-aligned-row">
-          <td><strong>Class</strong></td>
-          <td class="class-name-in-header">Merb::Config</td>
-        </tr>
-        <tr class="top-aligned-row">
-            <td><strong>In:</strong></td>
-            <td>
-                <a href="../../files/lib/merb_config_rb.html">
-                lib/merb_config.rb
-                </a>
-        <br />
-            </td>
-        </tr>
-        <tr class="top-aligned-row">
-            <td><strong>Parent:</strong></td>
-            <td>
-                Object
-            </td>
-        </tr>
-        </table>
-    </div>
-  <!-- banner header -->
-  <div id="bodyContent">
-  <div id="contextContent">
-   </div>
-    <div id="method-list">
-      <h3 class="section-bar">Methods</h3>
-      <div class="name-list">
-      <a href="#M000001">setup</a>&nbsp;&nbsp;
-      </div>
-    </div>
-  </div>
-    <!-- if includes -->
-    <div id="section">
-    <!-- if method_list -->
-    <div id="methods">
-      <h3 class="section-bar">Public Class methods</h3>
-      <div id="method-M000001" class="method-detail">
-        <a name="M000001"></a>
-        <div class="method-heading">
-          <a href="#M000001" class="method-signature">
-          <span class="method-name">setup</span><span class="method-args">()</span>
-          </a>
-        </div>
-        <div class="method-description">
-          <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000001-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000001-source">
-<pre>
-    <span class="ruby-comment cmt"># File lib/merb_config.rb, line 5</span>
- 5:   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">setup</span>
- 6:     <span class="ruby-identifier">defaults</span> = {
- 7:       <span class="ruby-identifier">:host</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">&quot;0.0.0.0&quot;</span>,
- 8:       <span class="ruby-identifier">:port</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">&quot;4000&quot;</span>,
- 9:       <span class="ruby-identifier">:allow_reloading</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-keyword kw">true</span>,
-10:       <span class="ruby-identifier">:merb_root</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-constant">Dir</span>.<span class="ruby-identifier">pwd</span>
-11:     }
-12:
-13:     <span class="ruby-keyword kw">begin</span>
-14:       <span class="ruby-identifier">options</span> = <span class="ruby-identifier">defaults</span>.<span class="ruby-identifier">merge</span>(<span class="ruby-constant">YAML</span>.<span class="ruby-identifier">load</span>(<span class="ruby-constant">ERB</span>.<span class="ruby-identifier">new</span>(<span class="ruby-constant">IO</span>.<span class="ruby-identifier">read</span>(<span class="ruby-node">&quot;#{defaults[:merb_root]}/conf/merb.yml&quot;</span>)).<span class="ruby-identifier">result</span>))
-15:     <span class="ruby-keyword kw">rescue</span>
-16:       <span class="ruby-identifier">options</span> = <span class="ruby-identifier">defaults</span>
-17:     <span class="ruby-keyword kw">end</span>
-18:
-19:     <span class="ruby-identifier">options</span>
-20:   <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-<div id="validator-badges">
-  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
-</div>
-</body>
-</html>