manveru-ramaze 2009.04 → 2009.04.01

data/spec/ramaze/helper/flash.rb

@@ -4,7 +4,7 @@
 require 'spec/helper'
 
 class SpecHelperFlash < Ramaze::Controller
-  map '/'
+  map :/
   helper :flash
   trait :flashbox => "%key : %value"
 
@@ -23,19 +23,23 @@ class SpecHelperFlash < Ramaze::Controller
 end
 
 describe Ramaze::Helper::Flash do
-  behaves_like :mock
+  behaves_like :session
 
   it 'displays a flashbox with one item' do
-    get('/populate_one')
-    get('/box')
-    last_response.status.should == 200
-    last_response.body.should == 'one : for starters'
+    session do |mock|
+      mock.get('/populate_one')
+      got = mock.get('/box')
+      got.status.should == 200
+      got.body.should == 'one : for starters'
+    end
   end
 
   it 'displays a flashbox with two items' do
-    get('/populate_two')
-    get('/box')
-    last_response.status.should == 200
-    last_response.body.split("\n").sort.should == ['one : this one', 'two : and this']
+    session do |mock|
+      mock.get('/populate_two')
+      got = mock.get('/box')
+      got.status.should == 200
+      got.body.split("\n").sort.should == ['one : this one', 'two : and this']
+    end
   end
 end

data/spec/ramaze/helper/httpdigest.rb

@@ -26,7 +26,7 @@ class PlainTextController < Ramaze::Controller
 
   protected
 
-  def httpdigest_lookup_plaintext_password(username)
+  def httpdigest_lookup_plaintext_password username
     username.reverse
   end
 end
@@ -48,67 +48,85 @@ class PasswordLookupController < Ramaze::Controller
 end
 
 describe Ramaze::Helper::HttpDigest do
-  describe 'headers' do
-    behaves_like :mock
+  behaves_like :mock, :session
 
-    it 'sends out all the required header information' do
-      get '/authenticate'
-      www_authenticate = last_response.headers['WWW-Authenticate']
-      authorization = Rack::Auth::Digest::Params.parse(www_authenticate)
+  def auth_for(got, uri, username, password, qop_type = "auth")
+    authorization = Rack::Auth::Digest::Params.parse(got.headers['WWW-Authenticate'])
+
+    cnonce = Digest::MD5.hexdigest(rand.to_s)
+    nc = 1
+    nonce = authorization['nonce']
+
+    authorization['cnonce'] = cnonce
+    authorization['nc'] = nc
+    authorization['uri'] = uri
+    authorization['username'] = username
+    authorization['qop'] = qop_type
+
+    ha1 = Digest::MD5.hexdigest([username, REALM, password].join(':'))
+    a2 = ['GET',uri]
+    a2 << Digest::MD5.hexdigest('') if qop_type == "auth-int"
+    ha2 = Digest::MD5.hexdigest( a2.join(':') )
+
+    authorization['response'] = Digest::MD5.hexdigest([ha1, nonce, nc, cnonce, qop_type, ha2].join(':'))
+
+    "Digest #{authorization}"
+  end
+
+  def get_auth( uri, username, password, qop_type = "auth" )
+    got = nil
+    session do |mock|
+      got = mock.get( uri )
+      got.status.should == 401
+      got.body.should == 'Unauthorized'
+      got = mock.get( uri , 'HTTP_AUTHORIZATION' => auth_for(got, uri, username, password, qop_type ) )
+    end
+    got
+  end
+
+  it 'sends out all the required header information' do
+    session do |mock|
+      got = mock.get('/authenticate')
+      authorization = Rack::Auth::Digest::Params.parse(got.headers['WWW-Authenticate'])
       authorization["opaque"].should.not.be.empty
       authorization["nonce"].should.not.be.empty
       authorization["realm"].should == REALM
       authorization["qop"].should == "auth,auth-int"
-
-      digest_authorize 'foo', 'oof'
-      get '/authenticate'
-      last_response.headers.should.satisfy do |headers|
+      got = mock.get( '/authenticate' , 'HTTP_AUTHORIZATION' => auth_for(got, '/authenticate', 'foo', 'oof' ) )
+      got.headers.should.satisfy do |headers|
         !headers.has_key?( "WWW-Authenticate" )
       end
     end
   end
-end
-
-__END__
-
-  describe 'Digest authentication' do
-    behaves_like :mock
-
-    it 'authenticates a user with a block' do
-      digest_authorize 'foo', 'oof'
-      get '/authenticate'
-      last_response.status.should == 200
-      last_response.body.should == "Hello foo"
-    end
 
-    it 'fails to authenticate an incorrect password with a block' do
-      digest_authorize 'foo', 'bar'
-      get '/authenticate'
-      last_response.status.should == 401
-      last_response.body.should == "Unauthorized"
-    end
+  it 'authenticates a user with a block' do
+    got = get_auth( '/authenticate', 'foo', 'oof' )
+    got.status.should == 200
+    got.body.should == "Hello foo"
   end
 
-  describe 'Plaintext authentication' do
-    behaves_like :mock
+  it 'fails to authenticate an incorrect password with a block' do
+    got = get_auth( '/authenticate', 'foo', 'bar' )
+    got.status.should == 401
+    got.body.should == "Unauthorized"
+  end
 
-    it 'authenticates a user with the plaintext method' do
-      get '/plaintext/authenticate'
-      last_response.status.should == 401
-      last_response.body.should == 'Unauthorized'
+  it 'authenticates a user with a block using auth for a random given' do
+    got = get_auth( '/authenticate', 'foo', 'oof', 'some-random-non-existant-auth-type' )
+    got.status.should == 200
+    got.body.should == "Hello foo"
+  end
 
-      authorize 'foo', 'oof'
-      get '/plaintext/authenticate'
-      last_response.status.should == 200
-      last_response.body.should == "Hello foo"
-    end
+  it 'authenticates a user with the plaintext method' do
+    got = get_auth( '/plaintext/authenticate', 'foo', 'oof' )
+    got.status.should == 200
+    got.body.should == "Hello foo"
+  end
 
-    it 'fails to authenticate an incorrect password with the plaintext method' do
-      authorize 'foo', 'bar'
-      get '/plaintext/authenticate'
-      last_response.status.should == 401
-      last_response.body.should == "Unauthorized"
-    end
+  it 'fails to authenticate an incorrect password with the plaintext method' do
+    got = get_auth( '/plaintext/authenticate', 'foo', 'bar' )
+    got.status.should == 401
+    got.body.should == "Unauthorized"
   end
 
   it 'authenticates a user with the password lookup method' do

data/spec/ramaze/helper/localize.rb

@@ -1,5 +1,5 @@
 # * Encoding: UTF-8
-$KCODE = 'u' if /regexp/.respond_to?(:kcode)
+$KCODE = 'u' if //.respond_to?(:kcode)
 require 'spec/helper'
 spec_requires 'locale/tag', 'locale'
 
@@ -35,26 +35,26 @@ describe Ramaze::Helper::Localize do
   end
 
   should 'override language by ?lang' do
-    get('/', :lang => :de).body.should == 'de'
+    get('/?lang=de').body.should == 'de'
   end
 
   should 'override language by cookie' do
-    get('/', {}, :cookie => 'lang=ja').body.should == 'ja'
+    get('/', 'HTTP_COOKIE' => 'lang=ja').body.should == 'ja'
   end
 
   should 'not fail if language is invalid' do
-    get('/', :lang => :foobar).body.should == 'foobar'
+    get('/?lang=foobar').body.should == 'foobar'
   end
 
   should 'use dictionary to translate' do
     get('/translate/one').body.should == 'one'
-    get('/translate/one', :lang => :en).body.should == 'one'
-    get('/translate/one', :lang => :ja).body.should == '一'
-    get('/translate/one', :lang => :de).body.should == 'eins'
+    get('/translate/one?lang=en').body.should == 'one'
+    get('/translate/one?lang=ja').body.should == '一'
+    get('/translate/one?lang=de').body.should == 'eins'
   end
 
   it "falls back to default language if string wasn't found in dictionary" do
-    get('/translate/two', :lang => :ja).body.should == 'two'
-    get('/translate/three', :lang => :ja).body.should == '三'
+    get('/translate/two?lang=ja').body.should == 'two'
+    get('/translate/three?lang=ja').body.should == '三'
   end
 end

data/spec/ramaze/helper/partial.rb

@@ -0,0 +1,40 @@
+require 'spec/helper'
+require 'ramaze/helper/partial'
+
+class SpecHelperPartialMain < Ramaze::Controller
+  layout :layout
+  helper :partial
+  engine :Ezamar
+  map '/'
+
+  def layout
+    '[ #{@content} ]'
+  end
+
+  def entries
+    @entries = ['Hello', 'World']
+
+    '<?r @entries.each do |entry| ?>
+      #{SpecHelperPartialSub.partial_content(:entry, :entry => entry).inspect}
+     <?r end ?>'
+  end
+end
+
+class SpecHelperPartialSub < SpecHelperPartialMain
+  map '/sub'
+
+  def entry
+    @entry ||= 'Hello'
+
+    'Entry: #{@entry}'
+  end
+end
+
+describe 'Ramaze::Helper::Partial' do
+  behaves_like :mock
+
+  it 'renders partial content' do
+    SpecHelperPartialSub.partial_content(:entry).should == 'Entry: Hello'
+    SpecHelperPartialSub.partial_content(:entry, :entry => 'foo').should == 'Entry: foo'
+  end
+end

data/spec/ramaze/helper/sequel_form.rb

@@ -32,7 +32,7 @@ class FormController < Ramaze::Controller
   end
 
   def edit(id)
-    sequel_form(User[id]).to_s
+    sequel_form(User[id])
   end
 
   def edit_with_options(id)

data/spec/ramaze/helper/simple_captcha.rb

@@ -25,21 +25,25 @@ class SpecCustomCaptcha < SpecSimpleCaptcha
 end
 
 describe Ramaze::Helper::SimpleCaptcha do
-  behaves_like :mock
+  behaves_like :session
 
   should 'ask question' do
-    get('/ask_question')
-    question = last_response.body
-    question.should =~ /^\d+ [+-] \d+$/
+    session do |mock|
+      question = mock.get('/ask_question').body
+      question.should =~ /^\d+ [+-] \d+$/
 
-    lh, m, rh = question.split
-    answer = lh.to_i.send(m, rh.to_i)
+      lh, m, rh = question.split
+      answer = lh.to_i.send(m, rh.to_i)
 
-    get("/answer_question/#{answer}").body.should == 'correct'
+      mock.get("/answer_question/#{answer}").body.should == 'correct'
+    end
   end
 
   should 'ask custom question' do
-    get('/fish/ask_question').body.should == 'the answer to everything'
-    get('/fish/answer_question/42').body.should == 'correct'
+    session do |mock|
+      question = mock.get('/fish/ask_question')
+      question.body.should == 'the answer to everything'
+      mock.get('/fish/answer_question/42').body.should == 'correct'
+    end
   end
 end

data/spec/ramaze/helper/stack.rb

@@ -39,48 +39,56 @@ class SpecStackHelper < Ramaze::Controller
 end
 
 describe Ramaze::Helper::Stack do
-  behaves_like :mock
+  behaves_like :session
   @uri = 'http://example.org'
 
   should 'login directly' do
-    get('/secure').body.should == 'please login'
+    session do |mock|
+      mock.get('/secure').body.should == 'please login'
 
-    get('/login').status.should == 302
-    last_response['Location'].should == "#@uri/secure"
+      got = mock.get('/login')
+      got.status.should == 302
+      got['Location'].should == "#@uri/secure"
 
-    get('/secure').status.should == 200
-    last_response.body.should == 'secret content'
+      got = mock.get('/secure')
+      got.status.should == 200
+      got.body.should == 'secret content'
 
-    get('/secure').body.should == 'secret content'
-    get('/logout')
-    get('/secure').body.should == 'please login'
+      mock.get('/secure').body.should == 'secret content'
+      mock.get('/logout')
+      mock.get('/secure').body.should == 'please login'
+    end
   end
 
   should 'login via redirects' do
-    get('/logged_in_page').status.should == 302
-    last_response['Location'].should == 'http://example.org/login'
-
-    get('/login').status.should == 302
-    last_response['Location'].should == 'http://example.org/logged_in_page'
-
-    get('/logged_in_page').status.should == 200
-    last_response.body.should == 'the logged in page'
-
-    get('/logout')
-    get('/secure').body.should == 'please login'
+    session do |mock|
+      got = mock.get('/logged_in_page')
+      got.status.should == 302
+      got['Location'].should == 'http://example.org/login'
+
+      got = mock.get('/login')
+      got.status.should == 302
+      got['Location'].should == 'http://example.org/logged_in_page'
+
+      got = mock.get('/logged_in_page')
+      got.status.should == 200
+      got.body.should == 'the logged in page'
+    end
   end
 
   should 'login with params via redirects' do
-    get('/logged_in_params?x=y').status.should == 302
-    last_response['Location'].should == 'http://example.org/login'
-
-    get('/login').status.should == 302
-    last_response['Location'].should == 'http://example.org/logged_in_params?x=y'
-
-    get('/logged_in_params?x=y').status.should == 200
-    last_response.body.should == {'x' => 'y'}.inspect
-
-    get('/logout')
-    get('/secure').body.should == 'please login'
+    session do |mock|
+      got = mock.get('/logged_in_params?x=y')
+      got.status.should == 302
+      got['Location'].should == 'http://example.org/login'
+
+      got = mock.get('/login')
+      got.status.should == 302
+      got['Location'].should == 'http://example.org/logged_in_params?x=y'
+
+      got = mock.get('/logged_in_params?x=y')
+      got.status.should == 200
+      got.body.should == {'x' => 'y'}.inspect
+    end
   end
 end

data/spec/ramaze/helper/user.rb

@@ -23,10 +23,6 @@ class SpecUserHelper < Ramaze::Controller
     user_login ? 'logged in' : 'failed login'
   end
 
-  def logout
-    user_logout
-  end
-
   def profile
     user.profile
   end
@@ -52,21 +48,23 @@ class SpecUserHelperCallback < SpecUserHelper
 end
 
 describe Ramaze::Helper::User do
-  behaves_like :mock
+  behaves_like :session
 
   should 'login' do
-    get('/status').body.should == 'no'
-    get('/login', :name => :arthur, :password => 42).body.should == 'logged in'
-    get('/status').body.should == 'yes'
-    get('/profile').body.should == MockSequelUser.new.profile
-    get('/logout').status.should == 200
+    session do |mock|
+      mock.get('/status').body.should == 'no'
+      mock.get('/login?name=arthur&password=42').body.should == 'logged in'
+      mock.get('/status').body.should == 'yes'
+      mock.get('/profile').body.should == MockSequelUser.new.profile
+    end
   end
 
   should 'login via the callback' do
-    get('/callback/status').body.should == 'no'
-    get('/callback/login', :name => :arthur, :password => 42).body.should == 'logged in'
-    get('/callback/status').body.should == 'yes'
-    get('/callback/profile').body.should == MockSequelUser.new.profile
-    get('/logout').status.should == 200
+    session do |mock|
+      mock.get('/callback/status').body.should == 'no'
+      mock.get('/callback/login?name=arthur&password=42').body.should == 'logged in'
+      mock.get('/callback/status').body.should == 'yes'
+      mock.get('/callback/profile').body.should == MockSequelUser.new.profile
+    end
   end
 end

data/spec/ramaze/request.rb

@@ -46,16 +46,4 @@ describe 'Ramaze::Request' do
   should 'provide #accept_charset' do
     request(@env).accept_charset.should == 'UTF-8'
   end
-
-  should 'properly parse requested locale' do
-    header = { "HTTP_ACCEPT_LANGUAGE" => "sv-se,sv;q=0.8,en-us;q=0.5,en;q=0.3" }
-    request(@env.merge(header)).accept_language_with_weight.should == [
-      ['sv-se', 1.0], ['sv', 0.8], ['en-us', 0.5], ['en', 0.3]
-    ]
-
-    header = { "HTTP_ACCEPT_LANGUAGE" => "nl-nl" }
-    request(@env.merge(header)).accept_language_with_weight.should == [
-      ['nl-nl', 1.0]
-    ]
-  end
 end

data/tasks/bacon.rake

@@ -2,65 +2,48 @@ desc 'Run all bacon specs with pretty output'
 task :bacon => :install_dependencies do
   require 'open3'
   require 'scanf'
-  require 'matrix'
 
   specs = PROJECT_SPECS
 
   some_failed = false
-  specs_size = specs.size
+  total = specs.size
   len = specs.map{|s| s.size }.sort.last
-  total_tests = total_assertions = total_failures = total_errors = 0
-  totals = Vector[0, 0, 0, 0]
+  tt = ta = tf = te = 0
 
   red, yellow, green = "\e[31m%s\e[0m", "\e[33m%s\e[0m", "\e[32m%s\e[0m"
   left_format = "%4d/%d: %-#{len + 11}s"
   spec_format = "%d specifications (%d requirements), %d failures, %d errors"
 
   specs.each_with_index do |spec, idx|
-    print(left_format % [idx + 1, specs_size, spec])
+    print(left_format % [idx + 1, total, spec])
 
     Open3.popen3(RUBY, spec) do |sin, sout, serr|
-      out = sout.read.strip
-      err = serr.read.strip
+      out = sout.read
+      err = serr.read
 
-      # this is conventional, see spec/innate/state/fiber.rb for usage
-      if out =~ /^Bacon::Error: (needed .*)/
-        puts(yellow % ("%6s %s" % ['', $1]))
-      else
-        total = nil
+      ran = false
 
-        out.each_line do |line|
-          scanned = line.scanf(spec_format)
+      out.each_line do |line|
+        tests, assertions, failures, errors = all = line.scanf(spec_format)
+        next unless all.any?
+        ran = true
+        tt += tests; ta += assertions; tf += failures; te += errors
 
-          next unless scanned.size == 4
-
-          total = Vector[*scanned]
-          break
-        end
-
-        if total
-          totals += total
-          tests, assertions, failures, errors = total_array = total.to_a
-
-          if tests > 0 && failures + errors == 0
-            puts((green % "%6d passed") % tests)
-          else
-            some_failed = true
-            puts(red % "       failed")
-            puts out unless out.empty?
-            puts err unless err.empty?
-          end
+        if tests == 0 || failures + errors > 0
+          puts((red % spec_format) % all)
+          puts out
+          puts err
         else
-          some_failed = true
-          puts(red % "       failed")
-          puts out unless out.empty?
-          puts err unless err.empty?
+          puts((green % "%6d passed") % tests)
         end
+
+        break
       end
+
+      puts(yellow % "       skipped") unless ran
     end
   end
 
-  total_color = some_failed ? red : green
-  puts(total_color % (spec_format % totals.to_a))
+  puts(spec_format % [tt, ta, tf, te])
   exit 1 if some_failed
 end

data/tasks/release.rake

@@ -2,7 +2,7 @@ namespace :release do
   task :all => [:release_github, :release_rubyforge]
 
   desc 'Display instructions to release on github'
-  task :github => [:jquery, :reversion, :gemspec] do
+  task :github => [:reversion, :gemspec] do
     name, version = GEMSPEC.name, GEMSPEC.version
 
     puts <<INSTRUCTIONS
@@ -22,14 +22,14 @@ INSTRUCTIONS
 
   # TODO: Not tested
   desc 'Display instructions to release on rubyforge'
-  task :rubyforge => [:jquery, :reversion, :gemspec, :package] do
+  task :rubyforge => [:reversion, :gemspec, :package] do
     name, version = GEMSPEC.name, GEMSPEC.version
 
     puts <<INSTRUCTIONS
 To publish to rubyforge do following:
 
 rubyforge login
-rubyforge add_release #{name} '#{version}' pkg/#{name}-#{version}.gem
+rubyforge add_release #{name} #{version} pkg/#{name}-#{version}.gem
 
 After you have done these steps, see:
 
@@ -40,12 +40,30 @@ INSTRUCTIONS
 
   desc 'Display instructions to add archives after release:rubyforge'
   task :rubyforge_archives do
+    release_id = latest_release_id
+
     puts "Adding archives for distro packagers is:", ""
 
     Dir["pkg/#{name}-#{version}.{gz,zip}"].each do |file|
-      puts "rubyforge add_file #{name} #{name} '#{version}' '#{file}'"
+      puts "rubyforge add_file #{name} #{name} #{release_id} '#{file}'"
     end
 
     puts
   end
 end
+
+# Use URI and proper XPATH, something along these lines:
+#
+# a = doc.at('a[@href=~"release_id"]')[:href]
+# release_id = URI(a).query[/release_id=(\w+)/, 1]
+def latest_release_id
+  require 'open-uri'
+  require 'hpricot'
+
+  url = "http://rubyforge.org/frs/?group_id=#{PROJECT_RUBYFORGE_GROUP_ID}"
+  doc = Hpricot(open(url))
+  a = (doc/:a).find{|a| a[:href] =~ /release_id/}
+
+  version = a.inner_html
+  release_id = Hash[*a[:href].split('?').last.split('=').flatten]['release_id']
+end