ramaze 0.0.7 → 0.0.8

data/spec/tc_helper_form.rb

@@ -26,9 +26,7 @@ Logger.send(:class_variable_set, "@@global_logger", gulp_class.new)
 
 Og.start :destroy => true
 
-include Ramaze
-
-class TCFormHelperEntryController < Template::Ramaze
+class TCFormHelperEntryController < Ramaze::Controller
   helper :form
 
   def index
@@ -56,7 +54,7 @@ class TCFormHelperEntryController < Template::Ramaze
   end
 end
 
-class TCFormHelperEntryTimestampedController < Template::Ramaze
+class TCFormHelperEntryTimestampedController < Ramaze::Controller
   helper :form
 
   def index
@@ -68,7 +66,7 @@ class TCFormHelperEntryTimestampedController < Template::Ramaze
   end
 end
 
-class TCFormHelperEntryDated < Template::Ramaze
+class TCFormHelperEntryDatedController < Ramaze::Controller
   helper :form
 
   def index
@@ -127,7 +125,7 @@ context "FormHelper" do
     end
 
     context "EntryDated" do
-      ramaze :fake_start => true, :mapping => {'/entry_dated' => TCFormHelperEntryDated}
+      ramaze :fake_start => true, :mapping => {'/entry_dated' => TCFormHelperEntryDatedController}
 
       specify "testrun" do
         get('/entry_dated').should ==

data/spec/tc_helper_link.rb

@@ -3,9 +3,7 @@
 
 require 'spec/spec_helper'
 
-include Ramaze
-
-class TCLinkHelperController < Template::Ramaze
+class TCLinkHelperController < Ramaze::Controller
   helper :link
 
   def index

data/spec/tc_helper_redirect.rb

@@ -3,9 +3,7 @@
 
 require 'spec/spec_helper'
 
-include Ramaze
-
-class TCRedirectHelperController < Template::Ramaze
+class TCRedirectHelperController < Ramaze::Controller
   helper :redirect
 
   def index
@@ -27,6 +25,16 @@ class TCRedirectHelperController < Template::Ramaze
   def redirect_referer_action
     redirect_referer
   end
+
+  def no_actual_redirect
+    catch(:redirect){ redirection }
+    'foo'
+  end
+
+  def no_actual_double_redirect
+    catch(:redirect){ double_redirection }
+    'bar'
+  end
 end
 
 context "RedirectHelper" do
@@ -39,13 +47,20 @@ context "RedirectHelper" do
   end
 
   specify "calls" do
-    ctx.get('/redirection').should        == "TCRedirectHelperController"
-    ctx.get('/double_redirection').should == "TCRedirectHelperController"
+    ctx.story do
+      get('/redirection').should        == "TCRedirectHelperController"
+      get('/double_redirection').should == "TCRedirectHelperController"
+      get('/no_actual_redirect').should        == 'foo'
+      get('/no_actual_double_redirect').should == 'bar'
+    end
   end
 
   specify "redirect to referer" do
-    ctx.get('/redirect_referer_action').should == 'TCRedirectHelperController'
-    ctx.get('/noop').should                    == 'noop'
-    ctx.get('/redirect_referer_action').should == 'noop'
+    ctx.story do
+      get('/').should                        == 'TCRedirectHelperController'
+      get('/redirect_referer_action').should == 'TCRedirectHelperController'
+      get('/noop').should                    == 'noop'
+      get('/redirect_referer_action').should == 'noop'
+    end
   end
 end

data/spec/tc_helper_stack.rb

@@ -3,30 +3,36 @@
 
 require 'spec/spec_helper'
 
-include Ramaze
-
-class TCStackHelperController < Template::Ramaze
-  helper :stack
+class TCStackHelperController < Ramaze::Controller
+  helper :stack, :aspect
 
   def index
     session.inspect
   end
 
   def foo
-    call :login unless logged_in?
+    call Rs(:login) unless logged_in?
     "logged in"
   end
 
   def bar
-    call :login unless logged_in?
+    call Rs(:login) unless logged_in?
     request.params.inspect
   end
 
+  def secure
+    logged_in? ? 'secret content' : 'please login'
+  end
+
   def login
     session[:logged_in] = true
     answer
   end
 
+  def logout
+    session.clear
+  end
+
   private
 
   def logged_in?
@@ -37,19 +43,29 @@ end
 context "StackHelper" do
   ramaze(:mapping => {'/' => TCStackHelperController})
 
-  ctx = Context.new
+  specify "conventional login" do
+=begin
+    Context.new do
+      get('/secure').should == 'please login'
+      get('/login')
+      get('/secure').should == 'secret content'
+      get('/logout')
+    end
+=end
+  end
 
   specify "indirect login" do
-    ctx.get('/foo').should == 'logged in'
-    ctx.eget('/').should == {:logged_in => true, :STACK => []}
+    Context.new do
+      get('/foo').should == 'logged in'
+      get('/foo').should == 'logged in'
+      eget('/').should == {:logged_in => true, :STACK => []}
+    end
   end
 
   specify "indirect login with params" do
-    ctx.eget('/bar?x=y').should == {'x' => 'y'}
-    ctx.eget('/').should == {:logged_in => true, :STACK => []}
-  end
-
-  specify "indirect posting fun" do
-    ctx.epost('/bar', :x => :y)['x'].should == 'y'
+    Context.new do
+      eget('/bar', 'x' => 'y').should == {'x' => 'y'}
+      eget('/').should == {:logged_in => true, :STACK => []}
+    end
   end
 end

data/spec/tc_morpher.rb

@@ -3,12 +3,10 @@
 
 require 'spec/spec_helper'
 
-include Ramaze
-
 begin
   require 'hpricot'
 
-class TCMorpherController < Template::Ramaze
+class TCMorpherController < Ramaze::Controller
   def index
     self.class.name
   end

data/spec/tc_params.rb

@@ -3,9 +3,7 @@
 
 require 'spec/spec_helper'
 
-include Ramaze
-
-class TCParamsController < Template::Ramaze
+class TCParamsController < Ramaze::Controller
   def index
     "index"
   end
@@ -33,10 +31,29 @@ class TCParamsController < Template::Ramaze
   def one_default param = 'default'
     "one_default (#{param})"
   end
+
+  def cat1__cat11
+    'cat1: cat11'
+  end
+
+  def cat1__cat11__cat111
+    'cat1: cat11: cat111'
+  end
+end
+
+class TCParamsController2 < Ramaze::Controller
+  def add(one, two = nil, three = nil)
+    "#{one}:#{two}:#{three}"
+  end
 end
 
 context "Simple Parameters" do
-  ramaze(:mapping => {'/' => TCParamsController})
+  ramaze(
+    :mapping => {
+        '/' => TCParamsController,
+        '/jo' => TCParamsController2
+      }
+  )
 
   specify "Should respond to no parameters given" do
     get('/no_params').should == "no params"
@@ -47,7 +64,7 @@ context "Simple Parameters" do
   end
 
   specify "call /bar though index doesn't take params" do
-    lambda{ p get('/bar') }.should_raise #OpenURI::HTTPError
+    lambda{ get('/bar') }.should_raise #OpenURI::HTTPError
   end
 
   specify "action that takes a single param" do
@@ -59,7 +76,7 @@ context "Simple Parameters" do
   end
 
   specify "action that takes two params but we give only one" do
-    lambda{ p get('/double_param/foo') }.should_raise #OpenURI::HTTPError
+    lambda{ get('/double_param/foo') }.should_raise #OpenURI::HTTPError
   end
 
   specify "action that takes all params" do
@@ -71,7 +88,7 @@ context "Simple Parameters" do
   end
 
   specify "action that takes all params but needs at least one (not given here)" do
-    lambda{ p get('/at_least_one') }.should_raise #OpenURI::HTTPError
+    lambda{ get('/at_least_one') }.should_raise #OpenURI::HTTPError
   end
 
   specify "one default" do
@@ -81,4 +98,28 @@ context "Simple Parameters" do
   specify "one default" do
     get('/one_default/my_default').should == "one_default (my_default)"
   end
+
+  specify "double underscore lookup" do
+    get('/cat1/cat11').should == 'cat1: cat11'
+  end
+
+  specify "double double underscore lookup" do
+    get('/cat1/cat11/cat111').should == 'cat1: cat11: cat111'
+  end
+
+
+  specify "jo/add should raise with 0 parameters" do
+    lambda{ get('/jo/add') }.should_raise
+  end
+  
+  specify "add should raise with 4 parameters" do
+    lambda{ get('/jo/add/1/2/3/4') }.should_raise
+  end
+  
+  specify "add should not raise with 1-3 parameters" do
+    get('/jo/add/1').should == '1::'
+    get('/jo/add/1/2').should == '1:2:'
+    get('/jo/add/1/2/3').should == '1:2:3'
+  end
+  
 end

data/spec/tc_request_mongrel.rb

@@ -0,0 +1,9 @@
+require 'spec/spec_helper'
+
+testcase_requires 'mongrel'
+
+def ramaze_options
+  { :adapter => :mongrel }
+end
+
+require 'spec/request_tc_helper'

data/spec/tc_request_webrick.rb

@@ -0,0 +1,5 @@
+def ramaze_options
+  { :adapter => :webrick }
+end
+
+require 'spec/request_tc_helper'

data/spec/tc_session.rb

@@ -3,9 +3,7 @@
 
 require 'spec/spec_helper'
 
-include Ramaze
-
-class TCSessionController < Template::Ramaze
+class TCSessionController < Ramaze::Controller
   def index
     session.inspect
   end
@@ -21,36 +19,54 @@ class TCSessionController < Template::Ramaze
   end
 end
 
-context "usual Session" do
+context "Session" do
   ramaze(:mapping => {'/' => TCSessionController})
 
-  ctx = Context.new
+  { :MemoryCache => :memory,
+    :YAMLStoreCache => :yaml_store,
+    :MemcachedCache => :memcached,
+  }.each do |cache, requirement|
+    begin
+      require "ramaze/cache/#{requirement}"
+    rescue LoadError => ex
+      puts ex
+      next
+    end
 
-  specify "Should give me an empty session" do
-    ctx.eget.should == {}
-  end
+    context cache.to_s do
 
-  specify "set some session-parameters" do
-    ctx.eget('/set_session/foo/bar').should == {'foo' => 'bar'}
-  end
+      Ramaze::Global.cache = cache
+      Thread.main[:session_cache] = nil
 
-  specify "inspect session again" do
-    ctx.eget('/').should == {'foo' => 'bar'}
-  end
+      ctx = Context.new
 
-  specify "change the session" do
-    ctx.eget('/set_session/foo/foobar').should == {'foo' => 'foobar'}
-  end
+      specify "Should give me an empty session" do
+        ctx.eget.should == {}
+      end
 
-  specify "inspect the changed session" do
-    ctx.eget('/').should == {'foo' => 'foobar'}
-  end
+      specify "set some session-parameters" do
+        ctx.eget('/set_session/foo/bar').should == {'foo' => 'bar'}
+      end
 
-  specify "now a little bit with POST" do
-    ctx.epost('/post_set_session', :x => :y)['x'].should == 'y'
-  end
+      specify "inspect session again" do
+        ctx.eget('/').should == {'foo' => 'bar'}
+      end
+
+      specify "change the session" do
+        ctx.eget('/set_session/foo/foobar')['foo'].should == 'foobar'
+      end
+
+      specify "inspect the changed session" do
+        ctx.eget('/')['foo'].should == 'foobar'
+      end
+
+      specify "now a little bit with POST" do
+        ctx.epost('/post_set_session', 'x' => 'y')['x'].should == 'y'
+      end
 
-  specify "snooping a bit around" do
-    ctx.cookie.split('=').size.should == 2
+      specify "snooping a bit around" do
+        ctx.cookie.split('=').size.should == 3
+      end
+    end
   end
 end

data/spec/tc_store.rb

@@ -4,19 +4,68 @@
 require 'spec/spec_helper'
 require 'ramaze/store/default'
 
-include Ramaze
-
 context "initialize an Store" do
   db = 'db.yaml'
 
+  def add hash = {}
+    Books.merge!(hash)
+  end
+
   specify "Store::Default.new" do
-    Db = Store::Default.new(db)
-    Db.db.should.is_a?(YAML::Store)
+    Books = Ramaze::Store::Default.new(db)
+    Books.db.should.is_a?(YAML::Store)
   end
 
   specify "store and retrieve something" do
-    (Db[:foo] = :bar).should == :bar
-    Db[:foo].should == :bar
+    add 'Pickaxe' => 'good book'
+    Books['Pickaxe'].should == 'good book'
+  end
+
+  specify "empty?" do
+    add 'Pickaxe' => 'good book'
+
+    Books.empty?.should == false
+    Books.clear
+    Books.empty?.should == true
+  end
+
+  specify "size" do
+    Books.size.should == 0
+
+    {
+      'Pickaxe' => 'good book',
+      '1984' => 'scary',
+      'Brave new World' => 'interesting',
+    }.each_with_index do |(title, content), i|
+      add title => content
+      Books.size.should == i + 1
+    end
+  end
+
+  specify "Enumerable" do
+    add 'Pickaxe' => 'good book', '1984' => 'scary'
+
+    Books.each do |title, content|
+      [title, content].compact.empty?.should == false
+      Books[title].should == content
+    end
+  end
+
+  specify "merge and merge!" do
+    books = {'Pickaxe' => 'good book', '1984' => 'scary'}
+    add books
+
+    bnw = {'Brave new World' => 'interesting'}
+
+    Books.merge(bnw).should == books.merge(bnw)
+
+    Books[bnw.keys.first].should == nil
+
+    Books.merge!(bnw).should == books.merge(bnw)
+
+    Books[bnw.keys.first].should == bnw.values.first
+    
+    Books.size.should == 3
   end
 
   teardown do