lib/runner_helpers/base.rb lib/runner_helpers/registry.rb lib/runner_helpers/request_logger.rb lib/runner_helpers/session.rb @@ -43,6 +43,7 @@ module Mack # Gives access to the session. See Mack::Session for more information. def session + raise Mack::Errors::NoSessionError.new if self.request.session.nil? self.request.session end @@ -364,26 +365,12 @@ module Mack # Make sure that all the class level methods got included into the receiver's class # def self.included(base) - Mack::Controller::Registry.instance.controllers << base + Mack::Controller::Registry.add(base) base.extend(ClassMethods) end # Houses a repository of all the controllers in the system. - class Registry - include Singleton - - attr_reader :controllers - - def initialize - @controllers = [] - end - - # Add a controller to the registry. - def self.add(controller) - Mack::Controller::Registry.instance.controllers << controller - Mack::Controller::Registry.instance.controllers.uniq! - end - + class Registry < Mack::Utils::Registry end end # Controller lib/controller/controller.rb @@ -1,6 +1,10 @@ module Mack module Errors # :nodoc: + # Raised when there is no session available and one is trying to be accessed. + class NoSessionError < StandardError + end + # Raised when someone calls render twice in one action # # Example: lib/errors/errors.rb @@ -61,6 +61,7 @@ module Mack "mack::cache_classes" => true, "mack::use_lint" => true, "mack::show_exceptions" => true, + "mack::use_sessions" => true, "mack::session_id" => "_mack_session_id", "mack::rendering_systems" => [:action, :text, :partial, :public, :url, :xml], "mack::cookie_values" => { lib/initialization/configuration.rb @@ -35,7 +35,7 @@ unless Mack::Configuration.initialized Mack.logger.info "Initializing core classes..." # Require all the necessary files to make Mack actually work! - lib_dirs = ["errors", "core_extensions", "utils", "routing", "view_helpers", "rendering", "controller", "tasks", "initialization/server", "generators", "distributed"] + lib_dirs = ["errors", "core_extensions", "utils", "runner_helpers", "routing", "view_helpers", "rendering", "controller", "tasks", "initialization/server", "generators", "distributed"] lib_dirs << "testing" if Mack.env == "test" lib_dirs.each do |dir| dir_globs = Dir.glob(File.join(fl, dir, "**/*.rb")) lib/mack.rb @@ -9,51 +9,44 @@ module Mack attr_reader :response # :nodoc: attr_reader :request # :nodoc: attr_reader :cookies # :nodoc: + attr_reader :runner_helpers # :nodoc: + # This method needs to be defined as part of the Rack framework. As is noted for the Mack::Runner # class, this is where the center of the Mack framework lies. def call(env) - # pp env begin - setup(env) do - begin - route = Mack::Routes::RouteMap.instance.get_route_from_request(self.request) - if route[:redirect_to] - # because the route is specified to be a redirect, let's do that: - redirect_to(route) - else - self.request.all_params[:original_controller] = route[:controller] - self.request.all_params[:original_action] = route[:action] - run_controller(route) - end - # rescue Mack::Errors::ResourceNotFound, Mack::Errors::UndefinedRoute => e - # return try_to_find_resource(env, e) - rescue Exception => e - route = Mack::Routes::RouteMap.instance.get_route_from_error(e.class) - unless route.nil? - run_controller(route, e) + setup(env) + begin + route = Mack::Routes::RouteMap.instance.get_route_from_request(self.request) + if route[:redirect_to] + # because the route is specified to be a redirect, let's do that: + redirect_to(route) + else + self.request.all_params[:original_controller] = route[:controller] + self.request.all_params[:original_action] = route[:action] + run_controller(route) + end + # rescue Mack::Errors::ResourceNotFound, Mack::Errors::UndefinedRoute => e + # return try_to_find_resource(env, e) + rescue Exception => e + route = Mack::Routes::RouteMap.instance.get_route_from_error(e.class) + unless route.nil? + run_controller(route, e) + else + if e.class == Mack::Errors::ResourceNotFound || e.class == Mack::Errors::UndefinedRoute + return try_to_find_resource(env, e) else - if e.class == Mack::Errors::ResourceNotFound || e.class == Mack::Errors::UndefinedRoute - return try_to_find_resource(env, e) - else - raise e - end + raise e end end - end # setup + end + teardown rescue Exception => e Mack.logger.error(e) raise e end end - #-- - # This method gets called after the session has been established. Override this method - # to add custom code around requests. - # def custom_dispatch_wrapper - # yield - # end - #++ - #private def run_controller(route, e = nil) # let's handle a normal request: @@ -75,71 +68,25 @@ module Mack self.response.write(c.run) end - def log_request - s_time = Time.now - x = yield - e_time = Time.now - p_time = e_time - s_time - if app_config.log.detailed_requests - msg = "\n\t[#{@request.request_method.upcase}] '#{@request.path_info}'\n" - msg << "\tSession ID: #{@request.session.id}\n" - msg << "\tParameters: #{@request.all_params}\n" - msg << "\tCompleted in #{p_time} (#{(1 / p_time).round} reqs/sec) | #{@response.status} [#{@request.full_host}]" - else - msg = "[#{@request.request_method.upcase}] '#{@request.path_info}' (#{p_time})" - end - Mack.logger.info(msg) - x - end - # Setup the request, response, cookies, session, etc... # yield up, and then clean things up afterwards. def setup(env) - exception = nil - log_request do - @request = Mack::Request.new(env) - @response = Mack::Response.new - @cookies = Mack::CookieJar.new(self.request, self.response) - session do - begin - # custom_dispatch_wrapper do - yield - # end - rescue Exception => e - exception = e - end - end + @request = Mack::Request.new(env) + @response = Mack::Response.new + @cookies = Mack::CookieJar.new(self.request, self.response) + @runner_helpers = [] + Mack::RunnerHelpers::Registry.registered_items.each do |helper| + help = helper.new + help.start(self.request, self.response, self.cookies) + @runner_helpers << help end - raise exception if exception - self.response.finish end - def session - sess_id = self.cookies[app_config.mack.session_id] - unless sess_id - sess_id = create_new_session - else - sess = Cachetastic::Caches::MackSessionCache.get(sess_id) - if sess - self.request.session = sess - else - # we couldn't find it in the store, so we need to create it: - sess_id = create_new_session - end + def teardown + self.runner_helpers.reverse.each do |help| + help.complete(self.request, self.response, self.cookies) end - - yield - - Cachetastic::Caches::MackSessionCache.set(sess_id, self.request.session) - end - - def create_new_session - id = String.randomize(40).downcase - self.cookies[app_config.mack.session_id] = {:value => id, :expires => nil} - sess = Mack::Session.new(id) - self.request.session = sess - Cachetastic::Caches::MackSessionCache.set(id, sess) - id + self.response.finish end def try_to_find_resource(env, exception) lib/runner.rb @@ -1,5 +1,10 @@ module Mack module Utils + + # Houses a registry of Rack runners that should be called before the Mack::Runner. + class RunnersRegistry < Mack::Utils::Registry + end + module Server # This method wraps all the necessary components of the Rack system around @@ -8,9 +13,8 @@ module Mack # Mack framework: app = Mack::Runner.new - Mack::Utils::Server::Registry.instance.wrappers do |w| - puts "Wrapping app with: #{w}" - app = w.new(app) + Mack::Utils::RunnersRegistry.registered_items.each do |runner| + app = runner.new(app) end # Any urls listed will go straight to the public directly and will not be served up via the app: @@ -21,28 +25,9 @@ module Mack app = Rack::Recursive.new(app) # This will reload any edited classes if the cache_classes config setting is set to true. app = Rack::Reloader.new(app, 1) unless app_config.mack.cache_classes - # TODO: Not sure about this logger, investigate better ones. - # TODO: Depends on Mack.logger already being configured. - # This makes it a drag run this 'standalone' in another Ruby program. - # app = Rack::CommonLogger.new(app, Mack.logger) app end - class Registry - include Singleton - - attr_reader :wrappers - - def initialize - @wrappers = [] - end - - def add(klass) - @wrappers << klass - end - - end - end # Server end # Utils end # Mack \ No newline at end of file lib/utils/server.rb @@ -35,9 +35,9 @@ describe Mack::Controller do it "should hold a list of all the controllers registered with Mack" do class RegTestController end - Mack::Controller::Registry.instance.controllers.should_not include(RegTestController) + Mack::Controller::Registry.registered_items.should_not include(RegTestController) RegTestController.send(:include, Mack::Controller) - Mack::Controller::Registry.instance.controllers.should include(RegTestController) + Mack::Controller::Registry.registered_items.should include(RegTestController) end end test/unit/controller/controller_base_spec.rb @@ -14,4 +14,33 @@ describe Mack::Session do end + describe "app_config.mack.use_sessions" do + + class SessionSpecController + include Mack::Controller + + def index + session[:id] = params[:id] if session[:id].nil? + render(:text, "id: #{session[:id]}") + end + + end + + it "should be able to turn off sessions" do + temp_app_config("mack::use_sessions" => false) do + lambda{get "/session_spec/index"}.should raise_error(Mack::Errors::NoSessionError) + end + end + + it "should be able to turn on sessions (default)" do + get "/session_spec/index?id=1" + response.body.should match(/id: 1/) + get "/session_spec/index" + response.body.should match(/id: 1/) + get "/session_spec/index?id=2" + response.body.should match(/id: 1/) + end + + end + end \ No newline at end of file test/unit/controller/session_spec.rb 0ee488dc7d49125394c853f950263513263fb88a d32c0c6a97cc93a0649488f071f7e6bc287da723 dsutedja dsutedja@helium.com http://github.com/markbates/mack/commit/6455ed89edd2f9179f0fb0e806901ad82af474c3 6455ed89edd2f9179f0fb0e806901ad82af474c3 2008-07-22T07:31:33-07:00 2008-07-22T07:31:33-07:00 Merge branch 'master' of git@github.com:markbates/mack Conflicts: CHANGELOG 9964e2749d57526a3680da616d85706b3ce52de3 dsutedja dsutedja@helium.com