tzispa 0.5.17 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76d727af344f043d01060b60f98dc46d363cf2de
-  data.tar.gz: 39aa0eb52c764598a6dfa416b12d9f5098f64701
+  metadata.gz: 0d1e2f805b398259308d37b08aaf4b1afe9d2537
+  data.tar.gz: 751ff37e20bdb8f0c0fc27a12aa7250523b80c99
 SHA512:
-  metadata.gz: '0957f93051d376bc12bd0a77c93f8886ff607ff179172bf5ed8619ecaa3dcedcd00491335591e8092e590648e323d93460fa79e092bcb06fb4031683b0760fb9'
-  data.tar.gz: 2eb808739fee4c3231ec7abd97cc1c7c45c42e810062090f923f2125dc12974412e992eb2aac37a63d5991f5f5399b46de883da0d860673fdaa6982feca8b446
+  metadata.gz: c98965cffb98d15718affc2fa467a9cd6fce46c9033bfcdbdaf1fc55849679708e75fa6db836e735be380d3af9cb8e2f71a753c1dbc92d47ffef0cfb8af43069
+  data.tar.gz: a38443bda7a70802a8baf6d946a5c5293576dcdf8742f5afaf04f658154017454a06c34c71add5324796ab3f5fc9b6b6850ba9a6aff22c39035d2ff29fa4932a

data/CHANGELOG.md

@@ -2,6 +2,13 @@ Tzispa
 
 General purpose web framework
 
+## v0.6.0
+- code refactoring & templates namespace simplification
+- added auth_layout controller
+- added context cache
+- added default format from config in layout url builders
+- removed per app rig engines
+
 ## v0.5.17
 - remove debug puts
 

data/lib/tzispa/api/handler.rb

@@ -26,7 +26,7 @@ module Tzispa
       using Tzispa::Utils
 
       attr_reader :context, :response_verb, :data, :status
-      def_delegators :@context, :request, :response, :app, :repository, :config
+      def_delegators :@context, :request, :response, :app, :repository, :config, :logger
 
       HANDLER_STATUS_UNDEFINED  = nil
       HANDLER_STATUS_OK         = :ok

data/lib/tzispa/app.rb

@@ -8,7 +8,6 @@ require 'tzispa/routes'
 require 'tzispa/config/appconfig'
 require 'tzispa/middleware'
 require 'tzispa_data'
-require "tzispa_rig"
 
 
 module Tzispa
@@ -30,6 +29,14 @@ module Tzispa
 
     class << self
 
+      alias :__new__ :new
+
+      def new(*args, &block)
+        __new__(*args, &block).tap { |app|
+          add app
+        }
+      end
+
       def applications
         synchronize do
           @@applications ||= Hash.new{ |hash, key| raise UnknownApplication.new("#{key}") }
@@ -53,19 +60,18 @@ module Tzispa
         end
       end
 
-      def run(domain_name, builder: nil, on: nil, &block)
-        theapp = self.new domain_name, on: on, &block
+      def run(appid, builder: nil, on: nil, &block)
+        theapp = self.new appid, on: on, &block
         theapp.run builder
       end
 
     end
 
-    def initialize(domain_name, on: nil, &block)
-      @domain = Domain.new(domain_name)
+    def initialize(appid, on: nil, &block)
+      @domain = Domain.new(appid)
       @config = Config::AppConfig.new(@domain).load!
       @middleware = Middleware.new self
       @routes ||= Routes.new(self, on)
-      self.class.add(self)
       instance_eval(&block) if block
     end
 
@@ -84,12 +90,11 @@ module Tzispa
     def load!
       self.class.synchronize {
         load_locales
-        @repository = Data::Repository.new(config.repository.to_h).load! if config.respond_to? :repository
-        @engine = Rig::Engine.new(self, config.template_cache.enabled, config.template_cache.size)
         @logger = Logger.new("logs/#{domain.name}.log", config.logging.shift_age).tap { |log|
           log.level = config.developing ? Logger::DEBUG : Logger::INFO
         } if config.logging&.enabled
-        domain_requires
+        domain_setup
+        @repository = Data::Repository.new(config.repository.to_h).load!(domain) if config.respond_to? :repository
         @loaded = true
       }
       self
@@ -101,7 +106,8 @@ module Tzispa
 
     private
 
-    def domain_requires
+    def domain_setup
+      domain.require_dir
       domain.require_dir 'helpers'
       domain.require_dir 'services'
       domain.require_dir 'api'
@@ -109,9 +115,9 @@ module Tzispa
     end
 
     def load_locales
-      if @config.respond_to?(:locales)
-        I18n.load_path = Dir["config/locales/*.yml"]
-        I18n.load_path += Dir["#{@domain.path}/locales/*.yml"]
+      if config.respond_to?(:locales)
+        I18n.enforce_available_locales = false
+        I18n.load_path += Dir["config/locales/*.yml", "#{domain.path}/locales/*.yml"]
       end
     end
 

data/lib/tzispa/context.rb

@@ -7,12 +7,13 @@ module Tzispa
   class Context
     extend Forwardable
 
-    attr_reader    :app, :env
+    attr_reader    :app, :env, :cache
     def_delegators :app, :config, :logger, :domain, :repository
 
     def initialize(app, environment)
       @env = environment
       @app = app
+      @cache = Hash.new
       I18n.locale = app.config.locales.default.to_sym if app.config&.respond_to?(:locales)
     end
 

data/lib/tzispa/controller/auth_layout.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'tzispa_rig'
+require 'tzispa/controller/base'
+require 'tzispa/controller/exceptions'
+require 'tzispa/helpers/response'
+require 'tzispa_rig'
+
+module Tzispa
+  module Controller
+    class AuthLayout < Base
+      include Tzispa::Helpers::Response
+
+      def render!
+        if (layout_name == login_layout) || context.login
+          rig = Tzispa::Rig::Engine.layout name: layout_name, domain: application.domain, content_type: context.router_params[:format] || config.default_format
+          response.body << rig.render(context)
+          content_type rig.content_type
+        else
+          context.redirect login_layout, true, response
+        end
+      end
+
+      private
+
+      def layout_name
+        context.layout || config.default_layout
+      end
+
+      def login_layout
+        config.login_layout
+      end
+
+
+    end
+  end
+end

data/lib/tzispa/controller/layout.rb

@@ -4,18 +4,17 @@ require 'tzispa_rig'
 require 'tzispa/controller/base'
 require 'tzispa/controller/exceptions'
 require 'tzispa/helpers/response'
+require 'tzispa_rig'
 
 module Tzispa
   module Controller
     class Layout < Base
-
       include Tzispa::Helpers::Response
 
       def render!
-        layout_format = context.router_params[:format] || context.config.default_format
-        rig = context.app.engine.layout(name: layout_name, format: layout_format.to_sym)
+        rig = Tzispa::Rig::Engine.layout name: layout_name, domain: application.domain, content_type: context.router_params[:format] || config.default_format
         response.body << rig.render(context)
-        content_type layout_format
+        content_type rig.content_type
       end
 
       private

data/lib/tzispa/domain.rb

@@ -1,8 +1,12 @@
 # frozen_string_literal: true
 
+require 'tzispa/utils/string'
+
 module Tzispa
   class Domain
 
+    using Tzispa::Utils
+
     attr_reader :name, :root
 
     DEFAULT_DOMAIN_NAME   = :default
@@ -22,24 +26,30 @@ module Tzispa
       Kernel.require "./#{path}/#{file}"
     end
 
-    def require_dir(dir)
-      Dir["./#{path}/#{dir}/*.rb"].each { |file|
-        name = file.split('/').last.split('.').first
-        Kernel.require "./#{path}/#{dir}/#{name}"
-      }
-    end
-
     def load(file)
       Kernel.load "./#{path}/#{file}.rb"
     end
 
-    def load_dir(dir)
-      Dir["./#{path}/#{dir}/*.rb"].each { |file|
+    def require_dir(dir = nil)
+      rqpath = dir ? "/#{path}/#{dir}" : "/#{path}"
+      Dir[".#{rqpath}/*.rb"].each { |file|
+        name = file.split('/').last.split('.').first
+        Kernel.require ".#{rqpath}/#{name}"
+      }
+    end
+
+    def load_dir(dir = nil)
+      rqpath = dir ? "/#{path}/#{dir}" : "/#{path}"
+      Dir[".#{rqpath}/*.rb"].each { |file|
         name = file.split('/').last
-        Kernel.load "./#{path}/#{dir}/#{name}"
+        Kernel.load ".#{rqpath}/#{name}"
       }
     end
 
+    def include(cmod)
+      name.to_s.capitalize.constantize.include cmod
+    end
+
     def self.require(domain, file)
       self.new(name: domain).require(file)
     end

data/lib/tzispa/http/context.rb

@@ -91,12 +91,12 @@ module Tzispa
 
       def layout_path(layout, params={})
         params = params.merge(layout: layout) unless app.config.default_layout&.to_sym == layout
-        app.routes.path layout, params
+        app.routes.path layout, normalize_format(params)
       end
 
       def app_layout_path(app_name, layout, params={})
         params = params.merge(layout: layout) unless app[app_name].config.default_layout&.to_sym == layout
-        app[app_name].routes.path layout, params
+        app[app_name].routes.path layout, normalize_format(params)
       end
 
       def layout_canonical_url(layout, params={})
@@ -107,7 +107,7 @@ module Tzispa
         app[app_name].config.canonical_url + app_layout_path(app_name, layout, params)
       end
 
-      def api(handler, verb, predicate, sufix, app_name)
+      def api(handler, verb, predicate, sufix, app_name = nil)
         unless app_name
           canonical_url :api, handler: handler, verb: verb, predicate: predicate, sufix: sufix
         else
@@ -129,8 +129,14 @@ module Tzispa
         sign == sign_array(args, config.salt)
       end
 
+      private
 
-    end
+      def normalize_format(params)
+        params.tap { |pmm|
+          pmm[:format] = config.default_format unless pmm[:format]
+        }
+      end
 
+    end
   end
 end

data/lib/tzispa/version.rb

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

data/tzispa.gemspec

@@ -16,13 +16,13 @@ Gem::Specification.new do |s|
   s.required_ruby_version     = '~> 2.3'
 
   s.add_dependency 'rack',           '~> 2.0',    '>= 2.0.1'
-  s.add_dependency 'i18n',           '~> 0.7.0'
+  s.add_dependency 'i18n',           '~> 0.8.0'
   s.add_dependency 'thor',           '~> 0.19.0'
   s.add_dependency 'http_router',    '~> 0.11.2'
-  s.add_dependency 'tzispa_helpers', '~> 0.2'
-  s.add_dependency 'tzispa_utils',   '~> 0.2'
-  s.add_dependency 'tzispa_rig',     '~> 0.4.2'
-  s.add_dependency 'tzispa_data',    '~> 0.2.0'
+  s.add_dependency 'tzispa_helpers', '~> 0.2.2'
+  s.add_dependency 'tzispa_utils',   '~> 0.3'
+  s.add_dependency 'tzispa_rig',     '~> 0.5'
+  s.add_dependency 'tzispa_data',    '~> 0.3'
 
   s.files         = Dir.glob("{lib,bin}/**/*") + %w(README.md CHANGELOG.md LICENSE tzispa.gemspec)
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tzispa
 version: !ruby/object:Gem::Version
-  version: 0.5.17
+  version: 0.6.0
 platform: ruby
 authors:
 - Juan Antonio Piñero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-24 00:00:00.000000000 Z
+date: 2017-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -78,56 +78,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: tzispa_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: tzispa_rig
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: tzispa_data
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.3'
 description: A sparkling web framework based on Rack and inspired by Sinatra and Lotus
 email:
 - japinero@area-integral.com
@@ -155,6 +155,7 @@ files:
 - lib/tzispa/config/yaml.rb
 - lib/tzispa/context.rb
 - lib/tzispa/controller/api.rb
+- lib/tzispa/controller/auth_layout.rb
 - lib/tzispa/controller/base.rb
 - lib/tzispa/controller/exceptions.rb
 - lib/tzispa/controller/http_error.rb
@@ -189,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: A sparkling web framework