tzispa 0.8.3 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5fb07c33906038498cb5703d6a81a72ed13a95ff
-  data.tar.gz: 4070f20be8b03dd43d28bb0fdbc6d3ee0dc358ed
+SHA256:
+  metadata.gz: d56df85ed27a10a1ea95fa328fafd0609edcc1ea65e506f8eb1f65769e7d5c47
+  data.tar.gz: 14e72d45df799982e624c41c1c26110f2cc1c36f128aab693f562d30f5d0e31d
 SHA512:
-  metadata.gz: 86e026030f090c5cc4ba3f1b08949a517e9b003d540b43f1590d69eaa49a690500e4223e795f15f2da4b079317448a1bb3c9263dac81a8cc6dc7d650721b07d4
-  data.tar.gz: c3a31477eb3cb52f5f3c4cf7e27d548d8e02e9d1a8c00fa8966d9a71ea3b2ad553c49b9a4f6df695125353e59462ac4622ccb5dadf23043bb96c86eea3aa76c7
+  metadata.gz: b4b5633c0c9bba5425c9b314d301676c50165fd937a9779433e10ce69f6c569334713f713253a0322ef6c44eae39d33b76302ab622f8e33c0f43f28410ca1123
+  data.tar.gz: 4708778807c9260ad414a4a526b07864aba6a47c0edd6910e73cf62baa0e9457724152e109f76a072ddd6e4994ee35b5da01e4b28dc4d1492905354816d10f69

data/CHANGELOG.md

@@ -2,6 +2,10 @@ Tzispa
 
 General purpose web framework
 
+## v0.9.0
+- configuration moved into tzispa_config gem
+- refactoring for new singleton Repository
+
 ## v0.8.3
 - refactoring for tzispa_helpers autoloading
 

data/lib/tzispa/app.rb

@@ -5,7 +5,6 @@ require 'logger'
 require 'i18n'
 require 'tzispa/domain'
 require 'tzispa/config/app_config'
-require 'tzispa/config/db_config'
 require 'tzispa/engine'
 require 'tzispa_data'
 
@@ -16,6 +15,7 @@ module Tzispa
 
     include Tzispa::Engine
 
+    # rubocop:disable Style/ClassVars
     @@appmutex = Mutex.new
 
     attr_reader :domain, :logger, :map_path, :engine, :routes
@@ -28,7 +28,6 @@ module Tzispa
         __new__(*args, &block).tap { |app| add app }
       end
 
-      # rubocop:disable Style/ClassVars
       def applications
         return __applications_container if @@appmutex.locked?
         synchronize do
@@ -57,6 +56,7 @@ module Tzispa
         @@applications ||= Hash.new { |_, key| raise UnknownApplication(key.to_s) }
       end
     end
+    # rubocop:enable Style/ClassVars
 
     def initialize(appid, engine:, on: nil, &block)
       @domain = Domain.new(appid)
@@ -74,7 +74,7 @@ module Tzispa
         app.class.synchronize do
           logging_setup
           locales_setup
-          repository&.load!(domain)
+          Data::Repository.load!(domain)
           domain.setup
           routes_setup
         end
@@ -86,20 +86,13 @@ module Tzispa
     end
 
     def env
-      Tzispa::Environment.instance
+      Environment.instance
     end
 
     def config
       @config ||= Config::AppConfig.new(@domain).load!
     end
 
-    def repository
-      @repository ||= begin
-        dbcfg = Config::DbConfig.new(env.environment)&.to_h
-        Data::Repository.new(dbcfg) if dbcfg&.count&.positive?
-      end
-    end
-
     private
 
     def routes_setup

data/lib/tzispa/commands/command.rb

@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
-require 'tzispa/environment'
+require 'tzispa_config'
 
 module Tzispa
   module Commands
 
     class Command
-
       NO_PROJECT_FOLDER = 'You must be located in a Tzispa project folder to run this command'
 
       def initialize(options)

data/lib/tzispa/commands/project.rb

@@ -5,7 +5,7 @@ require 'base64'
 require 'zlib'
 require 'pathname'
 require 'tzispa/tzisparc'
-require 'tzispa/environment'
+require 'tzispa_config'
 require 'tzispa_helpers'
 require 'tzispa/commands/helpers/project'
 require 'tzispa/commands/helpers/i18n'
@@ -92,7 +92,7 @@ module Tzispa
       end
 
       def generate_database_config
-        Tzispa::Config::DbConfig.create_default name
+        Tzispa::Data::Config.create_default name
       end
 
       def generate_boot

data/lib/tzispa/commands/repository.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'tzispa/config/db_config'
+require 'tzispa/data/config'
 require 'tzispa/commands/helpers/repository'
 
 module Tzispa
@@ -19,7 +19,7 @@ module Tzispa
 
       def generate
         return unless generate_structure
-        Tzispa::Config::DbConfig.add_repository(name, adapter, database)
+        Tzispa::Data::Config.add_repository(name, adapter, database)
         return unless (db = Sequel.connect "#{adapter}://#{database}")
         tables = db.tables
         generate_models tables

data/lib/tzispa/controller/base.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'tzispa_helpers'
-require 'tzispa/environment'
+require 'tzispa_config'
 require 'tzispa/context'
 
 module Tzispa
@@ -28,11 +28,11 @@ module Tzispa
       private
 
       def invoke
-        catch(:halt) {
+        catch(:halt) do
           do_before
           send callmethod
           do_after
-        }
+        end
       end
 
     end

data/lib/tzispa/controller/http.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'forwardable'
 require 'tzispa_helpers'
 require 'tzispa/controller/base'
@@ -60,7 +62,6 @@ module Tzispa
           end
         end
       end
-
     end
 
   end

data/lib/tzispa/domain.rb

@@ -12,7 +12,7 @@ module Tzispa
     def initialize(name)
       @name = name
       @root = "#{Tzispa::Environment.instance.root}/#{Tzispa::Environment.instance.apps_path}"
-      instance_eval "module ::#{name.to_s.capitalize}; end"
+      instance_eval "module ::#{name.to_s.capitalize}; end", __FILE__, __LINE__
     end
 
     def setup
@@ -27,6 +27,10 @@ module Tzispa
       @path ||= root % name.to_s.downcase
     end
 
+    def exist?(file)
+      File.exist? "#{path}/#{file}"
+    end
+
     def require(file)
       Kernel.require "#{path}/#{file}"
     end

data/lib/tzispa/engine/rig/auth/basic_layout.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'tzispa/engine/rig/layout'
+require 'tzispa_helpers'
+
+module Tzispa
+  module Engine
+    module Rig
+      module Auth
+
+        class BasicLayout < Tzispa::Engine::Rig::Layout
+          before :do_auth
+
+          def do_auth
+            # if settings.environment == :production
+            #  unless (@env['HTTP_X_FORWARDED_PROTO'] || @env['rack.url_scheme']) == 'https'
+            #    redirect "https://#{request.env['HTTP_HOST']}#{request.env['REQUEST_PATH']}"
+            #  end
+            # end
+            protected!
+          end
+
+          private
+
+          def protected!
+            return if authorized?
+            response['WWW-Authenticate'] = %(Basic realm="Testing HTTP Auth")
+            throw(:halt, [401, 'Not authorized'])
+          end
+
+          def auth
+            @auth ||= Rack::Auth::Basic::Request.new(request.env)
+          end
+
+          def authorized?
+            auth.provided? &&
+              auth.basic? &&
+              auth.credentials &&
+              auth.credentials == allowed_authorization
+          end
+
+          def allowed_authorization
+            @allowed_authorization ||= [config.auth.basic.user, config.auth.basic.password].freeze
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/tzispa/engine/rig/{auth_layout.rb → auth/session_layout.rb}

@@ -6,13 +6,15 @@ require 'tzispa_helpers'
 module Tzispa
   module Engine
     module Rig
+      module Auth
 
-      class AuthLayout < Tzispa::Engine::Rig::Layout
-        include Tzispa::Helpers::SessionAuth
+        class SessionLayout < Tzispa::Engine::Rig::Layout
+          include Tzispa::Helpers::SessionAuth
 
-        before :login_redirect
-      end
+          before :login_redirect
+        end
 
+      end
     end
   end
 end

data/lib/tzispa/route_set.rb

@@ -76,15 +76,29 @@ module Tzispa
     end
 
     def controller_class(mpath)
-      req_controller = mpath.pop
-      cf_module = if mpath.count > 1
-                    require "#{app.path}/controller/#{req_controller}"
-                    mpath.collect!(&:capitalize).join('::')
-                  else
-                    require "#{ctl_module.underscore}/#{req_controller}"
-                    ctl_module
-                  end
-      "#{cf_module}::#{req_controller.camelize}".constantize
+      name = mpath.pop
+      "#{require_controller(mpath, name)}::#{name.camelize}".constantize
+    end
+
+    def require_controller(mpath, name)
+      app_controller(mpath, name) || tz_controller(mpath, name)
+    end
+
+    def app_controller(mpath, name)
+      ac = "controller/#{mpath.join('/')}/#{name}"
+      return unless app.domain.exist? ac
+      app.domain.require ac
+      mpath.collect(&:capitalize).join('::')
+    end
+
+    def tz_controller(mpath, name)
+      if mpath.count.positive?
+        require "#{ctl_module.underscore}/#{mpath.join('/')}/#{name}"
+        [ctl_module, mpath.collect(&:capitalize).join('::')].join('::')
+      else
+        require "#{ctl_module.underscore}/#{name}"
+        ctl_module
+      end
     end
   end
 

data/lib/tzispa/server.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'rack'
-require 'tzispa/environment'
+require 'tzispa_config'
 
 module Tzispa
   # provides rack-based web server interface
@@ -21,7 +21,7 @@ module Tzispa
     private
 
     def setup
-      instance_eval 'load "./config/boot.rb"'
+      instance_eval 'load "./config/boot.rb"', __FILE__, __LINE__
       @app = if code_reloading?
                puts 'Tzispa is booting server with code reloading'
                Shotgun::Loader.new(rackup_file)

data/lib/tzispa/version.rb

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

data/tzispa.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 require File.expand_path('../lib/tzispa/version', __FILE__)
@@ -18,15 +17,16 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '~> 2.4'
 
   s.add_dependency 'bundler',        '~> 1.14'
-  s.add_dependency 'rack',           '~> 2.0', '>= 2.0.1'
+  s.add_dependency 'dotenv',         '~> 2.2'
+  s.add_dependency 'http_router',    '~> 0.11.2'
   s.add_dependency 'i18n',           '~> 0.8.0'
+  s.add_dependency 'rack',           '~> 2.0', '>= 2.0.1'
   s.add_dependency 'thor',           '~> 0.19.0'
-  s.add_dependency 'http_router',    '~> 0.11.2'
-  s.add_dependency 'tzispa_helpers', '~> 0.3.5'
-  s.add_dependency 'tzispa_utils',   '~> 0.3.5'
+  s.add_dependency 'tzispa_config',  '~> 0.1.0'
+  s.add_dependency 'tzispa_data',    '~> 0.5.0'
+  s.add_dependency 'tzispa_helpers', '~> 0.3.6'
   s.add_dependency 'tzispa_rig',     '~> 0.5.10'
-  s.add_dependency 'tzispa_data',    '~> 0.4.3'
-  s.add_dependency 'dotenv',         '~> 2.2'
+  s.add_dependency 'tzispa_utils',   '~> 0.3.6'
 
   s.add_development_dependency 'shotgun', '~> 0.9'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tzispa
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.9.0
 platform: ruby
 authors:
 - Juan Antonio Piñero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2017-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,25 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.14'
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
+        version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: http_router
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 0.11.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.2
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -59,103 +67,109 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.8.0
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
-  name: http_router
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
-  name: tzispa_helpers
+  name: tzispa_config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
-  name: tzispa_utils
+  name: tzispa_data
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
-  name: tzispa_rig
+  name: tzispa_helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.10
+        version: 0.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.10
+        version: 0.3.6
 - !ruby/object:Gem::Dependency
-  name: tzispa_data
+  name: tzispa_rig
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.5.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.5.10
 - !ruby/object:Gem::Dependency
-  name: dotenv
+  name: tzispa_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 0.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 0.3.6
 - !ruby/object:Gem::Dependency
   name: shotgun
   requirement: !ruby/object:Gem::Requirement
@@ -184,6 +198,7 @@ files:
 - bin/tzispa
 - lib/tzispa.rb
 - lib/tzispa/app.rb
+- lib/tzispa/app_config.rb
 - lib/tzispa/bin/tzispa
 - lib/tzispa/cli.rb
 - lib/tzispa/commands/api.rb
@@ -198,12 +213,6 @@ files:
 - lib/tzispa/commands/repository.rb
 - lib/tzispa/commands/rig.rb
 - lib/tzispa/commands/server.rb
-- lib/tzispa/config/app_config.rb
-- lib/tzispa/config/base.rb
-- lib/tzispa/config/db_config.rb
-- lib/tzispa/config/environment.rb
-- lib/tzispa/config/rc.rb
-- lib/tzispa/config/yaml.rb
 - lib/tzispa/context.rb
 - lib/tzispa/controller/base.rb
 - lib/tzispa/controller/exceptions.rb
@@ -212,18 +221,16 @@ files:
 - lib/tzispa/domain.rb
 - lib/tzispa/engine.rb
 - lib/tzispa/engine/rig/api.rb
-- lib/tzispa/engine/rig/auth_layout.rb
+- lib/tzispa/engine/rig/auth/basic_layout.rb
+- lib/tzispa/engine/rig/auth/session_layout.rb
 - lib/tzispa/engine/rig/context.rb
 - lib/tzispa/engine/rig/layout.rb
 - lib/tzispa/engine/rig/router.rb
-- lib/tzispa/env.rb
-- lib/tzispa/environment.rb
 - lib/tzispa/http/context.rb
 - lib/tzispa/http/request.rb
 - lib/tzispa/http/response.rb
 - lib/tzispa/route_set.rb
 - lib/tzispa/server.rb
-- lib/tzispa/tzisparc.rb
 - lib/tzispa/version.rb
 - tzispa.gemspec
 homepage: https://github.com/japiber/tzispa
@@ -246,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A sparkling web framework

data/lib/tzispa/config/base.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require 'ostruct'
-
-module Tzispa
-  module Config
-
-    class Base < Struct
-      def self.parametrize(params)
-        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

@@ -1,67 +0,0 @@
-# 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/environment.rb

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-module Tzispa
-  module Config
-    module Environment
-
-      RACK_ENV = 'RACK_ENV'
-
-      TZISPA_ENV = 'TZISPA_ENV'
-
-      DEVELOPMENT_ENV = 'development'
-
-      DEFAULT_ENV = 'development'
-
-      PRODUCTION_ENV = 'deployment'
-
-      RACK_ENV_DEPLOYMENT = 'deployment'
-
-      DEFAULT_DOTENV_ENV = '.env.%s'
-
-      DEFAULT_CONFIG = 'config'
-
-      TZISPA_HOST = 'TZISPA_HOST'
-
-      TZISPA_SSL = 'TZISPA_SSL'
-
-      TZISPA_SERVER_HOST = 'TZISPA_SERVER_HOST'
-
-      DEFAULT_HOST = 'localhost'
-
-      TZISPA_PORT = 'TZISPA_PORT'
-
-      TZISPA_SERVER_PORT = 'TZISPA_SERVER_PORT'
-
-      DEFAULT_PORT = 9412
-
-      DEFAULT_RACKUP = 'tzispa.ru'
-
-      DEFAULT_ENVIRONMENT_CONFIG = 'environment'
-
-      DEFAULT_DOMAINS_PATH = 'apps'
-
-      DOMAINS = 'domains'
-
-      DOMAINS_PATH = 'apps/%s'
-
-      APPLICATION = 'application'
-
-      APPLICATION_PATH = 'app'
-
-    end
-  end
-end

data/lib/tzispa/config/rc.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module Tzispa
-  module Config
-    module Rc
-
-      DEFAULT_ARCHITECTURE = 'domains'
-
-      APP_ARCHITECTURE = 'app'
-
-      ARCHITECTURE_KEY = 'architecture'
-
-      PROJECT_NAME = 'project'
-
-      DEFAULT_TEST_SUITE = 'minitest'
-
-      TEST_KEY = 'test'
-
-    end
-  end
-end

data/lib/tzispa/config/yaml.rb

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

data/lib/tzispa/env.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-require 'dotenv'
-
-module Tzispa
-
-  class Env
-    def initialize(env: ENV)
-      @env = env
-    end
-
-    def [](key)
-      @env[key]
-    end
-
-    def []=(key, value)
-      @env[key] = value
-    end
-
-    def key?(key)
-      @env.key? key
-    end
-
-    def load!(path)
-      return unless defined?(Dotenv)
-
-      contents = ::File.open(path, 'rb:bom|utf-8', &:read)
-      parsed   = Dotenv::Parser.call(contents)
-
-      parsed.each do |k, v|
-        next if @env.key?(k)
-        @env[k] = v
-      end
-      nil
-    end
-  end
-
-end

data/lib/tzispa/environment.rb

@@ -1,201 +0,0 @@
-# frozen_string_literal: true
-
-require 'thread'
-require 'pathname'
-require 'singleton'
-require 'tzispa/env'
-require 'tzispa/tzisparc'
-require 'tzispa_utils'
-require 'tzispa/config/environment'
-
-module Tzispa
-
-  class Environment
-    include Singleton
-    include Tzispa::Config::Environment
-    using Tzispa::Utils::TzHash
-
-    LOCK = Mutex.new
-
-    # rubocop:disable Style/ClassVars
-    @@opts = {}
-
-    def initialize
-      @env     = Tzispa::Env.new(env: @@opts.delete(:env) || ENV)
-      @options = Tzispa::Tzisparc.new(root).options
-      @options.merge! @@opts.clone.symbolize!
-      LOCK.synchronize { set_env_vars! }
-    end
-
-    class << self
-      def opts=(hash)
-        @@opts = hash.to_h.dup
-      end
-
-      def [](key)
-        instance[key]
-      end
-
-      def method_missing(name, *args, &block)
-        if instance.respond_to? name
-          instance.send name, *args, &block
-        elsif instance.key? ekup = name.to_s.upcase
-          instance[ekup]
-        else
-          super
-        end
-      end
-    end
-
-    def [](key)
-      @env[key]
-    end
-
-    def key?(key)
-      @env.key? key
-    end
-
-    def environment
-      @environment ||= env[TZISPA_ENV] || rack_env || DEFAULT_ENV
-    end
-
-    def development?
-      environment == DEVELOPMENT_ENV
-    end
-
-    def code_reloading?
-      development?
-    end
-
-    def environment?(*names)
-      names.map(&:to_s).include?(environment)
-    end
-
-    def bundler_groups
-      [:default, environment.to_sym]
-    end
-
-    def root
-      @root ||= Pathname.new(Dir.pwd)
-    end
-
-    def config
-      @config ||= root.join(@options.fetch(:config) { DEFAULT_CONFIG })
-    end
-
-    def project_name
-      @options.fetch(:project)
-    end
-
-    def architecture
-      @options.fetch(:architecture) do
-        warn "Tzispa architecture unknown: see `.tzisparc'"
-        exit 1
-      end
-    end
-
-    def apps_path
-      @options.fetch(:path) do
-        case architecture
-        when DOMAINS
-          DOMAINS_PATH
-        when APPLICATION
-          APPLICATION_PATH
-        end
-      end
-    end
-
-    def host
-      @host ||= @options.fetch(:host) do
-        env[TZISPA_HOST] || DEFAULT_HOST
-      end
-    end
-
-    def server_host
-      @server_host ||= @options.fetch(:server_host) do
-        env[TZISPA_SERVER_HOST] || host
-      end
-    end
-
-    def port
-      @port ||= @options.fetch(:port) do
-        env[TZISPA_PORT] || DEFAULT_PORT
-      end.to_i
-    end
-
-    def server_port
-      @server_port ||= @options.fetch(:server_port) do
-        env[TZISPA_SERVER_PORT] || port
-      end.to_i
-    end
-
-    def uri_port
-      if ssl?
-        ":#{port}" unless port == 443
-      else
-        ":#{port}" unless port == 80
-      end
-    end
-
-    def domains_path
-      @domains_path ||= @options.fetch(:domains_path) do
-        env[DOMAINS_PATH] || DEFAULT_DOMAINS_PATH
-      end
-    end
-
-    def default_port?
-      port == DEFAULT_PORT
-    end
-
-    def ssl?
-      env[TZISPA_SSL] == 'yes'
-    end
-
-    def rackup
-      root.join(@options.fetch(:rackup) { DEFAULT_RACKUP })
-    end
-
-    def daemonize?
-      @options.key?(:daemonize) && @options.fetch(:daemonize)
-    end
-
-    def to_options
-      @options.to_h.merge(
-        environment: environment,
-        apps_path:   apps_path,
-        rackup:      rackup,
-        host:        server_host,
-        port:        server_port
-      )
-    end
-
-    private
-
-    attr_reader :env
-
-    def set_env_vars!
-      set_application_env_vars!
-      set_tzispa_env_vars!
-    end
-
-    def set_tzispa_env_vars!
-      env[TZISPA_ENV]  = env[RACK_ENV] = environment
-      env[TZISPA_HOST] = host
-      env[TZISPA_PORT] = port.to_s
-    end
-
-    def set_application_env_vars!
-      dotenv = root.join(DEFAULT_DOTENV_ENV % environment)
-      env.load!(dotenv) if dotenv.exist?
-    end
-
-    def rack_env
-      case env[RACK_ENV]
-      when RACK_ENV_DEPLOYMENT
-        PRODUCTION_ENV
-      else
-        env[RACK_ENV]
-      end
-    end
-  end
-end

data/lib/tzispa/tzisparc.rb

@@ -1,66 +0,0 @@
-# frozen_string_literal: true
-
-require 'pathname'
-require 'tzispa_utils'
-require 'tzispa/config/rc'
-
-module Tzispa
-
-  class Tzisparc
-    using Tzispa::Utils::TzHash
-
-    include Tzispa::Config::Rc
-
-    FILE_NAME = '.tzisparc'
-
-    SEPARATOR = '='
-
-    def initialize(root)
-      @root = root
-    end
-
-    def options
-      @options ||= default_options.merge(file_options).symbolize!
-    end
-
-    def default_options
-      @default_options ||= { ARCHITECTURE_KEY => DEFAULT_ARCHITECTURE,
-                             PROJECT_NAME     => project_name,
-                             TEST_KEY         => DEFAULT_TEST_SUITE }
-    end
-
-    def exists?
-      path_file.exist?
-    end
-
-    def generate
-      File.open(path_file, 'w') do |file|
-        default_options.each { |k, v| file.puts("#{k}#{SEPARATOR}#{v}") }
-      end
-    end
-
-    private
-
-    def file_options
-      exists? ? parse_file(path_file) : {}
-    end
-
-    def parse_file(path)
-      {}.tap do |hash|
-        File.readlines(path).each do |line|
-          key, value = line.split(SEPARATOR)
-          hash[key] = value.strip
-        end
-      end
-    end
-
-    def path_file
-      @root.join FILE_NAME
-    end
-
-    def project_name
-      ::File.basename(@root)
-    end
-  end
-
-end