tzispa 0.4.10 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6563a94edbe1592bb7dca93f061094b7f545ddb7
-  data.tar.gz: 20e67059d53a2eace90a4b0f2f5d6445133455b4
+  metadata.gz: 9b3b6df11ce0ea41a4e564ec835dd8c98a87218c
+  data.tar.gz: 951f7c1e75d68514481c2f81cc5c92d461834bd3
 SHA512:
-  metadata.gz: 943d78aa578e90e7e664e1b8d4bafd38b54ba331b67c40c2d60cd5cd7c3d7d86b31b540fcbe4c9bd39f70aeb0ab49e125b7c82100b2a530e58a92514673864f6
-  data.tar.gz: 4593029b257aaa3fd201a3d5128a385b0f6451326ca6e43a3e302ea23daeecc2aa8a95a5ace2a4d7e2e9ea0faed7ae12afaf77f73207ccc7afc6ce52317c9c4d
+  metadata.gz: 031c851c6926cabb3ee2e8f2283b3701d842eba3fd9d607a75b5cfb39604a3acff2d9e9402905063ba6ffd65874c48373fd62eb41b04f22c2ad8ae58cfb930cc
+  data.tar.gz: cd1a9dd768e7723b1ae6f50fe3d8a3b63ba8e523aae1dc827e83cc14543dd9755dbc958c3fcf8ca8bf26aca4b8acc3ae7efb36ca24fb9c9af80d84cce7c31fb4

data/CHANGELOG.md

@@ -2,6 +2,11 @@ Tzispa
 
 General purpose web framework
 
+## v0.4.11
+- Rescue exceptions and catch halts on controller/base
+- http/context error_500 not sets response.status
+- Rescue exceptions in app.call only log and set response.status previous code moved to controller/base
+
 ## v0.4.10
 - http/context api method return a canonical url including hostname
 

data/lib/tzispa/app.rb

@@ -8,7 +8,6 @@ require 'tzispa/routes'
 require 'tzispa/config/appconfig'
 require 'tzispa/middleware'
 require 'tzispa/http/context'
-require 'tzispa/helpers/error_view'
 require 'tzispa_data'
 require "tzispa_rig"
 
@@ -22,8 +21,6 @@ module Tzispa
   class Application
     extend Forwardable
 
-    include Tzispa::Helpers::ErrorView
-
     attr_reader :domain, :config, :middleware, :repository, :engine, :logger
     def_delegator :@middleware, :use
     def_delegator :@domain, :name
@@ -76,18 +73,13 @@ module Tzispa
 
     def call(env)
       env[Tzispa::ENV_TZISPA_APP] = self
-      context = Tzispa::Http::Context.new(env)
-      env[Tzispa::ENV_TZISPA_CONTEXT] = context
+      env[Tzispa::ENV_TZISPA_CONTEXT] = Tzispa::Http::Context.new(env)
       begin
         middleware.call(env)
-      rescue StandardError, ScriptError => ex
-        logger.error "#{ex.message}\n#{ex.backtrace.map { |trace| "\t #{trace}" }.join('\n') if ex.respond_to?(:backtrace) && ex.backtrace}"
-        if config.developing
-          context.error_500 error_report(ex)
-        else
-          context.error_500 error_page(domain)
-        end
-        context.response.finish
+      rescue => ex
+        logger.error ex.message
+        env[Tzispa::ENV_TZISPA_CONTEXT].response.status = 500
+        env[Tzispa::ENV_TZISPA_CONTEXT].response.finish
       end
     end
 

data/lib/tzispa/controller/base.rb

@@ -3,6 +3,7 @@
 require 'forwardable'
 require 'tzispa/version'
 require 'tzispa/rig/template'
+require 'tzispa/helpers/error_view'
 
 
 module Tzispa
@@ -11,6 +12,8 @@ module Tzispa
     class Base
       extend Forwardable
 
+      include Tzispa::Helpers::ErrorView
+
       attr_reader :context
       def_delegators :@context, :request, :response, :config
 
@@ -28,13 +31,18 @@ module Tzispa
 
       def invoke(callmethod)
         status = catch(:halt) {
-          send "#{@callmethod}"
+          begin
+            send "#{@callmethod}"
+          rescue StandardError, ScriptError => exx
+            context.error_500( config.developing ? debug_info(exx) : nil )
+          end
         }
         response.status = status if status.is_a?(Integer)
-        context.error_500 context.app.error_page(context.app.domain, status: response.status) if (response.client_error? || response.server_error?)
+        if (response.client_error? || response.server_error?) && !config.developing
+          response.body = error_page(context.domain)
+        end
       end
 
-
     end
 
   end

data/lib/tzispa/http/context.rb

@@ -38,13 +38,6 @@ module Tzispa
         router_params&.fetch(:layout, nil)
       end
 
-      def error_500(body)
-        500.tap { |code|
-          response.status = code
-          response.body = body
-        }
-      end
-
       def set_last_access
         session[SESSION_LAST_ACCESS] = Time.now.utc.iso8601
       end
@@ -73,6 +66,12 @@ module Tzispa
         session.delete(SESSION_AUTH_USER)
       end
 
+      def error_500(str)
+        500.tap { |code|
+          response.body = str if str
+        }
+      end      
+
       def path(path_id, params={})
         app.class.routes.path path_id, params
       end

data/lib/tzispa/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Tzispa
-  VERSION = '0.4.10'
+  VERSION = '0.4.11'
   FRAMEWORK_NAME = 'Tzispa'
   GEM_NAME = 'tzispa'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tzispa
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
 platform: ruby
 authors:
 - Juan Antonio Piñero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-19 00:00:00.000000000 Z
+date: 2016-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack