tzispa 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 494da0d1c9e0718fe00cf30c6ca12ff79656a152
-  data.tar.gz: b076698a91484ffee3f0561f4293034f5eea6115
+  metadata.gz: f50c454f5ef7dadfebaba6ef100dd0b0c46cf195
+  data.tar.gz: ea1f5f7ba86c28537a1cb6cd3bbc2837e5d75da4
 SHA512:
-  metadata.gz: 98dd03475d556c2a0990b4f7979a4eba9ecc1ba94c8943874abf67a568c136f07fceb4c89de9672399bff13f7322d2f1a069a2d6693942be520b5d6816d00d4b
-  data.tar.gz: df7eb2126ea1cf8fc7bd2ddeefc8f975cf99c03d97ab90f31dd4cf5a3ba4d8e843e88ef56beac5bb66ed1d10252074b51ffff0e25a9ea4036e77d0d95a75aedb
+  metadata.gz: 4d25afce79bda116c7b7794eae00b10403edd4573950c3a9c6ee19cffe90dc2eb9d730865ba253eb460175abb0e5f206332aa4eac9ee7394730919565debed39
+  data.tar.gz: 587680df83f8d2c9016dd3c86b50d2baaf941398a791335ff5f570408b2ae0c2c83d85f83270ea15a7c57c76476e7af35cc6d9f3909a224cac69266f5fa3d18a

data/CHANGELOG.md

@@ -2,6 +2,11 @@ Tzispa
 
 General purpose web framework
 
+## v0.7.1
+- ensure set response status in prepare_client/server_error
+- added result_redirect method in api handlers
+- bug fixes
+
 ## v0.7.0
 - distinct error and http status in api handlers
 - better api responses by content type

data/lib/tzispa/api/handler.rb

@@ -41,12 +41,6 @@ module Tzispa
         @status = nil
       end
 
-      def result(type:, data: nil, error: nil)
-        @type = type
-        @data = data
-        @error = error
-      end
-
       class << self
         def before(*args)
           (@before_chain ||= []).tap do |bef|
@@ -59,7 +53,7 @@ module Tzispa
       end
 
       def error?
-        error && error != HANDLER_OK
+        @error && @error != HANDLER_OK
       end
 
       def error_status(error, status = nil)
@@ -67,12 +61,22 @@ module Tzispa
         @status = status
       end
 
-      def result_json(data, error: nil)
-        result type: :json, data: data, error: error
+      def result(type:, data: nil, error: nil)
+        @type = type
+        @data = data
+        @error = error if error
+      end
+
+      def result_json(data)
+        result type: :json, data: data
       end
 
-      def result_download(data, error: nil)
-        result type: :download, data: data, error: error
+      def result_download(data)
+        result type: :download, data: data
+      end
+
+      def result_redirect(data)
+        result type: :redirect, data: data
       end
 
       def not_found
@@ -80,7 +84,11 @@ module Tzispa
       end
 
       def message
-        I18n.t("#{self.class.name.dottize}.#{error}", default: error.to_s) if error
+        I18n.t(error_id, default: error.to_s) if error
+      end
+
+      def error_id
+        "#{self.class.name.dottize}.#{error}" if error
       end
 
       def run!(verb, predicate = nil)

data/lib/tzispa/controller/base.rb

@@ -53,13 +53,15 @@ module Tzispa
       end
 
       def prepare_response(status, content = nil)
-        response.status = status if status.is_a?(Integer)
         if response.client_error?
           prepare_client_error(status)
         elsif response.server_error?
           prepare_server_error(status)
         elsif content
+          response.status = status if status.is_a?(Integer)
           response.body = content
+        elsif status.is_a?(Integer)
+          response.status = status
         end
       end
 
@@ -69,6 +71,7 @@ module Tzispa
 
       def prepare_client_error(status, error = nil)
         status.tap do |code|
+          response.status = status if status.is_a?(Integer)
           context.logger.info log_format(code, error.to_s) if error
           response.body = error_page(context.domain, status: code)
         end
@@ -76,6 +79,7 @@ module Tzispa
 
       def prepare_server_error(status, error = nil)
         status.tap do |code|
+          response.status = status if status.is_a?(Integer)
           context.logger.error log_format(code, error_log(error)) if error
           response.body = if error && Tzispa::Environment.development?
                             debug_info(error)

data/lib/tzispa/server.rb

@@ -23,8 +23,10 @@ module Tzispa
     def setup
       instance_eval 'load "./config/boot.rb"'
       @app = if code_reloading?
+               puts 'Tzispa is booting server with code reloading'
                Shotgun::Loader.new(rackup_file)
              else
+               puts 'Tzispa is booting server without code reloading'
                config = "Rack::Builder.new {( #{::File.read(rackup_file)}\n )}.to_app"
                instance_eval config, rackup_file
              end

data/lib/tzispa/version.rb

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

data/tzispa.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'tzispa_data',    '~> 0.4'
   s.add_dependency 'dotenv',         '~> 2.2'
 
-  s.add_development_dependency 'shotgun'
+  s.add_development_dependency 'shotgun', '~> 0.9'
 
   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.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Juan Antonio Piñero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-13 00:00:00.000000000 Z
+date: 2017-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -160,16 +160,16 @@ dependencies:
   name: shotgun
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 description: A sparkling web framework Rack based
 email:
 - japinero@area-integral.com
@@ -241,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A sparkling web framework