theme_support 3.0.2 → 3.0.3

data/README

@@ -149,6 +149,8 @@ The theme_support plugin includes patches from the following:
 Thanks guys!
 
 == Changelog
+  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
 
   3.0.1 - layout :mymethod works again

data/VERSION

@@ -1 +1 @@
-3.0.2
+3.0.3

data/lib/theme_support/patches/abstractcontroller_ex.rb

@@ -32,19 +32,21 @@ class AbstractController::Base
   end
 end
 
-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
+# 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

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.2" =~ /[\.\d]+/) && $&
+  s.version     = ("$Release: 3.0.3" =~ /[\.\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: 3
+  hash: 1
   prerelease: false
   segments: 
   - 3
   - 0
-  - 2
-  version: 3.0.2
+  - 3
+  version: 3.0.3
 platform: ruby
 authors: 
 - Pierre Yager and Sylvain Claudel