ramaze 0.1.4 → 0.2.0

data/spec/ramaze/helper/cache.rb

@@ -4,10 +4,10 @@
 require 'spec/helper'
 
 class TCCacheHelperController < Ramaze::Controller
-  map '/'
-  helper :cache
+  map :/
 
-  trait :actions_cached => [:cached_action]
+  helper :cache
+  cache :cached_action
 
   def index
     self.class.name
@@ -36,35 +36,100 @@ class TCCacheHelperController < Ramaze::Controller
   end
 end
 
+class TCCacheHelperTTLController < Ramaze::Controller
+  map '/ttl'
+
+  helper :cache
+  cache :index, :ttl => 1
+
+  def cached_list
+    actions_cached.inspect
+  end
+
+  def index
+    rand
+  end
+end
+
+class TCCacheHelperKeyController < Ramaze::Controller
+  map '/key'
+
+  helper :cache
+  cache :name, :key => lambda{ request['name'] }
+
+  def cached_list
+    actions_cached.inspect
+  end
+
+  def name
+    "hi #{request['name']} #{rand}"
+  end
+end
+
+class TCCacheHelperOldController < Ramaze::Controller
+  map '/old'
+
+  helper :cache
+  trait :actions_cached => [:index, :action]
+
+  def index
+    rand
+  end
+
+  def action with, param
+    with + param + rand.to_s
+  end
+end
+
 describe "CacheHelper" do
   ramaze
 
+  def req(path='/', *args) get(path, *args).body end
+
   it "testrun" do
-    get('/').body.should == 'TCCacheHelperController'
+    req.should == 'TCCacheHelperController'
   end
 
-  def cached_value() get('/cached_value').body end
-  def uncache_value() get('/uncache_value').body end
-  def cached_action() get('/cached_action').body end
-  def uncache_actions() get('/uncache_actions').body end
-
   it "cached value" do
     3.times do
-      lambda{ cached_value }.should_not change{ cached_value }
+      lambda{ req('/cached_value') }.should_not change{ req('/cached_value') }
     end
 
     3.times do
-      lambda{ uncache_value }.should change{ cached_value }
+      lambda{ req('/uncache_value') }.should change{ req('/cached_value') }
     end
   end
 
   it "cached action" do
     3.times do
-      lambda{ cached_action }.should_not change{ cached_action }
+      lambda{ req('/cached_action') }.should_not change{ req('/cached_action') }
     end
 
     3.times do
-      lambda{ uncache_actions }.should change{ cached_action }
+      lambda{ req('/uncache_actions') }.should change{ req('/cached_action') }
     end
   end
+
+  it "should support options" do
+    req('/ttl/cached_list').should == { :index => { :ttl => 1 } }.inspect
+    req('/key/cached_list').should =~ /^\{:name=>\{:key=>/
+  end
+
+  it "should expire cache after time-to-live" do
+    orig_value = get('/ttl').body
+    req('/ttl').should == orig_value
+    sleep 1
+    req('/ttl').should_not == orig_value
+  end
+
+  it "should cache using key lambda if provided" do
+    lambda{ req('/key/name', {:name=>'Aman'}) }.should_not change{ req('/key/name', {:name=>'Aman'}) }
+    req('/key/name', {:name=>'Bob'}).should =~ /^hi Bob/
+  end
+
+  it "should remain backwards compatible" do
+    lambda{ req('/old') }.should_not change{ req('/old') }
+    lambda{ req('/old/action/one/two') }.should_not change{ req('/old/action/one/two') }
+    req('/old/action/two/three').should =~ /^twothree/
+  end
 end

data/spec/ramaze/helper/formatting.rb

@@ -0,0 +1,20 @@
+require 'spec/helper'
+require 'ramaze/helper/formatting'
+
+describe 'FormattingHelper' do
+  include Ramaze::FormattingHelper
+
+  it 'should format numbers' do
+    number_format(2_123_456).should == '2,123,456'
+    number_format(1234.567).should == '1,234.567'
+    number_format(123456.789, '.').should == '123.456,789'
+    number_format(123456.789123, '.').should == '123.456,789123'
+    number_format(132123456.789123, '.').should == '132.123.456,789123'
+  end
+
+  it 'should return difference in time as a string' do
+    time_diff(Time.now-29).should == 'less than a minute'
+    time_diff(Time.now-60).should == '1 minute'
+    time_diff(Time.now, Time.now+29, true).should == 'half a minute'
+  end
+end

data/spec/ramaze/helper/link.rb

@@ -14,6 +14,8 @@ describe "A" do
   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>}
 
     a = A('title', :href => '/foo', :class => :none)
     a.should =~ /class="none"/

data/spec/ramaze/helper/partial.rb

@@ -6,7 +6,6 @@ require 'spec/helper'
 class TCPartialHelperController < Ramaze::Controller
   map '/'
   helper :partial
-  template_root(__DIR__/:template)
 
   def index
     '<html><head><title>#{render_partial("/title")}</title></head></html>'
@@ -21,6 +20,10 @@ class TCPartialHelperController < Ramaze::Controller
     'From Action | ' +
     render_template("partial.xhtml")
   end
+
+  def recursive
+    @n = 1
+  end
 end
 
 describe "PartialHelper" do
@@ -35,4 +38,12 @@ describe "PartialHelper" do
   it 'should be able to render a template in the current scope' do
     get('/composed').body.should == 'From Action | From Partial there'
   end
+
+  it 'should render_template in a loop' do
+    get('/loop').body.gsub(/\s/,'').should == '12345'
+  end
+
+  it 'should work recursively' do
+    get('/recursive').body.gsub(/\s/,'').should == '{1{2{3{44}4}3}2}'
+  end
 end

data/spec/ramaze/helper/redirect.rb

@@ -5,7 +5,6 @@ require 'spec/helper'
 
 class TCRedirectHelperController < Ramaze::Controller
   map :/
-  helper :redirect
 
   def index
     self.class.name
@@ -36,10 +35,27 @@ class TCRedirectHelperController < Ramaze::Controller
     catch(:redirect){ double_redirection }
     'bar'
   end
+
+  def redirect_method
+    redirect Rs(:noop)
+  end
+
+  def absolute_uri_redirect
+    redirect 'http://localhost:7007/noop'
+  end
+
+  def loop
+    respond 'no loop'
+    'loop'
+  end
+
+  def respond_with_status
+    respond 'not found', 404
+  end
 end
 
 describe "RedirectHelper" do
-  ramaze(:adapter => :webrick)
+  ramaze(:adapter => :mongrel)
 
   b = Browser.new
 
@@ -47,21 +63,41 @@ describe "RedirectHelper" do
     b.get('/').should == "TCRedirectHelperController"
   end
 
-  it "calls" do
+  it "should do redirection" do
     b.story do
-      get('/redirection').should        == "TCRedirectHelperController"
+      get('/redirection').should == "TCRedirectHelperController"
       get('/double_redirection').should == "TCRedirectHelperController"
-      get('/no_actual_redirect').should        == 'foo'
+    end
+  end
+
+  it 'should be possible to catch a redirect' do
+    b.story do
+      get('/no_actual_redirect').should == 'foo'
       get('/no_actual_double_redirect').should == 'bar'
     end
   end
 
-  it "redirect to referer" do
+  it "should redirect to referer" do
     b.story do
-      get('/').should                        == 'TCRedirectHelperController'
+      get('/').should == "TCRedirectHelperController"
       get('/redirect_referer_action').should == 'TCRedirectHelperController'
-      get('/noop').should                    == 'noop'
+      get('/noop').should == 'noop'
       get('/redirect_referer_action').should == 'noop'
     end
   end
+
+  it "should work with R()" do
+    b.get('/redirect_method').should == 'noop'
+  end
+
+  it "should work with absolute uris" do
+    b.get('/absolute_uri_redirect').should == 'noop'
+  end
+
+  it 'should allow respond() that ignores return values and templates' do
+    get('/loop').body.should == 'no loop'
+    page = get('/respond_with_status')
+    page.status.should == 404
+    page.body.should == 'not found'
+  end
 end

data/spec/ramaze/helper/stack.rb

@@ -56,15 +56,15 @@ describe "StackHelper" do
   it "indirect login" do
     browser do
       get('/foo').should == 'logged in'
-      get('/foo').should == 'logged in'
-      eget('/').should == {:logged_in => true, :STACK => []}
+      get('/secure').should == 'secret content'
+      eget('/').should == {:logged_in => true}
     end
   end
 
   it "indirect login with params" do
     browser do
       eget('/bar', 'x' => 'y').should == {'x' => 'y'}
-      eget('/').should == {:logged_in => true, :STACK => []}
+      eget('/').should == {:logged_in => true}
     end
   end
 end

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

@@ -0,0 +1,3 @@
+<?r (1..5).each do |@n| ?>
+  #{render_template 'num.xhtml'}
+<?r end ?>

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

@@ -0,0 +1 @@
+#{@n}

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

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

data/spec/ramaze/morpher.rb

@@ -4,6 +4,7 @@
 require 'spec/helper'
 
 testcase_requires 'hpricot'
+require 'ramaze/template/ezamar/morpher'
 
 class TCMorpherController < Ramaze::Controller
   map '/'
@@ -48,6 +49,20 @@ class TCMorpherController < Ramaze::Controller
       <div each="@elem">#{_e}</div>
     }
   end
+
+  def complex_one
+    %q{
+<html>
+  <head>
+    <title>test morph</title>
+  </head>
+  <body>
+    <a if="1" href="foo">foo</a>
+    <a unless="1" href="bar">bar</a>
+  </body>
+</html>
+    }
+  end
 end
 
 describe "Morpher" do
@@ -62,32 +77,36 @@ describe "Morpher" do
     get(*url).body.split("\n").join.strip
   end
 
-  it "testrun" do
+  it "should do a testrun" do
     clean_get('/').should == 'TCMorpherController'
   end
 
-  it "if" do
+  it "should morph if" do
     clean_get('/simple_if').should == '<p>orig</p>'
     clean_get('/simple_if/bar').should == '<p>bar</p>'
   end
 
-  it "unless" do
+  it "should morph unless" do
     clean_get('/simple_unless').should == '<p>orig</p>'
     clean_get('/simple_unless/bar').should == '<p>bar</p>'
   end
 
-  it "for" do
+  it "should morph for" do
     clean_get('/simple_for').should == "<div>0</div><div>1</div>"
     clean_get('/simple_for/3').should == "<div>0</div><div>1</div><div>2</div><div>3</div>"
   end
 
-  it "times" do
+  it "should morph times" do
     clean_get('/simple_times').should == "<div>0</div>"
     clean_get('/simple_times/3').should == "<div>0</div><div>1</div><div>2</div>"
   end
 
-  it "each" do
+  it "should morph each" do
     clean_get('/simple_each').should == ''
     clean_get('/simple_each/1/2/3').should == "<div>1</div><div>2</div><div>3</div>"
   end
+
+  it 'should morph a more complex document' do
+    clean_get('/complex_one').should == '<html>  <head>    <title>test morph</title>  </head>  <body>    <a href="foo">foo</a>      </body></html>'
+  end
 end

data/spec/ramaze/params.rb

@@ -55,7 +55,7 @@ class TCParamsController3 < Ramaze::Controller
   map '/ma'
 
   def index(*args)
-    request.params['foo'].inspect
+    request.params['foo'].to_s.dump
   end
 end
 
@@ -141,6 +141,10 @@ describe "Simple Parameters" do
   end
 
   it 'params should have no content without params' do
-    get('/ma').body.should == 'nil'
+    get('/ma').body.should == '""'
+  end
+
+  it 'should have a parameter via QUERY_PARAMS' do
+    get('/ma', 'foo' => 'bar').body.should == '"bar"'
   end
 end

data/spec/ramaze/request.rb

@@ -20,6 +20,9 @@ class TCRequestController < Ramaze::Controller
   end
 
   def put_inspect(file)
+    # referencing request.rack_params breaks this test
+    # request.params is hacked to return {} on PUT requests
+    request.params
     request.body.read.inspect
   end
 
@@ -66,7 +69,7 @@ describe "Request" do
   end
 
   describe "PUT" do
-    it "put a ressource" do
+    it "put a resource" do
       image = 'favicon.ico'
       image_path = File.join('spec', 'ramaze', 'public', image)
       address = "/put_inspect/#{image}"
@@ -79,7 +82,7 @@ describe "Request" do
   end
 
   describe "DELETE" do
-    it "delete a ressource" do
+    it "delete a resource" do
       delete('/is_delete').body.should == 'true'
     end
   end

data/spec/ramaze/session.rb

@@ -17,6 +17,14 @@ class TCSessionController < Ramaze::Controller
     session.merge! request.params
     index
   end
+
+  def test_set(n)
+    session[:n] = n
+  end
+
+  def test_result
+    session[:n]
+  end
 end
 
 describe "Session" do
@@ -67,6 +75,17 @@ describe "Session" do
       it "snooping a bit around" do
         b.cookie.split('=').size.should == 3
       end
+
+      it 'should not hit IP_COUNT_LIMIT for the same session/ip' do
+        class Ramaze::Session
+          remove_const :IP_COUNT_LIMIT
+          const_set(:IP_COUNT_LIMIT, 2)
+        end
+        (0..Ramaze::Session::IP_COUNT_LIMIT * 2).each do |n|
+          b.get("/test_set/#{n}")
+          b.get("/test_result").should == n.to_s
+        end
+      end
     end
   end
 end