app/views/exceptions/bad_request.html.erb tasks/doc.thor tasks/merb.thor/app_script.rb tasks/merb.thor/common.rb tasks/merb.thor/gem_ext.rb tasks/merb.thor/main.thor tasks/merb.thor/ops.rb tasks/merb.thor/utils.rb @@ -22,3 +22,5 @@ src/* .hg/* .svn/* coverage/* +bin/ +gems .gitignore @@ -1,8 +1,3 @@ -require File.dirname(__FILE__) + "/config/rubundler" -r = Rubundler.new -r.setup_env -r.setup_requirements - require 'rubygems' require 'rake/rdoctask' Rakefile @@ -10,4 +10,8 @@ class Exceptions < Merb::Controller def not_acceptable render :format => :html end + + def bad_request + render :format => :html + end end app/controllers/exceptions.rb @@ -1,36 +1,33 @@ -add_source "http://gems.rubyforge.org/" +# dependencies are generated using a strict version, don't forget to edit the dependency versions when upgrading. +merb_gems_version = "1.0.6" +dm_gems_version = "0.9.8" -add_gem 'rspec', '=1.1.11' -add_gem 'rake' -add_gem 'rcov' -add_gem 'mongrel' -add_gem 'hoe' -add_gem 'rr' -add_dependency 'extlib', '=0.9.9', :require => 'extlib' -add_gem 'do_sqlite3', '=0.9.9' -add_gem 'ruby-debug', '=0.10.3' +# For more information about each component, please read http://wiki.merbivore.com/faqs/merb_components +dependency "merb-gen", merb_gems_version +dependency "merb-action-args", merb_gems_version +dependency "merb-assets", merb_gems_version +dependency "merb-cache", merb_gems_version +dependency "merb-helpers", merb_gems_version +dependency "merb-haml", merb_gems_version +dependency "merb-mailer", merb_gems_version +dependency "merb-slices", merb_gems_version +dependency "merb-auth-core", merb_gems_version +dependency "merb-auth-more", merb_gems_version +dependency "merb-auth-slice-password", merb_gems_version +dependency "merb-param-protection", merb_gems_version +dependency "merb-exceptions", merb_gems_version -merb_gems_version = "=1.0.4" -dm_gems_version = "=0.9.8" +dependency "merb-exceptions", merb_gems_version -add_dependency 'dm-core', dm_gems_version -add_dependency 'dm-validations', dm_gems_version, :require => 'dm-validations' +dependency "dm-core", dm_gems_version +dependency "dm-validations", dm_gems_version +dependency 'merb_datamapper', dm_gems_version -add_dependency 'merb-core', merb_gems_version, :require => 'merb-core' -add_dependency 'merb-gen', merb_gems_version, :require => 'merb-gen' -add_dependency 'merb-param-protection', merb_gems_version, :require => 'merb-param-protection' -add_dependency 'merb-haml', merb_gems_version, :require => 'merb-haml' -add_dependency 'merb-auth-core', merb_gems_version, :require => 'merb-auth-core' -add_dependency 'merb-auth-more', merb_gems_version, :require => 'merb-auth-more' -add_dependency 'merb-cache', merb_gems_version, :require => 'merb-cache' -add_dependency 'merb-helpers', merb_gems_version, :require => 'merb-helpers' -add_dependency 'merb-assets', merb_gems_version, :require => 'merb-assets' -add_dependency 'merb-slices', merb_gems_version, :require => 'merb-slices' -add_dependency 'merb-auth-slice-password', merb_gems_version, :require => 'merb-auth-slice-password' -add_dependency 'merb-action-args', merb_gems_version, :require => 'merb-action-args' -add_dependency 'merb-mailer', merb_gems_version, :require => 'merb-mailer' -add_dependency 'merb_datamapper', dm_gems_version +dependency 'nokogiri', '>=1.0.6' +dependency 'webrat', '=0.3.2' +dependency 'rr' +dependency 'rcov' +dependency 'mongrel' +dependency 'ruby-debug', '=0.10.3' -add_dependency 'ruby-openid', '=2.1.2' -add_dependency 'nokogiri', '>=1.0.6' -add_dependency 'webrat', '=0.3.2' +dependency "ruby-openid", '=2.1.2', :require_as => 'openid' config/dependencies.rb @@ -1,7 +1,4 @@ -require File.dirname(__FILE__) + "/rubundler" -r = Rubundler.new -r.setup_env -r.setup_requirements +require 'config/dependencies.rb' # Go to http://wiki.merbivore.com/pages/init-rb require 'pp' config/init.rb @@ -1,34 +1,36 @@ -describe "requesting OpenID Mode: CheckID Setup" do - describe "/servers without an openid mode" do +describe "requesting /servers" do + describe "No OpenID Mode Set" do it "should return Http BadRequest" do response = request("/servers") response.status.should == 400 end end + describe "requesting OpenID Mode: CheckID Setup" do + describe " with valid openid 2.0 parameters when authenticated", :given => 'an returning user with trusted hosts in their session' do + it "should redirect back to the consumer app with the appropriate query string" do + response = request("/servers", :params => default_request_parameters) + response.status.should == 302 - describe " with valid openid 2.0 parameters when authenticated", :given => 'an returning user with trusted hosts in their session' do - it "should redirect back to the consumer app with the appropriate query string" do - response = request("/servers", :params => default_request_parameters) - response.status.should == 302 - - redirect_params = Addressable::URI.parse(response.headers['Location']).query_values - %w(ns ns.sreg sreg.nickname sreg.email claimed_id identity mode op_endpoint assoc_handle response_nonce signed).each do |k| - redirect_params["openid.#{k}"].should_not be_nil + redirect_params = Addressable::URI.parse(response.headers['Location']).query_values + %w(ns ns.sreg sreg.nickname sreg.email claimed_id identity mode op_endpoint assoc_handle response_nonce signed).each do |k| + redirect_params["openid.#{k}"].should_not be_nil + end end end - end - - describe " with valid openid 2.0 parameters when authenticated", :given => 'an authenticated user' do - it "should redirect to the acceptance page since the host isn't trusted yet" do - response = request("/servers", :params => default_request_parameters) - response.should redirect_to("/servers/acceptance") + + describe " with valid openid 2.0 parameters when authenticated", :given => 'an authenticated user' do + it "should redirect to the acceptance page since the host isn't trusted yet" do + response = request("/servers", :params => default_request_parameters) + response.should redirect_to("/servers/acceptance") + end end - end - describe "with valid openid 2.0 parameters when unauthorized" do - it "should redirect to the acceptance page(and /login if needed)" do - response = request("/servers", :params => default_request_parameters) - response.should be_a_valid_merb_auth_form + describe "with valid openid 2.0 parameters when unauthorized" do + it "should redirect to the acceptance page(and /login if needed)" do + response = request("/servers", :params => default_request_parameters) + response.should be_a_valid_merb_auth_form + end end end end + spec/requests/openid/mode_check_id_setup_spec.rb bin/merb bin/merb-gen bin/rake bin/spec config/rubundler.rb script/check script/update 48b40de6dd575a9df4050b08fb03929b55854192 Corey Donohoe atmos@atmos.org http://github.com/atmos/flatirons/commit/1f517a36e4067450ee9ed36099498fe0d3da7d3c 1f517a36e4067450ee9ed36099498fe0d3da7d3c 2008-12-16T12:51:33-08:00 2008-12-16T12:51:33-08:00 update to 1.0.6 bundling from rubundler. add Exceptions#bad_request as that seems to be required now if you're going throw exceptions. 4229030fe03838b06c071a4d9159da29d4ef7f8d Corey Donohoe atmos@atmos.org