tzispa 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c4be6874602d23587c2ba452f1989d6fa49d358
-  data.tar.gz: a62b6ab378ef9cf8d4c33e5c34e5924d1ac882c4
+  metadata.gz: 1782a5ef50e95d6fd833efd6eacd2e29215e0ba5
+  data.tar.gz: b20ac80acf812c7a8c0479ebc7d23645829fddba
 SHA512:
-  metadata.gz: eb163a5d484d121d42f7b9c3994453c9118df7d430a5bee41c748551a647e80786c1d7a0e7da29587c295e425605a83fae5a4e88dc3553fb2c1cde5ba97fc342
-  data.tar.gz: 4c4fb446ea60989923a78f49040b8389cc049ec9e4a4d2c6f60efc97778db4e051fb953d2e4b7f9010cb506ce9445f56e6a529c656a9fe4e02bce2ce54be006d
+  metadata.gz: e5d2e25ffec6c8e87a6830edc5bafe4fc80d60e704b90f08c620a01e052c40a247c490420f434dab7470cbd187b3ec527bb5afd263ff5e79d70dac8136872e61
+  data.tar.gz: 93e818f963d31eaeec5f6d001940d1baf0b44f692989abd9c17d95f38e94674c90124e6fad315baa417086f28b44d747a134f85acbd38fa6c1e497d277118373

data/CHANGELOG.md

@@ -2,8 +2,11 @@ Tzispa
 
 General purpose web framework
 
+## v0.4.2
+- Preload api and helper modules an classes in app.load
+
 ## v0.4.1
-- Add support to generate canonical urls 
+- Add support to generate canonical urls
 
 ## v0.4.0
 - Added basic cli command engine

data/lib/tzispa/app.rb

@@ -62,7 +62,6 @@ module Tzispa
     def initialize(domain_name)
       @domain = Domain.new(domain_name)
       @middleware = Middleware.new self
-      I18n.load_path = Dir["config/locales/*.yml"]
       @config = Config::AppConfig.new(@domain).load!
     end
 
@@ -74,13 +73,14 @@ module Tzispa
     def load!
       unless @loaded
         Mutex.new.synchronize {
+          load_locales
           @middleware.load!
           @repository = Data::Repository.new(@config.repository.to_h).load! if @config.respond_to? :repository
           @engine = Rig::Engine.new(self, true, 32)
           @logger = Logger.new("logs/#{@domain.name}.log", 'weekly')
           @logger.level = @config.respond_to?(:developing) && @config.developing ? Logger::DEBUG : Logger::INFO
-          I18n.load_path += Dir["#{@domain.path}/config/locales/*.yml"] if @config.respond_to?(:locales) && @config.locales.preload
-          I18n.locale = @config.locales.default.to_sym if @config.respond_to?(:locales) && @config.locales.default
+          @domain.require_dir 'helpers'
+          @domain.require_dir 'api'
           @loaded = true
         }
       end
@@ -89,6 +89,13 @@ module Tzispa
 
     private
 
+    def load_locales
+      if @config.respond_to?(:locales)
+        I18n.load_path = Dir["config/locales/*.yml"]
+        I18n.load_path += Dir["#{@domain.path}/config/locales/*.yml"]
+      end
+    end
+
 
   end
 end

data/lib/tzispa/command/app.rb

@@ -15,6 +15,7 @@ module Tzispa
         'config',
         'config/locales',
         'error',
+        'helpers',
         'rig',
         'rig/block',
         'rig/layout',
@@ -37,6 +38,10 @@ module Tzispa
 
       private
 
+      def app_class_name
+        @app_class_name ||= "#{TzString.camelize domain.name}App"
+      end
+
       def update_project
         prj = Project.open
         raise "Application '#{domain.name}' already exist in this project" if prj.apps.include?(domain.name)
@@ -52,14 +57,13 @@ module Tzispa
       end
 
       def new_app_code(mount_path)
-        appclass = "#{TzString.camelize domain.name}App"
         Tzispa::Utils::Indenter.new(2).tap { |code|
-          code << "\nclass #{appclass} < Tzispa::Application\n\n"
+          code << "\nclass #{app_class_name} < Tzispa::Application\n\n"
           code.indent << "def initialize\n"
           code.indent << "super(:#{domain.name})\n"
           code.unindent << "end\n\n"
           code.unindent << "end\n\n"
-          code << "#{appclass}.mount '/#{mount_path}', self do |route|\n"
+          code << "#{app_class_name}.mount '/#{mount_path}', self do |route|\n"
           code.indent << "route.index '/', [:get, :head]\n"
           code << "route.api   '/__api_:sign/:handler/:verb(~:predicate)(/:sufix)', [:get, :head, :post]\n"
           code << "route.site  '/:title(/@:id0)(@:id1)(@~:id2)(@@:id3)(@@~:id4)(@@@:id5)/:layout.:format', [:get, :head]\n"

data/lib/tzispa/config/appconfig.rb

@@ -53,6 +53,7 @@ module Tzispa
           cfg['sessions'] = Hash.new.tap { |ses|
             ses['enabled'] = true
             ses['timeout'] = 3600
+            ses['store_path'] = 'data/session'
             ses['secret'] = secret(32)
           }
         }

data/lib/tzispa/context.rb

@@ -1,4 +1,5 @@
 require 'forwardable'
+require 'i18n'
 
 module Tzispa
 
@@ -13,6 +14,7 @@ module Tzispa
       @env = environment
       @app = environment[:tzispa__app]
       @repository = @app.repository.dup if @app.repository
+      I18n.locale = config.locales.default.to_sym if config.respond_to?(:locales)
     end
 
   end

data/lib/tzispa/controller/api.rb

@@ -30,7 +30,7 @@ module Tzispa
 
       def redirect
         context.flash << hnd.message
-        url = hnd.data
+        url = hnd.data || request.referer
         context.redirect url, response
       end
 

data/lib/tzispa/domain.rb

@@ -22,10 +22,24 @@ 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|
+        name = file.split('/').last
+        Kernel.load "./#{path}/#{dir}/#{name}"
+      }
+    end
+
     def self.require(domain, file)
       self.new(name: domain).require(file)
     end

data/lib/tzispa/http/context.rb

@@ -28,6 +28,7 @@ module Tzispa
         super(environment)
         @request = Tzispa::Http::Request.new(environment)
         @response = Tzispa::Http::Response.new
+        session[:id] ||= SecureRandom.uuid if app.config.sessions.enabled
       end
 
       def router_params
@@ -63,17 +64,17 @@ module Tzispa
       end
 
       def path(path_id, params={})
-        @app.class.routes.path path_id, params
+        app.class.routes.path path_id, params
       end
 
       def canonical_url(path_id, params={})
-        @app.config.canonical_url + path(path_id, params)
+        app.config.canonical_url + path(path_id, params)
       end
 
       def api(handler, verb, predicate, sufix)
         raise ArgumentError.new('missing parameter in api call') unless handler && verb
-        sign = sign_array [handler, verb, predicate], @app.config.salt
-        @app.class.routes.path :api, {sign: sign, handler: handler, verb: verb, predicate: predicate, sufix: sufix}
+        sign = sign_array [handler, verb, predicate], app.config.salt
+        app.class.routes.path :api, {sign: sign, handler: handler, verb: verb, predicate: predicate, sufix: sufix}
       end
 
     end

data/lib/tzispa/middleware.rb

@@ -57,8 +57,8 @@ module Tzispa
     def _load_session_middleware
       if @application.config.sessions.enabled
         use Rack::Session::Moneta,
-          store: Moneta.new(:HashFile, dir: './data/session', expires: true, threadsafe: true),
-          key: "_#{@application.config.id}__", ##{SecureRandom.hex(18)}
+          store: Moneta.new(:HashFile, dir: @application.config.sessions.store_path, expires: true, threadsafe: true),
+          key: "_#{@application.config.id}__",
           domain: @application.config.host_name,
           path: '/',
           expire_after: @application.config.sessions.timeout,

data/lib/tzispa/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tzispa
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Juan Antonio Piñero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-05 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack