merb 0.0.6 → 0.0.7

data/README

@@ -7,6 +7,15 @@ for simple dynamic pages.
 
 **Sample APP included**
 
+**Important**
+The new default filename extensions for templates are as follows:
+html ->  .herb
+js   ->  .jerb
+xml  ->  .xerb
+
+You can change the extensions to anything you want in your config file in
+yourapp/dist/conf/merb.yml. See the default settings in the sample app.
+
 Unpack the gem and grab the sample app
 
 $ gem unpack merb
@@ -19,10 +28,19 @@ $ merb
 then the sample app will be running on port 4000 in the foreground. 
 you can go to a few urls:
 
-http://localhost:4000/upload/start
+You will need the mongrel_upload_progress gem installed to go to /files
+
+http://localhost:4000/files/start
 
 http://localhost:4000/foo/123/baz/12234345
 
+If you have checked out merb trunk from svn you will want to build and install
+the gem to use merb. Run this command from the root of the merb svn checkout
+to do that:
+
+$ sudo rake install
+
+*note* you may have to run this comand twice if it fails the first time.
 
 **FEATURES** 1. Mongrel handler built in that parses incoming requests
 including multipart uploads and post as well as ?query=strings. Puts the
@@ -63,7 +81,7 @@ lambda{|path|
 3. Simple controller classes with built in render method and template handling
 with instance vars available in the views automatically. Merb also supports 
 layouts. It will look for a layout named after your controller class first and
-then fall back to application.rhtml if no layout exists named after your controller.
+then fall back to application.herb if no layout exists named after your controller.
 You can use render_no_layout or do layout :none right before you render
 
 
@@ -105,10 +123,10 @@ def ajax_action
   render_js
 end
 
-# ajax_action.merbjs
+# ajax_action.jerb
 $('comments').update('<%= escape_js(partial(:posts)) %>');
 
-# _posts.rhtml
+# _posts.herb
 <ul>
   <% @posts.each do |p| %>
     <li>

data/Rakefile

@@ -6,10 +6,11 @@ require 'rake/testtask'
 require 'spec/rake/spectask'
 require 'code_statistics' 
 require 'fileutils'
+require File.dirname(__FILE__)+'/tools/rakehelp'
 include FileUtils
 
 NAME = "merb"
-VERS = "0.0.6"
+VERS = "0.0.7"
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']
 RDOC_OPTS = ['--quiet', '--title', "Merb Documentation",
   "--opname", "index.html",
@@ -17,12 +18,21 @@ RDOC_OPTS = ['--quiet', '--title', "Merb Documentation",
   "--main", "README",
   "--inline-source"]
 
+setup_clean [ "pkg", "lib/*.bundle", "*.gem", 
+            "doc", ".config", "examples/sample_app/dist/public/files/**/*"]
+
+
 desc "Packages up Merb."
 task :default => [:package]
-task :package => [:clean]
+task :package => [:really_clean, :clean, :rdoc]
 
 task :doc => [:rdoc]
 
+task :really_clean do
+  rm_rf 'examples/sample_app/log/*'
+end  
+
+
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'doc/rdoc'
   rdoc.options += RDOC_OPTS
@@ -48,9 +58,10 @@ spec = Gem::Specification.new do |s|
 
   s.add_dependency('mongrel')
   s.add_dependency('erubis')
+  s.add_dependency('json')
   s.required_ruby_version = '>= 1.8.4'
 
-  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{app,bin,doc,test,lib,examples}/**/*") 
+  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{app,bin,test,lib,examples}/**/*") 
       
   s.require_path = "lib"
   s.bindir = "bin"
@@ -62,6 +73,7 @@ Rake::GemPackageTask.new(spec) do |p|
 end
 
 task :install do
+  sh %{rake clean}
   sh %{rake package}
   sh %{sudo gem install pkg/#{NAME}-#{VERS}}
 end

data/TODO

@@ -4,14 +4,13 @@
 * Helpers
 * config file **DONE**
 * session
-  ** AR
+  ** AR ** DONE **
   ** DRb
 * Rails integration
-* Mongoose ?
 * Text backend?
 * plugins support(rails plugins too?)
 * Layouts **DONE**
 * auto template_dir **DONE**
-* before/after filters
+* before/after filters **DONE**
 * merbjs **DONE**
 * testing

data/bin/merb

@@ -4,6 +4,8 @@ require 'optparse'
 require 'ostruct'
 require 'fileutils'
 require 'yaml'
+require 'erubis'
+
 module Merb
 end
 
@@ -13,11 +15,11 @@ class Merb::Config
       :host => "0.0.0.0",
       :port => "4000",
       :allow_reloading => true,
-      :merb_root => Dir.pwd
+      :merb_root => Dir.pwd,
+      :template_ext => {:html => :herb, :js => :jerb, :xml => :xerb}
     }
-
     begin
-      options = defaults.merge(YAML.load(ERB.new(IO.read("#{defaults[:merb_root]}/dist/conf/merb.yml")).result))
+      options = defaults.merge(YAML.load(Erubis::Eruby.new(IO.read("#{defaults[:merb_root]}/dist/conf/merb.yml")).result))
     rescue
       options = defaults
     end
@@ -47,10 +49,6 @@ class Merb::Server
       opts.on("-p", "--port [Integer]") do |port|
         options[:port] = port
       end
-      
-      opts.on("-n", "--num-procs [Integer]") do |numprocs|
-        options[:numprocs] = numprocs
-      end
 
       opts.on("-h", "--host [String]") do |host|
         options[:host] = host
@@ -64,9 +62,12 @@ class Merb::Server
         options[:console] = true
       end
       
-      opts.on("-s", "--session-on") do |session|
-        require 'active_record'
-        options[:session] = true
+      opts.on("-s", "--session-drb-port [Integer]") do |drb_port|
+        options[:session] = drb_port
+      end
+      
+      opts.on("-l", "--log-level [String]") do |loglevel|
+        options[:log_level] = loglevel
       end
       
     end
@@ -79,19 +80,23 @@ class Merb::Server
     puts @@merb_opts.to_yaml; puts
   end
 
+  def self.initialize_merb
+    require 'merb'
+    require @@merb_opts[:merb_root]+'/dist/conf/router.rb'
+    require @@merb_opts[:merb_root]+'/dist/conf/merb_init.rb'
+  end  
+
   def self.run
     @@merb_raw_opts = ARGV
     merb_config
     
     @@merb_opts[:dist_root] = @@merb_opts[:merb_root]+'/dist' 
+    $LOAD_PATH.unshift( File.join(@@merb_opts[:dist_root] , '/app/controllers') )
+    $LOAD_PATH.unshift( File.join(@@merb_opts[:dist_root] , '/app/models') )
+    $LOAD_PATH.unshift( File.join(@@merb_opts[:dist_root] , '/lib') )
     
-    $LOAD_PATH.unshift( File.join(@@merb_opts[:merb_root] , '/dist/app/controllers') )
-    $LOAD_PATH.unshift( File.join(@@merb_opts[:merb_root] , '/dist/lib') )
-    require 'merb'
-    require @@merb_opts[:merb_root]+'/dist/conf/router.rb'
-    require @@merb_opts[:merb_root]+'/dist/conf/merb_init.rb'
-
     if @@merb_opts[:console]
+      initialize_merb
       ARGV.clear # Avoid passing args to IRB 
       require 'irb' 
       require 'irb/completion' 
@@ -105,57 +110,77 @@ class Merb::Server
       exit!
     end
     
+    if @@merb_opts[:session]
+      start(@@merb_opts[:session], :drbserver_start)
+    end  
+    
     if @@merb_opts[:cluster]
-      delete_pidfile
+      delete_pidfiles
       @@merb_opts[:port].to_i.upto(@@merb_opts[:port].to_i+@@merb_opts[:cluster].to_i-1) do |port|
         puts "Starting merb server on port: #{port}"
         start(port)
       end   
     elsif @@merb_opts[:daemonize]
-      delete_pidfile
+      delete_pidfiles(@@merb_opts[:port])
       start(@@merb_opts[:port])
     else
-      trap('INT') {exit}
+      initialize_merb
+      trap('TERM') { exit }
       mongrel_start(@@merb_opts[:port])
     end     
 
   end
 
-  def self.store_pid(pid)
-    File.open("#{@@merb_opts[:merb_root]}/log/merb.pid", 'a'){|f| f.write("#{Process.pid}\n")}
+  def self.store_pid(pid,port)
+    File.open("#{@@merb_opts[:merb_root]}/log/merb.#{port}.pid", 'w'){|f| f.write("#{Process.pid}\n")}
   end  
 
-  def self.start(port)
+  def self.start(port,what=:mongrel_start)
     fork do
       Process.setsid
       exit if fork
-      store_pid(Process.pid)
+      if what == :mongrel_start
+        store_pid(Process.pid, port)
+      else
+        store_pid(Process.pid, "drb.#{port}")
+      end
       Dir.chdir @@merb_opts[:merb_root]
       File.umask 0000
       STDIN.reopen "/dev/null"
       STDOUT.reopen "/dev/null", "a"
       STDERR.reopen STDOUT
       trap("TERM") { exit }
-      mongrel_start(port)
+      send(what, port)
     end
   end
   
-  def self.delete_pidfile
-    FileUtils.rm("#{@@merb_opts[:merb_root]}/log/merb.pid")  rescue nil
+  def self.delete_pidfiles(portor_star='*')
+    Dir["#{@@merb_opts[:merb_root]}/log/merb.#{portor_star}.pid"].each do |pid|
+      FileUtils.rm(pid)  rescue nil
+    end
   end  
   
-  def self.start_cluster(ports)
-    delete_pidfile
-    ports.each do |p|
-      start(port)
-    end
-  end
+  def self.drbserver_start(port)
+    require 'merb/session/merb_drb_server'
+    DRb.start_service("druby://#{@@merb_opts[:host]}:#{port}", Merb::DRbSession.setup)
+    DRb.thread.join
+  end  
 
   def self.mongrel_start(port)
-    h = Mongrel::HttpServer.new((@@merb_opts[:host]||"0.0.0.0"), (port ||4000), (@@merb_opts[:numprocs]||100))
-    h.register("/", MerbHandler.new(@@merb_opts[:dist_root]+'/public'))
-    h.register("/favicon.ico", Mongrel::Error404Handler.new(""))
-    h.run.join
+    initialize_merb
+
+    config = Mongrel::Configurator.new :host => (@@merb_opts[:host]||"0.0.0.0"), :port => (port ||4000) do
+      load_plugins( :includes => ["mongrel"], :excludes => ["rails"] ) if @@merb_opts[:config]
+      listener do
+        run_config(@@merb_opts[:config]) if @@merb_opts[:config]
+        uri "/", :handler => MerbHandler.new(@@merb_opts[:dist_root]+'/public')
+        uri "/favicon.ico", :handler => Mongrel::Error404Handler.new("")
+      end
+
+      trap("INT") { stop }
+      run
+    end
+    config.join
   end  
 
   def self.config

data/examples/sample_app/dist/app/controllers/files.rb

@@ -0,0 +1,31 @@
+class Files < Merb::Controller
+  
+  def start
+    render_no_layout
+  end
+  
+  def index
+    @args = params
+    render 'start'
+  end  
+  
+  def upload
+    puts params.inspect
+    
+    FileUtils.mv params[:data][:tempfile].path, 
+                 Merb::Server.config[:dist_root]+"/public/files/#{params[:data][:filename]}"
+    render_no_layout
+  end
+  
+  def progress
+    puts params.inspect
+    Mongrel::Uploads.debug = true
+    @upstatus = Mongrel::Uploads.check(params[:upload_id])
+    render_js 'progress'
+  end
+  
+  def file
+    send_file DIST_ROOT+'/public/files/'+params[:file]
+  end
+
+end

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

@@ -2,7 +2,8 @@
 class Posts < Merb::Controller
   
   def new
-    #session[:foo] = 'bar'
+    session[:foo] = 'bar'
+    puts session.sess_id
     render
   end  
   
@@ -12,12 +13,35 @@ class Posts < Merb::Controller
   end
     
   def show
-    #puts session[:foo]
+    puts session[:foo]
+    session[:foo] = 'changed'
     @post = Post.find params[:id]
     @comments = @post.comments
     render
   end
   
+  def test
+    puts "protocol: #{protocol}"
+    puts "ssl?: #{ssl?}"
+    puts "uri: #{uri}"
+    puts "path: #{path}"
+    puts "path_info: #{path_info}"
+    puts "port: #{port}"
+    puts "host: #{host}"
+    puts "domain: #{domain}"
+    puts "get?: #{get?}"
+    puts "post?: #{post?}"
+    puts "put?: #{put?}"
+    puts "delete?: #{delete?}"
+    puts "head?: #{head?}"
+    puts "xhr?: #{xhr?}"
+    puts @env.inspect
+  end
+  
+  def xml_test
+    render_xml
+  end  
+  
   def list
     @posts = Post.find :all, :limit => 4
     render

data/examples/sample_app/dist/app/controllers/test.rb

@@ -1,11 +1,12 @@
 
 class Test < Merb::Controller
   
-  before :bfilter
+  before :authenticate
   before lambda{|c| puts 'lambda filter called'}
   
   def bfilter
     puts "Filter Called!"
+    #throw :halt
   end
   
   def hello
@@ -18,6 +19,11 @@ class Test < Merb::Controller
     "<html><body><h2>#{params[:rest]}</h2></body></html>"
   end  
   
+  def json
+    @post = Post.find :first
+    render_js
+  end  
+  
   def foo
     @args = params
     render

data/examples/sample_app/dist/app/views/files/progress.jerb

@@ -0,0 +1,3 @@
+<% if @upstatus %>
+UploadProgress.update(<%= @upstatus[:size] %>, <%= @upstatus[:received] %>);
+<% end %>

data/examples/sample_app/dist/app/views/files/start.herb

@@ -0,0 +1,62 @@
+<html>
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+    <title>mongrel test</title>
+    <script src="/javascripts/prototype.js" type="text/javascript"></script>
+	<script src="/javascripts/effects.js" type="text/javascript"></script>
+	<script src="/javascripts/mup.js" type="text/javascript"></script>
+	
+<style type="text/css">
+#progress-bar {
+  width:500px;
+  height:25px;
+  margin:15px;
+  border:solid 1px #000;
+  position:relative;
+}
+
+#progress-bar #status-bar {
+  display:block;
+  height:25px;
+  width:0;
+  background-color:#00f;
+  border-right:solid 1px #000;
+  position:absolute;
+  top:0; left:0;
+}
+
+#progress-bar #status-text {
+  display:block;
+  padding: 0 15px;
+  line-height:25px;
+  position:absolute;
+  top:0; left:0;
+}
+</style>
+  </head>
+  <body>
+	
+<h2>Test file uploading.</h2>
+<%= @upid = Time.now.to_i.to_s %>
+<form action="/files/upload?upload_id=<%= @upid %>" 
+	enctype="multipart/form-data" target='upload' method="post"
+	onsubmit="UploadProgress.monitor('<%= escape_js @upid %>')">
+
+  <dl>
+    <dt><label>Select a file</label></dt>
+    <dd><input name="data" type="file" /></dd>
+  </dl>
+
+
+  <p>
+    <input name="commit" type="submit" value="Upload" />
+  </p>
+</form>
+
+<div id="results"></div>
+<div id="progress-bar"></div>
+
+<iframe id="upload" name="upload" src="about:blank"></iframe>
+
+  </body>
+</html>