app/helpers/global_helpers.rb
app/models/merb/session.rb
autotest/discover.rb
autotest/merb.rb
autotest/merb_rspec.rb
config/environments/rake.rb
config/environments/staging.rb
merb.thor
public/favicon.ico
public/robots.txt
spec/spec.opts
test/test_helper.rb
@@ -1,4 +1,5 @@
class Exceptions < Application
+
# handle NotFound exceptions (404)
def not_found
render :format => :html
app/controllers/exceptions.rb
@@ -1,7 +1,7 @@
<html>
<head>
- <meta http-equiv="Content-type" content="text/html; charset=utf-8">
- <title><%= @exception.name.humanize %></title>
+ <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+ <title><%= @exception_name %></title>
<style type="text/css" media="screen">
body {
font-family:arial;
@@ -105,6 +105,10 @@
font-weight:bold;
color:#00BF10;
}
+ table.trace tr td.code a {
+ width: 20px;
+ float: left;
+ }
table.trace tr td.code .more {
color:#666;
}
@@ -125,34 +129,34 @@
<div class="internalError">
<div class="header">
- <h1><%= @exception.name.humanize %> <sup class="error_<%= @exception.class::STATUS %>"><%= @exception.class::STATUS %></sup></h1>
- <% if show_details = ::Merb::Server.config[:exception_details] -%>
- <h2><%= @exception.message %></h2>
+ <h1><%= @exception_name %> <sup class="error_<%= @exception.class::STATUS %>"><%= @exception.class::STATUS %></sup></h1>
+ <% if show_details = ::Merb::Config[:exception_details] -%>
+ <h2><%=h @exception.message %></h2>
<% else -%>
<h2>Sorry about that...</h2>
<% end -%>
<h3>Parameters</h3>
<ul>
- <% controller.params[:original_params].each do |param, value| %>
+ <% params[:original_params].each do |param, value| %>
<li><strong><%= param %>:</strong> <%= value.inspect %></li>
<% end %>
- <%= "<li>None</li>" if controller.params[:original_params].empty? %>
+ <%= "<li>None</li>" if params[:original_params].empty? %>
</ul>
<h3>Session</h3>
<ul>
- <% controller.params[:original_session].each do |param, value| %>
+ <% params[:original_session].each do |param, value| %>
<li><strong><%= param %>:</strong> <%= value.inspect %></li>
<% end %>
- <%= "<li>None</li>" if controller.params[:original_session].empty? %>
+ <%= "<li>None</li>" if params[:original_session].empty? %>
</ul>
<h3>Cookies</h3>
<ul>
- <% controller.params[:original_cookies].each do |param, value| %>
+ <% params[:original_cookies].each do |param, value| %>
<li><strong><%= param %>:</strong> <%= value.inspect %></li>
<% end %>
- <%= "<li>None</li>" if controller.params[:original_cookies].empty? %>
+ <%= "<li>None</li>" if params[:original_cookies].empty? %>
</ul>
</div>
@@ -164,17 +168,22 @@
<td class="expand">
</td>
<td class="path">
- <%= (line.match(/^([^:]+)/)[1] rescue 'unknown').sub(/\/((opt|usr)\/local\/lib\/(ruby\/)?(gems\/)?(1.8\/)?(gems\/)?|.+\/app\/)/, '') %> in "<strong><%= line.match(/:in `(.+)'$/)[1] rescue '?' %></strong>"
+ <%= (line.match(/^([^:]+)/)[1] rescue 'unknown').sub(/\/((opt|usr)\/local\/lib\/(ruby\/)?(gems\/)?(1.8\/)?(gems\/)?|.+\/app\/)/, '') %>
+ <% unless line.match(/\.erb:/) %>
+ in "<strong><%= line.match(/:in `(.+)'$/)[1] rescue '?' %></strong>"
+ <% else %>
+ (<strong>ERB Template</strong>)
+ <% end %>
</td>
<td class="line">
- <a href="txmt://open?url=file://<%=file = (line.match(/^([^:]+)/)[1] rescue 'unknown')%>&line=<%= lineno = line.match(/:([0-9]+):/)[1] rescue '?' %>"><%=lineno%></a>
+ <a href="txmt://open?url=file://<%=file = (line.match(/^([^:]+)/)[1] rescue 'unknown')%>&line=<%= lineno = line.match(/:([0-9]+):/)[1] rescue '?' %>"><%=lineno%></a>
</td>
</tr>
<tr class="source">
<td class="collapse">
</td>
<td class="code" colspan="2"><% (__caller_lines__(file, lineno, 5) rescue []).each do |llineno, lcode, lcurrent| %>
-<a href="txmt://open?url=file://<%=file%>&line=<%=llineno%>"><%= llineno %></a><%='<em>' if llineno==lineno.to_i %><%= lcode.size > 90 ? lcode[0..90]+'<span class="more">......</span>' : lcode %><%='</em>' if llineno==lineno.to_i %>
+<a href="txmt://open?url=file://<%=file%>&line=<%=llineno%>"><%= llineno %></a><%='<em>' if llineno==lineno.to_i %><%= lcode.size > 90 ? CGI.escapeHTML(lcode[0..90])+'<span class="more">......</span>' : CGI.escapeHTML(lcode) %><%='</em>' if llineno==lineno.to_i %>
<% end %>
</td>
app/views/exceptions/internal_server_error.html.erb
@@ -1,38 +1,63 @@
- <div id="container">
- <div id="header-container">
- <img src="/images/merb.jpg">
- <!-- <h1>Mongrel + Erb</h1> -->
- <h2>pocket rocket web framework</h2>
- <hr />
- </div>
-
- <div id="left-container">
- <h3>Exception:</h3>
- <p><%= params[:exception] %></p>
- </div>
-
- <div id="main-container">
- <h3>Why am I seeing this page?</h3>
- <p>Merb couldn't find an appropriate content_type to return,
- based on what you said was available via provides() and
- what the client requested. For more information, visit
- http://merbivore.com/fixing_406_issues
- </p>
+<div id="container">
+ <div id="header-container">
+ <img src="/images/merb.jpg" />
+ <!-- <h1>Mongrel + Erb</h1> -->
+ <h2>pocket rocket web framework</h2>
+ <hr />
+ </div>
+
+ <div id="left-container">
+ <h3>Exception:</h3>
+ <p><%= request.exceptions.first.message %></p>
+ </div>
+
+ <div id="main-container">
+ <h3>Why am I seeing this page?</h3>
+ <p>Merb couldn't find an appropriate content_type to return,
+ based on what you said was available via provides() and
+ what the client requested.</p>
+
+ <h3>How to add a mime-type</h3>
+ <pre><code>
+ Merb.add_mime_type :pdf, :to_pdf, %w[application/pdf], "Content-Encoding" => "gzip"
+ </code></pre>
+ <h3>What this means is:</h3>
+ <ul>
+ <li>Add a mime-type for :pdf</li>
+ <li>Register the method for converting objects to PDF as <code>#to_pdf</code>.</li>
+ <li>Register the incoming mime-type "Accept" header as <code>application/pdf</code>.</li>
+ <li>Specify a new header for PDF types so it will set <code>Content-Encoding</code> to gzip.</li>
+ </ul>
+
+ <h3>You can then do:</h3>
+ <pre><code>
+ class Foo < Application
+ provides :pdf
+ end
+ </code></pre>
+
+ <h3>Where can I find help?</h3>
+ <p>If you have any questions or if you can't figure something out, please take a
+ look at our <a href="http://merbivore.com/"> project page</a>,
+ feel free to come chat at irc.freenode.net, channel #merb,
+ or post to <a href="http://groups.google.com/group/merb">merb mailing list</a>
+ on Google Groups.</p>
- <h3>Where can I find help?</h3>
- <p>If you have any questions or if you can't figure something out, please take a
- look at our <a href="http://merb.devjavu.com/"> project development page</a> or,
- feel free to come chat at irc.freenode.net, channel #merb.</p>
-
- <h3>How do I edit this page?</h3>
- <p>You can change what people see when this happens byy editing <tt>app/views/exceptions/not_found.html.erb</tt>.</p>
-
- </div>
-
- <div id="footer-container">
- <hr />
- <div class="left"></div>
- <div class="right">© 2007 the merb dev team</div>
- <p> </p>
- </div>
+ <h3>What if I've found a bug?</h3>
+ <p>If you want to file a bug or make your own contribution to Merb,
+ feel free to register and create a ticket at our
+ <a href="http://merb.lighthouseapp.com/">project development page</a>
+ on Lighthouse.</p>
+
+ <h3>How do I edit this page?</h3>
+ <p>You can change what people see when this happens by editing <tt>app/views/exceptions/not_acceptable.html.erb</tt>.</p>
+
+ </div>
+
+ <div id="footer-container">
+ <hr />
+ <div class="left"></div>
+ <div class="right">© 2008 the merb dev team</div>
+ <p> </p>
</div>
+</div>
app/views/exceptions/not_acceptable.html.erb
@@ -1,40 +1,47 @@
- <div id="container">
- <div id="header-container">
- <img src="/images/merb.jpg">
- <!-- <h1>Mongrel + Erb</h1> -->
- <h2>pocket rocket web framework</h2>
- <hr />
- </div>
+<div id="container">
+ <div id="header-container">
+ <img src="/images/merb.jpg" />
+ <!-- <h1>Mongrel + Erb</h1> -->
+ <h2>pocket rocket web framework</h2>
+ <hr />
+ </div>
- <div id="left-container">
- <h3>Exception:</h3>
- <p><%= params[:exception] %></p>
- </div>
+ <div id="left-container">
+ <h3>Exception:</h3>
+ <p><%= request.exceptions.first.message %></p>
+ </div>
- <div id="main-container">
- <h3>Welcome to Merb!</h3>
- <p>Merb is a light-weight MVC framework written in Ruby. We hope you enjoy it.</p>
+ <div id="main-container">
+ <h3>Welcome to Merb!</h3>
+ <p>Merb is a light-weight MVC framework written in Ruby. We hope you enjoy it.</p>
+
+ <h3>Where can I find help?</h3>
+ <p>If you have any questions or if you can't figure something out, please take a
+ look at our <a href="http://merbivore.com/"> project page</a>,
+ feel free to come chat at irc.freenode.net, channel #merb,
+ or post to <a href="http://groups.google.com/group/merb">merb mailing list</a>
+ on Google Groups.</p>
- <h3>Where can I find help?</h3>
- <p>If you have any questions or if you can't figure something out, please take a
- look at our <a href="http://merb.devjavu.com/"> project development page</a> or,
- feel free to come chat at irc.freenode.net, channel #merb.</p>
+ <h3>What if I've found a bug?</h3>
+ <p>If you want to file a bug or make your own contribution to Merb,
+ feel free to register and create a ticket at our
+ <a href="http://merb.lighthouseapp.com/">project development page</a>
+ on Lighthouse.</p>
- <h3>How do I edit this page?</h3>
- <p>You're seeing this page because you need to edit the following files:
- <ul>
- <li>config/merb.yml <strong><em>(optional)</em></strong></li>
- <li>config/router.rb <strong><em>(recommended)</em></strong></li>
- <li>app/views/exceptions/not_found.html.erb <strong><em>(recommended)</em></strong></li>
- <li>app/views/layout/application.html.erb <strong><em>(change this layout)</em></strong></li>
- </ul>
- </p>
- </div>
+ <h3>How do I edit this page?</h3>
+ <p>You're seeing this page because you need to edit the following files:
+ <ul>
+ <li>config/router.rb <strong><em>(recommended)</em></strong></li>
+ <li>app/views/exceptions/not_found.html.erb <strong><em>(recommended)</em></strong></li>
+ <li>app/views/layout/application.html.erb <strong><em>(change this layout)</em></strong></li>
+ </ul>
+ </p>
+ </div>
- <div id="footer-container">
- <hr />
- <div class="left"></div>
- <div class="right">© 2007 the merb dev team</div>
- <p> </p>
- </div>
+ <div id="footer-container">
+ <hr />
+ <div class="left"></div>
+ <div class="right">© 2008 the merb dev team</div>
+ <p> </p>
</div>
+</div>
app/views/exceptions/not_found.html.erb
@@ -1,7 +1,10 @@
Merb.logger.info("Loaded DEVELOPMENT Environment...")
Merb::Config.use { |c|
c[:exception_details] = true
+ c[:reload_templates] = true
c[:reload_classes] = true
c[:reload_time] = 0.5
c[:log_auto_flush ] = true
+ c[:ignore_tampered_cookies] = true
+ c[:log_level] = :debug
}
\ No newline at end of file
config/environments/development.rb
@@ -2,6 +2,6 @@ Merb.logger.info("Loaded PRODUCTION Environment...")
Merb::Config.use { |c|
c[:exception_details] = false
c[:reload_classes] = false
- c[:log_level] = :info
+ c[:log_level] = :error
c[:log_file] = Merb.log_path + "/production.log"
}
\ No newline at end of file
config/environments/production.rb
@@ -1 +1,8 @@
-puts "Loaded TEST Environment..."
\ No newline at end of file
+Merb.logger.info("Loaded TEST Environment...")
+Merb::Config.use { |c|
+ c[:testing] = true
+ c[:exception_details] = true
+ c[:log_auto_flush ] = true
+ c[:log_level] = :fatal
+ c[:log_file] = Merb.log_path / 'merb_test.log'
+}
config/environments/test.rb
public/images/merb.jpg
@@ -1,6 +1,22 @@
#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'merb-core'
-ARGV=["-F"]
-require 'merb/server'
-
-Merb::Server.run
+# this is Merb.root, change this if you have some funky setup.
+merb_root = File.expand_path(File.dirname(__FILE__) / '../')
+
+# If the fcgi process runs as apache, make sure
+# we have an inlinedir set for Rubyinline action-args to work
+unless ENV["INLINEDIR"] || ENV["HOME"]
+ tmpdir = merb_root / "tmp"
+ unless File.directory?(tmpdir)
+ Dir.mkdir(tmpdir)
+ end
+ ENV["INLINEDIR"] = tmpdir
+end
+
+# start merb with the fcgi adapter, add options or change the log dir here
+Merb.start(:adapter => 'fcgi',
+ :merb_root => merb_root,
+ :log_file => merb_root /'log'/'merb.log')
\ No newline at end of file
public/merb.fcgi
fcf08b342b45452e9c034ca5e0bc9c48b912ef6d
Martyn Loughran
martyn@new-bamboo.co.uk
http://github.com/twinge/panda/commit/10dbe439374abbc311fa879a69a526bbe7a4c176
10dbe439374abbc311fa879a69a526bbe7a4c176
2008-10-20T11:59:12-07:00
2008-10-20T11:56:44-07:00
Update merb app for 0.9.8
334e12e0c6639c6ca7bfe518bb1fe49f5e869a90
Martyn Loughran
martyn@new-bamboo.co.uk