ramaze 0.2.1 → 0.3.0

data/rake_tasks/conf.rake

@@ -9,7 +9,7 @@ BASEDIR = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 NAME = "ramaze"
 VERS = Ramaze::VERSION
 COPYRIGHT = [
-  "#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com",
+  "#          Copyright (c) #{Time.now.year} Michael Fellinger m.fellinger@gmail.com",
   "# All files in this distribution are subject to the terms of the Ruby license."
 ]
 CLEAN.include %w[

data/rake_tasks/maintenance.rake

@@ -205,13 +205,14 @@ end
 
 def authors
   author_map = {
-    'm.fellinger@gmail.com'                   => 'Michael Fellinger',
-    'manveru@weez-int.com'                    => 'Michael Fellinger',
-    'clive@crous.co.za'                       => 'Clive Crous',
     'blueonyx@dev-area.net'                   => 'Martin Hilbig',
-    'rff.rff@gmail.com'                       => 'Gabriele Renzi',
+    'clive@crous.co.za'                       => 'Clive Crous',
     'comp.lang.zenix+ramaze@gmail.com'        => 'zenix',
     'jesuswasramazing.10.pistos@geoshell.com' => 'Pistos',
+    'manveru@weez-int.com'                    => 'Michael Fellinger',
+    'm.fellinger@gmail.com'                   => 'Michael Fellinger',
+    'outtenr@gmail.com'                       => 'Carlo Zottmann',
+    'rff.rff@gmail.com'                       => 'Gabriele Renzi',
     'stephan@spaceboyz.net'                   => 'Stephan Maka',
   }
 
@@ -221,11 +222,12 @@ def authors
     email  = author.pop.gsub(/<(.*?)>/, '\1')
     name   = author.join(' ')
     name   = author_map[email] if name.empty?
+    fail "#{email} doesn't have a name" unless name
     mapping[name] ||= { :email => email, :patches => 0 }
     mapping[name][:patches] += 1
   end
 
-  max = mapping.map{|k,v| k.length}.max
+  max = mapping.map{|k,v| k.size }.max
   mapping.inject({}) {|h,(k,v)| h[k.ljust(max)] = v; h}
 end
 

data/rake_tasks/spec.rake

@@ -2,47 +2,61 @@
 # All files in this distribution are subject to the terms of the Ruby license.
 
 require 'rake'
-require 'ramaze/spec/helper/layout'
-require 'lib/ramaze/snippets/divide'
-
-SPEC_BASE = File.expand_path('spec')
-EXAMPLE_BASE = File.expand_path('examples')
-SNIPPETS_BASE = File.expand_path('snippets')
-# ignore files with these paths
-ignores = [ './*', './helper/*', './ramaze/adapter.rb', './ramaze/request.rb', ]
-
-files = Dir[SPEC_BASE/'**'/'*.rb'] + 
-        Dir[EXAMPLE_BASE/'**/spec'/'*.rb']
-        Dir[SNIPPETS_BASE/'**/*.rb']
-ignores.each do |ignore|
-  ignore_files = Dir[SPEC_BASE/ignore]
-  ignore_files.each do |ignore_file|
-    files.delete File.expand_path(ignore_file)
-  end
-end
-
-files.sort!
-
-spec_layout = Hash.new{|h,k| h[k] = []}
+require 'pp'
 
-files.each do |file|
-  name = file.gsub(/^(#{SPEC_BASE}|#{EXAMPLE_BASE})/, '.')
-  dir_name = File.dirname(name)[2..-1]
-  task_name = ([:test] + dir_name.split('/')).join(':')
-  spec_layout[task_name] << file
-end
-
-spec_layout.each do |task_name, specs|
-
-  desc task_name
-  task task_name => [:clean] do
-    wrap = SpecWrap.new(*specs)
-    wrap.run
+require 'lib/ramaze/snippets/divide'
+require 'lib/ramaze/snippets/string/color'
+
+desc 'Run all specs'
+task 'spec' do
+  non_verbose, non_fatal = ENV['non_verbose'], ENV['non_fatal']
+  require 'scanf'
+
+  root = File.expand_path(File.dirname(__FILE__)/'..')
+  libpath = root/'lib'
+
+  specs = Dir[root/'spec/{ramaze,examples,snippets,contrib}/**/*.rb'] +
+    Dir[root/'examples/**/spec/**/*.rb']
+
+  ignore = [
+    root/'spec/ramaze/adapter.rb', root/'spec/ramaze/request.rb',
+  ].map{|i| Dir[i].map{|f| File.expand_path(f) }}.flatten
+
+  config = RbConfig::CONFIG
+  bin = config['bindir']/config['ruby_install_name']
+
+  result_format = '%d tests, %d assertions, %d failures, %d errors'
+
+  list = (specs - ignore).sort
+  names = list.map{|l| l.sub(root + '/', '') }
+  width = names.sort_by{|s| s.size}.last.size
+  total = names.size
+
+  list.zip(names).each_with_index do |(spec, name), idx|
+    print '%2d/%d: ' % [idx + 1, total]
+    print name.ljust(width + 2)
+
+    stdout = `#{bin} -I#{libpath} #{spec} 2>&1`
+
+    status = $?.exitstatus
+    tests, assertions, failures, errors =
+      stdout[/.*\Z/].to_s.scanf(result_format)
+
+    if stdout =~ /Usually you should not worry about this failure, just install the/
+      lib = stdout[/^no such file to load -- (.*?)$/, 1] ||
+            stdout[/RubyGem version error: (.*)$/, 1]
+      puts "requires #{lib}".yellow
+    elsif status == 0
+      puts "all %3d passed".green % tests
+    else
+      out = result_format % [tests, assertions, failures, errors].map{|e| e.to_s.to_i}
+      puts out.red
+      puts stdout unless non_verbose
+      exit status unless non_fatal
+    end
   end
-end
 
-desc "Test all"
-task "test:all" => [:clean] do
-  wrap = SpecWrap.new(*spec_layout.values.flatten)
-  wrap.run
+  puts '', "joy: the emotion evoked by well-being, success, or good fortune or by the
+prospect of possessing what one desires"
+  puts "All specs pass, go enjoy yourself :)"
 end

data/spec/contrib/auto_params.rb

@@ -1,5 +1,5 @@
 require 'spec/helper'
-testcase_requires 'ruby2ruby'
+spec_require 'ruby2ruby'
 
 Ramaze.contrib :auto_params
 
@@ -40,8 +40,24 @@ class MainController < Ramaze::Controller
   end
 end
 
+class GetArgsTest
+  def one(a, b, c) end
+  def two(a, b = 1, c = nil) end
+  def three(a, *args) end
+end
+
+describe 'Method#get_args' do
+  it 'should return a list of arguments' do
+    gat = GetArgsTest.new
+    gat.method(:one).get_args.should == [[:a], [:b], [:c]]
+    gat.method(:two).get_args.should == [[:a], [:b, 1], [:c, nil]]
+    gat.method(:three).get_args.should == [[:a], [:"*args"]]
+  end
+end
+
 describe 'Parameterized actions' do
-  before(:all) { ramaze }
+  behaves_like 'http'
+  ramaze
 
   it 'should pass in values from request.params' do
     get('/create/Aman/20').body.should == 'Aman, 20'
@@ -82,7 +98,8 @@ describe 'Parameterized actions' do
 end if method(:puts).respond_to? :get_args
 
 describe 'Normal behavior' do
-  before(:all) { ramaze }
+  extend MockHTTP
+  ramaze
 
   it 'should work with no arguments' do
     get('/page').body.should == 'page'
@@ -99,4 +116,4 @@ describe 'Normal behavior' do
   it 'should work with /' do
     get('/css/style.css').body.should == 'style.css'
   end
-end
+end

data/spec/contrib/route.rb

@@ -1,5 +1,7 @@
 require 'spec/helper'
 
+Ramaze.contrib :route
+
 class MainController < Ramaze::Controller
   def float(flt)
     "Float: #{flt}"
@@ -12,13 +14,28 @@ class MainController < Ramaze::Controller
   def price(p)
     "Price: \$#{p}"
   end
+
+  def sum(a, b)
+    a.to_i + b.to_i
+  end
 end
 
 describe 'Route' do
-  before :all do
-    Ramaze.contrib :route
-    ramaze
-    @route = Ramaze::Contrib::Route
+  behaves_like 'http'
+  ramaze
+  @route = Ramaze::Contrib::Route
+
+  it 'should take custom lambda routers' do
+    @route['string'] = lambda {|path, req| path if path =~ %r!^/string! }
+    @route['string'].class.should == Proc
+
+    @route['calc sum'] = lambda do |path, req|
+      if req[:do_calc]
+        lval, rval = req[:a, :b]
+        rval = rval.to_i * 10
+        "/sum/#{lval}/#{rval}"
+      end
+    end
   end
 
   it 'should be possible to define routes' do
@@ -55,4 +72,14 @@ describe 'Route' do
     r.status.should == 200
     r.body.should == 'Price: $12.84'
   end
+
+  it 'should use lambda routers' do
+    r = get('/string/abc')
+    r.status.should == 200
+    r.body.should == 'String: abc'
+
+    r = get('/', 'do_calc=1&a=2&b=6')
+    r.status.should == 200
+    r.body.should == '62'
+  end
 end

data/spec/contrib/sequel/fill.rb

@@ -1,6 +1,6 @@
 require 'spec/helper'
 
-testcase_requires 'sequel'
+spec_require 'sequel'
 
 begin
   DB = Sequel.sqlite
@@ -35,9 +35,8 @@ class MainController < Ramaze::Controller
 end
 
 describe 'Route' do
-  before :all do
-    ramaze
-  end
+  behaves_like 'http'
+  ramaze
 
   it 'should fill values from current request' do
     insert = get('/insert', 'name' => 'manveru')

data/spec/examples/caching.rb

@@ -2,15 +2,18 @@ require 'spec/helper'
 require 'examples/caching'
 
 describe 'Caching' do
+  behaves_like 'http'
   ramaze
 
   it '/' do
     3.times do
-      lambda{ get('/') }.should_not change{ get('/').body }
+      lambda{ get('/') }.
+        should.not.change{ get('/').body }
     end
 
     3.times do
-      lambda{ get('/invalidate') }.should change{ get('/').body }
+      lambda{ get('/invalidate') }.
+        should.change{ get('/').body }
     end
   end
 end

data/spec/examples/css.rb

@@ -1,12 +1,15 @@
 require 'spec/helper'
+spec_require 'haml'
 require 'examples/css'
 
 describe 'CSSController' do
+  behaves_like 'http'
   ramaze
 
   def req(path) r = get(path); [r.content_type, r.body] end
 
   it 'should cache generated css' do
-    lambda{ req('/css/style.css') }.should_not change{ req('/css/style.css') }
+    lambda{ req('/css/style.css') }.
+      should.not.change{ req('/css/style.css') }
   end
-end
+end

data/spec/examples/element.rb

@@ -2,13 +2,14 @@ require 'spec/helper'
 require 'examples/element'
 
 describe 'Element' do
+  behaves_like 'http'
   ramaze
 
   it '/' do
     r = get('/').body
-    r.should include('<title>examples/element</title>')
-    r.should include('<h1>Test</h1>')
-    r.should include('<a href="http://something.com">something</a>')
-    r.should include('Hello, World!')
+    r.should.include('<title>examples/element</title>')
+    r.should.include('<h1>Test</h1>')
+    r.should.include('<a href="http://something.com">something</a>')
+    r.should.include('Hello, World!')
   end
 end

data/spec/examples/hello.rb

@@ -2,6 +2,7 @@ require 'spec/helper'
 require 'examples/hello'
 
 describe 'Hello' do
+  behaves_like 'http'
   ramaze
 
   it '/' do

data/spec/examples/linking.rb

@@ -0,0 +1,18 @@
+require 'spec/helper'
+require 'examples/linking'
+
+describe 'Linking' do
+  behaves_like 'http'
+  ramaze
+
+  it 'should provide a link to help' do
+    r = get('/').body
+    r.should.include('<a href="/help">Help?</a>')
+  end
+  
+  it 'should provide a link to another controller' do
+    r = get('/help').body
+    r.should.include('<a href="/link_to/another">A Different Controller</a>')
+  end
+
+end

data/spec/examples/simple.rb

@@ -2,49 +2,44 @@ require 'spec/helper'
 require 'examples/simple'
 
 describe 'Simple' do
+  behaves_like 'http'
   ramaze
 
-  after :each do
-    @response.status.should == 200
+  def check(url)
+    response = get(url)
+    response.status.should == 200
+    response.body
   end
 
   it '/' do
-    @response = get('/')
-    @response.body.should == 'simple'
+    check('/').should == 'simple'
   end
 
   it '/simple' do
-    @response = get('/simple')
-    @response.body.should =~ /^#<Ramaze::Request/
+    check('/simple').should =~ /^#<Ramaze::Request/
   end
 
   it '/join/foo/bar' do
-    @response = get('/join/foo/bar')
-    @response.body.should == 'foobar'
+    check('/join/foo/bar').should == 'foobar'
   end
 
   it '/join/bar/baz' do
-    @response = get('/join/bar/baz')
-    @response.body.should == 'barbaz'
+    check('/join/bar/baz').should == 'barbaz'
   end
 
   it '/join_all' do
-    @response = get('/join_all/a/b/c/d/e/f')
-    @response.body.should == 'abcdef'
+    check('/join_all/a/b/c/d/e/f').should == 'abcdef'
   end
 
   it '/sum' do
-    @response = get('/sum/1/2')
-    @response.body.should == '3'
+    check('/sum/1/2').should == '3'
   end
 
   it '/post_or_get' do
-    @response = get('/post_or_get')
-    @response.body.should == 'GET'
+    check('/post_or_get').should == 'GET'
   end
 
   it '/other' do
-    @response = get('/other')
-    @response.body.should == "Hello, World from OtherController"
+    check('/other').should == "Hello, World from OtherController"
   end
 end

data/spec/examples/templates/template_amrita2.rb

@@ -1,14 +1,15 @@
 require 'spec/helper'
 
-testcase_requires 'amrita2'
+spec_require 'amrita2'
 require 'examples/templates/template_amrita2'
 
 describe 'Template Amrita2' do
+  behaves_like 'http'
   ramaze
 
   it '/external' do
     html = get('/external').body
-    html.should_not == nil
+    html.should.not == nil
     html.should =~ %r{<title>Template::Amrita2 external</title>}
     html.should =~ %r{<h1>The external Template for Amrita2</h1>}
   end

data/spec/examples/templates/template_erubis.rb

@@ -1,9 +1,10 @@
 require 'spec/helper'
 
-testcase_requires 'erubis'
+spec_require 'erubis'
 require 'examples/templates/template_erubis'
 
 describe 'Template Erubis' do
+  behaves_like 'http'
   ramaze
 
   it '/' do
@@ -14,7 +15,7 @@ describe 'Template Erubis' 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::Erubis (internal|external)</title>}
       html.should =~ %r{<h1>The (internal|external) Template for Erubis</h1>}
     end