Pistos-ramaze 2009.04.08 → 2009.06.12

data/examples/app/blog/app.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'ramaze'
 
 Ramaze.setup :verbose => true do
-  gem 'sequel', '2.11.0'
+  gem 'sequel', '2.12.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
-        partial_content(:form, :comment => @comment, :entry => @entry)
+        render_partial(:form, :comment => @comment, :entry => @entry)
       end
     end
 

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

@@ -25,9 +25,6 @@ module Blog
       @comment_count = number_counter(@entry.comments.count, 'comment')
     end
 
-    def feed
-    end
-
     def edit(slug)
       login_required
       @entry = Entry.from_slug(slug)
@@ -61,6 +58,18 @@ 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,10 +1,15 @@
 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
 
-    belongs_to :entry, :class => 'Blog::Entry'
-    belongs_to :tag, :class => 'Blog::Tag'
+    many_to_one :entry, :class => 'Blog::Entry'
+    many_to_one :tag, :class => 'Blog::Tag'
 
     create_table unless table_exists?
   end

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

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

data/examples/app/localization/locale/de.yaml

@@ -0,0 +1,5 @@
+'hello world': 'Guten Tag Welt!'
+'just for fun': 'halm im Scherz'
+'english': 'Englisch'
+'japanese': 'Japanisch'
+'german': 'Deutsch'

data/examples/app/localization/locale/en.yaml

@@ -0,0 +1,5 @@
+'hello world': 'Hello world!'
+'just for fun': 'Just for fun'
+'english': 'English'
+'japanese': 'Japanese'
+'german': 'German'

data/examples/app/localization/locale/ja.yaml

@@ -0,0 +1,5 @@
+'hello world': 'おはよう世界！'
+'just for fun': '冗談半分に'
+'english': '英語'
+'japanese': '日本語'
+'german': 'ドイツ語'

data/examples/app/localization/start.rb

@@ -1,34 +1,47 @@
+# -*- coding: utf-8 -*-
 require 'rubygems'
 require 'ramaze'
 
 # require YAML based localization
-require 'ramaze/tool/localize'
-
-# Activate localization
-# Setup localization options
-class Ramaze::Tool::Localize
-  Ramaze::Dispatcher::Action::FILTER << self
-
-  trait :default_language => 'en',
-        :languages => %w[ en ja cn es de it ],
-        :file => lambda{|l| Ramaze::Global.root/"locale/#{l}.yaml" }
-  # alternative, problematic if you want to run from another pwd.
-  #     :file => "locale/%s.yaml"
-end
+require 'ramaze/helper/localize'
 
+#
+# Old Dispatcher::Action::FILTER style localization.
+#
 class MainController < Ramaze::Controller
+  helper :localize
+
   def index
-    # Enclose the strings that have to be localized with [[]]
-    # This works with any templating engine.
-    "<h1>[[hello world]]</h1>
-     <p>[[just for fun]]</p>
-     <a href='/locale/en'>[[English]]</a><br />
-     <a href='/locale/de'>[[German]]</a><br />
+    # Enclose the strings that have to be localized with {}
+    "<h1>{hello world}</h1>
+     <p>{just for fun}</p>
+     <a href='/locale/en'>{english}</a><br />
+     <a href='/locale/ja'>{japanese}</a><br />
+     <a href='/locale/de'>{german}</a><br />
     "
   end
 
   def locale(name)
-    session[:LOCALE] = name
+    session[:lang] = name
+    redirect r(:/)
+  end
+
+  # for Localization
+  alias :raw_wrap_action_call :wrap_action_call
+
+  def wrap_action_call(action, &block)
+    localize(raw_wrap_action_call(action, &block))
+  end
+
+  private
+
+  Dictionary = Ramaze::Helper::Localize::Dictionary.new
+  Dir.glob('./locale/*.yaml').each do |path|
+    Dictionary.load(File.basename(path, '.yaml').intern, :yaml => path)
+  end
+
+  def localize_dictionary
+    Dictionary
   end
 end
 

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

@@ -1,20 +1,18 @@
 require 'ramaze'
-require 'ramaze/spec/helper'
+require 'ramaze/spec'
 
-spec_require 'hpricot', 'sequel'
+spec_requires 'hpricot', 'sequel'
 
 $LOAD_PATH.unshift base = __DIR__('..')
 require 'start'
 
 describe 'Wikore' do
-  behaves_like 'http'
-  ramaze :public_root => base/:public,
-         :view_root   => base/:template
+  behaves_like :mock
 
   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,26 +18,28 @@ class MainController < Ramaze::Controller
   end
 end
 
-class PageController < Ramaze::Controller
+class Pages < Ramaze::Controller
   map '/page'
 
-  helper :aspect
-
   def create
+    redirect_referer unless request.post?
+
     change "Created Page '%s'" do |title, text|
       Page.create(:title => title, :text => text, :version => 1)
-      redirect R(MainController, title)
+      redirect MainController.r(:/, 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 R(MainController, title)
+      redirect MainController.r(:/, title)
     end
   end
 
@@ -60,11 +62,7 @@ class PageController < Ramaze::Controller
   def revert(title)
     page = Page[:title => title]
     page.revert
-    redirect R(MainController, title)
-  end
-
-  before :create, :save do
-    redirect_referer unless request.post?
+    redirect MainController.r(:/, title)
   end
 
   private
@@ -75,6 +73,6 @@ class PageController < Ramaze::Controller
       message % title
     end
 
-    redirect(R(MainController, redirect_to))
+    redirect MainController.r(redirect_to)
   end
 end

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

@@ -1,17 +1,14 @@
 require 'sequel'
 
-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'
+if $wikore_db == :memory
+  DB = Sequel.sqlite
+else
+  DB_FILE = __DIR__('wikore.db')
+  DB = Sequel.connect("sqlite://#{DB_FILE}")
 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
+Ramaze.start :file => __FILE__

data/examples/helpers/cache.rb

@@ -6,12 +6,14 @@ class MainController < Ramaze::Controller
   helper :cache
 
   def index
-%[
+    @number = rand * 100
+
+%q[
 <html>
   <head><title>examples/caching</title></head>
   <body>
     <p>
-      This action just shows you a random number: #{rand * 100}.<br />
+      This action just shows you a random number: #{@number}.<br />
       If you <a href="/">refresh</a> the page it won't change since you see a cached version.<br />
       But if you <a href="/invalidate">invalidate</a> it, the page will be regenerated.
     </p>
@@ -20,10 +22,10 @@ class MainController < Ramaze::Controller
 ]
   end
 
-  cache_action :method => :index
+  cache_action :method => 'index'
 
   def invalidate
-    Ramaze::Cache.action.delete(:method => 'index')
+    Ramaze::Cache.action.delete('/')
     redirect :/
   end
 end

data/examples/misc/css.rb

@@ -10,15 +10,10 @@ module Ramaze::SourceReloadHooks
 end
 
 class CSSController < Ramaze::Controller
-  engine :Sass
-
-  helper :aspect
-  before_all do
-    response['Content-Type'] = 'text/css'
-    nil
-  end
+  helper :cache
+  provide :css, :type => 'text/css', :engine => :Sass
 
-  define_method('style.css') do
+  def style
     %(
 body
   font:
@@ -29,9 +24,8 @@ body
     )
   end
 
-  helper :cache
-  cache 'style.css'
+  cache_action :method => 'style'
 end
 
-# http://localhost:81/css/style.css
-Ramaze.start :adapter => :mongrel, :port => 81
+# http://localhost:7000/css/style.css
+Ramaze.start :adapter => :mongrel, :port => 7000

data/examples/misc/rapp.rb

@@ -4,10 +4,13 @@
 require 'rubygems'
 require 'ramaze'
 require 'sequel'
+require 'abbrev'
 
-DB = Sequel.sqlite :logger => Ramaze::Log
+DB = Sequel.sqlite
 
 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
@@ -18,27 +21,35 @@ end
 class MainController < Ramaze::Controller
   def index
     @posts = Post.order(:created_at.desc).first(10)
-%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>
+
+    <<-'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 ?>
     </div>
-  <?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>)
+    <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
   end
 
   def create
     Post.create(:text => request[:text])
-    redirect Rs(:/)
+    redirect r(:/)
   end
 end