nephos-server 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88dc123fd7778e73c4170a998c38f2a29bf63ad4
-  data.tar.gz: 0831153c3949c6c869212c28fc98ee7c03046b23
+  metadata.gz: d4514440bf54a350bfc10a1708dd59e62026c09a
+  data.tar.gz: 9b799b47b67cf952c673dff00d0f78372fdd19ab
 SHA512:
-  metadata.gz: 1164950bbde121ac27a0e779bbe3e8db88c1832d6b18021355382c698bc7604c8c9877fe9721ab31f9aa059c88ffd2c85b4c43ea63c90141134a4dc5c4117b8d
-  data.tar.gz: ebf578920edd66b5171670b3675b37dd988c04855350eb0a6434c1e1ff6e9316909a2a73aa32dd7869b3ccc738fc14c0a86bd08c461167fc26b315c445ca1409
+  metadata.gz: e9c40078b0cd371e4d8a78ef260d8ba60077495c27b4b0dcc8608d439585c39102281d877906345776168351d3d2709a409cfe1a15b9ade138cb141835117786
+  data.tar.gz: 4d9d73d790941b6a0192525ed3c20374c683affc465d83ad761ac7a32e6a9268524205141d26dcd83d13e3ef1bdbe4f34fb4035cb8d5bcfdbb87849fa435c8cd

data/CHANGELOG

@@ -1,3 +1,7 @@
+v0.4.4
+	* improve errors
+	* fix unitary tests about controller generator
+
 v0.4.3
 	* improve gemspec changelog
 	* improve generator

data/bin/nephos-generator

@@ -120,7 +120,7 @@ EOF
       case opt[0]
       when "c", "controller"
         if opt[1].to_s.match(/[\w\-\.]+/)
-          Controller.generate!("#{opt[1].capitalize}Controller", "app/#{opt[1].downcase}.rb")
+          Controller.generate!("#{opt[1].capitalize}Controller", "app/#{opt[1].downcase}_controller.rb")
         else
           puts "error"
         end

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

@@ -29,22 +29,33 @@ module Nephos
       return {route: route, verb: verb, from: from, path: path, args: args}
     end
 
+    def self.error(code, err=nil)
+      if ENV["ENVIRONMENT"].to_s.match(/prod(uction)?/)
+        return render(status: code)
+      elsif err
+        #TODO: improve this
+        return render(status: code, content: err.is_a?(String) ? err : err.message)
+      else
+        return render(status: code)
+      end
+    end
+
     def self.execute(env)
       begin
         route = URI.parse(env['REQUEST_URI'])
       rescue => err
         puts "uri err #{err.message}".red
-        return render(status: 500)
+        return error(500, err)
       end
       parsed = parse_env(env, route)
       puts "#{parsed[:from]} [#{parsed[:verb]}] \t ---> \t #{route}"
       call = parse_path(parsed[:path], parsed[:verb])
-      return render(status: 404) if call.nil?
+      return error(404, "404 not found \"#{route}\"") if call.nil?
       begin
         controller = Module.const_get(call[:controller]).new(env, parsed, call)
-        return render(controller.send(call[:method]) || {status: 500})
+        return render(controller.send(call[:method]))
       rescue => err
-        return render(status: 500)
+        return error(500, err)
       end
     end
 

data/test/generator.rb

@@ -7,17 +7,17 @@ class TestNephosServerGenerator < Test::Unit::TestCase
   end
 
   def test_generator_controller
-    `rm -f app/test.rb`
+    `rm -f app/test_controller.rb`
 
     `nephos-generator --debug c test`
-    assert File.exists? "app/test.rb"
-    assert_equal "class TestController < Nephos::Controller", File.read("app/test.rb").split("\n").first
-    `rm -f app/test.rb`
+    assert File.exists? "app/test_controller.rb"
+    assert_equal "class TestController < Nephos::Controller", File.read("app/test_controller.rb").split("\n").first
+    `rm -f app/test_controller.rb`
 
     `nephos-generator c test --debug`
-    assert File.exists? "app/test.rb"
-    assert_equal "class TestController < Nephos::Controller", File.read("app/test.rb").split("\n").first
-    `rm -f app/test.rb`
+    assert File.exists? "app/test_controller.rb"
+    assert_equal "class TestController < Nephos::Controller", File.read("app/test_controller.rb").split("\n").first
+    `rm -f app/test_controller.rb`
   end
 
   # test simple and rm

data/version

@@ -1 +1 @@
-0.4.3
+0.4.4

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nephos-server
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - poulet_a
@@ -148,6 +148,5 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: "* improve gemspec changelog * improve generator * improve responder (with
-  integer argument) * fix router helpers"
+summary: "* improve errors * fix unitary tests about controller generator"
 test_files: []