tzispa 0.6.1 → 0.7.0

data/lib/tzispa/commands/console.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require 'tzispa/commands/command'
+
+module Tzispa
+  module Commands
+
+    class Console < Command
+      ENGINES = {
+        'pry'  => 'Pry',
+        'irb'  => 'IRB'
+      }.freeze
+
+      DEFAULT_ENGINE = ['irb'].freeze
+
+      attr_reader :options
+
+      def initialize(options)
+        super(options)
+
+        @options = Tzispa::Environment.instance.to_options
+      end
+
+      def start
+        prepare
+        engine.start
+      end
+
+      def engine
+        load_engine options.fetch(:engine) { engine_lookup }
+      end
+
+      private
+
+      def prepare
+        # Clear out ARGV so Pry/IRB don't attempt to parse the rest
+        ARGV.shift until ARGV.empty?
+        # Add convenience methods to the main:Object binding
+        # TOPLEVEL_BINDING.eval('self').__send__(:include, CodeReloading)
+      end
+
+      def engine_lookup
+        (ENGINES.find { |_, klass| Object.const_defined?(klass) } || DEFAULT_ENGINE).first
+      end
+
+      # rubocop:disable Lint/HandleExceptions
+      # rubocop:disable Lint/EnsureReturn
+      def load_engine(engine)
+        require engine
+      rescue LoadError
+      ensure
+        return Object.const_get(
+          ENGINES.fetch(engine) do
+            raise ArgumentError("Unknown console engine: `#{engine}'")
+          end
+        )
+      end
+      # rubocop:enable Lint/EnsureReturn
+      # rubocop:enable Lint/HandleExceptions
+    end
+  end
+end

data/lib/tzispa/commands/helpers/i18n.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module Tzispa
+  module Commands
+    module Helpers
+      module I18n
+
+        # Zlib::Inflate.inflate(Base64.decode64(e)).force_encoding('UTF-8').encode
+
+        I18N_DEFAULTS_EN = <<-I18NDEFAULTSEN
+eJydWFtv2zYUfu+vIIQJaYF6gLc3vS0ruqJDdkGzDXkSKIm2iFCkx0sSt8h/
+7+GdlqXUWx9q8lw/fjw8pLLZbF4R3rxCaMCa2F+EcNfJdsDHluOJKC/boE+G
+h9GNiKNbQ8LoHzJE2WjC6L2k0RfrHHkSXI8nsYPVRxzjviddzIVlGP10kEl2
+jB4J00fDop3Zx6zkEEa/9zqMfhMPYfSO9G60tNAhZYC15gksV+UZLJmXc1i4
+LKaw+jwBAoyM052QE9YhHwAgO2yYblBV323qaVMPVdAwwfdWfI3q4S2q76Jc
+jUI6+w5F45dINVgeM7GymAK7/Zj5pWyJYZIpPmaOjdKZZk2mjshMtsgzILxU
+Aut5KuRAZKS9OZK0141bTpx43mx9ajqFGh2o0pj3pKW8fYQ4iU3cCaPbp3YU
+sBtRCKk4abwObZHVZY0eAUTQ1V96Ybh+diZqFtKBWouZEa8H9QFmUe2y14Im
+StZjOvcYkk1CrcZ0yrWgXrkYdcRs1+J2otxAh3BThJGfxkIlSrV6xNyy5BTz
+7NYCWYu5a4KQLTJfPtRCEkV6OJjrSbbIW1yQJIQKllCtcoVAq1qhz6kWyXuy
+jXQeaYtiKyhiVMnfelTJf5nP7QqL1Zy8ItBS+a4UbjWr2Rxlmfk1vqs5zT7Q
+QYrpUHRAfGzQu0SJPXsN+pAPaSy9m3LJDlhjG3SC73M00JHKLbXb0aA7v21E
+ShF31vdhBxJrLWkHwZ9hG6GHKrwnz6Gz+lluMH1vGx6kmaAHoo4kSTDoGOb3
+Deoxv3JqNw+6gySKcJ19SyWA3lELiQreoEEQZSPAvB9RCTGYE6DwWORx86j7
+12DWapETOQnSIpVptHyA6z9bwSwqnnpmlINCFbK45UNa414SaMfSHcfsHaSn
+B2zBoxWyPUd44i3kKmLKS2BcaC8ZyAAD8CaI0XA5WeMHzOjgTMN43k4ygvPu
+cNZ6FpFnvxdgT2IgrE14qr/tr9trtMOU2YKqv/jyfI7HDRYHnZcbe2Om1WLk
+BaUNh8Ca7K1VqkqOgiy2tqGoWZgEsQTAVKZ6Jk+ZPI3vbXGMWMEFAbszHMGV
+cC+PNkK07p1y2hAAK2jcCwa9nvATncxkhVvUj1jiHjb6zbxZrPmkHpJc1Zsi
+u38NLaZ3KohF+X/If+70AoBHCWhbRvgemtE5BihGZ4G8BXoNwQ0b7A58C8kL
+ri/gcQFmZe1kC3UNr7YDS69+aFxigH5ydQvWkNv+B326Y2RS6JECAgtpJxgT
+jxRg7ShhcA9cxaYN5REfc4mCre+3Ns5IOwo9EoI4Qt1peEY7uAgAoo2ncG4v
+C/eHPxmXR7JHaCTsQGK3V4SRPtWJv4Ea9AcjWJGg9Hamm2iy611TatDP7jel
+ixeOt4Xn/cOZzhzcFxX6y/2W2nCenV1vpCS8P8Z84U5KPIALhRSOi7dVEuer
+y9Q8i+F66alvjT8koSIHqBItbIjvs62ie053FK4PiLPDTOW3hIKb5gAdpTBp
+PxMp1NzQcLv66ruqvE/TZ80C8gWAi/BWwV0EbTQT5hlHTydo2BZr8WzJDMKp
+MNXJkgozOBWUMQf42g8K1RRVN2cquAQGGdV/5klhouE8K2zfK7dhVCqT8+25
+p6f96urbNZNsTqj/cbkItDQX1UBhp2Df4HH0/8k95vbj/7m+cX0sXrZO6tuB
+latCse8a9Mt1IbgHwa+lYALBTSnQILj1AugNPTzGAP8Fp69gslhdHd+zkdsL
+A+UPWTzB19dUnJ+lvwtg+PofkP3cv0P1h6a+aepPqP689ncCb3P21wIfIasO
+kPowvfoKEwcxSQ==
+        I18NDEFAULTSEN
+
+        I18N_DEFAULTS_ES = <<-I18NDEFAULTSES
+eJydVU1rFEEQvedXlIFhL9kNeuxbgvE75hAVPC3dM727jf2x9vQENjdFEBER
+ETyIl4AgQUUk4EG87T/xl1iz0z3dm8ySxcPA61fV1a/q9cz0+/0NXpINAGep
+LqVw3FLHawLAVtIjgPkJARrwKQEe8HcCIuAzAibg3wSqgJ8R2An4FYG9gN8Q
+uB3wewIHAX8k8DDgnwR0wO8S/DnR8zXR8yPR8yvR8yfR8yLR8zrR8zbR8yHR
+8ynR84VAHvDLButKMW6bSeWVtVznszC3kbGKurACKLgUqp4ygc3BZkv7NNjM
+NGRV5KeW56IURhO41pIln1J0ydQ1tmJuKcZajERONRYaUVnyGHJWTIdCJynD
+Y25NeT6x0qJW8ff5t6busvxO8R0SOwWulLeWuEmlqI46cqGoHNZqS3LpEM+l
+ATAh5UKwErJ+pNG8TOLKxxMKAHMWG+T8TC8H3KSeSEedpxUtbHoWu5jjJqYq
+qS4WCSlvV4pgq0V0HNBY2utdfiHbnCVTr3ZfMGerte5XklfijaBj/v+2zRzv
+GMcu0l2zqPl0EGNG4OZuQjxB4m5KKCT2U8Ih8aAhptzmXDvUv8arnUxyqbum
+uTjcNSs5ofypVOFnb6AGyctZxrdiRCuJR0Evo1uQFZAxyB5Ddotk+yQ7hOw4
+yMI7MiZwBRN3MW+rzQrxcmKsaxKaKjE4RQXTRkGBf4oobZUaLLGdqe1ESM/v
+9S0xZocFnQ01Vdxv78N1ozy6V2mP9qkNSHCP7lQBPWq5Q8piZWW0myzX3tMh
+8wZnF2rvsPYUOmtP0S2SIW9swnl86tFB7jy6b45CJ6L5X3S1KHRbBNv0t3Uh
+xsWFmJ/a3MiWwJaP2gV2bePGw/kJo4Xp8oMJ6ybe0kGmBsHq1qcr0anV1yRE
+mqniZ2s449Q2OSyJJxcI6aKhu62wJpph4wpncGyiJUJGU0x0RUQsW4zO4Kcm
+muMEV1g6elTFFfq0FEW3krWxRfix92sDPVo04nHd/8Y/VCdZrA==
+        I18NDEFAULTSES
+
+      end
+    end
+  end
+end

data/lib/tzispa/commands/helpers/project.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module Tzispa
+  module Commands
+    module Helpers
+      module Project
+
+        PROJECT_STRUCTURE = [
+          'apps', 'config', 'config/locales', 'config/routes', 'data', 'logs', 'public',
+          'public/css', 'public/vendors', 'public/css/fonts', 'public/css/less', 'public/img',
+          'public/js', 'repository', 'scripts', 'tmp'
+        ].freeze
+
+        PUMA_CONFIG_FILE = 'puma.rb'
+
+        BOOT_FILE = 'boot.rb'
+
+        DEFAULT_MOUNT_PATH = '/'
+
+        GIT_IGNORE = [
+          '*.gem', '*.rbc', '.bundle', '.config', 'Gemfile.lock', 'test/tmp',
+          'tmp', '*.bundle', ' .DS_Store', '.tzisparc', '.rubocop.yml', '.rubocop_todo.yml',
+          'logs/', 'data/', 'tmp/', 'config/*.yml', 'puma.pid', 'puma.state', '.directory',
+          '*.lock', '.env.*'
+        ].freeze
+
+        PUMA_CONFIG = <<-PUMACONFIG
+#!/usr/bin/env puma
+env = Tzispa::Environment.instance
+app_dir = env.root.to_s
+tmp_dir = "\#{app_dir}/tmp"
+logs_dir = "\#{app_dir}/logs"
+environment env.environment
+daemonize env.daemonize?
+pidfile "\#{tmp_dir}/puma.pid"
+state_path "\#{tmp_dir}/puma.state"
+if env.daemonize?
+  stdout_redirect "\#{logs_dir}/puma.stdout", "\#{logs_dir}/puma.stderr"
+end
+workers 0
+# threads 0, 16
+if env.ssl?
+  path_to_key = "\#{app_dir}/\#{env['TZISPA_SSL_KEY']}"
+  path_to_cert = "\#{app_dir}/\#{env['TZISPA_SSL_CERT']}"
+  bind "ssl://\#{env.server_host}:\#{env.server_port}?key=\#{path_to_key}&cert=\#{path_to_cert}"
+else
+  bind "tcp://\#{env.server_host}:\#{env.server_port}"
+end
+tag '%s'
+worker_timeout 90
+        PUMACONFIG
+
+        ENVC_DEFAULTS = <<-ENVCDEFAULTS
+# Define ENV variables
+WEB_SESSIONS_SECRET="%s"
+WEB_SESSIONS_TIMEOUT=2400
+TZISPA_HOST=localhost
+TZISPA_SERVER_HOST=0.0.0.0
+# TZISPA_PORT = 9412
+# TZISPA_SERVER_PORT = 9412
+TZISPA_SSL=no
+# TZISPA_SSL_KEY=.ssl.key
+# TZISPA_SSL_CERT=.ssl.cer
+        ENVCDEFAULTS
+
+      end
+    end
+  end
+end

data/lib/tzispa/commands/helpers/repository.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Tzispa
+  module Commands
+    module Helpers
+      module Repository
+
+        REPO_STRUCTURE = %w(helpers model entity command).freeze
+
+        MODEL_TEMPLATE = <<-MODTPL
+# frozen_string_literal: true
+
+require 'tzispa/data/entity'
+
+module %s
+  module Model
+    class %s < Sequel::Model(:%s)
+      include Tzispa::Data::Entity
+      plugin :validation_helpers
+
+      def validate
+        true
+      end
+    end
+  end
+end
+        MODTPL
+
+        ENTITY_TEMPLATE = <<-ENTTTPL
+# frozen_string_literal: true
+
+require 'tzispa/utils/decorator'
+
+module %s
+  module Entity
+    class %s < Tzispa::Utils::Decorator
+
+    end
+  end
+end
+        ENTTTPL
+
+      end
+    end
+  end
+end

data/lib/tzispa/commands/project.rb

@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+require 'json'
+require 'base64'
+require 'zlib'
+require 'pathname'
+require 'tzispa/tzisparc'
+require 'tzispa/environment'
+require 'tzispa/helpers/security'
+require 'tzispa/commands/helpers/project'
+require 'tzispa/commands/helpers/i18n'
+require 'tzispa/config/db_config'
+
+module Tzispa
+  module Commands
+
+    class Project
+      include Tzispa::Helpers::Security
+      include Tzispa::Commands::Helpers::Project
+      include Tzispa::Commands::Helpers::I18n
+
+      attr_accessor :name, :apps, :created
+
+      def initialize(name)
+        @name = name
+        @apps = []
+      end
+
+      def generate
+        return unless generate_structure
+        generate_projectrc
+        generate_environment
+        generate_rackup
+        generate_puma_config
+        generate_gitignore
+        generate_i18n(%w(en es))
+        generate_database_config
+      end
+
+      private
+
+      def generate_structure
+        return if File.exist? name
+        Dir.mkdir name.to_s
+        PROJECT_STRUCTURE.each do |psdir|
+          Dir.mkdir "#{name}/#{psdir}"
+          File.open("#{name}/#{psdir}/.gitkeep", 'w')
+        end
+      end
+
+      def generate_projectrc
+        rc = Tzisparc.new Pathname.new(Dir.pwd).join(name)
+        rc.generate
+      end
+
+      def generate_environment
+        File.open("#{name}/.env.production", 'w') { |file| file.puts ENVC_DEFAULTS % secret(64) }
+        File.open("#{name}/.env.deployment", 'w') { |file| file.puts ENVC_DEFAULTS % secret(64) }
+        File.open("#{name}/.env.test", 'w') { |file| file.puts ENVC_DEFAULTS % secret(64) }
+      end
+
+      def generate_rackup
+        File.open("#{name}/#{Tzispa::Environment::DEFAULT_RACKUP}", 'w') do |file|
+          file.puts "\# project #{name} started on #{Time.now}"
+        end
+      end
+
+      def generate_gitignore
+        File.open("#{name}/.gitignore", 'w') do |file|
+          GIT_IGNORE.each { |sig| file.puts sig }
+        end
+      end
+
+      def generate_puma_config
+        File.open("#{name}/config/#{PUMA_CONFIG_FILE}", 'w') do |f|
+          f.puts PUMA_CONFIG % name
+        end
+      end
+
+      def generate_database_config
+        Tzispa::Config::DbConfig.create_default name
+      end
+
+      def generate_boot
+        File.open("#{name}/config/#{BOOT_FILE}", 'w') do |file|
+          file.puts 'require \'bundler/setup\' # Set up gems listed in the Gemfile'
+          file.puts
+          file.puts 'Bundler.require(*Tzispa::Environment.instance.bundler_groups)'
+        end
+      end
+
+      def generate_i18n(langs)
+        langs.each do |lang|
+          File.open("#{name}/config/locales/#{lang}.yml", 'w') do |f|
+            content = Base64.decode64(self.class.const_get("I18N_DEFAULTS_#{lang.upcase}"))
+            content = Zlib::Inflate.inflate(content)
+            f.puts content.force_encoding('UTF-8').encode
+          end
+        end
+      end
+    end
+
+  end
+end

data/lib/tzispa/commands/repository.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require 'tzispa/config/db_config'
+require 'tzispa/commands/helpers/repository'
+
+module Tzispa
+  module Commands
+
+    class Repository
+      include Tzispa::Commands::Helpers::Repository
+
+      attr_reader :name, :adapter, :database
+
+      def initialize(name, adapter, dbconn)
+        @name = name
+        @adapter = adapter
+        @database = dbconn
+      end
+
+      def generate
+        return unless generate_structure
+        Tzispa::Config::DbConfig.add_repository(name, adapter, database)
+        return unless (db = Sequel.connect "#{adapter}://#{database}")
+        tables = db.tables
+        generate_models tables
+        generate_entities tables
+      end
+
+      def generate_structure
+        return if File.exist? repo_root
+        Dir.mkdir repo_root
+        REPO_STRUCTURE.each do |psdir|
+          Dir.mkdir "#{repo_root}/#{psdir}"
+          File.open("#{repo_root}/#{psdir}/.gitkeep", 'w')
+        end
+      end
+
+      def generate_models(tables)
+        tables.each do |tc|
+          model_src = format(MODEL_TEMPLATE, name.capitalize, tc.capitalize, tc)
+          File.open(model_file(tc), 'w') { |f| f << model_src }
+        end
+      end
+
+      def generate_entities(tables)
+        tables.each do |tc|
+          entity_src = format(ENTITY_TEMPLATE, name.capitalize, tc.capitalize)
+          File.open(entity_file(tc), 'w') { |f| f << entity_src }
+        end
+      end
+
+      def repo_root
+        @repo_root ||= File.join('repository', name)
+      end
+
+      def model_file(name)
+        "#{repo_root}/model/#{name}.rb"
+      end
+
+      def entity_file(name)
+        "#{repo_root}/entity/#{name}.rb"
+      end
+    end
+
+  end
+end

data/lib/tzispa/commands/rig.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'tzispa/rig/template'
+
+module Tzispa
+  module Commands
+
+    class Rig < Command
+      attr_reader :name, :domain, :type, :mime_format
+
+      def initialize(name, app, type, mime_format = nil, options = nil)
+        super(options)
+        @domain = Tzispa::Domain.new app
+        @type = type.to_sym
+        @name = name
+        @mime_format = mime_format
+      end
+
+      def generate
+        Tzispa::Rig::Template.new(name: name,
+                                  type: type,
+                                  domain: domain,
+                                  format: mime_format).create
+      end
+    end
+
+  end
+end

data/lib/tzispa/commands/server.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'tzispa/commands/command'
+
+module Tzispa
+  module Commands
+
+    class Server < Command
+      def initialize(options)
+        super(options)
+
+        require 'tzispa/server'
+        @server = Tzispa::Server.new
+      end
+
+      def start
+        server.start
+      end
+
+      protected
+
+      attr_reader :server
+    end
+
+  end
+end

data/lib/tzispa/config/{appconfig.rb → app_config.rb}

@@ -6,7 +6,6 @@ require 'tzispa/helpers/security'
 module Tzispa
   module Config
     class AppConfig
-
       include Tzispa::Helpers::Security
 
       CONFIG_FILENAME = :appconfig
@@ -25,54 +24,35 @@ module Tzispa
       def load!
         if @cftime.nil?
           @cftime = File.ctime(filename)
-        else
-          if @cftime != File.ctime(filename)
-            @config = nil
-            @cftime = File.ctime(filename)
-          end
+        elsif @cftime != File.ctime(filename)
+          @config = nil
+          @cftime = File.ctime(filename)
         end
         @config ||= Tzispa::Config::Yaml.load(filename)
       end
 
-      def create_default(host:, default_layout: 'index', locale: 'en')
-        hcfg = Hash.new.tap { |cfg|
-          cfg['developing'] = true
-          cfg['id'] = domain.name
+      def create_default(default_layout, locale)
+        hcfg = {}.tap do |cfg|
           cfg['default_layout'] = default_layout
           cfg['default_format'] = 'htm'
-          cfg['host_name'] = host
-          cfg['canonical_url'] = "http://#{host}"
           cfg['default_encoding'] = 'utf-8'
-          cfg['auth_required'] = false
           cfg['absolute_redirects'] = true
           cfg['salt'] = secret(24)
           cfg['secret'] = secret(36)
-          cfg['temp_dir'] = 'tmp'
-          cfg['temp_dir'] = true
-          cfg['template_cache'] = Hash.new.tap { |tpc|
-            tpc['enabled'] = false
-            tpc['size'] = 0
-          }
-          cfg['locales'] = Hash.new.tap { |loc|
+          cfg['locales'] = {}.tap do |loc|
             loc['preload'] = true
             loc['default'] = locale
-          }
-          cfg['logging'] = Hash.new.tap { |log|
+          end
+          cfg['logging'] = {}.tap do |log|
             log['enabled'] = true
             log['shift_age'] = 'daily'
-          }
-          cfg['sessions'] = Hash.new.tap { |ses|
-            ses['enabled'] = true
-            ses['timeout'] = 3600
-            ses['store_path'] = 'data/session'
-            ses['secret'] = secret(32)
-          }
-        }
+          end
+          cfg['sessions'] = {}.tap { |ses| ses['enabled'] = true }
+        end
         Tzispa::Config::Yaml.save(hcfg, filename)
         load!
       end
-
-
     end
+
   end
 end

data/lib/tzispa/config/base.rb

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 require 'ostruct'
 
 module Tzispa
   module Config
-    class Base < Struct
 
+    class Base < Struct
       def self.parametrize(params)
-        self.new( *(params.keys.map { |k| k.to_sym })).new(*(params.values.map { |v|
-          v.is_a?(Hash) ? self.parametrize(v) : v
-        }))
+        new(*params.keys.map(&:to_sym)).new(*(params.values.map do |v|
+          v.is_a?(Hash) ? parametrize(v) : v
+        end))
       end
-
     end
+
   end
 end

data/lib/tzispa/config/db_config.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require 'tzispa/config/yaml'
+
+module Tzispa
+  module Config
+
+    class DbConfig
+      attr_reader :env, :config
+
+      CONFIG_FILENAME = 'database'
+
+      def initialize(env)
+        @cftime = nil
+        @env = env.to_sym
+      end
+
+      def to_h
+        load!
+        config.to_h[env]&.to_h
+      end
+
+      def load!
+        if @cftime.nil?
+          @cftime = File.ctime(filename)
+        elsif @cftime != File.ctime(filename)
+          @config = nil
+          @cftime = File.ctime(filename)
+        end
+        @config ||= Tzispa::Config::Yaml.load(filename)
+      end
+
+      def filename
+        DbConfig.filename
+      end
+
+      class << self
+        def filename
+          @filename ||= "config/#{CONFIG_FILENAME}.yml"
+        end
+
+        def create_default(path)
+          hcfg = {}.tap do |cfg|
+            cfg['development'] = {}
+            cfg['deployment'] = {}
+            cfg['test'] = {}
+          end
+          Yaml.save(hcfg, File.join(path, filename))
+        end
+
+        def add_repository(name, adapter, dbconn)
+          hs = YAML.safe_load(File.open(filename))
+          hs.each do |_, v|
+            v[name] = {
+              'adapter' => adapter,
+              'database' => dbconn,
+              'connection_validation' => 'No',
+              'local' => 'Yes'
+            }
+          end
+          Yaml.save(hs, filename)
+        end
+      end
+    end
+
+  end
+end

data/lib/tzispa/config/yaml.rb

@@ -1,24 +1,23 @@
+# frozen_string_literal: true
+
 require 'yaml'
 require 'tzispa/config/base'
 
 module Tzispa
   module Config
-    class Yaml < Tzispa::Config::Base
-
 
+    class Yaml < Tzispa::Config::Base
       def self.load(filename)
-        params =  YAML.load(File.open(filename))
-        self.parametrize params
+        params = YAML.safe_load(File.open(filename))
+        parametrize params
       end
 
       def self.save(cfg, filename)
-        File.open(filename, 'w') { |f|
-           f.write cfg.to_yaml
-        }        
+        File.open(filename, 'w') do |f|
+          f.write cfg.to_yaml
+        end
       end
-
-
-
     end
+
   end
 end

data/lib/tzispa/context.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'forwardable'
 require 'i18n'
 
@@ -13,10 +15,9 @@ module Tzispa
     def initialize(app, environment)
       @env = environment
       @app = app
-      @cache = Hash.new
+      @cache = {}
       I18n.locale = app.config.locales.default.to_sym if app.config&.respond_to?(:locales)
     end
-
   end
 
 end