RubyGems - tzispa_helpers - Versions diffs - 0.2.2 → 0.3.0 - Mend

tzispa_helpers 0.2.2 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (23) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +4 -0
data/lib/tzispa/helpers.rb +8 -7
data/lib/tzispa/helpers/date_time.rb +4 -1
data/lib/tzispa/helpers/error_view.rb +47 -32
data/lib/tzispa/helpers/html.rb +3 -5
data/lib/tzispa/helpers/mime.rb +1 -1
data/lib/tzispa/helpers/pattern.rb +19 -21
data/lib/tzispa/helpers/provider.rb +5 -8
data/lib/tzispa/helpers/request.rb +42 -36
data/lib/tzispa/helpers/requirer.rb +6 -4
data/lib/tzispa/helpers/response.rb +39 -71
data/lib/tzispa/helpers/security.rb +21 -36
data/lib/tzispa/helpers/services/content_type.rb +60 -0
data/lib/tzispa/helpers/services/error_view.rb +38 -0
data/lib/tzispa/helpers/services/send_file.rb +64 -0
data/lib/tzispa/helpers/session.rb +60 -0
data/lib/tzispa/helpers/session_flash_bag.rb +64 -0
data/lib/tzispa/helpers/sign_requirer.rb +2 -3
data/lib/tzispa/helpers/text.rb +54 -49
data/lib/tzispa/helpers/version.rb +1 -1
metadata +7 -3
data/lib/tzispa/helpers/hash_trans.rb +0 -18

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8d9b4d815e666c509beeb5c3c5b5446302c3a5f
-  data.tar.gz: ffd7c7ef51dcdbd5ab14078381ac1c93a5e3f23b
+  metadata.gz: 3e89639a5292d45bd73bb24c089a7d2e12a5af5d
+  data.tar.gz: a913cbe727b39b40d9e0fdf9cf893c820a42baaf
 SHA512:
-  metadata.gz: b1702fe53fe07d1b9d5bff987f38ce1946e0a351e1d2e234441ff01462fc3dd8d9281b0eda134ab569d4950ed619dbb0ab0fa0010aa42c8df3e1bb9f18e53289
-  data.tar.gz: fde228365de640a6f7ea82fb86b2e133872f51e4242525668f0b15a30ea4279d23b6e3578fd93056c643d585b68282707bd9b228800bcdefdab2d30a04d8ce57
+  metadata.gz: 45d66dc9fec88bdb30d7257a82bceb59bc3fb4746b22788e009d0d9f965a26ca041141465f82ffba50b67e0f921ac8b8d9061c9a499a06567d8f45bd5e9617b7
+  data.tar.gz: b0c6b9d2f8054c820ea478c3f870811c26b6719ba87b14160bb7be4a902be31a20506bfdfc3e3a2dd48c3c1bbd3472e1ca5403f69f1b7ea8477b0b75569f85cd

data/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,9 @@
 Tzispa Helpers
+## v0.3.0
+- bug fixes
+- code refactoring
 ## v0.2.2
 - unscape html request form values
 - added not_authorized alias method

data/lib/tzispa/helpers.rb CHANGED Viewed

@@ -1,19 +1,20 @@
+# frozen_string_literal: true
 module Tzispa
   module Helpers
-    require 'tzispa/helpers/version'
-    require 'tzispa/helpers/crawler'
+    require 'tzispa/helpers/date_time'
+    require 'tzispa/helpers/error_view'
     require 'tzispa/helpers/html'
-    require 'tzispa/helpers/mail'
-    require 'tzispa/helpers/mime'
     require 'tzispa/helpers/pattern'
+    require 'tzispa/helpers/provider'
     require 'tzispa/helpers/request'
+    require 'tzispa/helpers/requirer'
     require 'tzispa/helpers/response'
     require 'tzispa/helpers/security'
+    require 'tzispa/helpers/sign_requirer'
     require 'tzispa/helpers/text'
-    require 'tzispa/helpers/provider'
-    require 'tzispa/helpers/error_view'
-    require 'tzispa/helpers/recaptcha'
+    require 'tzispa/helpers/version'
   end
 end

data/lib/tzispa/helpers/date_time.rb CHANGED Viewed

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
 module Tzispa
   module Helpers
     module DateTime
       def date_months_diff(date1, date2)
-        (date2.year - date1.year) * 12 + date2.month - date1.month - (date2.day >= date1.day ? 0 : 1)
+        (date2.year - date1.year) * 12 +
+          date2.month - date1.month - (date2.day >= date1.day ? 0 : 1)
       end
       def date_days_diff(date1, date2)

data/lib/tzispa/helpers/error_view.rb CHANGED Viewed

@@ -1,49 +1,64 @@
+# frozen_string_literal: true
 require 'tzispa/rig/template'
 require 'tzispa/version'
+require 'tzispa/helpers/services/error_view'
 module Tzispa
   module Helpers
     module ErrorView
-      def debug_info(exception=nil, status: 500)
-        String.new.tap { |text|
-          text << '<!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 exception
-            text << "<h1>#{exception.class.name}</h1><h3>#{exception.message}</h1>\n"
-            text << '<ol>' + exception.backtrace.map { |trace| "<li>#{trace}</li>\n" }.join + '</ol>' if exception.respond_to?(:backtrace) && exception.backtrace
-          else
-            text << "<h1>Error #{status}</h1>\n"
-            text << "Se ha producido un error inesperado al tramitar la petición"
-          end
+      ERROR_HEADER = <<-ERRORHEADER
+      <head>
+      <meta charset="utf-8" />
+      <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; } ul{list-style:none; margin:0; padding:0;} li{font-style:italic; color:#666;} h1 {color:#2ECC71;} </style>
+      </head>
+      ERRORHEADER
+      ERROR_PLATFORM_VERSIONS = <<-ERRORPVERSION
+      <h6>#{Tzispa::FRAMEWORK_NAME} #{Tzispa::VERSION}</h6>
+      ERRORPVERSION
+      def debug_info(ex = nil, status: 500)
+        String.new.tap do |text|
+          text << '<!DOCTYPE html><html lang="es">'
+          text << ERROR_HEADER << '<body>'
+          text << ERROR_PLATFORM_VERSIONS
+          text << if ex
+                    srx = Tzispa::Helpers::Services::ErrorView.new ex
+                    "<h1>#{srx.error_header}\n #{srx.error_backtrace_list}"
+                  else
+                    "<h1>Error #{status}</h1>\nSe ha producido un error indeterminado"
+                  end
           text << '</body></html>'
-        }
+        end
       end
       def error_page(domain, status: 500)
-        begin
-          error_file = "#{domain.path}/error/#{status}.htm"
-          Tzispa::Rig::File.new(error_file).load!.content
-        rescue
-          String.new.tap { |text|
-            text << '<!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;} #main {margin:auto; } h1 {color:#2ECC71; font-size:4em; text-align:center;} </style>'
-            text << '</head><body>'
-            text << '<div id="main">'
-            text << "<h5>#{Tzispa::FRAMEWORK_NAME} #{Tzispa::VERSION}</h5>\n"
-            text << "<h1>Error #{status}</h1>\n"
-            text << '</div>'
-            text << '</body></html>'
-          }
+        error_file = "#{domain.path}/error/#{status}.htm"
+        if (ef = Tzispa::Rig::File.new(error_file)) && ef.exist?
+          ef.load!.content
+        else
+          error_default
         end
       end
+      def error_log(ex)
+        Tzispa::Helpers::Services::ErrorView.new(ex).error_backtrace_log
+      end
+      def error_default
+        String.new.tap do |text|
+          text << '<!DOCTYPE html><html lang="es">'
+          text << ERROR_HEADER << '<body>'
+          text << '</head><body>'
+          text << '<div id="main">'
+          text << ERROR_PLATFORM_VERSIONS
+          text << "<h1>Error #{status}</h1>\n"
+          text << '</div>'
+          text << '</body></html>'
+        end
+      end
     end
   end

data/lib/tzispa/helpers/html.rb CHANGED Viewed

@@ -20,11 +20,11 @@ module Tzispa
       end
       def html_escape(str)
-        CGI::escapeHTML str
+        CGI.escapeHTML str
       end
       def html_unescape(str)
-        CGI::unescapeHTML str
+        CGI.unescapeHTML str
       end
       def html_urlencode(str)
@@ -36,10 +36,9 @@ module Tzispa
       end
       def html_strip(source)
-        source.gsub(/<\/?[^>]*>/, '')
+        source.gsub(%r{/<\/?[^>]*>/}, '')
       end
       #
       # $Id: sanitize.rb 3 2005-04-05 12:51:14Z dwight $
       #
@@ -147,7 +146,6 @@ module Tzispa
         result
       end
     end
   end
 end

data/lib/tzispa/helpers/mime.rb CHANGED Viewed

@@ -9,7 +9,7 @@ module Tzispa
       def mime_type(type, value = nil)
         return type      if type.nil?
         return type.to_s if type.to_s.include?('/')
-        type = ".#{type}" unless type.to_s[0] == ?.
+        type = ".#{type}" unless type.to_s[0] == '.'
         return Rack::Mime.mime_type(type, nil) unless value
         Rack::Mime::MIME_TYPES[type] = value
       end

data/lib/tzispa/helpers/pattern.rb CHANGED Viewed

@@ -8,49 +8,47 @@ module Tzispa
       include Tzispa::Helpers::Html
-      def pattern_select_hours(selected=nil)
+      def pattern_select_hours(selected = nil)
         selected &&= selected.to_i
-        Proc.new {
-          (0..23).map { |hour|
+        proc do
+          (0..23).map do |hour|
             loop_item(
               value: hour,
               text: hour.to_s.rjust(2, '0'),
-              selected: html_selected( selected == hour )
+              selected: html_selected(selected == hour)
             )
-          }
-        }
+          end
+        end
       end
-      def pattern_select_minutes(selected=nil)
+      def pattern_select_minutes(selected = nil)
         selected &&= selected.to_i
-        Proc.new {
-          (0..59).map { |minute|
+        proc do
+          (0..59).map do |minute|
             loop_item(
               value: minute,
               text: minute.to_s.rjust(2, '0'),
-              selected: html_selected( selected == minute )
+              selected: html_selected(selected == minute)
             )
-          }
-        }
+          end
+        end
       end
-      def pattern_select_year(first, last, selected=nil, reverse=true)
+      def pattern_select_year(first, last, selected = nil)
         selected &&= selected.to_i
-        Proc.new {
+        proc do
           ryear = (first..last)
-          enum_year = first > last ? (ryear.first).downto(ryear.last) : (ryear.first).to(ryear.last)
-          enum_year.map { |year|
+          enum_year = first > last ? ryear.first.downto(ryear.last) : ryear.first.to(ryear.last)
+          enum_year.map do |year|
             loop_item(
               value: year,
               text:  year,
-              selected: html_selected( selected == year )
+              selected: html_selected(selected == year)
             )
-          }
-        }
+          end
+        end
       end
     end
   end
 end

data/lib/tzispa/helpers/provider.rb CHANGED Viewed

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module Tzispa
   module Helpers
     module Provider
@@ -11,13 +13,10 @@ module Tzispa
       end
       module ClassMethods
         def provides(*args)
-          (@provides ||= Hash.new).tap { |prv|
-            args&.each { |s|
-              prv[s.to_sym] = s
-            }
-          }
+          (@provides ||= {}).tap do |prv|
+            args&.each { |s| prv[s.to_sym] = s }
+          end
         end
         def provides?(verb)
@@ -28,10 +27,8 @@ module Tzispa
         def provides_map(source, dest)
           provides[source] = dest
         end
       end
     end
   end
 end

data/lib/tzispa/helpers/request.rb CHANGED Viewed

@@ -6,59 +6,65 @@ module Tzispa
   module Helpers
     module Request
-      using Tzispa::Utils
+      using Tzispa::Utils::TzString
       def request_data(fields)
-        Hash.new.tap { |data|
-          fields.each { |name|
+        {}.tap do |data|
+          fields.each do |name|
             macro_field = name.split('@:')
             macro = macro_field.first.to_sym if macro_field.length == 2
             field = macro_field.length == 2 ? macro_field.last : macro_field.first
-            field.split(':').tap { |fld|
-              src = fld.first
-              dest = fld.last
-              value = String == context.request[src] ? String.unescape_html(context.request[src]) : context.request[src]
-              data[dest.to_sym] = macro ? send(macro, value) : value
-            }
-          }
-        }
+            build_field field, macro, data
+          end
+        end
       end
       def request_data_object(data_object:, fields:)
-        data_object.tap { |data|
-          fields.each { |name|
+        data_object.tap do |data|
+          fields.each do |name|
             macro_field = name.split('@:')
             macro = macro_field.first.to_sym if macro_field.length == 2
             field = macro_field.length == 2 ? macro_field.last : macro_field.first
-            field.split(':').tap { |fld|
-              src = fld.first
-              dest = fld.last
-              value = String == context.request[src] ? String.unescape_html(context.request[src]) : context.request[src]
-              data.send "#{dest}=".to_sym, macro ? send(macro, value) : value
-            }
-          }
-        }
+            build_field field, macro, data
+          end
+        end
       end
       def request_file_upload(request_file:, destination_path:, save_as: nil, keep_ext: true)
-        if request_file
-          fileext = File.extname(request_file[:filename]).downcase
-          filetype = request_file[:type]
-          save_ext = fileext if keep_ext
-          filename = (save_as ? "#{save_as}#{save_ext}" : request_file[:filename])
-          tempfile = request_file[:tempfile]
-          dest_file = "#{destination_path}/#{filename}"
-          begin
-            FileUtils.mkdir_p(destination_path) unless File.exists?(destination_path)
-            FileUtils.cp tempfile.path, dest_file
-          ensure
-            tempfile.close
-            tempfile.unlink
-          end
-          { name: filename, ext: fileext, path: dest_file, size: ::File.size(dest_file), type: filetype }
+        return unless request_file
+        fileext = File.extname(request_file[:filename]).downcase
+        filetype = request_file[:type]
+        save_ext = fileext if keep_ext
+        filename = (save_as ? "#{save_as}#{save_ext}" : request_file[:filename])
+        tempfile = request_file[:tempfile]
+        dest_file = "#{destination_path}/#{filename}"
+        begin
+          FileUtils.mkdir_p(destination_path) unless File.exist?(destination_path)
+          FileUtils.cp tempfile.path, dest_file
+        ensure
+          tempfile.close
+          tempfile.unlink
         end
+        { name: filename, ext: fileext, path: dest_file,
+          size: ::File.size(dest_file), type: filetype }
       end
+      def build_field(field, macro, data)
+        field.split(':').tap do |src, dest|
+          dest ||= src
+          value = if String == request[src]
+                    String.unescape_html(request[src])
+                  else
+                    request[src]
+                  end
+          value = macro ? send(macro, value) : value
+          if data.is_a? ::Hash
+            data[dest.to_sym] = value
+          else
+            data.send "#{dest}=".to_sym, value
+          end
+        end
+      end
     end
   end

data/lib/tzispa/helpers/requirer.rb CHANGED Viewed

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module Tzispa
   module Helpers
     module Requirer
@@ -7,7 +9,7 @@ module Tzispa
       end
       def required?(target, value)
-        self.class.required? target. value
+        self.class.required? target, value
       end
       def required_valid?(target, value)
@@ -17,10 +19,10 @@ module Tzispa
       module ClassMethods
         def required(target, value, &block)
-          @required ||= Hash.new
-          (@required[target] ||= Hash.new).tap { |reqt|
+          @required ||= {}
+          (@required[target] ||= {}).tap do |reqt|
             reqt[value] = block || true
-          }
+          end
         end
         def required?(target, value)

data/lib/tzispa/helpers/response.rb CHANGED Viewed

@@ -2,6 +2,8 @@
 require 'uri'
 require_relative 'mime'
+require_relative 'services/send_file'
+require_relative 'services/content_type'
 module Tzispa
   module Helpers
@@ -23,10 +25,14 @@ module Tzispa
       # evaluation is deferred until the body is read with #each.
       def body(value = nil, &block)
         if block_given?
-          def block.each; yield(call) end
+          def block.each
+            yield(call)
+          end
           response.body = block
         elsif value
-          headers.delete 'Content-Length' unless request.head? || value.is_a?(Rack::File) || value.is_a?(Stream)
+          headers.delete 'Content-Length' unless request.head? ||
+                                                 value.is_a?(Rack::File) ||
+                                                 value.is_a?(Stream)
           response.body = value
         else
           response.body
@@ -42,14 +48,7 @@ module Tzispa
       # Halt processing and redirect to the URI provided.
       def redirect(uri, absolute, *args)
-        if (env['HTTP_VERSION'] == 'HTTP/1.1' || env['HTTP_VERSION'] == 'HTTP/2.0') && env["REQUEST_METHOD"] != 'GET'
-          status 303
-        else
-          status 302
-        end
-        # According to RFC 2616 section 14.30, "the field value consists of a
-        # single absolute URI"
+        status(request.allowed_http_version? && request.get? ? 303 : 302)
         response['Location'] = uri(uri.to_s, absolute)
         halt(*args)
       end
@@ -61,27 +60,30 @@ module Tzispa
         halt(*args)
       end
       # Generates the absolute URI for a given path in the app.
       # Takes Rack routers and reverse proxies into account.
       def uri(addr = nil, absolute = true)
-        return addr if addr =~ /\A[A-z][A-z0-9\+\.\-]*:/
+        return addr if addr.match?(/\A[A-z][A-z0-9\+\.\-]*:/)
         uri = [host = String.new]
-        if absolute
-          host << "http#{'s' if request.secure?}://"
-          if request.forwarded? or request.port != (request.secure? ? 443 : 80)
-            host << request.host_with_port
-          else
-            host << request.host
-          end
-        end
+        host << uri_host if absolute
         uri << (addr ? addr : request.path_info).to_s
         File.join uri
       end
+      def uri_host
+        String.new.tap do |host|
+          host << "http#{'s' if request.secure?}://"
+          host << (uri_port? ? request.host_with_port : request.host)
+        end
+      end
+      def uri_port?
+        request.forwarded? || request.port != (request.secure? ? 443 : 80)
+      end
       # Halt processing and return the error status provided.
-      def error(code, body = nil)
-        code, body    = 500, code.to_str if code.respond_to? :to_str
+      def error(code = 500, body = nil)
+        body = code.to_str if code.respond_to? :to_str
         response.body = body unless body.nil?
         halt code
       end
@@ -95,7 +97,7 @@ module Tzispa
       def unauthorized(body = nil)
         error 401, body
       end
-      alias_method :not_authorized, :unauthorized
+      alias not_authorized unauthorized
       # Set multiple response headers with Hash.
       def headers(hash = nil)
@@ -106,55 +108,17 @@ module Tzispa
       # Set the Content-Type of the response body given a media type or file
       # extension.
       def content_type(type = nil, params = {})
-        return response['Content-Type'] unless type
-        default = params.delete :default
-        mime_type = mime_type(type) || default
-        fail "Unknown media type: %p" % type if mime_type.nil?
-        mime_type = mime_type.dup
-        unless params.include? :charset
-          params[:charset] = params.delete('charset') || config.default_encoding
-        end
-        params.delete :charset if mime_type.include? 'charset'
-        unless params.empty?
-          mime_type << (mime_type.include?(';') ? ', ' : ';')
-          mime_type << params.map do |key, val|
-            val = val.inspect if val =~ /[";,]/
-            "#{key}=#{val}"
-          end.join(', ')
-        end
-        response['Content-Type'] = mime_type
-      end
-      def attachment!(filename = nil, disposition = 'attachment')
-        content_disposition = disposition.to_s
-        content_disposition += "; filename=\"#{filename}\"; filename*=UTF-8''#{URI.escape(filename)}" if !filename.nil?
-        response['Content-Disposition'] = content_disposition
+        return if response.drop_content_info?
+        ct = Tzispa::Helpers::Services::ContentType.new(response,
+                                                        config.default_encoding)
+        ct.header(type, params)
       end
       def send_file(path, opts = {})
-        begin
-          if opts[:type] or not response['Content-Type']
-            content_type opts[:type] || opts[:extension], :default => 'application/octet-stream'
-          end
-          disposition = opts[:disposition]
-          filename    = opts[:filename]
-          disposition = 'attachment' if disposition.nil? and filename
-          filename    = path         if filename.nil?
-          attachment! filename, disposition
-          last_modified opts[:last_modified] if opts[:last_modified]
-          file   = Rack::File.new(Dir.pwd)
-          result = file.serving(request, path)
-          result[1].each { |k,v| response.headers[k] ||= v }
-          response.headers['Content-Length'] = result[1]['Content-Length']
-          response.status = result[0]
-          response.body = result[2]
-        rescue
-          not_found 'Fichero no encontrado'
-        end
+        not_found unless ::File.exist? path
+        file = Rack::File.new(Dir.pwd)
+        fss = Tzispa::Helpers::Services::SendFile.new response, path, opts
+        fss.send file.serving(request, path)
       end
       # Sugar for redirect (example:  redirect back)
@@ -192,12 +156,16 @@ module Tzispa
         response.status == 404
       end
+      def error_500(str)
+        500.tap { |_code| response.body = str if str }
+      end
       class NotFound < NameError #:nodoc:
-        def http_status; 404 end
+        def http_status
+          404
+        end
       end
     end
   end
 end

data/lib/tzispa/helpers/security.rb CHANGED Viewed

@@ -6,57 +6,46 @@ module Tzispa
   module Helpers
     module Security
       def secret(length)
-        alfanb = (['!', '"', '·', '$', '%', '&', '/', '(', ')', '=', '?', '+',
-                  '@', '#', ',', '.', '-', ';', ':', '_', '[', ']', '>', '<', '*'] <<
-                  [('a'..'z'), ('0'..'9'), ('A'..'Z')].map { |i| i.to_a }).flatten
+        alfanb = (['!', '"', '·', '$', '%', '&', '/', '(', ')', '=',
+                   '?', '+', '@', '#', ',', '.', '-', ';', ':', '_',
+                   '[', ']', '>', '<', '*'] <<
+                  [('a'..'z'), ('0'..'9'), ('A'..'Z')].map(&:to_a)).flatten
         (0...length).map { alfanb[rand(alfanb.length)] }.join
       end
       def uuid
-        sprintf('%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
-          # 32 bits for "time_low"
-          rand(0..0xffff), rand(0..0xffff),
-          # 16 bits for "time_mid"
-          rand(0..0xffff),
-          # 16 bits for "time_hi_and_version",
-          #3 four most significant bits holds version number 4
-          rand(0..0x0fff) | 0x4000,
-          # 16 bits, 8 bits for "clk_seq_hi_res",
-          # 8 bits for "clk_seq_low",
-          # two most significant bits holds zero and one for variant DCE1.1
-          rand(0..0x3fff) | 0x8000,
-          # 48 bits for "node"
-          rand(0..0xffff), rand(0..0xffff), rand(0..0xffff)
-        )
+        format('%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
+               rand(0..0xffff),
+               rand(0..0xffff),
+               rand(0..0xffff),
+               rand(0..0x0fff) | 0x4000,
+               rand(0..0x3fff) | 0x8000,
+               rand(0..0xffff),
+               rand(0..0xffff),
+               rand(0..0xffff))
       end
-      def sign_array(astr, salt=nil)
-        sign, i = String.new, 0
-        astr.each { |s|
-          i = i + 1
-          sign << "#{"_"*i}#{s}"
-        }
+      def sign_array(astr, salt = nil)
+        sign = String.new
+        i = 0
+        astr.each do |s|
+          i += 1
+          sign << "#{'_' * i}#{s}"
+        end
         sign << "**#{salt}"
         Digest::SHA1.hexdigest sign
       end
       def hash_password(password, salt)
-        Digest::MD5::hexdigest "#{password}::#{salt}"
+        Digest::MD5.hexdigest "#{password}::#{salt}"
       end
       def hash_password?(hashed, pwd, salt)
         hashed == hash_password(pwd, salt)
       end
       class Identity
         attr_reader :id, :token
         def initialize(id, secret)
@@ -68,15 +57,11 @@ module Tzispa
           @token == Identity.generate_token(@id, secret)
         end
-        private
         def self.generate_token(value, salt)
           Digest::SHA1.hexdigest "___#{value}_#{salt}__token__"
         end
       end
     end
   end
 end

data/lib/tzispa/helpers/services/content_type.rb ADDED Viewed

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+require 'uri'
+require 'tzispa/helpers/mime'
+module Tzispa
+  module Helpers
+    module Services
+      class ContentType
+        include Tzispa::Helpers::Mime
+        attr_reader :response, :default_encoding
+        def initialize(response, default_encoding = nil)
+          @response = response
+          @default_encoding = default_encoding
+        end
+        # Set the Content-Type of the response body given a media type or file
+        # extension.
+        def header(type = nil, params = {})
+          return response['Content-Type'] unless type || params[:default]
+          default = params.delete :default
+          mime = mime_type(type) || default
+          raise "Unknown media type: #{type}" unless mime
+          params = charset mime, params
+          build mime.dup, params
+        end
+        def charset(mime, params)
+          unless params.include?(:charset) || mime.include?('charset')
+            params[:charset] = params.delete('charset') || default_encoding
+          end
+          params.delete :charset if mime.include? 'charset'
+          params
+        end
+        def file(type, extension = nil)
+          return unless response['Content-Type']
+          header type || extension,
+                 default: 'application/octet-stream'
+        end
+        private
+        def build(mime, params)
+          mime if params.empty?
+          mime << (mime.include?(';') ? ', ' : ';')
+          mime << params.select { |_, val| val&.match?(/[";,]/) }
+                        .map do |key, val|
+                          "#{key}=#{val.inspect}"
+                        end.join(', ')
+          response['Content-Type'] = mime
+        end
+      end
+    end
+  end
+end

data/lib/tzispa/helpers/services/error_view.rb ADDED Viewed

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+module Tzispa
+  module Helpers
+    module Services
+      class ErrorView
+        attr_reader :exception
+        def initialize(exception)
+          @exception = exception
+        end
+        def error_header
+          "<h1>#{exception.class.name}</h1><h3>#{exception.message}</h3>"
+        end
+        def error_backtrace_list
+          return unless exception.respond_to?(:backtrace) && exception.backtrace
+          String.new.tap do |str|
+            str << '<ol>'
+            str << exception.backtrace.map { |trace| "<li>#{trace}</li>\n" }.join
+            str << '</ol>'
+          end
+        end
+        def error_backtrace_log
+          return unless exception.respond_to?(:backtrace) && exception.backtrace
+          String.new.tap do |str|
+            str << "#{exception.class.name}: #{exception}:\n"
+            str << exception.backtrace.join("\n")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/tzispa/helpers/services/send_file.rb ADDED Viewed

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+require 'uri'
+module Tzispa
+  module Helpers
+    module Services
+      class SendFile
+        attr_reader :response, :opts, :path
+        def initialize(response, path, opts)
+          @response = response
+          @opts = opts
+          @path = path
+        end
+        def content_disposition(filename = nil, disposition = 'attachment')
+          disposition = String.new << disposition.to_s
+          if filename
+            escaped = URI.escape(filename)
+            disposition << "; filename=\"#{escaped}\""
+            disposition << "; filename*=UTF-8''#{escaped}"
+          end
+          response['Content-Disposition'] = disposition
+        end
+        def send(result)
+          prepare
+          response.status = result[0]
+          if response.status.between? 200, 299
+            headers_set result[1]
+            response.body = result[2]
+          end
+          response
+        end
+        private
+        def prepare
+          content_headers
+          disposition = opts[:disposition]
+          filename    = opts[:filename]
+          disposition = 'attachment' if disposition.nil? && filename
+          filename    = path         if filename.nil?
+          content_disposition filename, disposition
+        end
+        def headers_set(headers)
+          headers.each { |k, v| response.headers[k] ||= v }
+          response.headers['Content-Length'] = headers['Content-Length']
+          response.no_cache.cache_private if opts[:no_cache]
+        end
+        def content_headers
+          ct = Tzispa::Helpers::Services::ContentType.new response
+          ct.file opts[:type], opts[:extension]
+          last_modified opts[:last_modified] if opts[:last_modified]
+        end
+      end
+    end
+  end
+end

data/lib/tzispa/helpers/session.rb ADDED Viewed

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+require 'securerandom'
+require 'tzispa/helpers/session_flash_bag'
+module Tzispa
+  module Helpers
+    module Session
+      SESSION_LAST_ACCESS   = :__last_access
+      SESSION_ID            = :__session_id
+      SESSION_AUTH_USER     = :__auth__user
+      GLOBAL_MESSAGE_FLASH  = :__global_message_flash
+      def init_session
+        generate_session_id if config&.sessions&.enabled && !session?
+      end
+      def set_last_access
+        session[SESSION_LAST_ACCESS] = Time.now.utc.iso8601
+      end
+      def last_access
+        session[SESSION_LAST_ACCESS]
+      end
+      def flash
+        @flash ||= SessionFlashBag.new(session, GLOBAL_MESSAGE_FLASH)
+      end
+      def session?
+        !session[SESSION_ID].nil? && (session[SESSION_ID] == session.id)
+      end
+      def logged?
+        session? && login
+      end
+      def login=(user)
+        session[SESSION_AUTH_USER] = user unless user.nil?
+      end
+      def login
+        session[SESSION_AUTH_USER]
+      end
+      def logout
+        session.delete(SESSION_AUTH_USER)
+      end
+      def generate_session_id
+        SecureRandom.uuid.tap do |uuid|
+          session.id = uuid
+          session[SESSION_ID] = uuid
+        end
+      end
+    end
+  end
+end

data/lib/tzispa/helpers/session_flash_bag.rb ADDED Viewed

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+require 'forwardable'
+require 'json'
+module Tzispa
+  module Helpers
+    module Session
+      class SessionFlashBag
+        extend Forwardable
+        def_delegators :@bag, :count, :length, :size, :each
+        SESSION_FLASH_BAG = :__flash_bag
+        def initialize(session, key)
+          @session = session
+          @session_key = "#{SESSION_FLASH_BAG}_#{key}".to_sym
+          load!
+        end
+        def <<(value)
+          return unless value
+          bag << value
+          store
+        end
+        def pop
+          value = bag.pop
+          store
+          value
+        end
+        def pop_all
+          empty!
+          bag
+        end
+        def push(value)
+          bag.push value
+          store
+        end
+        private
+        attr_reader :bag, :session, :session_key
+        def load!
+          @bag = session[session_key] ? JSON.parse(session[session_key]) : []
+        end
+        def store
+          session[session_key] = bag.to_json
+        end
+        def empty!
+          session[session_key] = []
+        end
+      end
+    end
+  end
+end

data/lib/tzispa/helpers/sign_requirer.rb CHANGED Viewed

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 require_relative 'requirer'
 module Tzispa
@@ -17,9 +19,7 @@ module Tzispa
         self.class.sign_valid? self
       end
       module ClassMethods
         def sign_required!(&block)
           required(:router_params, :sign, &block)
         end
@@ -31,7 +31,6 @@ module Tzispa
         def sign_valid?(obj)
           required_valid? :router_params, :sign, obj
         end
       end
     end

data/lib/tzispa/helpers/text.rb CHANGED Viewed

@@ -3,7 +3,7 @@
 require 'date'
 require 'bigdecimal'
 require 'i18n'
-require "unicode_utils"
+require 'unicode_utils'
 require 'cgi/util'
 module Tzispa
@@ -11,13 +11,11 @@ module Tzispa
     module Text
       def remove_words(sentence, removable)
-        sentence.split.delete_if{|x| removable.include?(UnicodeUtils.downcase x)}.join(' ')
+        sentence.split.delete_if { |x| removable.include? UnicodeUtils.downcase(x) }.join(' ')
       end
       def remove_phrases(text, removable)
-        removable.each { |phrase|
-          text.slice! phrase
-        }
+        removable.each { |phrase| text.slice! phrase }
         text
       end
@@ -26,68 +24,67 @@ module Tzispa
       end
       def synonymize(sentence, synonyms)
-        sentence.gsub(/[[:alnum:]]+/) {|word|
+        sentence.gsub(/[[:alnum:]]+/) do |word|
           dwword = UnicodeUtils.downcase word
-          synonyms.has_key?(dwword) ? synonyms[dwword] : word
-        }
+          synonyms.key?(dwword) ? synonyms[dwword] : word
+        end
       end
       def strip_to_nil(str, transform = nil)
-        sstr = str.strip if str and not str.strip.empty?
+        sstr = str.strip if str && !str.strip.empty?
         case transform
-          when :upcase then
-             UnicodeUtils.upcase(sstr)
-          when :downcase then
-             UnicodeUtils.downcase(sstr)
-          when :titlecase then
-             UnicodeUtils.titlecase(sstr)
-          else sstr
+        when :upcase then
+          UnicodeUtils.upcase(sstr)
+        when :downcase then
+          UnicodeUtils.downcase(sstr)
+        when :titlecase then
+          UnicodeUtils.titlecase(sstr)
+        else
+          sstr
         end
       end
       def html_unscape(str)
-        CGI::unescapeHTML(str.strip) if str && !str.strip.empty?
+        CGI.unescapeHTML(str.strip) if str && !str.strip.empty?
       end
-      def split_to_array(str, separator=';')
-        str.split(separator) if str
+      def split_to_array(str, separator = ';')
+        str&.split(separator)
       end
       def join_to_nil(ary, separator)
-        ary.join(separator) if ary and not ary.empty?
+        ary.join(separator) if ary && !ary.empty?
       end
-      def str_to_bool(str, strue=nil)
+      def str_to_bool(str, strue = nil)
         strue ? (strue == str) : (str == 'yes' || str == 'true')
       end
-      def str_to_date(str, format=nil)
+      def str_to_date(str, format = nil)
         str = strip_to_nil str
         Date.strptime(str, format || I18n.t('date.formats.default')) if str
       end
-      def str_to_datetime(str, format=nil)
+      def str_to_datetime(str, format = nil)
         str = strip_to_nil str
         DateTime.strptime(str, format || I18n.t('datetime.formats.default'))
       end
-      def str_time_ellapsed(t_start, t_end=nil)
+      def str_time_ellapsed(t_start, t_end = nil)
         elapsed = (t_end || Time.now) - t_start
         seconds = elapsed % 60
         minutes = (elapsed / 60) % 60
         hours = elapsed / (60 * 60)
-        format("%02d:%02d:%02d", hours, minutes, seconds)
+        format('%02d:%02d:%02d', hours, minutes, seconds)
       end
       def str_to_amount(str, options = {})
-        if str && !str.strip.empty?
-          separator = options.fetch(:separator, I18n.t('number.currency.format.separator'))
-          precision = options.fetch(:precision, I18n.t('number.currency.format.precision'))
-          re = Regexp.new "[^\\d\\#{separator}\\-]"
-          str = str.gsub(re, '')
-          str = str.gsub(separator, '.') if separator != '.'
-          BigDecimal.new(str).round(precision).to_s('F')
-        end
+        return unless !str || str.strip.empty?
+        separator = options.fetch(:separator, I18n.t('number.currency.format.separator'))
+        precision = options.fetch(:precision, I18n.t('number.currency.format.precision'))
+        str = str.gsub(Regexp.new("[^\\d\\#{separator}\\-]"), '')
+        str = str.gsub(separator, '.') if separator != '.'
+        BigDecimal.new(str).round(precision).to_s('F')
       end
       def amount(number, options = {})
@@ -106,30 +103,34 @@ module Tzispa
           separator = options.fetch(:separator, I18n.t('number.currency.format.separator'))
           delimiter = options.fetch(:delimiter, I18n.t('number.currency.format.delimiter')).to_s
           minimum_precision = options[:minimum_precision] || 0
-          str = number.is_a?(BigDecimal) ? number.to_s('F').sub(/\.0+\z/, "") : number.to_s.sub(/\.0+\z/, "")
-          str =~ /\A(\-?)(\d+)(?:\.(\d+))?\z/ or raise "Could not parse number: #{number}"
-          sign = $1
-          integer = $2
-          fraction = ($3 || '')
+          str = if number.is_a?(BigDecimal)
+                  number.to_s('F').sub(/\.0+\z/, '')
+                else
+                  number.to_s.sub(/\.0+\z/, '')
+                end
+          smatch = str.match(/\A(\-?)(\d+)(?:\.(\d+))?\z/)
+          raise "Could not parse number: #{number}" unless smatch
+          sign = smatch[1]
+          integer = smatch[2]
+          fraction = (smatch[3] || '')
           if options[:maximum_precision]
             fraction = fraction[0, options[:maximum_precision]] if options[:maximum_precision]
           end
-          if fraction.length > 0 && minimum_precision > 0
+          if fraction.positive? && minimum_precision.positive?
             fraction = "#{fraction}#{'0' * [0, minimum_precision - fraction.length].max}"
-          elsif minimum_precision == 0 && fraction.length > 0 && fraction.to_i == 0
+          elsif minimum_precision.zero? && !fraction.empty? && fraction.to_i.zero?
             fraction = ''
           end
-          # the following two lines appear to be the most performant way to add a delimiter to every thousands place in the number
+          # add a delimiter to every thousands place in the number
           integer_size = integer.size
-          (1..((integer_size-1) / 3)).each {|x| integer[integer_size-x*3,0] = delimiter}
+          (1..((integer_size - 1) / 3)).each { |x| integer[integer_size - x * 3, 0] = delimiter }
           str = integer.chomp(delimiter)
           # add fraction
-          str << "#{separator}#{fraction}" if fraction.length > 0
+          str << "#{separator}#{fraction}" unless fraction.empty?
           # restore sign
           str = "#{sign}#{str}"
@@ -145,22 +146,26 @@ module Tzispa
       end
       def money_amount(number, options = {})
-        amount(number, options.merge(:unit => I18n.t('number.currency.format.unit'), :nil_as_dash => false, :precision => I18n.t('number.currency.format.precision'), minimum_precision: 0))
+        amount(number, options.merge(unit: I18n.t('number.currency.format.unit'),
+                                     nil_as_dash: false,
+                                     precision: I18n.t('number.currency.format.precision'),
+                                     minimum_precision: 0))
       end
       def price_amount(number, options = {})
-        amount(number, options.merge(:nil_as_dash => false, :precision => I18n.t('number.currency.format.precision'), minimum_precision: 0))
+        amount(number, options.merge(nil_as_dash: false,
+                                     precision: I18n.t('number.currency.format.precision'),
+                                     minimum_precision: 0))
       end
       def starinizer(rating, star_value, max_stars)
-        Hash.new.tap { |stars|
+        {}.tap do |stars|
           stars[:full] = rating / star_value
           stars[:half] = rating % star_value
           stars[:o] = max_stars - stars[:full] - stars[:half]
-        }
+        end
       end
     end
   end
 end

data/lib/tzispa/helpers/version.rb CHANGED Viewed

@@ -3,7 +3,7 @@
 module Tzispa
   module Helpers
-    VERSION  = '0.2.2'
+    VERSION  = '0.3.0'
     NAME     = 'Tzispa Helpers'
     GEM_NAME = 'tzispa_helpers'

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tzispa_helpers
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Juan Antonio Piñero
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2017-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -64,7 +64,6 @@ files:
 - lib/tzispa/helpers.rb
 - lib/tzispa/helpers/date_time.rb
 - lib/tzispa/helpers/error_view.rb
-- lib/tzispa/helpers/hash_trans.rb
 - lib/tzispa/helpers/html.rb
 - lib/tzispa/helpers/mime.rb
 - lib/tzispa/helpers/pattern.rb
@@ -73,6 +72,11 @@ files:
 - lib/tzispa/helpers/requirer.rb
 - lib/tzispa/helpers/response.rb
 - lib/tzispa/helpers/security.rb
+- lib/tzispa/helpers/services/content_type.rb
+- lib/tzispa/helpers/services/error_view.rb
+- lib/tzispa/helpers/services/send_file.rb
+- lib/tzispa/helpers/session.rb
+- lib/tzispa/helpers/session_flash_bag.rb
 - lib/tzispa/helpers/sign_requirer.rb
 - lib/tzispa/helpers/text.rb
 - lib/tzispa/helpers/version.rb

data/lib/tzispa/helpers/hash_trans.rb DELETED Viewed

@@ -1,18 +0,0 @@
-module Tzispa
-  module Helpers
-    module HashTrans
-      def hash_fussion!(hash, fussion_keys={})
-        hash.keys.each { |key|
-          if fussion_keys.has_key?(key)
-            hash[fussion_keys[key]] ?
-              hash[fussion_keys[key]] += hash[key] :
-              hash[fussion_keys[key]] = hash[key]
-            hash.delete(key)
-          end
-        } unless fussion_keys.empty?
-      end
-    end
-  end
-end