manveru-ramaze 2009.04.08 → 2009.04.18

data/spec/ramaze/helper/auth.rb

@@ -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 :mock
+
+      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/flash.rb

@@ -4,7 +4,7 @@
 require 'spec/helper'
 
 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 :mock
 
   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/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,85 +48,67 @@ class PasswordLookupController < Ramaze::Controller
 end
 
 describe Ramaze::Helper::HttpDigest do
-  behaves_like :mock, :session
+  describe 'headers' do
+    behaves_like :mock
 
-  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'])
+    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 :mock
 
-  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 :mock
+
+    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/localize.rb

@@ -1,5 +1,5 @@
 # * Encoding: UTF-8
-$KCODE = 'u' if //.respond_to?(:kcode)
+$KCODE = 'u' if /regexp/.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('/', 'HTTP_COOKIE' => 'lang=ja').body.should == 'ja'
+    get('/', {}, :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/simple_captcha.rb

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

data/spec/ramaze/helper/stack.rb

@@ -39,56 +39,48 @@ class SpecStackHelper < Ramaze::Controller
 end
 
 describe Ramaze::Helper::Stack do
-  behaves_like :session
+  behaves_like :mock
   @uri = 'http://example.org'
 
   should 'login directly' do
-    session do |mock|
-      mock.get('/secure').body.should == 'please login'
+    get('/secure').body.should == 'please login'
 
-      got = mock.get('/login')
-      got.status.should == 302
-      got['Location'].should == "#@uri/secure"
+    get('/login').status.should == 302
+    last_response['Location'].should == "#@uri/secure"
 
-      got = mock.get('/secure')
-      got.status.should == 200
-      got.body.should == 'secret content'
+    get('/secure').status.should == 200
+    last_response.body.should == 'secret content'
 
-      mock.get('/secure').body.should == 'secret content'
-      mock.get('/logout')
-      mock.get('/secure').body.should == 'please login'
-    end
+    get('/secure').body.should == 'secret content'
+    get('/logout')
+    get('/secure').body.should == 'please login'
   end
 
   should 'login via redirects' do
-    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
+    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'
   end
 
   should 'login with params via redirects' do
-    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
+    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'
   end
 end

data/spec/ramaze/helper/user.rb

@@ -23,6 +23,10 @@ class SpecUserHelper < Ramaze::Controller
     user_login ? 'logged in' : 'failed login'
   end
 
+  def logout
+    user_logout
+  end
+
   def profile
     user.profile
   end
@@ -48,23 +52,21 @@ class SpecUserHelperCallback < SpecUserHelper
 end
 
 describe Ramaze::Helper::User do
-  behaves_like :session
+  behaves_like :mock
 
   should 'login' do
-    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
+    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
   end
 
   should 'login via the callback' do
-    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
+    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
   end
 end

data/spec/ramaze/request.rb

@@ -46,4 +46,16 @@ 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/release.rake

@@ -2,7 +2,7 @@ namespace :release do
   task :all => [:release_github, :release_rubyforge]
 
   desc 'Display instructions to release on github'
-  task :github => [:reversion, :gemspec] do
+  task :github => [:jquery, :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 => [:reversion, :gemspec, :package] do
+  task :rubyforge => [:jquery, :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,30 +40,12 @@ 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} #{release_id} '#{file}'"
+      puts "rubyforge add_file #{name} #{name} '#{version}' '#{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

data/tasks/setup.rake

@@ -0,0 +1,44 @@
+# Currently, Ramaze is not usable without Rack from the master branch head.
+# Also, our specs now depend on the latest rack-test.
+#
+# In order to make setup simpler for folks, I'll put up some gemspecs on github
+# and use their automatic building to provide development versions of these
+# libraries as gems for easier deployment.
+#
+# Once the libraries are officially released in a usable state I'll switch
+# dependencies to the official ones again.
+#
+# Please note that this makes running in environments that enforce their own
+# Rack (like jruby-rack) still quite difficult, but should allow for easier
+# development.
+#
+# Please be patient.
+
+desc 'install all possible dependencies'
+task :setup do
+  GemInstaller.new do
+    # misc
+    gem 'bacon',      '>= 1.0'
+    gem 'json',       '>= 1.1.3'
+    gem 'memcache',   '~> 1.7.0'
+
+    # templating engines
+    gem 'Remarkably', '~> 0.5.2'
+    gem 'erubis',     '>= 2.6.4'
+    gem 'haml',       '~> 2.0.9'
+    gem 'hpricot',    '>= 0.7'
+    gem 'liquid',     '~> 2.0.0'
+    gem 'sequel',     '>= 2.11.0'
+    gem 'tagz',       '>= 5.0.1'
+    gem 'tenjin',     '~> 0.6.1'
+
+    # mine
+    gem 'manveru-innate',    '>= 2009.04.10', :lib => 'innate',    :source => github
+    gem 'manveru-ezamar',    '>= 2009.03.10', :lib => 'ezamar',    :source => github
+    gem 'manveru-nagoro',    '>= 2009.03.28', :lib => 'nagoro',    :source => github
+    gem 'manveru-rack-test', '> 0.1.0',       :lib => 'rack-test', :source => github
+    gem 'manveru-rack',      '>= 0.9.9',      :lib => 'rack',      :source => github
+
+    setup
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: manveru-ramaze
 version: !ruby/object:Gem::Version 
-  version: 2009.04.08
+  version: 2009.04.18
 platform: ruby
 authors: 
 - Michael 'manveru' Fellinger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-08 00:00:00 -07:00
+date: 2009-04-18 00:00:00 -07:00
 default_executable: ramaze
 dependencies: []
 
@@ -206,6 +206,7 @@ files:
 - examples/templates/view/external.rhtml
 - examples/templates/view/external.tenjin
 - examples/templates/view/external.zmr
+- lib/proto/app.rb
 - lib/proto/config.ru
 - lib/proto/controller/init.rb
 - lib/proto/controller/main.rb
@@ -220,7 +221,6 @@ files:
 - lib/proto/spec/main.rb
 - lib/proto/start.rb
 - lib/proto/view/index.xhtml
-- lib/proto/view/page.xhtml
 - lib/ramaze.rb
 - lib/ramaze/app.rb
 - lib/ramaze/cache.rb
@@ -323,7 +323,6 @@ files:
 - lib/ramaze/snippets/ramaze/struct.rb
 - lib/ramaze/snippets/string/camel_case.rb
 - lib/ramaze/snippets/string/color.rb
-- lib/ramaze/snippets/string/each.rb
 - lib/ramaze/snippets/string/end_with.rb
 - lib/ramaze/snippets/string/esc.rb
 - lib/ramaze/snippets/string/ord.rb
@@ -421,7 +420,6 @@ files:
 - spec/ramaze/helper/maruku.rb
 - spec/ramaze/helper/pager.rb
 - spec/ramaze/helper/paginate.rb
-- spec/ramaze/helper/partial.rb
 - spec/ramaze/helper/request_accessor.rb
 - spec/ramaze/helper/sequel_form.rb
 - spec/ramaze/helper/simple_captcha.rb
@@ -506,6 +504,7 @@ files:
 - tasks/rcov.rake
 - tasks/release.rake
 - tasks/reversion.rake
+- tasks/setup.rake
 - tasks/todo.rake
 - tasks/traits.rake
 - tasks/yard.rake
@@ -540,7 +539,7 @@ requirements: []
 rubyforge_project: ramaze
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Ramaze is a simple and modular web framework
 test_files: []