nephos-server 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b13edc23b32693d79a6ff436f805f2ac7a57d941
-  data.tar.gz: a25a361fe88d7763e4f7aee48a92cea306855197
+  metadata.gz: 47e385b6e019a466c3af125cbb247264e2fcd452
+  data.tar.gz: d6f6a10f417bf70a4178d61a1322d6d04a3d9596
 SHA512:
-  metadata.gz: 66d81d163d29377255e3a5c866fdc4076e70e8d70d8276798152f03bee4900615b20010429c79831448c78597026ea5035bd1449babffeabebf517408881bff3
-  data.tar.gz: f63d4ede65f21ad854d88b5d4ff02d50552be506c3e347a087eafb09339dca12d40f87325b433fee0cb42aab7c0a27e5b57958ee5826bb603a8aae6f6376a0ff
+  metadata.gz: 6be74ee7209d60848fa64ec901320fddcdf1e11bd8f24a22ca789a85df9e97e20cd4cfcb869bafac0e0bd693d68b31a369b7119e9a9b1633fb4450009fc89cfa
+  data.tar.gz: c899551d96c76d48d94606d32b892093e35e6bcaca6d32efd028db49ac51a260ceefa68c57b50d79a8fb97db118ac57c5f6ef17b6a6ed223c579009311dd656c

data/README.md

@@ -15,8 +15,6 @@ This is a simple web server, based on rack and puma, with a minimal help:
 
 # TODO
 
-- Improve rendering
-  - html support
 - Routing
   - improve get with arguments
   - add ressource (elarge urls)

data/lib/nephos-server/routing/controller.rb

@@ -3,8 +3,8 @@ module Nephos
 
     attr_reader :env, :infos
 
-    # @params env [Hash] env extracted from the http request
-    # @params parsed [Hash] pre-parsed env with parameters, ...
+    # @param env [Hash] env extracted from the http request
+    # @param parsed [Hash] pre-parsed env with parameters, ...
     def initialize env, parsed
       @env= env
       @infos= parsed

data/lib/nephos-server/routing/execute.rb

@@ -10,13 +10,13 @@ module Nephos
 
     ALL = []
 
-    # @params arg [Hash or Symbol]
+    # @param arg [Hash or Symbol]
     # shortcut to #{Nephos::Responder.render}
     def self.render arg
       Responder.render arg
     end
 
-    # @params path [Array]
+    # @param path [Array]
     # find the right route to use from the url
     def self.parse_path path, verb
       route = File.join(["/"] + path)

data/lib/nephos-server/routing/load.rb

@@ -1,9 +1,3 @@
-class RoutingError < StandardError; end
-class InvalidRoute < RoutingError; end
-class InvalidRouteUrl < InvalidRoute; end
-class InvalidRouteController < InvalidRoute; end
-class InvalidRouteMethod < InvalidRoute; end
-
 module Nephos
   module Route
 
@@ -37,7 +31,7 @@ def route_prefix
   File.join(["/"] + @route_prefix)
 end
 
-# @params what [Hash]
+# @param what [Hash]
 def get what
   raise InvalidRoute unless what.is_a? Hash
   what[:url] = File.expand_path File.join(route_prefix, what[:url])
@@ -45,7 +39,7 @@ def get what
   Nephos::Route.add(what, "GET")
 end
 
-# @params what [Hash]
+# @param what [Hash]
 def post what
   raise InvalidRoute unless what.is_a? Hash
   what[:url] = File.join(route_prefix, what[:url])
@@ -53,7 +47,7 @@ def post what
   Nephos::Route.add(what, "POST")
 end
 
-# @params what [Hash]
+# @param what [Hash]
 def put what
   raise InvalidRoute unless what.is_a? Hash
   what[:url] = File.join(route_prefix, what[:url])

data/lib/nephos-server/server/basic_errors.rb

@@ -1 +1,7 @@
+class RoutingError < StandardError; end
+class InvalidRoute < RoutingError; end
+class InvalidRouteUrl < InvalidRoute; end
+class InvalidRouteController < InvalidRoute; end
+class InvalidRouteMethod < InvalidRoute; end
+
 class InvalidApplicationError < RuntimeError; end

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

@@ -9,7 +9,7 @@ module Nephos
 
     attr_accessor :port
 
-    # @params port [Integer] port to listen
+    # @param port [Integer] port to listen
     def initialize port
       @port = Integer(port)
     end

data/lib/nephos-server/server/responder.rb

@@ -1,29 +1,74 @@
 module Nephos
   module Responder
 
-    CT_CHARSET_ = '; charset=UTF-8'
-    CT_TP = {'Content-type' => 'text/plain' + CT_CHARSET_}
-    CT_TJ = {'Content-type' => 'text/javascript' + CT_CHARSET_}
-    CT_TH = {'Content-type' => 'text/html' + CT_CHARSET_}
+    class InvalidContentType < StandardError; end
 
-    # @params params [Hash, Symbol]
-    def self.render params
-      if params == :empty
-        return [204, CT_TP, [""]]
-      elsif params[:status] == 404
-        return [404, CT_TP, ['Error 404 : Not found !']]
-      elsif params[:status] == 500
-        return [500, CT_TP, ['Error 5OO : Internal Server Error !']]
-      elsif params[:status].is_a? Fixnum
-        return [params[:status], CT_TP, ["Error #{params[:status]}"]]
-      elsif params[:json]
-        return [200, CT_TJ, [params[:json].to_json]]
-      elsif params[:plain]
-        return [200, CT_TJ, [params[:plain].to_s]]
+    CT_CHARSET_PREFIX = '; charset='
+
+    def self.content_type(kind, type, charset='UTF-8')
+      {'Content-type' => "#{kind}/#{type}" + CT_CHARSET_PREFIX + charset}
+    end
+    def self.ct_plain
+      content_type(:text, :plain)
+    end
+    def self.ct_html
+      content_type(:text, :html)
+    end
+    def self.ct_json
+      content_type(:text, :javascript)
+    end
+    # @param params [Hash] containing :type => "kind/type", example: "text/html"
+    def self.ct_specific(params)
+      kind, type = params[:type].match(/^(\w+)\/(\w+)$/)[1..2]
+      if kind.nil? or type.nil?
+        raise InvalidContentType, "params[:type] must match with \"kind/type\""
+      end
+      content_type(kind, type)
+    end
+
+    # Fill params with default parameters (status, plain errors)
+    def self.set_default_params params
+      if (params.keys & [:status]).empty?
+        params[:status] ||= 200
+      end
+      if (params.keys & [:plain, :html, :json, :type]).empty?
+        if params[:status].to_s.match(/^[345]\d\d$/)
+          params[:plain] ||= "Error: #{params[:status]} code"
+        else
+          params[:plain] ||= "ok"
+        end
+      end
+      params
+    end
+
+    # @return [Symbol, nil] :plain, :html, :json, or nil
+    # search the content type
+    def self.params_content_type params
+      (params.keys & [:plain, :html, :json]).first
+    end
+
+    # search the content to render from the params,
+    # based on content_type (plain, html, ...).
+    # If not, check for specific type
+    def self.params_content_type_value params
+      type = params_content_type(params)
+      if type
+        self.send("ct_#{type}")
       else
-        render(:empty)
+        self.send("ct_specific", params)
       end
     end
 
+    # @param params [Hash, Symbol]
+    def self.render params
+      return [204, plain(), [""]] if params == :empty
+      params = set_default_params(params)
+      return [
+        params[:status],
+        params_content_type_value(params),
+        [params[params_content_type(params) || :content]],
+      ]
+    end
+
   end
 end

data/version

@@ -1 +1 @@
-0.1.7
+0.1.8

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nephos-server
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - poulet_a