app/models/merb/session.rb app/views/layout/application.html.erb autotest/discover.rb autotest/merb.rb autotest/merb_rspec.rb public/favicon.ico public/robots.txt public/stylesheets/common.css public/stylesheets/idle.css public/stylesheets/master.css public/stylesheets/reset.css public/stylesheets/rice.css spec/models/log/dm.log @@ -1,7 +1,21 @@ .DS_Store -public/javascripts/.DS_Store -public/stylesheets/*.css log/* -*.pid -spec/models/log -coverage/* \ No newline at end of file +tmp/* +gems/cache/* +TAGS +*~ +.#* +schema/schema.rb +schema/*_structure.sql +schema/*.sqlite3 +schema/*.sqlite +schema/*.db +*.sqlite +*.sqlite3 +*.db +src/* +.hgignore +.hg/* +.svn/* + +spec/model/*.log .gitignore @@ -1,26 +1,25 @@ 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 } -require 'vlad' -Vlad.load( :app => nil, :scm => 'git' ) +# 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 @@ -28,10 +27,6 @@ task :merb_env do end ############################################################################## -# SVN -############################################################################## - -desc "Add new files to subversion" -task :svn_add do - system "svn status | grep '^\?' | sed -e 's/? *//' | sed -e 's/ /\ /g' | xargs svn add" -end \ No newline at end of file +# ADD YOUR CUSTOM TASKS IN /lib/tasks +# NAME YOUR RAKE FILES file_name.rake +############################################################################## \ No newline at end of file Rakefile @@ -10,13 +10,4 @@ class Exceptions < Application render :format => :html end - # handle 500 errors - def internal_server_error - LoggedException.create_from_controller( self ) - - # Required for rendering the exception message - replace for production - @exception = params[:exception] - render :format => :html, :layout => :nil - end - end \ No newline at end of file app/controllers/exceptions.rb @@ -1,34 +1,5 @@ module Merb module GlobalHelpers - - def print_flash - return unless flash[:error] || flash[:notice] - klass = flash[:error] ? 'errors' : 'notice' - out = <<-EOS - <div class="#{ klass }" id="flash"> - #{ flash[:error] || flash[:notice] } - </div> - EOS - out << "<script type='text/javascript'>setTimeout( function(){ $('#flash').fadeOut(2*1000); }, 5*1000 );</script>" if flash[:notice] - out - end - - def print_date( date ) - date.strftime('<div class="date"><span class="month">%b</span><span class="day">%d</span></div>') - end - - def blog_by_date_url( blog ) - url(:controller => '') - end - - def pluralize( count, word ) - '%d %s' % [count, count == 1 ? word : word.pluralize] - end - - def to_rfc822( datetime ) - d = datetime - ::Time.local(d.year, d.month, d.day, d.hour, d.min, d.sec).rfc822 - end - + # helpers defined here available to all views. end -end \ No newline at end of file +end app/helpers/global_helpers.rb @@ -131,7 +131,7 @@ <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><%= @exception.message %></h2> + <h2><%=h @exception.message %></h2> <% else -%> <h2>Sorry about that...</h2> <% end -%> app/views/exceptions/internal_server_error.html.erb @@ -15,24 +15,49 @@ <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> - + 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://merb.devjavu.com/"> project development page</a> or, - feel free to come chat at irc.freenode.net, channel #merb.</p> + 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 byy editing <tt>app/views/exceptions/not_found.html.erb</tt>.</p> - + <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; 2007 the merb dev team</div> + <div class="right">&copy; 2008 the merb dev team</div> <p>&nbsp;</p> </div> </div> app/views/exceptions/not_acceptable.html.erb @@ -17,8 +17,16 @@ <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> + 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: @@ -33,7 +41,7 @@ <div id="footer-container"> <hr /> <div class="left"></div> - <div class="right">&copy; 2007 the merb dev team</div> + <div class="right">&copy; 2008 the merb dev team</div> <p>&nbsp;</p> </div> </div> app/views/exceptions/not_found.html.erb @@ -1,8 +1,12 @@ 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 } class Merb::Mailer config/environments/development.rb @@ -1,8 +1,9 @@ Merb.logger.info("Loaded PRODUCTION Environment...") Merb::Config.use { |c| c[:exception_details] = false - c[:reload_classes] = true - c[:reload_time] = 0.5 + c[:reload_classes] = false + c[:log_level] = :error + c[:log_file] = Merb.log_path + "/production.log" } Merb::Mailer.config = {:sendmail_path => '/usr/sbin/sendmail'} config/environments/production.rb @@ -2,7 +2,7 @@ Merb.logger.info("Loaded TEST Environment...") Merb::Config.use { |c| c[:testing] = true c[:exception_details] = true - c[:reload_classes] = false + c[:log_auto_flush ] = true } class Merb::Mailer config/environments/test.rb @@ -1,59 +1,51 @@ -# Make the app's "gems" directory a place where gems are loaded from -Gem.clear_paths -Gem.path.unshift(Merb.root / "gems") - -# Make the app's "lib" directory a place where ruby files get "require"d from -$LOAD_PATH.unshift(Merb.root / "lib") - -Merb::Config.use do |c| - - ### Sets up a custom session id key, if you want to piggyback sessions of other applications - ### with the cookie session store. If not specified, defaults to '_session_id'. - c[:session_id_key] = '_fightinjoe_session_id' - c[:session_secret_key] = '0089065a640a7408b2b9a75f360a58adce409a10' - c[:session_store] = 'cookie' -end - -### Merb doesn't come with database support by default. You need -### an ORM plugin. Install one, and uncomment one of the following lines, -### if you need a database. - -### Uncomment for DataMapper ORM -use_orm :datamapper - -### Uncomment for ActiveRecord ORM -# use_orm :activerecord - -### Uncomment for Sequel ORM -# use_orm :sequel - - -### This defines which test framework the generators will use -### rspec is turned on by default -### -### Note that you need to install the merb_rspec if you want to ue -### rspec and merb_test_unit if you want to use test_unit. -### merb_rspec is installed by default if you did gem install -### merb. -### -# use_test :test_unit -use_test :rspec - -### Add your other dependencies here - -# These are some examples of how you might specify dependencies. -# -# dependencies "RedCloth", "merb_helpers" -# OR -# dependency "RedCloth", "> 3.0" -# OR -# dependencies "RedCloth" => "> 3.0", "ruby-aes-cext" => "= 1.0" +$KCODE = 'UTF8' + +# +# ==== Structure of Merb initializer +# +# 1. Load paths. +# 2. Dependencies configuration. +# 3. Libraries (ORM, testing tool, etc) you use. +# 4. Application-specific configuration. + +# +# ==== Set up load paths +# + +# Add the app's "gems" directory to the gem load path. +# Note that the gems directory must mirror the structure RubyGems uses for +# directories under which gems are kept. +# +# To conveniently set it up, use gem install -i <merb_app_root/gems> +# when installing gems. This will set up the structure under /gems +# automagically. +# +# An example: +# +# You want to bundle ActiveRecord and ActiveSupport with your Merb +# application to be deployment environment independent. To do so, +# install gems into merb_app_root/gems directory like this: +# +# gem install -i merb_app_root/gems activesupport-post-2.0.2.gem activerecord-post-2.0.2.gem +# +# Since RubyGems will search merb_app_root/gems for dependencies, order +# in the statement above is important: we need to install ActiveSupport which +# ActiveRecord depends on first. +# +# Remember that bundling of dependencies as gems with your application +# makes it independent of the environment it runs in and is a very +# good, encouraged practice to follow. + +# If you want modules and classes from libraries organized like +# merbapp/lib/magicwand/lib/magicwand.rb to autoload, +# uncomment this. +# Merb.push_path(:lib, Merb.root / "lib") # uses **/*.rb as path glob. + +# ==== Dependencies dependencies "merb_helpers", "merb_helpers_ext" -# http://jacobswanner.com/2008/2/14/merb-0-9-haml require 'merb-mailer' dependencies "merb-haml", "merb-cache", "merb-parts", "merb-builder" -# dependencies "RedCloth" # Frozen Gem dependencies dependencies "merb_has_flash", 'paginator' @@ -63,10 +55,37 @@ dependencies 'merb_router_behavior_ext', 'merb_exceptions_ext' require File.join(File.dirname(__FILE__), '..', 'lib', 'authenticated_system/authenticated_dependencies') rescue LoadError -Merb::BootLoader.after_app_loads do - ### Add dependencies here that must load after the application loads: +# These are a few, but not all, of the standard merb-more dependencies: +# +# dependency "merb-action-args" # Provides support for querystring arguments to be passed in to controller actions +# dependency "merb-assets" # Provides link_to, asset_path, auto_link, image_tag methods (and lots more) +# dependency "merb-cache" # Provides your application with caching functions +# dependency "merb-haml" # Adds rake tasks and the haml generators to your merb app +# dependency "merb-jquery" # Provides a #jquery method to insert jQuery code in to a content block +# dependency "merb-mailer" # Integrates mail support via Merb Mailer + +# These are a few, but not all, of the merb-plugin dependencies: +# +# dependency "merb_helpers" # Provides the form, date/time, and other helpers +# dependency "merb_param_protection" # Lets you have better control over your query string params and param logging +# dependency "merb_stories" # Provides rspec helper methods for your application + +# Miscellaneous dependencies: +# +# Specify more than one dependency at a time with the #dependencies method: +# dependencies "RedCloth", "BlueCloth" + +# Specify a specific version of a dependency +# dependency "RedCloth", "> 3.0" + +# Specify more than one dependency at a time as well as the version: +# dependencies "RedCloth" => "> 3.0", "BlueCloth" => "= 1.0.0" - # dependency "magic_admin" # this gem uses the app's model classes +# You can also add in dependencies after your application loads. +Merb::BootLoader.after_app_loads do + # For example, the magic_admin gem uses the app's model classes. This requires that the models be + # loaded already. So, we can put the magic_admin dependency here: + # dependency "magic_admin" Merb.add_mime_type(:rss, nil, ['text/xml']) @@ -81,3 +100,117 @@ Merb::BootLoader.after_app_loads do end +# +# ==== Set up your ORM of choice +# + +# Merb doesn't come with database support by default. You need +# an ORM plugin. Install one, and uncomment one of the following lines, +# if you need a database. + +# Uncomment for DataMapper ORM +use_orm :datamapper + +# Uncomment for ActiveRecord ORM +# use_orm :activerecord + +# Uncomment for Sequel ORM +# use_orm :sequel + + +# +# ==== Pick what you test with +# + +# This defines which test framework the generators will use. +# RSpec is turned on by default. +# +# To use Test::Unit, you need to install the merb_test_unit gem. +# To use RSpec, you don't have to install any additional gems, since +# merb-core provides support for RSpec. +# +# use_test :test_unit +use_test :rspec + + +# +# ==== Choose which template engine to use by default +# + +# Merb can generate views for different template engines, choose your favourite as the default. + +use_template_engine :erb +# use_template_engine :haml + + +# +# ==== Set up your basic configuration +# + +# IMPORTANT: +# +# early on Merb boot init file is not yet loaded. +# Thus setting PORT, PID FILE and ADAPTER using init file does not +# make sense and only can lead to confusion because default settings +# will be used instead. +# +# Please use command line options for them. +# See http://wiki.merbivore.com/pages/merb-core-boot-process +# if you want to know more. +Merb::Config.use do |c| + + # Sets up a custom session id key which is used for the session persistence + # cookie name. If not specified, defaults to '_session_id'. + c[:session_id_key] = '_fightinjoe_session_id' + + # The session_secret_key is only required for the cookie session store. + c[:session_secret_key] = '0089065a640a7408b2b9a75f360a58adce409a10' + + # There are various options here, by default Merb comes with 'cookie', + # 'memory', 'memcache' or 'container'. + # You can of course use your favorite ORM instead: + # 'datamapper', 'sequel' or 'activerecord'. + c[:session_store] = 'cookie' +end + + +# ==== Tune your inflector + +# To fine tune your inflector use the word, singular_word and plural_word +# methods of English::Inflect module metaclass. +# +# Here we define erratum/errata exception case: +# +# English::Inflect.word "erratum", "errata" +# +# In case singular and plural forms are the same omit +# second argument on call: +# +# English::Inflect.word 'information' +# +# You can also define general, singularization and pluralization +# rules: +# +# Once the following rule is defined: +# English::Inflect.rule 'y', 'ies' +# +# You can see the following results: +# irb> "fly".plural +# => flies +# irb> "cry".plural +# => cries +# +# Example for singularization rule: +# +# English::Inflect.singular_rule 'o', 'oes' +# +# Works like this: +# irb> "heroes".singular +# => hero +# +# Example of pluralization rule: +# English::Inflect.singular_rule 'fe', 'ves' +# +# And the result is: +# irb> "wife".plural +# => wives config/init.rb @@ -1 +1,12 @@ + +# use PathPrefix Middleware if :path_prefix is set in Merb::Config +if prefix = ::Merb::Config[:path_prefix] + use Merb::Rack::PathPrefix, prefix +end + +# comment this out if you are running merb behind a load balancer +# that serves static files +use Merb::Rack::Static, Merb.dir_for(:public) + +# this is our main merb application run Merb::Rack::Application.new \ No newline at end of file config/rack.rb @@ -2,57 +2,61 @@ # # You can route a specific URL to a controller / action pair: # -# r.match("/contact"). +# match("/contact"). # to(:controller => "info", :action => "contact") # # You can define placeholder parts of the url with the :symbol notation. These # placeholders will be available in the params hash of your controllers. For example: # -# r.match("/books/:book_id/:action"). +# match("/books/:book_id/:action"). # to(:controller => "books") # # Or, use placeholders in the "to" results for more complicated routing, e.g.: # -# r.match("/admin/:module/:controller/:action/:id"). +# match("/admin/:module/:controller/:action/:id"). # to(:controller => ":module/:controller") # +# You can specify conditions on the placeholder by passing a hash as the second +# argument of "match" +# +# match("/registration/:course_name", :course_name => /^[a-z]{3,5}-\d{5}$/). +# to(:controller => "registration") +# # You can also use regular expressions, deferred routes, and many other options. # See merb/specs/merb/router.rb for a fairly complete usage sample. Merb.logger.info("Compiling routes...") -Merb::Router.prepare do |r| +Merb::Router.prepare do # RESTful routes - r.resources :blogs do |b| + resources :blogs do |b| b.resources :comments end - r.namespace :admin do |admin| + namespace :admin do |admin| admin.resources :blogs end - - r.resources :comments - - r.match(%r{/(\d+)/(\d+)/([a-zA-Z\-]+)}).to( + + resources :comments + + match(%r{/(\d+)/(\d+)/([a-zA-Z\-]+)}).to( :controller => 'blogs', :action => 'show', :year => "[1]", :month => "[2]", :path_title => "[3]" ) - + # NAMED routes r.match('/contact').to( :controller => 'comments', :action => 'new' ).name( :contact ) - + r.match('/:category_title').to( :controller => 'blogs', :action => 'index' ).name( :category ) + # resources :posts # This is the default route for /:controller/:action/:id # This is fine for most cases. If you're heavily using resource-based # routes, you may want to comment/remove this line to prevent # clients from calling your create or destroy actions with a GET - r.default_routes + default_routes # Used for path generation r.match('/:year/:month/:path_title').to( :controller => 'blogs', :action => 'show' ).name( :blog_by_date ) - # Change this for your home page to be available at / r.match('/').to(:controller => 'blogs', :action =>'show', :id => 'latest' ) -end - -AuthenticatedSystem.add_routes rescue nil +end \ No newline at end of file config/router.rb @@ -1,4 +1,22 @@ #!/usr/bin/env ruby + +require 'rubygems' +require 'merb-core' -argv = ARGV + %w[-a fcgi] -Merb.start(argv) \ No newline at end of file +# 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 @@ -1,18 +1,22 @@ -$TESTING=true -require 'rubygems' -require 'merb-core' -require 'ruby-debug' -require 'spec' -require File.join( File.dirname(__FILE__), "authenticated_system_spec_helper") -require File.join( File.dirname(__FILE__), "user_spec_helper") +require "rubygems" +# Add the local gems dir if found within the app root; any dependencies loaded +# hereafter will try to load from the local gems before loading system gems. +if (local_gem_dir = File.join(File.dirname(__FILE__), '..', 'gems')) && $BUNDLE.nil? + $BUNDLE = true; Gem.clear_paths; Gem.path.unshift(local_gem_dir) +end + +require "merb-core" +require "spec" # Satisfies Autotest and anyone else not using the Rake tasks + +# this loads all plugins required in your init file so don't add them +# here again, Merb will do it for you Merb.start_environment(:testing => true, :adapter => 'runner', :environment => ENV['MERB_ENV'] || 'test') Spec::Runner.configure do |config| config.include(Merb::Test::ViewHelper) config.include(Merb::Test::RouteHelper) config.include(Merb::Test::ControllerHelper) -# config.mock_with :mocha end def blog_options spec/spec_helper.rb 176eac4d277abc38a2f8bdf7f5dabc28ce6dc704 Aaron Wheeler oldaaronwheeler@aaron-wheelers-macbook-pro-15.local http://github.com/fightinjoe/fightinjoe-merb-blog/commit/ebf59c65656f1d7752031ca1016c8bc6ddd674ad ebf59c65656f1d7752031ca1016c8bc6ddd674ad 2008-10-08T18:50:17-07:00 2008-10-08T18:50:17-07:00 Upgraded to frozen version of Merb 1672303eeef7b1a6ff92fc3329569d44dff2b48a Aaron Wheeler oldaaronwheeler@aaron-wheelers-macbook-pro-15.local