ramaze 0.2.1 → 0.3.0

data/spec/examples/templates/template_ezamar.rb

@@ -3,6 +3,7 @@ require 'spec/helper'
 require 'examples/templates/template_ezamar'
 
 describe 'Template Ezamar' do
+  behaves_like 'http'
   ramaze
 
   it '/' do
@@ -13,7 +14,7 @@ describe 'Template Ezamar' do
   %w[/internal /external].each do |url|
     it url do
       html = get(url).body
-      html.should_not == nil
+      html.should.not == nil
       html.should =~ %r{<title>Template::Ezamar (internal|external)</title>}
       html.should =~ %r{<h1>The (internal|external) Template for Ezamar</h1>}
     end

data/spec/examples/templates/template_haml.rb

@@ -1,9 +1,10 @@
 require 'spec/helper'
 
-testcase_requires 'haml'
+spec_require 'haml'
 require 'examples/templates/template_haml'
 
 describe 'Template Haml' do
+  behaves_like 'http'
   ramaze
 
   it '/' do
@@ -14,7 +15,7 @@ describe 'Template Haml' do
   %w[/internal /external].each do |url|
     it url do
       html = get(url).body
-      html.should_not == nil
+      html.should.not == nil
       html.should =~ %r{<title>Template::Haml (internal|external)</title>}
       html.should =~ %r{<h1>The (internal|external) Template for Haml</h1>}
     end

data/spec/examples/templates/template_liquid.rb

@@ -1,9 +1,10 @@
 require 'spec/helper'
 
-testcase_requires 'liquid'
+spec_require 'liquid'
 require 'examples/templates/template_liquid'
 
 describe 'Template Liquid' do
+  behaves_like 'http'
   ramaze
 
   it '/' do
@@ -17,7 +18,7 @@ describe 'Template Liquid' do
       response = get(url)
       response.status.should == 200
       html = response.body
-      html.should_not == nil
+      html.should.not == nil
       html.should =~ %r(<title>Template::Liquid #{name}</title>)
       html.should =~ %r(<h1>The #{name} Template for Liquid</h1>)
     end

data/spec/examples/templates/template_markaby.rb

@@ -1,9 +1,10 @@
 require 'spec/helper'
 
-testcase_requires 'markaby'
+spec_require 'markaby'
 require 'examples/templates/template_markaby'
 
 describe 'Template Markaby' do
+  behaves_like 'http'
   ramaze
 
   it '/' do
@@ -14,7 +15,7 @@ describe 'Template Markaby' do
   %w[/internal /external].each do |url|
     it url do
       html = get(url).body
-      html.should_not == nil
+      html.should.not == nil
       html.should =~ %r{<title>Template::Markaby (internal|external)</title>}
       html.should =~ %r{<h1>The (internal|external) Template for Markaby</h1>}
     end

data/spec/examples/templates/template_remarkably.rb

@@ -1,9 +1,10 @@
 require 'spec/helper'
 
-testcase_requires 'remarkably/engines/html'
+spec_require 'remarkably/engines/html'
 require 'examples/templates/template_remarkably'
 
 describe 'Template Remarkably' do
+  behaves_like 'http'
   ramaze
 
   it '/' do
@@ -14,7 +15,7 @@ describe 'Template Remarkably' do
   %w[/internal /external].each do |url|
     it url do
       html = get(url).body
-      html.should_not == nil
+      html.should.not == nil
       html.should =~ %r{<title>Template::Remarkably (internal|external)</title>}
       html.should =~ %r{<h1>The (internal|external) Template for Remarkably</h1>}
     end

data/spec/ramaze/action/basics.rb

@@ -5,8 +5,8 @@ describe 'Action() basics' do
     action = Ramaze::Action()
 
     action.params.should == []
-    action.method.should be_nil
-    action.template.should be_nil
+    action.method.should == nil
+    action.template.should == nil
   end
 
   it 'should sanitize parameters' do
@@ -23,12 +23,12 @@ describe 'Action() basics' do
     # TODO: in Action.new() raise on init :controller or use a default
     hsh = Ramaze::Action(:controller=>Object).to_hash
     hsh[:method].should == nil
-    hsh[:binding].should be_an_instance_of(Binding)
+    hsh[:binding].should.instance_of?(Binding)
     hsh[:controller].should == Object
     hsh[:engine].should == Ramaze::Template::Ezamar
     hsh[:params].should == []
     hsh[:path].should == nil
-    hsh[:instance].should be_an_instance_of(Object)
+    hsh[:instance].should.instance_of?(Object)
     hsh[:template].should == nil
   end
 

data/spec/ramaze/action/cache.rb

@@ -21,25 +21,23 @@ class TCOtherCache < Ramaze::Controller
 end
 
 describe 'Action rendering' do
-  before :all do
-    @public_root = __DIR__ / :public
-    FileUtils.mkdir_p @public_root
-    ramaze :file_cache => true
-  end
+  behaves_like 'http'
+
+  @public_root = __DIR__ / :public
+  FileUtils.mkdir_p @public_root
+  ramaze :file_cache => true
 
   def req(path) r = get(path); [r.content_type, r.body] end
 
   it 'should cache to file' do
-    lambda{ req('/') }.should_not change{ req('/') }
-    File.file?(@public_root/'index').should be_true
+    lambda{ req('/') }.should.not.change{ req('/') }
+    File.file?(@public_root/'index').should == true
   end
 
   it 'should create subdirs as needed' do
-    lambda{ req('/other') }.should_not change{ req('/other') }
-    File.file?(@public_root/'other'/'index').should be_true
+    lambda{ req('/other') }.should.not.change{ req('/other') }
+    File.file?(@public_root/'other'/'index').should == true
   end
 
-  after :all do
-    FileUtils.rm_rf @public_root
-  end
-end
+  FileUtils.rm_rf @public_root
+end

data/spec/ramaze/action/layout.rb

@@ -80,11 +80,46 @@ class TCActionSubLayout < Ramaze::Controller
   end
 end
 
-describe 'Action rendering' do
-  before :all do
-    ramaze
+class TCReUseActionLayout < Ramaze::Controller
+  map '/reuse'
+  layout '/wrapper'
+
+  def index
+    'hi'
+  end
+
+  def other_layout
+    "#@title: #@content"
+  end
+end
+
+class TCLayoutInstance < Ramaze::Controller
+  map '/reuse_instance'
+  layout '/reuse/other_layout'
+
+  def index
+    @title = 'hello'
+    'world'
+  end
+end
+
+class TCLayoutInstanceVars < Ramaze::Controller
+  map '/instancevars'
+  layout :layout
+
+  def layout
+    @title = "layout"
   end
 
+  def test
+    'test'
+  end
+end
+
+describe 'Action rendering' do
+  behaves_like 'http'
+  ramaze
+
   it 'should work with layouts' do
     get('/').body.should == "<pre>Hello, World!</pre>"
     get('/foo').body.should == "<pre>bar</pre>"
@@ -115,4 +150,13 @@ describe 'Action rendering' do
   it 'should apply relative layouts' do
     get('/sub').body.should == "<h1>SubWrapper</h1>"
   end
+
+  it 'should use instance vars defined in the layout action in external templates' do
+    get('/instancevars/test').body.should == 'layout: test'
+  end
+
+  it 'should allow re-using layouts from other controllers' do
+    get('/reuse').body.should == "<pre>hi</pre>"
+    get('/reuse_instance').body.should == "hello: world"
+  end
 end

data/spec/ramaze/action/render.rb

@@ -16,10 +16,10 @@ class TCActionOne < Ramaze::Controller
   end
 end
 
+ramaze
+
 describe 'Action rendering' do
-  before :all do
-    ramaze
-  end
+  behaves_like "http"
 
   it 'should render' do
     action = Ramaze::Action(:method => :index, :controller => TCActionOne)

data/spec/ramaze/action/template/instancevars/layout.xhtml

@@ -0,0 +1 @@
+#@title: #@content

data/spec/ramaze/adapter.rb

@@ -4,19 +4,19 @@
 require 'spec/helper'
 
 class TCAdapterController < Ramaze::Controller
+  map '/'
+
   def index
     "The index"
   end
 end
 
+ramaze ramaze_options.merge(:spawn => 10)
+
 describe "Adapter" do
-  ramaze ramaze_options.merge( :port => 7007, :spawn => 10, :mapping => {'/' => TCAdapterController} )
+  behaves_like "http"
 
-  describe "multiple" do
-    it "simple request" do
-      browser do
-        get('/').should == "The index"
-      end
-    end
+  it 'should do a simple request' do
+    get('/').body.should == 'The index'
   end
 end

data/spec/ramaze/adapter/mongrel.rb

@@ -3,7 +3,7 @@
 
 require 'spec/helper'
 
-testcase_requires 'mongrel'
+spec_require 'mongrel'
 
 def ramaze_options
   { :adapter => :mongrel }

data/spec/ramaze/adapter/record.rb

@@ -13,18 +13,18 @@ class TCRecordController < Ramaze::Controller
 end
 
 describe 'Adapter recording' do
-  setup do
-    ramaze :adapter => :webrick, :record => lambda{|request|
-      request.remote_addr == '127.0.0.1'
-    }
+  behaves_like 'http'
 
-    @record = Ramaze::Record
-  end
+  ramaze :adapter => :webrick, :record => lambda{|request|
+    request.remote_addr == '127.0.0.1'
+  }
+
+  @record = Ramaze::Record
 
   it 'should record' do
     get('/').body.should == 'The index'
     get('/foo').body.should == 'The foo'
-    @record.should have(2).requests
+    @record.size.should == 2
     @record.first.path_info.should == '/'
     @record.last.path_info.should == '/foo'
   end

data/spec/ramaze/adapter/webrick.rb

@@ -3,7 +3,7 @@
 
 require 'spec/helper'
 
-testcase_requires 'webrick'
+spec_require 'webrick'
 
 def ramaze_options
   { :adapter => :webrick }

data/spec/ramaze/cache.rb

@@ -26,19 +26,15 @@ caches.each do |cache, name|
   end
 
   describe "#{name} modification" do
-    setup do
+    before do
       Ramaze::Global.cache = cache
       @cache = Ramaze::Global.cache.new
     end
 
-    after :each do
+    after do
       @cache.clear
     end
 
-    after :all do
-      FileUtils.rm(@cache.file) if cache == :yaml
-    end
-
     it "should be assignable with #[]=" do
       @cache[:foo] = :bar
       @cache[:foo].should == :bar
@@ -52,7 +48,7 @@ caches.each do |cache, name|
     it "should delete keys" do
       @cache[:bar] = :duh
       @cache.delete(:bar)
-      @cache[:bar].should be_nil
+      @cache[:bar].should == nil
     end
 
     it "should show values for multiple keys" do
@@ -69,7 +65,9 @@ caches.each do |cache, name|
       Ramaze::Cache.foo[key] = 'foo'
       Ramaze::Cache.bar[key] = 'bar'
 
-      Ramaze::Cache.foo[key].should_not == Ramaze::Cache.bar[key]
+      Ramaze::Cache.foo[key].should.not == Ramaze::Cache.bar[key]
     end
+
+    FileUtils.rm(@cache.file) if cache == :yaml
   end
 end

data/spec/ramaze/controller.rb

@@ -40,70 +40,79 @@ describe "Controller" do
     resolve(*url).values_at(:method, :params, :template)
   end
 
-  before :all do
-    ramaze :error_page => false
-    @hash = {
-      '/' => [
-        ["/", 'index', []]
-      ],
-
-      '/foo' => [
-        ["/foo", 'index',[]],
-        ['/',    'foo',  []],
-        ["/",    'index', ["foo"]],
-      ],
-
-      '/foo/bar' => [
-        ["/foo/bar",  "index",    []],
-
-        ["/foo",      "bar",      []],
-        ["/foo",      "index",    ["bar"]],
-
-        ["/",         "foo__bar", []],
-        ["/",         "foo",      ["bar"]],
-        ["/",         "index",    ["foo", "bar"]],
-      ],
-
-      '/foo/bar/baz' => [
-
-        ['/foo/bar/baz',   'index',         []],
-
-        ['/foo/bar',       'baz',           []],
-        ['/foo/bar',       'index',         ['baz']],
-
-        ['/foo',           'bar__baz',      []],
-        ['/foo',           'bar',           ['baz']],
-        ['/foo',           'index',         ['bar', 'baz']],
-
-        ['/',              'foo__bar__baz', []],
-        ['/',              'foo__bar',      ['baz']],
-        ['/',              'foo',           ['bar', 'baz']],
-        ['/',              'index',         ['foo', 'bar', 'baz']],
-      ],
-
-      '/foo/bar/baz/oof' => [
-        ['/foo/bar/baz/oof',    'index',               []],
-
-        ['/foo/bar/baz',        'oof',                 []],
-        ['/foo/bar/baz',        'index',               ['oof']],
-
-        ['/foo/bar',            'baz__oof',            []],
-        ['/foo/bar',            'baz',                 ['oof']],
-        ['/foo/bar',            'index',               ['baz', 'oof']],
-
-        ['/foo',                'bar__baz__oof',       []],
-        ['/foo',                'bar__baz',            ['oof']],
-        ['/foo',                'bar',                 ['baz', 'oof']],
-        ['/foo',                'index',               ['bar', 'baz', 'oof']],
-
-        ['/',                   'foo__bar__baz__oof',  []],
-        ['/',                   'foo__bar__baz',       ['oof']],
-        ['/',                   'foo__bar',            ['baz', 'oof']],
-        ['/',                   'foo',                 ['bar', 'baz', 'oof']],
-        ['/',                   'index',               ['foo', 'bar', 'baz', 'oof']],
-      ]
-    }
-  end
+  ramaze :error_page => false
+  @hash = {
+    '/' => [
+      ["/", 'index', []]
+    ],
+
+    '/foo' => [
+      ["/foo", "index",      []],
+      ["/",    "foo__index", []],
+      ["/",    "foo",        []],
+      ["/",    "index",      ["foo"]]
+
+    ],
+
+    '/foo/bar' => [
+      ["/foo/bar", "index",           []],
+      ["/foo",     "bar__index",      []],
+      ["/foo",     "bar",             []],
+      ["/foo",     "index",           ["bar"]],
+      ["/",        "foo__bar__index", []],
+      ["/",        "foo__bar",        []],
+      ["/",        "foo__index",      ["bar"]],
+      ["/",        "foo",             ["bar"]],
+      ["/",        "index",           ["foo", "bar"]]
+    ],
+
+    '/foo/bar/baz' => [
+      ["/foo/bar/baz", "index",                []],
+      ["/foo/bar",     "baz__index",           []],
+      ["/foo/bar",     "baz",                  []],
+      ["/foo/bar",     "index",                ["baz"]],
+      ["/foo",         "bar__baz__index",      []],
+      ["/foo",         "bar__baz",             []],
+      ["/foo",         "bar__index",           ["baz"]],
+      ["/foo",         "bar",                  ["baz"]],
+      ["/foo",         "index",                ["bar", "baz"]],
+      ["/",            "foo__bar__baz__index", []],
+      ["/",            "foo__bar__baz",        []],
+      ["/",            "foo__bar__index",      ["baz"]],
+      ["/",            "foo__bar",             ["baz"]],
+      ["/",            "foo__index",           ["bar", "baz"]],
+      ["/",            "foo",                  ["bar", "baz"]],
+      ["/",            "index",                ["foo", "bar", "baz"]]
+    ],
+
+    '/foo/bar/baz/oof' => [
+      ["/foo/bar/baz/oof", "index",                     []],
+       ["/foo/bar/baz",     "oof__index",                []],
+       ["/foo/bar/baz",     "oof",                       []],
+       ["/foo/bar/baz",     "index",                     ["oof"]],
+       ["/foo/bar",         "baz__oof__index",           []],
+       ["/foo/bar",         "baz__oof",                  []],
+       ["/foo/bar",         "baz__index",                ["oof"]],
+       ["/foo/bar",         "baz",                       ["oof"]],
+       ["/foo/bar",         "index",                     ["baz", "oof"]],
+       ["/foo",             "bar__baz__oof__index",      []],
+       ["/foo",             "bar__baz__oof",             []],
+       ["/foo",             "bar__baz__index",           ["oof"]],
+       ["/foo",             "bar__baz",                  ["oof"]],
+       ["/foo",             "bar__index",                ["baz", "oof"]],
+       ["/foo",             "bar",                       ["baz", "oof"]],
+       ["/foo",             "index",                     ["bar", "baz", "oof"]],
+       ["/",                "foo__bar__baz__oof__index", []],
+       ["/",                "foo__bar__baz__oof",        []],
+       ["/",                "foo__bar__baz__index",      ["oof"]],
+       ["/",                "foo__bar__baz",             ["oof"]],
+       ["/",                "foo__bar__index",           ["baz", "oof"]],
+       ["/",                "foo__bar",                  ["baz", "oof"]],
+       ["/",                "foo__index",                ["bar", "baz", "oof"]],
+       ["/",                "foo",                       ["bar", "baz", "oof"]],
+       ["/",                "index",                     ["foo", "bar", "baz", "oof"]]
+    ],
+  }
 
   it "dry pattern_for" do
     @hash.each do |path, correct|
@@ -142,13 +151,16 @@ describe "Controller" do
   it "double underscore in templates" do
     handle('/some/long/action').should == 'some long action'
     handle('/another/long/action').should == 'another long action'
+    handle('/other').should == 'This is the index of /other'
   end
 
   TCControllerController.private_methods.sort.each do |action|
     it action do
       path = "/#{action}"
       message = "No Action found for `#{path}' on TCControllerController"
-      lambda{ resolve(path) }.should raise_error(Ramaze::Error::NoAction, message)
+      lambda{ resolve(path) }.should.
+        raise(Ramaze::Error::NoAction).
+        message.should == message
     end
   end