render_parent 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/render_parent/rails2.rb

@@ -2,10 +2,9 @@ require 'action_view/base'
 
 ActionView::Base.class_eval do
   def render_parent_template(local_assigns = {}, &block)
-    saved_view_paths = view_paths.dup
-    view_paths.delete_if {|p| p.to_s == template.load_path.to_s}
+    view_paths.exclusions << template
     result = render({:file => template.to_s}, local_assigns, &block)
-    view_paths.replace(saved_view_paths)
+    view_paths.exclusions.delete template
     result
   end
 
@@ -18,4 +17,46 @@ ActionView::Base.class_eval do
   end
 
   alias_method_chain :render, :parent
+end
+
+ActionView::PathSet.class_eval do
+  attr_writer :exclusions
+
+  def exclusions
+    @exclusions ||= []
+  end
+
+  def find_template(original_template_path, format = nil, html_fallback = true)
+    return original_template_path if original_template_path.respond_to?(:render)
+    template_path = original_template_path.sub(/^\//, '')
+
+    each do |load_path|
+      if format && (template = load_path["#{template_path}.#{I18n.locale}.#{format}"]) && !exclusions.include?(template)
+        return template
+      # Try the default locale version if the current locale doesn't have one
+      # (i.e. you haven't translated this view to German yet, but you have the English version on hand)
+      elsif format && (template = load_path["#{template_path}.#{I18n.default_locale}.#{format}"]) && !exclusions.include?(template)
+        return template
+      elsif format && (template = load_path["#{template_path}.#{format}"]) && !exclusions.include?(template)
+        return template
+      elsif (template = load_path["#{template_path}.#{I18n.locale}"]) && !exclusions.include?(template)
+        return template
+      elsif (template = load_path["#{template_path}.#{I18n.default_locale}"]) && !exclusions.include?(template)
+        return template
+      elsif (template = load_path[template_path]) && !exclusions.include?(template)
+        return template
+      # Try to find html version if the format is javascript
+      elsif format == :js && html_fallback && (template = load_path["#{template_path}.#{I18n.locale}.html"]) && !exclusions.include?(template)
+        return template
+      elsif format == :js && html_fallback && (template = load_path["#{template_path}.#{I18n.default_locale}.html"]) && !exclusions.include?(template)
+        return template
+      elsif format == :js && html_fallback && (template = load_path["#{template_path}.html"]) && !exclusions.include?(template)
+        return template
+      end
+    end
+
+    return ActionView::Template.new(original_template_path) if File.file?(original_template_path)
+
+    raise ActionView::MissingTemplate.new(self, original_template_path, format)
+  end
 end

data/lib/render_parent/rails3.rb

@@ -6,6 +6,9 @@ module RenderParent
       ActiveSupport.on_load(:action_controller) do
         require 'render_parent/rails3/on_load_action_controller'
       end
+      ActiveSupport.on_load(:action_mailer) do
+        require 'render_parent/rails3/on_load_action_mailer'
+      end
       ActiveSupport.on_load(:action_view) do
         require 'render_parent/rails3/on_load_action_view'
       end

data/lib/render_parent/rails3/on_load_action_mailer.rb

@@ -0,0 +1,11 @@
+require 'action_mailer/base'
+
+ActionMailer::Base.class_eval do
+  def active_template_stack
+    @active_template_stack ||= []
+  end
+
+  def active_template
+    @active_template_stack.last
+  end
+end

data/lib/render_parent/rails3/on_load_action_view.rb

@@ -4,10 +4,9 @@ require 'action_view/renderer/template_renderer'
 ActionView::Helpers::RenderingHelper.module_eval do
   def render_parent_template(locals = {}, &block)
     template = controller.active_template
-    saved_view_paths = view_paths.paths.dup
-    view_paths.paths.delete_if {|p| template.identifier.start_with? p.to_s}
+    view_paths.exclusions << template
     result = render({:file => template.virtual_path}, locals, &block)
-    view_paths.paths.replace(saved_view_paths)
+    view_paths.exclusions.delete template
     result
   end
 
@@ -22,9 +21,31 @@ ActionView::Helpers::RenderingHelper.module_eval do
   alias_method_chain :render, :parent
 end
 
+ActionView::PathSet.class_eval do
+  attr_writer :exclusions
+
+  def exclusions
+    @exclusions ||= []
+  end
+
+  def find_all_with_exclusions(path, prefixes = [], *args)
+    prefixes = [prefixes] if String === prefixes
+    prefixes.each do |prefix|
+      paths.each do |resolver|
+        templates = resolver.find_all(path, prefix, *args)
+        templates.delete_if {|t| exclusions.include? t}
+        return templates unless templates.empty?
+      end
+    end
+    []
+  end
+
+  alias_method_chain :find_all, :exclusions
+end
+
 ActionView::TemplateRenderer.class_eval do
   def render_template_with_active_template(template, layout_name = nil, locals = {})
-    template_stack = @view.controller.try(:active_template_stack)
+    template_stack = @view.controller.respond_to?(:active_template_stack) && @view.controller.active_template_stack
     template_stack.push(template) if template_stack
     result = render_template_without_active_template( template, layout_name, locals)
     template_stack.pop if template_stack
@@ -36,7 +57,7 @@ end
 
 ActionView::PartialRenderer.class_eval do
   def render_partial_with_active_template
-    template_stack = @view.controller.try(:active_template_stack)
+    template_stack = @view.controller.respond_to?(:active_template_stack) && @view.controller.active_template_stack
     template_stack.push(@template) if template_stack
     result = render_partial_without_active_template
     template_stack.pop if template_stack

metadata

@@ -1,81 +1,72 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: render_parent
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 0.0.2
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
 platform: ruby
-authors: 
+authors:
 - Anton Argirov
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-17 00:00:00 +07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.0
-  requirement: *id001
+  type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+- !ruby/object:Gem::Dependency
   name: bundler
-  type: :development
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.1.0
-  requirement: *id002
+  type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
   name: jeweler
-  type: :development
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 1
-        - 8
-        - 3
+      - !ruby/object:Gem::Version
         version: 1.8.3
-  requirement: *id003
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.3
 description: 
 email: anton.argirov@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - Gemfile
 - LICENSE.txt
@@ -87,43 +78,37 @@ files:
 - lib/render_parent/rails2.rb
 - lib/render_parent/rails3.rb
 - lib/render_parent/rails3/on_load_action_controller.rb
+- lib/render_parent/rails3/on_load_action_mailer.rb
 - lib/render_parent/rails3/on_load_action_view.rb
-- render_parent.gemspec
 - test/helper.rb
 - test/test_render_parent.rb
-has_rdoc: true
 homepage: http://redmine.academ.org
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 117922609
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Adds Rails "render :parent" helper, which renders template with the same name as current but higher on the view path
+summary: Adds Rails "render :parent" helper, which renders template with the same
+  name as current but higher on the view path
 test_files: []
-

data/render_parent.gemspec

@@ -1,59 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{render_parent}
-  s.version = "0.0.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Anton Argirov"]
-  s.date = %q{2012-09-17}
-  s.email = %q{anton.argirov@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    "Gemfile",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "lib/rails/init.rb",
-    "lib/render_parent.rb",
-    "lib/render_parent/rails2.rb",
-    "lib/render_parent/rails3.rb",
-    "lib/render_parent/rails3/on_load_action_controller.rb",
-    "lib/render_parent/rails3/on_load_action_view.rb",
-    "render_parent.gemspec",
-    "test/helper.rb",
-    "test/test_render_parent.rb"
-  ]
-  s.homepage = %q{http://redmine.academ.org}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Adds Rails "render :parent" helper, which renders template with the same name as current but higher on the view path}
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, [">= 2.3.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.1.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
-    else
-      s.add_dependency(%q<rails>, [">= 2.3.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.1.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-    end
-  else
-    s.add_dependency(%q<rails>, [">= 2.3.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.1.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-  end
-end
-