ramaze 2009.06.12 → 2009.07

data/MANIFEST

@@ -209,6 +209,7 @@ lib/ramaze.rb
 lib/ramaze/app.rb
 lib/ramaze/cache.rb
 lib/ramaze/cache/localmemcache.rb
+lib/ramaze/cache/lru.rb
 lib/ramaze/cache/memcache.rb
 lib/ramaze/cache/sequel.rb
 lib/ramaze/contrib/addressable_route.rb
@@ -236,6 +237,7 @@ lib/ramaze/gestalt.rb
 lib/ramaze/helper.rb
 lib/ramaze/helper/auth.rb
 lib/ramaze/helper/bench.rb
+lib/ramaze/helper/blue_form.rb
 lib/ramaze/helper/cache.rb
 lib/ramaze/helper/disqus.rb
 lib/ramaze/helper/flash.rb
@@ -303,6 +305,7 @@ lib/ramaze/snippets/ramaze/acquire.rb
 lib/ramaze/snippets/ramaze/deprecated.rb
 lib/ramaze/snippets/ramaze/dictionary.rb
 lib/ramaze/snippets/ramaze/fiber.rb
+lib/ramaze/snippets/ramaze/lru_hash.rb
 lib/ramaze/snippets/ramaze/struct.rb
 lib/ramaze/snippets/string/camel_case.rb
 lib/ramaze/snippets/string/color.rb
@@ -328,6 +331,7 @@ lib/ramaze/view/erubis.rb
 lib/ramaze/view/ezamar.rb
 lib/ramaze/view/gestalt.rb
 lib/ramaze/view/haml.rb
+lib/ramaze/view/less.rb
 lib/ramaze/view/liquid.rb
 lib/ramaze/view/maruku.rb
 lib/ramaze/view/nagoro.rb
@@ -368,8 +372,10 @@ spec/ramaze/action/view/single_wrapper.xhtml
 spec/ramaze/action/view/sub/sub_wrapper.erb
 spec/ramaze/action/view/sub/sub_wrapper.xhtml
 spec/ramaze/app.rb
+spec/ramaze/app/location.rb
 spec/ramaze/bin/ramaze.rb
 spec/ramaze/cache/localmemcache.rb
+spec/ramaze/cache/lru.rb
 spec/ramaze/cache/memcache.rb
 spec/ramaze/cache/sequel.rb
 spec/ramaze/controller/actionless_templates.rb
@@ -397,6 +403,7 @@ spec/ramaze/files/public_2/rich.txt
 spec/ramaze/gestalt.rb
 spec/ramaze/helper/auth.rb
 spec/ramaze/helper/bench.rb
+spec/ramaze/helper/blue_form.rb
 spec/ramaze/helper/cache.rb
 spec/ramaze/helper/flash.rb
 spec/ramaze/helper/form.rb
@@ -449,6 +456,8 @@ spec/ramaze/view/gestalt/external.ges
 spec/ramaze/view/haml.rb
 spec/ramaze/view/haml/external.haml
 spec/ramaze/view/haml/sum.haml
+spec/ramaze/view/less.rb
+spec/ramaze/view/less/file.css.less
 spec/ramaze/view/liquid.rb
 spec/ramaze/view/liquid/external.liquid
 spec/ramaze/view/liquid/sum.liquid
@@ -476,6 +485,7 @@ spec/snippets/object/__dir__.rb
 spec/snippets/ordered_set.rb
 spec/snippets/ramaze/acquire.rb
 spec/snippets/ramaze/dictionary.rb
+spec/snippets/ramaze/lru_hash.rb
 spec/snippets/ramaze/struct.rb
 spec/snippets/string/camel_case.rb
 spec/snippets/string/color.rb

data/README.md

@@ -13,7 +13,7 @@ give you the ultimate tools, but you have to use them yourself to achieve
 perfect custom-tailored results.
 
 Another one of the goals during development of Ramaze was to make every part as
-modular and therefor reuasable as possible, not only to provide a basic
+modular and therefor reusable as possible, not only to provide a basic
 understanding after the first glance, but also to make it as simple as possible
 to reuse parts of the code.
 
@@ -136,11 +136,6 @@ Ramaze offers following features at the moment:
 
       Wrapping the functionality of Ramazes logging facilities.
 
-    * Markaby
-
-      Allows you to use Markaby in your Controller without having it as the
-      default templating engine.
-
     * Nitroform
 
       Hooks up on nitros form builder to help you creating forms from Og
@@ -241,7 +236,7 @@ There are some basic principles that Ramaze tries to follow:
 
       $ gem install ramaze
 
-  Versions are made as we see fit and get an announcment out (usually that's
+  Versions are made as we see fit and get an announcement out (usually that's
   the major obstacle as there is a lot to announce).
 
   If you want to install the nightly gem of Ramaze you can do this with:
@@ -279,7 +274,7 @@ There are some basic principles that Ramaze tries to follow:
 
         $ export RUBYLIB="$HOME/ruby/ramaze/lib:$HOME/.site_ruby:$HOME/ruby/bacon/lib"
 
-  * use `require 'ramaze'` systemwide from everywhere
+  * use `require 'ramaze'` system wide from everywhere
 
     add a file to your `site_ruby` directory named 'ramaze.rb'
     the content should be: `require '/path/to/git/repo/ramaze/lib/ramaze'`
@@ -401,7 +396,7 @@ For help you can:
 
 # And thanks to...
 
-There is a large number of people who made Ramaze possibe by their ongoing
+There is a large number of people who made Ramaze possible by their ongoing
 efforts in the world of open source and by encouraging and helping me.
 
 This list is by no means a full listing of all these people, but I try to

data/Rakefile

@@ -20,8 +20,28 @@ PROJECT_COPYRIGHT   = [
   "# All files in this distribution are subject to the terms of the Ruby license."
 ]
 
-# To release the monthly version do:
-# $ VERSION=2009.03 rake release
+DEPENDENCIES = {
+  'innate' => {:version => '= 2009.07'},
+}
+
+DEVELOPMENT_DEPENDENCIES = {
+  'Remarkably'       => {:version => '~> 0.5.2', :lib => 'remarkably'},
+  'bacon'            => {:version => '>= 1.1.0'},
+  'erubis'           => {:version => '>= 2.6.4'},
+  'ezamar'           => {:version => '>= 2009.06'},
+  'haml'             => {:version => '~> 2.2.1'},
+  'hpricot'          => {:version => '>= 0.8.1'},
+  'json'             => {:version => '>= 1.1.7'},
+  'liquid'           => {:version => '~> 2.0.0'},
+  'localmemcache'    => {:version => '~> 0.4.1'},
+  'memcache-client'  => {:version => '~> 1.7.4', :lib => 'memcache'},
+  'nagoro'           => {:version => '>= 2009.05'},
+  'rack-test'        => {:version => '>= 0.4.0', :lib => 'rack/test'},
+  'rack-contrib'     => {:version => '>= 0.9.2', :lib => 'rack/contrib'},
+  'sequel'           => {:version => '=  3.2.0'},
+  'tagz'             => {:version => '>= 5.0.1'},
+  'tenjin'           => {:version => '~> 0.6.1'},
+}
 
 GEMSPEC = Gem::Specification.new{|s|
   s.name         = 'ramaze'
@@ -40,25 +60,6 @@ GEMSPEC = Gem::Specification.new{|s|
   s.rubyforge_project = "ramaze"
   s.required_rubygems_version = '>= 1.3.1'
 
-  s.add_dependency('innate', '= 2009.06.12')
-
-  # rip those out if they cause you trouble
-  s.add_development_dependency('Remarkably',      '~> 0.5.2')
-  s.add_development_dependency('bacon',           '>= 1.1.0')
-  s.add_development_dependency('erubis',          '>= 2.6.4')
-  s.add_development_dependency('ezamar',          '>= 2009.06')
-  s.add_development_dependency('haml',            '~> 2.0.9')
-  s.add_development_dependency('hpricot',         '>= 0.8.1')
-  s.add_development_dependency('json',            '>= 1.1.6')
-  s.add_development_dependency('liquid',          '~> 2.0.0')
-  s.add_development_dependency('localmemcache',   '~> 0.4.0')
-  s.add_development_dependency('memcache-client', '~> 1.7.2')
-  s.add_development_dependency('nagoro',          '>= 2009.05')
-  s.add_development_dependency('rack-test',       '>= 0.3.0')
-  s.add_development_dependency('sequel',          '=  3.1.0')
-  s.add_development_dependency('tagz',            '>= 5.0.1')
-  s.add_development_dependency('tenjin',          '~> 0.6.1')
-
   s.post_install_message = <<MESSAGE.strip
 ============================================================
 
@@ -70,6 +71,14 @@ You can now do create a new project:
 MESSAGE
 }
 
+DEPENDENCIES.each do |name, options|
+  GEMSPEC.add_dependency(name, options[:version])
+end
+
+DEVELOPMENT_DEPENDENCIES.each do |name, options|
+  GEMSPEC.add_development_dependency(name, options[:version])
+end
+
 Dir['tasks/*.rake'].each{|f| import(f) }
 
 task :default => [:bacon]

data/doc/AUTHORS

@@ -1,7 +1,7 @@
 Following persons have contributed to ramaze.
 (Sorted by number of submitted patches, then alphabetically)
 
-  2605 Michael Fellinger <m.fellinger@gmail.com>
+  2641 Michael Fellinger <m.fellinger@gmail.com>
    216 Aman Gupta <aman@ramaze.net>
     87 Jonathan Buch <john@oxyliquit.de>
     75 Pistos <gitsomegrace.5.pistos@geoshell.com>

data/doc/CHANGELOG

@@ -1,3 +1,147 @@
+[d0267ff | Fri Jul 24 18:56:44 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Version 2009.07
+
+[e802979 | Sun Jul 19 03:16:06 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Update versions for Rakefile
+
+[311b372 | Sun Jul 19 01:39:12 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix marshal size for 1.8
+
+[42516be | Fri Jul 17 10:02:05 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Raise correct exception depending on existence of KeyError
+
+[90d49ee | Fri Jul 17 09:40:09 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix some more 1.8 incompatibilities
+
+[5121688 | Fri Jul 17 09:21:25 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Don't require nokogiri
+
+[17c4aa6 | Fri Jul 17 09:21:06 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Forgot using 1.8 syntax
+
+[9fd07cb | Fri Jul 17 09:16:29 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Try to make the blue_form spec nicer
+
+[6bb2c79 | Fri Jul 17 09:07:45 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix syntax error in LRU cache
+
+[2cc4309 | Fri Jul 17 08:09:12 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Adding Helper::BlueForm and spec
+
+[cd77929 | Fri Jul 17 07:59:58 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Adding LRU cache
+
+[252dda0 | Thu Jul 16 03:04:47 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Rely on Gestalt to make proper markup for paginate
+
+[fe6c09f | Tue Jul 14 07:01:08 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix Request#to_instance_variables
+
+[b8d016b | Thu Jul 02 12:28:05 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Increase the time we wait for the cache ttl to expire
+
+[eb63517 | Thu Jul 02 12:20:56 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Recognize Spec precondition and Spec require in bacon task
+
+[552ae84 | Thu Jul 02 11:48:04 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add the ramaze/lib directory to -I on bacon task
+
+[0333e52 | Thu Jul 02 11:34:12 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Clean up the spec middleware mess, it's _always_ m.run(Ramaze::AppMap)
+
+[02a7c0b | Thu Jul 02 10:43:27 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add missing rack-contrib development dependency
+
+[5d14456 | Thu Jul 02 10:35:12 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Now even obfuscate_mail should work on 1.8 again
+
+[6547065 | Thu Jul 02 10:13:22 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Layout helper asks for #to_hash, so it should use it. Also don't rely on Enumerable#first, not in 1.8.6
+
+[21e47bb | Thu Jul 02 10:12:49 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Don't rely on order in less spec
+
+[1389dd8 | Thu Jul 02 09:28:12 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Improve gem_setup task
+
+[dd9d838 | Thu Jul 02 07:02:57 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Update announcement
+
+[158ae0f | Tue Jun 30 10:50:13 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Let the bacon task pass -I with the root directory
+
+[4747ef4 | Tue Jun 30 10:49:34 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix the require path for bin/ramaze spec
+
+[1667e7f | Tue Jun 30 10:48:10 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Refactor AddressableRoute, use instance variable instead of constant
+
+[a41c4ac | Tue Jun 30 10:47:22 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix annoying behaviour when '/' location is assigned to an app earlier loaded, apps after it would overwrite the location. Now only :pristine uses it by default
+
+[2e7a643 | Tue Jun 30 10:45:44 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Remove ContentLength middleware from default stacks, all Rack handlers do that already
+
+[cfef249 | Tue Jun 30 10:45:19 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix the misc/css example
+
+[4dcc77d | Tue Jun 30 10:43:50 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Use absolute path when spec requires spec/helper, '.' will be removed from the load path in 1.9.2
+
+[03bd5bb | Sun Jun 28 05:43:57 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Remove deprecated cache method, add basic doc for cache_action
+
+[b2ae4dd | Thu Jun 25 11:18:58 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Improve the cache_value method of the cache helper, rename the cache used to cache_helper_value, and add some docs describing the new behaviour
+
+[0a4cbaf | Thu Jun 18 04:14:26 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Remove cruft from less
+
+[de61a32 | Thu Jun 18 04:09:15 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add support for the less css templating engine
+
+[529681e | Thu Jun 18 04:08:18 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix some spelling mistakes in the readme
+
+[f90b76e | Sat Jun 13 12:22:10 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * The spec mode was flawed, fix it and give proto better defaults
+
 [3aa5bfb | Fri Jun 12 12:54:51 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
 
   * Version 2009.06.12

data/doc/meta/announcement.txt

@@ -1,16 +1,17 @@
-The Ramaze development team is happy to announce version 2009.06 of Ramaze, the
+The Ramaze development team is happy to announce version 2009.07 of Ramaze, the
 light and modular open source web framework that tries to stay out of your way.
 
-This release features a lot of work directly from our community and we are
-really greatful for everybody who helped in testing, patching and contributing
-exciting new features.
+This release contains mostly bug fixes and compatibility improvements.
 
-Our extensive set of specs and docs now covers almost every detail of
-implementation and usage. Ramaze is under development by a growing community
-and in production use at companies.
+Also, thanks to the work of Jeremy Evans, Scaffolding Extensions works with the
+current version of Ramaze again, giving you a powerful and simple way to
+provide CRUD and admin interfaces for Sequel and ActiveRecord.
 
-There have been too many changes since the last official announcement in
-2008.07, so I will only list changes since the last release.
+I also would like to take this opportunity to ask for volunteers that are
+running on Windows, we are currently working on a major overhaul of the ramaze
+executable and would like to make sure it behaves correctly.
+If you are interested, check out the modular-bin branch and report any issues
+on the bug tracker or hang out on IRC.
 
 
 == Metadata
@@ -19,6 +20,7 @@ Home page:       http://ramaze.net
 Wiki:            http://wiki.ramaze.net
 
 Repository:      http://github.com/manveru/ramaze
+Bug tracker:     http://github.com/manveru/ramaze/issues
 
 Git clone:       git://github.com/manveru/ramaze
 Current tarball: http://github.com/manveru/ramaze/tarball/master
@@ -30,7 +32,7 @@ Simple example:
 
   require 'ramaze'
 
-  class MainController
+  class MainController < Ramaze::Controller
     def index
       'Hello, World!'
     end
@@ -39,66 +41,33 @@ Simple example:
   Ramaze.start
 
 
-== Around 80 commits since 2009.05
-
-- Improved bin/ramaze with lots of specs, should work now even on windows.
-- Middleware order has been inverted.
-- Support for Webrat out of the box.
-- Fixed MemCache caching and sessions.
-- Removed a whole lot of methods that were marked deprecated.
-- New default Layout helper
-
-
 == Summarized changes with their respective commits
 
-- Antti Tuomi 
-  - Link helper did not set the prefix, added spec and fixed the behaviour
-    [ af753a0 | bae2b53 | eba4734 ]
+- Aaron Müller
+  - Update identity helper with new link helper
+
+- Masahiro Nakagawa
+  - Rewrite localization example
 
 - Michael Fellinger (manveru)
-  - Fix bug that made default port/handler break in bin/ramaze [ e6715e1 ]
-  - Remove deprecated methods on Ramaze::Controller, Helper::Cache,
-    Helper::Link, and Helper::Auth. Also remove the deprecated methods
-    Object#acquire, String#/, and Symbol#/
-    [ 272fced | 1e4ac92 | a0a9329 | 68242b3 | 57e7a85 | 31b809a | 3fc4622 ]
-  - The bacon scope :mock was renamed to :rack_test, added shared :webrat, so
-    you can run your specs with that as well. Also move the bacon-specific code
-    to ramaze/spec/bacon, prepare for test-framework-agnostic behaviour.
-    [ f1a2669 | c12a0a4 | fdde916 ]
-  - Fix ordering of middleware [ 508bffc ]
-  - Warn and fix the ttl if someone exceeds the maximum ttl allowed by MemCache
-    [ 3124879 | bc08091 ]
-  - Comaptibility with localmemcache 0.4.0 [ 096f051 ]
-  - Fixed Cache::Sequel to work with 3.1.0 [ d2c2b85 ]
-  - Fix bug with memcache on 1.9, make sure the Etag middleware works on it
-    [ 21763df | 1d0dff5 ]
-  - A little bit of example-usage for Helper::Form#form_select, improve by
-    allowing :multiple => 10 [ a634582 | de73014 ]
-  - Avoid useless iteration and fix ambigous linking in helper/paginate
-    [ 6fb74df | 9b73450 ]
-  - Respect preset options for port/adapter on ramaze start [ 6efaaaa ]
-  - Preserve file permissions during `ramaze create` [ 3e3bc0a ]
-  - Implement and spec the lonely controller rule [ fdfe5b9 | 4dd866b ]
-  - Fix "bug" pointed out by druby [ 796627a ]
-  - Output to logger in ramaze/setup if Log is available, don't output the
-    require exception twice. Avoid infinite recursion when a
-    gem name does not match it's lib name [ b9fa0c4 | 7bc9d65 | e6b4996 ]
-  - Put a notice into config.ru making clear that the handler cannot be set
-    inside [ b4bad57 ]
-  - Some mods to contrib, fix facebook.rb syntax for ruby 1.9 and adding
-    Ramaze::AddressableRoute for great profit!  [ c7fbf0c | cafe657 ]
-  - Don't write a file to /tmp during the bin/ramaze spec [ eb5e4ef ]
-
-- Pistos 
-  - Explicitly state top-level namespace for ::File in config.ru, since
-    otherwise it is confused for Rack::File.
-    [ 5509950 ]
-  - Added Layout helper with specs and documentation
-    [ a84f675 | 41ad023 | 4f23d16 ]
-
-- TJ Vanderpoel (bougyman)
-  - Added some specs for ramaze/bin, correcting a require bug already in
-    bin/ramaze. [ 8bbb8e8 | 9a3edf3 | 33fa3aa ]
+  - Adding support for the less CSS templating engine
+  - Better defaults for proto specs
+  - The Helper::Cache#cache_value optionally takes a block now
+  - Make sure proto/config.ru points to correct location
+  - Fix annoying behaviour when '/' location is assigned to an app loaded
+    earlier, apps loaded afterwards would overwrite the mapping. This caused
+    some very annoying and hard to debug behaviour.
+  - Fix bacon task dependency
+  - Fix Controller to work properly on Ruby 1.8.6
+  - Fix bug when using localmemcache on Ruby 1.9
+  - Fix the misc/css example
+  - Remove Helper::Cache#cache method
+  - Use absolute paths for requires in all ramaze specs, $LOAD_PATH in Ruby
+    1.9.2 will not include '.'
+  - Remove ContentLength middleware from :live and :dev modes. Rack handlers
+    use it already.
+  - Refactor contrib/addressable_route, it now uses instance variables and can
+    take a mapping on initialize.
 
 A complete Changelog is available at
 http://github.com/manveru/ramaze/tree/master/doc/CHANGELOG?raw=true
@@ -106,19 +75,22 @@ http://github.com/manveru/ramaze/tree/master/doc/CHANGELOG?raw=true
 
 == Known issues
 
-- Some problems may show up when running the specs, these are mostly caused
-  by the gem-versions of Rack::Test and Rack, they only affect the specs and
-  should have no influence on the actual runtime.
+- When running on Ruby 1.9.x, Rack 1.0.0 has problems with the encoding, it is
+  recommended to use master HEAD from http://github.com/rack/rack until the
+  next release of Rack.
+- When running on Ruby 1.9.2dev (ruby trunk), using the thin handler can lead
+  to memory leaks. The cause is yet unknown, please use Ruby 1.9.1 or another
+  handler (mongrel, webrick, and fcgi are known to work well)
 
 
 == Ramaze Features
 
 - Builds on top of the Rack library, which provides easy use of adapters like
-  Mongrel, WEBrick, LiteSpeed, Thin, CGI or FCGI.
+  Mongrel, WEBrick, LiteSpeed, Thin, CGI, SCGI, or FCGI.
 
-- Supports a wide range of templating-engines like: ERB, Erubis, Haml, Liquid,
-  Maruku, Redcloth, Remarkably, Sass, Tagz, Tenjin. And its own engines called
-  Etanni, Ezamar, Gestalt, and Nagoro.
+- Supports a wide range of templating-engines like: ERB, Erubis, Haml, Less,
+  Liquid, Maruku, Redcloth, Remarkably, Sass, Tagz, Tenjin. And its own engines
+  called Etanni, Ezamar, Gestalt, and Nagoro.
 
 - Highly modular structure: you can just use the parts you like. This also
   means that it's very simple to add your own customizations.
@@ -128,8 +100,7 @@ http://github.com/manveru/ramaze/tree/master/doc/CHANGELOG?raw=true
   controllers.
 
 - It is possible to use the ORM you like, be it Sequel, DataMapper,
-  ActiveRecord, Og, Kansas or something more simplistic like DBI, or a wrapper
-  around YAML::Store.
+  ActiveRecord, Og, Kansas or something more simplistic like M4DBI.
 
 - Good documentation: although we don't have 100% documentation right now (dcov
   says around 75%), just about every part of Ramaze is covered with basic and
@@ -137,7 +108,7 @@ http://github.com/manveru/ramaze/tree/master/doc/CHANGELOG?raw=true
   available.
 
 - Friendly community: there are people from all over the world using Ramaze, so
-  you can get almost instant help and info.
+  you can get plenty of help and information around the clock.
 
 
 For more information please come to http://ramaze.net or ask directly on IRC