tzispa 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c89e8ec7f20be6d2513d85e5951f8040efdfb1e
-  data.tar.gz: aadaaee55360b82fd09d644c0e48eb3ef76d03bb
+  metadata.gz: be0264dbd88974cd802bdc9e3e4d71413d90b47e
+  data.tar.gz: 9d27f6794453d3d9f351c608463fc492000ac474
 SHA512:
-  metadata.gz: ee05ed3e7c10f7eda755d9564838cf8024c830a44e29381307674ff11e595c437cac4a1fbb1b527efce8ad30ae0cb8de780260a4a27c520c3c8e193928094e0e
-  data.tar.gz: 89dbc1f7e155605d2194b9302711040663186fdf738cd1463b8f1226a1c92c51198353ce734aa29872b27e6db85eb7dae6b9ebfd8e165a1f7b0ecc0d24030aa1
+  metadata.gz: be70785ed4efbe53d86c975e99832a62eb91ca50ac46877e0de19727b1bbb2714c3217c96e937892146309c8b3e0f1f8b19c6897d2b6e778bb7d47dd758d82b2
+  data.tar.gz: d72f41fcd6edabadc31276bdf935f260adf6f44ec4194089c25f60afd8329202ab0a384d7c8831a833a641b50349ac91bb5938d672dbb5b6ae990eec0ecce2b1

data/CHANGELOG.md

@@ -2,6 +2,10 @@ Tzispa
 
 General purpose web framework
 
+## v0.4.7
+- remove browser detection obsolete code
+- remake app error handling and reporting
+
 ## v0.4.6
 - add browser detection support
 - allow specify a url fragment to redirect to the referer page section

data/lib/tzispa/app.rb

@@ -8,6 +8,7 @@ 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"
 
@@ -21,6 +22,8 @@ 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
@@ -73,8 +76,19 @@ module Tzispa
 
     def call(env)
       env[Tzispa::ENV_TZISPA_APP] = self
-      env[Tzispa::ENV_TZISPA_CONTEXT] = Tzispa::Http::Context.new(env)
-      middleware.call(env)
+      context = Tzispa::Http::Context.new(env)
+      env[Tzispa::ENV_TZISPA_CONTEXT] = context
+      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 error_report(ex)
+        else
+          context.error error_page(domain)
+        end
+        context.response.finish
+      end
     end
 
     def load!

data/lib/tzispa/config/appconfig.rb

@@ -35,14 +35,13 @@ module Tzispa
         @config ||= Tzispa::Config::Yaml.load(filename)
       end
 
-      def create_default(host:, layout: 'index', dev_mode: true, locale: 'en')
+      def create_default(host:, layout: 'index', locale: 'en')
         hcfg = Hash.new.tap { |cfg|
           cfg['id'] = domain.name
           cfg['default_layout'] = layout
           cfg['default_format'] = 'htm'
           cfg['host_name'] = host
           cfg['canonical_url'] = "http://#{host}"
-          cfg['dev_mode'] = dev_mode
           cfg['default_encoding'] = 'utf-8'
           cfg['auth_required'] = false
           cfg['salt'] = secret(24)

data/lib/tzispa/controller/base.rb

@@ -12,7 +12,7 @@ module Tzispa
       extend Forwardable
 
       attr_reader :context
-      def_delegators :@context, :request, :response, :config
+      def_delegators :@context, :request, :response, :config, :error
 
       def initialize(callmethod=nil)
         @callmethod = callmethod
@@ -28,58 +28,12 @@ module Tzispa
 
       def invoke(callmethod)
         status = catch(:halt) {
-          begin
-            send "#{@callmethod}"
-          rescue StandardError, ScriptError => ex
-            context.app.logger.error "#{ex.message}\n#{ex.backtrace.map { |trace| "\t #{trace}" }.join('\n') if ex.respond_to?(:backtrace) && ex.backtrace}"
-            error error_report(ex)
-          end
+          send "#{@callmethod}"
         }
         response.status = status if status.is_a?(Integer)
-        error_page(response.status) if (response.client_error? || response.server_error?) && !config.developing
+        error context.app.error_page(response.status) if (response.client_error? || response.server_error?)
       end
 
-      def error(body)
-        500.tap { |code|
-          response.status = code
-          response.body = body
-        }
-      end
-
-      def error_report(error=nil)
-        text = String.new('<!DOCTYPE html>')
-        text << '<html lang="es"><head>'
-        text << '<meta charset="utf-8" />'
-        text << '<style> html {background:#cccccc; font-family:Arial; font-size:15px; color:#555;} body {width:75%; max-width:1200px; margin:18px auto; background:#fff; border-radius:6px; padding:32px 24px;} ul{list-style:none; margin:0; padding:0;} li{font-style:italic; color:#666;} h1 {color:#2ECC71;} </style>'
-        text << '</head><body>'
-        text << "<h5>#{Tzispa::FRAMEWORK_NAME} #{Tzispa::VERSION}</h5>\n"
-        if error && config.developing
-          text << "<h1>#{error.class.name}</h1><h3>#{error.message}</h1>\n"
-          text << '<ol>' + error.backtrace.map { |trace| "<li>#{trace}</li>\n" }.join + '</ol>' if error.respond_to?(:backtrace) && error.backtrace
-        else
-          text << "<h1>Error 500</h1>\n"
-          text << "Se ha producido un error inesperado al tramitar la petición"
-        end
-        text << '</body></html>'
-      end
-
-      def error_page(status)
-        begin
-          error_file = "#{context.app.domain.path}/error/#{status}.htm"
-          response.body = Tzispa::Rig::File.new(error_file).load!.content
-        rescue
-          response.body = String.new('<!DOCTYPE html>')
-          response.body << '<html lang="es"><head>'
-          response.body << '<meta charset="utf-8" />'
-          response.body << '<style> html {background:#cccccc; font-family:Arial; font-size:15px; color:#555;} body {width:75%; max-width:1200px; margin:18px auto; background:#fff; border-radius:6px; padding:32px 24px;} #main {margin:auto; } h1 {color:#2ECC71; font-size:4em; text-align:center;} </style>'
-          response.body << '</head><body>'
-          response.body << '<div id="main">'
-          response.body << "<h5>#{Tzispa::FRAMEWORK_NAME} #{Tzispa::VERSION}</h5>\n"
-          response.body << "<h1>Error #{status}</h1>\n"
-          response.body << '</div>'
-          response.body << '</body></html>'
-        end
-      end
 
     end
 

data/lib/tzispa/http/context.rb

@@ -38,6 +38,13 @@ module Tzispa
         router_params&.fetch(:layout, nil)
       end
 
+      def error(body)
+        500.tap { |code|
+          response.status = code
+          response.body = body
+        }
+      end      
+
       def set_last_access
         session[SESSION_LAST_ACCESS] = Time.now.utc.iso8601
       end

data/lib/tzispa/http/request.rb

@@ -36,76 +36,6 @@ module Tzispa
           request_method == "UNLINK"
         end
 
-        def browser_is? name
-      		name = name.to_s.strip
-      		return true if browser_name == name
-      		return true if name == 'mozilla' && browser_name == 'gecko'
-      		return true if name == 'ie' && browser_name.index('ie')
-      		return true if name == 'webkit' && %w{safari chrome iphone ipad ipod}.include?(browser_name)
-      		return true if name == 'ios' && %w{iphone ipad ipod}.include?(browser_name)
-      		return true if name == 'robots' && %w{googlebot msnbot yahoobot}.include?(browser_name)
-      	end
-
-        # Returns the user agent string as determined by the plugin
-      	def browser_name
-      		@browser_name ||= begin
-      			if user_agentindex('msie') && !user_agent.index('opera') && !user_agent.index('webtv')
-      				'ie'+user_agent[user_agent.index('msie')+5].chr
-      			elsif user_agent.index('gecko/')
-      				'gecko'
-      			elsif user_agent.index('opera')
-      				'opera'
-      			elsif user_agent.index('konqueror')
-      				'konqueror'
-      			elsif user_agent.index('ipod')
-      				'ipod'
-      			elsif user_agent.index('ipad')
-      				'ipad'
-      			elsif user_agent.index('iphone')
-      				'iphone'
-      			elsif user_agent.index('chrome/')
-      				'chrome'
-      			elsif user_agent.index('applewebkit/')
-      				'safari'
-      			elsif user_agent.index('googlebot/')
-      				'googlebot'
-      			elsif user_agent.index('msnbot')
-      				'msnbot'
-      			elsif user_agent.index('yahoo! slurp')
-      				'yahoobot'
-      			#Everything thinks it's mozilla, so this goes last
-      			elsif user_agent.index('mozilla/')
-      				'gecko'
-      			else
-      				'unknown'
-      			end
-      		end
-      	end
-
-      	# Determine the version of webkit.
-      	# Useful for determing rendering capabilties
-      	def browser_webkit_version
-      		if browser_is? 'webkit'
-      			match = user_agent.match(%r{\bapplewebkit/([\d\.]+)\b})
-      			if (match)
-      				match[1].to_f
-      			else
-      				nil
-      			end
-      		else
-      			nil
-      		end
-      	end
-
-        #Gather the user agent and store it for use.
-      	def user_agent
-      		@ua ||= begin
-      			@env['HTTP_USER_AGENT'].downcase
-      		rescue
-      			''
-      		end
-      	end
-
     end
   end
 end

data/lib/tzispa/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Tzispa
-  VERSION = '0.4.6'
+  VERSION = '0.4.7'
   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.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Juan Antonio Piñero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-11 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack