theme_support 3.0.3 → 3.0.4

data/README

@@ -149,6 +149,8 @@ The theme_support plugin includes patches from the following:
 Thanks guys!
 
 == Changelog
+  3.0.4 - [BUG] override view when we use explicitely render 
+
   3.0.3 - Hack which uses layout theme but crashes if it doesn't exist ! Now it loads the default layout
 
   3.0.2 - Don't load a nil theme

data/VERSION

@@ -1 +1 @@
-3.0.3
+3.0.4

data/lib/theme_support/patches/abstractcontroller_ex.rb

@@ -32,21 +32,19 @@ class AbstractController::Base
   end
 end
 
-# Hack which uses layout theme but crashes if it doesn't exist !
-# Now it loads the default layout
-#AbstractController::Layouts.module_eval do
-#  def _normalize_options(options)
-#    super
-#
-#    if _include_layout?(options)
-#      layout = options.key?(:layout) ? options.delete(:layout) : :default
-#      value = _layout_for_option(layout)
-#      options[:layout] = (value =~ /\blayouts/ ? value : "layouts/#{value}") if value
-#    end
-#
-#    if current_theme
-#      theme_path = File.join(Rails.root, "themes", current_theme, "views")
-#      options[:layout] = File.join(theme_path, options[:layout])
-#    end
-#  end
-#end
+module AbstractController
+  module Rendering
+    alias_method :theme_support_render, :render
+
+    def render(*args, &block)
+      theme = current_theme
+      if theme
+        theme = ActionView::Base.process_view_paths(File.join("themes", theme, "views"))
+        prepend_view_path(theme)
+      end
+
+      theme_support_render(*args, &block)
+    end
+
+  end
+end

data/lib/theme_support.rb

@@ -7,7 +7,6 @@ require 'theme_support/theme_controller'
 
 # Initializes theme support by extending some of the core Rails classes
 require 'theme_support/patches/abstractcontroller_ex'
-require 'theme_support/patches/actioncontroller_ex'
 require 'theme_support/patches/routeset_ex'
 
 # Add the tag helpers for rhtml and, optionally, liquid templates

data/theme_support.gemspec

@@ -5,7 +5,7 @@ spec = Gem::Specification.new do |s|
   s.name        = 'theme_support'
   s.author      = 'Pierre Yager and Sylvain Claudel'
   s.email       = "pierre@levosgien.net"
-  s.version     = ("$Release: 3.0.3" =~ /[\.\d]+/) && $&
+  s.version     = ("$Release: 3.0.4" =~ /[\.\d]+/) && $&
   s.platform    = Gem::Platform::RUBY
   s.homepage    = 'http://github.com/zedalaye/theme_support'
   s.rubyforge_project = 'theme-support'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: theme_support
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: false
   segments: 
   - 3
   - 0
-  - 3
-  version: 3.0.3
+  - 4
+  version: 3.0.4
 platform: ruby
 authors: 
 - Pierre Yager and Sylvain Claudel
@@ -38,7 +38,6 @@ files:
 - lib/generators/theme/templates/preview.png
 - lib/generators/theme/theme_generator.rb
 - lib/theme_support.rb
-- lib/theme_support/patches/actioncontroller_ex.rb
 - lib/theme_support/patches/abstractcontroller_ex.rb
 - lib/theme_support/patches/routeset_ex.rb
 - lib/theme_support/patches/actionmailer_ex.rb

data/lib/theme_support/patches/actioncontroller_ex.rb

@@ -1,16 +0,0 @@
-# Load the theme to execution and not in loading app
-# TODO Check if this code works this action mailer
-module ActionController
-  module ImplicitRender
-    alias_method :theme_support_default_render, :default_render
-
-    def default_render
-      theme = current_theme
-      if theme
-        theme = ActionView::Base.process_view_paths(File.join("themes", theme, "views"))
-        prepend_view_path(theme)
-      end
-      theme_support_default_render
-    end
-  end
-end