Pistos-ramaze 2009.04.08 → 2009.06.12

data/spec/ramaze/helper/auth.rb

@@ -1,7 +1,7 @@
 #          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
-require 'spec/helper'
+require File.expand_path('../../../../spec/helper', __FILE__)
 
 $password = Digest::SHA1.hexdigest('pass')
 
@@ -49,46 +49,35 @@ class SpecHelperAuthLambda < SpecHelperAuth
 end
 
 describe Ramaze::Helper::Auth do
-  behaves_like :session, :multipart
-
-  def procedure(prefix)
-    session do |mock|
-      got = mock.get("#{prefix}/secured")
-      got.status.should == 302
-      got['Location'].should =~ (/#{prefix}\/login$/)
-
-      got = mock.get("#{prefix}/login")
-      got.status.should == 200
-      got.body.should =~ (/<form/)
-
-      env = multipart('username' => 'manveru', 'password' => 'pass')
-      got = mock.post("#{prefix}/login", env)
-      got.status.should == 302
-      got['Location'].should =~ (/#{prefix}\/secured/)
-
-      got = mock.get("#{prefix}/secured")
-      got.status.should == 200
-      got.body.should == 'Secret content'
-
-      got = mock.get("#{prefix}/logout")
-      got.status.should == 302
-      got['Location'].should =~ (/\/$/)
-
-      got = mock.get("#{prefix}/secured")
-      got.status.should == 302
-      got['Location'].should =~ (/#{prefix}\/login$/)
+  %w[ hash lambda method ].each do |prefix|
+    describe "login" do
+      behaves_like :rack_test
+
+      it "uses a #{prefix}" do
+        get "/#{prefix}/secured"
+        follow_redirect!
+        last_response.status.should == 200
+        last_response.body.should =~ (/<form/)
+
+        post("/#{prefix}/login", 'username' => 'manveru', 'password' => 'pass')
+        follow_redirect!
+        last_response.status.should == 200
+        last_response.body.should == 'Secret content'
+
+        get "/#{prefix}/secured"
+        last_response.status.should == 200
+        last_response.body.should == 'Secret content'
+
+        get "/#{prefix}/logout"
+        follow_redirect!
+        last_response.status.should == 200
+        last_response.body.should == 'SpecHelperAuth'
+
+        get "/#{prefix}/secured"
+        follow_redirect!
+        last_response.status.should == 200
+        last_response.body.should =~ (/<form/)
+      end
     end
   end
-
-  it 'authenticates by looking into a hash' do
-    procedure('/hash')
-  end
-
-  it 'authenticates by looking into a lambda' do
-    procedure('/lambda')
-  end
-
-  it 'authenticates by looking into a method' do
-    procedure('/method')
-  end
 end

data/spec/ramaze/helper/bench.rb

@@ -1,4 +1,7 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
 require 'ramaze/helper/bench'
 
 describe Ramaze::Helper::Bench do
@@ -12,6 +15,7 @@ describe Ramaze::Helper::Bench do
     result = bench{ sleep 0.1; 'result' }
     result.should == 'result'
     log.size.should == 1
-    log.pop.should =~ %r!Bench #{__FILE__}:#{__LINE__ - 3}: \d\.\d+!
+    # output between ruby 1.8 and 1.9 differs...
+    log.pop.should =~ %r!^Bench #{__FILE__}:#{__LINE__ - 4}:.* \d\.\d+$!
   end
 end

data/spec/ramaze/helper/cache.rb

@@ -1,12 +1,15 @@
 #          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
-require 'spec/helper'
+require File.expand_path('../../../../spec/helper', __FILE__)
 
 class SpecHelperCache < Ramaze::Controller
   map '/'
   helper :cache
-  cache_action :method => :cached_action
+
+  cache_action(:method => :cached_action)
+  cache_action(:method => :with_params)
+  cache_action(:method => :with_type)
 
   def cached_value
     cache_value[:time] ||= random
@@ -16,6 +19,15 @@ class SpecHelperCache < Ramaze::Controller
     random.to_s
   end
 
+  def with_params(foo, bar)
+    "foo: #{foo}, bar: #{bar}, random: #{random}"
+  end
+
+  def with_type
+    response['Content-Type'] = 'text/plain'
+    random.to_s
+  end
+
   private
 
   def random
@@ -36,15 +48,15 @@ end
 class SpecHelperCacheKey < Ramaze::Controller
   map '/key'
   helper :cache
-  cache_action(:method => :name){ request[:name] }
+  cache_action(:method => :index){ request[:name] }
 
-  def name
+  def index
     "hi #{request['name']} #{rand}"
   end
 end
 
 describe Ramaze::Helper::Cache do
-  behaves_like :mock
+  behaves_like :rack_test
 
   it 'caches actions' do
     got = get('/cached_action')
@@ -74,6 +86,22 @@ describe Ramaze::Helper::Cache do
     got.body.should == cached_body
   end
 
+  it 'caches actions with params' do
+    2.times do
+      lambda{ get('/with_params/foo/bar').body }.should.not.change{ get('/with_params/foo/bar').body }
+    end
+
+    get('/with_params/foo/bar').body.should.not == get('/with_params/baz/quux').body
+  end
+
+  it 'preserves the Content-Type' do
+    2.times do
+      lambda{ get('/with_type').body }.should.not.change{ get('/with_type').body }
+    end
+
+    get('/with_type')['Content-Type'].should == 'text/plain'
+  end
+
   it 'caches actions with ttl' do
     2.times do
       lambda{ get('/ttl').body }.should.not.change{ get('/ttl').body }
@@ -81,4 +109,16 @@ describe Ramaze::Helper::Cache do
 
     lambda{ sleep 1; get('/ttl').body }.should.change{ get('/ttl').body }
   end
+
+  it 'caches actions with block keys' do
+    2.times do
+      lambda{ get('/key?name=foo').body }.should.not.change{ get('/key?name=foo').body }
+    end
+
+    get('/key?name=foo').body.should.not == get('/key?name=bar').body
+  end
+
+  it 'caches actions on a per-controller basis' do
+    get('/ttl').body.should.not == get('/key').body
+  end
 end

data/spec/ramaze/helper/flash.rb

@@ -1,10 +1,10 @@
 #          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
-require 'spec/helper'
+require File.expand_path('../../../../spec/helper', __FILE__)
 
 class SpecHelperFlash < Ramaze::Controller
-  map :/
+  map '/'
   helper :flash
   trait :flashbox => "%key : %value"
 
@@ -23,23 +23,19 @@ class SpecHelperFlash < Ramaze::Controller
 end
 
 describe Ramaze::Helper::Flash do
-  behaves_like :session
+  behaves_like :rack_test
 
   it 'displays a flashbox with one item' do
-    session do |mock|
-      mock.get('/populate_one')
-      got = mock.get('/box')
-      got.status.should == 200
-      got.body.should == 'one : for starters'
-    end
+    get('/populate_one')
+    get('/box')
+    last_response.status.should == 200
+    last_response.body.should == 'one : for starters'
   end
 
   it 'displays a flashbox with two items' do
-    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
+    get('/populate_two')
+    get('/box')
+    last_response.status.should == 200
+    last_response.body.split("\n").sort.should == ['one : this one', 'two : and this']
   end
 end

data/spec/ramaze/helper/form.rb

@@ -1,4 +1,7 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
 
 spec_requires 'hpricot'
 
@@ -42,7 +45,7 @@ class SpecHelperForm < Ramaze::Controller
 
   def select_array_multiple
     languages = %w[ English German Japanese ]
-    form_select('Languages', :languages, languages, :multiple => true)
+    form_select('Languages', :languages, languages, :multiple => 1)
   end
 
   def select_array_selected
@@ -57,7 +60,7 @@ class SpecHelperForm < Ramaze::Controller
 end
 
 describe Ramaze::Helper::Form do
-  behaves_like :mock
+  behaves_like :rack_test
 
   it 'provides empty text input' do
     got = get('/text')

data/spec/ramaze/helper/formatting.rb

@@ -1,4 +1,7 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
 require 'ramaze/helper/formatting'
 
 describe 'Helper::Formatting' do

data/spec/ramaze/helper/gestalt.rb

@@ -1,4 +1,7 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
 require 'ramaze/helper/gestalt'
 
 describe Ramaze::Helper::Gestalt do

data/spec/ramaze/helper/gravatar.rb

@@ -1,4 +1,7 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
 require 'ramaze/helper/gravatar'
 
 describe Ramaze::Helper::Gravatar do

data/spec/ramaze/helper/httpdigest.rb

@@ -1,4 +1,7 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
 
 REALM = 'HttpDigestTestRealm'
 
@@ -26,7 +29,7 @@ class PlainTextController < Ramaze::Controller
 
   protected
 
-  def httpdigest_lookup_plaintext_password username
+  def httpdigest_lookup_plaintext_password(username)
     username.reverse
   end
 end
@@ -48,85 +51,67 @@ class PasswordLookupController < Ramaze::Controller
 end
 
 describe Ramaze::Helper::HttpDigest do
-  behaves_like :mock, :session
-
-  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(':') )
+  describe 'headers' do
+    behaves_like :rack_test
 
-    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'])
+    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)
       authorization["opaque"].should.not.be.empty
       authorization["nonce"].should.not.be.empty
       authorization["realm"].should == REALM
       authorization["qop"].should == "auth,auth-int"
-      got = mock.get( '/authenticate' , 'HTTP_AUTHORIZATION' => auth_for(got, '/authenticate', 'foo', 'oof' ) )
-      got.headers.should.satisfy do |headers|
+
+      digest_authorize 'foo', 'oof'
+      get '/authenticate'
+      last_response.headers.should.satisfy do |headers|
         !headers.has_key?( "WWW-Authenticate" )
       end
     end
   end
+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
+__END__
 
-  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
+  describe 'Digest authentication' do
+    behaves_like :rack_test
 
-  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
+    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 'authenticates a user with the plaintext method' do
-    got = get_auth( '/plaintext/authenticate', 'foo', 'oof' )
-    got.status.should == 200
-    got.body.should == "Hello foo"
+    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
   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"
+  describe 'Plaintext authentication' do
+    behaves_like :rack_test
+
+    it 'authenticates a user with the plaintext method' do
+      get '/plaintext/authenticate'
+      last_response.status.should == 401
+      last_response.body.should == 'Unauthorized'
+
+      authorize 'foo', 'oof'
+      get '/plaintext/authenticate'
+      last_response.status.should == 200
+      last_response.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
   end
 
   it 'authenticates a user with the password lookup method' do

data/spec/ramaze/helper/layout.rb

@@ -0,0 +1,79 @@
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
+
+class LayoutHelperOne < Ramaze::Controller
+  map '/one'
+  set_layout 'default'
+
+  def laid_out1; end
+  def laid_out2; end
+  def laid_out3; end
+end
+
+class LayoutHelperTwo < Ramaze::Controller
+  map '/two'
+  set_layout 'default' => [:laid_out1, :laid_out2]
+
+  def laid_out1; end
+  def laid_out2; end
+
+  def not_laid_out; end
+end
+
+class LayoutHelper < Ramaze::Controller
+  map '/three'
+  set_layout_except 'default' => [:not_laid_out1, :not_laid_out2]
+
+  def laid_out1; end
+  def laid_out2; end
+
+  def not_laid_out1; end
+  def not_laid_out2; end
+end
+
+
+describe Ramaze::Helper::Layout do
+  behaves_like :rack_test
+
+  it 'lays out all actions' do
+    get '/one/laid_out1'
+    last_response.status.should == 200
+    last_response.body.should.match /laid out/
+    get '/one/laid_out2'
+    last_response.status.should == 200
+    last_response.body.should.match /laid out/
+    get '/one/laid_out3'
+    last_response.status.should == 200
+    last_response.body.should.match /laid out/
+  end
+
+  it 'lays out only a whitelist of actions' do
+    get '/two/laid_out1'
+    last_response.status.should == 200
+    last_response.body.should.match /laid out/
+    get '/two/laid_out2'
+    last_response.status.should == 200
+    last_response.body.should.match /laid out/
+    get '/two/not_laid_out'
+    last_response.status.should == 200
+    last_response.body.should.not.match /laid out/
+  end
+
+  it 'lays out all actions except a blacklist' do
+    get '/three/laid_out1'
+    last_response.status.should == 200
+    last_response.body.should.match /laid out/
+    get '/three/laid_out2'
+    last_response.status.should == 200
+    last_response.body.should.match /laid out/
+    get '/three/not_laid_out1'
+    last_response.status.should == 200
+    last_response.body.should.not.match /laid out/
+    get '/three/not_laid_out2'
+    last_response.status.should == 200
+    last_response.body.should.not.match /laid out/
+  end
+
+end