ramaze 0.1.0 → 0.1.1

data/spec/examples/caching.rb

@@ -6,7 +6,7 @@ describe 'Caching' do
   ramaze
 
   it '/' do
-    n1 = 10_0000
+    n1 = 10_000
     n2 = 10_000
     result = n1 ** n2
     url = "/#{n1}/#{n2}"

data/spec/examples/simple.rb

@@ -16,7 +16,7 @@ describe 'Simple' do
 
   it '/simple' do
     @response = get('/simple')
-    @response.body.should =~ /^#<Rack::Request/
+    @response.body.should =~ /^#<Ramaze::Request/
   end
 
   it '/join/foo/bar' do

data/spec/examples/templates/template_amrita2.rb

@@ -1,5 +1,6 @@
 require 'spec/helper'
 
+testcase_requires 'amrita2'
 require 'examples/templates/template_amrita2'
 
 describe 'Template Amrita2' do

data/spec/examples/templates/template_erubis.rb

@@ -1,5 +1,6 @@
 require 'spec/helper'
 
+testcase_requires 'erubis'
 require 'examples/templates/template_erubis'
 
 describe 'Template Erubis' do
@@ -7,7 +8,7 @@ describe 'Template Erubis' do
 
   it '/' do
     get('/').body.strip.should ==
-      "<a href=\"/\">index</a> | <a href=\"/internal\">internal</a> | <a href=\"/external\">external</a>"
+      "<a href=\"/\">Home</a> | <a href=\"/internal\">internal</a> | <a href=\"/external\">external</a>"
   end
 
   %w[/internal /external].each do |url|

data/spec/examples/templates/template_ezamar.rb

@@ -7,7 +7,7 @@ describe 'Template Ezamar' do
 
   it '/' do
     get('/').body.should ==
-      "<a href=\"/\">index</a> | <a href=\"/internal\">internal</a> | <a href=\"/external\">external</a>"
+      "<a href=\"/\">Home</a> | <a href=\"/internal\">internal</a> | <a href=\"/external\">external</a>"
   end
 
   %w[/internal /external].each do |url|

data/spec/examples/templates/template_haml.rb

@@ -1,5 +1,6 @@
 require 'spec/helper'
 
+testcase_requires 'haml'
 require 'examples/templates/template_haml'
 
 describe 'Template Haml' do
@@ -7,7 +8,7 @@ describe 'Template Haml' do
 
   it '/' do
     get('/').body.strip.should ==
-      "<a href=\"/\">index</a> | <a href=\"/internal\">internal</a> | <a href=\"/external\">external</a>"
+      "<a href=\"/\">Home</a> | <a href=\"/internal\">internal</a> | <a href=\"/external\">external</a>"
   end
 
   %w[/internal /external].each do |url|

data/spec/examples/templates/template_liquid.rb

@@ -1,5 +1,6 @@
 require 'spec/helper'
 
+testcase_requires 'liquid'
 require 'examples/templates/template_liquid'
 
 describe 'Template Liquid' do
@@ -7,7 +8,7 @@ describe 'Template Liquid' do
 
   it '/' do
     get('/').body.strip.should ==
-      "<a href=\"/\">index</a> | <a href=\"/internal\">internal</a> | <a href=\"/external\">external</a>"
+      "<a href=\"/\">Home</a> | <a href=\"/internal\">internal</a> | <a href=\"/external\">external</a>"
   end
 
   %w[/internal /external].each do |url|

data/spec/examples/templates/template_markaby.rb

@@ -1,5 +1,6 @@
 require 'spec/helper'
 
+testcase_requires 'markaby'
 require 'examples/templates/template_markaby'
 
 describe 'Template Markaby' do
@@ -7,7 +8,7 @@ describe 'Template Markaby' do
 
   it '/' do
     get('/').body.strip.should ==
-      "<a href=\"/\">index</a> | <a href=\"/internal\">internal</a> | <a href=\"/external\">external</a>"
+      "<a href=\"/\">Home</a> | <a href=\"/internal\">internal</a> | <a href=\"/external\">external</a>"
   end
 
   %w[/internal /external].each do |url|

data/spec/examples/templates/template_remarkably.rb

@@ -0,0 +1,22 @@
+require 'spec/helper'
+
+testcase_requires 'remarkably/engines/html'
+require 'examples/templates/template_remarkably'
+
+describe 'Template Remarkably' do
+  ramaze
+
+  it '/' do
+    get('/').body.strip.should ==
+      "<a href=\"/\">Home</a> | <a href=\"/internal\">internal</a> | <a href=\"/external\">external</a>"
+  end
+
+  %w[/internal /external].each do |url|
+    it url do
+      html = get(url).body
+      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
+  end
+end

data/spec/examples/todolist.rb

@@ -0,0 +1,125 @@
+require 'spec/helper'
+
+testcase_requires 'hpricot'
+
+$:.unshift 'examples/todolist'
+require 'main'
+
+# fix the paths to template and public for the spec
+class MainController
+  template_root 'examples/todolist/template'
+  public_root 'examples/todolist/public'
+end
+
+describe 'todolist' do
+  def h_get(*args)
+    Hpricot(get(*args).body)
+  end
+
+  def task_titles
+    doc = h_get('/')
+    doc.search("td[@class='title']").
+      map{|t| t.inner_html.strip}.sort
+  end
+
+  def tasks
+    (h_get('/')/:tr)
+  end
+
+  def spectask
+    tasks.find do |task|
+      (task/:td).find do |td|
+        td['class'] == 'title' and
+        td.inner_html.strip == 'spectask'
+      end
+    end
+  end
+
+  def spectask_status
+    spectask.search("td[@class='status']").inner_html.strip
+  end
+
+  def error_on_page(url, response)
+    doc = h_get(url, :cookie => response.headers['Set-Cookie'])
+
+    error = doc.search("div[@class='error']")
+    error.inner_html.strip
+  end
+
+  it 'should start' do
+    ramaze :port => 7080
+    get('/').status.should == 200
+  end
+
+  it 'should have no empty mainpage' do
+    get('/').body.should_not be_nil
+  end
+
+  it 'should have two preset tasks' do
+    task_titles.should == %w[Laundry Wash\ dishes]
+  end
+
+  it 'should have a link to new tasks' do
+    doc = h_get('/')
+    link = (doc/:a).find{|a| a.inner_html == 'New Task'}
+    link['href'].should == '/new'
+  end
+
+  it 'should have a page to create new tasks' do
+    get('/new').body.should_not be_nil
+  end
+
+  it 'should have a form to create a tasks on the /new page' do
+    doc = h_get('/new')
+    form = doc.at :form
+    form.should_not be_nil
+    input = form.at(:input)
+    input['type'].should == 'text'
+    input['name'].should == 'title'
+  end
+
+  it 'should POST new task and redirect to /' do
+    result = post('/create', 'title' => 'spectask')
+    result.status.should == 303
+  end
+
+  it 'should show have the new task' do
+    task_titles.should include('spectask')
+  end
+
+  it 'should toggle the spectask' do
+    get('/close/spectask').status.should == 303
+    spectask.should_not be_nil
+    spectask_status.should == 'done'
+    get('/open/spectask').status.should == 303
+    spectask.should_not be_nil
+    spectask_status.should == 'not done'
+  end
+
+  it 'should raise on modifying a not existing task' do
+    %w[open close].each do |action|
+      response = get("/#{action}/nothere", :referrer => "/")
+      response.status.should == 303
+      response.original_headers['Location'].should == '/'
+      error_on_page('/', response).should == "No such Task: `nothere'"
+    end
+  end
+
+  it 'should delete the new task' do
+    get('/delete/spectask').status.should == 303
+    task_titles.should_not include('spectask')
+  end
+
+  it 'should not create empty tasks but show a subtle error message' do
+    response = post('/create', 'title' => '', :referrer => "/new")
+
+    response.status.should == 303
+    response.original_headers['Location'].should == '/new'
+
+    error_on_page('/new', response).should == 'Please enter a title'
+  end
+
+  after :all do
+    FileUtils.rm('todolist.db') rescue nil
+  end
+end

data/spec/helper.rb

@@ -1,27 +1,7 @@
 #          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
-require 'timeout'
-
-$:.unshift File.join(File.dirname(File.expand_path(__FILE__)), '..', 'lib')
-$:.unshift '/home/manveru/prog/projects/rack/lib'
-
-# $VERBOSE = 1
-$context_runner = false
-
-require 'ramaze'
-
-begin
-  require 'rubygems'
-rescue LoadError => ex
-end
-
-require 'spec'
-if Spec::VERSION::FULL_VERSION < "0.9.1 (r1880)"
-  puts "please update rspec >= 0.9.1"
-  exit 1
-end
-
+require 'spec/helper/minimal'
 require 'spec/helper/mock_http'
 require 'spec/helper/simple_http'
 require 'spec/helper/requester'
@@ -43,14 +23,13 @@ end
 
 def ramaze_start hash = {}
   options = {
-    :mode         => :debug,
     :adapter      => false,
     :run_loose    => true,
     :error_page   => false,
     :port         => 7007,
     :host         => '127.0.0.1',
     :force        => true,
-    :force_setup  => true,
+    :origin       => :spec,
   }.merge(hash)
 
   Ramaze.start(options)

data/spec/helper/minimal.rb

@@ -0,0 +1,20 @@
+require 'timeout'
+
+base = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
+$:.unshift base.gsub(/^#{Dir.pwd}/, '.')
+
+# $VERBOSE = 1
+$context_runner = false
+
+require 'ramaze'
+
+begin
+  require 'rubygems'
+rescue LoadError => ex
+end
+
+require 'spec'
+if Spec::VERSION::FULL_VERSION < "0.9.1 (r1880)"
+  puts "please update rspec >= 0.9.1"
+  exit 1
+end

data/spec/helper/mock_http.rb

@@ -1,8 +1,10 @@
 require 'ramaze'
 require 'rack/mock'
 
-module Ramaze::Adapter
-  class Fake < Ramaze::Adapter::Base
+module Ramaze
+  module Adapter
+    class Fake < Base
+    end
   end
 end
 
@@ -16,34 +18,30 @@ module MockHTTP
     :port => 80
   )
 
-  def get(path, query = {})
-    uri = create_url(path, query)
-    mock_request.get(uri, DEFAULTS)
-  end
+  FISHING = {
+    :input => :input,
+    :referrer => 'HTTP_REFERER',
+    :referer => 'HTTP_REFERER',
+    :cookie => 'HTTP_COOKIE',
+  }
 
-  def post(path, query = {})
-    input = query.delete(:input)
-    uri = create_url(path, query)
-    if input
-      mock_request.post(uri, DEFAULTS.merge(:input => input))
-    else
-      mock_request.post(uri, DEFAULTS)
-    end
-  end
+  MOCK_REQUEST = ::Rack::MockRequest.new(Ramaze::Adapter::Fake)
 
-  def put(path, query = {})
-    input = query.delete(:input)
-    uri = create_url(path, query)
-    if input
-      mock_request.put(uri, DEFAULTS.merge(:input => input))
-    else
-      mock_request.put(uri, DEFAULTS)
-    end
+  def get(*args)    mock_request(:get,    *args) end
+  def put(*args)    mock_request(:put,    *args) end
+  def post(*args)   mock_request(:post,   *args) end
+  def delete(*args) mock_request(:delete, *args) end
+
+  def mock_request(meth, path, query = {})
+    uri, options = process_request(path, query)
+    MOCK_REQUEST.send(meth, uri, DEFAULTS.merge(options))
   end
 
-  def delete(path, query = {})
-    uri = create_url(path, query)
-    mock_request.delete(uri, DEFAULTS)
+  def process_request(path, query)
+    options = {}
+    FISHING.each{|key, value|
+      options[value] = query.delete(key)}
+    [create_url(path, query), options]
   end
 
   def create_url(path, query)
@@ -59,8 +57,4 @@ module MockHTTP
 			s + [CGI::escape(key) + "=" + CGI::escape(value)]
     end.join('&')
 	end
-
-  def mock_request
-    ::Rack::MockRequest.new(Ramaze::Adapter::Fake)
-  end
 end

data/spec/helper/simple_http.rb

@@ -342,10 +342,10 @@ class SimpleHttp
 		# add custom request headers.
 
 		@request_headers.each {|key,value|
-			request[key]=value;
+			request[key]=value
 		}
 
-		handle_response(request, http.request(request));
+		handle_response(request, http.request(request))
 	end
 
 	# internal

data/spec/helper/wrap.rb

@@ -134,26 +134,23 @@ class SpecFile
     total = f[@passed + @failed] rescue nil
     failed, passed = f[@failed], f[@passed]
     color = :red
+    width = 22
 
     if total_failure?
-      text = 'total failure'
+      text = 'total failure'.center(width)
     elsif failed?
-      text = "#{total} specs - #{failed} failed"
+      text = "#{total} specs - #{failed} failed".rjust(width)
       if @stdout =~ /Usually you should not worry about this failure, just install the/
         lib = @stdout.scan(/^no such file to load -- (.*?)$/).flatten.first
-        text = "needs #{lib}"
+        text = "needs #{lib}".center(width)
         @mark_passed = true
       end
     elsif (not @mark_passed) and succeeded?
       color = :green
-      text = "#{total} specs - all passed"
+      text = "#{total} specs - all passed".rjust(width)
     end
 
-    text.strip!
-    text = (' ' + text + ' ').center(24)
-    text = "[#{text}]"
-
-    puts(text.send(color))
+    puts "[ #{text.send(color)} ]"
   end
 
   def long_summary

data/spec/ramaze/adapter.rb

@@ -10,7 +10,7 @@ class TCAdapterController < Ramaze::Controller
 end
 
 describe "Adapter" do
-  ramaze ramaze_options.merge( :port => '7007..7010', :mapping => {'/' => TCAdapterController} )
+  ramaze ramaze_options.merge( :port => 7007, :spawn => 10, :mapping => {'/' => TCAdapterController} )
 
   describe "multiple" do
     it "simple request" do