custom_errors_handler 0.2.4 → 0.2.5

data/CHANGELOG.rdoc

@@ -1,3 +1,5 @@
+= Version 0.2.5
+* Searching with prefix and postfix paths
 = Version 0.2.4
 * Added support for haml
 * Added searching in 'shared' by default

data/Rakefile

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('custom_errors_handler', '0.2.4') do |p|
+Echoe.new('custom_errors_handler', '0.2.5') do |p|
   p.description    = "Custom Errors Handler is intended as an easy alternative to manage showing/rendering exceptions templates (404, 500) in Rails3"
   p.url            = "https://github.com/mensfeld/Custom-Errors-Handler"
   p.author         = "Maciej Mensfeld"

data/custom_errors_handler.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{custom_errors_handler}
-  s.version = "0.2.4"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Maciej Mensfeld}]

data/lib/custom_errors_handler_controller.rb

@@ -3,7 +3,8 @@ require 'action_controller'
 
 class CustomErrorsHandlerController < ActionController::Base
   # Where it should look for error templates
-  VALID_ERRORS_SUBDIRS = ['layouts', 'shared']
+  VALID_ERRORS_DIR_PREFIX  = ['', 'layouts', 'shared']
+  VALID_ERRORS_DIR_POSTFIX = ['', 'errors', 'shared']
 
   ERRORS = [
     :internal_server_error,
@@ -28,18 +29,29 @@ class CustomErrorsHandlerController < ActionController::Base
   # Returns the file from which Rails should render error template
   def error_layout(path, e)
     e = translate_error(e)
-    path= path.split('/')
+    path = path.split('/')
     path.size.downto(0) do |i|
-      VALID_ERRORS_SUBDIRS.each { |lay_path|
-        template_path = File.join(lay_path, (path[0,i]).join('/'), e)
+      VALID_ERRORS_DIR_POSTFIX.each do |lay_path|
+        template_path = File.join(path[0,i], lay_path, e)
         return template_path if template?(template_path)
-        template_path = File.join(lay_path, (path[0,i]).join('/'), 'errors',e)
+        template_path = File.join(path[0,i], 'errors',e)
         return template_path if template?(template_path)
-      }
+      end
       template_path = File.join(path[0,i], e)
       return template_path if template?(template_path)
     end
-    e
+
+    VALID_ERRORS_DIR_PREFIX.each do |lay_path|
+      path.size.downto(0) do |i|
+        template_path = File.join(lay_path, path[0,i], e)
+        return template_path if template?(template_path)
+        template_path = File.join(lay_path, path[0,i], 'errors',e)
+        return template_path if template?(template_path)
+      end
+      template_path = File.join(path[0,i], e)
+      return template_path if template?(template_path)
+    end
+    template_from_public(e)
   end
 
   def template?(template)
@@ -61,4 +73,7 @@ class CustomErrorsHandlerController < ActionController::Base
     end
   end
 
-end
+  def template_from_public(e)
+    File.join("#{Rails.root}", 'public', "#{e}.html")
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: custom_errors_handler
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &25664000 !ruby/object:Gem::Requirement
+  requirement: &15968920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *25664000
+  version_requirements: *15968920
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &25663400 !ruby/object:Gem::Requirement
+  requirement: &15968340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *25663400
+  version_requirements: *15968340
 description: Custom Errors Handler is intended as an easy alternative to manage showing/rendering
   exceptions templates (404, 500) in Rails3
 email: maciej@mensfeld.pl