ramaze 0.1.4 → 0.2.0

data/spec/contrib/sequel/fill.rb

@@ -0,0 +1,46 @@
+require 'spec/helper'
+
+require 'ramaze/contrib'
+
+testcase_requires 'sequel', 'sequel/sqlite'
+
+DB = Sequel('sqlite:/')
+
+require 'ramaze/contrib/sequel/fill'
+
+class Person < Sequel::Model(:person)
+  set_schema do
+    primary_key :id
+    text :name
+  end
+end
+
+Person.create_table!
+
+class MainController < Ramaze::Controller
+  def index
+    'Hello, World!'
+  end
+
+  def insert
+    person = Person.fill
+    person.save
+  end
+
+  def show id
+    Person[id.to_i].name
+  end
+end
+
+describe 'Route' do
+  before :all do
+    ramaze
+  end
+
+  it 'should fill values from current request' do
+    insert = get('/insert', 'name' => 'manveru')
+    insert.status.should == 200
+    person = get('/show/1')
+    person.body.should == 'manveru'
+  end
+end

data/spec/examples/caching.rb

@@ -1,6 +1,5 @@
 require 'spec/helper'
-
-require 'examples/caching.rb'
+require 'examples/caching'
 
 describe 'Caching' do
   ramaze

data/spec/examples/css.rb

@@ -0,0 +1,12 @@
+require 'spec/helper'
+require 'examples/css'
+
+describe 'CSSController' do
+  ramaze
+
+  def req(path) r = get(path); [r.content_type, r.body] end
+
+  it 'should cache generated css' do
+    lambda{ req('/css/style.css') }.should_not change{ req('/css/style.css') }
+  end
+end

data/spec/examples/element.rb

@@ -1,5 +1,4 @@
 require 'spec/helper'
-
 require 'examples/element'
 
 describe 'Element' do

data/spec/examples/hello.rb

@@ -1,5 +1,4 @@
 require 'spec/helper'
-
 require 'examples/hello'
 
 describe 'Hello' do

data/spec/examples/simple.rb

@@ -1,5 +1,4 @@
 require 'spec/helper'
-
 require 'examples/simple'
 
 describe 'Simple' do

data/spec/helper.rb

@@ -1,3 +1,4 @@
-$LOAD_PATH.unshift( File.join( File.dirname(__FILE__), "lib" ) )
-require 'ramaze'
+ramaze_dir = File.expand_path(File.join(File.dirname(__FILE__), "../lib"))
+$LOAD_PATH.unshift(ramaze_dir)
+require "ramaze"
 require 'ramaze/spec/helper'

data/spec/ramaze/action/cache.rb

@@ -7,22 +7,39 @@ class TCActionCache < Ramaze::Controller
   def index
     rand
   end
+  cache :index
+end
+
+class TCOtherCache < Ramaze::Controller
+  map '/other'
+  helper :cache
 
-  trait :actions_cached => [:index]
+  def index
+    rand
+  end
+  cache :index
 end
 
 describe 'Action rendering' do
   before :all do
     @public_root = __DIR__ / :public
     FileUtils.mkdir_p @public_root
-    ramaze :action_file_cached => true, :public_root => @public_root
+    ramaze :file_cache => true
   end
 
-  after :all do
-    FileUtils.rm_rf @public_root
+  def req(path) r = get(path); [r.content_type, r.body] end
+
+  it 'should cache to file' do
+    lambda{ req('/') }.should_not change{ req('/') }
+    File.file?(@public_root/'index').should be_true
   end
 
-  it 'should render' do
-    lambda{ get('/') }.should_not change{ get('/').body }
+  it 'should create subdirs as needed' do
+    lambda{ req('/other') }.should_not change{ req('/other') }
+    File.file?(@public_root/'other'/'index').should be_true
   end
-end
+
+  after :all do
+    FileUtils.rm_rf @public_root
+  end
+end

data/spec/ramaze/action/layout.rb

@@ -2,8 +2,7 @@ require 'spec/helper'
 
 class TCActionLayout < Ramaze::Controller
   map '/'
-  layout :wrapper
-  template_root __DIR__ / :template
+  layout '/wrapper'
 
   def wrapper
     "<pre>#@content</pre>"
@@ -20,8 +19,8 @@ end
 
 class TCActionOtherLayout < Ramaze::Controller
   map '/other'
-  layout :other_wrapper
-  template_root __DIR__ / :template
+  layout '/other_wrapper'
+  template_root __DIR__/:template
 
   def index
     "Others Hello"
@@ -30,8 +29,7 @@ end
 
 class TCActionSingleLayout < Ramaze::Controller
   map '/single'
-  template_root __DIR__ / :template
-  layout :single_wrapper => :index
+  layout '/single_wrapper' => :index
 
   def index
     "Single Hello"
@@ -44,8 +42,7 @@ end
 
 class TCActionDenyLayout < Ramaze::Controller
   map '/deny'
-  template_root __DIR__/:template
-  layout :single_wrapper
+  layout '/single_wrapper'
   deny_layout :without
 
   def index
@@ -59,9 +56,7 @@ end
 
 class TCActionMultiLayout < Ramaze::Controller
   map '/multi'
-  template_root __DIR__/:template
-  layout :single_wrapper => [:index, :second]
-  p trait
+  layout '/single_wrapper' => [:index, :second]
 
   def index
     "Single Hello"
@@ -76,6 +71,15 @@ class TCActionMultiLayout < Ramaze::Controller
   end
 end
 
+class TCActionSubLayout < Ramaze::Controller
+  map '/sub'
+  layout :sub_wrapper
+
+  def index
+    "Sub Hello"
+  end
+end
+
 describe 'Action rendering' do
   before :all do
     ramaze
@@ -107,4 +111,8 @@ describe 'Action rendering' do
     get('/multi/second').body.should == "<b>Second with layout</b>"
     get('/multi/without').body.should == "Without wrapper"
   end
+
+  it 'should apply relative layouts' do
+    get('/sub').body.should == "<h1>SubWrapper</h1>"
+  end
 end

data/spec/ramaze/action/template/sub/sub_wrapper.xhtml

@@ -0,0 +1 @@
+<h1>SubWrapper</h1>

data/spec/ramaze/controller.rb

@@ -151,4 +151,15 @@ describe "Controller" do
       lambda{ resolve(path) }.should raise_error(Ramaze::Error::NoAction, message)
     end
   end
+
+  it 'should resolve correctly even if the action is cached already.' do
+    handle('/').should == 'Hello, World!'
+    handle('/').should == 'Hello, World!'
+  end
+
+  it 'should remove invalid cached actions' do
+    handle('/').should == 'Hello, World!'
+    Ramaze::Cache.resolved['/'] = 'duh'
+    handle('/').should == 'Hello, World!'
+  end
 end

data/spec/ramaze/controller/template_resolving.rb

@@ -4,7 +4,6 @@
 require 'spec/helper'
 
 class MainController < Ramaze::Controller
-  template_root __DIR__ / :template
 
   def greet(type, message = "Message")
     @greet = "#{type} : #{message}"
@@ -13,40 +12,41 @@ class MainController < Ramaze::Controller
   def list
     @obj = Ramaze::Action.current.method
   end
+
   alias_method :index, :list
   template :index, 'list'
+  template :non_existant_method, :list
 
 end
 
 class OtherController < MainController
-  template_root __DIR__ / "template/other"
 
   def greet__mom(message = "Moms are cool!")
     greet('Mom', message)
   end
   template :greet__mom, MainController, :greet
 
-  def greet__other(one, two)
+  def greet__other
     @greet = "Other"
   end
-  template :greet__other, 'greet/other'
+  template :greet__other, :blah
 
-  def partial_stuff
-    render_partial('/greet/the/world', :foo => :bar)
+  def greet__another
+    @greet = "Another"
   end
-end
-
-class Ramaze::Controller
-  private
+  template :greet__another, :greet__other
 
-  def render_partial(url, options = {})
-    body = Ramaze::Controller.handle(url)
-    body
+  def greet__last
+    @greet = 'Last'
   end
+  template :greet__last, 'greet/other'
+
 end
 
 describe "Testing Template overriding" do
-  ramaze(:mapping => {'/' => MainController, '/other' => OtherController})
+  before(:all) do
+    ramaze
+  end
 
   it "simple request to greet" do
     get('/greet/asdf').body.should == '<html>asdf : Message</html>'
@@ -56,23 +56,24 @@ describe "Testing Template overriding" do
     get('/other/greet/mom').body.should == '<html>Mom : Moms are cool!</html>'
   end
 
-  it "should accept template overrides with same name as controller" do
-    get('/other/greet/other/one/two').body.should == '<html>Other: Other</html>'
+  it "should treat template overrides as possible alternatives (only use if found)" do
+    get('/other/greet/other').body.should == '<html>Other: Other</html>'
   end
 
-  it "setting template for non-existant :index action should not arbitrary parameters" do
-    get('/list').body.should == '<html>list</html>'
+  it "should accept template overrides given as symbols" do
+    get('/other/greet/another').body.should == '<html>Other: Another</html>'
+  end
 
-    response = get('/non_existant_method')
-    response.status.should == 404
-    response.body.should =~ %r(No Action found for `/non_existant_method' on MainController)
+  it "should accept template overrides given as strings" do
+    get('/other/greet/last').body.should == '<html>Other: Last</html>'
   end
 
-end
+  it "should set template for aliased :index action" do
+    get('/list').body.should == '<html>list</html>'
+    get('/index').body.should == '<html>index</html>'
+  end
 
-describe "render_partial" do
-  it 'greet' do
-    result = get('/other/partial_stuff')
-    result.body.should == '<html>the : world</html>'
+  it "should use template overrides for non-existant actions" do
+    get('/non_existant_method').body.should == '<html></html>'
   end
-end
+end

data/spec/ramaze/dispatcher.rb

@@ -0,0 +1,32 @@
+#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require 'spec/helper'
+
+class TCDispatcherController < Ramaze::Controller
+  map '/'
+
+  def index
+    "Hello, World!"
+  end
+end
+
+describe "Dispatcher" do
+  before :all do
+    ramaze :ignore => ['/favicon.ico', '/robots.txt'],
+      :ignore_body => 'File not found'
+  end
+
+  it 'should resolve a normal request' do
+    page = get('/')
+    page.status.should == 200
+    page.body.should == 'Hello, World!'
+  end
+
+  it 'should ignore /foo.ico' do
+    Ramaze::Global.ignore = ['/foo.ico']
+    page = get('/foo.ico')
+    page.status.should == 404
+    page.body.should == 'File not found'
+  end
+end

data/spec/ramaze/dispatcher/directory.rb

@@ -4,7 +4,8 @@ testcase_requires 'hpricot'
 
 describe 'Dispatcher::Directory' do
   before :all do
-    ramaze :public_root => __DIR__/:public
+    ramaze
+
     @hierarchy = %w[
     /test/deep/hierarchy/one.txt
     /test/deep/hierarchy/two.txt

data/spec/ramaze/element.rb

@@ -4,7 +4,7 @@
 require 'spec/helper'
 
 class TCElementController < Ramaze::Controller
-  trait :engine => Ramaze::Template::Ezamar
+  engine :Ezamar
 
   def index
     "The index"

data/spec/ramaze/gestalt.rb

@@ -6,6 +6,8 @@ require 'spec/helper'
 testcase_requires 'ramaze/gestalt'
 
 describe "Gestalt" do
+  # This is useful for any controller using Gestalt,
+  # should be made a MixIn somewhen.
   def gestalt &block
     Ramaze::Gestalt.new(&block).to_s
   end
@@ -89,4 +91,30 @@ describe "Gestalt" do
       end
     }.should == '<table><tr><td>one</td><td>two</td><td>three</td></tr></table>'
   end
+
+  it "children as parameters" do
+    gestalt {
+      a "Hello"
+      b(23, 5) { "1" }
+      c(42) {
+        d
+      }
+      e("f & g")
+    }.should == '<a>Hello</a><b>2351</b><c>42<d /></c><e>f &amp; g</e>'
+  end
+
+  it "escapeable attributes" do
+    gestalt {
+      a(:href => "http://example.org/?a=one&b=two") {
+        "Click here"
+      }
+    }.should == '<a href="http://example.org/?a=one&amp;b=two">Click here</a>'
+  end
+
+  it 'should accept symbols as attributes' do
+    input = gestalt{ input(:type => :text, :value => :one) }
+
+    input.should =~ /type="text"/
+    input.should =~ /value="one"/
+  end
 end

data/spec/ramaze/helper/aspect.rb

@@ -7,7 +7,6 @@ class TCAspectController < Ramaze::Controller
   map '/'
   trait :foo => :bar
   helper :aspect
-  template_root(__DIR__/:template)
 
   def test_before() 'test before' end
   before(:test_before){ '<aspect>' }
@@ -24,8 +23,8 @@ end
 class TCAspectAllController < Ramaze::Controller
   map '/all'
 
-  helper :aspect
-  template_root(__DIR__/:template)
+  helper :aspect, :partial
+  template_root __DIR__/:template
 
   def test_all_first() 'first' end
   def test_all_second() 'second' end
@@ -34,6 +33,10 @@ class TCAspectAllController < Ramaze::Controller
   after_all{ '</pre>' }
 
   def test_all_after() 'after' end
+
+  def layout() '<div>#@content</div>' end
+  template :loop_with_layout, :loop
+  layout :layout => [:loop_with_layout]
 end
 
 describe "AspectHelper" do
@@ -71,4 +74,12 @@ describe "AspectHelper" do
   it 'should before_all and after_all for all defined actions' do
     get('/all/test_all_after').body.should == '<pre>after</pre>'
   end
+
+  it 'should not apply aspects to render_template' do
+    get('/all/loop').body.gsub(/\s/,'').should == '<pre>12345</pre>'
+  end
+
+  it 'should not apply aspects to layouts' do
+    get('/all/loop_with_layout').body.gsub(/\s/,'').should == '<div><pre>12345</pre></div>'
+  end
 end