manveru-ramaze 2009.04 → 2009.04.01

data/examples/app/blog/app.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'ramaze'
 
 Ramaze.setup :verbose => true do
-  gem 'sequel', '2.12.0'
+  gem 'sequel', '2.11.0'
   gem 'maruku', '0.5.9'
 end
 

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

@@ -23,7 +23,7 @@ module Blog
       if @comment.update(@entry, request)
         redirect @comment.href
       else
-        render_partial(:form, :comment => @comment, :entry => @entry)
+        partial_content(:form, :comment => @comment, :entry => @entry)
       end
     end
 

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

@@ -25,6 +25,9 @@ module Blog
       @comment_count = number_counter(@entry.comments.count, 'comment')
     end
 
+    def feed
+    end
+
     def edit(slug)
       login_required
       @entry = Entry.from_slug(slug)
@@ -58,18 +61,6 @@ module Blog
       Entry.from_slug(slug).destroy
     end
 
-    def trackback(slug)
-      render_partial(:index){|a|
-        a.method = :index
-        a.params << slug
-      } + <<-COMMENT.strip
-I really have not the faintest idea about what this is supposed to do.<br />
-People tell me it's broken, but nobody tells me how to fix it :)<br />
-For now I'll just use it to show off how to modify an action that requires a
-method parameter.
-      COMMENT
-    end
-
     private
 
     def fetch_tags

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

@@ -1,15 +1,10 @@
 require 'sequel'
-require 'sequel/extensions/inflector'
 
 module Blog
   DB = Sequel.sqlite("#{__DIR__}/../blog.db")
   # DB = Sequel.connect("sqlite:///#{__DIR__}/../blog.db")
 end
 
-Sequel::Model.plugin :validation_class_methods
-Sequel::Model.plugin :schema
-Sequel::Model.plugin :hook_class_methods
-
 require 'model/tag'
 require 'model/entry'
 require 'model/comment'

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

@@ -7,8 +7,8 @@ module Blog
       foreign_key :tag_id
     end
 
-    many_to_one :entry, :class => 'Blog::Entry'
-    many_to_one :tag, :class => 'Blog::Tag'
+    belongs_to :entry, :class => 'Blog::Entry'
+    belongs_to :tag, :class => 'Blog::Tag'
 
     create_table unless table_exists?
   end

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/blog/view/entry/index.nag

@@ -1,7 +1,7 @@
-#{ Blog::Entries.render_partial(:show, :entry => @entry) }
+#{ Blog::Entries.partial_content(:show, :entry => @entry) }
 <div id="comments" class="comments">
   <?r @entry.comments.each do |comment| ?>
-    #{ Blog::Comments.render_partial(:show, :comment => comment) }
+    #{ Blog::Comments.partial_content(:show, :comment => comment) }
   <?r end ?>
-  #{ Blog::Comments.render_partial(:form, :entry => @entry) }
+  #{ Blog::Comments.partial_content(:form, :entry => @entry) }
 </div>

data/examples/app/blog/view/feed.atom.nag

@@ -13,6 +13,6 @@
   <id>#{ "#{ Blog.options.uuid }/atom" }</id>
   <generator uri='#{ @generator_uri }'>#{ @generator }</generator>
   <?r @entries.each do |entry| ?>
-    #{ Blog::Entries.render_partial('feed.atom', :entry => entry) }
+    #{ Blog::Entries.partial_content('feed.atom', :entry => entry) }
   <?end ?>
 </feed>

data/examples/app/blog/view/feed.rss.nag

@@ -19,7 +19,7 @@
     <docs>http://blogs.law.harvard.edu/tech/rss</docs>
     <ttl>240</ttl>
     <?r @entries.each do |entry| ?>
-      #{ Blog::Entries.render_partial('feed.rss', :entry => entry) }
+      #{ Blog::Entries.partial_content('feed.rss', :entry => entry) }
     <?r end ?>
   </channel>
 </rss>

data/examples/app/blog/view/index.nag

@@ -1,6 +1,6 @@
 <div id="entries">
   <?r @pager.each do |entry| ?>
-    #{Blog::Entries.render_partial(:show, :entry => entry)}
+    #{Blog::Entries.partial_content(:show, :entry => entry)}
   <?r end ?>
   #{ @pager.navigation if @pager.needed? }
 </div>

data/examples/app/blog/view/tag/index.nag

@@ -1,5 +1,5 @@
 <?r @tags.each do |tag| ?>
   <?r tag.entries.each do |entry| ?>
-    #{Blog::Entries.render_partial(:show, :entry => entry)}
+    #{Blog::Entries.partial_content(:show, :entry => entry)}
   <?r end ?>
 <?r end ?>

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

@@ -1,7 +1,4 @@
 module TodoList
-  # yeah, we're lazy
-  Sequel::Model.plugin(:schema)
-
   # Uncomment the line for the DB you want to use.
 
   # Sqlite In memory, fastest, but cannot persist over restarts.

data/examples/app/wikore/spec/wikore.rb

@@ -1,18 +1,20 @@
 require 'ramaze'
-require 'ramaze/spec'
+require 'ramaze/spec/helper'
 
-spec_requires 'hpricot', 'sequel'
+spec_require 'hpricot', 'sequel'
 
 $LOAD_PATH.unshift base = __DIR__('..')
 require 'start'
 
 describe 'Wikore' do
-  behaves_like :mock
+  behaves_like 'http'
+  ramaze :public_root => base/:public,
+         :view_root   => base/:template
 
   def check_redirect(to = '/')
     response = yield
     response.status.should == 302
-    response.body.should =~ /<a href='.*#{to}'>/
+    response.body.should =~ /<a href="#{to}">/
   end
 
   def page_should_exist(name, *matches)

data/examples/app/wikore/src/controller.rb

@@ -18,28 +18,26 @@ class MainController < Ramaze::Controller
   end
 end
 
-class Pages < Ramaze::Controller
+class PageController < Ramaze::Controller
   map '/page'
 
-  def create
-    redirect_referer unless request.post?
+  helper :aspect
 
+  def create
     change "Created Page '%s'" do |title, text|
       Page.create(:title => title, :text => text, :version => 1)
-      redirect MainController.r(:/, title)
+      redirect R(MainController, title)
     end
   end
 
   def save
-    redirect_referer unless request.post?
-
     change "Updated Page '%s'" do |title, text|
       page = Page[:title => title]
       page.backup
       page.text = text
       page.version += 1
       page.save
-      redirect MainController.r(:/, title)
+      redirect R(MainController, title)
     end
   end
 
@@ -62,7 +60,11 @@ class Pages < Ramaze::Controller
   def revert(title)
     page = Page[:title => title]
     page.revert
-    redirect MainController.r(:/, title)
+    redirect R(MainController, title)
+  end
+
+  before :create, :save do
+    redirect_referer unless request.post?
   end
 
   private
@@ -73,6 +75,6 @@ class Pages < Ramaze::Controller
       message % title
     end
 
-    redirect MainController.r(redirect_to)
+    redirect(R(MainController, redirect_to))
   end
 end

data/examples/app/wikore/src/model.rb

@@ -1,14 +1,17 @@
 require 'sequel'
 
-if $wikore_db == :memory
-  DB = Sequel.sqlite
-else
-  DB_FILE = __DIR__('wikore.db')
-  DB = Sequel.connect("sqlite://#{DB_FILE}")
+begin
+  case $wikore_db
+  when :memory
+    DB = Sequel.sqlite
+  else
+    DB_FILE = __DIR__('wikore.db')
+    DB = Sequel.connect("sqlite://#{DB_FILE}")
+  end
+rescue NoMethodError
+  raise LoadError, 'Install latest Sequel gem'
 end
 
-Sequel::Model.plugin :schema
-
 module Model
   PAGE_SCHEMA = lambda{
     primary_key :id

data/examples/app/wikore/start.rb

@@ -6,4 +6,4 @@ $wikore = {}
 require 'src/model'
 require 'src/controller'
 
-Ramaze.start :file => __FILE__
+Ramaze.start

data/examples/helpers/provide.rb

@@ -0,0 +1,23 @@
+require 'ramaze'
+require 'fjson'
+
+class User
+  def to_yaml
+    "Look, I'm YAML!".to_yaml
+  end
+
+  def to_json
+    "Look, I'm YSON!".to_json
+  end
+end
+
+class MainController < Ramaze::Controller
+  helper :provide
+  provides :yaml, :json
+
+  def user
+    display User.new
+  end
+end
+
+Ramaze.start

data/examples/misc/rapp.rb

@@ -4,13 +4,10 @@
 require 'rubygems'
 require 'ramaze'
 require 'sequel'
-require 'abbrev'
 
-DB = Sequel.sqlite
+DB = Sequel.sqlite :logger => Ramaze::Log
 
 class Post < Sequel::Model
-  plugin :schema
-  plugin :hook_class_methods
   set_schema{ primary_key :id; time :created_at; text :text }
   before_create{ self.created_at ||= Time.now }
   create_table
@@ -21,35 +18,27 @@ end
 class MainController < Ramaze::Controller
   def index
     @posts = Post.order(:created_at.desc).first(10)
-
-    <<-'TEMPLATE'.strip
-<html>
-  <head><title>Rapp</title></head>
-  <body>
-    <h1>Welcome to Rapp</h1>
-    <h2>A minimal chat wall</h2>
-    <p>Recent Posts:</p>
-    <div id="posts" class="container">
-      <?r @posts.each do |post| ?>
-        <div id="post-#{post.id}" class="post">
-          <p class="text">#{post.text}</p>
-          <p class="created">#{post.created_at}</p>
-        </div>
-      <?r end ?>
+%q(<h1>Welcome to Rapp</h1>
+<h2>A minimal chat wall</h2>
+<p>Recent Posts:</p>
+<div id="posts" class="container">
+  <?r @posts.each do |post| ?>
+    <div id="post-#{post.id}" class="post">
+      <p class="text">#{post.text}</p>
+      <p class="created">#{post.created_at}</p>
     </div>
-    <p>Post Something:</p>
-    <form action="#{r(:create)}" method="POST">
-      <input type="text" size="40" name="text" />
-      <input type="submit" value="Post Message!" />
-    </form>
-  </body>
-</html>
-    TEMPLATE
+  <?r end ?>
+</div>
+<p>Post Something:</p>
+<form action="#{Rs(:create)}" method="POST">
+  <input type="text" size="40" name="text" />
+  <input type="submit" value="Post Message!" />
+</form>)
   end
 
   def create
     Post.create(:text => request[:text])
-    redirect r(:/)
+    redirect Rs(:/)
   end
 end
 

data/examples/templates/template_redcloth.rb

@@ -42,13 +42,13 @@ __REDCLOTH__
   end
 
   def layout
-    <<'__HTML__'
+    <<__HTML__
 <html>
   <head>
     <title>Template::RedCloth <%= @place %></title>
   </head>
   <body>
-    <%= @content %>
+#{@content}
   </body>
 </html>
 __HTML__

data/examples/templates/template_xslt.rb

@@ -0,0 +1,48 @@
+require 'rubygems'
+require 'ramaze'
+require 'ramaze/gestalt'
+
+class MainController < Ramaze::Controller
+  engine :XSLT
+
+  def index
+    redirect R(:external)
+  end
+
+  def external *args
+    r = lambda { |*a| R(*a) }
+    response['Content-Type'] = 'application/xhtml+xml'
+
+    #options = {:place => :internal, :action => 'internal',
+    #  :args => args, :request => request, :this => self}
+    Ramaze::Gestalt.build do
+      page(:title=>"Template::XSLT") do
+        heading "The external Template for XSLT"
+        text "Here you can pass some stuff if you like, parameters are just passed like this:"
+        list do
+          item {
+            link(:href => r.call(@this, :external, :one)) { "external/one" }
+          }
+          item {
+            link(:href => r.call(@this, :external, :one, :two, :three)) { "external/one/two/three" }
+          }
+          item {
+            link(:href => r.call(@this, :external, :one, :foo => :bar)) { "external/one?foo=bar" }
+          }
+        end
+        text "The arguments you have passed to this action are:"
+        if args.empty?
+          text "none"
+        else
+          list {
+            args.each do |arg|
+              item arg
+            end
+          }
+        end
+      end
+    end
+  end
+end
+
+Ramaze.start :file => __FILE__

data/examples/templates/view/external.xsl

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0"
+		xmlns="http://www.w3.org/1999/xhtml"
+		xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+		exclude-result-prefixes="xsl">
+
+<xsl:output method="xml"
+            version="1.0"
+            encoding="utf-8"
+            doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
+            doctype-system="DTD/xhtml1-strict.dtd"
+            indent="yes"/>
+
+  <xsl:template match="/page">
+    <html>
+      <head>
+	<title>
+	  <xsl:value-of select="@title"/>
+	</title>
+      </head>
+      <body>
+	<xsl:apply-templates/>
+      </body>
+    </html>
+  </xsl:template>
+
+  <xsl:template match="heading">
+    <h1>
+      <xsl:apply-templates/>
+    </h1>
+  </xsl:template>
+
+  <xsl:template match="list">
+    <ul>
+      <xsl:apply-templates/>
+    </ul>
+  </xsl:template>
+
+  <xsl:template match="list/item">
+    <li>
+      <xsl:apply-templates/>
+    </li>
+  </xsl:template>
+
+  <xsl:template match="link">
+    <a href="{@href}">
+      <xsl:apply-templates/>
+    </a>
+  </xsl:template>
+
+  <xsl:template match="text">
+    <p>
+      <xsl:apply-templates/>
+    </p>
+  </xsl:template>
+
+</xsl:stylesheet>

data/lib/proto/config.ru

@@ -8,9 +8,10 @@
 # Rack::Builder DSL to configure middleware and build up applications easily.
 #
 # rackup automatically figures out the environment it is run in, and runs your
-# application as FastCGI, CGI, or standalone with Mongrel or WEBrick -- all from
+# application as FastCGI, CGI, or standalone with Mongrel or WEBrick—all from
 # the same configuration.
 
-require File.expand_path('app', File.dirname(__FILE__))
-Ramaze.start(:file => __FILE__, :started => true)
-run Ramaze
+cwd = File.dirname(__FILE__)
+require "#{cwd}/start"
+Ramaze.start(:started => true)
+run Innate

data/lib/proto/controller/init.rb

@@ -2,9 +2,9 @@
 # controllers
 
 class Controller < Ramaze::Controller
-  layout :default
+  layout 'default'
   helper :xhtml
-  engine :Etanni
+  engine :Nagoro
 end
 
 # Here go your requires for subclasses of Controller:

data/lib/proto/spec/main.rb

@@ -2,20 +2,21 @@ require 'ramaze'
 require 'ramaze/spec'
 
 require __DIR__('../start')
-Ramaze.options.roots = __DIR__('../')
 
 describe MainController do
   behaves_like :mock
 
   should 'show start page' do
-    get('/').status.should == 200
-    last_response['Content-Type'].should == 'text/html'
-    last_response.should =~ /<h1>Welcome to Ramaze!<\/h1>/
+    got = get('/')
+    got.status.should == 200
+    got['Content-Type'].should == 'text/html'
+    got.body.should =~ /<h1>Welcome to Ramaze!<\/h1>/
   end
 
   should 'show /notemplate' do
-    get('/notemplate').status.should == 200
-    last_response['Content-Type'].should == 'text/html'
-    last_response.should =~ /there is no 'notemplate\.xhtml' associated with this action/
+    got = get('/notemplate')
+    got.status.should == 200
+    got['Content-Type'].should == 'text/html'
+    got.body.should =~ /there is no 'notemplate.xhtml' associated with this action/
   end
 end

data/lib/proto/start.rb

@@ -1,8 +1,12 @@
-# Use this file directly like `ruby start.rb` if you don't want to use the
-# `ramaze start` command.
-# All application related things should go into `app.rb`, this file is simply
-# for options related to running the application locally.
+require 'rubygems'
+require 'ramaze'
 
-require File.expand_path('app', File.dirname(__FILE__))
+# Add the directory this file resides in to the load path, so you can run the
+# app from any other working directory
+$LOAD_PATH.unshift(__DIR__)
 
-Ramaze.start(:adapter => :webrick, :port => 7000, :file => __FILE__)
+# Initialize controllers and models
+require 'controller/init'
+require 'model/init'
+
+Ramaze.start(:adapter => :webrick, :port => 7000) if __FILE__ == $0

data/lib/proto/view/page.nag

@@ -0,0 +1,27 @@
+<?xml version="1.0" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+  "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>#{@title}</title>
+    <meta http-equiv="Content-Script-Type" content="text/javascript" />
+    <meta http-equiv="Content-Style-Type" content="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta http-equiv="expires" content="0" />
+    <meta name="description" content="Description for search engines" />
+    <meta name="generator" content="Ramaze #{Ramaze::VERSION}" />
+    <meta name="keywords" content="Ramaze, Your own keywords" />
+    <meta name="author" content="Max Mustermann" />
+    <meta name="date" content="#{Time.now.iso8601}" />
+    <style type="text/css">
+      body { margin: 2em; }
+      #content { margin-left: 2em; }
+    </style>
+  </head>
+  <body>
+    <h1>#{@title}</h1>
+    <div id="content">
+      #@content
+    </div>
+  </body>
+</html>

data/lib/ramaze/app.rb

@@ -68,11 +68,11 @@ module Ramaze
 
     APP_LIST = {}
 
-    attr_reader :name, :location, :url_map, :options
+    attr_reader :name, :location, :map, :options
 
     def initialize(name, location)
       @name = name.to_sym
-      @url_map = Innate::URLMap.new
+      @map = Innate::URLMap.new
       self.location = location
 
       APP_LIST[@name] = self
@@ -95,16 +95,16 @@ module Ramaze
 
     def to_app
       files = Ramaze::Files.new(*public_roots)
-      app = Current.new(Route.new(url_map), Rewrite.new(url_map))
+      app = Current.new(Route.new(@map), Rewrite.new(@map))
       Rack::Cascade.new([files, app])
     end
 
     def map(location, object)
-      url_map.map(location, object)
+      @map.map(location, object)
     end
 
     def to(object)
-      return unless mapped = url_map.to(object)
+      return unless mapped = @map.to(object)
       [location, mapped].join('/').squeeze('/')
     end
 

data/lib/ramaze/cache.rb

@@ -7,9 +7,8 @@ module Ramaze
   Cache = Innate::Cache
 
   class Cache
-    autoload :LocalMemCache, 'ramaze/cache/localmemcache'
-    autoload :MemCache,      'ramaze/cache/memcache'
-    autoload :Sequel,        'ramaze/cache/sequel'
+    autoload :MemCache, 'ramaze/cache/memcache'
+    autoload :Sequel, 'ramaze/cache/sequel'
 
     def self.clear_after_reload
       action.clear if respond_to?(:action)

data/lib/ramaze/contrib/email.rb

@@ -30,8 +30,6 @@ require 'net/smtp'
 
 module Ramaze
   class EmailHelper
-    include Innate::Traited
-
     # Required to be set
     trait :smtp_server => 'smtp.your-isp.com'
     trait :smtp_helo_domain => 'your.helo.domain.com'

data/lib/ramaze/contrib/sequel/create_join.rb

@@ -1,5 +1,4 @@
 require 'sequel'
-require 'sequel/extensions/inflector'
 
 module Sequel
   class Model