Pistos-ramaze 2009.04.08 → 2009.06.12

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

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

data/spec/ramaze/helper/link.rb

@@ -1,8 +1,7 @@
 #          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'
-require 'ramaze/helper/link'
+require File.expand_path('../../../../spec/helper', __FILE__)
 
 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

@@ -1,6 +1,9 @@
 # * Encoding: UTF-8
-$KCODE = 'u' if //.respond_to?(:kcode)
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+$KCODE = 'u' if /regexp/.respond_to?(:kcode)
+require File.expand_path('../../../../spec/helper', __FILE__)
 spec_requires 'locale/tag', 'locale'
 
 class SpecHelperLocalize < Ramaze::Controller
@@ -28,7 +31,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'
@@ -39,7 +42,9 @@ describe Ramaze::Helper::Localize do
   end
 
   should 'override language by cookie' do
-    get('/', 'HTTP_COOKIE' => 'lang=ja').body.should == 'ja'
+    set_cookie('lang=ja')
+    get('/').body.should == 'ja'
+    clear_cookies
   end
 
   should 'not fail if language is invalid' do

data/spec/ramaze/helper/maruku.rb

@@ -1,4 +1,7 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
 spec_require 'maruku'
 
 class SpecHelperMaruku < Ramaze::Controller
@@ -11,7 +14,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

@@ -1,7 +1,7 @@
 #          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'
+require File.expand_path('../../../../spec/helper', __FILE__)
 spec_require 'hpricot'
 
 module Og
@@ -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

@@ -1,4 +1,7 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
 spec_require 'hpricot'
 
 class SpecHelperPaginateArray < Ramaze::Controller
@@ -23,7 +26,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

@@ -1,4 +1,7 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
 
 class SpecHelperRequestAccessor < Ramaze::Controller
   map '/'
@@ -10,7 +13,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

@@ -1,10 +1,15 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
 
 spec_requires 'hpricot', 'sequel'
 
 DB = Sequel.sqlite
 
 class User < Sequel::Model(:user)
+  plugin :schema
+
   set_schema do
     primary_key :id
 
@@ -41,7 +46,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

@@ -1,7 +1,7 @@
 #          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'
+require File.expand_path('../../../../spec/helper', __FILE__)
 
 class SpecSimpleCaptcha < Ramaze::Controller
   helper :simple_captcha
@@ -25,25 +25,21 @@ class SpecCustomCaptcha < SpecSimpleCaptcha
 end
 
 describe Ramaze::Helper::SimpleCaptcha do
-  behaves_like :session
+  behaves_like :rack_test
 
   should 'ask question' do
-    session do |mock|
-      question = mock.get('/ask_question').body
-      question.should =~ /^\d+ [+-] \d+$/
+    get('/ask_question')
+    question = last_response.body
+    question.should =~ /^\d+ [+-] \d+$/
 
-      lh, m, rh = question.split
-      answer = lh.to_i.send(m, rh.to_i)
+    lh, m, rh = question.split
+    answer = lh.to_i.send(m, rh.to_i)
 
-      mock.get("/answer_question/#{answer}").body.should == 'correct'
-    end
+    get("/answer_question/#{answer}").body.should == 'correct'
   end
 
   should 'ask custom question' do
-    session do |mock|
-      question = mock.get('/fish/ask_question')
-      question.body.should == 'the answer to everything'
-      mock.get('/fish/answer_question/42').body.should == 'correct'
-    end
+    get('/fish/ask_question').body.should == 'the answer to everything'
+    get('/fish/answer_question/42').body.should == 'correct'
   end
 end

data/spec/ramaze/helper/stack.rb

@@ -1,7 +1,7 @@
 #          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'
+require File.expand_path('../../../../spec/helper', __FILE__)
 
 class SpecStackHelper < Ramaze::Controller
   map '/'
@@ -39,56 +39,48 @@ class SpecStackHelper < Ramaze::Controller
 end
 
 describe Ramaze::Helper::Stack do
-  behaves_like :session
+  behaves_like :rack_test
   @uri = 'http://example.org'
 
   should 'login directly' do
-    session do |mock|
-      mock.get('/secure').body.should == 'please login'
+    get('/secure').body.should == 'please login'
 
-      got = mock.get('/login')
-      got.status.should == 302
-      got['Location'].should == "#@uri/secure"
+    get('/login').status.should == 302
+    last_response['Location'].should == "#@uri/secure"
 
-      got = mock.get('/secure')
-      got.status.should == 200
-      got.body.should == 'secret content'
+    get('/secure').status.should == 200
+    last_response.body.should == 'secret content'
 
-      mock.get('/secure').body.should == 'secret content'
-      mock.get('/logout')
-      mock.get('/secure').body.should == 'please login'
-    end
+    get('/secure').body.should == 'secret content'
+    get('/logout')
+    get('/secure').body.should == 'please login'
   end
 
   should 'login via redirects' do
-    session do |mock|
-      got = mock.get('/logged_in_page')
-      got.status.should == 302
-      got['Location'].should == 'http://example.org/login'
-
-      got = mock.get('/login')
-      got.status.should == 302
-      got['Location'].should == 'http://example.org/logged_in_page'
-
-      got = mock.get('/logged_in_page')
-      got.status.should == 200
-      got.body.should == 'the logged in page'
-    end
+    get('/logged_in_page').status.should == 302
+    last_response['Location'].should == 'http://example.org/login'
+
+    get('/login').status.should == 302
+    last_response['Location'].should == 'http://example.org/logged_in_page'
+
+    get('/logged_in_page').status.should == 200
+    last_response.body.should == 'the logged in page'
+
+    get('/logout')
+    get('/secure').body.should == 'please login'
   end
 
   should 'login with params via redirects' do
-    session do |mock|
-      got = mock.get('/logged_in_params?x=y')
-      got.status.should == 302
-      got['Location'].should == 'http://example.org/login'
-
-      got = mock.get('/login')
-      got.status.should == 302
-      got['Location'].should == 'http://example.org/logged_in_params?x=y'
-
-      got = mock.get('/logged_in_params?x=y')
-      got.status.should == 200
-      got.body.should == {'x' => 'y'}.inspect
-    end
+    get('/logged_in_params?x=y').status.should == 302
+    last_response['Location'].should == 'http://example.org/login'
+
+    get('/login').status.should == 302
+    last_response['Location'].should == 'http://example.org/logged_in_params?x=y'
+
+    get('/logged_in_params?x=y').status.should == 200
+    last_response.body.should == {'x' => 'y'}.inspect
+
+    get('/logout')
+    get('/secure').body.should == 'please login'
   end
 end

data/spec/ramaze/helper/user.rb

@@ -1,4 +1,7 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
 
 class MockSequelUser
   def profile
@@ -23,6 +26,10 @@ class SpecUserHelper < Ramaze::Controller
     user_login ? 'logged in' : 'failed login'
   end
 
+  def logout
+    user_logout
+  end
+
   def profile
     user.profile
   end
@@ -48,23 +55,21 @@ class SpecUserHelperCallback < SpecUserHelper
 end
 
 describe Ramaze::Helper::User do
-  behaves_like :session
+  behaves_like :rack_test
 
   should 'login' do
-    session do |mock|
-      mock.get('/status').body.should == 'no'
-      mock.get('/login?name=arthur&password=42').body.should == 'logged in'
-      mock.get('/status').body.should == 'yes'
-      mock.get('/profile').body.should == MockSequelUser.new.profile
-    end
+    get('/status').body.should == 'no'
+    get('/login?name=arthur&password=42').body.should == 'logged in'
+    get('/status').body.should == 'yes'
+    get('/profile').body.should == MockSequelUser.new.profile
+    get('/logout').status.should == 200
   end
 
   should 'login via the callback' do
-    session do |mock|
-      mock.get('/callback/status').body.should == 'no'
-      mock.get('/callback/login?name=arthur&password=42').body.should == 'logged in'
-      mock.get('/callback/status').body.should == 'yes'
-      mock.get('/callback/profile').body.should == MockSequelUser.new.profile
-    end
+    get('/callback/status').body.should == 'no'
+    get('/callback/login?name=arthur&password=42').body.should == 'logged in'
+    get('/callback/status').body.should == 'yes'
+    get('/callback/profile').body.should == MockSequelUser.new.profile
+    get('/logout').status.should == 200
   end
 end

data/spec/ramaze/helper/xhtml.rb

@@ -1,4 +1,7 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
 require 'ramaze/helper/xhtml'
 
 describe Ramaze::Helper::XHTML do

data/spec/ramaze/log/informer.rb

@@ -1,7 +1,7 @@
 #          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'
+require File.expand_path('../../../../spec/helper', __FILE__)
 require 'ramaze/log/informer'
 
 describe 'Informer' do

data/spec/ramaze/log/logging.rb

@@ -1,4 +1,7 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
 
 class SpecLogger
   include Ramaze::Logging

data/spec/ramaze/log/syslog.rb

@@ -1,14 +1,14 @@
 #          Copyright (c) 2008 rob@rebeltechnologies.nl
 # All files in this distribution are subject to the terms of the Ruby license.
 
-require 'spec/helper'
+require File.expand_path('../../../../spec/helper', __FILE__)
 
 require 'ramaze/log/syslog'
 
 describe 'Syslog' do
 
 	# close the syslog, if it was open for some reason before we
-	# start a test. 
+	# start a test.
 	before do
 		if ( Syslog.opened? )
 			::Syslog.close
@@ -24,8 +24,8 @@ describe 'Syslog' do
 	end
 
 	it 'should handle non default initialization' do
-		syslog = Ramaze::Logger::Syslog.new( 'ramaze_syslog_test', 
-		                                               ::Syslog::LOG_NDELAY | ::Syslog::LOG_NOWAIT, 
+		syslog = Ramaze::Logger::Syslog.new( 'ramaze_syslog_test',
+		                                               ::Syslog::LOG_NDELAY | ::Syslog::LOG_NOWAIT,
 		                                               ::Syslog::LOG_DAEMON )
 		::Syslog.opened?.should == true
 		::Syslog.ident.should   == 'ramaze_syslog_test'
@@ -43,7 +43,7 @@ describe 'Syslog' do
 		child = fork {
 			logpipe[0].close
 			STDERR.reopen(logpipe[1])
-			syslog = Ramaze::Logger::Syslog.new( 'ramaze_syslog_test', 
+			syslog = Ramaze::Logger::Syslog.new( 'ramaze_syslog_test',
 			                                              ::Syslog::LOG_PID | ::Syslog::LOG_NDELAY | ::Syslog::LOG_PERROR,
 														  ::Syslog::LOG_USER )
 			syslog.send priority, msg
@@ -54,7 +54,7 @@ describe 'Syslog' do
 
 		logpipe[0].gets.should == "ramaze_syslog_test[#{child}]: #{msg}\n"
 	end
-	
+
 	it 'should handle debug' do
 		test_log_msg :direct, :debug, "Hello Debug World"
 	end