config/dependencies.yml @@ -1,6 +1,18 @@ -config/database.yml* -db/*.sqlite3 -app/plugins/* -public/plugins* -public/favicon.ico +.DS_Store log/* +tmp/* +TAGS +*~ +.#* +schema/schema.rb +schema/*_structure.sql +schema/*.sqlite3 +schema/*.sqlite +schema/*.db +*.sqlite +*.sqlite3 +*.db +src/* +.hgignore +.hg/* +.svn/* \ No newline at end of file .gitignore @@ -1,25 +1,35 @@ require 'rubygems' -Gem.clear_paths -Gem.path.unshift(File.join(File.dirname(__FILE__), "gems")) - -require 'rake' require 'rake/rdoctask' -require 'rake/testtask' -require 'spec/rake/spectask' -require 'fileutils' + require 'merb-core' -require 'rubigen' +require 'merb-core/tasks/merb' + include FileUtils # Load the basic runtime dependencies; this will include # any plugins and therefore plugin rake tasks. init_env = ENV['MERB_ENV'] || 'rake' Merb.load_dependencies(:environment => init_env) - + # Get Merb plugins and dependencies -Merb::Plugins.rakefiles.each { |r| require r } +Merb::Plugins.rakefiles.each { |r| require r } -desc "start runner environment" +# Load any app level custom rakefile extensions from lib/tasks +tasks_path = File.join(File.dirname(__FILE__), "lib", "tasks") +rake_files = Dir["#{tasks_path}/*.rake"] +rake_files.each{|rake_file| load rake_file } + +desc "Start runner environment" task :merb_env do Merb.start_environment(:environment => init_env, :adapter => 'runner') -end \ No newline at end of file +end + +require 'spec/rake/spectask' +require 'merb-core/test/tasks/spectasks' +desc 'Default: run spec examples' +task :default => 'spec' + +############################################################################## +# ADD YOUR CUSTOM TASKS IN /lib/tasks +# NAME YOUR RAKE FILES file_name.rake +############################################################################## Rakefile @@ -1,10 +1,4 @@ class Exceptions < Application - layout :exceptions - - # handle internal server errors - def internal_server_error - render :format => :html - end # handle NotFound exceptions (404) def not_found @@ -15,4 +9,5 @@ class Exceptions < Application def not_acceptable render :format => :html end -end + +end \ No newline at end of file app/controllers/exceptions.rb @@ -1,63 +1,17 @@ +# This is a default user class used to activate merb-auth. Feel free to change from a User to +# Some other class, or to remove it altogether. If removed, merb-auth may not work by default. +# +# Don't forget that by default the salted_user mixin is used from merb-more +# You'll need to setup your db as per the salted_user mixin, and you'll need +# To use :password, and :password_confirmation when creating a user +# +# see config/merb-auth/setup.rb to see how to disable the salted_user mixin +# +# You will need to setup your database and create a user. class User include DataMapper::Resource - - property :id, Serial - property :login, String - property :name, String - property :email, String - property :crypted_password, String, :length => 150 - property :salt, String, :length => 150 - property :active, Boolean, :default => false - # property :identity_url, String - property :time_zone, String - property :default_formatter, String - - after :save, :set_create_activity - after :save, :set_update_activity - - validates_present :login, :email - validates_is_unique :login, :email - validates_format :email, :as => :email_address + property :id, Serial + property :login, String - attr_accessor :password, :password_confirmation - validates_is_confirmed :password - - before :save, :encrypt_password - - def active? - !!self.active - end - - def self.encrypt(salt, password = nil) - Digest::SHA1.hexdigest("--#{salt}--#{password}--") - end - - def self.authenticate(login, password) - u = self.first(:login => login) - return nil unless u - u.crypted_password == encrypt(u.salt, password) ? u : nil - end - - def encrypt_password - self.salt ||= Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{login}--") - self.crypted_password ||= User.encrypt(salt, password) - end - - def set_create_activity - if new_record? - a = Activity.new - a.message = "User \"#{self.login}\" created" - a.save - end - end - - def set_update_activity - unless new_record? - a = Activity.new - a.message = "User \"#{self.login}\" updated" - a.save - end - end - -end \ No newline at end of file +end app/models/user.rb @@ -1,80 +1,216 @@ -<h1><%= @exception_name %></h1> -<% if show_details = ::Merb::Config[:exception_details] -%> - <h2><%= params[:exception].message %></h2> - <h3>Parameters</h3> - <ul> - <% params[:original_params].each do |param, value| %> - <li><strong><%= param %>:</strong> <%= value.inspect %></li> - <% end %> - <%= "<li>None</li>" if params[:original_params].empty? %> - </ul> - - <h3>Session</h3> - <ul> - <% params[:original_session].each do |param, value| %> - <li><strong><%= param %>:</strong> <%= value.inspect %></li> - <% end %> - <%= "<li>None</li>" if params[:original_session].empty? %> - </ul> - - <h3>Cookies</h3> - <ul> - <% params[:original_cookies].each do |param, value| %> - <li><strong><%= param %>:</strong> <%= value.inspect %></li> - <% end %> - <%= "<li>None</li>" if params[:original_cookies].empty? %> - </ul> -<% else -%> - <h2>There has been an error!</h2> - <h3>What next?</h3> - <ul> - <li>Go <a href="javascript:history.go(-1)">back</a> and retry what you were doing - the problem may be temporary!</li> - <li>If it still happens, drop the blog owner a note to let them know!</li> - </ul> -<% end -%> -<div class="break"></div> -<% if show_details %> - <table class="trace"> - <% params[:exception].backtrace.each_with_index do |line, index| %> - <tbody class="close"> - <tr class="file"> - <td class="expand"></td> - <td class="path"> - <%= (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')%>&amp;line=<%= lineno = line.match(/:([0-9]+):/)[1] rescue '?' %>"><%=lineno%></a>&nbsp; - </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| %> +<html> +<head> + <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; + font-size:11px; + } + h1 { + font-size:48px; + letter-spacing:-4px; + margin:0; + line-height:36px; + color:#333; + } + h1 sup { + font-size: 0.5em; + } + h1 sup.error_500, h1 sup.error_400 { + color:#990E05; + } + h1 sup.error_100, h1 sup.error_200 { + color:#00BF10; + } + h1 sup.error_300 { + /* pretty sure you cant 'see' status 300 + errors but if you could I think they + would be blue */ + color:#1B2099; + } + h2 { + font-size:36px; + letter-spacing:-3px; + margin:0; + line-height:28px; + color:#444; + } + a, a:visited { + color:#00BF10; + } + .internalError { + width:800px; + margin:50px auto; + } + .header { + border-bottom:10px solid #333; + margin-bottom:1px; + background-image: url("data:image/gif;base64,R0lGODlhAwADAIAAAP///8zMzCH5BAAAAAAALAAAAAADAAMAAAIEBHIJBQA7"); + padding:20px; + } + table.trace { + width:100%; + font-family:courier, monospace; + letter-spacing:-1px; + border-collapse: collapse; + border-spacing:0; + } + table.trace tr td{ + padding:0; + height:26px; + font-size:13px; + vertical-align:middle; + } + table.trace tr.file{ + border-top:2px solid #fff; + background-color:#F3F3F3; + } + table.trace tr.source { + background-color:#F8F8F8; + display:none; + } + table.trace .open tr.source { + display:table-row; + } + table.trace tr.file td.expand { + width:23px; + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAXCAIAAABvSEP3AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAdVJREFUeNqMVL+TwUAYxaRIOlEhlZHGDAUzzOQ61+AqXMV1lJSU7q/QRqm8KFUcJTNn5qJkaPyoKKVz7y4mF8na5Kt29tt9+/Z97/u81+vVQ4r9frdarS6Xi7ETDIZisRjxMGPfmk4niNPpZE+xLAugbPaZ53nzvtfMBe/3+/3dbuehBrAKhZdUKkVAWa9Xsiybv0CPZDJZLr/qa5/BwgwRjYqOKIvFYjQa/aNommZh0Ww2K5UqzwfoQOPxaLPZ3FAmk0+7lplMpt1u53J5OpBOR0eZEE9wHJfP5zud93g88QhluwWbjW+5VOmKBgKBer3eaDTDYeGBQF8+x7rqIYoiPgixWJazpA6HA+MSxRArkUgMh0M409g8Ho8+9wYxxCqVSq1W26EDHGM2m4HOHQrEc38f/Yn7cLmlIRhBENzcx8cVRZnPZ/YUep2BWkjTIfA+PKVpZAXR5QxsjiqCKvGEqqp443w+0dvy17swqD0HB3S73V5PpkNg1qBqt8kwGCjmPkinM0QJbIoEa7U6UG6ToVgs4V9G2g0ESoP5Aoi7KYX5oCgf8IKbkvn9/mr1LRQKESamzgJy0g0tSZIuB3nuGqRU9Vv9C4sKkUhEkp4soxvxI8AAhWrrtXa3X8EAAAAASUVORK5CYII=); + background-position:top left; + background-repeat:no-repeat; + } + table.trace .open tr.file td.expand { + width:19px; + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAB1CAIAAAAqdO2mAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAXZJREFUeNrslK1ywkAUhcMOBomEOiSdqLxEBJX0NaijOsjyHGGmCGyQQYaiiiw4gktkcOmZbpsuuzQ/M5XnqJ2d3S/n3nM3rTzPLUP7/Tt0+pLcGQwG3W53OLyHzPMtjYL7q9UqSRLrD4E1Gj1orCvKYuFHUWTVkOM44/HjDcp8/lL4r6NerzeZPMm1KFw0QkDn83m5fP2lHA4fNQvRtNvtjsfDd0WzmSfb2e/fdTqdOvdh/HLJZLOn0+d2HJ+KRGzbdl23EpFlmed5cp2maRzHQq1lvQ5KMi6EUZBGfup6E1pTfd+vrGW7jbQ2C9hTt9BpqNyIWaAwAy6xg2eBz5iRC/NomiZhGN5sqmnkauo0BUGgVQoBjQ80oCACgNQdZHfTYBkF2mxCtWWAqunWpahxIDUt3QYUxIFQpJHyIWpXjinabKbbwItMHT+NyjchrP8QKaSQQgoppJBCCimkkEIKKaSQQgoppJBCCimkkEIKKaSo+hRgAEFD17X08O2NAAAAAElFTkSuQmCC); + background-position:top left; + background-repeat:no-repeat; + } + table.trace tr.source td.collapse { + width:19px; + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAB1CAIAAAAqdO2mAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAVxJREFUeNrs0zFygkAUBmBlUkgJHdABlQwVkVJKKUxBYWbkALTxMJwhltyDFkss03IF8pudIcwaDaDl/6pd2P327b7d+eHwMXs4lNkzggoVKlSoUKFChQoVKlSoUKFChQoVKlSoUKFChQqVEYqm6ft9+qiSJEkYho7jTlcw2fd9NOI4nq4gEdFwXXe1Cqco63VkWVbXRTqLhTpOwQRpF7quR1E0TgGhqvLKUFCyoQqG/rks3O6kZKW/eRFpevOCoGTXVTcMQ5EyxyDEkML1c5RzuZOICIyXqn7JBVez6282MWrx731HOv2qB8Hri2lamNk0DfpVVdV1Peodappmmua8bdvzuc7zfNprzrLMth1FnGh/X8MjCAIQv/cFz/+65PcDh7rbvYv2ZUfdj+PxsyzLgVl0hKwgTqeqKApx2LeOc7t98zyv/1FWOgvx9RPii23bmL9cetJ8Ed8CDAC6aFW8bCzFhwAAAABJRU5ErkJggg==); + background-position:bottom left; + background-repeat:no-repeat; + background-color:#6F706F; + } + table.trace tr td.path { + padding-left:10px; + } + table.trace tr td.code { + padding-left:35px; + white-space: pre; + line-height:9px; + padding-bottom:10px; + } + table.trace tr td.code em { + font-weight:bold; + color:#00BF10; + } + table.trace tr td.code a { + width: 20px; + float: left; + } + table.trace tr td.code .more { + color:#666; + } + table.trace tr td.line { + width:30px; + text-align:right; + padding-right:4px; + } + .footer { + margin-top:5px; + font-size:11px; + color:#444; + text-align:right; + } + </style> +</head> +<body> + <div class="internalError"> + + <div class="header"> + <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> + <% params[:original_params].each do |param, value| %> + <li><strong><%= param %>:</strong> <%= value.inspect %></li> + <% end %> + <%= "<li>None</li>" if params[:original_params].empty? %> + </ul> + + <h3>Session</h3> + <ul> + <% params[:original_session].each do |param, value| %> + <li><strong><%= param %>:</strong> <%= value.inspect %></li> + <% end %> + <%= "<li>None</li>" if params[:original_session].empty? %> + </ul> + + <h3>Cookies</h3> + <ul> + <% params[:original_cookies].each do |param, value| %> + <li><strong><%= param %>:</strong> <%= value.inspect %></li> + <% end %> + <%= "<li>None</li>" if params[:original_cookies].empty? %> + </ul> + </div> + + <% if show_details %> + <table class="trace"> + <% @exception.backtrace.each_with_index do |line, index| %> + <tbody class="close"> + <tr class="file"> + <td class="expand"> + </td> + <td class="path"> + <%= (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')%>&amp;line=<%= lineno = line.match(/:([0-9]+):/)[1] rescue '?' %>"><%=lineno%></a>&nbsp; + </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%>&amp;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> - </tr> - </tbody> - <% end %> - </table> - <script type="text/javascript" charset="utf-8"> - // swap the open & closed classes - els = document.getElementsByTagName('td'); - for(i=0; i<els.length; i++){ - if(els[i].className=='expand' || els[i].className=='collapse'){ - els[i].onclick = function(e){ - tbody = this.parentNode.parentNode; - if(tbody.className=='open'){ - tbody.className='closed'; - }else{ - tbody.className='open'; + +</td> + </tr> + </tbody> + <% end %> + </table> + <script type="text/javascript" charset="utf-8"> + // swop the open & closed classes + els = document.getElementsByTagName('td'); + for(i=0; i<els.length; i++){ + if(els[i].className=='expand' || els[i].className=='collapse'){ + els[i].onclick = function(e){ + tbody = this.parentNode.parentNode; + if(tbody.className=='open'){ + tbody.className='closed'; + }else{ + tbody.className='open'; + } } } } - } - </script> -<% end %> + </script> + <% end %> + <div class="footer"> + lots of love, from <a href="#">merb</a> + </div> + </div> +</body> +</html> \ No newline at end of file app/views/exceptions/internal_server_error.html.erb @@ -1,80 +1,63 @@ -<h1><%= @exception_name %></h1> -<% if show_details = ::Merb::Config[:exception_details] -%> - <h2><%= params[:exception].message %></h2> - <h3>Parameters</h3> - <ul> - <% params[:original_params].each do |param, value| %> - <li><strong><%= param %>:</strong> <%= value.inspect %></li> - <% end %> - <%= "<li>None</li>" if params[:original_params].empty? %> - </ul> +<div id="container"> + <div id="header-container"> + <img src="/images/merb.jpg" /> + <!-- <h1>Mongrel + Erb</h1> --> + <h2>pocket rocket web framework</h2> + <hr /> + </div> - <h3>Session</h3> - <ul> - <% params[:original_session].each do |param, value| %> - <li><strong><%= param %>:</strong> <%= value.inspect %></li> - <% end %> - <%= "<li>None</li>" if params[:original_session].empty? %> - </ul> + <div id="left-container"> + <h3>Exception:</h3> + <p><%= request.exceptions.first.message %></p> + </div> - <h3>Cookies</h3> - <ul> - <% params[:original_cookies].each do |param, value| %> - <li><strong><%= param %>:</strong> <%= value.inspect %></li> - <% end %> - <%= "<li>None</li>" if params[:original_cookies].empty? %> - </ul> -<% else -%> -<h2><%= request.env["REQUEST_URI"] %> not acceptable!</h2> - <h3>What next?</h3> - <ul> - <li>Please check the url you were attempting to find, to ensure it's correct</li> - <li>If you think there is a problem, drop the blog owner a note to let them know!</li> - </ul> -<% end -%> -<div class="break"></div> -<% if show_details %> - <table class="trace"> - <% params[:exception].backtrace.each_with_index do |line, index| %> - <tbody class="close"> - <tr class="file"> - <td class="expand"></td> - <td class="path"> - <%= (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')%>&amp;line=<%= lineno = line.match(/:([0-9]+):/)[1] rescue '?' %>"><%=lineno%></a>&nbsp; - </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%>&amp;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> - </tr> - </tbody> - <% end %> - </table> - <script type="text/javascript" charset="utf-8"> - // swap the open & closed classes - els = document.getElementsByTagName('td'); - for(i=0; i<els.length; i++){ - if(els[i].className=='expand' || els[i].className=='collapse'){ - els[i].onclick = function(e){ - tbody = this.parentNode.parentNode; - if(tbody.className=='open'){ - tbody.className='closed'; - }else{ - tbody.className='open'; - } - } - } - } - </script> -<% end %> + <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], &quot;Content-Encoding&quot; =&gt; &quot;gzip&quot; + </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 &lt; 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>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">&copy; 2008 the merb dev team</div> + <p>&nbsp;</p> + </div> +</div> app/views/exceptions/not_acceptable.html.erb @@ -1,80 +1,47 @@ -<h1><%= @exception_name %></h1> -<% if show_details = ::Merb::Config[:exception_details] -%> - <h2><%= params[:exception].message %></h2> - <h3>Parameters</h3> - <ul> - <% params[:original_params].each do |param, value| %> - <li><strong><%= param %>:</strong> <%= value.inspect %></li> - <% end %> - <%= "<li>None</li>" if params[:original_params].empty? %> - </ul> +<div id="container"> + <div id="header-container"> + <img src="/images/merb.jpg" /> + <!-- <h1>Mongrel + Erb</h1> --> + <h2>pocket rocket web framework</h2> + <hr /> + </div> - <h3>Session</h3> - <ul> - <% params[:original_session].each do |param, value| %> - <li><strong><%= param %>:</strong> <%= value.inspect %></li> - <% end %> - <%= "<li>None</li>" if params[:original_session].empty? %> - </ul> + <div id="left-container"> + <h3>Exception:</h3> + <p><%= request.exceptions.first.message %></p> + </div> - <h3>Cookies</h3> - <ul> - <% params[:original_cookies].each do |param, value| %> - <li><strong><%= param %>:</strong> <%= value.inspect %></li> - <% end %> - <%= "<li>None</li>" if params[:original_cookies].empty? %> - </ul> -<% else -%> -<h2><%= request.env["REQUEST_URI"] %> not found!</h2> - <h3>What next?</h3> - <ul> - <li>Please check the url you were attempting to find, to ensure it's correct</li> - <li>If you think there is a problem, drop the blog owner a note to let them know!</li> - </ul> -<% end -%> -<div class="break"></div> -<% if show_details %> - <table class="trace"> - <% params[:exception].backtrace.each_with_index do |line, index| %> - <tbody class="close"> - <tr class="file"> - <td class="expand"></td> - <td class="path"> - <%= (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')%>&amp;line=<%= lineno = line.match(/:([0-9]+):/)[1] rescue '?' %>"><%=lineno%></a>&nbsp; - </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%>&amp;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> - </tr> - </tbody> - <% end %> - </table> - <script type="text/javascript" charset="utf-8"> - // swap the open & closed classes - els = document.getElementsByTagName('td'); - for(i=0; i<els.length; i++){ - if(els[i].className=='expand' || els[i].className=='collapse'){ - els[i].onclick = function(e){ - tbody = this.parentNode.parentNode; - if(tbody.className=='open'){ - tbody.className='closed'; - }else{ - tbody.className='open'; - } - } - } - } - </script> -<% end %> + <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>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/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">&copy; 2008 the merb dev team</div> + <p>&nbsp;</p> + </div> +</div> app/views/exceptions/not_found.html.erb @@ -14,8 +14,7 @@ class Autotest::MerbRspec < Autotest super # Ignore any happenings in these directories - add_exception %r%^\./(?:doc|log|public|tmp)% - + add_exception %r%^\./(?:doc|log|public|tmp|\.git|\.hg|\.svn|framework|gems|schema|\.DS_Store|autotest|bin|.*\.sqlite3)% # Ignore SCM directories and custom Autotest mappings %w[.svn .hg .git .autotest].each { |exception| add_exception(exception) } @@ -49,7 +48,7 @@ class Autotest::MerbRspec < Autotest end # Any change to a helper will cause its spec to be run - add_mapping %r%^app/helpers/(.*)_helper(s)?\.rb% do |_, m| + add_mapping %r%^app/helpers/((.*)_helper(s)?)\.rb% do |_, m| spec_for(m[1], 'helper') end autotest/merb_rspec.rb @@ -109,8 +109,8 @@ Merb::BootLoader.after_app_loads do :email => "admin@example.com", :password => "password", :password_confirmation => "password", :time_zone => "Europe/London", -# :active => true, - # :identity_url => File.read(Merb.root / "config" / "open_id"), + :active => true, +# :identity_url => File.read(Merb.root / "config" / "open_id"), :time_zone => "Europe/London") Merb::Mailer.delivery_method = :sendmail config/init.rb @@ -1,27 +1 @@ -var ArticleHelper = { - - /** - * This function will auto-resize a text area instead of showing scroll bars - **/ - resizeTextArea: function(elem) { - a = elem.value.split('\n'); - b = 1; - - for (i = 0; i < a.length; i++) { - if (a[i].length >= elem.cols) { - b += Math.floor(a[i].length / elem.cols); - } - } - - b += a.length; - - if (b > elem.rows) { - elem.rows = b + 5; - } - } - -} - -Event.observe(window, 'load', function() { - Event.observe('article_content', 'keypress', function() { ArticleHelper.resizeTextArea($('article_content')) }); -}); +// Common JavaScript code across your application goes here. \ No newline at end of file public/javascripts/application.js @@ -1,4 +1,22 @@ #!/usr/bin/env ruby + +require 'rubygems' +require 'merb-core' -argv = ARGV + %w[-a fcgi] -Merb.start(argv) +# 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 b68289eb38d5420db2c8904c7a39e73c8cc531fe damm damm@livid.dk http://github.com/mleung/feather/commit/b6e6a7da5e9ba80b521b3768769f59120ba8c37b b6e6a7da5e9ba80b521b3768769f59120ba8c37b 2008-10-22T00:40:31-07:00 2008-10-22T00:40:31-07:00 - I skipped a few iles in the commit... woops. Signed-off-by: damm <damm@livid.dk> 880539d3c2b6823fbe47611f3230e68bab7f57d6 damm damm@livid.dk