ramaze 2010.03 → 2010.04

data/MANIFEST

@@ -361,6 +361,7 @@ spec/examples/element.rb
 spec/examples/hello.rb
 spec/examples/helpers/httpdigest.rb
 spec/examples/linking.rb
+spec/examples/misc/sequel_scaffolding.rb
 spec/examples/simple.rb
 spec/examples/templates/template_erubis.rb
 spec/examples/templates/template_ezamar.rb
@@ -372,6 +373,7 @@ spec/examples/templates/template_nagoro.rb
 spec/examples/templates/template_redcloth.rb
 spec/examples/templates/template_remarkably.rb
 spec/examples/templates/template_tenjin.rb
+spec/examples/todolist.rb
 spec/helper.rb
 spec/ramaze/action/render.rb
 spec/ramaze/action/view/bar.xhtml

data/README.md

@@ -347,18 +347,15 @@ Some places to get started are:
 
 There are some examples for your instant pleasure inside the examples-directory
 in the Ramaze-distribution.
-To start up an example, you can use the Ramaze binary located in bin/ramaze
-for example:
+You can start up an example just as you usually would any other ruby program:
 
-  $ ramaze examples/hello.rb
+  $ ruby examples/basic/hello.rb
 
 Or:
 
-  $ cd examples/blog
-  $ ramaze
-
-Since ramaze uses the start.rb by default if you don't pass anything else.
-
+  $ cd examples/app/blog
+  $ ruby start.rb
+  
 For more information about the usage of ramaze try:
 
   $ ramaze --help
@@ -366,16 +363,16 @@ For more information about the usage of ramaze try:
 
 Examples include:
 
-* examples/hello.rb
+* examples/basic/hello.rb
   Hello, World!
 
-* examples/simple.rb
+* examples/basic/simple.rb
   A bit more advanced than the hello-example, but still very basic.
 
-* examples/blog
+* examples/app/blog
   Not yet fully functional, but coming along.
 
-* examples/whywiki
+* examples/app/whywiki
   A basic examples of a minimalistic application, based on the Wiki of \_why in
   his camping-framework.
 

data/Rakefile

@@ -14,7 +14,7 @@ PROJECT_SPECS = FileList[
 PROJECT_MODULE      = 'Ramaze'
 PROJECT_JQUERY_FILE = 'lib/proto/public/js/jquery.js'
 PROJECT_README      = 'README.md'
-PROJECT_VERSION     = ENV['VERSION'].dup || Date.today.strftime('%Y.%m.%d')
+PROJECT_VERSION     = (ENV['VERSION'] || Date.today.strftime('%Y.%m.%d')).dup
 PROJECT_COPYRIGHT   = [
   "#          Copyright (c) #{Time.now.year} Michael Fellinger m.fellinger@gmail.com",
   "# All files in this distribution are subject to the terms of the Ruby license."
@@ -25,41 +25,38 @@ DEPENDENCIES = {
 }
 
 DEVELOPMENT_DEPENDENCIES = {
-  "abstract"   	    => {:version => "1.0.0"},
-  "addressable"     => {:version => "2.1.1"},
-  "bacon"           => {:version => "1.1.0"},
-  "builder"         => {:version => "2.1.2"},
-  "erector"         => {:version => "0.7.2"},
-  "erubis"          => {:version => "2.6.5"},
-  "ezamar"          => {:version => "2009.06"},
-  "gemcutter"       => {:version => "0.5.0"},
-  "haml"            => {:version => "2.2.20"},
-  "hpricot"         => {:version => "0.8.2"},
-  "json"            => {:version => "1.2.0"},
-  "less"            => {:version => "1.1.13"},
-  "liquid"          => {:version => "2.0.0"},
-  "locale"          => {:version => "2.0.5"},
-  "localmemcache"   => {:version => "0.4.4"},
-  "lokar"           => {:version => "0.1.0"},
-  "maruku"          => {:version => "0.6.0"},
-  "memcache-client" => {:version => "1.8.0", :lib => 'memcache'},
-  "mustache"        => {:version => "0.6.0"},
-  "mutter"          => {:version => "0.5.3"},
-  "nagoro"          => {:version => "2009.05"},
-  "polyglot"        => {:version => "0.3.0"},
-  "rack-contrib"    => {:version => "0.9.2", :lib => 'rack/contrib'},
-  "rack-test"       => {:version => "0.5.3", :lib => 'rack/test'},
-  "ramaze"          => {:version => "2010.03.02"},
-  "RedCloth"        => {:version => "4.2.3"},
-  "Remarkably"      => {:version => "0.5.2", :lib => 'remarkably'},
-  "RubyInline"      => {:version => "3.8.4"},
-  "sequel"          => {:version => "3.9.0"},
-  "slippers"        => {:version => "0.0.14"},
-  "sqlite3-ruby"    => {:version => "1.2.5", :lib => 'sqlite3'},
-  "tagz"            => {:version => "7.2.3"},
-  "tenjin"          => {:version => "0.6.1"},
-  "treetop"         => {:version => "1.4.4"},
-  "ZenTest"         => {:version => "4.2.1"},
+  "abstract"   	            => {:version => "1.0.0"},
+  "addressable"             => {:version => "2.1.1"},
+  "bacon"                   => {:version => "1.1.0"},
+  "builder"                 => {:version => "2.1.2"},
+  "erector"                 => {:version => "0.7.2"},
+  "erubis"                  => {:version => "2.6.5"},
+  "ezamar"                  => {:version => "2009.06"},
+  "gemcutter"               => {:version => "0.5.0"},
+  "haml"                    => {:version => "2.2.22"},
+  "hpricot"                 => {:version => "0.8.2"},
+  "json"                    => {:version => "1.2.3"},
+  "less"                    => {:version => "1.2.21"},
+  "liquid"                  => {:version => "2.0.0"},
+  "locale"                  => {:version => "2.0.5"},
+  "localmemcache"           => {:version => "0.4.4"},
+  "lokar"                   => {:version => "0.1.0"},
+  "maruku"                  => {:version => "0.6.0"},
+  "memcache-client"         => {:version => "1.8.1", :lib => 'memcache'},
+  "mustache"                => {:version => "0.9.2"},
+  "mutter"                  => {:version => "0.5.3"},
+  "nagoro"                  => {:version => "2009.05"},
+  "rack-contrib"            => {:version => "0.9.2", :lib => 'rack/contrib'},
+  "rack-test"               => {:version => "0.5.3", :lib => 'rack/test'},
+  "RedCloth"                => {:version => "4.2.3"},
+  "Remarkably"              => {:version => "0.5.2", :lib => 'remarkably'},
+  "RubyInline"              => {:version => "3.8.4"},
+  "sequel"                  => {:version => "3.9.0"},
+  "scaffolding_extensions"  => {:version => "1.4.0"},
+  "slippers"                => {:version => "0.0.14"},
+  "sqlite3-ruby"            => {:version => "1.2.5", :lib => 'sqlite3'},
+  "tagz"                    => {:version => "7.2.3"},
+  "tenjin"                  => {:version => "0.6.1"},
 }
 
 GEMSPEC = Gem::Specification.new{|s|
@@ -83,8 +80,8 @@ GEMSPEC = Gem::Specification.new{|s|
 ============================================================
 
 Thank you for installing Ramaze!
-You can now do create a new project:
-# ramaze create yourproject
+To create a new project:
+$ ramaze create yourproject
 
 ============================================================
 MESSAGE

data/doc/AUTHORS

@@ -1,13 +1,14 @@
 Following persons have contributed to ramaze.
 (Sorted by number of submitted patches, then alphabetically)
 
-  2682 Michael Fellinger <m.fellinger@gmail.com>
+  2689 Michael Fellinger <m.fellinger@gmail.com>
    216 Aman Gupta <aman@ramaze.net>
     89 Jonathan Buch <jonathan.buch@gmail.com>
     77 Pistos <gitsomegrace.5.pistos@geoshell.com>
     69 Clive Crous <clive@crous.co.za>
     27 Keita Yamaguchi <keita.yamaguchi@gmail.com>
     20 Ryan Grove <ryan@wonko.com>
+    19 injekt <injekt.me@gmail.com>
     16 TJ Vanderpoel <bougy.man@gmail.com>
     11 Wang, Jinjing <nfjinjing@gmail.com>
      8 Mario Gutierrez <mgutz@mgutz-mbp.local>
@@ -22,12 +23,12 @@ Following persons have contributed to ramaze.
      4 mig <mig@mypeplum.com>
      3 Chris Duncan <celldee@gmail.com>
      3 Clinton R. Nixon <clinton.nixon@viget.com>
+     3 Masahiro Nakagawa <repeatedly@gmail.com>
      3 Riku Raisaenen <riku@helloit.fi>
      3 starapor <me@sarahtaraporewalla.com>
      2 Andrew Farmer <xichekolas@gmail.com>
      2 jShaf <joshua.shaffner@gmail.com>
      2 Lars Olsson <lasso@lassoweb.se>
-     2 Masahiro Nakagawa <repeatedly@gmail.com>
      2 Yutaka HARA <yutaka.hara+github@gmail.com>
      1 Aaron Mueller <mail@aaron-mueller.de>
      1 Ara T. Howard <ara.t.howard@gmail.com>
@@ -35,6 +36,7 @@ Following persons have contributed to ramaze.
      1 Cheah Chu Yeow <chuyeow@gmail.com>
      1 Christian Neukirchen <chneukirchen@gmail.com>
      1 Colin Shea <colin@centuar.(none)>
+     1 crab <crabtw@gmail.com>
      1 Dmitry Gorbik <dmitrygorbik@isengard.local>
      1 Fabian Buch <fabian.buch@fabian-buch.de>
      1 Gavin Kistner <gavin@phrogz.net>

data/doc/CHANGELOG

@@ -1,3 +1,118 @@
+[8a77923 | Fri Apr 02 15:43:02 UTC 2010] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Version 2010.04
+
+[f8a2708 | Fri Apr 02 15:41:43 UTC 2010] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix Mustache engine
+
+[a1c7fd6 | Fri Apr 02 15:34:50 UTC 2010] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Update post install message
+
+[fd3697a | Fri Apr 02 15:34:36 UTC 2010] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Update dependencies
+
+[135bc90 | Fri Apr 02 07:11:24 UTC 2010] injekt <injekt.me@gmail.com>
+
+  * fixed file dispatcher spec
+
+[4891e4b | Fri Apr 02 01:35:11 UTC 2010] injekt <injekt.me@gmail.com>
+
+  * added scaffolding_extensions dev dependency
+
+[f098e58 | Fri Apr 02 01:05:51 UTC 2010] injekt <injekt.me@gmail.com>
+
+  * fixed todolist requires
+
+[32c33de | Fri Apr 02 00:46:31 UTC 2010] injekt <injekt.me@gmail.com>
+
+  * pagination fixes
+
+[89080f4 | Fri Apr 02 00:19:34 UTC 2010] injekt <injekt.me@gmail.com>
+
+  * paginate helper to extend sequel with pagination
+
+[8c1a80a | Fri Apr 02 00:12:21 UTC 2010] injekt <injekt.me@gmail.com>
+
+  * fixed blog example
+
+[a4cc3cc | Mon Mar 29 15:13:35 UTC 2010] injekt <injekt.me@gmail.com>
+
+  * fixed partial example
+
+[df28492 | Mon Mar 29 14:59:09 UTC 2010] injekt <injekt.me@gmail.com>
+
+  * fix layout example
+
+[33fe3d0 | Fri Mar 26 11:49:18 UTC 2010] injekt <injekt.me@gmail.com>
+
+  * fixed path in usage example
+
+[de80952 | Fri Mar 26 11:45:54 UTC 2010] injekt <injekt.me@gmail.com>
+
+  * fixed a couple of depreciated methods in documentation
+
+[68682c1 | Fri Mar 26 01:18:05 UTC 2010] injekt <injekt.me@gmail.com>
+
+  * Change app location setting to how it's documented
+
+[7de6f76 | Fri Mar 26 00:51:35 UTC 2010] injekt <injekt.me@gmail.com>
+
+  * added spec for todolist example
+
+[1c2848e | Fri Mar 26 00:29:47 UTC 2010] injekt <injekt.me@gmail.com>
+
+  * fixed todolist example
+
+[fccee57 | Wed Mar 24 14:00:37 UTC 2010] injekt <injekt.me@gmail.com>
+
+  * fixed documention for number_counter, wrong method name used
+
+[a7ee66f | Wed Mar 24 02:20:19 UTC 2010] injekt <injekt.me@gmail.com>
+
+  * added spec for sequel_scaffolding
+
+[f19ddf9 | Wed Mar 24 02:11:34 UTC 2010] injekt <injekt.me@gmail.com>
+
+  * fixed sequel_scaffolding example
+
+[4c36872 | Wed Mar 24 00:05:12 UTC 2010] injekt <injekt.me@gmail.com>
+
+  * xhtml helpers should chomp leading slash from prefix
+
+[d4dcc8a | Tue Mar 23 16:24:28 UTC 2010] injekt <injekt.me@gmail.com>
+
+  * adapter handler should be fastcgi rack handler
+
+[d11daa3 | Tue Mar 23 10:07:40 UTC 2010] injekt <injekt.me@gmail.com>
+
+  * Project creator not copying dotfiles (.htaccess) due to globbing
+
+[bd1ec41 | Fri Mar 19 01:22:55 UTC 2010] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Replace last occurances of Global
+
+[050a949 | Thu Mar 11 18:44:20 UTC 2010] Masahiro Nakagawa <repeatedly@gmail.com>
+
+  * Fix Mustache template adapter
+
+    Mustache changed template context(latest version doesn't use Hash).
+    So, if template file doesn't find, use Mustache::Context instead of Hash.
+
+[6df728c | Thu Mar 11 08:14:43 UTC 2010] crab <crabtw@gmail.com>
+
+  * use Ramaze.options.prefix as link prefix
+
+[1095d18 | Tue Mar 09 01:50:23 UTC 2010] Michael Fellinger <m.fellinger@gmail.com>
+
+  * ramaze is no dependency of ramaze
+
+[b46443d | Tue Mar 09 01:47:57 UTC 2010] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix .dup in Rakefile
+
 [43a38b8 | Mon Mar 08 13:55:07 UTC 2010] Michael Fellinger <m.fellinger@gmail.com>
 
   * Version 2010.03

data/examples/app/blog/app.rb

@@ -2,8 +2,8 @@ require 'rubygems'
 require 'ramaze'
 
 Ramaze.setup :verbose => true do
-  gem 'sequel', '2.12.0'
-  gem 'maruku', '0.5.9'
+  gem 'sequel', '3.9.0'
+  gem 'maruku', '0.6.0'
 end
 
 module Blog

data/examples/app/blog/controller/init.rb

@@ -3,6 +3,8 @@ module Blog
     engine :Nagoro
     layout(:default){|path, wish| wish !~ /rss|atom/ }
     map_layouts '/'
+    map nil, :blog
+    app.location = '/'
     trait :app => :blog
     helper :form, :auth, :formatting
 

data/examples/app/blog/model/init.rb

@@ -6,6 +6,7 @@ module Blog
   # DB = Sequel.connect("sqlite:///#{__DIR__}/../blog.db")
 end
 
+Sequel.extension :pagination
 Sequel::Model.plugin :validation_class_methods
 Sequel::Model.plugin :schema
 Sequel::Model.plugin :hook_class_methods

data/examples/app/blog/start.rb

@@ -2,4 +2,4 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'app'
 
-Ramaze.start(:adapter => :webrick, :mode => :dev) if $0 == __FILE__
+Ramaze.start :adapter => :webrick, :mode => :dev

data/examples/app/todolist/controller/init.rb

@@ -3,8 +3,10 @@ module TodoList
     layout :default
     engine :Etanni
     helper :form
-    trait :app => :todolist
+    
+    map '/', :todolist
+    app.location = '/'
   end
 end
 
-require 'controller/task'
+require __DIR__'task'

data/examples/app/todolist/controller/task.rb

@@ -22,17 +22,17 @@ module TodoList
     end
 
     def open(title)
-      Task[:title => title].open!
+      Task[:title => Ramaze::Helper::CGI.url_decode(title)].open!
       redirect r('/')
     end
 
     def close(title)
-      Task[:title => title].close!
+      Task[:title => Ramaze::Helper::CGI.url_decode(title)].close!
       redirect r('/')
     end
 
     def delete(title)
-      Task[:title => title].destroy
+      Task[:title => Ramaze::Helper::CGI.url_decode(title)].destroy
       redirect r('/')
     end
   end

data/examples/app/todolist/model/init.rb

@@ -11,4 +11,4 @@ module TodoList
   # DB = Sequel.sqlite(__DIR__('../todolist.sqlite'))
 end
 
-require 'model/task'
+require __DIR__'task'

data/examples/app/todolist/start.rb

@@ -5,7 +5,7 @@ Ramaze.setup do
   gem 'sequel'
 end
 
-require 'controller/init'
-require 'model/init'
+require __DIR__'controller/init'
+require __DIR__'model/init'
 
 Ramaze.start

data/examples/basic/layout.rb

@@ -3,7 +3,7 @@ require 'ramaze'
 
 class MainController < Ramaze::Controller
   layout :page
-  provide :html => :nagoro
+  provide :html, :engine => :Nagoro
 
   def index
     @title = "Test"

data/examples/basic/partial.rb

@@ -7,7 +7,7 @@ require 'ramaze'
 # Browse to /more and /even_more
 
 class MainController < Ramaze::Controller
-  provide :html => :nagoro
+  engine :nagoro
 
   def index
     "Hello, World!"

data/examples/basic/simple.rb

@@ -3,8 +3,9 @@ require 'ramaze'
 
 # A very simple little application, you can simply run it and
 # point your browser to http://localhost:7000
-# you can change the port by setting
-# Global.port = 80
+#
+# You can change the port by setting
+# Ramaze.options.adapter.port = 80
 # this most likely requires root-privileges though.
 
 # This example shows following (requests to the mentioned base-url) :

data/examples/misc/sequel_scaffolding.rb

@@ -3,8 +3,14 @@ require 'ramaze'
 require 'sequel'
 require 'scaffolding_extensions'
 
+# More information on Scaffolding Extensions here: http://scaffolding-ext.rubyforge.org/
+
 DB = Sequel.sqlite
 
+# Sequel::Model doesn't support schema creation by default
+# So we have to load it as a plugin
+Sequel::Model.plugin :schema
+
 class User < Sequel::Model(:user)
   set_schema do
     primary_key :id
@@ -12,12 +18,17 @@ class User < Sequel::Model(:user)
     text :description
   end
 
-  create_table unless User.table_exists?
+  create_table unless table_exists?
+  
+  # Add a couple of users to our database
+  create(:name => 'manveru', :description => 'The first user!')
+  create(:name => 'injekt', :description => 'Just another user')
 end
 
 ScaffoldingExtensions.all_models = [User]
 
 class UserController < Ramaze::Controller
+  map '/user'
   scaffold_all_models :only => [User]
 end
 
@@ -27,7 +38,7 @@ class MainController < Ramaze::Controller
       <a href="http://sequel.rubyforge.org/classes/Sequel/Model.html">
       Sequel::Model
       </a> User.
-      You can access the scaffolded Model at #{A('/user')}}
+      You can access the scaffolded Model at #{a('/user')}}
   end
 end