Merge branch 'master' into nested_has_many_through

Conflicts:
	activerecord/lib/active_record/associations.rb
	activerecord/test/cases/associations/cascaded_eager_loading_test.rb

1 files changed, 36 insertions, 0 deletions

diff --git a/actionpack/lib/action_view/renderer/abstract_renderer.rb b/actionpack/lib/action_view/renderer/abstract_renderer.rb
new file mode 100644
index 0000000000..77cfa51dff
--- /dev/null
+++ b/actionpack/lib/action_view/renderer/abstract_renderer.rb
@@ -0,0 +1,36 @@
+module ActionView
+  class AbstractRenderer #:nodoc:
+    attr_reader :vew, :lookup_context
+
+    delegate :find_template, :template_exists?, :with_fallbacks, :update_details,
+      :with_layout_format, :formats, :to => :lookup_context
+
+    def initialize(view)
+      @view = view
+      @lookup_context = view.lookup_context
+    end
+
+    def render
+      raise NotImplementedError
+    end
+
+    # Checks if the given path contains a format and if so, change
+    # the lookup context to take this new format into account.
+    def wrap_formats(value)
+      return yield unless value.is_a?(String)
+      @@formats_regexp ||= /\.(#{Mime::SET.symbols.join('|')})$/
+
+      if value.sub!(@@formats_regexp, "")
+        update_details(:formats => [$1.to_sym]){ yield }
+      else
+        yield
+      end
+    end
+
+    protected
+
+    def instrument(name, options={})
+      ActiveSupport::Notifications.instrument("render_#{name}.action_view", options){ yield }
+    end
+  end
+end
\ No newline at end of file