tzispa 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4afde718b4afe167e5e25031d064aa92c826162b
-  data.tar.gz: 51c74b98a6a21715a6cd1f23dcf70b5974c1211b
+  metadata.gz: ddd8b371c81a060fcfbe8d43042605073ee6961e
+  data.tar.gz: 72ecddae14e7e16f2c5f3a905941493b35364645
 SHA512:
-  metadata.gz: 63d7bb48cd522eacd349ca5284271fc30ae263558f82a959e4308e31a5ed5e9de56b7cb77489b9bd07faf6382394f8243cee3dabe7b4dd5b399911f6818654fb
-  data.tar.gz: 93450d79ad98a19086ff28b9555efb179bb3da19f4565e8157569b5ad1d44085dc9ee2978da87c4ba3724a8e88cb2efab3277e43ad4c413bb85be20420032fe7
+  metadata.gz: d968dca749d0d728d13a0294bc327010aee8845b17153b6d63916e350cb0a0fb052589348a685faf8c8dfe0704eb090108364845b94d8fa97a63a90cbb318b89
+  data.tar.gz: d79c5b31526e60335a8737b30ae6cab4cdfed10e4d69dafd67ef48badfe2ef91c4ae680adb93fa277fdebf7db01cec4c72592c241ed4c4cf97624143c92b79d1

data/CHANGELOG.md

@@ -2,6 +2,12 @@ Tzispa
 
 General purpose web framework
 
+## v0.8.1
+- rig api handler moved to tzispa_rig gem
+- environment constants refactoring & improves env key access throught method_missing
+- fix applocation global mutext for apps boot & initialization
+- postpone server bind host/port to the Puma web server configuration phase
+
 ## v0.8.0
 - introducing support for other template engines
 - improve errors log

data/lib/tzispa/app.rb

@@ -16,6 +16,8 @@ module Tzispa
 
     include Tzispa::Engine
 
+    @@appmutex = Mutex.new
+
     attr_reader :domain, :logger, :map_path, :engine, :routes
     def_delegators :@domain, :name, :path
 
@@ -28,15 +30,12 @@ module Tzispa
 
       # rubocop:disable Style/ClassVars
       def applications
+        return __applications_container if @@appmutex.locked?
         synchronize do
-          @@applications ||= Hash.new { |_, key| raise UnknownApplication(key.to_s) }
+          __applications_container
         end
       end
 
-      def synchronize
-        Mutex.new.synchronize { yield }
-      end
-
       def [](name)
         applications[name]
       end
@@ -47,6 +46,16 @@ module Tzispa
           applications[app.name] = app
         end
       end
+
+      def synchronize
+        @@appmutex.synchronize { yield }
+      end
+
+      private
+
+      def __applications_container
+        @@applications ||= Hash.new { |_, key| raise UnknownApplication(key.to_s) }
+      end
     end
 
     def initialize(appid, engine:, on: nil, &block)

data/lib/tzispa/commands/api.rb

@@ -38,13 +38,13 @@ module Tzispa
 
       def handler_code(namespace, class_name)
         Tzispa::Utils::Indenter.new.tap do |code|
-          code << "require 'tzispa/api/handler'\n\n"
+          code << "require 'tzispa/rig/handler'\n\n"
           level = 0
           namespace.split('::').each do |ns|
             level.positive? ? code.indent << "module #{ns}\n" : code << "module #{ns}\n"
             level += 1
           end
-          code.indent << "\nclass #{class_name} < Tzispa::Api::Handler\n\n"
+          code.indent << "\nclass #{class_name} < Tzispa::Rig::Handler\n\n"
           code << "end\n\n"
           namespace.split('::').each { code.unindent << "end\n" }
         end.to_s

data/lib/tzispa/config/environment.rb

@@ -0,0 +1,53 @@
+# 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

@@ -0,0 +1,21 @@
+# 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/engine/rig/auth_layout.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 require 'tzispa/engine/rig/layout'
-require 'tzispa/helpers/login'
+require 'tzispa/helpers/session_auth'
 
 module Tzispa
   module Engine
     module Rig
 
       class AuthLayout < Tzispa::Engine::Rig::Layout
-        include Tzispa::Helpers::Login
+        include Tzispa::Helpers::SessionAuth
 
         before :login_redirect
       end

data/lib/tzispa/env.rb

@@ -17,6 +17,10 @@ module Tzispa
       @env[key] = value
     end
 
+    def key?(key)
+      @env.key? key
+    end
+
     def load!(path)
       return unless defined?(Dotenv)
 

data/lib/tzispa/environment.rb

@@ -6,59 +6,17 @@ require 'singleton'
 require 'tzispa/env'
 require 'tzispa/tzisparc'
 require 'tzispa/utils/hash'
+require 'tzispa/config/environment'
 
 module Tzispa
 
   class Environment
     include Singleton
+    include Tzispa::Config::Environment
     using Tzispa::Utils::TzHash
 
     LOCK = Mutex.new
 
-    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'
-
     # rubocop:disable Style/ClassVars
     @@opts = {}
 
@@ -69,22 +27,34 @@ module Tzispa
       LOCK.synchronize { set_env_vars! }
     end
 
-    def self.opts=(hash)
-      @@opts = hash.to_h.dup
-    end
+    class << self
+      def opts=(hash)
+        @@opts = hash.to_h.dup
+      end
 
-    def self.[](key)
-      instance[key]
-    end
+      def [](key)
+        instance[key]
+      end
 
-    def self.development?
-      instance.development?
+      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
@@ -105,21 +75,25 @@ module Tzispa
       [: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
-        puts "Tzispa architecture unknown: see `.tzisparc'"
+        warn "Tzispa architecture unknown: see `.tzisparc'"
         exit 1
       end
     end
 
-    def root
-      @root ||= Pathname.new(Dir.pwd)
-    end
-
     def apps_path
       @options.fetch(:path) do
         case architecture
@@ -131,10 +105,6 @@ module Tzispa
       end
     end
 
-    def config
-      @config ||= root.join(@options.fetch(:config) { DEFAULT_CONFIG })
-    end
-
     def host
       @host ||= @options.fetch(:host) do
         env[TZISPA_HOST] || DEFAULT_HOST

data/lib/tzispa/route_set.rb

@@ -2,7 +2,7 @@
 
 require 'yaml'
 require 'http_router'
-require 'tzispa/utils/string'
+require 'tzispa_utils'
 require 'tzispa/controller/http_error'
 
 module Tzispa

data/lib/tzispa/server.rb

@@ -54,8 +54,8 @@ module Tzispa
       {
         environment: env.environment,
         config:      rackup_file,
-        Host:        env.server_host,
-        Port:        env.server_port,
+        # Host:        env.server_host,
+        # Port:        env.server_port,
         AccessLog:   []
       }
     end

data/lib/tzispa/tzisparc.rb

@@ -1,30 +1,17 @@
 # frozen_string_literal: true
 
 require 'pathname'
-require 'tzispa/utils/hash'
+require 'tzispa_utils'
+require 'tzispa/config/rc'
 
 module Tzispa
 
   class Tzisparc
     using Tzispa::Utils::TzHash
 
-    FILE_NAME = '.tzisparc'
-
-    DEFAULT_ARCHITECTURE = 'domains'
-
-    APP_ARCHITECTURE = 'app'
-
-    ARCHITECTURE_KEY = 'architecture'
-
-    PROJECT_NAME = 'project'
+    include Tzispa::Config::Rc
 
-    DEFAULT_TEST_SUITE = 'minitest'
-
-    TEST_KEY = 'test'
-
-    DEFAULT_TEMPLATE = 'rig'
-
-    TEMPLATE_KEY = 'template'
+    FILE_NAME = '.tzisparc'
 
     SEPARATOR = '='
 
@@ -39,8 +26,7 @@ module Tzispa
     def default_options
       @default_options ||= { ARCHITECTURE_KEY => DEFAULT_ARCHITECTURE,
                              PROJECT_NAME     => project_name,
-                             TEST_KEY         => DEFAULT_TEST_SUITE,
-                             TEMPLATE_KEY     => DEFAULT_TEMPLATE }
+                             TEST_KEY         => DEFAULT_TEST_SUITE }
     end
 
     def exists?

data/lib/tzispa/version.rb

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

data/lib/tzispa.rb

@@ -1,8 +1,16 @@
 module Tzispa
 
   require 'tzispa/version'
-  require 'tzispa/environment'
-  require 'tzispa/server'
-  require 'tzispa/app'
+
+  autoload :Environment,    'tzispa/environment'
+  autoload :Server,         'tzispa/server'
+  autoload :Application,    'tzispa/app'
+  autoload :Cli,            'tzispa/cli'
+  autoload :Context,        'tzispa/context'
+  autoload :Domain,         'tzispa/domain'
+  autoload :Env,            'tzispa/env'
+  autoload :RouteSet,       'tzispa/route_set'
+  autoload :Server,         'tzispa/server'
+  autoload :Tzisparc,       'tzispa/tzisparc'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tzispa
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Juan Antonio Piñero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-22 00:00:00.000000000 Z
+date: 2017-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -183,8 +183,6 @@ files:
 - README.md
 - bin/tzispa
 - lib/tzispa.rb
-- lib/tzispa/api/handler.rb
-- lib/tzispa/api/handler_error.rb
 - lib/tzispa/app.rb
 - lib/tzispa/bin/tzispa
 - lib/tzispa/cli.rb
@@ -203,6 +201,8 @@ files:
 - 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
@@ -246,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A sparkling web framework

data/lib/tzispa/api/handler.rb

@@ -1,107 +0,0 @@
-# frozen_string_literal: true
-
-require 'forwardable'
-require 'tzispa/helpers/provider'
-require 'tzispa/helpers/sign_requirer'
-require 'tzispa/helpers/hooks/before'
-require 'tzispa/helpers/hooks/after'
-require_relative 'handler_error'
-
-module Tzispa
-  module Api
-
-    class ApiException < StandardError; end
-    class UnknownHandlerVerb < ApiException
-      def initialize(s, name)
-        super("Unknown verb: '#{s}' called in api handler '#{name}'")
-      end
-    end
-    class InvalidSign < ApiException; end
-
-    class Handler
-      extend Forwardable
-
-      include Tzispa::Api::HandlerError
-      include Tzispa::Helpers::Provider
-      include Tzispa::Helpers::SignRequirer
-      include Tzispa::Helpers::Hooks::Before
-      include Tzispa::Helpers::Hooks::After
-
-      using Tzispa::Utils::TzString
-
-      attr_reader :context, :type, :data, :error, :rescue_hook, :status
-      def_delegators :@context, :request, :response, :app, :repository,
-                     :config, :logger, :error_log, :info_log
-
-      def initialize(context)
-        @context = context
-        @error = nil
-        @status = nil
-        @rescue_hook = nil
-      end
-
-      def result(type:, data: nil)
-        @type = type
-        @data = data
-      end
-
-      def result_json(data)
-        result type: :json, data: data
-      end
-
-      def result_download(data)
-        result type: :download, data: data
-      end
-
-      def result_redirect(data)
-        result type: :redirect, data: data
-      end
-
-      def error_status(error_code, http_status = nil)
-        @error = error_code
-        @status = http_status
-        result_json error_message: error_message
-      end
-      # alias result_error error_status
-
-      def on_error(http_error, error_code = nil, logger = nil)
-        @rescue_hook = { logger: logger, error_code: error_code, http_error: http_error }
-      end
-
-      def run!(verb, predicate = nil)
-        raise UnknownHandlerVerb.new(verb, self.class.name) unless provides? verb
-        raise InvalidSign if sign_required? && !sign_valid?
-        do_before
-        begin
-          send verb, *(predicate&.split(','))
-        rescue => err
-          if rescue_hook
-            send(rescue_hook[:logger], err) if rescue_hook.include? :logger
-            send(rescue_hook[:http_error], rescue_hook[:error_code])
-          else
-            raise
-          end
-        end
-        do_after
-      end
-
-      def redirect_url(url)
-        if url && !url.strip.empty?
-          url.start_with?('#') ? "#{request.referer}#{url}" : url
-        else
-          request.referer
-        end
-      end
-
-      protected
-
-      def static_path_sign?
-        context.path_sign? context.router_params[:sign],
-                           context.router_params[:handler],
-                           context.router_params[:verb],
-                           context.router_params[:predicate]
-      end
-    end
-
-  end
-end

data/lib/tzispa/api/handler_error.rb

@@ -1,76 +0,0 @@
-# frozen_string_literal: true
-
-require 'i18n'
-require 'tzispa/utils/string'
-
-module Tzispa
-  module Api
-    module HandlerError
-
-      using Tzispa::Utils::TzString
-
-      HANDLER_OK = :ok
-
-      def error?
-        @error && @error != HANDLER_OK
-      end
-
-      def error_message
-        I18n.t(error_id, default: error.to_s) if error
-      end
-
-      def error_id
-        "#{self.class.name.dottize}.#{error}" if error
-      end
-
-      def http_bad_request(code = nil)
-        error_status code || :bad_request, 400
-      end
-
-      def http_unauthorized(code = nil)
-        error_status code || :unauthorized, 401
-      end
-
-      def http_forbidden(code = nil)
-        error_status code || :forbidden, 403
-      end
-
-      def http_not_found(code = nil)
-        error_status code || :not_found, 404
-      end
-
-      def http_not_aceptable(code = nil)
-        error_status code || :not_acceptable, 406
-      end
-
-      def http_conflict(code = nil)
-        error_status code || :conflict, 409
-      end
-
-      def http_gone(code = nil)
-        error_status code || :gone, 410
-      end
-
-      def http_token_required(code = nil)
-        error_status code || :token_required, 499
-      end
-
-      def http_server_error(code = nil)
-        error_status code || :internal_server_error, 500
-      end
-
-      def http_not_implemented(code = nil)
-        error_status code || :not_implemented, 501
-      end
-
-      def http_bad_gateway(code = nil)
-        error_status code || :bad_gateway, 502
-      end
-
-      def http_service_unavailable(code = nil)
-        error_status code || :service_unavailable, 503
-      end
-
-    end
-  end
-end