nephos-server 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 837711f9cdfb6dbb77a5c9c5a0964bd3f603c0c5
-  data.tar.gz: 1d69471c358c7a4e042dcabbbeb6d2002f55c1ed
+  metadata.gz: fd4f2176f42e827ebb36ac19f651e3adb12e7609
+  data.tar.gz: 99677cc04947d8c967c358d8e2cc8dab847e5879
 SHA512:
-  metadata.gz: 807f30fb29bdc799e41180f9af31357aaae7c62118a551ff0e674419e6a6431b994e2a02c241a2e187d102dc3e5fea4349408c95fda63431f81f13dc62f0f4a9
-  data.tar.gz: 69442d3daba27976f008181bfaa7bff0746d0278267e24749962fae8320ee1961ed0a3ac5ec610021b8416e50ae45db67a7213a37551d4160a8243589f25b22a
+  metadata.gz: 4d609afb7b502b5ab9831f289b0029cecfbe0ea3ccf8c8c86686df86e575eb1021a8b73b7f39fc4449ce00cecd0c018b264f322d5cfcbce8977345bc65e67824
+  data.tar.gz: 1db01ad58ca2bec79883ca541b8e6d6bd436fea5622b4f0fe193fdcecc1864a917ea3595fe7c8347d0678be3d5d30e4168f5d462ecfdbda00f85886f78b3f291

data/CHANGELOG

@@ -1,3 +1,6 @@
+v0.6.3
+        * Add customisable default error page
+
 v0.6.2
         * Fix generator (bug when --application on current directory)
 	* Improve hooks (add the :only option)

data/README.md

@@ -46,6 +46,7 @@ Theses guides will provide you knowlegde about everything you can use in the app
 - [Render API](DOCUMENTATION/API_RENDER.md)
 - [Router GUIDE](DOCUMENTATION/GUIDE_ROUTER.md)
 - [Controller GUIDE](DOCUMENTATION/GUIDE_CONTROLLER.md)
+- [Customisable errors GUIDE](DOCUMENTATION/GUIDE_ERRORS.md)
 - [Code documentation on RubyDoc.info](http://www.rubydoc.info/gems/nephos-server/toplevel) -> **Note: you can also generate local documentation via yard**
 
 ## Examples
@@ -109,24 +110,28 @@ end
 
 # Developers: Roadmap
 
-## TODO v0.5
-
 ## TODO v0.6
-- startable as daemon
 - feature to change HTTP header from controller
-- customisable default 404 errors and 500 errors
 - functionnal tests
 
+## TODO v0.7
+- Documentation on architecture (UML)
+- Improved documentation (Tutorial, Improved guides)
+- Alias for routing
+
 ## v1 requierements
 - Environement, Daemons, Port, Listen Host, Routables, Arguments
+- Clear architecture
 - Generator readables and powerfull
 - At least 80% tests coverage
+- Performances benchmark
 - Guide about
   - Controllers
   - Routing
   - Api Creation
   - Database creation
   - Web HTML with templating
+- Clear documentation on the features using regexp, options, ...
 
 Gitlab Continuous Integration:
 [![Gitlab Tests](https://gitlab.com/ci/projects/8973/status.png?ref=master)](https://gitlab.com/ci/projects/8973?ref=master)

data/lib/nephos-server/controller.rb

@@ -22,7 +22,6 @@ module Nephos
       @params.merge! Hash[callpath[:params].zip(params)]
       @params.select!{|k,v| not k.to_s.empty?}
 
-
       @params = Params.new(@params)
       @cookies = Params.new(@req.cookies)
     end

data/lib/nephos-server/router/main.rb

@@ -40,6 +40,20 @@ module Nephos
       end
     end
 
+    def error_custom(req, code, default=nil)
+      if File.exists? "app/#{code}.html"
+        @responder.render(status: code, html: File.read("app/#{code}.html"))
+      else
+        render_error(req, code, default || "Error: #{req.status}")
+      end
+    end
+
+    def error_404(req)
+      out = error_custom(req, 404, "404 not found \"#{req.path}\"")
+      out.body[0].gsub!("INJECT_REQ_PATH", req.path)
+      return out
+    end
+
     # @param path [Array]
     #
     # Find the right route to use from the url
@@ -53,13 +67,13 @@ module Nephos
       env = req.env
       puts "#{req.env["REMOTE_ADDR"]} [#{req.request_method}] \t ---> \t #{req.path}" unless @silent
       call = find_route(req)
-      return render_error(req, 404, "404 not found \"#{req.path}\"") if call.nil?
+      return error_404(req) if call.nil?
       begin
         return render_controller(req, call)
       rescue => err
         STDERR.puts "Error: #{err.message}"
         STDERR.puts err.backtrace
-        return render_error(req, 500, err)
+        return error_custom(req, 500, "Error: 500\n#{err.message}\n---Backtrace---\n#{err.backtrace.join("\n")}\n")
       end
     end
 

data/version

@@ -1 +1 @@
-0.6.2
+0.6.3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nephos-server
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - poulet_a
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nomorebeer