ramaze 2009.05 → 2009.06

data/spec/ramaze/dispatcher/file.rb

@@ -9,15 +9,15 @@ require 'spec/helper'
 module Ramaze
   # minimal middleware, no exception handling
   middleware!(:spec){|m|
-    m.apps(Rack::ETag, Rack::ConditionalGet)
+    m.apps Rack::ConditionalGet, Rack::ETag
     m.innate
   }
 end
 
 describe 'Serving static files' do
-  behaves_like :mock
+  behaves_like :rack_test
 
-  Ramaze.map('/', lambda{|env| [200, {}, 'nothing']})
+  Ramaze.map('/', lambda{|env| [200, {}, ['nothing']]})
 
   it 'serves from public root' do
     css = File.read(__DIR__('public/test_download.css'))
@@ -32,9 +32,9 @@ describe 'Serving static files' do
     last_response.body.should == 'hi'
   end
 
-  it 'sends ETag for string bodies' do
+  it 'sends Etag for string bodies' do
     get '/'
-    last_response['ETag'].size.should == 34
+    last_response['Etag'].size.should > 1
   end
 
   it 'sends Last-Modified for file bodies' do
@@ -45,10 +45,10 @@ describe 'Serving static files' do
     last_response['Last-Modified'].should == mtime.httpdate
   end
 
-  it 'respects ETag with HTTP_IF_NONE_MATCH' do
+  it 'respects Etag with HTTP_IF_NONE_MATCH' do
     get '/'
 
-    etag = last_response['ETag']
+    etag = last_response['Etag']
     etag.should.not.be.nil
 
     header 'HTTP_IF_NONE_MATCH', etag

data/spec/ramaze/error.rb

@@ -35,7 +35,7 @@ class SpecErrorHandling < SpecError
 end
 
 describe 'Error handling' do
-  behaves_like :mock
+  behaves_like :rack_test
 
   Ramaze.options.mode = :dev
 
@@ -66,7 +66,7 @@ describe 'Error handling' do
   end
 
   it 'uses Rack::RouteExceptions when a route is set' do
-    Rack::RouteExceptions[NameError] = '/handle/name_error'
+    Rack::RouteExceptions.route(NameError, '/handle/name_error')
 
     got = get('/raises')
     [got.status, got['Content-Type']].should == [200, 'text/html']

data/spec/ramaze/files.rb

@@ -17,7 +17,7 @@ Ramaze::App[:other].options.publics = 'files/public_2'
 Ramaze.middleware!(:spec){|m| m.run(Ramaze::AppMap) }
 
 describe Ramaze::Files do
-  behaves_like :mock
+  behaves_like :rack_test
 
   it 'serves files for core app from public_1' do
     get('/plain.txt').body.should == "Just some text in a file\n"

data/spec/ramaze/helper/auth.rb

@@ -51,7 +51,7 @@ end
 describe Ramaze::Helper::Auth do
   %w[ hash lambda method ].each do |prefix|
     describe "login" do
-      behaves_like :mock
+      behaves_like :rack_test
 
       it "uses a #{prefix}" do
         get "/#{prefix}/secured"

data/spec/ramaze/helper/bench.rb

@@ -12,6 +12,7 @@ describe Ramaze::Helper::Bench do
     result = bench{ sleep 0.1; 'result' }
     result.should == 'result'
     log.size.should == 1
-    log.pop.should =~ %r!Bench #{__FILE__}:#{__LINE__ - 3}: \d\.\d+!
+    # output between ruby 1.8 and 1.9 differs...
+    log.pop.should =~ %r!^Bench #{__FILE__}:#{__LINE__ - 4}:.* \d\.\d+$!
   end
 end

data/spec/ramaze/helper/cache.rb

@@ -56,7 +56,7 @@ class SpecHelperCacheKey < Ramaze::Controller
 end
 
 describe Ramaze::Helper::Cache do
-  behaves_like :mock
+  behaves_like :rack_test
 
   it 'caches actions' do
     got = get('/cached_action')

data/spec/ramaze/helper/flash.rb

@@ -23,7 +23,7 @@ class SpecHelperFlash < Ramaze::Controller
 end
 
 describe Ramaze::Helper::Flash do
-  behaves_like :mock
+  behaves_like :rack_test
 
   it 'displays a flashbox with one item' do
     get('/populate_one')

data/spec/ramaze/helper/form.rb

@@ -42,7 +42,7 @@ class SpecHelperForm < Ramaze::Controller
 
   def select_array_multiple
     languages = %w[ English German Japanese ]
-    form_select('Languages', :languages, languages, :multiple => true)
+    form_select('Languages', :languages, languages, :multiple => 1)
   end
 
   def select_array_selected
@@ -57,7 +57,7 @@ class SpecHelperForm < Ramaze::Controller
 end
 
 describe Ramaze::Helper::Form do
-  behaves_like :mock
+  behaves_like :rack_test
 
   it 'provides empty text input' do
     got = get('/text')

data/spec/ramaze/helper/httpdigest.rb

@@ -49,7 +49,7 @@ end
 
 describe Ramaze::Helper::HttpDigest do
   describe 'headers' do
-    behaves_like :mock
+    behaves_like :rack_test
 
     it 'sends out all the required header information' do
       get '/authenticate'
@@ -72,7 +72,7 @@ end
 __END__
 
   describe 'Digest authentication' do
-    behaves_like :mock
+    behaves_like :rack_test
 
     it 'authenticates a user with a block' do
       digest_authorize 'foo', 'oof'
@@ -90,7 +90,7 @@ __END__
   end
 
   describe 'Plaintext authentication' do
-    behaves_like :mock
+    behaves_like :rack_test
 
     it 'authenticates a user with the plaintext method' do
       get '/plaintext/authenticate'

data/spec/ramaze/helper/layout/default.xhtml

@@ -0,0 +1,5 @@
+<em>laid out</em>
+
+<div id="content">
+#@content
+</div>

data/spec/ramaze/helper/layout.rb

@@ -0,0 +1,79 @@
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require 'spec/helper'
+
+class LayoutHelperOne < Ramaze::Controller
+  map '/one'
+  set_layout 'default'
+
+  def laid_out1; end
+  def laid_out2; end
+  def laid_out3; end
+end
+
+class LayoutHelperTwo < Ramaze::Controller
+  map '/two'
+  set_layout 'default' => [:laid_out1, :laid_out2]
+
+  def laid_out1; end
+  def laid_out2; end
+
+  def not_laid_out; end
+end
+
+class LayoutHelper < Ramaze::Controller
+  map '/three'
+  set_layout_except 'default' => [:not_laid_out1, :not_laid_out2]
+
+  def laid_out1; end
+  def laid_out2; end
+
+  def not_laid_out1; end
+  def not_laid_out2; end
+end
+
+
+describe Ramaze::Helper::Layout do
+  behaves_like :rack_test
+
+  it 'lays out all actions' do
+    get '/one/laid_out1'
+    last_response.status.should == 200
+    last_response.body.should.match /laid out/
+    get '/one/laid_out2'
+    last_response.status.should == 200
+    last_response.body.should.match /laid out/
+    get '/one/laid_out3'
+    last_response.status.should == 200
+    last_response.body.should.match /laid out/
+  end
+
+  it 'lays out only a whitelist of actions' do
+    get '/two/laid_out1'
+    last_response.status.should == 200
+    last_response.body.should.match /laid out/
+    get '/two/laid_out2'
+    last_response.status.should == 200
+    last_response.body.should.match /laid out/
+    get '/two/not_laid_out'
+    last_response.status.should == 200
+    last_response.body.should.not.match /laid out/
+  end
+
+  it 'lays out all actions except a blacklist' do
+    get '/three/laid_out1'
+    last_response.status.should == 200
+    last_response.body.should.match /laid out/
+    get '/three/laid_out2'
+    last_response.status.should == 200
+    last_response.body.should.match /laid out/
+    get '/three/not_laid_out1'
+    last_response.status.should == 200
+    last_response.body.should.not.match /laid out/
+    get '/three/not_laid_out2'
+    last_response.status.should == 200
+    last_response.body.should.not.match /laid out/
+  end
+
+end

data/spec/ramaze/helper/link.rb

@@ -2,7 +2,6 @@
 # All files in this distribution are subject to the terms of the Ruby license.
 
 require 'spec/helper'
-require 'ramaze/helper/link'
 
 class SpecHelperLink < Ramaze::Controller
   map '/'
@@ -12,18 +11,18 @@ class SpecHelperLinkTwo < Ramaze::Controller
   map '/two'
 end
 
-describe Ramaze::Helper::Link do
-  extend Ramaze::Helper::Link
+class SpecHelperApp < Ramaze::Controller
+  map '/', :other
+end
 
-  it 'builds routes' do
-    R(SpecHelperLink, :foo).should == '/foo'
-    SpecHelperLink.Rs(:foo).should == '/foo'
-  end
+class SpecHelperAppTwo < Ramaze::Controller
+  map '/two', :other
+end
 
-  it 'builds links' do
-    SpecHelperLink.A(:foo).should == '<a href="/foo">foo</a>'
-    SpecHelperLink.A(:foo, :bar).should == '<a href="/bar">foo</a>'
-  end
+Ramaze::App[:other].location = '/other'
+
+describe Ramaze::Helper::Link do
+  extend Ramaze::Helper::Link
 
   it 'lays out breadcrumbs' do
     SpecHelperLink.breadcrumbs('/file/dir/listing/is/cool').
@@ -46,4 +45,26 @@ describe Ramaze::Helper::Link do
       '<a href="/prefix/path/file/dir/listing/is/cool">cool</a>'
     ].join('/')
   end
+
+  it "builds routes and links to other applications" do
+    SpecHelperApp.r(:foo).to_s.should == '/other/foo'
+    SpecHelperApp.a(:foo, :bar).should == '<a href="/other/bar">foo</a>'
+    SpecHelperAppTwo.r(:foo).to_s.should == '/other/two/foo'
+    SpecHelperAppTwo.a(:foo, :bar).should == '<a href="/other/two/bar">foo</a>'
+  end
+  it "builds routes when Ramaze.options.prefix is present" do
+    Ramaze.options.prefix = '/prfx'
+    SpecHelperLink.r(:foo).to_s.should == '/prfx/foo'
+    SpecHelperLinkTwo.r(:foo).to_s.should == '/prfx/two/foo'
+    SpecHelperApp.r(:foo).to_s.should == '/prfx/other/foo'
+    SpecHelperAppTwo.r(:foo).to_s.should == '/prfx/other/two/foo'
+
+  end
+  it "builds links when Ramaze.options.prefix is present" do
+    Ramaze.options.prefix = '/prfx'
+    SpecHelperLink.a(:foo, :bar).should == '<a href="/prfx/bar">foo</a>'
+    SpecHelperLinkTwo.a(:foo, :bar).should == '<a href="/prfx/two/bar">foo</a>'
+    SpecHelperApp.a(:foo, :bar).should == '<a href="/prfx/other/bar">foo</a>'
+    SpecHelperAppTwo.a(:foo, :bar).should == '<a href="/prfx/other/two/bar">foo</a>'
+  end
 end

data/spec/ramaze/helper/localize.rb

@@ -28,7 +28,7 @@ DICTIONARY.load(:de, :hash => {'one' => 'eins', 'two' => 'zwei'})
 DICTIONARY.load(:ja, :hash => {'one' => '一', 'three' => '三'})
 
 describe Ramaze::Helper::Localize do
-  behaves_like :mock
+  behaves_like :rack_test
 
   should 'default to a language' do
     get('/').body.should == 'en'

data/spec/ramaze/helper/maruku.rb

@@ -11,7 +11,7 @@ class SpecHelperMaruku < Ramaze::Controller
 end
 
 describe Ramaze::Helper::Maruku do
-  behaves_like :mock
+  behaves_like :rack_test
 
   it 'converts a markdown string to html' do
     get('/').body.should =~ /<h1 id=["']hello["']>Hello<\/h1>/

data/spec/ramaze/helper/pager.rb

@@ -29,7 +29,7 @@ class TCPagerController < Ramaze::Controller
 end
 
 shared 'pager' do
-  behaves_like :mock
+  behaves_like :rack_test
   extend Ramaze::Helper::Pager
 
   def pager_key

data/spec/ramaze/helper/paginate.rb

@@ -23,7 +23,7 @@ end
 
 describe Ramaze::Helper::Paginate do
   describe 'Array' do
-    behaves_like :mock
+    behaves_like :rack_test
 
     it 'shows navigation for page 1' do
       doc = Hpricot(get("/array/navigation").body)

data/spec/ramaze/helper/request_accessor.rb

@@ -10,7 +10,7 @@ class SpecHelperRequestAccessor < Ramaze::Controller
 end
 
 describe 'Ramaze::Helper::RequestAccessor' do
-  behaves_like :mock
+  behaves_like :rack_test
 
   it 'gives direct access to methods in Request' do
     get('/').body.should == 'GET'

data/spec/ramaze/helper/sequel_form.rb

@@ -43,7 +43,7 @@ class FormController < Ramaze::Controller
 end
 
 describe Ramaze::Helper::SequelForm do
-  behaves_like :mock
+  behaves_like :rack_test
 
   def hget(uri)
     got = get(uri)

data/spec/ramaze/helper/simple_captcha.rb

@@ -25,7 +25,7 @@ class SpecCustomCaptcha < SpecSimpleCaptcha
 end
 
 describe Ramaze::Helper::SimpleCaptcha do
-  behaves_like :mock
+  behaves_like :rack_test
 
   should 'ask question' do
     get('/ask_question')

data/spec/ramaze/helper/stack.rb

@@ -39,7 +39,7 @@ class SpecStackHelper < Ramaze::Controller
 end
 
 describe Ramaze::Helper::Stack do
-  behaves_like :mock
+  behaves_like :rack_test
   @uri = 'http://example.org'
 
   should 'login directly' do

data/spec/ramaze/helper/user.rb

@@ -52,7 +52,7 @@ class SpecUserHelperCallback < SpecUserHelper
 end
 
 describe Ramaze::Helper::User do
-  behaves_like :mock
+  behaves_like :rack_test
 
   should 'login' do
     get('/status').body.should == 'no'

data/spec/ramaze/params.rb

@@ -51,7 +51,7 @@ class TCParamsController2 < Ramaze::Controller
   end
 
   def keys
-    request.params.keys.to_s.dump
+    request.params.keys.inspect
   end
 end
 
@@ -64,7 +64,7 @@ class TCParamsController3 < Ramaze::Controller
 end
 
 describe "Simple Parameters" do
-  behaves_like :mock
+  behaves_like :rack_test
 
   def handle(*url)
     Ramaze::Mock.get(*url).body
@@ -103,8 +103,7 @@ describe "Simple Parameters" do
   end
 
   it "action that takes all params but needs at least one (not given here)" do
-    lambda{ handle('/at_least_one') }.
-      should.raise(ArgumentError)
+    lambda{ handle('/at_least_one') }.should.raise(ArgumentError)
   end
 
   it "one default" do
@@ -149,6 +148,6 @@ describe "Simple Parameters" do
   end
 
   it 'should handle valueless params' do
-    handle('/jo/keys?foo').should == '"foo"'
+    handle('/jo/keys?foo').should == '["foo"]'
   end
 end

data/spec/ramaze/session/memcache.rb

@@ -0,0 +1,66 @@
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require 'spec/helper'
+
+spec_precondition 'memcached is running' do
+  require 'memcache'
+  cache = MemCache.new(['localhost:11211'])
+  cache.set('active', true)
+end
+
+class SpecSession < Ramaze::Controller
+  map '/'
+  engine :None
+
+  def index
+    'No session here'
+  end
+
+  def init
+    session[:counter] = 0
+  end
+
+  def view
+    session[:counter]
+  end
+
+  def increment
+    session[:counter] += 1
+  end
+
+  def decrement
+    session[:counter] -= 1
+  end
+
+  def reset
+    session.clear
+  end
+end
+
+Ramaze::Cache.options.session = Ramaze::Cache::MemCache
+
+describe Innate::Session do
+  behaves_like :rack_test
+
+  should 'initiate session as needed' do
+    get '/'
+    last_response.body.should == 'No session here'
+    last_response['Set-Cookie'].should == nil
+
+    get('/init')
+    last_response.body.should == '0'
+
+    1.upto(10) do |n|
+      get('/increment').body.should == n.to_s
+    end
+
+    get('/reset')
+    get('/view').body.should == ''
+    get('/init').body.should == '0'
+
+    -1.downto(-10) do |n|
+      get('/decrement').body.should == n.to_s
+    end
+  end
+end