RubyGems - ramaze - Versions diffs - 0.3.5 → 0.3.9 - Mend

ramaze 0.3.5 → 0.3.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (204) hide show

data/Rakefile +5 -20
data/bin/ramaze +0 -4
data/doc/AUTHORS +5 -0
data/doc/meta/announcement.txt +2 -1
data/doc/tutorial/todolist.html +20 -21
data/doc/tutorial/todolist.mkd +10 -9
data/examples/blog/{src/controller.rb → controller/main.rb} +2 -0
data/examples/blog/{src/model.rb → model/entry.rb} +0 -0
data/examples/blog/spec/blog.rb +3 -3
data/examples/blog/start.rb +2 -3
data/examples/blog/view/edit.xhtml +17 -0
data/examples/blog/view/index.xhtml +17 -0
data/examples/blog/view/layout.xhtml +11 -0
data/examples/blog/view/new.xhtml +16 -0
data/examples/facebook.rb +15 -8
data/examples/identity.rb +1 -1
data/examples/memleak_detector.rb +1 -1
data/examples/rammit/src/model.rb +1 -1
data/examples/rapaste/controller/paste.rb +7 -7
data/examples/rapaste/model/paste.rb +1 -3
data/examples/rapaste/public/css/display.css +2 -1
data/examples/rapaste/start.rb +2 -3
data/examples/sourceview/sourceview.rb +1 -1
data/examples/templates/template/external.tenjin +28 -0
data/examples/templates/template_amrita2.rb +0 -3
data/examples/templates/template_tenjin.rb +57 -0
data/examples/todolist/spec/todolist.rb +13 -2
data/examples/todolist/src/controller/main.rb +1 -1
data/examples/todolist/template/index.xhtml +1 -1
data/examples/wiktacular/spec/wiktacular.rb +18 -0
data/examples/wiktacular/src/controller.rb +2 -2
data/examples/wiktacular/src/model.rb +8 -2
data/lib/proto/public/css/ramaze_error.css +4 -0
data/lib/proto/public/dispatch.fcgi +11 -0
data/lib/proto/spec/main.rb +1 -1
data/lib/proto/start.ru +8 -0
data/lib/proto/view/error.xhtml +2 -0
data/lib/ramaze.rb +28 -5
data/lib/ramaze/action.rb +9 -2
data/lib/ramaze/action/render.rb +40 -24
data/lib/ramaze/adapter.rb +10 -17
data/lib/ramaze/adapter/base.rb +8 -12
data/lib/ramaze/adapter/cgi.rb +14 -13
data/lib/ramaze/adapter/ebb.rb +34 -0
data/lib/ramaze/adapter/evented_mongrel.rb +1 -1
data/lib/ramaze/adapter/fcgi.rb +14 -14
data/lib/ramaze/adapter/lsws.rb +15 -11
data/lib/ramaze/adapter/mongrel.rb +2 -1
data/lib/ramaze/adapter/scgi.rb +24 -0
data/lib/ramaze/adapter/swiftiplied_mongrel.rb +1 -1
data/lib/ramaze/adapter/thin.rb +4 -5
data/lib/ramaze/adapter/webrick.rb +5 -5
data/lib/ramaze/cache.rb +1 -1
data/lib/ramaze/cache/memcached.rb +1 -1
data/lib/ramaze/contrib.rb +70 -10
data/lib/ramaze/contrib/auto_params.rb +1 -1
data/lib/ramaze/contrib/email.rb +15 -15
data/lib/ramaze/contrib/facebook.rb +2 -2
data/lib/ramaze/contrib/facebook/facebook.rb +7 -4
data/lib/ramaze/contrib/file_cache.rb +65 -0
data/lib/ramaze/contrib/gettext.rb +56 -55
data/lib/ramaze/contrib/profiling.rb +36 -0
data/lib/ramaze/contrib/sequel_cache.rb +92 -0
data/lib/ramaze/controller.rb +80 -47
data/lib/ramaze/controller/error.rb +10 -5
data/lib/ramaze/controller/resolve.rb +36 -48
data/lib/ramaze/current.rb +70 -0
data/lib/ramaze/{trinity → current}/request.rb +62 -15
data/lib/ramaze/current/response.rb +19 -0
data/lib/ramaze/{trinity → current}/session.rb +32 -110
data/lib/ramaze/current/session/flash.rb +67 -0
data/lib/ramaze/current/session/hash.rb +65 -0
data/lib/ramaze/dispatcher.rb +1 -28
data/lib/ramaze/dispatcher/action.rb +6 -3
data/lib/ramaze/dispatcher/directory.rb +1 -1
data/lib/ramaze/dispatcher/error.rb +26 -5
data/lib/ramaze/dispatcher/file.rb +13 -2
data/lib/ramaze/gestalt.rb +3 -1
data/lib/ramaze/global.rb +6 -3
data/lib/ramaze/global/globalstruct.rb +3 -1
data/lib/ramaze/helper.rb +66 -20
data/lib/ramaze/helper/aspect.rb +25 -17
data/lib/ramaze/helper/auth.rb +4 -3
data/lib/ramaze/helper/cache.rb +5 -4
data/lib/ramaze/helper/cgi.rb +11 -9
data/lib/ramaze/helper/flash.rb +28 -3
data/lib/ramaze/helper/formatting.rb +1 -3
data/lib/ramaze/helper/identity.rb +2 -3
data/lib/ramaze/helper/inform.rb +7 -6
data/lib/ramaze/helper/link.rb +15 -17
data/lib/ramaze/helper/markaby.rb +2 -4
data/lib/ramaze/helper/maruku.rb +1 -1
data/lib/ramaze/helper/nitroform.rb +4 -4
data/lib/ramaze/helper/pager.rb +4 -6
data/lib/ramaze/helper/partial.rb +24 -21
data/lib/ramaze/helper/redirect.rb +8 -5
data/lib/ramaze/helper/{file.rb → sendfile.rb} +1 -3
data/lib/ramaze/helper/sequel.rb +1 -3
data/lib/ramaze/helper/stack.rb +1 -3
data/lib/ramaze/helper/tagz.rb +19 -0
data/lib/ramaze/helper/user.rb +63 -0
data/lib/ramaze/inform.rb +2 -24
data/lib/ramaze/log.rb +28 -0
data/lib/ramaze/{inform → log}/analogger.rb +3 -3
data/lib/ramaze/{inform → log}/growl.rb +2 -2
data/lib/ramaze/{inform → log}/hub.rb +4 -6
data/lib/ramaze/{inform → log}/informer.rb +4 -4
data/lib/ramaze/{inform → log}/knotify.rb +2 -2
data/lib/ramaze/log/logger.rb +22 -0
data/lib/ramaze/{inform/informing.rb → log/logging.rb} +16 -16
data/lib/ramaze/{inform → log}/syslog.rb +0 -0
data/lib/ramaze/{inform → log}/xosd.rb +2 -2
data/lib/ramaze/route.rb +64 -36
data/lib/ramaze/snippets/array/put_within.rb +13 -0
data/lib/ramaze/snippets/binding/locals.rb +13 -0
data/lib/ramaze/snippets/kernel/__dir__.rb +10 -8
data/lib/ramaze/snippets/kernel/aquire.rb +1 -1
data/lib/ramaze/snippets/kernel/constant.rb +1 -1
data/lib/ramaze/snippets/object/pretty.rb +6 -0
data/lib/ramaze/snippets/object/scope.rb +11 -0
data/lib/ramaze/snippets/object/thread_accessor.rb +5 -0
data/lib/ramaze/snippets/ordered_set.rb +1 -1
data/lib/ramaze/snippets/proc/locals.rb +11 -0
data/lib/ramaze/snippets/ramaze/thread_accessor.rb +44 -0
data/lib/ramaze/snippets/string/esc.rb +29 -0
data/lib/ramaze/snippets/string/start_with.rb +7 -0
data/lib/ramaze/snippets/string/unindent.rb +6 -1
data/lib/ramaze/snippets/struct/values_at.rb +1 -5
data/lib/ramaze/sourcereload.rb +16 -14
data/lib/ramaze/spec.rb +1 -0
data/lib/ramaze/spec/helper.rb +11 -3
data/lib/ramaze/spec/helper/browser.rb +25 -1
data/lib/ramaze/spec/helper/pretty_output.rb +11 -11
data/lib/ramaze/template.rb +5 -4
data/lib/ramaze/template/amrita2.rb +2 -3
data/lib/ramaze/template/ezamar/element.rb +2 -3
data/lib/ramaze/template/ezamar/morpher.rb +1 -2
data/lib/ramaze/template/ezamar/render_partial.rb +1 -1
data/lib/ramaze/template/haml.rb +5 -2
data/lib/ramaze/template/markaby.rb +2 -0
data/lib/ramaze/template/tagz.rb +79 -0
data/lib/ramaze/template/tenjin.rb +34 -0
data/lib/ramaze/tool/create.rb +0 -3
data/lib/ramaze/tool/localize.rb +107 -105
data/lib/ramaze/tool/mime.rb +0 -2
data/lib/ramaze/trinity.rb +1 -26
data/lib/ramaze/version.rb +1 -1
data/lib/vendor/bacon.rb +47 -41
data/rake_tasks/conf.rake +18 -0
data/rake_tasks/darcs.rake +5 -0
data/rake_tasks/maintenance.rake +37 -24
data/rake_tasks/spec.rake +1 -1
data/spec/contrib/auto_params.rb +3 -1
data/spec/contrib/profiling.rb +26 -0
data/spec/examples/templates/template_redcloth.rb +1 -1
data/spec/examples/templates/template_tenjin.rb +28 -0
data/spec/helper.rb +0 -1
data/spec/ramaze/action/layout.rb +28 -0
data/spec/ramaze/controller/actionless_templates.rb +32 -0
data/spec/ramaze/controller/template/other_wrapper.xhtml +1 -0
data/spec/ramaze/controller/template_resolving.rb +37 -0
data/spec/ramaze/{trinity → current}/request.rb +12 -2
data/spec/ramaze/current/session.rb +97 -0
data/spec/ramaze/dispatcher/directory.rb +2 -1
data/spec/ramaze/dispatcher/file.rb +8 -3
data/spec/ramaze/dispatcher/public/file name.txt +1 -0
data/spec/ramaze/gestalt.rb +11 -0
data/spec/ramaze/helper/aspect.rb +28 -22
data/spec/ramaze/helper/cgi.rb +2 -2
data/spec/ramaze/helper/flash.rb +33 -15
data/spec/ramaze/helper/formatting.rb +2 -2
data/spec/ramaze/helper/link.rb +46 -18
data/spec/ramaze/helper/pager.rb +8 -5
data/spec/ramaze/helper/partial.rb +8 -1
data/spec/ramaze/helper/template/recursive_local_ivars.xhtml +7 -0
data/spec/ramaze/helper/user.rb +46 -0
data/spec/ramaze/{inform → log}/informer.rb +0 -0
data/spec/ramaze/{inform → log}/syslog.rb +1 -1
data/spec/ramaze/request.rb +14 -10
data/spec/ramaze/route.rb +23 -0
data/spec/ramaze/template.rb +48 -1
data/spec/ramaze/template/haml.rb +6 -16
data/spec/ramaze/template/haml/locals.haml +2 -1
data/spec/ramaze/template/tagz.rb +62 -0
data/spec/ramaze/template/tagz/external.tagz +8 -0
data/spec/ramaze/template/tagz/sum.tagz +1 -0
data/spec/ramaze/template/tenjin.rb +49 -0
data/spec/ramaze/template/tenjin/external.tenjin +1 -0
data/spec/snippets/string/unindent.rb +15 -0
metadata +509 -475
data/doc/README.html +0 -729
data/doc/changes.txt +0 -5757
data/doc/changes.xml +0 -5759
data/examples/blog/src/view.rb +0 -16
data/examples/blog/template/edit.xhtml +0 -19
data/examples/blog/template/index.xhtml +0 -19
data/examples/blog/template/new.xhtml +0 -18
data/examples/wiktacular/mkd/newpagename/current.mkd +0 -1
data/examples/wiktacular/mkd/newpagename/current.mkd.bak +0 -1
data/lib/ramaze/contrib/email.rb-darcs-backup0 +0 -81
data/lib/ramaze/template/bijou.rb +0 -39
data/lib/ramaze/trinity/response.rb +0 -32
data/spec/ramaze/template/bijou.rb +0 -25
data/spec/ramaze/trinity/session.rb +0 -29

data/spec/ramaze/action/layout.rb CHANGED

@@ -116,6 +116,28 @@ class TCLayoutInstanceVars < Ramaze::Controller
   end
 end
+class TCActionTwoLevelLayout < Ramaze::Controller
+  map '/twolevel'
+  layout :wrapper
+  layout :wrapper2 => [:foo]
+  def wrapper
+    "<pre>#@content</pre>"
+  end
+  def wrapper2
+    "<code>#@content</code>"
+  end
+  def index
+    'Hello, World!'
+  end
+  def foo
+    "bar"
+  end
+end
 describe 'Action rendering' do
   behaves_like 'http'
   ramaze
@@ -159,4 +181,10 @@ describe 'Action rendering' do
     get('/reuse').body.should == "<pre>hi</pre>"
     get('/reuse_instance').body.should == "hello: world"
   end
+  it 'should be able to override :all' do
+    get('/twolevel/index').body.should == '<pre>Hello, World!</pre>'
+    get('/twolevel/foo').body.should == '<code>bar</code>'
+  end
 end

data/spec/ramaze/controller/actionless_templates.rb ADDED

@@ -0,0 +1,32 @@
+#          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'
+class MainController < Ramaze::Controller
+  template :non_existant_method, :list
+end
+class TCActionOtherLayout < Ramaze::Controller
+  map '/other'
+  layout '/other_wrapper'
+  template_root __DIR__/:template
+  def index
+    "Others Hello"
+  end
+end
+describe "Testing Actionless Templates" do
+  behaves_like 'http'
+  ramaze :actionless_templates => false
+  it "should not find template file for non existant method" do
+    get('/non_existant_method').status.should == 404
+    get('/non_existant_method2').status.should == 404
+  end
+  it "should render layout(without method) for normal action" do
+    get('/other/index').body.should == '<p>Others Hello</p>'
+  end
+end

data/spec/ramaze/controller/template/other_wrapper.xhtml ADDED

	@@ -0,0 +1 @@
1	+ <p>#@content</p>

data/spec/ramaze/controller/template_resolving.rb CHANGED

@@ -43,6 +43,31 @@ class OtherController < MainController
 end
+class AnotherController < Ramaze::Controller
+  Root = File.expand_path(
+    MainController.template_root || Ramaze::Global.template_root
+  )
+  Absolute = lambda{|path| File.join Root, path}
+  Relative = lambda{|path| path}
+  def greet_absolute(type, message = "Message")
+    @greet = "#{type} : #{message}"
+  end
+  template :greet_absolute, :file => Absolute["greet.xhtml"]
+  def greet_relative(type, message = "Message")
+    @greet = "#{type} : #{message}"
+  end
+  template :greet_relative, :file => Relative["greet.xhtml"]
+  def greet_controller_action(type, message = "Message")
+    @greet = "#{type} : #{message}"
+  end
+  template :greet_controller_action, :controller => MainController, :action => "greet"
+end
 describe "Testing Template overriding" do
   behaves_like 'http'
   ramaze
@@ -75,4 +100,16 @@ describe "Testing Template overriding" do
   it "should use template overrides for non-existant actions" do
     get('/non_existant_method').body.should == '<html></html>'
   end
+  it "should allow template overrides to be specified by absolute path" do
+    get('/another/greet_absolute/asdf').body.should == '<html>asdf : Message</html>'
+  end
+  it "should allow template overrides to be specified by relative path" do
+    get('/another/greet_relative/asdf').body.should == '<html>asdf : Message</html>'
+  end
+  it "should allow template overrides to be specified by named controller and action" do
+    get('/another/greet_controller_action/asdf').body.should == '<html>asdf : Message</html>'
+  end
 end

data/spec/ramaze/{trinity → current}/request.rb RENAMED

@@ -5,16 +5,26 @@ describe 'Ramaze::Request' do
     Ramaze::Request.new(env)
   end
-  it 'should show request_uri' do
+  should 'provide #request_uri' do
     request('REQUEST_URI' => '/?a=b').request_uri.should == '/?a=b'
     request(  'PATH_INFO' => '/'    ).request_uri.should == '/'
   end
-  it 'should show local_net?' do
+  should 'provide #local_net?' do
     request.local_net?('192.168.0.1').to_s.should == '192.168.0.0'
     request.local_net?('252.168.0.1').should == nil
     request.local_net?('unknown').should == nil
     request('REMOTE_ADDR' => '211.3.129.47, 66.249.85.131').local_net?.should == nil
     request('REMOTE_ADDR' => '211.3.129.47').local_net?.should == nil
   end
+  should 'provide #subset' do
+    params = {'a' => 'b', 'c' => 'd', 'e' => 'f'}
+    env = { 'rack.request.form_hash' => params }
+    req = request(env)
+    req.params.should == params
+    req.subset(:a).should == {'a' => 'b'}
+    req.subset(:a, :c).should == {'a' => 'b', 'c' => 'd'}
+  end
 end

data/spec/ramaze/current/session.rb ADDED

@@ -0,0 +1,97 @@
+#          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'
+class TrinitySessionController < Ramaze::Controller
+  map :/
+  def index
+    "nothing"
+  end
+  def val
+    session.client[:val]
+  end
+  def set
+    session.client[:val] = 789
+  end
+  def del
+    session.client.delete(:val)
+  end
+end
+describe "Session" do
+  behaves_like 'http'
+  ramaze :sessions => false
+  it 'should work without sessions' do
+    class Ramaze::Session
+      remove_const :IP_COUNT_LIMIT
+      const_set(:IP_COUNT_LIMIT, 2)
+    end
+    (Ramaze::Session::IP_COUNT_LIMIT + 2).times do
+      r = get('/')
+      r.body.should == "nothing"
+      r.headers.should == {'Content-Type' => 'text/html'}
+    end
+  end
+end
+describe "Session cookie store" do
+  behaves_like 'http'
+  ramaze :sessions => true
+  Ramaze::Session::SESSION_KEY.replace('sess')
+  @secret = Ramaze::Session.trait[:secret] = 'abc'
+  # Marshal a session hash into safe cookie data. Include an integrity hash.
+  def marshal(session)
+    data = [ Marshal.dump(session) ].pack('m').chop
+    "#{data}--#{generate_digest(data)}"
+  end
+  # Unmarshal cookie data to a hash and verify its integrity.
+  def unmarshal(cookie)
+    if cookie
+      data, digest = cookie.split('--')
+      return {} unless digest == generate_digest(data)
+      Marshal.load(data.unpack('m').first)
+    end
+  end
+  # Generate the inline SHA512 message digest. Larger (128 bytes) than SHA256
+  # (64 bytes) or RMD160 (40 bytes), but small relative to the 4096 byte
+  # max cookie size.
+  def generate_digest(data)
+    Digest::SHA512.hexdigest "#{data}#{@secret}"
+  end
+  it 'should use session data from cookies' do
+    r = get('/val', :cookie => "sess-client="+marshal({ :val => 123 }))
+    r.body.should == '123'
+  end
+  it 'should use new values from session cookie' do
+    r = get('/val', :cookie => "sess-client="+marshal({ :val => 456 }))
+    r.body.should == '456'
+  end
+  it 'should set session values in the cookie' do
+    r = get('/set')
+    r.headers['Set-Cookie'].should == "sess-client=#{CGI.escape(marshal({:val => 789}))}; path=/"
+  end
+  it 'bad cookie should be ignored' do
+    r = get('/val', :cookie => marshal({ :val => 456 }) + 'wrong')
+    r.body.should.not == '456'
+  end
+  it 'should allow removing the last key/value pair' do
+    r = get('/del', :cookie => "sess-client="+marshal({ :val => 456 }))
+    r.body.should == '456'
+    r.headers['Set-Cookie'].should == "sess-client=#{CGI.escape(marshal({}))}; path=/"
+  end
+end

data/spec/ramaze/dispatcher/directory.rb CHANGED

@@ -36,7 +36,8 @@ describe 'Dispatcher::Directory' do
   it 'should dry serve root directory' do
    files = [
      ["/../", "Parent Directory"], ["/test", "test/"],
-     ["/favicon.ico", "favicon.ico"], ["/test_download.css", "test_download.css"]
+     ["/favicon.ico", "favicon.ico"], ["/file name.txt", "file name.txt"],
+     ["/test_download.css", "test_download.css"]
    ]
     check '/', 'Directory listing of /', files

data/spec/ramaze/dispatcher/file.rb CHANGED

@@ -22,10 +22,16 @@ describe 'Dispatcher::File' do
     get('/favicon.ico').body.should == original
   end
+  it 'should work on files with spaces' do
+    res = get('/file%20name.txt')
+    res.status.should == 200
+    res.body.should == 'hi'
+  end
   it 'should send ETag' do
     res = get '/test_download.css'
     res.headers['ETag'].should.not.be == nil
-    res.headers['ETag'].length.should == 34  # "32 hash"
+    res.headers['ETag'].length.should == 34  # "32 hash"
   end
   it 'should send Last-Modified' do
@@ -51,5 +57,4 @@ describe 'Dispatcher::File' do
     res.status.should == 304
     res.body.should == ''
   end
-end
+end

data/spec/ramaze/dispatcher/public/file name.txt ADDED

	@@ -0,0 +1 @@
1	+ hi

data/spec/ramaze/gestalt.rb CHANGED

@@ -117,4 +117,15 @@ describe "Gestalt" do
     input.should =~ /type="text"/
     input.should =~ /value="one"/
   end
+  it 'tags with prefix' do
+    gestalt{tag "prefix:local"}.should == '<prefix:local />'
+  end
+  it 'tags with a variety of characters' do
+    # with "-"
+    gestalt{tag "hello-world"}.should == '<hello-world />'
+    # with Hiragana
+    gestalt{tag "あいうえお"}.should == '<あいうえお />'
+  end
 end

data/spec/ramaze/helper/aspect.rb CHANGED

@@ -8,14 +8,14 @@ class TCAspectController < Ramaze::Controller
   trait :foo => :bar
   helper :aspect
-  def test_before() 'test before' end
-  before(:test_before){ '<aspect>' }
+  def test_before() request[:before] += 2 end
+  before(:test_before){ request[:before] = 40 }
-  def test_after() 'test after' end
-  after(:test_after){ '</aspect>' }
+  def test_after() request[:after] = 40 end
+  after(:test_after){ request[:after] += 2 }
-  def test_wrap() 'test wrap' end
-  wrap(:test_wrap){ '<br />' }
+  def test_wrap() end
+  wrap(:test_wrap){ request[:wrap] ||= 0; request[:wrap] += 21 }
   wrap(:test_template) { '<aspect>' }
 end
@@ -23,14 +23,14 @@ end
 class TCAspectAllController < Ramaze::Controller
   map '/all'
-  helper :aspect, :partial
+  helper :aspect
   template_root __DIR__/:template
   def test_all_first() 'first' end
   def test_all_second() 'second' end
-  before_all{ '<pre>' }
-  after_all{ '</pre>' }
+  before_all{ request[:all] = 40 }
+  after_all{ request[:all] += 2 }
   def test_all_after() 'after' end
@@ -42,45 +42,51 @@ 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
-    get('/test_before').body.should == '<aspect>test before'
+    get('/test_before')
+    request[:before].should == 42
   end
   it 'should use after' do
-    get('/test_after').body.should == 'test after</aspect>'
+    get('/test_after')
+    request[:after].should == 42
   end
   it 'should use wrap' do
-    get('/test_wrap').body.should == '<br />test wrap<br />'
-  end
-  it 'should wrap templates' do
-    get('/test_template').body.should == '<aspect>I am a template.<aspect>'
+    get('/test_wrap')
+    request[:wrap].should == 42
   end
   it 'should before_all and after_all' do
-    get('/all/test_all_first').body.should == '<pre>first</pre>'
-    get('/all/test_all_second').body.should == '<pre>second</pre>'
+    get('/all/test_all_first')
+    request[:all].should == 42
+    get('/all/test_all_second')
+    request[:all].should == 42
   end
   it 'should before_all and after_all for templates' do
-    get('/all/test_template').body.should == '<pre>I am a template.</pre>'
+    get('/all/test_template')
+    request[:all].should == 42
   end
   it 'should before_all and after_all for all defined actions' do
-    get('/all/test_all_after').body.should == '<pre>after</pre>'
+    get('/all/test_all_after')
+    request[:all].should == 42
   end
   it 'should not apply aspects to render_template' do
-    get('/all/loop').body.gsub(/\s/,'').should == '<pre>12345</pre>'
+    get('/all/loop').body.gsub(/\s/,'').should == '12345'
+    request[:all].should == 42
   end
   it 'should not apply aspects to layouts' do
-    get('/all/loop_with_layout').body.gsub(/\s/,'').should == '<div><pre>12345</pre></div>'
+    get('/all/loop_with_layout').body.gsub(/\s/,'').should == '<div>12345</div>'
+    request[:all].should == 42
   end
 end

data/spec/ramaze/helper/cgi.rb CHANGED

@@ -9,7 +9,7 @@ class TCLink < Ramaze::Controller
 end
 describe "url encode" do
-  extend Ramaze::CgiHelper
+  extend Ramaze::Helper::CGI
   it 'should url_encode strings' do
     # ok, I believe that the web is dumb for this
@@ -28,7 +28,7 @@ describe "url encode" do
 end
 describe 'html escape' do
-  extend Ramaze::CgiHelper
+  extend Ramaze::Helper::CGI
   it 'should escape html' do
     html_escape('& < >').should == '&amp; &lt; &gt;'

data/spec/ramaze/helper/flash.rb CHANGED

@@ -18,6 +18,17 @@ class TCFlashHelperFirstController < Ramaze::Controller
   def then_here
     flash[:first].to_s
   end
+  def set(*hash)
+    Hash[*hash].each do |key, value|
+      flash[key] = value
+    end
+    hash.inspect
+  end
+  def box
+    flashbox
+  end
 end
 class TCFlashHelperSecondController < Ramaze::Controller
@@ -57,46 +68,53 @@ class TCFlashHelperThirdController < Ramaze::Controller
   end
 end
-describe "FlashHelper" do
+describe Ramaze::Helper::Flash do
   behaves_like 'browser'
   ramaze :adapter => :webrick
-  it "twice" do
+  should "set and forget flash twice" do
     Browser.new('/') do
       get('/first_here')
       get('/then_here').should == 'hey'
-      get('/then_here').should == ''
-      get('/then_here').should == ''
+      2.times{ get('/then_here').should.be.empty }
       get('/first_here')
       get('/then_here').should == 'hey'
-      get('/then_here').should == ''
+      get('/then_here').should.be.empty
     end
   end
-  it "over seperate controllers" do
+  should "work over multiple controllers" do
     Browser.new do
       get('/first_here')
       get('/second/then_here').should == 'hey'
-      get('/then_here').should == ''
-      get('/second/then_here').should == ''
+      get('/then_here').should.be.empty
+      get('/second/then_here').should.be.empty
       get('/second/first_here')
       get('/then_here').should == 'hey'
-      get('/second/then_here').should == ''
+      get('/second/then_here').should.be.empty
     end
   end
-  it "single" do
+  should "set and retrieve custom value" do
     Browser.new do
       get('/third/set/foo').should == 'foo'
+      get('/third/retrieve').should == 'foo'
+      2.times{ get('/third/retrieve').should.be.empty }
     end
   end
-  it "single" do
+  should "show a flashbox" do
     Browser.new do
-      get('/third/set/foo').should == 'foo'
-      get('/third/retrieve').should == 'foo'
-      get('/third/retrieve').should == ''
-      get('/third/retrieve').should == ''
+      error_div = "<div class='flash' id='flash_error'>stuff failed</div>"
+      success_div = "<div class='flash' id='flash_success'>other things worked</div>"
+      get('/set/error/stuff%20failed')
+      get('/box').should == error_div
+      get('/set/error/stuff%20failed/success/other%20things%20worked')
+      get('/box').should == [error_div, success_div].join("\n")
+      get('/box').should.be.empty
     end
   end
 end