base.rb in actionpack-4.0.0.beta1

- old
+ new

@@ -1,17 +1,14 @@
 require 'active_support/core_ext/module/attr_internal'
-require 'active_support/core_ext/module/delegation'
-require 'active_support/core_ext/class/attribute'
-require 'active_support/core_ext/array/wrap'
+require 'active_support/core_ext/class/attribute_accessors'
 require 'active_support/ordered_options'
 require 'action_view/log_subscriber'
-require 'active_support/core_ext/module/deprecation'
 
 module ActionView #:nodoc:
   # = Action View Base
   #
-  # Action View templates can be written in several ways. If the template file has a <tt>.erb</tt> extension then it uses a mixture of ERb
+  # Action View templates can be written in several ways. If the template file has a <tt>.erb</tt> extension then it uses a mixture of ERB
   # (included in Ruby) and HTML. If the template file has a <tt>.builder</tt> extension then Jim Weirich's Builder::XmlMarkup library is used.
   #
   # == ERB
   #
   # You trigger ERB by using embeddings such as <% %>, <% -%>, and <%= %>. The <%= %> tag set is used when you want output. Consider the
@@ -56,11 +53,11 @@
   #
   # === Passing local variables to sub templates
   #
   # You can pass local variables to sub templates by using a hash with the variable names as keys and the objects as values:
   #
-  #   <%= render "shared/header", { :headline => "Welcome", :person => person } %>
+  #   <%= render "shared/header", { headline: "Welcome", person: person } %>
   #
   # These can now be accessed in <tt>shared/header</tt> with:
   #
   #   Headline: <%= headline %>
   #   First name: <%= person.first_name %>
@@ -139,52 +136,38 @@
     @@field_error_proc = Proc.new{ |html_tag, instance| "<div class=\"field_with_errors\">#{html_tag}</div>".html_safe }
 
     # How to complete the streaming when an exception occurs.
     # This is our best guess: first try to close the attribute, then the tag.
     cattr_accessor :streaming_completion_on_exception
-    @@streaming_completion_on_exception = %("><script type="text/javascript">window.location = "/500.html"</script></html>)
+    @@streaming_completion_on_exception = %("><script>window.location = "/500.html"</script></html>)
 
-    class_attribute :helpers
+    # Specify whether rendering within namespaced controllers should prefix
+    # the partial paths for ActiveModel objects with the namespace.
+    # (e.g., an Admin::PostsController would render @post using /admin/posts/_post.erb)
+    cattr_accessor :prefix_partial_path_with_controller_namespace
+    @@prefix_partial_path_with_controller_namespace = true
+
+    # Specify default_formats that can be rendered.
+    cattr_accessor :default_formats
+
     class_attribute :_routes
+    class_attribute :logger
 
     class << self
       delegate :erb_trim_mode=, :to => 'ActionView::Template::Handlers::ERB'
-      delegate :logger, :to => 'ActionController::Base', :allow_nil => true
 
       def cache_template_loading
         ActionView::Resolver.caching?
       end
 
       def cache_template_loading=(value)
         ActionView::Resolver.caching = value
       end
 
-      def process_view_paths(value)
-        value.is_a?(PathSet) ?
-          value.dup : ActionView::PathSet.new(Array.wrap(value))
-      end
-      deprecate :process_view_paths
-
       def xss_safe? #:nodoc:
         true
       end
-
-      # This method receives routes and helpers from the controller
-      # and return a subclass ready to be used as view context.
-      def prepare(routes, helpers) #:nodoc:
-        Class.new(self) do
-          if routes
-            include routes.url_helpers
-            include routes.mounted_helpers
-          end
-
-          if helpers
-            include helpers
-            self.helpers = helpers
-          end
-        end
-      end
     end
 
     attr_accessor :view_renderer
     attr_internal :config, :assigns
 
@@ -196,14 +179,12 @@
     end
 
     def initialize(context = nil, assigns = {}, controller = nil, formats = nil) #:nodoc:
       @_config = ActiveSupport::InheritableOptions.new
 
-      # Handle all these for backwards compatibility.
-      # TODO Provide a new API for AV::Base and deprecate this one.
       if context.is_a?(ActionView::Renderer)
         @view_renderer = context
-      elsif
+      else
         lookup_context = context.is_a?(ActionView::LookupContext) ?
           context : ActionView::LookupContext.new(context)
         lookup_context.formats  = formats if formats
         lookup_context.prefixes = controller._prefixes if controller
         @view_renderer = ActionView::Renderer.new(lookup_context)