ramaze 0.3.5 → 0.3.9

data/spec/ramaze/helper/formatting.rb

@@ -1,8 +1,8 @@
 require 'spec/helper'
 require 'ramaze/helper/formatting'
 
-describe 'FormattingHelper' do
-  extend Ramaze::FormattingHelper
+describe 'Helper::Formatting' do
+  extend Ramaze::Helper::Formatting
 
   it 'should format numbers' do
     number_format(2_123_456).should == '2,123,456'

data/spec/ramaze/helper/link.rb

@@ -17,18 +17,14 @@ end
 ramaze
 
 describe "A" do
-  extend Ramaze::LinkHelper
-
-  before do
-    # initialize Ramaze::Controller.current for Rs()
-    Ramaze::Controller.handle('/')
-  end
+  extend Ramaze::Helper::Link
+  behaves_like 'resolve'
 
   it 'should build links' do
     A('title', :href => '/').should == %(<a href="/">title</a>)
     A('title', :href => '/foo').should == %(<a href="/foo">title</a>)
     A('title', :href => '/foo?x=y').should == %{<a href="/foo?x=y">title</a>}
-    A('/foo?x=y').should == %{<a href="/foo?x=y">/foo?x=y</a>}
+    stack('/'){ A('/foo?x=y') }.should == %{<a href="/foo?x=y">/foo?x=y</a>}
 
     a = A('title', :href => '/foo', :class => :none)
     a.should =~ /class="none"/
@@ -36,12 +32,40 @@ describe "A" do
   end
 
   it 'should build position independend links' do
-    A(TCLink, :foo).should == %(<a href="/foo">foo</a>)
+    stack('/'){ A(TCLink, :foo) }.should == %(<a href="/foo">foo</a>)
+  end
+
+  it 'should escape path' do
+    stack('/'){ A('ti tle') }.should == '<a href="/ti+tle">ti tle</a>'
+    a = A('', :href => "/foo?chunky=b\000acon")
+    a.should == '<a href="/foo?chunky=b%00acon"></a>'
+  end
+
+  it 'should handle text key' do
+    A(:href => '/', :text => 'text').should == '<a href="/">text</a>'
+  end
+
+  it 'should use last argument as first text fallback' do
+    a = A('text', :href => '/', :title => 'title')
+    a.should =~ /href="\/"/
+    a.should =~ /title="title"/
+    a.should =~ />text</
+  end
+
+  it 'should use :title as second text fallback' do
+    a = A(:href => '/', :title => 'text')
+    a.should =~ /title="text"/
+    a.should =~ /href="\/"/
+    a.should =~ />text</
+  end
+
+  it 'should use :href as third text fallback' do
+    A(:href => '/').should == '<a href="/">/</a>'
   end
 end
 
 describe 'R' do
-  extend Ramaze::LinkHelper
+  extend Ramaze::Helper::Link
 
   it 'should build urls' do
     R(TCLink).should == '/'
@@ -52,25 +76,29 @@ describe 'R' do
 end
 
 describe 'Rs' do
-  extend Ramaze::LinkHelper
+  extend Ramaze::Helper::Link
 
-  it 'should build links for current controller' do
-    Ramaze::Controller.handle('/2')
-    Rs(:index).should == '/2/index'
+  def resolve(url)
+    Ramaze::Controller::resolve(url)
+  end
 
-    Ramaze::Controller.handle('/')
-    Rs(:index).should == '/index'
+  it 'should build links for current controller' do
+    resolve('/2').stack{ Rs(:index).should == '/2/index' }
+    resolve('/').stack{ Rs(:index).should == '/index' }
   end
 
   it 'should treat Rs() like R() when Controller given' do
-    Ramaze::Controller.handle('/2')
-    Rs(TCLink, :index).should == '/2/index'
+    resolve('/2').stack{ Rs(TCLink, :index).should == '/2/index' }
+  end
+
+  it 'should treat non-controllers as strings' do
+    resolve('/2').stack{ Rs(Ramaze, :index).should == '/2/Ramaze/index' }
   end
 
 end
 
 describe 'breadcrumbs' do
-  extend Ramaze::LinkHelper
+  extend Ramaze::Helper::Link
 
   it 'should lay out breadcrumbs' do
     breadcrumbs('/file/dir/listing/is/cool').

data/spec/ramaze/helper/pager.rb

@@ -34,7 +34,8 @@ ramaze
 
 shared 'pager' do
   behaves_like 'http'
-  extend Ramaze::PagerHelper
+  behaves_like 'resolve'
+  extend Ramaze::Helper::Pager
 
   def pager_key
     Ramaze::Pager.trait[:key]
@@ -69,11 +70,13 @@ shared 'pager' do
   end
 
   it "should link to other pages" do
-    @pager.should.not.be.nil
-    @pager.navigation.should.not.be.nil
+    stack('/page') do
+      @pager.should.not.be.nil
+      @pager.navigation.should.not.be.nil
 
-    page = Hpricot(@pager.navigation)
-    (page / 'a').size.should == 4
+      page = Hpricot(@pager.navigation)
+      (page / 'a').size.should == 4
+    end
   end
 end
 

data/spec/ramaze/helper/partial.rb

@@ -5,7 +5,6 @@ require 'spec/helper'
 
 class TCPartialHelperController < Ramaze::Controller
   map '/'
-  helper :partial
 
   def index
     '<html><head><title>#{render_partial("/title")}</title></head></html>'
@@ -30,6 +29,10 @@ class TCPartialHelperController < Ramaze::Controller
     render_template 'locals.xhtml', :say => 'Hello', :to => 'World'
   end
 
+  def test_local_ivars
+    render_template 'recursive_local_ivars.xhtml', :n => 1
+  end
+
   def test_without_ext
     render_template :locals, :say => 'Hi', :to => 'World'
   end
@@ -63,6 +66,10 @@ describe "PartialHelper" do
     get('/recursive/true').body.gsub(/\s/,'').should == '{1{2{3{44}3}2}1}'
   end
 
+  it 'should set ivars in addition to locals' do
+    get('/test_local_ivars').body.gsub(/\s/,'').should == '{1{2{3{44}3}2}1}'
+  end
+
   it 'should not require file extension' do
     get('/test_without_ext').body.should == 'Hi, World!'
   end

data/spec/ramaze/helper/template/recursive_local_ivars.xhtml

@@ -0,0 +1,7 @@
+{
+  #{@n}
+  <?r if @n < 4 ?>
+    #{render_template('recursive_local_ivars.xhtml', :n => @n+1)}
+  <?r end ?>
+  #{@n}
+}

data/spec/ramaze/helper/user.rb

@@ -0,0 +1,46 @@
+require 'spec/helper'
+
+class MockSequelUser
+  # mocks what User[:name => 'arthur', :password => '42'] would do
+  def self.[](hash)
+    name = hash[:name] || hash['name']
+    pass = hash[:password] || hash['password']
+    new if name == 'arthur' and pass == '42'
+  end
+
+  def profile
+    "Arthur Dent, fearful human in outer space!"
+  end
+end
+
+class HelperUser < Ramaze::Controller
+  map '/'
+  helper :user
+  trait :user_model => MockSequelUser
+
+  def status
+    user.logged_in?.to_s
+  end
+
+  def login
+    user.login
+  end
+
+  def profile
+    user.profile
+  end
+end
+
+describe Ramaze::Helper::User do
+  behaves_like 'browser'
+  ramaze :adapter => :webrick
+
+  should 'login' do
+    Browser.new '/status' do
+      get('/status').should == 'false'
+      get('/login', 'name' => 'arthur', 'password' => '42')
+      get('/status').should == 'true'
+      get('/profile').should == MockSequelUser.new.profile
+    end
+  end
+end

data/spec/ramaze/{inform → log}/syslog.rb

@@ -1,6 +1,6 @@
 require 'spec/helper'
 
-require 'ramaze/inform/syslog'
+require 'ramaze/log/syslog'
 
 describe 'Syslog' do
   it 'should do something' do

data/spec/ramaze/request.rb

@@ -36,10 +36,7 @@ class TCRequestController < Ramaze::Controller
   end
 
   def test_post
-    [ request['foo'],
-      request['bar']['1'],
-      request['bar']['7'],
-    ].inspect
+    request.params.inspect
   end
 
   def test_headers
@@ -85,6 +82,19 @@ describe "Request" do
     it "give me back what i gave" do
       post("/post_inspect", 'this' => 'post').body.should == {"this" => "post"}.inspect
     end
+
+    should "handle key[nested_key]" do
+      get('/test_get', 'foo' => 'bar').body.should == 'bar'
+      params = {'foo' => 'null', 'bar[1]' => 'eins', 'bar[7]' => 'sieben'}
+
+      eval(post('/test_post', params).body).should ==
+        {'foo' => 'null', 'bar' => {'1' => 'eins', '7' => 'sieben'}}
+    end
+
+    should 'handle key[nested_key][nested_nested_key]' do
+      eval(post('/test_post', 'foo[1][2]' => 'eins zwei').body).should ==
+        {'foo' => {'1' => {'2' => 'eins zwei'}}}
+    end
   end
 
   describe "PUT" do
@@ -133,12 +143,6 @@ describe "Request" do
     it "my ip" do
       get("/my_ip").body.should == '127.0.0.1'
     end
-
-    it "request[key]" do
-      get('/test_get', 'foo' => 'bar').body.should == 'bar'
-      post('/test_post', 'foo' => 'null', 'bar[1]' => 'eins', 'bar[7]' => 'sieben').body.should ==
-        ['null', 'eins', 'sieben'].inspect
-    end
   end
 
   describe "get files" do

data/spec/ramaze/route.rb

@@ -104,4 +104,27 @@ describe 'Route' do
     r.status.should == 200
     r.body.should == 'this is bar'
   end
+
+  it 'should clear routes' do
+    Ramaze::Route.trait[:routes].size.should > 0
+    Ramaze::Route.clear
+    Ramaze::Route.trait[:routes].size.should == 0
+  end
+
+  it 'should exclude existing actions' do
+    Ramaze::Route[ %r!^/(.+)$! ] = "/string/%s"
+    r = get('/hello')
+    r.status.should == 200
+    r.body.should == 'String: hello'
+
+    r = get('/bar')
+    r.status.should == 200
+    r.body.should == 'this is bar'
+  end
+
+  it 'should not recurse given a bad route' do
+    Ramaze::Route[ %r!^/good/(.+)$! ] = "/bad/%s"
+    r = get('/good/hi')
+    r.status.should == 404
+  end
 end

data/spec/ramaze/template.rb

@@ -30,6 +30,24 @@ class TCTemplateController < Ramaze::Controller
   end
 end
 
+class TCMultipleTemplateRoots < Ramaze::Controller
+  map '/multiple'
+  template_root __DIR__/:helper/:template, __DIR__/:template/:ezamar
+
+  def sum
+    @num1, @num2 = 1, 2
+  end
+
+  def num
+    @n = 3
+  end
+
+  def render
+    @n = 3
+    render_template :num
+  end
+end
+
 describe "testing ramaze template" do
   ramaze
 
@@ -75,7 +93,36 @@ describe "testing ramaze template" do
 
     @file.should =~ /external\.test$/
     @params.should == []
-    file = TCTemplateController.template_root/'external.test'
+    file = TCTemplateController.template_root.first/'external.test'
     @file.should == file
   end
 end
+
+describe 'multiple template_roots' do
+  def get(*args) Ramaze::Controller.handle(args) end
+
+  it 'should work' do
+    get('/multiple/sum').should == '3'
+    get('/multiple/num').should == '3'
+  end
+
+  it 'should work with render_template' do
+    get('/multiple/render').should == '3'
+  end
+end
+
+describe "ramaze template engines" do
+  Ramaze::Template::AVAILABLE_ENGINES.each do |engine|
+    begin
+      Ramaze::Template.const_get(engine)
+    rescue LoadError, NameError
+      # ignore missing template engines
+    end
+  end
+
+  it "should not have dots at beginning of template extensions" do
+    extensions = Ramaze::Template::ENGINES.map {|e,ext| ext }.flatten
+    extensions.find_all {|e| e =~ /\A\./ }.should.be.empty
+  end
+
+end

data/spec/ramaze/template/haml.rb

@@ -21,23 +21,17 @@ class TCTemplateHamlController < Ramaze::Controller
 end
 
 class TCRamazeLocals < Ramaze::Controller
-  map '/test'
+  map '/locals'
   template_root __DIR__/:haml
 
-  helper :partial
-
-  def render_with_locals
+  def output
     render_template 'locals.haml', :abc => 'def'
   end
-end
 
-class TCTemplateHamlLocalsController < Ramaze::Controller
-  map '/locals'
-  engine :Haml
-  trait :haml_options => { :locals => { :localvar => 'abcdefg' } }
+private
 
-  def test
-    %{= localvar}
+  def sayhi
+    'hi'
   end
 end
 
@@ -67,10 +61,6 @@ describe "Haml templates" do
   end
 
   it 'should support locals via render_template' do
-    get('/test/render_with_locals').body.strip.should == 'def'
-  end
-
-  it "should have access to locals defined" do
-    get('/locals/test').body.strip.should == 'abcdefg'
+    get('/locals/output').body.strip.should == "def\nhi"
   end
 end

data/spec/ramaze/template/haml/locals.haml

@@ -1 +1,2 @@
-= abc
+= abc
+= sayhi

data/spec/ramaze/template/tagz.rb

@@ -0,0 +1,62 @@
+#          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'
+
+spec_require 'tagz'
+
+
+class TCTemplateTagzController < Ramaze::Controller
+  map '/'
+  template_root 'spec/ramaze/template/tagz/'
+  engine :Tagz
+
+  helper :tagz
+
+  def index
+    tagz{ h1_{ "Tagz Index" } }
+  end
+
+  def links
+    tagz{
+      ul_{
+        li_{ a_(:href => R(self,:index)){ "Index page" } }
+        li_{ a_(:href => R(self,:internal)){ "Internal template" } }
+        li_{ a_(:href => R(self,:external)){ "External template" } }
+      }
+    }
+  end
+
+  def external
+  end
+
+  def sum num1, num2
+    @num1, @num2 = num1.to_i, num2.to_i
+  end
+end
+
+describe "Tagz" do
+  behaves_like 'http'
+  ramaze
+
+  it "index" do
+    get('/').body.should == '<h1>Tagz Index</h1>'
+  end
+
+  it "links" do
+    get('/links').body.should == '<ul><li><a href="/index">Index page</a></li><li><a href="/internal">Internal template</a></li><li><a href="/external">External template</a></li></ul>'
+  end
+
+  it "sum" do
+    get('/sum/1/2').body.should == '<div>3</div>'
+  end
+
+  it "external" do
+    get('/external').body.should == "<html><head><title>Tagz Test</title></head><body><h1>Tagz Template</h1></body></html>"
+  end
+
+  it "should not respond to tagz" do
+    response = get('/tagz')
+    response.status.should == 404
+  end
+end