ramaze 0.0.7 → 0.0.8

data/lib/ramaze/version.rb

@@ -5,7 +5,7 @@ module Ramaze #:nodoc:
   module Version #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 7
+    TINY  = 8
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/adapter_spec.rb

@@ -0,0 +1,20 @@
+#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require 'spec/spec_helper'
+
+class TCAdapterController < Ramaze::Controller
+  def index
+    "The index"
+  end
+end
+
+context "Adapter" do
+  ramaze ramaze_options.merge( :port => '7007..7010', :mapping => {'/' => TCAdapterController} )
+
+  context "multiple" do
+    specify "simple request" do
+      get('/').should == "The index"
+    end
+  end
+end

data/spec/public/test_download.css

@@ -0,0 +1,141 @@
+/*#############################################################
+ * Name: Light
+ * Date: 2006-08-20
+ * Description: Bright and smooth.
+ * Author: Viktor Persson
+ * URL: http://templates.arcsin.se
+ *
+ * Feel free to use and modify but please provide credits.
+ * #############################################################*/
+
+/* standard elements */
+{
+  margin: 0;
+  padding: 0;
+}
+a {
+  color: #567;
+}
+a:hover {
+  color: #28E;
+}
+body {
+  background: #F2F2F2 url(/media/bg.gif) repeat-y center top;
+  color: #555A60;
+  font: normal 62.5% "Lucida Sans Unicode",sans-serif;
+  margin: 0;
+}
+p,cite,code,ul {
+  font-size: 1.0em;
+  padding-bottom: 1.2em;
+}
+h1 {
+  font-size: 1.4em;
+  margin-bottom: 4px;
+}
+li {
+  list-style: url(/media/li.gif);
+  margin-left: 18px;
+}
+code {
+  background: url(/media/bgcode.gif);
+  border: 1px solid #F6F6F6;
+  color: #666;
+  display: block;
+  font: normal 1.1em "Lucida Sans Unicode",serif;
+  margin-bottom: 12px;
+  padding: 8px 10px;
+  white-space: pre;
+}
+cite {
+  background: url(/media/quote.gif) no-repeat;
+  color: #456;
+  display: block;
+  font: normal 1.4em "Lucida Sans Unicode",serif;
+  padding-left: 28px;
+}
+h1,h2,h3 {
+  color: #579;
+  padding-top: 6px;
+}
+*
+/* misc */
+.clearer {
+  clear: both;
+}
+
+/* structure */
+.container {
+  margin: 0 auto;
+  width: 730px;
+}
+
+/* title */
+.title {
+  float: left;
+  margin-top: 22px;
+  text-align: center;
+  width: 220px;
+}
+.title h1 {
+  font: normal 2em Verdana,sans-serif;
+}
+.title h2 {
+  color: #999;
+  font: normal 1.1em Verdana,sans-serif;
+}
+
+/* navigation */
+.navigation {
+  background: url(/media/holder.jpg) no-repeat;
+  height: 100px;
+  padding: 0 16px;
+}
+.navigation a {
+  border-left: 1px solid #DDD;
+  border-right: 1px solid #FFF;
+  color: #89A;
+  float: right;
+  font: bold 1.2em "Trebuchet MS",sans-serif;
+  margin-top: 9px;
+  padding: 58px 18px 8px;
+  text-align: center;
+  text-decoration: none;
+}
+.navigation a:hover {
+  background: #FFF url(/media/navhover.gif) repeat-x;
+  color: #28E;
+  padding: 56px 18px 10px;
+}
+
+/* holders */
+.holder {
+  background: url(/media/bgholder.jpg) repeat-y;
+  padding: 0 32px;
+}
+.holder_top,.footer {
+  clear: both;
+  background: url(/media/holder.jpg) no-repeat;
+  height: 40px;
+}
+
+/* footer */
+.footer {
+  background-position: left bottom;
+  color: #666;
+  font-size: 1.1em;
+  text-align: center;
+}
+
+form {
+  text-align: right;
+}
+
+form input {
+  width: 95%;
+}
+
+form textarea {
+  width: 95%;
+  height: 30em;
+}

data/spec/{tc_request.rb → request_tc_helper.rb}

@@ -3,9 +3,9 @@
 
 require 'spec/spec_helper'
 
-include Ramaze
+class TCRequestController < Ramaze::Controller
+  trait :public => 'spec/public'
 
-class TCRequestController < Template::Ramaze
   def is_post()   request.post?.to_s end
   def is_get()    request.get?.to_s end
   def is_put()    request.put?.to_s end
@@ -31,11 +31,6 @@ class TCRequestController < Template::Ramaze
     request['foo']
   end
 
-  def test_get_set(arg)
-    request['foo'] = arg
-    request['foo']
-  end
-
   def test_headers
   end
 
@@ -45,9 +40,10 @@ class TCRequestController < Template::Ramaze
 end
 
 context "Request" do
-  context "POST" do
-    ramaze( :adapter => :mongrel, :mapping => {'/' => TCRequestController} )
+  options = ramaze_options rescue {:adapter => :webrick}
+  ramaze options.merge( :mapping => {'/' => TCRequestController})
 
+  context "POST" do
     specify "give me the result of request.post?" do
       post("is_post").should == 'true'
     end
@@ -64,9 +60,11 @@ context "Request" do
 
   context "PUT" do
     specify "put a ressource" do
-      address = "http://localhost:7007/put_inspect/#{CGI.escape(__FILE__)}"
-      response = `curl -S -s -T #{__FILE__} #{address}`
-      file = File.read(__FILE__)
+      image = 'favicon.ico'
+      image_path = File.join('spec', 'public', image)
+      address = "http://localhost:7007/put_inspect/#{image}"
+      response = `curl -S -s -T #{image_path} #{address}`
+      file = File.read(image_path)
 
       response[1..-2].should == file
     end
@@ -88,7 +86,8 @@ context "Request" do
     end
 
     specify "give me back what i gave" do
-      get("/get_inspect?one=two&three=four").should == {'one' => 'two', 'three' => 'four'}.inspect
+      params = {'one' => 'two', 'three' => 'four'}
+      get("/get_inspect", params).should == params.inspect
     end
 
     specify "my ip" do
@@ -96,16 +95,41 @@ context "Request" do
     end
 
     specify "request[key]" do
-      get('test_get?foo=bar').should == 'bar'
-    end
-
-    specify "request[key] = value" do
-      get('test_get_set/bar').should == 'bar'
+      get('/test_get', 'foo' => 'bar').should == 'bar'
     end
+  end
 
-    specify "header" do
-      raw_get('/test_headers').status.should == %w[200 OK]
-      raw_get('/test_headers').content_type.should == "text/html"
+  context "send files" do
+    specify "threaded concurrently" do
+      css_path = 'test_download.css'
+      image_path = 'favicon.ico'
+      static_css = File.read("spec/public/#{css_path}").strip
+      static_image = File.read("spec/public/#{image_path}").strip
+
+      images = []
+      csses = []
+      threads = []
+
+      times = 100
+
+      times.times do
+        threads << Thread.new do
+          csses  << get(css_path)
+          images << get(image_path)
+        end
+      end
+
+      threads.each do |t|
+        t.join
+      end
+
+      images.each do |image|
+        image.should == static_image
+      end
+
+      csses.each do |css|
+        css.should == static_css
+      end
     end
   end
 end

data/spec/spec_all.rb

@@ -2,12 +2,29 @@
 # All files in this distribution are subject to the terms of the Ruby license.
 
 require 'pp'
+
+begin
+  require 'systemu'
+rescue LoadError
+  puts "Please install systemu for better-looking results"
+
+  # small drop-in replacement for systemu... far from perfect though, so please
+  # install the library
+
+  def systemu command
+    stdout = `#{command} 2>&1`
+    status, stdout, stderr = $?, stdout, ''
+  end
+end
+
 begin
   require 'term/ansicolor'
   class String
     include Term::ANSIColor
   end
 rescue LoadError
+  puts "Please install term-ansicolor for better-looking results"
+
   class String
 
     # this will be set in case term/ansicolor cannot be
@@ -24,50 +41,76 @@ end
 
 $stdout.sync = true
 
-specs = 0
-failures = 0
-problematic = {}
-
-Dir['spec/**/tc_*.rb'].each do |test_case|
-  print "rspec #{test_case.ljust(48)} "
-  out = `ruby #{test_case}`
-  out.split("\n").each do |line|
-    if line =~ /(\d+) specifications?, (\d+) failures?/
-      s, f = $1.to_i, $2.to_i
-
-      specs    += s
-      failures += f
-
-      message = "[#{s.to_s.rjust(3)} specs | "
-
-      if f.nonzero? or $?.exitstatus != 0
-        problematic[test_case] = out
-        message << "#{f.to_s.rjust(3)} failed ]"
-        puts message.red
-      else
-        message << "all passed ]"
-        puts message.green
+total_specs = 0
+total_fails = 0
+failed      = {}
+specs       = Dir[File.join('spec', 'tc_*.rb')].sort
+width       = specs.sort_by{|s| s.size }.last.size
+
+result_format = lambda do |str|
+  str = " #{ str } ".center(22, '=')
+  "[ #{str} ]"
+end
+
+specs.each do |spec|
+  print "Running #{spec}... ".ljust(width + 20)
+  status, stdout, stderr = systemu("ruby #{spec}")
+  hash = {:status => status, :stdout => stdout, :stderr => stderr}
+
+  if stdout =~ /Usually you should not worry about this failure, just install the/
+
+    lib = stdout.scan(/^no such file to load -- (.*?)$/).flatten.first
+    print result_format["needs #{lib}"].red
+
+  elsif status.exitstatus.nonzero? or stdout.empty? or not stderr.empty?
+
+    failed[spec] = hash
+    print result_format['failed'].red
+
+  else
+    stdout.each do |line|
+      if line =~ /(\d+) specifications?, (\d+) failures?/
+        s, f = $1.to_i, $2.to_i
+        ss, sf = s.to_s.rjust(3), f.to_s.rjust(3)
+
+        total_specs += s
+        total_fails += f
+
+        message = "[ #{ss} specs - "
+
+        if f.nonzero?
+          failed[spec] = hash
+          print((message << "#{f} failed ]").red)
+        else
+          print((message << "all passed ]").green)
+        end
       end
     end
   end
+  puts
 end
 
-puts "-" * 80
-problematic.each do |key, value|
-  puts key.center(80)
-  puts "v" * 80
+failed.each do |name, hash|
+  status, stdout, stderr = hash.values_at(:status, :stdout, :stderr)
+
+  puts "[ #{name} ]".center(80, '-')
+  puts "ExitStatus:".yellow
+  pp status
+  puts
+  puts "StdOut:".yellow
+  puts stdout
   puts
-  puts value
-  puts "-" * 80
+  puts "StdErr:".yellow
+  puts stderr
 end
 
 puts
-puts "#{specs} specifications, #{failures} failures"
+puts "#{total_specs} specifications, #{total_fails} failures"
 puts
 
-unless (problems = problematic.keys.join(', ')).empty?
-  puts "These failed: #{problems}"
-else
+if failed.empty?
   puts "No failing specifications, let's add some tests!"
+  puts
+else
+  puts "These failed: #{failed.keys.join(', ')}"
 end
-puts

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 #          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')
 
 require 'ramaze'
@@ -12,162 +14,11 @@ end
 
 require 'spec'
 
-require 'timeout'
-require 'open-uri'
-require 'net/http'
-
-# provides get/post methods for use inside your
-# Spec::Runner
-
-module StatelessContext
-  def raw_get url = ''
-    url = "http://localhost:#{Ramaze::Global.port}" + "/#{url}".squeeze('/')
-    Timeout.timeout(1) do
-      open(url)
-    end
-  end
-
-  # just GET an [url]
-
-  def get url = ''
-    raw_get(url).read.strip
-  end
-
-  # POST to an url the given params
-
-  def post url = '', params = {}
-    url = "http://localhost:#{Ramaze::Global.port}" + "/#{url}".squeeze('/')
-    uri = URI.parse(url)
-    Timeout.timeout(1) do
-      res = Net::HTTP.post_form(uri, params)
-      result = res.body.to_s.strip
-      #p res => result
-      result
-    end
-  end
-end
-
-include StatelessContext
-
-# provides a convinient Context for your requests
-# so you can simulate sessions and consecutive requests
-
-class Context
-  attr_accessor :cookie
-
-  # initialize the context with an url to obtain your cookie
-
-  def initialize(url = '/', base = nil)
-    @base = base
-    @cookie_url = with_base(url)
-    @history = []
-    reset
-  end
-
-  # combines the url given with the @base given, sanitizes
-  # the result a bit.
-
-  def with_base(url = '/')
-    url = url.to_s.squeeze('/')
-    if @base
-      unless url[0...@base.size] == @base
-        url = [@base,  url].join('/')
-      end
-    end
-    url.strip.squeeze('/')
-  end
-
-  # reset your session
-
-  def reset(url = @cookie_url)
-    @cookie = obtain_cookie( with_base(url) )
-  end
-
-  # just get a cookie, doesn't reset your session
-
-  def obtain_cookie(url = @cookie_url)
-    open(url).meta['set-cookie']
-  end
-
-  # our custom little open, take into account parameters and
-  # the port the server is running on
-  # the parameters are used for the session but could use
-  # any headers you wanna use for the request
-
-  def open url, hash = {}
-    unless @history.empty?
-      hash = {'HTTP_REFERER' => @history.last}.merge(hash)
-    end
-    url = with_base(url)
-    uri = "http://localhost:#{Global.port}#{url}"
-    puts "GET: #{uri}"
-    result = Kernel.open(uri, hash)
-    @history << url
-    result
-  end
-
-  # use Context#open with our cookie
-  # you can pass any header you want with an hash
-
-  def get url = '', headers = {}
-    open(url, {'Set-Cookie' => @cookie}.merge(headers)).read
-  end
-
-  # Net::HTTP.post_form with the cookie
-  # params are for the POST-parameters
-
-  def post url_param = '', params = {}, limit = 10
-    raise "Too many redirections" if limit <= 0
-
-    params['Set-Cookie'] = @cookie
-    url = "http://localhost:#{Ramaze::Global.port}"
-    new = with_base("/#{url_param.gsub(url, '')}")
-    url << new
-
-    uri = URI.parse(url)
-    puts "POST: #{uri}"
-    res = Net::HTTP.post_form(uri, params)
-    @history << uri.path
-
-    case res
-    when Net::HTTPSuccess
-      result = res.body.to_s.strip
-      result
-    when Net::HTTPRedirection
-      post(res['location'], params, limit - 1)
-    else
-      res.error!
-    end
-  end
-
-  # like post, but seval the returned string
-  # very comfortable if you just do {'foo' => 'bar'}.inspect in your template
-  # and in your specs you can
-  # epost('/foo').should == {'foo' => 'bar'}
-
-  def epost opt = '', params = {}
-    seval(post(opt, params))
-  end
-
-  # like get, but seval the returned string
-  # very comfortable if you just do {'foo' => 'bar'}.inspect in your template
-  # and in your specs you can
-  # eget('/foo').should == {'foo' => 'bar'}
+require 'spec/spec_helper_simple_http'
+require 'spec/spec_helper_requester'
+require 'spec/spec_helper_context'
 
-  def eget opt = ''
-    seval(get(opt))
-  end
-
-  # a very simple wrapper for eval that returns the
-  # error-message instead of the result of the eval
-  # in case there are errors.
-
-  def seval(string)
-    eval(string)
-  rescue Object => ex
-    ex.message
-  end
-end
+include Requester
 
 module Spec::Runner::ContextEval::ModuleMethods
 
@@ -177,7 +28,7 @@ module Spec::Runner::ContextEval::ModuleMethods
   def ramaze_start hash = {}
     options = {
       :mode         => :debug,
-      :adapter      => :webrick,
+      :adapter      => :mongrel,
       :run_loose    => true,
       :error_page   => false,
       :port         => 7007,
@@ -210,6 +61,6 @@ rescue LoadError => ex
   puts ex
   puts "Can't run #{$0}: #{ex}"
   puts "Usually you should not worry about this failure, just install the"
-  puts "library and try again (if you want to use that featureit later on)"
+  puts "library and try again (if you want to use that feature later on)"
   exit
 end