merb-auth/merb-auth-core/spec/merb-auth-core/failed_login_spec.rb merb-core/lib/merb-core/dispatch/request_parsers.rb merb-core/lib/merb-core/test/helpers/cookie_jar.rb merb-core/spec/public/core_ext/dependency_after_load_spec.rb merb-core/spec/public/core_ext/fixtures/bad_require_gem/Rakefile merb-core/spec/public/core_ext/fixtures/bad_require_gem/lib/BadRequireGem.rb merb-core/spec/public/core_ext/fixtures/gems/bin/edit_json.rb merb-core/spec/public/core_ext/fixtures/gems/gems/bad_require_gem-0.0.1/Rakefile merb-core/spec/public/core_ext/fixtures/gems/gems/bad_require_gem-0.0.1/lib/BadRequireGem.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/CHANGES merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/GPL merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/README merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/RUBY merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/Rakefile merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/TODO merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/VERSION merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/benchmarks/benchmark.txt merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/benchmarks/benchmark_generator.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/benchmarks/benchmark_parser.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/benchmarks/benchmark_rails.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/bin/edit_json.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/bin/prettify_json.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/data/example.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/data/index.html merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/data/prototype.js merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/ext/json/ext/generator/extconf.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/ext/json/ext/generator/generator.c merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/ext/json/ext/generator/unicode.c merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/ext/json/ext/generator/unicode.h merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/ext/json/ext/parser/extconf.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/ext/json/ext/parser/parser.c merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/ext/json/ext/parser/parser.rl merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/ext/json/ext/parser/unicode.c merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/ext/json/ext/parser/unicode.h merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/install.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json/Array.xpm merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json/FalseClass.xpm merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json/Hash.xpm merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json/Key.xpm merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json/NilClass.xpm merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json/Numeric.xpm merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json/String.xpm merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json/TrueClass.xpm merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json/add/core.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json/add/rails.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json/common.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json/editor.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json/ext.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json/json.xpm merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json/pure.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json/pure/generator.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json/pure/parser.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json/version.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail1.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail10.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail11.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail12.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail13.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail14.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail18.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail19.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail2.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail20.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail21.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail22.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail23.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail24.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail25.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail27.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail28.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail3.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail4.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail5.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail6.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail7.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail8.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail9.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/pass1.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/pass15.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/pass16.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/pass17.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/pass2.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/pass26.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/pass3.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/runner.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/test_json.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/test_json_addition.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/test_json_fixtures.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/test_json_generate.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/test_json_rails.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/test_json_unicode.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tools/fuzz.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tools/server.rb merb-core/spec/public/core_ext/fixtures/gems/gems/simple_gem-0.0.1/Rakefile merb-core/spec/public/core_ext/fixtures/gems/gems/simple_gem-0.0.1/lib/simple_gem.rb merb-core/spec/public/core_ext/fixtures/gems/gems/simple_gem-0.0.2/Rakefile merb-core/spec/public/core_ext/fixtures/gems/gems/simple_gem-0.0.2/lib/simple_gem.rb merb-core/spec/public/core_ext/fixtures/gems/specifications/bad_require_gem-0.0.1.gemspec merb-core/spec/public/core_ext/fixtures/gems/specifications/json_pure-1.1.3.gemspec merb-core/spec/public/core_ext/fixtures/gems/specifications/simple_gem-0.0.1.gemspec merb-core/spec/public/core_ext/fixtures/gems/specifications/simple_gem-0.0.2.gemspec merb-core/spec/public/core_ext/fixtures/simple_gem/Rakefile merb-core/spec/public/core_ext/fixtures/simple_gem/lib/simple_gem.rb merb-core/spec/public/core_ext/fixtures/simple_gem_2/Rakefile merb-core/spec/public/core_ext/fixtures/simple_gem_2/lib/simple_gem.rb merb-core/spec/public/core_ext/immediate_spec.rb merb-core/spec/public/core_ext/multi_versions_spec.rb merb-core/spec/public/core_ext/require_as_fail_spec.rb merb-core/spec/public/core_ext/require_as_immediate_spec.rb merb-core/spec/public/core_ext/require_as_version_spec.rb merb-core/spec/public/core_ext/require_as_working_spec.rb merb-core/spec/public/core_ext/simple_dependency_spec.rb merb-core/spec/public/core_ext/version_dependency_spec.rb merb-core/spec/public/test/controllers/request_controller.rb merb-core/spec/public/test/mock_request_helper_spec.rb merb-slices/lib/generators/templates/full/config/router.rb @@ -69,8 +69,20 @@ module Merb def authenticate!(request, params, *rest) opts = rest.last.kind_of?(Hash) ? rest.pop : {} rest = rest.flatten - strategies = rest.empty? ? Merb::Authentication.default_strategy_order : rest - + + strategies = if rest.empty? + if request.session[:authentication_strategies] + request.session[:authentication_strategies] + else + Merb::Authentication.default_strategy_order + end + else + request.session[:authentication_strategies] ||= [] + request.session[:authentication_strategies] << rest + request.session[:authentication_strategies].flatten!.uniq! + request.session[:authentication_strategies] + end + msg = opts[:message] || error_message user = nil # This one should find the first one that matches. It should not run antother @@ -87,19 +99,13 @@ module Merb user end end + # Check after callbacks to make sure the user is still cool - Merb::Authentication.after_callbacks.each do |cb| - user = case cb - when Proc - cb.call(user, request, params) - when Symbol, String - user.send(cb) - end - break unless user - end if user + user = run_after_authentication_callbacks(user, request, params) if user # Finally, Raise an error if there is no user found, or set it in the session if there is. raise Merb::Controller::Unauthenticated, msg unless user + session[:authentication_strategies] = nil # clear the session of Failed Strategies if login is successful self.user = user end @@ -142,11 +148,12 @@ module Merb # Keeps track of strategies by class or string # When loading from string, strategies are loaded withing the Merb::Authentication::Strategies namespace # When loaded by class, the class is stored directly + # @private def self.lookup_strategy @strategy_lookup || reset_strategy_lookup! end - # Restets the strategy lookup. Useful in specsd + # Restets the strategy lookup. Useful in specs def self.reset_strategy_lookup! @strategy_lookup = Mash.new do |h,k| case k @@ -158,5 +165,26 @@ module Merb end end + # Maintains a list of keys to maintain when needing to keep some state + # in the face of session.abandon! You need to maintain this state yourself + # @public + def self.maintain_session_keys + @maintain_session_keys ||= [:authentication_strategies] + end + + private + def run_after_authentication_callbacks(user, request, params) + Merb::Authentication.after_callbacks.each do |cb| + user = case cb + when Proc + cb.call(user, request, params) + when Symbol, String + user.send(cb) + end + break unless user + end + user + end + end # Merb::Authentication end # Merb merb-auth/merb-auth-core/lib/merb-auth-core/authentication.rb @@ -25,12 +25,12 @@ module Merb::AuthenticatedHelper # # set the ignore url via an :ignore option in the opts hash. def redirect_back_or(default_url, opts = {}) - if session.authentication.return_to_url && ![opts[:ignore]].flatten.include?(session.authentication.return_to_url) - redirect session.authentication.return_to_url, opts + if !session[:return_to].blank? && ![opts[:ignore]].flatten.include?(session[:return_to].first) + redirect session[:return_to].first, opts + session[:return_to] = nil else redirect default_url, opts end - session.authentication.return_to_url = nil "Redirecting to <a href='#{default_url}'>#{default_url}</a>" end @@ -49,23 +49,30 @@ module Merb::Authentication::Mixins private def _set_return_to - session.authentication.return_to_url ||= request.uri unless request.exceptions.blank? + unless request.exceptions.blank? + session[:return_to] ||= [] + session[:return_to] << request.uri + session[:return_to] + end end end # RedirectBack end # Merb::Authentication::Mixins # Adds required methods to the Authentication object for redirection -class Merb::Authentication - - def return_to_url - @return_to_url ||= session[:return_to] - end - - def return_to_url=(return_url) - @return_to_url = session[:return_to] = return_url - end +Merb::BootLoader.after_app_loads do + Merb::Authentication.maintain_session_keys << :return_to end +# class Merb::Authentication +# +# def return_to_url +# @return_to_url ||= session[:return_to] +# end +# +# def return_to_url=(return_url) +# @return_to_url = session[:return_to] = return_url +# end +# end # Mixin the RedirectBack mixin before the after_app_loads block (i.e. make sure there is an exceptions controller) Merb::Authentication.customize_default do merb-auth/merb-auth-more/lib/merb-auth-more/mixins/redirect_back.rb @@ -4,80 +4,94 @@ require File.join(File.expand_path(File.dirname(__FILE__)), "..", ".." ,"lib", " describe "redirect_back" do before(:all) do + Merb::Config[:exception_details] = true clear_strategies! + Merb::Router.reset! + Merb::Router.prepare do + match("/login", :method => :get).to(:controller => "exceptions", :action => "unauthenticated").name(:login) + match("/login", :method => :put).to(:controller => "sessions", :action => "update") + match("/go_back").to(:controller => "my_controller") + match("/").to(:controller => "my_controller") + match("/logout", :method => :delete).to(:controller => "sessions", :action => "destroy") + end class Merb::Authentication def store_user(user); user; end def fetch_user(session_info); session_info; end end - class MyStrategy < Merb::Authentication::Strategy; def run!; request.env["USER"]; end; end + # class MyStrategy < Merb::Authentication::Strategy; def run!; request.env["USER"]; end; end + class MyStrategy < Merb::Authentication::Strategy + def run! + params[:pass_auth] = false if params[:pass_auth] == "false" + params[:pass_auth] + end + end class Application < Merb::Controller; end class Exceptions < Merb::Controller include Merb::Authentication::Mixins::RedirectBack + def unauthenticated; end + + end + + class Sessions < Merb::Controller + before :ensure_authenticated + def update + redirect_back_or "/", :ignore => [url(:login)] + end + + def destroy + session.abandon! + end end class MyController < Application before :ensure_authenticated - def index; "HERE!" end + def index + "IN MY CONTROLLER" + end end + end + def login + request("/login", :method => "put", :params => {:pass_auth => true}) + end + it "should set the return_to in the session when sent to the exceptions controller from a failed login" do - controller = dispatch_to(Exceptions, :unauthenticated, {}, {:user => "winna", :request_uri => "go_back"}) do |c| - c.request.exceptions = [Merb::Controller::Unauthenticated.new] - end - controller.session.authentication.return_to_url.should == "go_back" + r = request("/go_back") + r.status.should == Merb::Controller::Unauthenticated.status + r2 = login + r2.should redirect_to("/go_back") end it "should not set the return_to in the session when deliberately going to unauthenticated" do - controller = dispatch_to(Exceptions, :unauthenticated, {}, {:user => "winna", :request_uri => "don't_go_back"}) do |c| - c.request.exceptions = [] - end - controller.session.authentication.return_to_url.should be_nil + r = login + r.should redirect_to("/") end - it "should not set the return_to when loggin into a controller directly" do - controller = dispatch_to(MyController, :index, {}, :user => "winna", :request_uri => "NOOO") - controller.session.authentication.return_to_url.should be_nil + it "should still redirect to the original even if it's failed many times" do + request("/go_back") + request("/login", :method => "put", :params => {:pass_auth => false}) + request("/login", :method => "put", :params => {:pass_auth => false}) + request("/login", :method => "put", :params => {:pass_auth => false}) + r = login + r.should redirect_to("/go_back") end - - describe "redirect_back helper" do - - before(:each) do - @with_redirect = dispatch_to(Exceptions, :unauthenticated, {}, :user => "WINNA", :request_uri => "request_uri") do |c| - c.request.exceptions = [Merb::Controller::Unauthenticated.new] - end - @no_redirect = dispatch_to(MyController, :index, {}, :user => "winna", :request_uri => "NOOO") - end - - it "should provide the url stored in the session" do - @with_redirect.session.authentication.return_to_url.should == "request_uri" - @with_redirect.redirect_back_or("/some/path") - @with_redirect.headers["Location"].should == "request_uri" - end - - it "should provide the url passed in by default when there is no return_to" do - @no_redirect.session.authentication.return_to_url.should be_nil - @no_redirect.redirect_back_or("/some/path") - @no_redirect.headers["Location"].should == "/some/path" - end - - it "should wipe out the return_to in the session after the redirect" do - @with_redirect.session.authentication.return_to_url.should == "request_uri" - @with_redirect.redirect_back_or("somewhere") - @with_redirect.headers["Location"].should == "request_uri" - @with_redirect.session.authentication.return_to_url.should be_nil - end - - it "should ignore a return_to if it's the same as the ignore url" do - @with_redirect.redirect_back_or("somewhere", :ignore => "request_uri") - @with_redirect.headers["Location"].should == "somewhere" - end - + + it "should not redirect back to a previous redirect back after being logged out" do + request("/go_back") + request("/login", :method => "put", :params => {:pass_auth => false}) + request("/login", :method => "put", :params => {:pass_auth => false}) + request("/login", :method => "put", :params => {:pass_auth => false}) + r = login + r.should redirect_to("/go_back") + request("/logout", :method => "delete") + r = login + r.should redirect_to("/") end end \ No newline at end of file merb-auth/merb-auth-more/spec/mixins/redirect_back_spec.rb @@ -1,9 +1,8 @@ class MerbAuthSlicePassword::Sessions < MerbAuthSlicePassword::Application - before :_grab_return_to # Need to hang onto the redirection during the session.abandon! - after :_store_return_to_in_session # Need to hang onto the redirection during the session.abandon! - + before :_maintain_auth_session_before, :exclude => [:destroy] # Need to hang onto the redirection during the session.abandon! before :_abandon_session, :only => [:update, :destroy] + before :_maintain_auth_session_after, :exclude => [:destroy] # Need to hang onto the redirection during the session.abandon! before :ensure_authenticated, :only => [:update] # redirect from an after filter for max flexibility @@ -33,15 +32,20 @@ class MerbAuthSlicePassword::Sessions < MerbAuthSlicePassword::Application message[:notice] = "Logged Out" redirect "/", :message => message end - + # @private - def _grab_return_to - session.authentication.return_to_url + def _maintain_auth_session_before + @_maintain_auth_session = {} + Merb::Authentication.maintain_session_keys.each do |k| + @_maintain_auth_session[k] = session[k] + end end - + # @private - def _store_return_to_in_session - session.authentication.return_to_url = session.authentication.return_to_url + def _maintain_auth_session_after + @_maintain_auth_session.each do |k,v| + session[k] = v + end end # @private merb-auth/merb-auth-slice-password/app/controllers/sessions.rb @@ -94,23 +94,23 @@ describe Merb::Cache::CacheMixin do describe "#_parameters_and_conditions" do it "should remove the :params entry from the conditions hash" do - @controller._parameters_and_conditions(:params => [:foo, :bar]).last.should_not include(:params) + @controller._parameters_and_conditions(:params => [:foo, :bar]).last.should_not have_key(:params) end it "should remove the :store entry from the conditions hash" do - @controller._parameters_and_conditions(:store => :foo_store).last.should_not include(:store) + @controller._parameters_and_conditions(:store => :foo_store).last.should_not have_key(:store) end it "should remove the :stores entry from the conditions hash" do - @controller._parameters_and_conditions(:stores => [:foo_store, :bar_store]).last.should_not include(:stores) + @controller._parameters_and_conditions(:stores => [:foo_store, :bar_store]).last.should_not have_key(:stores) end it "should keep an :expires_in entry in the conditions hash" do - @controller._parameters_and_conditions(:expire_in => 10).last.should include(:expire_in) + @controller._parameters_and_conditions(:expire_in => 10).last.should have_key(:expire_in) end it "should move the :params entry to the parameters array" do - @controller._parameters_and_conditions(:params => :foo).first.should include(:foo) + @controller._parameters_and_conditions(:params => :foo).first.should have_key(:foo) end end merb-cache/spec/merb-cache/merb_ext/controller_spec.rb @@ -230,6 +230,12 @@ end setup_specs("mri", "spec") setup_specs("jruby", "jruby -S spec") +task "specs:core_ext" do + require "lib/merb-core/test/run_specs" + run_specs("spec/public/core_ext/*_spec.rb", "spec", "-c -f o") +end + +task "spec" => ["specs:mri"] task "specs" => ["specs:mri"] task "specs:private" => ["specs:mri:private"] task "specs:public" => ["specs:mri:public"] merb-core/Rakefile @@ -402,7 +402,12 @@ module Merb Merb.logger.fatal! print_colorized_backtrace(e) if e && Merb::Config[:verbose] - exit(1) + + if Merb::Config[:show_ugly_backtraces] + raise e + else + exit(1) + end end # Print a colorized backtrace to the merb logger. merb-core/lib/merb-core.rb @@ -14,6 +14,7 @@ module Merb autoload :Rack, "merb-core/rack" autoload :RenderMixin, "merb-core/controller/mixins/render" autoload :Request, "merb-core/dispatch/request" + autoload :Parse, "merb-core/dispatch/request_parsers.rb" autoload :ResponderMixin, "merb-core/controller/mixins/responder" autoload :Router, "merb-core/dispatch/router" autoload :Test, "merb-core/test" merb-core/lib/merb-core/autoload.rb @@ -133,7 +133,7 @@ module Merb default_redirect_options = { :message => nil, :permanent => false } opts = default_redirect_options.merge(opts) if opts[:message] - notice = Merb::Request.escape([Marshal.dump(opts[:message])].pack("m")) + notice = Merb::Parse.escape([Marshal.dump(opts[:message])].pack("m")) url = url =~ /\?/ ? "#{url}&_message=#{notice}" : "#{url}?_message=#{notice}" end self.status = opts[:permanent] ? 301 : 302 merb-core/lib/merb-core/controller/mixins/controller.rb @@ -18,20 +18,16 @@ module Kernel # # @api private def track_dependency(name, *ver, &blk) - ver.pop if ver.last.is_a?(Hash) && ver.last.empty? - dep = Gem::Dependency.new(name, ver.empty? ? nil : ver) - dep.require_block = blk - dep.require_as = (ver.last.is_a?(Hash) && ver.last[:require_as]) || name + options = ver.pop if ver.last.is_a?(Hash) + new_dep = Gem::Dependency.new(name, ver.empty? ? nil : ver) + new_dep.require_block = blk + new_dep.require_as = (options && options[:require_as]) || name - existing = Merb::BootLoader::Dependencies.dependencies.find { |d| d.name == dep.name } - if existing - index = Merb::BootLoader::Dependencies.dependencies.index(existing) - Merb::BootLoader::Dependencies.dependencies.delete(existing) - Merb::BootLoader::Dependencies.dependencies.insert(index, dep) - else - Merb::BootLoader::Dependencies.dependencies << dep - end - return dep + deps = Merb::BootLoader::Dependencies.dependencies + + deps.reject! {|current| current.name == new_dep.name } + deps << new_dep + new_dep end # Loads the given string as a gem. Execution is deferred until merb-core/lib/merb-core/core_ext/kernel.rb @@ -68,7 +68,7 @@ module Merb options["expires"] = expiry.gmtime.strftime(Merb::Const::COOKIE_EXPIRATION_FORMAT) end secure = options.delete("secure") - kookie = "#{name}=#{Merb::Request.escape(value)}; " + kookie = "#{name}=#{Merb::Parse.escape(value)}; " # WebKit in particular doens't like empty cookie options - skip them. options.each { |k, v| kookie << "#{k}=#{v}; " unless v.blank? } kookie << 'secure' if secure @@ -116,7 +116,7 @@ module Merb # a Hash of key => value pairs. def cookies @cookies ||= begin - values = self.class.query_parse(@env[Merb::Const::HTTP_COOKIE], ';,') + values = Merb::Parse.query(@env[Merb::Const::HTTP_COOKIE], ';,') cookies = Merb::Cookies.new(values) cookies.update(default_cookies) if respond_to?(:default_cookies) cookies merb-core/lib/merb-core/dispatch/cookies.rb @@ -179,7 +179,7 @@ module Merb # # @api private def query_params - @query_params ||= self.class.query_parse(query_string || '') + @query_params ||= Merb::Parse.query(query_string || '') end # Parameters passed in the body of the request. Ajax calls from @@ -192,7 +192,7 @@ module Merb def body_params @body_params ||= begin if content_type && content_type.match(Merb::Const::FORM_URL_ENCODED_REGEXP) # or content_type.nil? - self.class.query_parse(raw_post) + Merb::Parse.query(raw_post) end end end @@ -226,7 +226,7 @@ module Merb # if the content-type is multipart # parse the multipart. Otherwise return {} if (Merb::Const::MULTIPART_REGEXP =~ content_type) - self.class.parse_multipart(@body, $1, content_length) + Merb::Parse.multipart(@body, $1, content_length) else {} end @@ -299,7 +299,7 @@ module Merb def message return {} unless params[:_message] begin - Marshal.load(Merb::Request.unescape(params[:_message]).unpack("m").first) + Marshal.load(Merb::Parse.unescape(params[:_message]).unpack("m").first) rescue ArgumentError, TypeError {} end @@ -539,7 +539,7 @@ module Merb # # @api public def path_info - @path_info ||= self.class.unescape(@env[Merb::Const::PATH_INFO]) + @path_info ||= Merb::Parse.unescape(@env[Merb::Const::PATH_INFO]) end # ==== Returns @@ -555,7 +555,8 @@ module Merb # # @api public def host - @env[Merb::Const::HTTP_X_FORWARDED_HOST] || @env[Merb::Const::HTTP_HOST] + @env[Merb::Const::HTTP_X_FORWARDED_HOST] || @env[Merb::Const::HTTP_HOST] || + @env[Merb::Const::SERVER_NAME] end # ==== Parameters @@ -603,227 +604,5 @@ module Merb end end - class << self - - # ==== Parameters - # value<Array, Hash, Dictionary ~to_s>:: The value for the query string. - # prefix<~to_s>:: The prefix to add to the query string keys. - # - # ==== Returns - # String:: The query string. - # - # ==== Alternatives - # If the value is a string, the prefix will be used as the key. - # - # ==== Examples - # params_to_query_string(10, "page") - # # => "page=10" - # params_to_query_string({ :page => 10, :word => "ruby" }) - # # => "page=10&word=ruby" - # params_to_query_string({ :page => 10, :word => "ruby" }, "search") - # # => "search[page]=10&search[word]=ruby" - # params_to_query_string([ "ice-cream", "cake" ], "shopping_list") - # # => "shopping_list[]=ice-cream&shopping_list[]=cake" - # - # @api private - def params_to_query_string(value, prefix = nil) - case value - when Array - value.map { |v| - params_to_query_string(v, "#{prefix}[]") - } * "&" - when Hash, Dictionary - value.map { |k, v| - params_to_query_string(v, prefix ? "#{prefix}[#{Merb::Request.escape(k)}]" : Merb::Request.escape(k)) - } * "&" - else - "#{prefix}=#{Merb::Request.escape(value)}" - end - end - - # ==== Parameters - # s<String>:: String to URL escape. - # - # ==== returns - # String:: The escaped string. - # - # @api private - def escape(s) - s.to_s.gsub(/([^ a-zA-Z0-9_.-]+)/n) { - '%'+$1.unpack('H2'*$1.size).join('%').upcase - }.tr(' ', '+') - end - - # ==== Parameter - # s<String>:: String to URL unescape. - # - # ==== returns - # String:: The unescaped string. - # - # @api private - def unescape(s) - s.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/n){ - [$1.delete('%')].pack('H*') - } - end - - # ==== Parameters - # query_string<String>:: The query string. - # delimiter<String>:: The query string divider. Defaults to "&". - # preserve_order<Boolean>:: Preserve order of args. Defaults to false. - # - # ==== Returns - # Mash:: The parsed query string (Dictionary if preserve_order is set). - # - # ==== Examples - # query_parse("bar=nik&post[body]=heya") - # # => { :bar => "nik", :post => { :body => "heya" } } - # - # @api private - def query_parse(query_string, delimiter = '&;', preserve_order = false) - query = preserve_order ? Dictionary.new : {} - for pair in (query_string || '').split(/[#{delimiter}] */n) - key, value = unescape(pair).split('=',2) - next if key.nil? - if key.include?('[') - normalize_params(query, key, value) - else - query[key] = value - end - end - preserve_order ? query : query.to_mash - end - - NAME_REGEX = /Content-Disposition:.* name="?([^\";]*)"?/ni.freeze - CONTENT_TYPE_REGEX = /Content-Type: (.*)\r\n/ni.freeze - FILENAME_REGEX = /Content-Disposition:.* filename="?([^\";]*)"?/ni.freeze - CRLF = "\r\n".freeze - EOL = CRLF - - # ==== Parameters - # request<IO>:: The raw request. - # boundary<String>:: The boundary string. - # content_length<Fixnum>:: The length of the content. - # - # ==== Raises - # ControllerExceptions::MultiPartParseError:: Failed to parse request. - # - # ==== Returns - # Hash:: The parsed request. - # - # @api private - def parse_multipart(request, boundary, content_length) - boundary = "--#{boundary}" - paramhsh = {} - buf = "" - input = request - input.binmode if defined? input.binmode - boundary_size = boundary.size + EOL.size - bufsize = 16384 - content_length -= boundary_size - status = input.read(boundary_size) - return {} if status == nil || status.empty? - raise ControllerExceptions::MultiPartParseError, "bad content body:\n'#{status}' should == '#{boundary + EOL}'" unless status == boundary + EOL - rx = /(?:#{EOL})?#{Regexp.quote(boundary,'n')}(#{EOL}|--)/ - loop { - head = nil - body = '' - filename = content_type = name = nil - read_size = 0 - until head && buf =~ rx - i = buf.index("\r\n\r\n") - if( i == nil && read_size == 0 && content_length == 0 ) - content_length = -1 - break - end - if !head && i - head = buf.slice!(0, i+2) # First \r\n - buf.slice!(0, 2) # Second \r\n - filename = head[FILENAME_REGEX, 1] - content_type = head[CONTENT_TYPE_REGEX, 1] - name = head[NAME_REGEX, 1] - - if filename && !filename.empty? - body = Tempfile.new(:Merb) - body.binmode if defined? body.binmode - end - next - end - - # Save the read body part. - if head && (boundary_size+4 < buf.size) - body << buf.slice!(0, buf.size - (boundary_size+4)) - end - - read_size = bufsize < content_length ? bufsize : content_length - if( read_size > 0 ) - c = input.read(read_size) - raise ControllerExceptions::MultiPartParseError, "bad content body" if c.nil? || c.empty? - buf << c - content_length -= c.size - end - end - - # Save the rest. - if i = buf.index(rx) - body << buf.slice!(0, i) - buf.slice!(0, boundary_size+2) - - content_length = -1 if $1 == "--" - end - - if filename && !filename.empty? - body.rewind - data = { - :filename => File.basename(filename), - :content_type => content_type, - :tempfile => body, - :size => File.size(body.path) - } - else - data = body - end - paramhsh = normalize_params(paramhsh,name,data) - break if buf.empty? || content_length == -1 - } - paramhsh - end - - # Converts a query string snippet to a hash and adds it to existing - # parameters. - # - # ==== Parameters - # parms<Hash>:: Parameters to add the normalized parameters to. - # name<String>:: The key of the parameter to normalize. - # val<String>:: The value of the parameter. - # - # ==== Returns - # Hash:: Normalized parameters - # - # @api private - def normalize_params(parms, name, val=nil) - name =~ %r([\[\]]*([^\[\]]+)\]*) - key = $1 || '' - after = $' || '' - - if after == "" - parms[key] = val - elsif after == "[]" - (parms[key] ||= []) << val - elsif after =~ %r(^\[\]\[([^\[\]]+)\]$) - child_key = $1 - parms[key] ||= [] - if parms[key].last.is_a?(Hash) && !parms[key].last.key?(child_key) - parms[key].last.update(child_key => val) - else - parms[key] << { child_key => val } - end - else - parms[key] ||= {} - parms[key] = normalize_params(parms[key], after, val) - end - parms - end - end end end merb-core/lib/merb-core/dispatch/request.rb @@ -223,7 +223,7 @@ module Merb ruby << " query_params.delete_if { |key, value| value.nil? }\n" ruby << " unless query_params.empty?\n" - ruby << ' url << "?#{Merb::Request.params_to_query_string(query_params)}"' << "\n" + ruby << ' url << "?#{Merb::Parse.params_to_query_string(query_params)}"' << "\n" ruby << " end\n" ruby << ' url << "##{fragment}" if fragment' << "\n" ruby << " url\n" merb-core/lib/merb-core/dispatch/router/route.rb @@ -126,7 +126,7 @@ module Merb def to_cookie unless self.empty? data = self.serialize - value = Merb::Request.escape "#{data}--#{generate_digest(data)}" + value = Merb::Parse.escape "#{data}--#{generate_digest(data)}" if value.size > MAX msg = "Cookies have limit of 4K. Session contents: #{data.inspect}" Merb.logger.error!(msg) @@ -164,7 +164,7 @@ module Merb if cookie.blank? {} else - data, digest = Merb::Request.unescape(cookie).split('--') + data, digest = Merb::Parse.unescape(cookie).split('--') return {} if data.blank? || digest.blank? unless digest == generate_digest(data) clear merb-core/lib/merb-core/dispatch/session/cookie.rb @@ -21,7 +21,6 @@ module Merb autoload :Tracer, 'merb-core/rack/middleware/tracer' autoload :ContentLength, 'merb-core/rack/middleware/content_length' autoload :ConditionalGet, 'merb-core/rack/middleware/conditional_get' - autoload :Csrf, 'merb-core/rack/middleware/csrf' autoload :StreamWrapper, 'merb-core/rack/stream_wrapper' autoload :Helpers, 'merb-core/rack/helpers' end # Rack merb-core/lib/merb-core/rack.rb @@ -33,14 +33,14 @@ module Merb # ==== Returns # Boolean:: True if file exists under the server root and is readable. def file_exist?(path) - full_path = ::File.join(@static_server.root, ::Merb::Request.unescape(path)) + full_path = ::File.join(@static_server.root, ::Merb::Parse.unescape(path)) ::File.file?(full_path) && ::File.readable?(full_path) end # ==== Parameters # env<Hash>:: Environment variables to pass on to the server. def serve_static(env) - env[Merb::Const::PATH_INFO] = ::Merb::Request.unescape(env[Merb::Const::PATH_INFO]) + env[Merb::Const::PATH_INFO] = ::Merb::Parse.unescape(env[Merb::Const::PATH_INFO]) @static_server.call(env) end merb-core/lib/merb-core/rack/middleware/static.rb @@ -292,7 +292,7 @@ module GemManagement end end end - + private def executable_wrapper(spec, bin_file_name, minigems = true) @@ -316,6 +316,7 @@ end if File.directory?(gems_dir = File.join(Dir.pwd, 'gems')) || File.directory?(gems_dir = File.join(File.dirname(__FILE__), '..', 'gems')) $BUNDLE = true; Gem.clear_paths; Gem.path.unshift(gems_dir) + ENV["PATH"] = "\#{File.dirname(__FILE__)}:\#{gems_dir}/bin:\#{ENV["PATH"]}" if (local_gem = Dir[File.join(gems_dir, "specifications", "#{spec.name}-*.gemspec")].last) version = File.basename(local_gem)[/-([\\.\\d]+)\\.gemspec$/, 1] end merb-core/lib/merb-core/tasks/gem_management.rb @@ -2,9 +2,10 @@ # testing helpers module Merb::Test::Helpers; end +require "merb-core/test/helpers/cookie_jar" require "merb-core/test/helpers/mock_request_helper" +require "merb-core/test/helpers/route_helper" require "merb-core/test/helpers/request_helper" require "merb-core/test/helpers/multipart_request_helper" require "merb-core/test/helpers/controller_helper" -require "merb-core/test/helpers/route_helper" require "merb-core/test/helpers/view_helper" \ No newline at end of file merb-core/lib/merb-core/test/helpers.rb @@ -52,7 +52,7 @@ module Merb if value.blank? self.delete(key) else - self[key] = Merb::Request.unescape(value) + self[key] = Merb::Parse.unescape(value) end end end @@ -210,7 +210,7 @@ module Merb # @api public # @deprecated def build_request(params = {}, env = {}) - params = Merb::Request.params_to_query_string(params) + params = Merb::Parse.params_to_query_string(params) query_string = env[:query_string] || env['QUERY_STRING'] env[:query_string] = query_string ? "#{query_string}&#{params}" : params merb-core/lib/merb-core/test/helpers/mock_request_helper.rb @@ -2,54 +2,48 @@ require "rack" module Merb module Test - module RequestHelper - - def describe_request(rack) - "a #{rack.original_env[:method] || rack.original_env["REQUEST_METHOD"] || "GET"} to '#{rack.url}'" - end - - def describe_input(input) - if input.respond_to?(:controller_name) - "#{input.controller_name}##{input.action_name}" - elsif input.respond_to?(:original_env) - describe_request(input) - else - input - end - end - - def status_code(input) - input.respond_to?(:status) ? input.status : input - end + module MakeRequest def request(uri, env = {}) - uri = url(uri) if uri.is_a?(Symbol) + uri = url(uri) if uri.is_a?(Symbol) + uri = URI(uri) + uri.scheme ||= "http" + uri.host ||= "example.org" if (env[:method] == "POST" || env["REQUEST_METHOD"] == "POST") params = env.delete(:body_params) if env.key?(:body_params) params = env.delete(:params) if env.key?(:params) && !env.key?(:input) - + unless env.key?(:input) - env[:input] = Merb::Request.params_to_query_string(params) + env[:input] = Merb::Parse.params_to_query_string(params) env["CONTENT_TYPE"] = "application/x-www-form-urlencoded" end end if env[:params] - uri << "?#{Merb::Request.params_to_query_string(env.delete(:params))}" + uri.query = [ + uri.query, Merb::Parse.params_to_query_string(env.delete(:params)) + ].compact.join("&") end + + ignore_cookies = env.has_key?(:jar) && env[:jar].nil? - if @__cookie__ - env["HTTP_COOKIE"] = @__cookie__ + unless ignore_cookies + # Setup a default cookie jar container + @__cookie_jar__ ||= Merb::Test::CookieJar.new + # Grab the cookie group name + jar = env.delete(:jar) || :default + # Set the cookie header with the cookies + env["HTTP_COOKIE"] = @__cookie_jar__.for(jar, uri) end - + app = Merb::Rack::Application.new - rack = app.call(::Rack::MockRequest.env_for(uri, env)) + rack = app.call(::Rack::MockRequest.env_for(uri.to_s, env)) rack = Struct.new(:status, :headers, :body, :url, :original_env). - new(rack[0], rack[1], rack[2], uri, env) - - @__cookie__ = rack.headers["Set-Cookie"] && rack.headers["Set-Cookie"].join + new(rack[0], rack[1], rack[2], uri.to_s, env) + + @__cookie_jar__.update(jar, uri, rack.headers["Set-Cookie"]) unless ignore_cookies Merb::Dispatcher.work_queue.size.times do Merb::Dispatcher.work_queue.pop.call @@ -57,9 +51,31 @@ module Merb rack end - alias requesting request - alias response_for request + end + + module RequestHelper + include MakeRequest + + def describe_request(rack) + "a #{rack.original_env[:method] || rack.original_env["REQUEST_METHOD"] || "GET"} to '#{rack.url}'" + end + + def describe_input(input) + if input.respond_to?(:controller_name) + "#{input.controller_name}##{input.action_name}" + elsif input.respond_to?(:original_env) + describe_request(input) + else + input + end + end + + def status_code(input) + input.respond_to?(:status) ? input.status : input + end + def requesting(*args) request(*args) end + def response_for(*args) request(*args) end end end end \ No newline at end of file merb-core/lib/merb-core/test/helpers/request_helper.rb @@ -36,6 +36,26 @@ Spec::Matchers.create(:be_missing, :be_client_error) do end end +Spec::Matchers.create(:have_body) do + matches do |rack, body| + @actual = if rack.respond_to?(:body) + rack.body.to_s + else + rack.to_s + end + + @actual == body + end + + negative_failure_message do |rack, body| + "Expected the response not to match:\n #{body}\nActual response was:\n #{@actual}" + end + + failure_message do |rack, body| + "Expected the response to match:\n #{body}\nActual response was:\n #{@actual}" + end +end + Spec::Matchers.create(:have_content_type) do matches do |rack, mime_symbol| content_type = rack.headers["Content-Type"].split("; ").first merb-core/lib/merb-core/test/matchers/request_matchers.rb @@ -56,7 +56,7 @@ module Merb::Test::Rspec::RouteMatchers # ==== Returns # String:: The failure message. def failure_message - "expected the request to route to #{@expected_controller.camel_case}##{@expected_action}#{expected_parameters_message}, but was #{@target_controller.camel_case}##{@target_action}#{actual_parameters_message}" + "expected the request to route to #{@expected_controller.to_const_string}##{@expected_action}#{expected_parameters_message}, but was #{@target_controller.to_const_string}##{@target_action}#{actual_parameters_message}" end # ==== Returns merb-core/lib/merb-core/test/matchers/route_matchers.rb @@ -16,12 +16,12 @@ describe Merb::Controller, " redirects" do it "redirects with messages" do @controller = dispatch_to(Merb::Test::Fixtures::Controllers::RedirectWithMessage, :index) @controller.status.should == 302 - expected_url = Merb::Request.escape([Marshal.dump(:notice => "what?")].pack("m")) + expected_url = Merb::Parse.escape([Marshal.dump(:notice => "what?")].pack("m")) @controller.headers["Location"].should == "/?_message=#{expected_url}" end it "consumes redirects with messages" do - message = Merb::Request.escape([Marshal.dump(:notice => "what?")].pack("m")) + message = Merb::Parse.escape([Marshal.dump(:notice => "what?")].pack("m")) @controller = dispatch_to(Merb::Test::Fixtures::Controllers::ConsumesMessage, :index, {:_message => message}) @controller.body.should == "\"what?\"" end @@ -32,7 +32,7 @@ describe Merb::Controller, " redirects" do end it "handles malformed message" do - message = Merb::Request.escape([Marshal.dump(:notice => "what?")].pack("m")) + message = Merb::Parse.escape([Marshal.dump(:notice => "what?")].pack("m")) message = message.reverse lambda do @controller = dispatch_to(Merb::Test::Fixtures::Controllers::SetsMessage, :index, {:_message => message}) merb-core/spec/public/controller/redirect_spec.rb @@ -3,71 +3,6 @@ startup_merb $:.push File.join(File.dirname(__FILE__), "fixtures") -describe Kernel, "#dependency" do - - before { reset_dependency('core_ext_dependency', :CoreExtDependency) } - - it "works even when the BootLoader has already finished" do - dependency "core_ext_dependency" - defined?(CoreExtDependency).should_not be_nil - end - - it "takes :immediate => true to require a dependency immediately" do - Merb::BootLoader::finished.delete("Merb::BootLoader::Dependencies") - dependency "core_ext_dependency" - defined?(CoreExtDependency).should be_nil - dependency "core_ext_dependency", :immediate => true - defined?(CoreExtDependency).should_not be_nil - Merb::BootLoader::finished << "Merb::BootLoader::Dependencies" - end - - it "returns a Gem::Dependency" do - dep = dependency "core_ext_dependency", ">= 1.1.2" - dep.name.should == "core_ext_dependency" - dep.version_requirements.to_s.should == ">= 1.1.2" - end - - it "adds a Gem::Dependency item to Merb::BootLoader::Dependencies.dependencies" do - dep = dependency "core_ext_dependency", ">= 1.1.2" - dep.name.should == "core_ext_dependency" - dep.version_requirements.to_s.should == ">= 1.1.2" - Merb::BootLoader::Dependencies.dependencies.should include(dep) - end - - it "will replace any previously registered dependencies with the same name" do - dep = dependency "core_ext_dependency", ">= 1.1.0" - dep.version_requirements.to_s.should == ">= 1.1.0" - dep = dependency "core_ext_dependency", ">= 1.1.2" - dep.version_requirements.to_s.should == ">= 1.1.2" - entries = Merb::BootLoader::Dependencies.dependencies.select { |d| d.name == dep.name } - entries.first.version_requirements.to_s.should == ">= 1.1.2" - entries.length.should == 1 - end - -end - -describe Kernel, "#load_dependency" do - - before { reset_dependency('core_ext_dependency', :CoreExtDependency) } - - it "requires a dependency immediately" do - load_dependency "core_ext_dependency" - defined?(CoreExtDependency).should_not be_nil - end - - it "returns a Gem::Dependency" do - dep = load_dependency "core_ext_dependency" - dep.name.should == "core_ext_dependency" - ["", ">= 0"].include?(dep.version_requirements.to_s.should) - end - - it "adds a Gem::Dependency item to Merb::BootLoader::Dependencies.dependencies" do - dep = load_dependency "core_ext_dependency" - Merb::BootLoader::Dependencies.dependencies.should include(dep) - end - -end - describe Kernel, "#use_orm" do before do merb-core/spec/public/core_ext/kernel_spec.rb @@ -31,7 +31,7 @@ describe Merb::Rack::Application do it 'does not set Date header' do status, headers, body = @app.call(@env) - headers.should_not include(Merb::Const::DATE) + headers.keys.should_not include(Merb::Const::DATE) end describe "#deferred?" do merb-core/spec/public/rack/rack_middleware_spec.rb @@ -2,268 +2,111 @@ require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper")) Merb.start :environment => 'test', :log_level => :fatal -Dir[File.join(File.dirname(__FILE__), "controllers/**/*.rb")].each do |f| - require f -end +require File.dirname(__FILE__) / "controllers/request_controller" describe Merb::Test::RequestHelper do - describe Merb::Test::RequestHelper::CookieJar do + before(:each) do + Merb::Controller._default_cookie_domain = "example.org" - it "should update its values from a request object" do - cookie_jar = Merb::Test::RequestHelper::CookieJar.new - cookie_jar.should be_empty - request = fake_request - request.cookies[:foo] = "bar+baz" # escaped by default - cookie_jar.update_from_request request - cookie_jar[:foo].should == 'bar baz' + Merb::Router.prepare do + with(:controller => "merb/test/request_controller") do + match("/set/short/long/read").to(:action => "get") + match("/:action(/:junk)", :junk => ".*").register + end end - - end + end - describe "#dispatch_to" do - - before(:all) do - @controller_klass = Merb::Test::DispatchController - end - - it "should dispatch to the given controller and action" do - Merb::Test::ControllerAssertionMock.should_receive(:called).with(:index) - - dispatch_to(@controller_klass, :index) - end - - it "should dispatch to the given controller and action with params" do - Merb::Test::ControllerAssertionMock.should_receive(:called).with(:show) - - controller = dispatch_to(@controller_klass, :show, :name => "Fred") - controller.params[:name].should == "Fred" - end - - it "should dispatch to the given controller and action with the query string merged into the params" do - Merb::Test::ControllerAssertionMock.should_receive(:called).with(:show) - controller = dispatch_to(@controller_klass, :show, {:name => "Fred"}, {'QUERY_STRING' => "last_name=Jones&age=42"} ) - - controller.params[:name].should == "Fred" - controller.params[:last_name].should == "Jones" - controller.params[:age].should == "42" - end - - it "should not hit the router to match its route" do - Merb::Router.should_not_receive(:match) - dispatch_to(@controller_klass, :index) - end - - it "merges :controller into params" do - controller = dispatch_to(@controller_klass, :show, :name => "Fred") - - controller.params[:controller].should == @controller_klass.name.to_const_path - end - - it "merges :action into params" do - controller = dispatch_to(@controller_klass, :show, :name => "Fred") - - controller.params[:action].should == "show" - end - - it "should support setting request.raw_post" do - controller = dispatch_to(@controller_klass, :show, {}, {:post_body => 'some XML'}) - controller.request.raw_post.should == 'some XML' - end + it "should dispatch a request using GET by defalt" do + request("/method").should have_body("Method - GET") end - describe "#dispatch_with_basic_authentication_to" do - - before(:all) do - @controller_klass = Merb::Test::DispatchController - end - - it "should dispatch to the given controller and action" do - Merb::Test::ControllerAssertionMock.should_receive(:called).with(:index) - - dispatch_with_basic_authentication_to(@controller_klass, :index, "Fred", "secret") - end - - it "should dispatch to the given controller and action with authentication token" do - Merb::Test::ControllerAssertionMock.should_receive(:called).with(:show) - - controller = dispatch_with_basic_authentication_to(@controller_klass, :show, "Fred", "secret") - - controller.request.env["X_HTTP_AUTHORIZATION"].should == "Basic #{Base64.encode64("Fred:secret")}" - end - - it "should dispatch to the given controller and action with authentication token and params" do - Merb::Test::ControllerAssertionMock.should_receive(:called).with(:show) - - controller = dispatch_with_basic_authentication_to(@controller_klass, :show, "Fred", "secret", :name => "Fred") - - controller.request.env["X_HTTP_AUTHORIZATION"].should == "Basic #{Base64.encode64("Fred:secret")}" - controller.params[:name].should == "Fred" - end - - it "should not hit the router to match its route" do - Merb::Router.should_not_receive(:match) - dispatch_with_basic_authentication_to(@controller_klass, :index, "Fred", "secret") - end + it "should persist cookies across sequential cookie setting requests" do + request("/counter").should have_body("1") + request("/counter").should have_body("2") end - - describe "#get" do - before(:each) do - Merb::Router.prepare do |r| - r.resources :spec_helper_controller - r.match("/:controller/:action/:custom").to(:controller => ":controller") - end - end - - it "should perform the index action when used with a get" do - Merb::Test::ControllerAssertionMock.should_receive(:called).with(:index) - get("/spec_helper_controller") - end - - it "should perform the index action and have params available" do - Merb::Test::ControllerAssertionMock.should_receive(:called).with(:index) - controller = get("/spec_helper_controller", :name => "Harry") - controller.params[:name].should == "Harry" - end - - it "should perform the index action and have params available from the query string" do - Merb::Test::ControllerAssertionMock.should_receive(:called).with(:index) - controller = get("/spec_helper_controller?last_name=Oswald&age=25", :name => "Harry") - controller.params[:name].should == "Harry" - controller.params[:last_name].should == "Oswald" - controller.params[:age].should == "25" - end - - it "should evaluate in the context of the controller in the block" do - get("/spec_helper_controller") do |controller| - controller.class.should == SpecHelperController - end - end - - it "should allow for custom router params" do - controller = get("/spec_helper_controller/index/my_custom_stuff") - controller.params[:custom].should == "my_custom_stuff" - end - - it "should get the show action" do - Merb::Test::ControllerAssertionMock.should_receive(:called).with(:show) - controller = get("/spec_helper_controller/my_id") - controller.params[:id].should == "my_id" - end + + it "should persist cookies across requests that don't return any cookie headers" do + request("/counter").should have_body("1") + request("/void").should have_body("Void") + request('/counter').should have_body("2") end - - describe "#post" do - before(:each) do - Merb::Router.prepare do |r| - r.resources :spec_helper_controller - end - end - - it "should post to the create action" do - Merb::Test::ControllerAssertionMock.should_receive(:called).with(:create) - post("/spec_helper_controller") - end - - it "should post to the create action with params" do - Merb::Test::ControllerAssertionMock.should_receive(:called).with(:create) - controller = post("/spec_helper_controller", :name => "Harry") - controller.params[:name].should == "Harry" - end + + it "should delete cookies from the jar" do + request("/counter").should have_body("1") + request("/delete").should have_body("Delete") + request("/counter").should have_body("1") end - - describe "#put" do - before(:each) do - Merb::Router.prepare do |r| - r.resources :spec_helper_controller - end - end - it "should put to the update action" do - Merb::Test::ControllerAssertionMock.should_receive(:called).with(:update) - put("/spec_helper_controller/1") - end - - it "should put to the update action with params" do - Merb::Test::ControllerAssertionMock.should_receive(:called).with(:update) - controller = put("/spec_helper_controller/my_id", :name => "Harry") - controller.params[:name].should == "Harry" - controller.params[:id].should == "my_id" - end + + it "should be able to disable the cookie jar" do + request("/counter", :jar => nil).should have_body("1") + request("/counter", :jar => nil).should have_body("1") + request("/counter").should have_body("1") + request("/counter").should have_body("2") end - - describe "#delete" do - before(:each) do - Merb::Router.prepare do |r| - r.resources :spec_helper_controller - end - end - it "should put to the update action" do - Merb::Test::ControllerAssertionMock.should_receive(:called).with(:destroy) - delete("/spec_helper_controller/1") - end - - it "should put to the update action with params" do - Merb::Test::ControllerAssertionMock.should_receive(:called).with(:destroy) - controller = delete("/spec_helper_controller/my_id", :name => "Harry") - controller.params[:name].should == "Harry" - controller.params[:id].should == "my_id" - end + + it "should be able to specify separate jars" do + request("/counter", :jar => :one).should have_body("1") + request("/counter", :jar => :two).should have_body("1") + request("/counter", :jar => :one).should have_body("2") + request("/counter", :jar => :two).should have_body("2") end - describe "#request" do - before(:each) do - Merb::Router.prepare do |r| - r.namespace :namespaced do |namespaced| - namespaced.resources :spec_helper_controller - end - end - end - - it "should support setting request.raw_post" do - controller = mock_request("/namespaced/spec_helper_controller", {}, {:post_body => 'some XML'}) - controller.request.raw_post.should == 'some XML' - end - - it "should get namespaced index action" do - Merb::Test::ControllerAssertionMock.should_receive(:called).with(:index) - controller = mock_request("/namespaced/spec_helper_controller") - controller.class.should == Namespaced::SpecHelperController - end - - it "should make the post body available in the request on deferred routing" do - Merb::Router.prepare do |r| - r.match('/xmlrpc').defer_to do |request, params| - request.raw_post.should == 'XMLRPC request body' - {:controller => 'spec_helper_controller', :action => :index} - end - end - - mock_request('/xmlrpc', {}, {:post_body => 'XMLRPC request body'}) - end + it "should respect cookie domains when no domain is explicitly set" do + request("http://example.org/counter").should have_body("1") + request("http://www.example.org/counter").should have_body("2") + request("http://example.org/counter").should have_body("3") + request("http://www.example.org/counter").should have_body("4") end -end - -module Merb::Test::RequestHelper - describe FakeRequest, ".new(env = {}, req = StringIO.new)" do - it "should create request with default enviroment, minus rack.input" do - @mock = FakeRequest.new - @mock.env.except('rack.input').should == FakeRequest::DEFAULT_ENV - end - - it "should override default env values passed in HTTP format" do - @mock = FakeRequest.new('HTTP_ACCEPT' => 'nothing') - @mock.env['HTTP_ACCEPT'].should == 'nothing' - end - - it "should override default env values passed in symbol format" do - @mock = FakeRequest.new(:http_accept => 'nothing') - @mock.env['HTTP_ACCEPT'].should == 'nothing' - end - - it "should set rack input to an empty StringIO" do - @mock = FakeRequest.new - @mock.env['rack.input'].should be_kind_of(StringIO) - @mock.env['rack.input'].read.should == '' - end + it "should respect the domain set in the cookie" do + request("http://example.org/domain").should have_body("1") + request("http://foo.example.org/domain").should have_body("1") + request("http://example.org/domain").should have_body("1") + request("http://foo.example.org/domain").should have_body("2") + end + + it "should respect the path set in the cookie" do + request("/path").should have_body("1") + request("/path/zomg").should have_body("1") + request("/path").should have_body("1") + request("/path/zomg").should have_body("2") end + + it "should use the most specific path cookie" do + request("/set/short") + request("/set/short/long") + request("/set/short/long/read").should have_body("/set/short/long") + end + + it "should use the most specific path cookie even if it was defined first" do + request("/set/short/long") + request("/set/short") + request("/set/short/long/read").should have_body("/set/short/long") + end + + it "should leave the least specific cookie intact when specifying a more specific path" do + request("/set/short") + request("/set/short/long/zomg/what/hi") + request("/set/short/long/read").should have_body("/set/short") + end + + it "should use the most specific domain cookie" do + request("http://test.com/domain_set") + request("http://one.test.com/domain_set") + request("http://one.test.com/domain_get").should have_body("one.test.com") + end + + it "should keep the less specific domain cookie" do + request("http://test.com/domain_set").should be_successful + request("http://one.test.com/domain_set").should be_successful + request("http://test.com/domain_get").should have_body("test.com") + end + + it "should respect the expiration" do + request("/expires").should have_body("1") + sleep(1) + request("/expires").should have_body("1") + end + end \ No newline at end of file merb-core/spec/public/test/request_helper_spec.rb @@ -14,4 +14,4 @@ RewriteCond %{REQUEST_FILENAME} !-f RewriteRule ^(.*)$ merb.fcgi [QSA,L] -ErrorDocument 500 "<h2>Application Error</h2>Merb could not be reached +ErrorDocument 500 "<h2>Application Error</h2>Merb could not be reached" merb-gen/lib/generators/templates/application/common/dothtaccess @@ -5,7 +5,7 @@ require 'fileutils' require 'yaml' # Important - don't change this line or its position -MERB_THOR_VERSION = '0.0.53' +MERB_THOR_VERSION = '0.1.0' ############################################################################## @@ -301,7 +301,7 @@ module GemManagement end end end - + private def executable_wrapper(spec, bin_file_name, minigems = true) @@ -325,6 +325,7 @@ end if File.directory?(gems_dir = File.join(Dir.pwd, 'gems')) || File.directory?(gems_dir = File.join(File.dirname(__FILE__), '..', 'gems')) $BUNDLE = true; Gem.clear_paths; Gem.path.unshift(gems_dir) + ENV["PATH"] = "\#{File.dirname(__FILE__)}:\#{gems_dir}/bin:\#{ENV["PATH"]}" if (local_gem = Dir[File.join(gems_dir, "specifications", "#{spec.name}-*.gemspec")].last) version = File.basename(local_gem)[/-([\\.\\d]+)\\.gemspec$/, 1] end @@ -476,8 +477,9 @@ module MerbThorHelper end def install_dependency(dependency, opts = {}) - opts[:version] ||= dependency.version_requirements.to_s - Merb::Gem.install(dependency.name, default_install_options.merge(opts)) + version = dependency.version_requirements.to_s + install_opts = default_install_options.merge(:version => version) + Merb::Gem.install(dependency.name, install_opts.merge(opts)) end def install_dependency_from_source(dependency, opts = {}) @@ -760,8 +762,10 @@ module Merb if only_missing = comp == 'missing' message "Preparing to install missing gems #{where} using #{strategy} strategy..." comp = nil + clobber = false else message "Preparing to install #{where} using #{strategy} strategy..." + clobber = true end # If comp given, filter on known stack components @@ -777,7 +781,7 @@ module Merb warning "No dependencies to install..." else puts "#{deps.length} dependencies to install..." - install_dependencies(strategy, deps) + install_dependencies(strategy, deps, clobber) end # Show current dependency info now that we're done @@ -873,10 +877,21 @@ module Merb # merb:dependencies:configure --config-file file.yml # write to the specified config file desc 'configure [comp]', 'Create a dependencies config file' - method_options "--dry-run" => :boolean, "--force" => :boolean + method_options "--dry-run" => :boolean, "--force" => :boolean, "--versions" => :boolean def configure(comp = nil) # If comp given, filter on known stack components deps = comp ? Merb::Stack.select_component_dependencies(dependencies, comp) : dependencies + + # If --versions is set, update the version_requirements with the actual version available + if options[:versions] + specs = local_gemspecs + deps.each do |dep| + if spec = specs.find { |s| s.name == dep.name } + dep.version_requirements = ::Gem::Requirement.create(spec.version) + end + end + end + config = YAML.dump(deps.map { |d| d.to_s }) puts "#{config}\n" if File.exists?(config_file) && !options[:force] @@ -902,31 +917,33 @@ module Merb end end - def install_dependencies(strategy, deps) + def install_dependencies(strategy, deps, clobber = true) if method = strategy?(strategy) # Clobber existing local dependencies - clobber_dependencies! + clobber_dependencies! if clobber # Run the chosen strategy - collect files installed from stable gems installed_from_stable = send(method, deps).map { |d| d.name } - # Sleep a bit otherwise the following steps won't see the new files - sleep(deps.length) if deps.length > 0 - - # Leave a file to denote the strategy that has been used for this dependency - self.local.each do |spec| - next unless File.directory?(spec.full_gem_path) - unless installed_from_stable.include?(spec.name) - FileUtils.touch(File.join(spec.full_gem_path, "#{strategy}.strategy")) - else - FileUtils.touch(File.join(spec.full_gem_path, "stable.strategy")) - end - end + unless dry_run? + # Sleep a bit otherwise the following steps won't see the new files + sleep(deps.length) if deps.length > 0 && deps.length <= 10 + + # Leave a file to denote the strategy that has been used for this dependency + self.local.each do |spec| + next unless File.directory?(spec.full_gem_path) + unless installed_from_stable.include?(spec.name) + FileUtils.touch(File.join(spec.full_gem_path, "#{strategy}.strategy")) + else + FileUtils.touch(File.join(spec.full_gem_path, "stable.strategy")) + end + end - # Add local binaries for the installed framework dependencies - comps = Merb::Stack.all_components & deps.map { |d| d.name } - comps << { :no_minigems => 'merb-gen' } - ensure_bin_wrapper_for(*comps) + # Add local binaries for the installed framework dependencies + comps = Merb::Stack.all_components & deps.map { |d| d.name } + comps << { :no_minigems => 'merb-gen' } + ensure_bin_wrapper_for(*comps) + end return true end false @@ -967,7 +984,7 @@ module Merb end end end - + deps end @@ -1037,15 +1054,12 @@ module Merb # Selectively update repositories for the matching dependencies update_dependency_repositories(deps) unless dry_run? - # Skip gem dependencies to prevent them from being installed from stable; - # however, core dependencies will be retrieved from source when available - install_opts = { :ignore_dependencies => true } if core = deps.find { |d| d.name == 'merb-core' } if dry_run? note "Installing #{core.name}..." else - if install_dependency_from_source(core, install_opts) - elsif install_dependency(core, install_opts) + if install_dependency_from_source(core) + elsif install_dependency(core) info "Installed #{core.name} from rubygems..." installed_from_rubygems << core end @@ -1057,8 +1071,8 @@ module Merb if dry_run? note "Installing #{dependency.name}..." else - if install_dependency_from_source(dependency, install_opts) - elsif install_dependency(dependency, install_opts) + if install_dependency_from_source(dependency) + elsif install_dependency(dependency) info "Installed #{dependency.name} from rubygems..." installed_from_rubygems << dependency end @@ -1079,24 +1093,31 @@ module Merb end # Extract application dependencies by querying the app directly. - def self.extract_dependencies(merb_root, env = 'production') + def self.extract_dependencies(merb_root) require 'merb-core' if !@_merb_loaded || Merb.root != merb_root Merb.start_environment( + :log_level => :fatal, :testing => true, :adapter => 'runner', - :environment => env, + :environment => ENV['MERB_ENV'] || 'development', :merb_root => merb_root ) @_merb_loaded = true end Merb::BootLoader::Dependencies.dependencies - rescue => e + rescue StandardError => e error "Couldn't extract dependencies from application!" error e.message puts "Make sure you're executing the task from your app (--merb-root), or" puts "specify a config option (--config or --config-file=YAML_FILE)" return [] + rescue SystemExit + error "Couldn't extract dependencies from application!" + error "application failed to run" + puts "Please check if your application runs using 'merb'; for example," + puts "look for any gem version mismatches in dependencies.rb" + return [] end # Parse the basic YAML config data, and process Gem::Dependency output. @@ -1124,6 +1145,7 @@ module Merb DM_STACK = %w[ extlib + data_objects dm-core dm-aggregates dm-migrations @@ -1143,6 +1165,9 @@ module Merb merb-mailer merb-slices merb-auth + merb-auth-core + merb-auth-more + merb-auth-slice-password merb-param-protection merb-exceptions ] + DM_STACK @@ -1221,6 +1246,15 @@ module Merb dm-rest-adapter ] + DATA_OBJECTS = %w[ + data_objects + do_derby do_hsqldb + do_jdbc + do_mysql + do_postgres + do_sqlite3 + ] + attr_accessor :system, :local, :missing include MerbThorHelper @@ -1391,6 +1425,7 @@ module Merb comps["merb-more"] = MERB_MORE.sort comps["merb-plugins"] = MERB_PLUGINS.sort comps["dm-more"] = DM_MORE.sort + comps["do"] = DATA_OBJECTS.sort comps end @@ -1416,7 +1451,7 @@ module Merb end def self.framework_components - %w[merb-core merb-more merb-plugins].inject([]) do |all, comp| + %w[merb-core merb-more].inject([]) do |all, comp| all + components(comp) end end @@ -1438,7 +1473,7 @@ module Merb end def self.base_components - %w[thor rake] + %w[thor rake extlib] end def self.all_components @@ -1450,6 +1485,7 @@ module Merb def self.core_dependencies(gem_dir = nil, ignore_deps = false) @_core_dependencies ||= begin if gem_dir # add local gems to index + orig_gem_path = ::Gem.path ::Gem.clear_paths; ::Gem.path.unshift(gem_dir) end deps = [] @@ -1464,7 +1500,7 @@ module Merb deps += gemspec.dependencies end end - ::Gem.clear_paths if gem_dir # reset + ::Gem.path.replace(orig_gem_path) if gem_dir # reset deps end end @@ -1821,6 +1857,8 @@ module Merb message "Installing #{current_gem} from source..." if install_dependency_from_source(dependency) ensure_bin_wrapper_for(dependency.name) if options[:binaries] + else + raise "gem source not found" end end end merb-gen/lib/generators/templates/application/common/merb.thor @@ -1,4 +1,3 @@ - # use PathPrefix Middleware if :path_prefix is set in Merb::Config if prefix = ::Merb::Config[:path_prefix] use Merb::Rack::PathPrefix, prefix merb-gen/lib/generators/templates/application/merb_core/config/rack.rb @@ -1,4 +1,3 @@ - # use PathPrefix Middleware if :path_prefix is set in Merb::Config if prefix = ::Merb::Config[:path_prefix] use Merb::Rack::PathPrefix, prefix merb-gen/lib/generators/templates/application/merb_stack/config/rack.rb @@ -52,9 +52,9 @@ describe "resource(:<%= plural_model %>)" do it "redirects to resource(:<%= plural_model %>)" do <%- if orm.to_sym == :datamapper -%> - @response.should redirect_to(resource(<%= singular_model.capitalize %>.first), :message => {:notice => "<%= singular_model %> was successfully created"}) + @response.should redirect_to(resource(<%= model_class_name %>.first), :message => {:notice => "<%= singular_model %> was successfully created"}) <%- elsif orm.to_sym == :activerecord -%> - @response.should redirect_to(resource(<%= singular_model.capitalize %>.first), :message => {:notice => "<%= singular_model %> was successfully created"}) + @response.should redirect_to(resource(<%= model_class_name %>.first), :message => {:notice => "<%= singular_model %> was successfully created"}) <% end -%> end merb-gen/lib/generators/templates/component/resource_controller/spec/requests/%file_name%_spec.rb @@ -36,7 +36,8 @@ describe Merb::Generators::FullSliceGenerator do "testing/stubs/app/controllers", "testing/stubs/app/controllers/application.rb", "testing/stubs/app/controllers/main.rb", "testing/TODO" ] - files.should == expected + diff = expected - files + diff.should be_empty end it "should render templates successfully" do merb-slices/spec/full_slice_generator_spec.rb @@ -3,6 +3,6 @@ $:.push File.join(File.dirname(__FILE__), '..', 'lib') require 'rubygems' -gem 'dm-core', '=0.9.6' +gem 'dm-core', '>=0.9.6' require 'dm-core' require 'merb-core' merb_datamapper/spec/spec_helper.rb merb-core/lib/merb-core/rack/middleware/csrf.rb merb-core/spec/public/rack/csrf_middleware_spec.rb 063c2574a7ffa41473f802effa92b1a41089593f a319ad0c8480bc10225909d7f97898dfd3989e4f Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/3e5171265f2cf3e4495fe5824b63e8a3cae79e3c 3e5171265f2cf3e4495fe5824b63e8a3cae79e3c 2008-10-29T14:31:13-07:00 2008-10-29T14:31:13-07:00 Merge branch 'active' of git@github.com:wycats/merb into active 082b3455504721d7894ed07ada9f0e18ac09007f Yehuda Katz wycats@gmail.com