manveru-ramaze 2008.08 → 2008.09

data/doc/tutorial/todolist.mkd

@@ -1,6 +1,6 @@
 Title: The official Ramaze todolist tutorial
-HTML use syntax: true
-
+html_use_syntax: true
+uv_style: iplastic
 
 # To-do List Tutorial
 
@@ -46,7 +46,8 @@ to-do list.
 
 So run:
 
-    $ ramaze --create todolist
+    ramaze --create todolist
+{:lang=shell-unix-generic}
 
 done.
 
@@ -59,7 +60,7 @@ with your ORM or database-library of choice.
 
 So first, create a `model/todolist.rb` for our application:
 
-	require 'ramaze/store/default'
+    require 'ramaze/store/default'
     TodoList = Ramaze::Store::Default.new('todolist.yaml')
 {:lang=ruby}
 
@@ -100,7 +101,7 @@ simple.
         </ul>
       </body>
     </html>
-{:lang=nagoro}
+{:lang=html}
 
 I will assume that you are familiar with basic Ruby already, so we will
 concentrate on the things new here.
@@ -118,7 +119,7 @@ interesting part)
       <li>Laundry: not done</li>
       <li>Wash dishes: not done</li>
     </ul>
-{:lang=nagoro}
+{:lang=html}
 
 That wasn't too bad, huh?
 
@@ -202,7 +203,7 @@ changed to do following:
         <?r end ?>
       </body>
     </html>
-{:lang=ruby}
+{:lang=ezamar}
 
 The rest of the template can stay the same.
 
@@ -224,6 +225,7 @@ Add a link on the `view/index.xhtml` like this:
 
     <h1>TodoList</h1>
     <a href="/new">New Task</a>
+{:lang=ezamar}
 
 Open a new file `view/new.xhtml` with a form to add a new task.
 
@@ -240,6 +242,7 @@ Open a new file `view/new.xhtml` with a form to add a new task.
         </form>
       </body>
     </html>
+{:lang=ezamar}
 
 We will not need a method for this on our controller, in fact, actions can
 consist of either method and template or only one of them. The Controller
@@ -288,7 +291,7 @@ Jump into `view/index.xhtml` and do the following:
         #{h title}: #{status} - [ #{toggle} ]
       </li>
     <?r end
-{:lang=ruby}
+{:lang=ezamar}
 
 We added a new element here, `toggle`, the Controller should give us
 a link to change the status corresponding to the status of the task, so off
@@ -317,6 +320,7 @@ toggle the status, A and Rs are both methods that help you do that.
 The result will be something like:
 
     <a href="/open/Wash+dishes">Close Task</a>
+{:lang=ezamar}
 
 Rs actually is responsible to build the links href, for more information please
 take a look at the RDoc for LinkHelper.
@@ -364,7 +368,10 @@ will translate into:
     open('Wash dishes')
 {:lang=ruby}
 
-Which in turn will call `task_status('Wash dishes', false)`
+Which in turn will call 
+
+    task_status('Wash dishes', false)
+{:lang=ruby}
 
 That's it, go on and try it :)
 
@@ -396,6 +403,7 @@ Now jumping to `view/index.xhtml` again, change it so it shows the link:
         #{h title}: #{status} [ #{toggle} | #{delete} ]
       </li>
     <?r end ?>
+{:lang=ezamar}
 
 Voilà, you now have acquired the Certificate of Ramazeness.
 
@@ -406,6 +414,7 @@ explain some more advanced concepts of Ramaze and Ezamar.
 ## Eighth Step, Elements
 
     <Page></Page>
+{:lang=ezamar}
 
 This is called an Element, Ramaze will go and search for a class that matches
 the name Page and responds to `#render`. Then it will go and hand the content in
@@ -423,12 +432,14 @@ Let us have a look at our templates, they got some repetitive stuff, like:
         <h1>some title</h1>
       </body>
     </html>
+{:lang=ezamar}
 
 How about replacing that with something short and reusable:
 
     <Page title="TodoList">
       your other content
     </Page>
+{:lang=html}
 
 Would be nice of course, and when you start having more templates it makes an
 awful lot of sense being able to change the enclosing stuff in one place.
@@ -497,6 +508,7 @@ First the `view/index.xhtml`
         </ul>
       <?r end ?>
     </Page>
+{:lang=ezamar}
 
 and the `view/new.xhtml`
 
@@ -507,6 +519,7 @@ and the `view/new.xhtml`
         <input type="submit" />
       </form>
     </Page>
+{:lang=ezamar}
 
 Alright, now just go and look at the result in the browser, try changing
 the things inside the Element and look at how it behaves.
@@ -526,6 +539,7 @@ So, from what we have right now:
         </li>
       <?r end ?>
     </ul>
+{:lang=ezamar}
 
 To something like this:
 
@@ -539,6 +553,7 @@ To something like this:
         </tr>
       <?r end ?>
     </table>
+{:lang=ezamar}
 
 And, since we have proper classes to address some style sheets, jump into the
 Page element and add some style sheet:
@@ -554,6 +569,7 @@ Page element and add some style sheet:
         a         { color:       #3a3;              }
       </style>
     </head>
+{:lang=ezamar}
 
 That looks quite a bit nicer, right?  And yes, if you don't like tables (though
 this is an entirely legit use in my opinion) you can just do it like you want,
@@ -759,6 +775,7 @@ and add in the right place:
       <?r end ?>
       #{content}
     </body>
+{:lang=ezamar}
 
 The only thing special about it is the `\\#{flash[:error]}`, we have to escape
 the `#` so it won't evaluate this immediately but wait until it is really

data/examples/helpers/paginate.rb

@@ -0,0 +1,71 @@
+require 'rubygems'
+require 'ramaze'
+
+USERS = DATA.read.split("\n")
+
+class MainController < Ramaze::Controller
+  helper :paginate
+
+  trait :paginate => {
+    :limit => 6,
+    :var => 'user_page',
+  }
+
+  def index
+    @pager = paginate(USERS)
+%q~
+<html>
+  
+  <head><title>Users</title></head>
+  <body>
+    #{@pager.navigation if @pager.needed?}
+    <pre>
+      <?r @pager.each do |user| ?>
+        #{user}
+      <?r end ?>
+    </pre>
+    #{@pager.navigation if @pager.needed?}
+  </body>
+</html>
+~
+  end
+end
+
+Ramaze.start
+
+__END__
+Michael Fellinger       1868 [ 77.13% ]
+Aman Gupta               211 [  8.71% ]
+Jonathan Buch             89 [  3.67% ]
+Gabriele Renzi            49 [  2.02% ]
+Ara T. Howard             44 [  1.82% ]
+Clive Crous               37 [  1.53% ]
+Keita Yamaguchi           27 [  1.11% ]
+Ryan Grove                17 [  0.70% ]
+Pistos                    16 [  0.66% ]
+Wang, Jinjing             11 [  0.45% ]
+Colin Shea                 9 [  0.37% ]
+Sam Carr                   6 [  0.25% ]
+Stephan Maka               5 [  0.21% ]
+samcarr                    4 [  0.17% ]
+raggi                      3 [  0.12% ]
+Clinton R. Nixon           3 [  0.12% ]
+Chris Duncan               3 [  0.12% ]
+Richard Outten             2 [  0.08% ]
+Andy Smith                 2 [  0.08% ]
+skaar                      1 [  0.04% ]
+Yasushi Abe                1 [  0.04% ]
+Thomas Leitner             1 [  0.04% ]
+Rob Lievaart               1 [  0.04% ]
+Riku Raisaenen             1 [  0.04% ]
+Matt Rubens                1 [  0.04% ]
+Martin Hilbig              1 [  0.04% ]
+Leo Borisenko              1 [  0.04% ]
+Lars Olsson                1 [  0.04% ]
+Jeremy Evans               1 [  0.04% ]
+Jean-Francois Chevrette    1 [  0.04% ]
+James Tucker               1 [  0.04% ]
+Fabian Buch                1 [  0.04% ]
+Christian Neukirchen       1 [  0.04% ]
+Carlo Zottmann             1 [  0.04% ]
+Andrew Farmer              1 [  0.04% ]

data/examples/misc/simple_auth.rb

@@ -2,22 +2,34 @@ require 'rubygems'
 require 'ramaze'
 
 class MainController < Ramaze::Controller
-  LOGINS = {
-   :username => 'password',
-   :admin => 'secret'
-  }.map{|k,v| ["#{k}:#{v}"].pack('m').strip} unless defined? LOGINS
+  trait :logins => {
+   'jill' => 'password1',
+   'jack' => 'password2',
+  }.map{|k,v| ["#{k}:#{v}"].pack('m').strip }
 
   helper :aspect
 
   before_all do
-    response['WWW-Authenticate'] = %(Basic realm="Login Required")
-    respond 'Unauthorized', 401 unless auth = request.env['HTTP_AUTHORIZATION'] and
-                                       LOGINS.include? auth.split.last
+    check_auth
   end
 
   def index
     'Secret Info'
   end
+
+  private
+
+  def check_auth
+    response['WWW-Authenticate'] = 'Basic realm="Login Required"'
+
+    if auth = request.env['HTTP_AUTHORIZATION']
+      if class_trait[:logins].include?(auth.split.last)
+        return true
+      end
+    end
+
+    respond 'Unauthorized', 401
+  end
 end
 
-Ramaze.start :adapter => :mongrel
+Ramaze.start :adapter => :mongrel

data/lib/proto/controller/init.rb

@@ -0,0 +1,10 @@
+# Define a subclass of Ramaze::Controller holding your defaults for all
+# controllers
+
+class Controller < Ramaze::Controller
+  layout '/page'
+  helper :xhtml
+  engine :Ezamar
+end
+
+acquire __DIR__/"*.rb"

data/lib/proto/controller/main.rb

@@ -5,9 +5,7 @@
 #  map '/otherurl'
 # this will force the controller to be mounted on: /otherurl
 
-class MainController < Ramaze::Controller
-  layout '/page'
-
+class MainController < Controller
   # the index action is called automatically when no other action is specified
   def index
     @title = "Welcome to Ramaze!"

data/lib/proto/model/init.rb

@@ -0,0 +1,4 @@
+# Here goes your database connection and options
+
+# Require all models in '/model/*.rb'
+acquire __DIR__/"*.rb"

data/lib/proto/spec/main.rb

@@ -1,7 +1,7 @@
 require 'ramaze'
 require 'ramaze/spec/helper'
 
-require __DIR__/'..'/'start'
+require __DIR__/'../start'
 
 describe MainController do
   behaves_like 'http', 'xpath'
@@ -11,6 +11,7 @@ describe MainController do
   it 'should show start page' do
     got = get('/')
     got.status.should == 200
+    puts got.body
     got.at('//title').text.strip.should ==
       MainController.new.index
   end

data/lib/proto/start.rb

@@ -1,8 +1,8 @@
 require 'rubygems'
 require 'ramaze'
 
-# require all controllers and models
-acquire __DIR__/:controller/'*'
-acquire __DIR__/:model/'*'
+# Initialize controllers and models
+require 'controller/init'
+require 'model/init'
 
 Ramaze.start :adapter => :webrick, :port => 7000

data/lib/ramaze.rb

@@ -33,6 +33,11 @@ module Ramaze
   BASEDIR = File.dirname(File.expand_path(__FILE__))
   $LOAD_PATH.unshift BASEDIR
   $LOAD_PATH.uniq!
+
+  # Shortcut to the HTTP_STATUS_CODES of Rack::Utils
+  # inverted for easier access
+
+  STATUS_CODE = Rack::Utils::HTTP_STATUS_CODES.invert
 end
 
 Thread.abort_on_exception = true
@@ -43,6 +48,7 @@ require 'ramaze/reloader'
 require 'ramaze/snippets'
 require 'ramaze/log'
 require 'ramaze/trinity'
+require 'ramaze/dispatcher'
 require 'ramaze/current'
 require 'ramaze/adapter'
 require 'ramaze/option'
@@ -53,7 +59,6 @@ require 'ramaze/tool'
 require 'ramaze/controller'
 
 # Complete
-require 'ramaze/dispatcher'
 require 'ramaze/template/ezamar'
 require 'ramaze/contrib'
 require 'ramaze/route'

data/lib/ramaze/action.rb

@@ -10,7 +10,7 @@ module Ramaze
     # The Action holds information that is essential to render the action for a
     # request.
 
-    class Action < Struct.new('Action', *members)
+    class Action < Ramaze::Struct.new('Action', *members)
     end
   end
 
@@ -145,7 +145,7 @@ module Ramaze
     end
   end
 
-  # Shortcut to create new instances of Action via Action::fill
+  # Shortcut to create new instances of Action
 
   def self.Action(hash = {})
     Action.create(hash)

data/lib/ramaze/adapter.rb

@@ -11,11 +11,6 @@ Socket.do_not_reverse_lookup = true
 
 module Ramaze
 
-  # Shortcut to the HTTP_STATUS_CODES of Rack::Utils
-  # inverted for easier access
-
-  STATUS_CODE = Rack::Utils::HTTP_STATUS_CODES.invert
-
   # This module holds all classes and methods related to the adapters like
   # webrick or mongrel.
   # It's responsible for starting and stopping them.

data/lib/ramaze/adapter/base.rb

@@ -5,14 +5,29 @@ module Ramaze
   module Adapter
 
     # (Rack) middleware injected around Adapter::Base::call
-    MIDDLEWARE = OrderedSet.new(
-      Ramaze::Current,
-      Ramaze::Reloader,
+    MIDDLEWARE = OrderedSet[
+      Rack::ShowExceptions,
       Rack::ShowStatus,
-      Rack::ShowExceptions
-    )
+      # Rack::Deflater,
+      Ramaze::Reloader,
+      Ramaze::Current,
+      Ramaze::Dispatcher,
+    ]
+
+    def self.middleware(mws = MIDDLEWARE)
+      if @middleware and trait[:previous] == mws
+        @middleware
+      else
+        trait :previous => mws.dup
+        inner_app = mws.last
+        cascade = mws[0...-1].reverse
+
+        @middleware = cascade.inject(inner_app){|app, mw| mw.new(app) }
+      end
+    end
 
-    trait :middleware => MIDDLEWARE.inject{|app, middleware| middleware.new(app) }
+    @middleware = nil
+    @middleware = middleware
 
     # Helper to assign a new block to before_call
     # Usage:
@@ -31,6 +46,7 @@ module Ramaze
 
     class Base
       class << self
+
         attr_reader :thread
 
         # Call ::startup with the given host and port.
@@ -102,9 +118,10 @@ module Ramaze
 
         def respond(env)
           Ramaze::STATE.wrap do
-            Adapter.trait[:middleware].call(env)
+            Adapter::middleware.call(env)
           end
         end
+
       end
     end
   end