tzispa 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4706212333c5bb1fb9c2aedf9606d11a6a33f005
-  data.tar.gz: 007f42e55ec20c1928efba0a79da4fef5ab86986
+  metadata.gz: 894d9aa7667fefcfa69c76eff750c199591e0ef9
+  data.tar.gz: dda3f0712b977878773d7a036b285d0dfb23c856
 SHA512:
-  metadata.gz: b551e4c9ec240ab5b8ea8bd260b69645a7574e7f60ed1ff79db903ab99ba47ab65fa16f36c940e42ab6322b2a825e88d16a43fdb0c7b357c8f5849f151ce3c57
-  data.tar.gz: 0c0bbae489606f7e3a4a985ccbf6f37877c1caef08eba5f5468570b24ff56a2d28bf47004b9e53e0f6bb3b95fb4fae8d5aa31ca81bdf68abb9f5f54f4d5165bd
+  metadata.gz: e364cd1714699a89d1ab2a8fd7e9f2e7e05637b7d3ddf81c699f0e49ce25c69680c6d4cff1765ce915d9b4f6e02fa594bc616149a04da2f7b75b8555ea5da237
+  data.tar.gz: a2db16df3d8d02498227ac359d6c542104bbad2dcde768ce4f95dd8a19e9fe6d32e788a566a393e81022bd9bf522bd342f6dc3f440fc1692699b66fec287e08d

data/CHANGELOG.md

@@ -2,6 +2,12 @@ Tzispa
 
 General purpose web framework
 
+## v0.5.1
+- Add result_json facility in Api::Handler
+- Rack update requirement to 2.0
+- Fix http_router not poulating env with rack 2.0
+- Code optimizations in middlaware management
+
 ## v0.5.0
 - Add support for signed and unsigned api calls
 

data/lib/tzispa/api/handler.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'forwardable'
+require 'json'
 
 module Tzispa
   module Api
@@ -34,6 +35,10 @@ module Tzispa
         @detailed_error = detailed_error
       end
 
+      def result_json(status=HANDLED_UNDEFINED, data=nil, detailed_error=nil)
+        result response_verb: :json, status: status, data: data.to_json, detailed_error: detailed_error
+      end
+
       def message
         if @status.nil?
           nil

data/lib/tzispa/app.rb

@@ -7,7 +7,6 @@ require 'tzispa/domain'
 require 'tzispa/routes'
 require 'tzispa/config/appconfig'
 require 'tzispa/middleware'
-require 'tzispa/http/context'
 require 'tzispa_data'
 require "tzispa_rig"
 
@@ -22,12 +21,13 @@ module Tzispa
     extend Forwardable
 
     attr_reader :domain, :config, :middleware, :repository, :engine, :logger
+    attr_accessor :routes
+
     def_delegator :@middleware, :use
     def_delegator :@domain, :name
 
 
     class << self
-
       def inherited(base)
         super
         base.class_eval do
@@ -51,31 +51,21 @@ module Tzispa
 
       def mount(path, builder)
         self.new.tap { |app|
-          app.routes ||= Routes.new(path)
-          yield(app.routes)
-          app.middleware.load_app path, builder
+          app.routes ||= Routes.new(app, path)
+          yield(app.routes) if block_given?
+          builder.map path do
+            run app.middleware.builder
+          end
         }
       end
-
-
     end
 
-    attr_accessor :routes
-
     def initialize(domain_name)
       @domain = Domain.new(domain_name)
       @config = Config::AppConfig.new(@domain).load!
       @middleware = Middleware.new self
     end
 
-    def call(env)
-      middleware.call(env)
-    end
-
-    def router
-      routes&.router
-    end
-
     def load!
       Mutex.new.synchronize {
         load_locales
@@ -86,10 +76,9 @@ module Tzispa
         @domain.require_dir 'helpers'
         @domain.require_dir 'api'
         @domain.require_dir 'middleware'
-        @middleware.load!
         @loaded = true
       }
-    self
+      self
     end
 
     private

data/lib/tzispa/context.rb

@@ -7,18 +7,15 @@ module Tzispa
   class Context
     extend Forwardable
 
-    attr_reader    :env
+    attr_reader    :app, :env
     def_delegators :app, :config, :logger, :domain, :repository
 
-    def initialize(environment)
+    def initialize(app, environment)
       @env = environment
+      @app = app
       I18n.locale = config.locales.default.to_sym if config.respond_to?(:locales)
     end
 
-    def app
-      @app ||= env[Tzispa::ENV_TZISPA_APP]
-    end
-
   end
 
 end

data/lib/tzispa/controller/base.rb

@@ -12,15 +12,18 @@ module Tzispa
 
       include Tzispa::Helpers::ErrorView
 
-      attr_reader :context
+      attr_reader :context, :application
       def_delegators :@context, :request, :response, :config
 
-      def initialize(callmethod=nil)
+      def initialize(app, callmethod=nil)
         @callmethod = callmethod
+        @application = app
       end
 
-      def call(environment)
-        @context = environment[Tzispa::ENV_TZISPA_CONTEXT]
+      def call(env)
+        @context = Tzispa::Http::Context.new(@application, env)
+        #env[Tzispa::ENV_TZISPA_CONTEXT] = @context
+        #@context = env[Tzispa::ENV_TZISPA_CONTEXT]
         invoke @callmethod if @callmethod
         response.finish
       end

data/lib/tzispa/http/context.rb

@@ -24,15 +24,15 @@ module Tzispa
       GLOBAL_MESSAGE_FLASH  = :__global_message_flash
 
 
-      def initialize(environment)
-        super(environment)
+      def initialize(app, environment)
+        super(app, 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
-        env['router.params']
+        env['router.params'] || Hash.new
       end
 
       def layout

data/lib/tzispa/http/response.rb

@@ -39,7 +39,7 @@ module Tzispa
         if calculate_content_length?
           # if some other code has already set Content-Length, don't muck with it
           # currently, this would be the static file-handler
-          headers["Content-Length"] = body.inject(0) { |l, p| l + Rack::Utils.bytesize(p) }.to_s
+          headers["Content-Length"] = body.inject(0) { |l, p| l + p.bytesize }.to_s
         end
         headers['X-Powered-By'] = "#{Tzispa::FRAMEWORK_NAME}"
         [status.to_i, headers, result]
@@ -60,6 +60,6 @@ module Tzispa
       end
 
     end
-    
+
   end
 end

data/lib/tzispa/middleware.rb

@@ -1,37 +1,25 @@
 # frozen_string_literal: true
 
+require 'tzispa/http/context'
+
 module Tzispa
+
   class Middleware
 
+    attr_reader :application, :stack
+
     def initialize(app)
       @stack = []
       @application = app
     end
 
-    def load!
-      @builder = ::Rack::Builder.new
-      load_default_stack
-      @stack.each { |m, args, block| @builder.use load_middleware(m), *args, &block }
-      @builder.run @application.router
-      self
-    end
-
-    def load_app(path, builder)
-      app = @application
-      builder.map path do
-        run app.load!
-      end
-    end
-
-    def call(env)
-      begin
-        env[Tzispa::ENV_TZISPA_APP] = @application
-        env[Tzispa::ENV_TZISPA_CONTEXT] = Tzispa::Http::Context.new(env)
-        @builder.call(env)
-      rescue => ex
-        @application.logger.error "#{ex.message} (#{ex.class}):\n #{ex.backtrace&.join("\n\t")}"
-        env[Tzispa::ENV_TZISPA_CONTEXT].response.status = 500
-        env[Tzispa::ENV_TZISPA_CONTEXT].response.finish
+    def builder
+      mw = self
+      @builder ||= ::Rack::Builder.new do
+        #mw.load_default_stack
+        app = mw.application.load!
+        mw.stack.each { |m, args, block| use mw.load(m), *args, &block }
+        run app.routes.router
       end
     end
 
@@ -39,9 +27,7 @@ module Tzispa
       @stack.unshift [middleware, args, blk]
     end
 
-    private
-
-    def load_middleware(middleware)
+    def load(middleware)
       case middleware
       when String
         Object.const_get(middleware)
@@ -52,8 +38,8 @@ module Tzispa
 
     def load_default_stack
       @default_stack_loaded ||= begin
-        #use Rack::MethodOverride
-        true
+        app = application.load!
+        #use TzispaEnv, app
       end
     end
 

data/lib/tzispa/routes.rb

@@ -5,6 +5,7 @@ require 'http_router'
 require 'tzispa/utils/string'
 require 'tzispa/controller/http_error'
 
+
 module Tzispa
 
   class Routes
@@ -13,10 +14,11 @@ module Tzispa
 
     attr_reader :router, :map_path
 
-    def initialize(map_path=nil)
+    def initialize(app, root=nil)
       @router = HttpRouter.new
+      @app = app
       @router.default Tzispa::Controller::HttpError.new('error_404')
-      @map_path = map_path unless map_path=='/'
+      @map_path = root unless root=='/'
     end
 
     def path(path_id, params={})
@@ -35,12 +37,13 @@ module Tzispa
         controller_module = CONTROLLERS_BASE
         require "tzispa/controller/#{req_controller}"
       end
-      @router.add(path, methods ? {request_method: methods} : nil ).tap { |rule|
-        rule.to TzString.constantize("#{controller_module}::#{controller}").new(callmethod)
+      @router.add(path, methods ? {request_method: methods} : nil).tap { |rule|
+        rule.to TzString.constantize("#{controller_module}::#{controller}").new(@app, callmethod)
         rule.name = route_id
       }
     end
 
+
     def index(path, methods=nil, controller=nil)
       add :index, path, methods, controller || 'layout:render!'
     end

data/lib/tzispa/version.rb

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

data/tzispa.gemspec

@@ -15,8 +15,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version     = '~> 2.3'
 
-  s.add_dependency 'rack',           '~> 1.5'
-  s.add_dependency 'puma',           '~> 3.1'
+  s.add_dependency 'rack',           '~> 2.0',    '>= 2.0.1'
   s.add_dependency 'i18n',           '~> 0.7.0'
   s.add_dependency 'http_router',    '~> 0.11.2'
   s.add_dependency 'moneta',         '~> 0.8.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tzispa
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Juan Antonio Piñero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2016-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -16,28 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '2.0'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: puma
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement