ramaze 0.2.1 → 0.3.0

data/lib/proto/spec/main.rb

@@ -0,0 +1,27 @@
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require 'ramaze'
+require 'ramaze/spec/helper'
+
+require __DIR__/'..'/'start'
+
+describe MainController do
+  behaves_like 'http', 'xpath'
+  ramaze :template_root => __DIR__/'../view',
+         :public_root => __DIR__/'../public'
+
+  it 'should show start page' do
+    got = get('/')
+    got.status.should == 200
+    got.at_xpath('//title').text.strip.should ==
+      MainController.new.index
+  end
+
+  it 'should show /notemplate' do
+    got = get('/notemplate')
+    got.status.should == 200
+    got.at_xpath('//body').text.strip.should ==
+      MainController.new.notemplate
+  end
+end

data/lib/proto/start.rb

@@ -1,11 +1,11 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
 require 'rubygems'
 require 'ramaze'
 
-require 'src/controller/main'
-require 'src/element/page'
-require 'src/model'
+# require all controllers and models
+acquire __DIR__/:controller/'*'
+acquire __DIR__/:model/'*'
 
-Ramaze.start :port => 7000
+Ramaze.start :adapter => :webrick, :port => 7000

data/lib/proto/view/error.xhtml

@@ -0,0 +1,62 @@
+<link rel="stylesheet" href="/css/ramaze_error.css" />
+<script type="text/javascript" src="/js/jquery.js"></script>
+
+<p>The backtrace gives filenames and line numbers for all parts of the call stack.<br />
+Click on any of them to view the surrounding source code.</p>
+
+<table class="main">
+  <tr class="head">
+    <td>File</td><td>Line</td><td>Method</td>
+  </tr>
+  <?r @backtrace.each do |lines, hash, file, lineno, meth| ?>
+    <tr class="line" id="#{hash}">
+      <td>#{file}</td><td class="lineno">#{lineno}</td><td><pre>#{meth}</pre></td>
+    </tr>
+    <tr id="source_#{hash}" style="display:none;">
+      <td colspan="3">
+        <div class="source">
+          <table style="width:100%;">
+            <tr>
+              <td class="editor" colspan="2">
+                #{@editor} #{file} +#{lineno}
+                <div style="float: right">
+                  <a href="txmt://open?url=file://#{file}&line=#{lineno}">open in textmate</a>
+                </div>
+              </td>
+            </tr>
+            <?r lines.each do |llineno, lcode, lcurrent| ?>
+              <tr class="source" #{'style="background:#faa;"' if lcurrent}>
+                <td class="lineno">#{llineno}</td>
+                <td class="code"><pre>#{lcode.to_s.rstrip}</pre></td>
+              </tr>
+            <?r end ?>
+          </table>
+        </div>
+      </td>
+    </tr>
+  <?r end ?>
+</table>
+
+<?r
+  { 'Session'   => Thread.current[:session],
+    'Request'   => Thread.current[:request],
+    'Response'  => Thread.current[:response],
+    'Global'    => Global,
+  }.each do |title, content|
+    hash = [title, content].object_id.abs
+  ?>
+  <div class="additional">
+    <h3 id="#{hash}">#{title}</h3>
+    <pre style="display:none" id="is_#{hash}">#{CGI.escapeHTML(content.pretty_inspect)}</pre>
+  </div>
+<?r end ?>
+
+<script type="text/javascript">
+  $("tr.line").click(function(){
+    $("tr#source_"+this.id).toggle()
+  });
+
+  $("div.additional > h3").click(function(){
+    $("pre#is_"+this.id).toggle()
+  });
+</script>

data/lib/proto/view/index.xhtml

@@ -0,0 +1,34 @@
+<p>Ramaze is working correctly with this application, now you can start
+working.</p>
+
+<p>To start you can modify:
+<ol>
+  <li>
+    <code>view/index.xhtml</code>, this page.
+  </li>
+  <li>
+    <code>view/page.xhtml</code>, the layout for this page.
+  </li>
+  <li>
+    <code>controller/main.rb</code>, where you can change the header of this
+    page and the <a href="/notemplate">notemplate</a> action
+  </li>
+</ol>
+</p>
+
+<p>For more documentation, check out <a href="http://ramaze.net">www.ramaze.net</a>, which includes:
+<ul>
+  <li>a <a href="http://ramaze.net/getting-started">getting started</a> guide</li>
+  <li>some <a href="http://ramaze.net/screencasts">screencasts</a></li>
+  <li>and an <a href="http://ramaze.rubyforge.org/tutorial/todolist.html">introductory tutorial</a></li>
+</ul>
+</p>
+
+<p>You can also read the
+<a href="http://ramaze.rubyforge.org/rdoc/files/doc/README.html">rdocs</a> or browse
+around the <a href="http://source.ramaze.net">Ramaze source code</a>.
+</p>
+
+<p>For help with Ramaze, visit the <a href="irc://chat.freenode.net/ramaze">#ramaze on irc.freenode.net</a> (you can use <a href="http://java.freenode.net/?channel=ramaze">this browser-based frontend</a>),
+or post on the <a href="http://groups.google.com/group/ramaze">Ramaze Google Group</a>.
+  </p>

data/lib/proto/view/page.xhtml

@@ -0,0 +1,15 @@
+<html>
+  <head>
+    <title>#{@title}</title>
+    <style type="text/css">
+      body { margin: 2em; }
+      #content { margin-left: 2em; }
+    </style>
+  </head>
+  <body>
+    <h1>#{@title}</h1>
+    <div id="content">
+      #@content
+    </div>
+  </body>
+</html>

data/lib/ramaze.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
 require 'fileutils'
@@ -10,10 +10,11 @@ end
 
 # The main namespace for Ramaze
 module Ramaze
-  BASEDIR = File.dirname(File.expand_path(__FILE__))
   SEEED = $0.dup
   APPDIR = File.dirname(File.expand_path($0))
-  $:.unshift BASEDIR
+  BASEDIR = File.dirname(File.expand_path(__FILE__))
+  $LOAD_PATH.unshift BASEDIR
+  $LOAD_PATH.uniq!
 end
 
 Thread.abort_on_exception = true
@@ -35,6 +36,7 @@ require 'ramaze/sourcereload'
 require 'ramaze/dispatcher'
 require 'ramaze/template/ezamar'
 require 'ramaze/contrib'
+require 'ramaze/controller/main'
 
 module Ramaze
 
@@ -50,12 +52,12 @@ module Ramaze
     # each class in trait[:essentials] by calling ::startup on them.
 
     def startup options = {}
-      starter = options.fetch(:runner, caller[0].split(':').first)
+      runner = options.delete(:runner) || caller[0].split(':').first
 
-      if $0 == starter or options.delete(:force)
+      if $0 == runner or options.delete(:force)
         Inform.info("Starting up Ramaze (Version #{VERSION})")
-        SEEED.replace(starter)
-        APPDIR.replace(File.dirname(File.expand_path(starter)))
+        SEEED.replace(runner)
+        APPDIR.replace(File.dirname(File.expand_path(runner)))
 
         trait[:essentials].each do |obj|
           obj.startup(options)

data/lib/ramaze/action.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
 module Ramaze
@@ -84,9 +84,13 @@ module Ramaze
       return default if engines.empty?
 
       ext = File.extname(template).gsub(/^\./, '')
-      ext_engine = engines.find{|e| e.last.include?(ext)}.first
+      ext_engines = engines.reject{|k,v| not v.include?(ext) }
 
-      self[:engine] = (ext_engine || default)
+      if ext_engines.has_key?(default)
+        self[:engine] = default
+      else
+        self[:engine] = ext_engines.keys.sort.first
+      end
     end
 
     # Returns an instance of controller, will be cached on first access.

data/lib/ramaze/action/render.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
 module Ramaze
@@ -82,7 +82,10 @@ module Ramaze
                  after_process].join
 
       if path and tlayout = layout
-        instance.instance_variable_set("@content", content)
+        [instance, tlayout.instance].each do |i|
+          i.instance_variable_set("@content", content)
+        end
+
         content = tlayout.render
 
         # restore Action.current after render above
@@ -110,9 +113,16 @@ module Ramaze
           return false
         end
 
-        layout_action.binding = binding
-        layout_action.controller = controller
-        layout_action.instance = instance
+        unless layout_action.controller == controller
+          instance.instance_variables.each do |x|
+            layout_action.instance.instance_variable_set(x, instance.instance_variable_get(x))
+          end
+        else
+          layout_action.binding = binding
+          layout_action.controller = controller
+          layout_action.instance = instance
+        end
+
         layout_action.path = nil
         layout_action
       end

data/lib/ramaze/adapter.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
 require 'socket'
@@ -39,10 +39,10 @@ module Ramaze
         start_adapter
 
         Timeout.timeout(3) do
-          sleep 0.01 until Global.adapters.list.any?
+          sleep 0.01 until Global.adapters.any?
         end
 
-        Global.adapters.list.each{|a| a.join} unless Global.run_loose
+        Global.adapters.each{|a| a.join} unless Global.run_loose
 
       rescue SystemExit
         Ramaze.shutdown
@@ -79,13 +79,13 @@ module Ramaze
 
       def shutdown
         Timeout.timeout(1) do
-          Global.adapters.list.each do |adapter|
+          Global.adapters.each do |adapter|
             a = adapter[:adapter]
             a.shutdown if a.respond_to?(:shutdown)
           end
         end
       rescue Timeout::Error
-        Global.adapters.list.each{|a| a.kill! }
+        Global.adapters.each{|a| a.kill! }
         # Hard exit! because it won't be able to kill Webrick otherwise
         exit!
       end

data/lib/ramaze/adapter/base.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
 module Ramaze
@@ -36,7 +36,7 @@ module Ramaze
         def call(env)
           if Ramaze::Global.benchmarking
             time = Benchmark.measure{ respond(env) }
-            Inform.debug("request took #{time.real}s")
+            Inform.debug('request took %.5fs [~%.0f r/s]' % [time.real, 1.0/time.real])
           else
             respond env
           end

data/lib/ramaze/adapter/cgi.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
 require 'ramaze/adapter'

data/lib/ramaze/adapter/evented_mongrel.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
 Ramaze::Inform.debug "Using Evented Mongrel"

data/lib/ramaze/adapter/fcgi.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
 require 'ramaze/adapter'
@@ -12,7 +12,7 @@ module Ramaze::Adapter
       # start FastCGI in a new thread, host and port parameter are only taken
       # to make it compatible with other adapters but have no influence and
       # can be omitted
-      def start host = nil, ports = nil
+      def run_server host = nil, ports = nil
         Thread.new do
           Thread.current[:task] = :cgi
           Rack::Handler::FastCGI.run(self)

data/lib/ramaze/adapter/mongrel.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
 require 'mongrel'

data/lib/ramaze/adapter/swiftiplied_mongrel.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
 Ramaze::Inform.debug "Using Swiftiplied Mongrel"

data/lib/ramaze/adapter/thin.rb

@@ -0,0 +1,25 @@
+require 'thin'
+require 'ramaze/adapter'
+require 'rack/handler/thin'
+
+module Ramaze
+  module Adapter
+
+    class Thin < Base
+      class << self
+
+        # start server on given host and port.
+        def run_server host, port
+          server = ::Thin::Server.new(host, port, self)
+          server.silent = true
+          server.timeout = 3
+          server.start
+
+          thread = Thread.new{ server.listen! }
+          thread[:adapter] = server
+          thread
+        end
+      end
+    end
+  end
+end

data/lib/ramaze/adapter/webrick.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
 require 'ramaze/adapter'

data/lib/ramaze/cache.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
 require 'ramaze/cache/memory'
@@ -25,7 +25,8 @@ module Ramaze
       # Ramaze.trait(:essentials).
 
       def startup(options)
-        Cache.add :compiled, :actions, :patterns, :resolved, :shield
+        Cache.add :compiled, :actions, :patterns,
+                  :resolved, :shield, :action_methods
       end
 
       # This will define a method to access a new cache directly over

data/lib/ramaze/cache/memcached.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 require 'memcache'
 

data/lib/ramaze/cache/memory.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
 module Ramaze

data/lib/ramaze/cache/yaml_store.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 require 'yaml/store'
 

data/lib/ramaze/contrib.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
 module Ramaze

data/lib/ramaze/contrib/auto_params.rb

@@ -86,13 +86,20 @@ module Ramaze
     # use Method#get_args to insert values from request.params into Action#params
 
     def self.resolve_method(name, *params)
-      if method = [ name, name.gsub('__','/') ].find{|n| action_methods.delete(n) }
+      if method = [ name, name.gsub('__','/') ].find{|n|
+          cached_action_methods.include?(n) }
         meth = instance_method(method)
         arity = meth.arity
 
         if meth.respond_to? :get_args
-          Cache.args[name] ||= meth.get_args.select{|e| e.to_s !~ /^\*/} || []
-          args = Cache.args[name]
+          unless args = Cache.args[name]
+            if args = meth.get_args
+              args = args.select{|e| e.to_s !~ /^\*/}
+            else
+              args = []
+            end
+            Cache.args[name] = args
+          end
 
           param_keys = request.params.keys
 
@@ -100,7 +107,7 @@ module Ramaze
           if args.size > params.size or args.find{|k,v| param_keys.include?(k.to_s) }
             args.each_with_index do |(name, val), i|
               r_params = request.params[name.to_s]
-              if params[i] and r_params.size > 0
+              if params[i] and r_params and r_params.size > 0
                 params[i] = [params[i], r_params].flatten
               else
                 params[i] ||= r_params
@@ -125,4 +132,4 @@ module Ramaze
 
   end
 
-end
+end