tzispa 0.5.4 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: deec1c9dafa50296d745e6299f14f6b7c64a582e
-  data.tar.gz: f66ce54490b77c65d4ed3dba5021cc5f54974742
+  metadata.gz: 854b76c406ea8c9fa9742f2e4cd8daa7ec4fea16
+  data.tar.gz: 604cb924b0d88785ac2c9f7808eecb594bda3534
 SHA512:
-  metadata.gz: 5fe4b90a3e2ebb6b3da3f8c6e505ddeeb7173fc43e99af76a64af86627a302c274ca4a7f1ff5b5e9ac9d648ff026dbfe0a80b02a451363f5cff07b452ca01e50
-  data.tar.gz: 0cb5ce7bf33ccc60205f404fc0020167dffbb544429d2d212c23d57c221d45e78180c8c52b05e0ffb84d37c4b86c390f5d7f7cd666f81ae58c6e1081836e6428
+  metadata.gz: 5703eafce64f5b86c2de1e2dd7c9d8235a692a84ffd0fa2ac40c63c37a6de495c559b89f7ec46f29bfe1f7a31a69427d1a8c204551eaf6dc321019e45f8ffad1
+  data.tar.gz: bd6804a30b18b86fa577ca6f2a70c8efe433124caeeaf86f76e43a9d26853bd24ffde5f4985813f9b49cf70793f8afc3ebf4973c114551af694ecb8daf1c5d7f

data/CHANGELOG.md

@@ -2,6 +2,15 @@ Tzispa
 
 General purpose web framework
 
+## v0.5.6
+- more application DSL usage improvements
+- application builder passed in the run method
+- fix router to response http error 404 when no route match is found
+
+## v0.5.5
+- Changes in application initialize to improve DSL usage
+- Application mount removed
+
 ## v0.5.3
 - Add basic inter-app operability for api and url calls
 

data/lib/tzispa/app.rb

@@ -20,8 +20,8 @@ module Tzispa
   class Application
     extend Forwardable
 
-    attr_reader :domain, :config, :middleware, :repository, :engine, :logger
-    attr_accessor :routes
+    attr_reader :domain, :config, :middleware, :repository, :engine,
+                :logger, :mount_path, :routes
 
     def_delegator :@middleware, :use
     def_delegator :@domain, :name
@@ -45,19 +45,6 @@ module Tzispa
         applications[name]
       end
 
-      def mount(path, builder)
-        self.new.tap { |app|
-          add(app)
-          app.routes ||= Routes.new(app, path)
-          yield(app.routes) if block_given?
-          builder.map path do
-            run app.middleware.builder
-          end
-        }
-      end
-
-      private
-
       def add(app)
         synchronize do
           raise DuplicateDomain.new("You have try to add an app with a duplicate domain name #{app.name}") if applications.has_key? app.name
@@ -67,10 +54,25 @@ module Tzispa
 
     end
 
-    def initialize(domain_name)
+    def initialize(domain_name, mount_path: nil, &block)
       @domain = Domain.new(domain_name)
       @config = Config::AppConfig.new(@domain).load!
       @middleware = Middleware.new self
+      @routes ||= Routes.new(self, mount_path)
+      self.class.add(self)
+      instance_eval(&block) if block
+    end
+
+    def run(builder=nil)
+      builder ||= ::Rack::Builder.new
+      if routes.map_path
+        this_app = self
+        builder.map routes.map_path do
+          run this_app.middleware.builder
+        end
+      else
+        builder.run middleware.builder
+      end
     end
 
     def load!

data/lib/tzispa/context.rb

@@ -13,7 +13,7 @@ module Tzispa
     def initialize(app, environment)
       @env = environment
       @app = app
-      I18n.locale = config.locales.default.to_sym if config.respond_to?(:locales)
+      I18n.locale = app.config.locales.default.to_sym if app.config&.respond_to?(:locales)
     end
 
   end

data/lib/tzispa/http/context.rb

@@ -28,7 +28,7 @@ module Tzispa
         super(app, environment)
         @request = Tzispa::Http::Request.new(environment)
         @response = Tzispa::Http::Response.new
-        session[:id] ||= SecureRandom.uuid if app.config.sessions.enabled
+        session[:id] ||= SecureRandom.uuid if app&.config&.sessions&.enabled
       end
 
       def router_params

data/lib/tzispa/middleware.rb

@@ -14,12 +14,12 @@ module Tzispa
     end
 
     def builder
-      mw = self
+      midw = 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
+        midw.application.load!
+        midw.stack.each { |m, args, block| use midw.load(m), *args, &block }
+        run midw.application.routes.router
       end
     end
 
@@ -38,7 +38,7 @@ module Tzispa
 
     def load_default_stack
       @default_stack_loaded ||= begin
-        app = application.load!
+        application.load!
         #use TzispaEnv, app
       end
     end

data/lib/tzispa/routes.rb

@@ -17,7 +17,7 @@ module Tzispa
     def initialize(app, root=nil)
       @router = HttpRouter.new
       @app = app
-      @router.default Tzispa::Controller::HttpError.new('error_404')
+      @router.default Tzispa::Controller::HttpError.new(app, :error_404)
       @map_path = root unless root=='/'
     end
 

data/lib/tzispa/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Tzispa
-  VERSION = '0.5.4'
+  VERSION = '0.5.6'
   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.5.4
+  version: 0.5.6
 platform: ruby
 authors:
 - Juan Antonio Piñero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2016-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack