RubyGems - ramaze - Versions diffs - 0.2.1 → 0.3.0 - Mend

ramaze 0.2.1 → 0.3.0

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 (304) hide show

data/Rakefile +20 -3
data/bin/ramaze +1 -4
data/doc/AUTHORS +2 -1
data/doc/CHANGELOG +539 -32
data/doc/LEGAL +4 -0
data/doc/meta/announcement.txt +79 -47
data/examples/blog/README +2 -2
data/examples/blog/spec/blog.rb +33 -48
data/examples/blog/src/controller.rb +15 -13
data/examples/blog/src/model.rb +28 -10
data/examples/blog/start.rb +0 -10
data/examples/blog/template/edit.xhtml +1 -1
data/examples/blog/template/index.xhtml +2 -2
data/examples/facebook.rb +152 -0
data/examples/linking.rb +28 -0
data/examples/ramaise.rb +4 -11
data/examples/rammit/spec/rammit.rb +30 -0
data/examples/rammit/src/controller/main.rb +3 -0
data/examples/rammit/src/controller/page.rb +16 -0
data/examples/rammit/src/model.rb +33 -0
data/examples/rammit/start.rb +7 -0
data/examples/rammit/template/index.xhtml +14 -0
data/examples/rammit/template/page/view.xhtml +4 -0
data/examples/rapaste/Rakefile +28 -0
data/examples/rapaste/public/css/active4d.css +114 -0
data/examples/rapaste/public/css/all_hallows_eve.css +72 -0
data/examples/rapaste/public/css/amy.css +147 -0
data/examples/rapaste/public/css/blackboard.css +88 -0
data/examples/rapaste/public/css/brilliance_black.css +605 -0
data/examples/rapaste/public/css/brilliance_dull.css +599 -0
data/examples/rapaste/public/css/cobalt.css +149 -0
data/examples/rapaste/public/css/dawn.css +121 -0
data/examples/rapaste/public/css/display.css +179 -0
data/examples/rapaste/public/css/eiffel.css +121 -0
data/examples/rapaste/public/css/espresso_libre.css +109 -0
data/examples/rapaste/public/css/idle.css +62 -0
data/examples/rapaste/public/css/iplastic.css +80 -0
data/examples/rapaste/public/css/lazy.css +73 -0
data/examples/rapaste/public/css/mac_classic.css +123 -0
data/examples/rapaste/public/css/magicwb_amiga.css +104 -0
data/examples/rapaste/public/css/pastels_on_dark.css +188 -0
data/examples/rapaste/public/css/slush_poppies.css +85 -0
data/examples/rapaste/public/css/spacecadet.css +51 -0
data/examples/rapaste/public/css/sunburst.css +180 -0
data/examples/rapaste/public/css/twilight.css +137 -0
data/examples/rapaste/public/css/zenburnesque.css +91 -0
data/examples/rapaste/public/js/jquery.js +11 -0
data/examples/rapaste/rapaste.sqlite +0 -0
data/examples/rapaste/spec/rapaste.rb +49 -0
data/examples/rapaste/src/controller.rb +69 -0
data/examples/rapaste/src/model.rb +61 -0
data/examples/rapaste/start.rb +20 -0
data/examples/rapaste/template/copy.xhtml +10 -0
data/examples/rapaste/template/index.xhtml +9 -0
data/examples/rapaste/template/layout.xhtml +22 -0
data/examples/rapaste/template/list.xhtml +28 -0
data/examples/rapaste/template/view.xhtml +37 -0
data/examples/sourceview/sourceview.rb +3 -3
data/examples/templates/template_amrita2.rb +1 -3
data/examples/todolist/spec/todolist.rb +15 -18
data/examples/whywiki/spec/whywiki.rb +15 -20
data/examples/whywiki/start.rb +0 -1
data/examples/wikore/spec/wikore.rb +14 -19
data/examples/wiktacular/spec/wiktacular.rb +8 -15
data/lib/proto/{src/controller → controller}/main.rb +4 -4
data/lib/proto/public/css/ramaze_error.css +39 -3
data/lib/proto/public/js/jquery.js +2039 -1020
data/lib/proto/spec/main.rb +27 -0
data/lib/proto/start.rb +5 -5
data/lib/proto/view/error.xhtml +62 -0
data/lib/proto/view/index.xhtml +34 -0
data/lib/proto/view/page.xhtml +15 -0
data/lib/ramaze.rb +9 -7
data/lib/ramaze/action.rb +7 -3
data/lib/ramaze/action/render.rb +15 -5
data/lib/ramaze/adapter.rb +5 -5
data/lib/ramaze/adapter/base.rb +2 -2
data/lib/ramaze/adapter/cgi.rb +1 -1
data/lib/ramaze/adapter/evented_mongrel.rb +1 -1
data/lib/ramaze/adapter/fcgi.rb +2 -2
data/lib/ramaze/adapter/mongrel.rb +1 -1
data/lib/ramaze/adapter/swiftiplied_mongrel.rb +1 -1
data/lib/ramaze/adapter/thin.rb +25 -0
data/lib/ramaze/adapter/webrick.rb +1 -1
data/lib/ramaze/cache.rb +3 -2
data/lib/ramaze/cache/memcached.rb +1 -1
data/lib/ramaze/cache/memory.rb +1 -1
data/lib/ramaze/cache/yaml_store.rb +1 -1
data/lib/ramaze/contrib.rb +1 -1
data/lib/ramaze/contrib/auto_params.rb +12 -5
data/lib/ramaze/contrib/auto_params/get_args.rb +1 -0
data/lib/ramaze/contrib/facebook.rb +23 -0
data/lib/ramaze/contrib/facebook/facebook.rb +168 -0
data/lib/ramaze/contrib/gettext.rb +111 -0
data/lib/ramaze/contrib/gettext/mo.rb +155 -0
data/lib/ramaze/contrib/gettext/po.rb +109 -0
data/lib/ramaze/contrib/gzip_filter.rb +1 -1
data/lib/ramaze/contrib/route.rb +15 -5
data/lib/ramaze/contrib/sequel/fill.rb +1 -1
data/lib/ramaze/controller.rb +10 -4
data/lib/ramaze/controller/error.rb +5 -13
data/lib/ramaze/controller/main.rb +2 -0
data/lib/ramaze/controller/resolve.rb +18 -10
data/lib/ramaze/dispatcher.rb +1 -1
data/lib/ramaze/dispatcher/action.rb +1 -1
data/lib/ramaze/dispatcher/directory.rb +3 -2
data/lib/ramaze/dispatcher/error.rb +5 -5
data/lib/ramaze/dispatcher/file.rb +13 -2
data/lib/ramaze/error.rb +1 -1
data/lib/ramaze/gestalt.rb +2 -2
data/lib/ramaze/global.rb +5 -5
data/lib/ramaze/global/dsl.rb +1 -1
data/lib/ramaze/global/globalstruct.rb +11 -5
data/lib/ramaze/helper.rb +1 -1
data/lib/ramaze/helper/aspect.rb +1 -1
data/lib/ramaze/helper/auth.rb +2 -2
data/lib/ramaze/helper/cache.rb +1 -1
data/lib/ramaze/helper/cgi.rb +1 -1
data/lib/ramaze/helper/file.rb +1 -1
data/lib/ramaze/helper/flash.rb +1 -1
data/lib/ramaze/helper/formatting.rb +1 -1
data/lib/ramaze/helper/identity.rb +1 -1
data/lib/ramaze/helper/inform.rb +1 -1
data/lib/ramaze/helper/link.rb +4 -4
data/lib/ramaze/helper/markaby.rb +1 -1
data/lib/ramaze/helper/nitroform.rb +1 -1
data/lib/ramaze/helper/pager.rb +2 -1
data/lib/ramaze/helper/partial.rb +1 -1
data/lib/ramaze/helper/redirect.rb +6 -1
data/lib/ramaze/helper/sequel.rb +54 -0
data/lib/ramaze/helper/stack.rb +1 -1
data/lib/ramaze/inform.rb +1 -1
data/lib/ramaze/inform/analogger.rb +1 -1
data/lib/ramaze/inform/growl.rb +1 -1
data/lib/ramaze/inform/hub.rb +1 -1
data/lib/ramaze/inform/informer.rb +1 -1
data/lib/ramaze/inform/informing.rb +2 -2
data/lib/ramaze/inform/knotify.rb +1 -1
data/lib/ramaze/inform/syslog.rb +1 -1
data/lib/ramaze/inform/xosd.rb +1 -1
data/lib/ramaze/snippets.rb +1 -1
data/lib/ramaze/snippets/array/put_within.rb +1 -1
data/lib/ramaze/snippets/blankslate.rb +7 -0
data/lib/ramaze/snippets/dictionary.rb +6 -1
data/lib/ramaze/snippets/divide.rb +1 -1
data/lib/ramaze/snippets/kernel/__dir__.rb +1 -1
data/lib/ramaze/snippets/kernel/acquire.rb +39 -0
data/lib/ramaze/snippets/kernel/aquire.rb +1 -34
data/lib/ramaze/snippets/kernel/constant.rb +1 -1
data/lib/ramaze/snippets/kernel/pretty_inspect.rb +1 -1
data/lib/ramaze/snippets/numeric/filesize_format.rb +1 -1
data/lib/ramaze/snippets/object/traits.rb +1 -1
data/lib/ramaze/snippets/ordered_set.rb +12 -7
data/lib/ramaze/snippets/ramaze/caller_info.rb +1 -1
data/lib/ramaze/snippets/ramaze/caller_lines.rb +1 -1
data/lib/ramaze/snippets/string/camel_case.rb +1 -1
data/lib/ramaze/snippets/string/color.rb +2 -4
data/lib/ramaze/snippets/string/each.rb +1 -1
data/lib/ramaze/snippets/string/ord.rb +15 -0
data/lib/ramaze/snippets/string/snake_case.rb +1 -1
data/lib/ramaze/snippets/struct/fill.rb +4 -2
data/lib/ramaze/snippets/struct/values_at.rb +2 -2
data/lib/ramaze/snippets/symbol/to_proc.rb +15 -8
data/lib/ramaze/snippets/thread/into.rb +1 -1
data/lib/ramaze/sourcereload.rb +4 -3
data/lib/ramaze/spec/helper.rb +85 -32
data/lib/ramaze/spec/helper/bacon.rb +7 -0
data/lib/ramaze/spec/helper/browser.rb +1 -2
data/lib/ramaze/spec/helper/mock_http.rb +1 -1
data/lib/ramaze/spec/helper/pretty_output.rb +70 -0
data/lib/ramaze/spec/helper/requester.rb +1 -1
data/lib/ramaze/spec/helper/simple_http.rb +5 -4
data/lib/ramaze/spec/helper/snippets.rb +6 -0
data/lib/ramaze/store/default.rb +1 -1
data/lib/ramaze/template.rb +1 -1
data/lib/ramaze/template/amrita2.rb +6 -5
data/lib/ramaze/template/erubis.rb +1 -1
data/lib/ramaze/template/ezamar.rb +1 -1
data/lib/ramaze/template/ezamar/element.rb +1 -1
data/lib/ramaze/template/ezamar/engine.rb +1 -1
data/lib/ramaze/template/ezamar/morpher.rb +1 -1
data/lib/ramaze/template/ezamar/render_partial.rb +1 -1
data/lib/ramaze/template/haml.rb +1 -1
data/lib/ramaze/template/liquid.rb +1 -1
data/lib/ramaze/template/markaby.rb +1 -1
data/lib/ramaze/template/nagoro.rb +4 -6
data/lib/ramaze/template/none.rb +1 -1
data/lib/ramaze/template/remarkably.rb +1 -1
data/lib/ramaze/template/sass.rb +1 -1
data/lib/ramaze/tool.rb +1 -1
data/lib/ramaze/tool/create.rb +7 -1
data/lib/ramaze/tool/localize.rb +7 -14
data/lib/ramaze/tool/mime.rb +1 -1
data/lib/ramaze/tool/record.rb +1 -1
data/lib/ramaze/trinity.rb +1 -1
data/lib/ramaze/trinity/request.rb +4 -2
data/lib/ramaze/trinity/response.rb +1 -1
data/lib/ramaze/trinity/session.rb +7 -1
data/lib/ramaze/version.rb +3 -3
data/lib/vendor/bacon.rb +317 -0
data/rake_tasks/conf.rake +1 -1
data/rake_tasks/maintenance.rake +7 -5
data/rake_tasks/spec.rake +54 -40
data/spec/contrib/auto_params.rb +21 -4
data/spec/contrib/route.rb +31 -4
data/spec/contrib/sequel/fill.rb +3 -4
data/spec/examples/caching.rb +5 -2
data/spec/examples/css.rb +5 -2
data/spec/examples/element.rb +5 -4
data/spec/examples/hello.rb +1 -0
data/spec/examples/linking.rb +18 -0
data/spec/examples/simple.rb +13 -18
data/spec/examples/templates/template_amrita2.rb +3 -2
data/spec/examples/templates/template_erubis.rb +3 -2
data/spec/examples/templates/template_ezamar.rb +2 -1
data/spec/examples/templates/template_haml.rb +3 -2
data/spec/examples/templates/template_liquid.rb +3 -2
data/spec/examples/templates/template_markaby.rb +3 -2
data/spec/examples/templates/template_remarkably.rb +3 -2
data/spec/ramaze/action/basics.rb +4 -4
data/spec/ramaze/action/cache.rb +11 -13
data/spec/ramaze/action/layout.rb +47 -3
data/spec/ramaze/action/render.rb +3 -3
data/spec/ramaze/action/template/instancevars/layout.xhtml +1 -0
data/spec/ramaze/adapter.rb +7 -7
data/spec/ramaze/adapter/mongrel.rb +1 -1
data/spec/ramaze/adapter/record.rb +7 -7
data/spec/ramaze/adapter/webrick.rb +1 -1
data/spec/ramaze/cache.rb +6 -8
data/spec/ramaze/controller.rb +77 -65
data/spec/ramaze/controller/resolve.rb +2 -1
data/spec/ramaze/controller/template_resolving.rb +3 -4
data/spec/ramaze/dispatcher.rb +3 -4
data/spec/ramaze/dispatcher/directory.rb +35 -35
data/spec/ramaze/dispatcher/file.rb +8 -5
data/spec/ramaze/element.rb +4 -4
data/spec/ramaze/error.rb +13 -11
data/spec/ramaze/gestalt.rb +1 -1
data/spec/ramaze/helper/aspect.rb +2 -1
data/spec/ramaze/helper/auth.rb +4 -2
data/spec/ramaze/helper/cache.rb +10 -9
data/spec/ramaze/helper/cgi.rb +2 -2
data/spec/ramaze/helper/file.rb +1 -0
data/spec/ramaze/helper/flash.rb +5 -4
data/spec/ramaze/helper/formatting.rb +1 -1
data/spec/ramaze/helper/link.rb +3 -3
data/spec/ramaze/helper/pager.rb +44 -80
data/spec/ramaze/helper/partial.rb +2 -3
data/spec/ramaze/helper/redirect.rb +10 -1
data/spec/ramaze/helper/stack.rb +4 -3
data/spec/ramaze/helper/template/loop.xhtml +2 -1
data/spec/ramaze/inform/informer.rb +2 -2
data/spec/ramaze/inform/syslog.rb +1 -1
data/spec/ramaze/localize.rb +26 -26
data/spec/ramaze/morpher.rb +6 -7
data/spec/ramaze/params.rb +7 -8
data/spec/ramaze/request.rb +27 -6
data/spec/ramaze/request/mongrel.rb +1 -1
data/spec/ramaze/request/thin.rb +9 -0
data/spec/ramaze/session.rb +2 -1
data/spec/ramaze/store/default.rb +14 -17
data/spec/ramaze/template.rb +5 -7
data/spec/ramaze/template/amrita2.rb +4 -1
data/spec/ramaze/template/erubis.rb +2 -1
data/spec/ramaze/template/ezamar.rb +2 -3
data/spec/ramaze/template/ezamar/other__index.xhtml +1 -0
data/spec/ramaze/template/haml.rb +2 -1
data/spec/ramaze/template/liquid.rb +4 -2
data/spec/ramaze/template/markaby.rb +4 -2
data/spec/ramaze/template/nagoro.rb +3 -4
data/spec/ramaze/template/remarkably.rb +4 -2
data/spec/ramaze/template/sass.rb +3 -2
data/spec/ramaze/template/xslt.rb +4 -7
data/spec/ramaze/trinity/request.rb +4 -3
data/spec/ramaze/trinity/session.rb +6 -4
data/spec/snippets/array/put_within.rb +3 -2
data/spec/snippets/divide.rb +1 -4
data/spec/snippets/kernel/__dir__.rb +1 -1
data/spec/snippets/kernel/acquire.rb +71 -0
data/spec/snippets/kernel/constant.rb +4 -8
data/spec/snippets/numeric/filesize_format.rb +1 -1
data/spec/snippets/ordered_set.rb +9 -2
data/spec/snippets/ramaze/caller_info.rb +3 -3
data/spec/snippets/ramaze/caller_lines.rb +3 -3
data/spec/snippets/string/camel_case.rb +1 -1
data/spec/snippets/string/color.rb +2 -2
data/spec/snippets/string/snake_case.rb +5 -1
data/spec/snippets/string/unindent.rb +1 -1
data/spec/snippets/struct/fill.rb +14 -15
data/spec/snippets/struct/values_at.rb +15 -10
data/spec/snippets/symbol/to_proc.rb +13 -0
data/spec/snippets/thread/into.rb +3 -4
metadata +458 -386
data/doc/README.html +0 -729
data/doc/changes.txt +0 -5044
data/doc/changes.xml +0 -5046
data/lib/proto/public/error.zmr +0 -61
data/lib/proto/src/element/page.rb +0 -17
data/lib/proto/src/model.rb +0 -6
data/lib/proto/template/index.xhtml +0 -15
data/lib/ramaze/spec/helper/layout.rb +0 -58
data/lib/ramaze/spec/helper/minimal.rb +0 -23
data/lib/ramaze/spec/helper/wrap.rb +0 -198
data/spec/snippets/kernel/aquire.rb +0 -71

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

@@ -14,6 +14,7 @@ class MainController < Ramaze::Controller
 end
 describe 'Controller resolving' do
+  behaves_like 'http'
   ramaze
   it 'should work with .' do
@@ -28,4 +29,4 @@ describe 'Controller resolving' do
   it 'should find templates' do
     get('/other/greet/other').body.should == '<html>Other: hi</html>'
   end
-end
+end

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

@@ -44,9 +44,8 @@ class OtherController < MainController
 end
 describe "Testing Template overriding" do
-  before(:all) do
-    ramaze
-  end
+  behaves_like 'http'
+  ramaze
   it "simple request to greet" do
     get('/greet/asdf').body.should == '<html>asdf : Message</html>'
@@ -76,4 +75,4 @@ describe "Testing Template overriding" do
   it "should use template overrides for non-existant actions" do
     get('/non_existant_method').body.should == '<html></html>'
   end
-end
+end

data/spec/ramaze/dispatcher.rb CHANGED

@@ -12,10 +12,9 @@ class TCDispatcherController < Ramaze::Controller
 end
 describe "Dispatcher" do
-  before :all do
-    ramaze :ignore => ['/favicon.ico', '/robots.txt'],
-      :ignore_body => 'File not found'
-  end
+  behaves_like 'http'
+  ramaze :ignore => ['/favicon.ico', '/robots.txt'],
+    :ignore_body => 'File not found'
   it 'should resolve a normal request' do
     page = get('/')

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

@@ -1,54 +1,54 @@
 require 'spec/helper'
-testcase_requires 'hpricot'
+spec_require 'hpricot'
 describe 'Dispatcher::Directory' do
-  before :all do
-    ramaze
-    @hierarchy = %w[
-    /test/deep/hierarchy/one.txt
-    /test/deep/hierarchy/two.txt
-    /test/deep/three.txt
-    /test/deep/four.txt
-    /test/five.txt
-    /test/six.txt ]
-    @hierarchy.each do |path|
-      FileUtils.mkdir_p(__DIR__/:public/File.dirname(path))
-      FileUtils.touch(__DIR__/:public/path)
-    end
+  @hierarchy = %w[
+  /test/deep/hierarchy/one.txt
+  /test/deep/hierarchy/two.txt
+  /test/deep/three.txt
+  /test/deep/four.txt
+  /test/five.txt
+  /test/six.txt ]
+  @hierarchy.each do |path|
+    FileUtils.mkdir_p(__DIR__/:public/File.dirname(path))
+    FileUtils.touch(__DIR__/:public/path)
   end
   def build_listing(path)
     Ramaze::Dispatcher::Directory.build_listing(path)
   end
-  it 'should dry serve root directory' do
-    body, status, header = build_listing('/')
+  def check(url, title, list)
+    body, status, header = build_listing(url)
     status.should == 200
     header['Content-Type'].should == 'text/html'
     doc = Hpricot(body)
-    doc.at(:title).inner_text.should == 'Directory listing of /'
-    files = doc.search("//td[@class='n']")
-    links = files.map{|td| a = td.at(:a); [a['href'], a.inner_text]}
-    links.should == [["/../", "Parent Directory"], ["/test", "test/"],
-      ["/favicon.ico", "favicon.ico"], ["/test_download.css", "test_download.css"]]
+    doc.at(:title).inner_text.should == title
+    doc.search("//td[@class='n']").map{|td|
+      a = td.at(:a)
+      [ a[:href], a.inner_text ]
+    }.should == list
   end
-  it 'should serve hierarchies' do
-    body, status, header = build_listing('/test')
-    status.should == 200
-    header['Content-Type'].should == 'text/html'
-    doc = Hpricot(body)
-    doc.at(:title).inner_text.should == 'Directory listing of /test'
-    files = doc.search("//td[@class='n']")
-    links = files.map{|td| a = td.at(:a); [a['href'], a.inner_text]}
-    links.should == [["/test/../", "Parent Directory"], ["/test/deep", "deep/"],
-      ["/test/five.txt", "five.txt"], ["/test/six.txt", "six.txt"]]
+  it 'should dry serve root directory' do
+   files = [
+     ["/../", "Parent Directory"], ["/test", "test/"],
+     ["/favicon.ico", "favicon.ico"], ["/test_download.css", "test_download.css"]
+   ]
+    check '/', 'Directory listing of /', files
   end
-  after :all do
-    FileUtils.rm_rf(__DIR__/:public/:test)
+  it 'should serve hierarchies' do
+    files = [
+      ["/test/../", "Parent Directory"], ["/test/deep", "deep/"],
+      ["/test/five.txt", "five.txt"], ["/test/six.txt", "six.txt"]
+    ]
+    check '/test', 'Directory listing of /test', files
   end
+  FileUtils.rm_rf(__DIR__/:public/:test)
 end

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

@@ -1,10 +1,9 @@
 require 'spec/helper'
 describe 'Dispatcher::File' do
-  before :all do
-    ramaze
-    @public_root = Ramaze::Global.public_root = 'spec/ramaze/dispatcher/public'
-  end
+  behaves_like 'http'
+  @public_root = 'spec/ramaze/dispatcher/public'
+  ramaze :public_root => @public_root
   it 'should serve from Global.public_root' do
     css = File.read(@public_root/'test_download.css')
@@ -15,7 +14,11 @@ describe 'Dispatcher::File' do
   it 'should give priority to Global.public_root' do
     file = (@public_root/'favicon.ico')
-    original = File.read(file)
+    if RUBY_VERSION >= '1.9.0'
+      original = File.open(file, 'r:ASCII'){|f| f.read}
+    else
+      original = File.read(file)
+    end
     get('/favicon.ico').body.should == original
   end
 end

data/spec/ramaze/element.rb CHANGED

@@ -46,8 +46,8 @@ end
 class PageWithParams < Ezamar::Element
   def render
-    ivs = (instance_variables - ['@content'])
-    ivs.inject({}){|s,v| s.merge(v => instance_variable_get(v)) }.inspect
+    ivs = (instance_variables - ['@content', :@content])
+    ivs.inject({}){|s,v| s.merge(v.to_s => instance_variable_get(v)) }.inspect
   end
 end
@@ -59,8 +59,8 @@ end
 class PageLittleWithParams < Ezamar::Element
   def render
-    ivs = (instance_variables - ['@content'])
-    ivs.inject({}){|s,v| s.merge(v => instance_variable_get(v)) }.inspect
+    ivs = (instance_variables - ['@content', :@content])
+    ivs.inject({}){|s,v| s.merge(v.to_s => instance_variable_get(v)) }.inspect
   end
 end

data/spec/ramaze/error.rb CHANGED

@@ -29,16 +29,18 @@ class TCErrorCustomController < Ramaze::Controller
 end
 describe "Error" do
-  ramaze :error_page => true, :public_root => 'spec/ramaze/public'
+  behaves_like 'http'
+  ramaze :error_page => true,
+         :template_root => 'spec/ramaze/public'
-  before :all do
-    require 'ramaze/dispatcher/error'
-    @handle_error = Ramaze::Dispatcher::Error::HANDLE_ERROR
-  end
+  @handle_error = Ramaze::Dispatcher::Error::HANDLE_ERROR
+  @orig_handle_error = @handle_error.dup
-  before :each do
+  before do
     Ramaze::Cache.resolved.clear
     Ramaze::Cache.patterns.clear
+    @handle_error.clear
+    @handle_error.merge!(@orig_handle_error)
   end
   it 'should resolve custom error pages per controller' do
@@ -67,8 +69,7 @@ describe "Error" do
   end
   it "should give custom status when no action is found" do
-    @handle_error.should_receive(:[]).twice.
-      with(Ramaze::Error::NoAction).and_return{ [707, '/error'] }
+    @handle_error[Ramaze::Error::NoAction] = [707, '/error']
     response = get('/illegal1')
     response.status.should == 707
@@ -76,15 +77,16 @@ describe "Error" do
   end
   it "should give 404 when no controller is found" do
-    Ramaze::Global.should_receive(:mapping).exactly(6).times.and_return{ {} }
+    old_mapping = Ramaze::Global.mapping.dup
+    Ramaze::Global.mapping.clear
     response = get('/illegal2')
     response.status.should == 404
     response.body.should =~ %r(No Controller found for `/error')
+    Ramaze::Global.mapping = old_mapping
   end
   it "should return custom error page" do
-    @handle_error.should_receive(:[]).twice.
-      with(Ramaze::Error::NoAction).and_return{ [404, '/error404'] }
+    @handle_error[Ramaze::Error::NoAction] = [404, '/error404']
     response = get('/illegal3')
     response.status.should == 404
     response.body.should == '404 - not found'

data/spec/ramaze/gestalt.rb CHANGED

@@ -3,7 +3,7 @@
 require 'spec/helper'
-testcase_requires 'ramaze/gestalt'
+spec_require 'ramaze/gestalt'
 describe "Gestalt" do
   # This is useful for any controller using Gestalt,

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

@@ -40,7 +40,8 @@ class TCAspectAllController < Ramaze::Controller
 end
 describe "AspectHelper" do
-  ramaze(:error_page => false)
+  behaves_like 'http'
+  ramaze :error_page => false
   it "shouldn't overwrite traits on inclusion" do
     TCAspectController.trait[:foo].should == :bar

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

@@ -45,14 +45,16 @@ class TCAuthLambdaHelperController < TCAuthHelperController
 end
 describe "StackHelper" do
+  behaves_like 'browser'
   ramaze :adapter => :webrick
   [ TCAuthHashHelperController,
     TCAuthMethodHelperController,
     TCAuthLambdaHelperController
   ].each do |controller|
-    specify controller.to_s do
-      browser('/', Ramaze::Global.mapping.invert[controller]) do
+    it controller.to_s do
+      Browser.new('/', Ramaze::Global.mapping.invert[controller]) do
         get('/secured').should == ''
         post('/login', 'username' => 'manveru', 'password' => 'password')
         get('/secured').should == 'Secret content'

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

@@ -87,6 +87,7 @@ class TCCacheHelperOldController < Ramaze::Controller
 end
 describe "CacheHelper" do
+  behaves_like 'http'
   ramaze
   def req(path='/', *args) get(path, *args).body end
@@ -97,23 +98,23 @@ describe "CacheHelper" do
   it "cached value" do
     3.times do
-      lambda{ req('/cached_value') }.should_not change{ req('/cached_value') }
+      lambda{ req('/cached_value') }.should.not.change{ req('/cached_value') }
     end
     3.times do
-      lambda{ req('/uncache_values') }.should change{ req('/cached_value') }
+      lambda{ req('/uncache_values') }.should.change{ req('/cached_value') }
     end
-    lambda{ req('/uncache_values') }.should change{ req('/alt_cached_value') }
+    lambda{ req('/uncache_values') }.should.change{ req('/alt_cached_value') }
   end
   it "cached action" do
     3.times do
-      lambda{ req('/cached_action') }.should_not change{ req('/cached_action') }
+      lambda{ req('/cached_action') }.should.not.change{ req('/cached_action') }
     end
     3.times do
-      lambda{ req('/uncache_actions') }.should change{ req('/cached_action') }
+      lambda{ req('/uncache_actions') }.should.change{ req('/cached_action') }
     end
   end
@@ -126,17 +127,17 @@ describe "CacheHelper" do
     orig_value = req('/ttl')
     req('/ttl').should == orig_value
     sleep 1
-    req('/ttl').should_not == orig_value
+    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') }
+    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/two/three') }.should_not change{ req('/old/action/one/two') }
+    lambda{ req('/old') }.should.not.change{ req('/old') }
+    lambda{ req('/old/action/two/three') }.should.not.change{ req('/old/action/one/two') }
     req('/old/action/two/three').should =~ /^twothree/
   end
 end

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

@@ -9,7 +9,7 @@ class TCLink < Ramaze::Controller
 end
 describe "url encode" do
-  include Ramaze::CgiHelper
+  extend Ramaze::CgiHelper
   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
-  include Ramaze::CgiHelper
+  extend Ramaze::CgiHelper
   it 'should escape html' do
     html_escape('& < >').should == '&amp; &lt; &gt;'

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

@@ -9,6 +9,7 @@ class TCFileHelper < Ramaze::Controller
 end
 describe 'FileHelper' do
+  behaves_like 'http'
   ramaze
   it 'serving a file' do

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

@@ -58,10 +58,11 @@ class TCFlashHelperThirdController < Ramaze::Controller
 end
 describe "FlashHelper" do
+  behaves_like 'browser'
   ramaze :adapter => :webrick
   it "twice" do
-    browser '/' do
+    Browser.new('/') do
       get('/first_here')
       get('/then_here').should == 'hey'
       get('/then_here').should == ''
@@ -73,7 +74,7 @@ describe "FlashHelper" do
   end
   it "over seperate controllers" do
-    browser do
+    Browser.new do
       get('/first_here')
       get('/second/then_here').should == 'hey'
       get('/then_here').should == ''
@@ -85,13 +86,13 @@ describe "FlashHelper" do
   end
   it "single" do
-    browser do
+    Browser.new do
       get('/third/set/foo').should == 'foo'
     end
   end
   it "single" do
-    browser do
+    Browser.new do
       get('/third/set/foo').should == 'foo'
       get('/third/retrieve').should == 'foo'
       get('/third/retrieve').should == ''

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

@@ -2,7 +2,7 @@ require 'spec/helper'
 require 'ramaze/helper/formatting'
 describe 'FormattingHelper' do
-  include Ramaze::FormattingHelper
+  extend Ramaze::FormattingHelper
   it 'should format numbers' do
     number_format(2_123_456).should == '2,123,456'

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

@@ -9,7 +9,7 @@ class TCLink < Ramaze::Controller
 end
 describe "A" do
-  include Ramaze::LinkHelper
+  extend Ramaze::LinkHelper
   it 'should build links' do
     A('title', :href => '/').should == %(<a href="/">title</a>)
@@ -24,7 +24,7 @@ describe "A" do
 end
 describe 'R' do
-  include Ramaze::LinkHelper
+  extend Ramaze::LinkHelper
   it 'should build urls' do
     R(TCLink).should == '/'
@@ -35,7 +35,7 @@ describe 'R' do
 end
 describe 'breadcrumbs' do
-  include Ramaze::LinkHelper
+  extend Ramaze::LinkHelper
   it 'should lay out breadcrumbs' do
     breadcrumbs('/file/dir/listing/is/cool').

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

@@ -3,7 +3,18 @@
 require 'spec/helper'
-testcase_requires 'hpricot'
+spec_require 'hpricot'
+module Og
+  class Mock
+    def initialize(*a); @a = a; end
+    def all(o) @a[(o[:offset]||0),o[:limit]] end
+    def count(*a) @a.size end
+    alias reload all
+  end
+  module Mixin; end
+  module Collection; end
+end
 class TCPagerController < Ramaze::Controller
   map '/'
@@ -19,114 +30,67 @@ class TCPagerController < Ramaze::Controller
 end
-describe "PagerHelper" do
-  include Ramaze::PagerHelper
+ramaze
-  before(:all){ ramaze }
+shared 'pager' do
+  behaves_like 'http'
+  extend Ramaze::PagerHelper
-  # Used internally in Pager to get parameters like: ?_page=1
+  def pager_key
+    Ramaze::Pager.trait[:key]
+  end
+  # Used internally in Pager to get parameters like: ?_page=1
   def request
-    req = mock("Request")
-    req.should_receive(:params).with(no_args).
-                                any_number_of_times.
-                                and_return(Ramaze::Pager.trait[:key] => 1)
+    req = Object.new
+    def req.params
+      {Ramaze::Pager.trait[:key] => 1}
+    end
     req
   end
-  it "should be paginated" do
-    get('/page').body.should == '[1, 2]'
-    get("/page", Ramaze::Pager.trait[:key] => '2').body.should == '[3, 4]'
-  end
-  it "should link to other pages" do
-    stuff = [1, 2, 3, 4, 5, 6, 7, 8, 9]
-    items, pager = paginate(stuff, :limit => 2)
-    page = Hpricot(pager.navigation)
-    (page / 'a').size.should == 6
+  before do
+    @items, @pager = paginate(@stuff, :limit => 2)
   end
-end
-describe "Pager", :shared => true do
-  include Ramaze::PagerHelper
-  def request
-    req = mock("Request")
-    req.should_receive(:params).with(no_args).
-                                any_number_of_times.
-                                and_return(Ramaze::Pager.trait[:key] => 1)
-    req
+  it 'should be paginated' do
+    get('/page').body.should == [1, 2].inspect
+    get('/page', pager_key => '2').body.should == [3, 4].inspect
   end
   it "should report the number of articles as Pager#total_count" do
-    @pager.should_not be_nil
-    @pager.total_count.should == 5
+    @pager.should.not.be.nil
+    @pager.total_count.should.equal 5
   end
   it "should return the same number of items as passed to :per_page" do
-    @items.should_not be_nil
-    @items.size.should == 2
+    @items.should.not.be.nil
+    @items.size.should.equal 2
   end
   it "should link to other pages" do
-    @pager.should_not be_nil
-    @pager.navigation.should_not be_nil
+    @pager.should.not.be.nil
+    @pager.navigation.should.not.be.nil
-    require 'hpricot'
     page = Hpricot(@pager.navigation)
     (page / 'a').size.should == 4
   end
 end
-describe "OgPager" do
-  it_should_behave_like "Pager"
-  module Og; end
-  module Og::Mixin; end
-  module Og::Collection; end
-  before do
-    person = mock("Person")
-    person.should_receive(:count).with(any_args).and_return(5)
-    person.should_receive(:all).with(any_args).and_return([1,2])
-    person.should_receive(:is_a?).any_number_of_times do |x|
-      x.inspect =~ /Og::Mixin/
-    end
-    @items, @pager = paginate(person, :limit => 2)
-  end
+describe "Array Pager" do
+  @stuff = (1..5).to_a
+  behaves_like "pager"
 end
-describe "OgCollectionPager" do
-  it_should_behave_like "Pager"
-  module Og; end
-  module Og::Mixin; end
-  module Og::Collection; end
-  before do
-    collection = mock("Og::HasMany.new")
-    collection.should_receive(:count).with(any_args).and_return(5)
-    collection.should_receive(:reload).with(any_args).and_return([1,2])
-    collection.should_receive(:is_a?).any_number_of_times do |x|
-      x.inspect =~ /Og::Collection/
-    end
-    @items, @pager = paginate(collection, :limit => 2)
-  end
+describe "OgPager" do
+  @stuff = Og::Mock.new(1,2,3,4,5).extend(Og::Mixin)
+  behaves_like "pager"
 end
-describe "ArrayPager" do
-  it_should_behave_like "Pager"
-  before do
-    stuff = [1, 2, 3, 4, 5]
-    @items, @pager = paginate(stuff, :limit => 2)
-  end
+describe "OgCollectionPager" do
+  @stuff = Og::Mock.new(1,2,3,4,5).extend(Og::Collection)
+  behaves_like "pager"
 end