halorgium-actionpack 3.0.pre

data/lib/action_controller/caching/sweeping.rb

@@ -0,0 +1,97 @@
+module ActionController #:nodoc:
+  module Caching
+    # Sweepers are the terminators of the caching world and responsible for expiring caches when model objects change.
+    # They do this by being half-observers, half-filters and implementing callbacks for both roles. A Sweeper example:
+    #
+    #   class ListSweeper < ActionController::Caching::Sweeper
+    #     observe List, Item
+    #
+    #     def after_save(record)
+    #       list = record.is_a?(List) ? record : record.list
+    #       expire_page(:controller => "lists", :action => %w( show public feed ), :id => list.id)
+    #       expire_action(:controller => "lists", :action => "all")
+    #       list.shares.each { |share| expire_page(:controller => "lists", :action => "show", :id => share.url_key) }
+    #     end
+    #   end
+    #
+    # The sweeper is assigned in the controllers that wish to have its job performed using the <tt>cache_sweeper</tt> class method:
+    #
+    #   class ListsController < ApplicationController
+    #     caches_action :index, :show, :public, :feed
+    #     cache_sweeper :list_sweeper, :only => [ :edit, :destroy, :share ]
+    #   end
+    #
+    # In the example above, four actions are cached and three actions are responsible for expiring those caches.
+    #
+    # You can also name an explicit class in the declaration of a sweeper, which is needed if the sweeper is in a module:
+    #
+    #   class ListsController < ApplicationController
+    #     caches_action :index, :show, :public, :feed
+    #     cache_sweeper OpenBar::Sweeper, :only => [ :edit, :destroy, :share ]
+    #   end
+    module Sweeping
+      def self.included(base) #:nodoc:
+        base.extend(ClassMethods)
+      end
+
+      module ClassMethods #:nodoc:
+        def cache_sweeper(*sweepers)
+          configuration = sweepers.extract_options!
+
+          sweepers.each do |sweeper|
+            ActiveRecord::Base.observers << sweeper if defined?(ActiveRecord) and defined?(ActiveRecord::Base)
+            sweeper_instance = (sweeper.is_a?(Symbol) ? Object.const_get(sweeper.to_s.classify) : sweeper).instance
+
+            if sweeper_instance.is_a?(Sweeper)
+              around_filter(sweeper_instance, :only => configuration[:only])
+            else
+              after_filter(sweeper_instance, :only => configuration[:only])
+            end
+          end
+        end
+      end
+    end
+
+    if defined?(ActiveRecord) and defined?(ActiveRecord::Observer)
+      class Sweeper < ActiveRecord::Observer #:nodoc:
+        attr_accessor :controller
+
+        def before(controller)
+          self.controller = controller
+          callback(:before) if controller.perform_caching
+        end
+
+        def after(controller)
+          callback(:after) if controller.perform_caching
+          # Clean up, so that the controller can be collected after this request
+          self.controller = nil
+        end
+
+        protected
+          # gets the action cache path for the given options.
+          def action_path_for(options)
+            Actions::ActionCachePath.new(controller, options).path
+          end
+
+          # Retrieve instance variables set in the controller.
+          def assigns(key)
+            controller.instance_variable_get("@#{key}")
+          end
+
+        private
+          def callback(timing)
+            controller_callback_method_name = "#{timing}_#{controller.controller_name.underscore}"
+            action_callback_method_name     = "#{controller_callback_method_name}_#{controller.action_name}"
+
+            __send__(controller_callback_method_name) if respond_to?(controller_callback_method_name, true)
+            __send__(action_callback_method_name)     if respond_to?(action_callback_method_name, true)
+          end
+
+          def method_missing(method, *arguments, &block)
+            return if @controller.nil?
+            @controller.__send__(method, *arguments, &block)
+          end
+      end
+    end
+  end
+end

data/lib/action_controller/deprecated.rb

@@ -0,0 +1,4 @@
+ActionController::AbstractRequest = ActionController::Request = ActionDispatch::Request
+ActionController::AbstractResponse = ActionController::Response = ActionDispatch::Response
+ActionController::Routing = ActionDispatch::Routing
+ActionController::Routing::Routes = ActionDispatch::Routing::RouteSet.new

data/lib/action_controller/deprecated/integration_test.rb

@@ -0,0 +1,2 @@
+ActionController::Integration = ActionDispatch::Integration
+ActionController::IntegrationTest = ActionDispatch::IntegrationTest

data/lib/action_controller/deprecated/performance_test.rb

@@ -0,0 +1 @@
+ActionController::PerformanceTest = ActionDispatch::PerformanceTest

data/lib/action_controller/dispatch/dispatcher.rb

@@ -0,0 +1,57 @@
+require 'active_support/core_ext/module/delegation'
+
+module ActionController
+  # Dispatches requests to the appropriate controller and takes care of
+  # reloading the app after each request when Dependencies.load? is true.
+  class Dispatcher
+    cattr_accessor :prepare_each_request
+    self.prepare_each_request = false
+
+    class << self
+      def define_dispatcher_callbacks(cache_classes)
+        unless cache_classes
+          # Run prepare callbacks before every request in development mode
+          self.prepare_each_request = true
+
+          # Development mode callbacks
+          ActionDispatch::Callbacks.before_dispatch do |app|
+            ActionController::Routing::Routes.reload
+          end
+
+          ActionDispatch::Callbacks.after_dispatch do
+            # Cleanup the application before processing the current request.
+            ActiveRecord::Base.reset_subclasses if defined?(ActiveRecord)
+            ActiveSupport::Dependencies.clear
+            ActiveRecord::Base.clear_reloadable_connections! if defined?(ActiveRecord)
+          end
+
+          ActionView::Helpers::AssetTagHelper.cache_asset_timestamps = false
+        end
+
+        if defined?(ActiveRecord)
+          to_prepare(:activerecord_instantiate_observers) do
+            ActiveRecord::Base.instantiate_observers
+          end
+        end
+
+        if Base.logger && Base.logger.respond_to?(:flush)
+          after_dispatch do
+            Base.logger.flush
+          end
+        end
+
+        to_prepare do
+          I18n.reload!
+        end
+      end
+
+      delegate :to_prepare, :before_dispatch, :around_dispatch, :after_dispatch,
+        :to => ActionDispatch::Callbacks
+
+      def new
+        # DEPRECATE Rails application fallback
+        Rails.application
+      end
+    end
+  end
+end

data/lib/action_controller/metal.rb

@@ -0,0 +1,129 @@
+require 'active_support/core_ext/class/inheritable_attributes'
+
+module ActionController
+  # ActionController::Metal provides a way to get a valid Rack application from a controller.
+  #
+  # In AbstractController, dispatching is triggered directly by calling #process on a new controller.
+  # ActionController::Metal provides an #action method that returns a valid Rack application for a
+  # given action. Other rack builders, such as Rack::Builder, Rack::URLMap, and the Rails router,
+  # can dispatch directly to the action returned by FooController.action(:index).
+  class Metal < AbstractController::Base
+    abstract!
+
+    # :api: public
+    attr_internal :params, :env
+
+    # Returns the last part of the controller's name, underscored, without the ending
+    # "Controller". For instance, MyApp::MyPostsController would return "my_posts" for
+    # controller_name
+    #
+    # ==== Returns
+    # String
+    def self.controller_name
+      @controller_name ||= controller_path.split("/").last
+    end
+
+    # Delegates to the class' #controller_name
+    def controller_name
+      self.class.controller_name
+    end
+
+    # Returns the full controller name, underscored, without the ending Controller.
+    # For instance, MyApp::MyPostsController would return "my_app/my_posts" for
+    # controller_name.
+    #
+    # ==== Returns
+    # String
+    def self.controller_path
+      @controller_path ||= name && name.sub(/Controller$/, '').underscore
+    end
+
+    # Delegates to the class' #controller_path
+    def controller_path
+      self.class.controller_path
+    end
+
+    # The details below can be overridden to support a specific
+    # Request and Response object. The default ActionController::Base
+    # implementation includes RackConvenience, which makes a request
+    # and response object available. You might wish to control the
+    # environment and response manually for performance reasons.
+
+    attr_internal :status, :headers, :content_type, :response
+
+    def initialize(*)
+      @_headers = {}
+      super
+    end
+
+    # Basic implementations for content_type=, location=, and headers are
+    # provided to reduce the dependency on the RackConvenience module
+    # in Renderer and Redirector.
+
+    def content_type=(type)
+      headers["Content-Type"] = type.to_s
+    end
+
+    def location=(url)
+      headers["Location"] = url
+    end
+
+    # :api: private
+    def dispatch(name, env)
+      @_env = env
+      process(name)
+      to_a
+    end
+
+    # :api: private
+    def to_a
+      response ? response.to_a : [status, headers, response_body]
+    end
+
+    class ActionEndpoint
+      @@endpoints = Hash.new {|h,k| h[k] = Hash.new {|h,k| h[k] = {} } }
+
+      def self.for(controller, action, stack)
+        @@endpoints[controller][action][stack] ||= begin
+          endpoint = new(controller, action)
+          stack.build(endpoint)
+        end
+      end
+
+      def initialize(controller, action)
+        @controller, @action = controller, action
+      end
+
+      def call(env)
+        @controller.new.dispatch(@action, env)
+      end
+    end
+
+    extlib_inheritable_accessor(:middleware_stack) { ActionDispatch::MiddlewareStack.new }
+
+    def self.use(*args)
+      middleware_stack.use(*args)
+    end
+
+    def self.middleware
+      middleware_stack
+    end
+
+    def self.call(env)
+      action(env['action_dispatch.request.path_parameters'][:action]).call(env)
+    end
+
+    # Return a rack endpoint for the given action. Memoize the endpoint, so
+    # multiple calls into MyController.action will return the same object
+    # for the same action.
+    #
+    # ==== Parameters
+    # action<#to_s>:: An action name
+    #
+    # ==== Returns
+    # Proc:: A rack application
+    def self.action(name)
+      ActionEndpoint.for(self, name, middleware_stack)
+    end
+  end
+end

data/lib/action_controller/metal/benchmarking.rb

@@ -0,0 +1,73 @@
+require 'active_support/core_ext/benchmark'
+
+module ActionController #:nodoc:
+  # The benchmarking module times the performance of actions and reports to the logger. If the Active Record
+  # package has been included, a separate timing section for database calls will be added as well.
+  module Benchmarking #:nodoc:
+    extend ActiveSupport::Concern
+
+    protected
+      def render(*args, &block)
+        if logger
+          if Object.const_defined?("ActiveRecord") && ActiveRecord::Base.connected?
+            db_runtime = ActiveRecord::Base.connection.reset_runtime
+          end
+
+          render_output = nil
+          @view_runtime = Benchmark.ms { render_output = super }
+
+          if Object.const_defined?("ActiveRecord") && ActiveRecord::Base.connected?
+            @db_rt_before_render = db_runtime
+            @db_rt_after_render = ActiveRecord::Base.connection.reset_runtime
+            @view_runtime -= @db_rt_after_render
+          end
+
+          render_output
+        else
+          super
+        end
+      end
+
+    private
+      def process_action(*args)
+        if logger
+          ms = [Benchmark.ms { super }, 0.01].max
+          logging_view          = defined?(@view_runtime)
+          logging_active_record = Object.const_defined?("ActiveRecord") && ActiveRecord::Base.connected?
+
+          log_message  = 'Completed in %.0fms' % ms
+
+          if logging_view || logging_active_record
+            log_message << " ("
+            log_message << view_runtime if logging_view
+
+            if logging_active_record
+              log_message << ", " if logging_view
+              log_message << active_record_runtime + ")"
+            else
+              ")"
+            end
+          end
+
+          log_message << " | #{response.status}"
+          log_message << " [#{complete_request_uri rescue "unknown"}]"
+
+          logger.info(log_message)
+          response.headers["X-Runtime"] = "%.0f" % ms
+        else
+          super
+        end
+      end
+
+      def view_runtime
+        "View: %.0f" % @view_runtime
+      end
+
+      def active_record_runtime
+        db_runtime = ActiveRecord::Base.connection.reset_runtime
+        db_runtime += @db_rt_before_render if @db_rt_before_render
+        db_runtime += @db_rt_after_render if @db_rt_after_render
+        "DB: %.0f" % db_runtime
+      end
+  end
+end

data/lib/action_controller/metal/compatibility.rb

@@ -0,0 +1,145 @@
+module ActionController
+  module Rails2Compatibility
+    extend ActiveSupport::Concern
+
+    class ::ActionController::ActionControllerError < StandardError #:nodoc:
+    end
+
+    # Temporary hax
+    included do
+      ::ActionController::UnknownAction = ::AbstractController::ActionNotFound
+      ::ActionController::DoubleRenderError = ::AbstractController::DoubleRenderError
+
+      cattr_accessor :session_options
+      self.session_options = {}
+
+      cattr_accessor :allow_concurrency
+      self.allow_concurrency = false
+
+      cattr_accessor :relative_url_root
+      self.relative_url_root = ENV['RAILS_RELATIVE_URL_ROOT']
+
+      class << self
+        delegate :default_charset=, :to => "ActionDispatch::Response"
+      end
+
+      # cattr_reader :protected_instance_variables
+      cattr_accessor :protected_instance_variables
+      self.protected_instance_variables = %w(@assigns @performed_redirect @performed_render
+                                             @variables_added @request_origin @url
+                                             @parent_controller @action_name
+                                             @before_filter_chain_aborted @_headers @_params
+                                             @_flash @_response)
+
+      # Indicates whether or not optimise the generated named
+      # route helper methods
+      cattr_accessor :optimise_named_routes
+      self.optimise_named_routes = true
+
+      cattr_accessor :resources_path_names
+      self.resources_path_names = { :new => 'new', :edit => 'edit' }
+
+      # Controls the resource action separator
+      cattr_accessor :resource_action_separator
+      self.resource_action_separator = "/"
+
+      cattr_accessor :use_accept_header
+      self.use_accept_header = true
+
+      cattr_accessor :page_cache_directory
+      self.page_cache_directory = defined?(Rails.public_path) ? Rails.public_path : ""
+
+      cattr_reader :cache_store
+
+      cattr_accessor :consider_all_requests_local
+      self.consider_all_requests_local = true
+
+      # Prepends all the URL-generating helpers from AssetHelper. This makes it possible to easily move javascripts, stylesheets,
+      # and images to a dedicated asset server away from the main web server. Example:
+      #   ActionController::Base.asset_host = "http://assets.example.com"
+      cattr_accessor :asset_host
+
+      cattr_accessor :ip_spoofing_check
+      self.ip_spoofing_check = true
+
+      cattr_accessor :trusted_proxies
+    end
+
+    # For old tests
+    def initialize_template_class(*) end
+    def assign_shortcuts(*) end
+
+    # TODO: Remove this after we flip
+    def template
+      @template ||= view_context
+    end
+
+    def process_action(*)
+      template
+      super
+    end
+
+    module ClassMethods
+      def consider_all_requests_local
+      end
+
+      def rescue_action(env)
+        raise env["action_dispatch.rescue.exception"]
+      end
+
+      # Defines the storage option for cached fragments
+      def cache_store=(store_option)
+        @@cache_store = ActiveSupport::Cache.lookup_store(store_option)
+      end
+    end
+
+    def render_to_body(options)
+      if options.is_a?(Hash) && options.key?(:template)
+        options[:template].sub!(/^\//, '')
+      end
+
+      options[:text] = nil if options.delete(:nothing) == true
+      options[:text] = " " if options.key?(:text) && options[:text].nil?
+
+      super || " "
+    end
+
+    def _handle_method_missing
+      method_missing(@_action_name.to_sym)
+    end
+
+    def method_for_action(action_name)
+      super || (respond_to?(:method_missing) && "_handle_method_missing")
+    end
+
+    def _find_layout(name, details)
+      details[:prefix] = nil if name =~ /\blayouts/
+      super
+    end
+    
+    # Move this into a "don't run in production" module
+    def _default_layout(details, require_layout = false)
+      super
+    rescue ActionView::MissingTemplate
+      _find_layout(_layout({}), {})
+      nil
+    end
+
+    def performed?
+      response_body
+    end
+
+    # ==== Request only view path switching ====
+    def append_view_path(path)
+      view_paths.push(*path)
+    end
+
+    def prepend_view_path(path)
+      view_paths.unshift(*path)
+    end
+
+    def view_paths
+      view_context.view_paths
+    end
+  end
+end