ramaze 0.1.0 → 0.1.1

data/spec/ramaze/element.rb

@@ -73,31 +73,35 @@ end
 describe "Element" do
   ramaze(:mapping => {'/' => TCElementController})
 
+  def retrieve(*url)
+    Ramaze::Controller.handle(*url).strip
+  end
+
   it "simple request" do
-    get('/').body.should == "The index"
+    retrieve('/').should == "The index"
   end
 
   it "with element" do
-    get('/elementy').body.should == "<wrap> The index </wrap>"
+    retrieve('/elementy').should == "<wrap> The index </wrap>"
   end
 
   it "nested element" do
-    get('/nested').body.should == "<wrap>  some stuff  <wrap> The index </wrap>  more stuff  </wrap>"
+    retrieve('/nested').should == "<wrap>  some stuff  <wrap> The index </wrap>  more stuff  </wrap>"
   end
 
   it "with_params" do
-    get('/with_params/one/two').body.should == {'@one' => 'two'}.inspect
+    retrieve('/with_params/one/two').should == {'@one' => 'two'}.inspect
   end
 
   it "little" do
-    get('/little').body.should == 'little'
+    retrieve('/little').should == 'little'
   end
 
   it "little params" do
-    get('/little_params/one/eins').body.should == {'@one' => 'eins'}.inspect
+    retrieve('/little_params/one/eins').should == {'@one' => 'eins'}.inspect
   end
 
   it "templating" do
-    get('/templating/10').body.should == (1..10).to_a.join(', ')
+    retrieve('/templating/10').should == (1..10).to_a.join(', ')
   end
 end

data/spec/ramaze/error.rb

@@ -6,7 +6,7 @@ require 'open-uri'
 
 class TCErrorController < Ramaze::Controller
   map :/
-  trait :public => 'spec/ramaze/public'
+  public_root 'spec/ramaze/public'
 
   def index
     self.class.name

data/spec/ramaze/gestalt.rb

@@ -3,6 +3,8 @@
 
 require 'spec/helper'
 
+testcase_requires 'ramaze/gestalt'
+
 describe "Gestalt" do
   def gestalt &block
     Ramaze::Gestalt.new(&block).to_s

data/spec/ramaze/helper/aspect.rb

@@ -5,49 +5,57 @@ require 'spec/helper'
 
 class TCAspectController < Ramaze::Controller
   map '/'
+  trait :foo => :bar
   helper :aspect
 
-  def pre_aspect() '<aspect>' end
-  def post_aspect() '</aspect>' end
-  def wrap_aspect() '<br />' end
-
-  def test() 'test' end
-  pre :test, :pre_aspect
-  post :test, :post_aspect
-
-  def test_pre() 'test pre' end
-  pre :test_pre, :pre_aspect
+  def test_before() 'test before' end
+  before(:test_before){ '<aspect>' }
 
-  def test_post() 'test post' end
-  post :test_post, :post_aspect
+  def test_after() 'test after' end
+  after(:test_after){ '</aspect>' }
 
   def test_wrap() 'test wrap' end
-  wrap :test_wrap, :wrap_aspect
+  wrap(:test_wrap){ '<br />' }
 end
 
 class TCAspectAllController < Ramaze::Controller
   map '/all'
-  trait :foo => :bar
 
   helper :aspect
 
-  def pre_aspect() '<pre>' end
-  def post_aspect() '</pre>' end
-
   def test_all_first() 'first' end
   def test_all_second() 'second' end
 
-  pre :all, :pre_aspect
-  post :all, :post_aspect
+  before_all{ '<pre>' }
+  after_all{ '</pre>' }
 end
 
-describe "Aspect" do
+describe "AspectHelper" do
   ramaze(:error_page => false)
 
   it "shouldn't overwrite traits on inclusion" do
-    TCAspectAllController.trait[:foo].should == :bar
+    TCAspectController.trait[:foo].should == :bar
+  end
+
+  it 'should use before' do
+    get('/test_before').body.should == '<aspect>test before'
+  end
+
+  it 'should use after' do
+    get('/test_after').body.should == 'test after</aspect>'
   end
 
+  it 'should use wrap' do
+    get('/test_wrap').body.should == '<br />test wrap<br />'
+  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>'
+  end
+end
+
+=begin
   it "pre" do
     get('/test_pre').body.should == '<aspect>test pre'
   end
@@ -69,3 +77,4 @@ describe "Aspect" do
     get('/all/test_all_second').body.should == '<pre>second</pre>'
   end
 end
+=end

data/spec/ramaze/helper/auth.rb

@@ -18,7 +18,7 @@ class TCAuthHelperController < Ramaze::Controller
   def secured
     "Secret content"
   end
-  pre :secured, :login_required
+  before(:secured){ login_required }
 end
 
 class TCAuthHashHelperController < TCAuthHelperController

data/spec/ramaze/helper/cache.rb

@@ -4,6 +4,7 @@
 require 'spec/helper'
 
 class TCCacheHelperController < Ramaze::Controller
+  map '/'
   helper :cache
 
   trait :actions_cached => [:cached_action]
@@ -36,7 +37,7 @@ class TCCacheHelperController < Ramaze::Controller
 end
 
 describe "CacheHelper" do
-  ramaze(:mapping => {'/' => TCCacheHelperController})
+  ramaze
 
   it "testrun" do
     get('/').body.should == 'TCCacheHelperController'

data/spec/ramaze/helper/form.rb

@@ -26,6 +26,7 @@ Logger.send(:class_variable_set, "@@global_logger", Ramaze::Informer.new)
 Og.start :destroy => true
 
 class TCFormHelperEntryController < Ramaze::Controller
+  map '/'
   helper :form
 
   def index
@@ -54,6 +55,7 @@ class TCFormHelperEntryController < Ramaze::Controller
 end
 
 class TCFormHelperEntryTimestampedController < Ramaze::Controller
+  map '/entry_timestamped'
   helper :form
 
   def index
@@ -66,6 +68,7 @@ class TCFormHelperEntryTimestampedController < Ramaze::Controller
 end
 
 class TCFormHelperEntryDatedController < Ramaze::Controller
+  map '/entry_dated'
   helper :form
 
   def index
@@ -79,40 +82,38 @@ end
 
 describe "FormHelper" do
   describe "Entry" do
-    ramaze :mapping => {'/entry' => TCFormHelperEntryController}
+    ramaze
 
     it "testrun" do
-      get('/entry/').body.should == 'FormHelper Entry'
+      get('/').body.should == 'FormHelper Entry'
     end
 
     it "with submit" do
-      get('/entry/form_with_submit').body.should ==
+      get('/form_with_submit').body.should ==
         %{title: <input type="text" name="title" value="" /><br />\n<input type="submit" />}
     end
 
     it "without submit" do
-      get('/entry/form_without_submit').body.should ==
+      get('/form_without_submit').body.should ==
         %{title: <input type="text" name="title" value="" />}
     end
 
     it "with title" do
-      get('/entry/form_with_title').body.should ==
+      get('/form_with_title').body.should ==
         %{Title: <input type="text" name="title" value="" /><br />\n<input type="submit" />}
     end
 
     it "without title" do
-      get('/entry/form_without_title').body.should ==
+      get('/form_without_title').body.should ==
         %{<input type="text" name="title" value="" /><br />\n<input type="submit" />}
     end
 
     it "with oid" do
-      get('/entry/form_with_oid').body.should ==
+      get('/form_with_oid').body.should ==
         %{title: <input type="text" name="title" value="" /><br />\noid: <input type="text" name="oid" value="0" /><br />\n<input type="submit" />}
     end
 
     describe "EntryTimestamped" do
-      ramaze :fake_start => true, :mapping => {'/entry_timestamped' => TCFormHelperEntryTimestampedController}
-
       it "testrun" do
         get('/entry_timestamped/').body.should == "FormHelper EntryTimestamped"
       end
@@ -124,8 +125,6 @@ describe "FormHelper" do
     end
 
     describe "EntryDated" do
-      ramaze :fake_start => true, :mapping => {'/entry_dated' => TCFormHelperEntryDatedController}
-
       it "testrun" do
         get('/entry_dated').body.should ==
           "FormHelper Dated"
@@ -139,5 +138,9 @@ describe "FormHelper" do
         result.should =~ /<input type="submit" \/>/
       end
     end
+
+    after :all do
+      FileUtils.rm('data.db')
+    end
   end
 end

data/spec/ramaze/helper/link.rb

@@ -2,55 +2,32 @@
 # All files in this distribution are subject to the terms of the Ruby license.
 
 require 'spec/helper'
+require 'ramaze/helper/link'
 
-class TCLinkHelperController < Ramaze::Controller
-  helper :link
-
-  def index
-    link self
-  end
-
-  def index_with_title
-    link self, :title => 'Foo'
-  end
+class TCLink < Ramaze::Controller
+  map '/'
 end
 
-
-describe "LinkHelper" do
-  ramaze(:mapping => {'/' => TCLinkHelperController})
-
+describe "A" do
   include Ramaze::LinkHelper
 
-  this = TCLinkHelperController
+  it 'should build links' do
+    A('title', :href => '/').should == %(<a href="/">title</a>)
+    A('title', :href => '/foo').should == %(<a href="/foo">title</a>)
 
-  it "testrun" do
-    get('/').body.should == %{<a href="/">index</a>}
-    get('/index_with_title').body.should == %{<a href="/">Foo</a>}
-  end
-
-  it "link" do
-    link(:foo).should       == %{<a href="foo">foo</a>}
-    link(:foo, :bar).should == %{<a href="foo/bar">bar</a>}
-    link(this, :bar).should == %{<a href="/bar">bar</a>}
-    link('/foo/bar').should == %{<a href="/foo/bar">bar</a>}
-  end
-
-  it "link with title" do
-    link(:foo, :title => 'bar').should == %{<a href="foo">bar</a>}
+    a = A('title', :href => '/foo', :class => :none)
+    a.should =~ /class="none"/
+    a.should =~ /href="\/foo"/
   end
+end
 
-  it "link with get-parameters" do
-    link(:foo, :first => :bar, :title => 'bar').should == %{<a href="foo?first=bar">bar</a>}
-    l = link(:foo, :first => :bar, :second => :foobar)
-    m = l.match(%r{<a href="foo\?(.*?)=(.*?);(.*?)=(.*?)">(.*?)</a>}).to_a
-    m.shift
-    m.pop.should == 'foo'
-    Hash[*m].should == {'first' => 'bar', 'second' => 'foobar'}
-  end
+describe 'R' do
+  include Ramaze::LinkHelper
 
-  it "R" do
-    R(this).should == '/'
-    R(this, :foo).should == '/foo'
-    R(this, :foo, :bar => :one).should == '/foo?bar=one'
+  it 'should build urls' do
+    R(TCLink).should == '/'
+    R(TCLink, :foo).should == '/foo'
+    R(TCLink, :foo, :bar).should == '/foo/bar'
+    R(TCLink, :foo, :bar => :baz).should == '/foo?bar=baz'
   end
 end

data/spec/ramaze/localize.rb

@@ -12,7 +12,7 @@ Ramaze::Tool::Localize.trait :enable    => true,
 Ramaze::Dispatcher::Action.trait[:filter] << Ramaze::Tool::Localize
 
 class TCLocalize < Ramaze::Controller
-  trait :map => '/'
+  map '/'
 
   def hello lang = 'en'
     session[:LOCALE] = lang
@@ -26,7 +26,30 @@ class TCLocalize < Ramaze::Controller
 end
 
 describe "Localize" do
-  ramaze
+  before :all do
+    @dir = File.join(File.dirname(__FILE__), 'conf')
+    FileUtils.mkdir_p(@dir)
+
+    dict = {
+      :de => {
+        'hello'  => 'Hallo, Welt!',
+        'this'   => 'Das',
+        'is'     => 'ist',
+        'a'      => 'ein',
+        'test'   => 'Test',
+      },
+      :en => {
+        'hello'  => 'Hello, World!',
+        'this'   => 'this',
+        'is'     => 'is',
+        'a'      => 'a',
+        'test'   => 'test',
+    } }
+    dict.each do |lang, dic|
+      File.open(@dir/"locale_#{lang}.yaml", 'w+'){|fp| fp.print(dic.to_yaml)}
+    end
+    ramaze
+  end
 
   it "hello world" do
     get('/hello').body.should == 'Hello, World!'
@@ -37,4 +60,8 @@ describe "Localize" do
     get('/advanced').body.should == 'this is a test'
     get('/advanced/de').body.should == 'Das ist ein Test'
   end
+
+  after :all do
+    FileUtils.rm_rf(@dir)
+  end
 end

data/spec/ramaze/morpher.rb

@@ -6,6 +6,8 @@ require 'spec/helper'
 testcase_requires 'hpricot'
 
 class TCMorpherController < Ramaze::Controller
+  map '/'
+
   def index
     self.class.name
   end
@@ -49,34 +51,43 @@ class TCMorpherController < Ramaze::Controller
 end
 
 describe "Morpher" do
-  ramaze :mapping => {'/' => TCMorpherController}
+  before :all do
+    ramaze
+    Ramaze::Template::Ezamar.trait[:transform_pipeline] = [
+      Ezamar::Element, Ezamar::Morpher, Ezamar::Template
+    ]
+  end
+
+  def clean_get(*url)
+    get(*url).body.split("\n").join.strip
+  end
 
   it "testrun" do
-    get('/').body.should == 'TCMorpherController'
+    clean_get('/').should == 'TCMorpherController'
   end
 
   it "if" do
-    get('/simple_if').body.should == '<p>orig</p>'
-    get('/simple_if/bar').body.should == '<p>bar</p>'
+    clean_get('/simple_if').should == '<p>orig</p>'
+    clean_get('/simple_if/bar').should == '<p>bar</p>'
   end
 
   it "unless" do
-    get('/simple_unless').body.should == '<p>orig</p>'
-    get('/simple_unless/bar').body.should == '<p>bar</p>'
+    clean_get('/simple_unless').should == '<p>orig</p>'
+    clean_get('/simple_unless/bar').should == '<p>bar</p>'
   end
 
   it "for" do
-    get('/simple_for').body.should == "<div>0</div><div>1</div>"
-    get('/simple_for/3').body.should == "<div>0</div><div>1</div><div>2</div><div>3</div>"
+    clean_get('/simple_for').should == "<div>0</div><div>1</div>"
+    clean_get('/simple_for/3').should == "<div>0</div><div>1</div><div>2</div><div>3</div>"
   end
 
   it "times" do
-    get('/simple_times').body.should == "<div>0</div>"
-    get('/simple_times/3').body.should == "<div>0</div><div>1</div><div>2</div>"
+    clean_get('/simple_times').should == "<div>0</div>"
+    clean_get('/simple_times/3').should == "<div>0</div><div>1</div><div>2</div>"
   end
 
   it "each" do
-    get('/simple_each').body.should == ''
-    get('/simple_each/1/2/3').body.should == "<div>1</div><div>2</div><div>3</div>"
+    clean_get('/simple_each').should == ''
+    clean_get('/simple_each/1/2/3').should == "<div>1</div><div>2</div><div>3</div>"
   end
 end