app/models/merb/session.rb
config/environments/staging.rb
docs/tutorial.markdown
merb.thor
public/favicon.ico
public/robots.txt
spec/spec/spec.opts
spec/spec/spec_helper.rb
@@ -1,14 +1,9 @@
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
@@ -19,16 +14,26 @@ Merb.load_dependencies(:environment => init_env)
# Get Merb plugins and dependencies
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
+
+require 'spec/rake/spectask'
+require "merb-core/test/tasks/spectasks"
+desc 'Default: run spec examples'
+task :default => 'spec'
+
+
+
+
##############################################################################
-# ADD YOUR CUSTOM TASKS BELOW
+# ADD YOUR CUSTOM TASKS IN /lib/tasks
+# NAME YOUR RAKE FILES file_name.rake
##############################################################################
-
-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
Rakefile
@@ -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
@@ -8,7 +8,7 @@
<div id="left-container">
<h3>Exception:</h3>
- <p><%= params[:exception] %></p>
+ <p><%= request.exceptions.first.message %></p>
</div>
<div id="main-container">
@@ -38,18 +38,26 @@
<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">© 2007 the merb dev team</div>
+ <div class="right">© 2008 the merb dev team</div>
<p> </p>
</div>
</div>
app/views/exceptions/not_acceptable.html.erb
@@ -8,7 +8,7 @@
<div id="left-container">
<h3>Exception:</h3>
- <p><%= params[:exception] %></p>
+ <p><%= request.exceptions.first.message %></p>
</div>
<div id="main-container">
@@ -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">© 2007 the merb dev team</div>
+ <div class="right">© 2008 the merb dev team</div>
<p> </p>
</div>
</div>
app/views/exceptions/not_found.html.erb
@@ -9,7 +9,7 @@ class Autotest::Merb < Autotest
# +fixtures_dir+:: the directory to find fixtures in
attr_accessor :model_tests_dir, :controller_tests_dir, :view_tests_dir, :fixtures_dir
- def initialize # :nodoc:
+ def initialize
super
initialize_test_layout
@@ -127,7 +127,7 @@ private
# => "login_controller_test.rb"
# > test_for("form", :view)
# => "form_view_spec.rb" # If you're running a RSpec-like suite
- def test_for(filename, kind_of_test) # :nodoc:
+ def test_for(filename, kind_of_test)
name = [filename]
name << kind_of_test.to_s if kind_of_test == :view
name << "test"
autotest/merb.rb
@@ -3,147 +3,115 @@ require 'autotest'
class RspecCommandError < StandardError; end
+# This class maps your application's structure so Autotest can understand what
+# specs to run when files change.
+#
+# Fixtures are _not_ covered by this class. If you change a fixture file, you
+# will have to run your spec suite manually, or, better yet, provide your own
+# Autotest map explaining how your fixtures are set up.
class Autotest::MerbRspec < Autotest
-
- # +model_tests_dir+:: the directory to find model-centric tests
- # +controller_tests_dir+:: the directory to find controller-centric tests
- # +view_tests_dir+:: the directory to find view-centric tests
- # +fixtures_dir+:: the directory to find fixtures in
- attr_accessor :model_tests_dir, :controller_tests_dir, :view_tests_dir, :fixtures_dir
-
- def initialize # :nodoc:
+ def initialize
super
-
- initialize_test_layout
-
+
# 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) }
+
# Ignore any mappings that Autotest may have already set up
clear_mappings
-
- # Any changes to a file in the root of the 'lib' directory will run any
- # model test with a corresponding name.
- add_mapping %r%^lib\/.*\.rb% do |filename, _|
- files_matching %r%#{model_test_for(filename)}$%
+
+ # Anything in /lib could have a spec anywhere, if at all. So, look for
+ # files with roughly the same name as the file in /lib
+ add_mapping %r%^lib\/(.*)\.rb% do |_, m|
+ files_matching %r%^spec\/#{m[1]}%
end
-
+
add_mapping %r%^spec/(spec_helper|shared/.*)\.rb$% do
- files_matching %r%^spec/.*_spec\.rb$%
+ all_specs
end
-
- # Any changes to a fixture will run corresponding view, controller and
- # model tests
- add_mapping %r%^#{fixtures_dir}/(.*)s.yml% do |_, m|
- [
- model_test_for(m[1]),
- controller_test_for(m[1]),
- view_test_for(m[1])
- ]
- end
-
- # Any change to a test or spec will cause it to be run
- add_mapping %r%^spec/(unit|models|integration|controllers|views|functional)/.*rb$% do |filename, _|
+
+ # Changing a spec will cause it to run itself
+ add_mapping %r%^spec/.*\.rb$% do |filename, _|
filename
end
-
+
# Any change to a model will cause it's corresponding test to be run
add_mapping %r%^app/models/(.*)\.rb$% do |_, m|
- model_test_for(m[1])
+ spec_for(m[1], 'model')
end
-
- # Any change to the global helper will result in all view and controller
+
+ # Any change to global_helpers will result in all view and controller
# tests being run
- add_mapping %r%^app/helpers/global_helpers.rb% do
- files_matching %r%^spec/(views|functional|controllers)/.*_spec\.rb$%
+ add_mapping %r%^app/helpers/global_helpers\.rb% do
+ files_matching %r%^spec/(views|controllers|helpers)/.*_spec\.rb$%
end
-
- # Any change to a helper will run it's corresponding view and controller
- # tests, unless the helper is the global helper. Changes to the global
- # helper run all view and controller tests.
- add_mapping %r%^app/helpers/(.*)_helper(s)?.rb% do |_, m|
- if m[1] == "global" then
- files_matching %r%^spec/(views|functional|controllers)/.*_spec\.rb$%
- else
- [
- view_test_for(m[1]),
- controller_test_for(m[1])
- ]
- end
+
+ # Any change to a helper will cause its spec to be run
+ add_mapping %r%^app/helpers/((.*)_helper(s)?)\.rb% do |_, m|
+ spec_for(m[1], 'helper')
end
-
- # Changes to views result in their corresponding view and controller test
- # being run
+
+ # Changes to a view cause its spec to be run
add_mapping %r%^app/views/(.*)/% do |_, m|
- [
- view_test_for(m[1]),
- controller_test_for(m[1])
- ]
+ spec_for(m[1], 'view')
end
-
- # Changes to a controller result in its corresponding test being run. If
- # the controller is the exception or application controller, all
- # controller tests are run.
+
+ # Changes to a controller result in its corresponding spec being run. If
+ # the controller is the exception or application controller, all
+ # controller specs are run.
add_mapping %r%^app/controllers/(.*)\.rb$% do |_, m|
if ["application", "exception"].include?(m[1])
- files_matching %r%^spec/(controllers|views|functional)/.*_spec\.rb$%
+ files_matching %r%^spec/controllers/.*_spec\.rb$%
else
- controller_test_for(m[1])
+ spec_for(m[1], 'controller')
end
end
- # If a change is made to the router, run all controller and view tests
- add_mapping %r%^config/router.rb$% do # FIX
- files_matching %r%^spec/(controllers|views|functional)/.*_spec\.rb$%
+ # If a change is made to the router, run controller, view and helper specs
+ add_mapping %r%^config/router.rb$% do
+ files_matching %r%^spec/(controllers|views|helpers)/.*_spec\.rb$%
end
- # If any of the major files governing the environment are altered, run
+ # If any of the major files governing the environment are altered, run
# everything
- add_mapping %r%^spec/spec_helper.rb|config/(init|rack|environments/test.rb|database.yml)% do # FIX
- files_matching %r%^spec/(unit|models|controllers|views|functional)/.*_spec\.rb$%
+ add_mapping %r%^config/(init|rack|environments/test).*\.rb|database\.yml% do
+ all_specs
end
end
-
+
def failed_results(results)
results.scan(/^\d+\)\n(?:\e\[\d*m)?(?:.*?Error in )?'([^\n]*)'(?: FAILED)?(?:\e\[\d*m)?\n(.*?)\n\n/m)
end
def handle_results(results)
- @failures = failed_results(results)
- @files_to_test = consolidate_failures @failures
- unless $TESTING
- if @files_to_test.empty?
- hook :green
- else
- hook :red
- end
- end
- @tainted = true unless @files_to_test.empty?
+ @failures = failed_results(results)
+ @files_to_test = consolidate_failures(@failures)
+ @files_to_test.empty? && !$TESTING ? hook(:green) : hook(:red)
+ @tainted = !@files_to_test.empty?
end
-
+
def consolidate_failures(failed)
filters = Hash.new { |h,k| h[k] = [] }
failed.each do |spec, failed_trace|
- find_files.keys.select { |f| f =~ /spec\// }.each do |f|
- if failed_trace =~ Regexp.new(f)
- filters[f] << spec
- break
- end
+ if f = test_files_for(failed).find { |f| f =~ /spec\// }
+ filters[f] << spec
+ break
end
end
filters
end
- def make_test_cmd(files_to_test)
+ def make_test_cmd(specs_to_runs)
[
- ruby,
- "-S",
- spec_command,
- add_options_if_present,
+ ruby,
+ "-S",
+ spec_command,
+ add_options_if_present,
files_to_test.keys.flatten.join(' ')
- ].join(" ")
+ ].join(' ')
end
-
+
def add_options_if_present
File.exist?("spec/spec.opts") ? "-O spec/spec.opts " : ""
end
@@ -153,10 +121,10 @@ class Autotest::MerbRspec < Autotest
# ~/.autotest to provide a different spec command then the default
# paths provided.
def spec_command(separator=File::ALT_SEPARATOR)
- unless defined? @spec_command then
- @spec_command = spec_commands.find { |cmd| File.exists? cmd }
+ unless defined?(@spec_command)
+ @spec_command = spec_commands.find { |cmd| File.exists?(cmd) }
- raise RspecCommandError, "No spec command could be found!" unless @spec_command
+ raise RspecCommandError, "No spec command could be found" unless @spec_command
@spec_command.gsub!(File::SEPARATOR, separator) if separator
end
@@ -166,61 +134,32 @@ class Autotest::MerbRspec < Autotest
# Autotest will look for spec commands in the following
# locations, in this order:
#
- # * bin/spec
# * default spec bin/loader installed in Rubygems
+ # * any spec command found in PATH
def spec_commands
- [
- File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'spec')),
- File.join(Config::CONFIG['bindir'], 'spec')
- ]
+ [File.join(Config::CONFIG['bindir'], 'spec'), 'spec']
end
-
+
private
- # Determines the paths we can expect tests or specs to reside, as well as
- # corresponding fixtures.
- def initialize_test_layout
- self.model_tests_dir = "spec/models"
- self.controller_tests_dir = "spec/controllers"
- self.view_tests_dir = "spec/views"
- self.fixtures_dir = "spec/fixtures"
+ # Runs +files_matching+ for all specs
+ def all_specs
+ files_matching %r%^spec/.*_spec\.rb$%
end
-
- # Given a filename and the test type, this method will return the
- # corresponding test's or spec's name.
- #
+
+ # Generates a path to some spec given its kind and the match from a mapping
+ #
# ==== Arguments
- # +filename+<String>:: the file name of the model, view, or controller
- # +kind_of_test+<Symbol>:: the type of test we that we should run
- #
+ # match<String>:: the match from a mapping
+ # kind<String>:: the kind of spec that the match represents
+ #
# ==== Returns
- # String:: the name of the corresponding test or spec
- #
+ # String
+ #
# ==== Example
- #
- # > test_for("user", :model)
- # => "user_test.rb"
- # > test_for("login", :controller)
- # => "login_controller_test.rb"
- # > test_for("form", :view)
- # => "form_view_spec.rb" # If you're running a RSpec-like suite
- def test_for(filename, kind_of_test) # :nodoc:
- name = [filename]
- name << kind_of_test.to_s if kind_of_test == :view
- name << "spec"
- return name.join("_") + ".rb"
- end
-
- def model_test_for(filename)
- [model_tests_dir, test_for(filename, :model)].join("/")
- end
-
- def controller_test_for(filename)
- [controller_tests_dir, test_for(filename, :controller)].join("/")
- end
-
- def view_test_for(filename)
- [view_tests_dir, test_for(filename, :view)].join("/")
+ # > spec_for('post', :view')
+ # => "spec/views/post_spec.rb"
+ def spec_for(match, kind)
+ File.join("spec", kind + 's', "#{match}_spec.rb")
end
-
end
autotest/merb_rspec.rb
@@ -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,4 +2,6 @@ Merb.logger.info("Loaded PRODUCTION Environment...")
Merb::Config.use { |c|
c[:exception_details] = false
c[:reload_classes] = false
+ c[:log_level] = :error
+ c[:log_file] = Merb.log_path + "/production.log"
}
\ No newline at end of file
config/environments/production.rb
@@ -3,4 +3,5 @@ Merb::Config.use { |c|
c[:testing] = true
c[:exception_details] = true
c[:log_auto_flush ] = true
-}
\ No newline at end of file
+ c[:log_level] = :fatal
+}
config/environments/test.rb
@@ -1,60 +1,189 @@
-# Make the app's "gems" directory a place where gems are loaded from
-Gem.clear_paths
-Gem.path.unshift(Merb.root / "gems")
+#
+# ==== Structure of Merb initializer
+#
+# 1. Load paths.
+# 2. Dependencies configuration.
+# 3. Libraries (ORM, testing tool, etc) you use.
+# 4. Application-specific configuration.
-# Make the app's "lib" directory a place where ruby files get "require"d from
-$LOAD_PATH.unshift(Merb.root / "lib")
+#
+# ==== 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.
-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] = '_session_id'
-
- c[:session_secret_key] = 'c0113d63bf43fe84d826be0245b26d7a44477e58'
- c[:session_store] = 'cookie'
-end
+# 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
+
+# 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-helpers" # Provides the form, date/time, and other helpers
+# 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_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"
+
+# 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"
+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.
+#
+# ==== Set up your ORM of choice
+#
-### Uncomment for DataMapper ORM
+# 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
+# Uncomment for ActiveRecord ORM
use_orm :activerecord
-### Uncomment for Sequel ORM
+# 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.
-###
+#
+# ==== 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
-### 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"
+#
+# ==== Choose which template engine to use by default
+#
-dependency "merb_helpers"
+# Merb can generate views for different template engines, choose your favourite as the default.
-Merb::BootLoader.after_app_loads do
- ### Add dependencies here that must load after the application loads:
+use_template_engine :erb
+# use_template_engine :haml
- # dependency "magic_admin" # this gem uses the app's model classes
+
+#
+# ==== 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] = '_session_id'
+
+ # The session_secret_key is only required for the cookie session store.
+ c[:session_secret_key] = '7e10ab4be37b5203f478cde3c07ba051b27ebf20'
+
+ # 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,34 +2,40 @@
#
# 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 :posts
+ # 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
# Change this for your home page to be available at /
- # r.match('/').to(:controller => 'whatever', :action =>'index')
+ # match('/').to(:controller => 'whatever', :action =>'index')
end
\ No newline at end of file
config/router.rb
@@ -1,179 +1,119 @@
body {
- font-family: Arial, Verdana, sans-serif;
- font-size: 12px;
- background-color: #fff;
- padding: 40px;
+ font-family: Arial, Verdana, sans-serif;
+ font-size: 12px;
+ background-color: #fff;
}
-
* {
- margin: 0px;
- padding: 0px;
- text-decoration: none;
+ margin: 0px;
+ padding: 0px;
+ text-decoration: none;
}
-
html {
- margin-bottom: 1px;
+ height: 100%;
+ margin-bottom: 1px;
}
-
#container {
- width: 80%;
- text-align: left;
- background-color: #fff;
- margin-right: auto;
- margin-left: auto;
+ width: 80%;
+ text-align: left;
+ background-color: #fff;
+ margin-right: auto;
+ margin-left: auto;
}
-
#header-container {
- width: 100%;
- padding-top: 15px;
+ width: 100%;
+ padding-top: 15px;
}
-
#header-container h1, #header-container h2 {
- margin-left: 6px;
- margin-bottom: 6px;
+ margin-left: 6px;
+ margin-bottom: 6px;
}
-
.spacer {
- width: 100%;
- height: 15px;
+ width: 100%;
+ height: 15px;
}
-
hr {
- border: 0px;
- color: #ccc;
- background-color: #cdcdcd;
- height: 1px;
- width: 100%;
- text-align: left;
+ border: 0px;
+ color: #ccc;
+ background-color: #cdcdcd;
+ height: 1px;
+ width: 100%;
+ text-align: left;
}
-
h1 {
- color: #c55;
- background-color: #fff;
- letter-spacing: -0.05em;
- word-spacing: 2px;
- font: bold 32px "Helvetica Neue", Helvetica, Arial, FreeSans, sans-serif;
- text-transform: uppercase;
+ font-size: 28px;
+ color: #c55;
+ background-color: #fff;
+ font-family: Arial, Verdana, sans-serif;
+ font-weight: 300;
}
-
h2 {
- font-size: 20px;
- color: #999;
- font-family: "Helvetica Neue", Helvetica, Arial, FreeSans, sans-serif;
- ;
+ font-size: 15px;
+ color: #999;
+ font-family: Arial, Verdana, sans-serif;
font-weight: 300;
- background-color: #fff;
- margin-bottom: 40px;
+ background-color: #fff;
}
-
h3 {
- color: #4d9b12;
- font-size: 15px;
- text-align: left;
- font-weight: 300;
- padding: 5px;
- margin-top: 5px;
+ color: #4d9b12;
+ font-size: 15px;
+ text-align: left;
+ font-weight: 300;
+ padding: 5px;
+ margin-top: 5px;
}
#left-container {
- float: left;
- width: 250px;
- background-color: #FFFFFF;
- color: black;
+ float: left;
+ width: 250px;
+ background-color: #FFFFFF;
+ color: black;
}
#left-container h3 {
- color: #c55;
+ color: #c55;
}
#main-container {
- margin: 5px 5px 5px 260px;
- padding: 15px;
- border-left: 1px solid silver;
- min-height: 400px;
+ margin: 5px 5px 5px 260px;
+ padding: 15px;
+ border-left: 1px solid silver;
+ min-height: 400px;
}
-
p {
- color: #767d83;
- background-color: #fff;
- padding: 5px;
- font: 17px/20px "Helvetica Neue", Helvetica, Arial, FreeSans, sans-serif;
+ color: #000;
+ background-color: #fff;
+ line-height: 20px;
+ padding: 5px;
}
-
a {
- color: #4d9b12;
- background-color: #fff;
- text-decoration: none;
+ color: #4d9b12;
+ background-color: #fff;
+ text-decoration: none;
}
-
a:hover {
- color: #4d9b12;
- background-color: #fff;
- text-decoration: underline;
+ color: #4d9b12;
+ background-color: #fff;
+ text-decoration: underline;
}
-
#footer-container {
- clear: both;
- font-size: 12px;
- font-family: Verdana, Arial, sans-serif;
+ clear: both;
+ font-size: 12px;
+ font-family: Verdana, Arial, sans-serif;
}
-
.right {
- float: right;
- font-size: 100%;
- margin-top: 5px;
- color: #999;
- background-color: #fff;
+ float: right;
+ font-size: 100%;
+ margin-top: 5px;
+ color: #999;
+ background-color: #fff;
}
-
.left {
- float: left;
- font-size: 100%;
- margin-top: 5px;
- color: #999;
- background-color: #fff;
+ float: left;
+ font-size: 100%;
+ margin-top: 5px;
+ color: #999;
+ background-color: #fff;
}
-
#main-container ul {
- margin-left: 3.0em;
-}
-
-#posts.container {
- border: 10px solid #eaeaea;
- min-height: 240px;
- position: relative;
-}
-
-div.post {
- position: relative;
- border-bottom: 2px solid #c0c0c0;
-}
-
-div.post p.body {
- color: #3d4043;
-}
-
-div.post p.created {
- color: #d5d5d5;
- position: absolute;
- top: 0px;
- right: 10px;
- font-weight: bold;
- font-size: 15px;
-}
-
-form {
- background-color: #d5d5d5;
- padding: 20px;
-}
-
-form input[type=text] {
- font: 17px "Helvetica Neue", Helvetica, Arial, FreeSans, sans-serif;
- padding: 3px 5px;
- color: #424242;
-}
-
-form button {
- font-size: medium;
- padding: 5px 10px;
+ margin-left: 3.0em;
}
\ No newline at end of file
public/stylesheets/master.css
log/merb_test.log
f7df4c7f5f0d2e3d55af51e61d57679f7bf01ee4
Anonymous
admin@monsterignite.com
http://github.com/oftenvoid/slapp/commit/1b6ba6f5ce4451effefdd996f804c2e0ad4af97e
1b6ba6f5ce4451effefdd996f804c2e0ad4af97e
2008-12-28T21:04:35-08:00
2008-12-28T21:04:35-08:00
Partial update to Merb 0.9.8-0.9.9.
2260525af1ac727ffa1233a4da16570c6f60dced
Anonymous
admin@monsterignite.com