ramaze 2008.06 → 2008.11

data/spec/contrib/auto_params.rb

@@ -1,5 +1,5 @@
 require 'spec/helper'
-spec_require 'ruby2ruby'
+spec_require 'parse_tree', 'ruby2ruby'
 
 Ramaze.contrib :auto_params
 
@@ -100,7 +100,7 @@ describe 'Parameterized actions' do
 end if method(:puts).respond_to? :get_args
 
 describe 'Normal behavior' do
-  extend MockHTTP
+  behaves_like 'http'
   ramaze
 
   it 'should work with no arguments' do
@@ -108,7 +108,7 @@ describe 'Normal behavior' do
   end
 
   it 'should raise no action' do
-    get('/none').body.should =~ /^No Action found/
+    get('/none').body.should =~ /No Action found/
   end
 
   it 'should work with included actions' do

data/spec/contrib/profiling.rb

@@ -11,7 +11,7 @@ class MainController < Ramaze::Controller
 end
 
 output = StringIO.new
-Ramaze::Log.loggers << Ramaze::Logging::Logger::Informer.new(output)
+Ramaze::Log.loggers << Ramaze::Logger::Informer.new(output)
 
 describe 'Profiling' do
   behaves_like "http"
@@ -19,7 +19,7 @@ describe 'Profiling' do
 
   it "should profile" do
     output = StringIO.new
-    Ramaze::Log.loggers << Ramaze::Logging::Logger::Informer.new(output)
+    Ramaze::Log.loggers << Ramaze::Logger::Informer.new(output)
 
     get('/')
     output.string.should =~ /Thread ID:\s\d+/

data/spec/examples/simple_auth.rb

@@ -7,12 +7,12 @@ describe "SimpleAuth" do
 
   it 'should show start page' do
     Browser.new do
-      http.basic_authentication "username", "password"
+      http.basic_authentication "jill", "password1"
       get('/').should == "Secret Info"
     end
 
     Browser.new do
-      http.basic_authentication "admin", "secret"
+      http.basic_authentication "jack", "password2"
       get('/').should == "Secret Info"
     end
   end

data/spec/examples/templates/template_haml.rb

@@ -21,5 +21,3 @@ describe 'Template Haml' do
     end
   end
 end
-
-

data/spec/ramaze/action/file_cache.rb

@@ -22,6 +22,18 @@ class TCOtherCache < Ramaze::Controller
   cache :index
 end
 
+class TCIndexCache < Ramaze::Controller
+  map '/withparams'
+  helper :cache
+
+  def index(somearg = nil)
+    rand + somearg.to_f
+  end
+  alias :nonindex :index
+
+  cache :index, :nonindex
+end
+
 describe 'Action rendering' do
   behaves_like 'http'
 
@@ -44,5 +56,15 @@ describe 'Action rendering' do
     File.file?(public_root/'other/index').should == true
   end
 
+  should 'cache action with params' do
+    lambda{ req('/withparams/nonindex/42') }.should.not.change{ req('/withparams/nonindex/42') }
+    File.file?(public_root/'withparams/nonindex/42').should == true
+  end
+
+  should 'cache index action with params' do
+    lambda{ req('/withparams/42') }.should.not.change{ req('/withparams/42') }
+    File.file?(public_root/'withparams/42').should == true
+  end
+
   FileUtils.rm_rf public_root
 end

data/spec/ramaze/adapter.rb

@@ -12,7 +12,7 @@ class TCAdapterController < Ramaze::Controller
 end
 
 $output = StringIO.new
-Ramaze::Log.loggers << Ramaze::Logging::Logger::Informer.new($output)
+Ramaze::Log.loggers << Ramaze::Logger::Informer.new($output)
 
 describe "Adapter" do
   ramaze ramaze_options ||= {}
@@ -46,4 +46,4 @@ describe "Adapter" do
     ret.status.should == 200
     ret.body.should == 'i am before'
   end
-end
+end

data/spec/ramaze/controller/actionless_templates.rb

@@ -19,7 +19,7 @@ end
 describe "Testing Actionless Templates" do
   behaves_like 'http'
   ramaze :actionless_templates => false,
-         :view_root => __DIR__/:view
+         :view_root => __DIR__/:view, :error_page => true
 
   it "should not find template file for non existant method" do
     get('/non_existant_method').status.should == 404

data/spec/ramaze/controller/subclass.rb

@@ -4,6 +4,9 @@
 require 'spec/helper'
 
 class BaseController < Ramaze::Controller
+  template :foo, :bar
+  template :one, self, :another
+
   def test() 'test' end
 end
 
@@ -18,4 +21,16 @@ describe 'Controller' do
   it 'should allow sub-classing MainController' do
     get('/test').body.should == 'test'
   end
+
+  it 'should respect template mappings set in superclass, with no explicit controller' do
+    # The template file it should use is view/bar.xhtml, as the template mapping doesn't
+    # specify a controller, so it will be implicitly relative to MainController.
+    get('/foo').body.should == 'bar'
+  end
+
+  it 'should respect template mappings set in superclass, with an explicit controller' do
+    # Note that the template file it should use is view/base/another.xhtml, because
+    # BaseController explicitly specifies the template mapping in relation to self.
+    get('/one').body.should == 'another'
+  end
 end

data/spec/ramaze/controller/template_resolving.rb

@@ -44,7 +44,7 @@ class OtherController < MainController
 
 end
 
-class AnotherController < Ramaze::Controller
+class AnotherController < MainController
   Root = __DIR__/:view
   Absolute = lambda{|path| File.join Root, path}
   Relative = lambda{|path| path}

data/spec/ramaze/controller/view/bar.xhtml

@@ -0,0 +1 @@
+bar

data/spec/ramaze/controller/view/base/another.xhtml

@@ -0,0 +1 @@
+another

data/spec/ramaze/current/session.rb

@@ -35,7 +35,7 @@ describe "Session" do
     (Ramaze::Session::IP_COUNT_LIMIT + 2).times do
       r = get('/')
       r.body.should == "nothing"
-      r.headers.should == {'Content-Type' => 'text/html'}
+      r.headers['Content-Type'].should == 'text/html'
     end
   end
 end

data/spec/ramaze/dispatcher/file.rb

@@ -37,7 +37,7 @@ describe 'Dispatcher::File' do
   it 'should send Last-Modified' do
     res = get '/test_download.css'
     res.headers['Last-Modified'].should.not.be == nil
-    res.headers['Last-Modified'].should == File.stat(@public_root/'test_download.css').mtime.httpdate
+    res.headers['Last-Modified'].should == File.mtime(@public_root/'test_download.css').httpdate
   end
 
   it 'should respect ETag with IF_NONE_MATCHES' do
@@ -57,4 +57,4 @@ describe 'Dispatcher::File' do
     res.status.should == 304
     res.body.should == ''
   end
-end
+end

data/spec/ramaze/helper/aspect.rb

@@ -8,14 +8,14 @@ class TCAspectController < Ramaze::Controller
   trait :foo => :bar
   helper :aspect
 
-  def test_before() request[:before] += 2 end
-  before(:test_before){ request[:before] = 40 }
+  def test_before() $helper_aspect_spec_test_before += 2 end
+  before(:test_before){ $helper_aspect_spec_test_before = 40 }
 
-  def test_after() request[:after] = 40 end
-  after(:test_after){ request[:after] += 2 }
+  def test_after() $helper_aspect_spec_test_after = 40 end
+  after(:test_after){ $helper_aspect_spec_test_after += 2 }
 
   def test_wrap() end
-  wrap(:test_wrap){ request[:wrap] ||= 0; request[:wrap] += 21 }
+  wrap(:test_wrap){ $helper_aspect_spec_test_wrap ||= 0; $helper_aspect_spec_test_wrap += 21 }
 
   wrap(:test_template) { '<aspect>' }
 end
@@ -29,8 +29,8 @@ class TCAspectAllController < Ramaze::Controller
   def test_all_first() 'first' end
   def test_all_second() 'second' end
 
-  before_all{ request[:all] = 40 }
-  after_all{ request[:all] += 2 }
+  before_all{ $helper_aspect_spec_all = 40 }
+  after_all{ $helper_aspect_spec_all += 2 }
 
   def test_all_after() 'after' end
 
@@ -42,51 +42,60 @@ end
 describe "AspectHelper" do
   behaves_like 'http'
   ramaze :error_page => false
-  extend Ramaze::Trinity
 
   it "shouldn't overwrite traits on inclusion" do
     TCAspectController.trait[:foo].should == :bar
   end
 
   it 'should use before' do
+    $helper_aspect_spec_test_before = nil
     get('/test_before')
-    request[:before].should == 42
+    $helper_aspect_spec_test_before.should == 42
   end
 
   it 'should use after' do
+    $helper_aspect_spec_test_after = nil
     get('/test_after')
-    request[:after].should == 42
+    $helper_aspect_spec_test_after.should == 42
   end
 
   it 'should use wrap' do
+    $helper_aspect_spec_test_wrap = nil
     get('/test_wrap')
-    request[:wrap].should == 42
+    $helper_aspect_spec_test_wrap.should == 42
   end
 
   it 'should before_all and after_all' do
+    $helper_aspect_spec_all = nil
     get('/all/test_all_first')
-    request[:all].should == 42
+    $helper_aspect_spec_all.should == 42
+
+    $helper_aspect_spec_all = nil
     get('/all/test_all_second')
-    request[:all].should == 42
+    $helper_aspect_spec_all.should == 42
   end
 
   it 'should before_all and after_all for templates' do
+    $helper_aspect_spec_all = nil
     get('/all/test_template')
-    request[:all].should == 42
+    $helper_aspect_spec_all.should == 42
   end
 
   it 'should before_all and after_all for all defined actions' do
+    $helper_aspect_spec_all = nil
     get('/all/test_all_after')
-    request[:all].should == 42
+    $helper_aspect_spec_all.should == 42
   end
 
   it 'should not apply aspects to render_template' do
+    $helper_aspect_spec_all = nil
     get('/all/loop').body.gsub(/\s/,'').should == '12345'
-    request[:all].should == 42
+    $helper_aspect_spec_all.should == 42
   end
 
   it 'should not apply aspects to layouts' do
+    $helper_aspect_spec_all = nil
     get('/all/loop_with_layout').body.gsub(/\s/,'').should == '<div>12345</div>'
-    request[:all].should == 42
+    $helper_aspect_spec_all.should == 42
   end
 end

data/spec/ramaze/helper/formatting.rb

@@ -26,6 +26,11 @@ describe 'Helper::Formatting' do
       "<a href=\"http://ramaze.net\" target='_blank'>http://ramaze.net</a>"
   end
 
+  it 'should auto_link urls, setting the result of the given block as the link text' do
+    auto_link('http://ramaze.net rocks, so does http://rubyonrails.org.') { |url| url.sub!(%r{http://}, '') }.should ==
+      '<a href="http://ramaze.net">ramaze.net</a> rocks, so does <a href="http://rubyonrails.org">rubyonrails.org</a>.'
+  end
+
   should 'ordinalize numbers' do
     ordinal(1).should == '1st'
     ordinal(2).should == '2nd'
@@ -38,4 +43,12 @@ describe 'Helper::Formatting' do
     ordinal(100).should == '100th'
     ordinal(133).should == '133rd'
   end
+
+  should 'generate tagclouds' do
+    tags = %w[ruby ruby code ramaze]
+    tagcloud(tags).should ==
+      {"code"=>0.75, "ramaze"=>0.75, "ruby"=>1.0}
+    tagcloud(tags, 0.5, 2.0).should ==
+      {"code"=>0.875, "ramaze"=>0.875, "ruby"=>1.25}
+  end
 end

data/spec/ramaze/log/informer.rb

@@ -4,8 +4,8 @@ describe 'Informer' do
   before do
     @out = []
     def @out.puts(*args) push(*args) end
-    Ramaze::Logging::Logger::Informer.trait[:colorize] = false
-    @inform = Ramaze::Logging::Logger::Informer.new(@out)
+    Ramaze::Logger::Informer.trait[:colorize] = false
+    @inform = Ramaze::Logger::Informer.new(@out)
   end
 
   def format(tag, string)
@@ -39,27 +39,27 @@ describe 'Informer' do
   end
 
   it 'should choose stdout on init(stdout,:stdout,STDOUT)' do
-    a = Ramaze::Logging::Logger::Informer.new(STDOUT)
-    b = Ramaze::Logging::Logger::Informer.new(:stdout)
-    c = Ramaze::Logging::Logger::Informer.new('stdout')
+    a = Ramaze::Logger::Informer.new(STDOUT)
+    b = Ramaze::Logger::Informer.new(:stdout)
+    c = Ramaze::Logger::Informer.new('stdout')
     [a,b,c].each { |x| x.out.should == $stdout}
   end
 
   it 'should choose stderr on init(stderr,:stderr,STDERR)' do
-    a = Ramaze::Logging::Logger::Informer.new(STDERR)
-    b = Ramaze::Logging::Logger::Informer.new(:stderr)
-    c = Ramaze::Logging::Logger::Informer.new('stderr')
+    a = Ramaze::Logger::Informer.new(STDERR)
+    b = Ramaze::Logger::Informer.new(:stderr)
+    c = Ramaze::Logger::Informer.new('stderr')
     [a,b,c].each { |x| x.out.should == $stderr}
   end
 
   it 'should use IO when supplied' do
-    i = Ramaze::Logging::Logger::Informer.new(s = StringIO.new)
+    i = Ramaze::Logger::Informer.new(s = StringIO.new)
     i.out.should == s
   end
 
   it 'should open file otherwise' do
     begin
-      i = Ramaze::Logging::Logger::Informer.new('tmp.dummy')
+      i = Ramaze::Logger::Informer.new('tmp.dummy')
       out = i.out
       out.should.be.instance_of(File)
       out.path.should == 'tmp.dummy'

data/spec/ramaze/log/syslog.rb

@@ -1,10 +1,73 @@
+#          Copyright (c) 2008 rob@rebeltechnologies.nl
+# All files in this distribution are subject to the terms of the Ruby license.
+
 require 'spec/helper'
 
 require 'ramaze/log/syslog'
 
 describe 'Syslog' do
-  it 'should do something' do
-    syslog = Ramaze::Logging::Logger::Syslog.new
-    syslog.send(:ident).should =~ /#{Regexp.escape(__FILE__)}$/
-  end
+
+	# close the syslog, if it was open for some reason before we
+	# start a test. 
+	before do
+		if ( Syslog.opened? )
+			::Syslog.close
+		end
+	end
+
+	it 'should default initialize correctly' do
+		syslog = Ramaze::Logger::Syslog.new
+		::Syslog.opened?.should == true
+		::Syslog.ident.should   == $0
+		::Syslog.options.should == ( ::Syslog::LOG_PID | ::Syslog::LOG_CONS )
+		::Syslog.facility.should == ::Syslog::LOG_USER
+	end
+
+	it 'should handle non default initialization' do
+		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'
+		::Syslog.options.should == ( ::Syslog::LOG_NDELAY | ::Syslog::LOG_NOWAIT )
+		::Syslog.facility.should == ::Syslog::LOG_DAEMON
+	end
+
+    # We test the actual logging using a trick found in te test code of the
+    # syslog module.  We create a pipe, fork a child, reroute the childs
+    # stderr to the pipe. Then we open the logging using LOG_PERROR, so all
+    # log messages are written to stderror.  In the parent we read the messages
+    # from the pipe and compare them to what we expected.
+	def test_log_msg( type, priority, msg )
+		logpipe = IO::pipe
+		child = fork {
+			logpipe[0].close
+			STDERR.reopen(logpipe[1])
+			syslog = Ramaze::Logger::Syslog.new( 'ramaze_syslog_test', 
+			                                              ::Syslog::LOG_PID | ::Syslog::LOG_NDELAY | ::Syslog::LOG_PERROR,
+														  ::Syslog::LOG_USER )
+			syslog.send priority, msg
+			Process.exit!( 0 )
+		}
+		logpipe[1].close
+		Process.waitpid(child)
+
+		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
+	it 'should handle dev' do
+		test_log_msg :direct, :dev, "Hello Dev World"
+	end
+	it 'should handle info' do
+		test_log_msg :direct, :info, 'Hello Info World!'
+	end
+	it 'should handle warn' do
+		test_log_msg :direct, :warn, 'Hello Warn World!'
+	end
+	it 'should handle error' do
+		test_log_msg :direct, :error, 'Hello Error World!'
+	end
 end

data/spec/ramaze/rewrite.rb

@@ -33,4 +33,4 @@ describe 'Route' do
     r = get('/index.php/file.css')
     [ r.status, r.body ].should == [ 200, 'this is css' ]
   end
-end
+end