nephos-server 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ebd683681680431232080fb04b684f7096990ea
-  data.tar.gz: 7f2eb0f1413f4b05dba58f0f6cf4b5687d9faacc
+  metadata.gz: 505ec6c0b755cfae4d95193fe452246ecec7bb56
+  data.tar.gz: aff6de3c8994e6fa3cfc85a19f60942a1d2a77cf
 SHA512:
-  metadata.gz: 9c135eb80f258c823ea98467fb958696fdf99e1587fd797130e2b1cb2f5d6d3aa11bb1d261c105b33997b3fe1a5a997905c7d4bae6c5746bd68d3cb5733864fc
-  data.tar.gz: 9d4df9a01574a401b93d90f5ce8330d2a0ddef27271264d2254abda8492c522494f777a8cfb1d4c98f3c39eea33e2ee3f7e70a3b67cc8781ab19310ade63d180
+  metadata.gz: 06aa251c55dd7ac4234aa5a2fdbc3ba428639c5a4bb3fcca97f6147ef6e96d31ed0ac4a062e58c6bff2201343b36b1f6028c4fdb91aaf05c2c1bcd2c15e51dcf
+  data.tar.gz: 9bee705a410c42ff8765635f2bd12781715e72010fefc51190ef928c1f960a38816c8664c1d3c94df49700d4badedc8c22e97fa16231aa42f5162cbb9e1266ad

data/README.md

@@ -12,11 +12,30 @@ This is a simple web server, based on rack and puma, with a minimal help:
 - Rendering
 - Routing
 
+No templating, no database by default. They are extensions of your choice.
 
-# TODO
 
-- Database connection
+# TODO
 
+## TODO v0.2
+
+- Test
+  - Unitary tests
+    - rendering
+    - routing
+- Documentation
+  - Render Api
+  - Routing
+
+## TODO v1
+- Improved Routing (more helper options)
+- Improved Rendering (more options)
+- Guide about
+  - Controllers
+  - Routing
+  - Api Creation
+  - Database creation
+  - Web HTML with templating
 
 # Start
 

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

@@ -10,8 +10,8 @@ module Nephos
       @infos= parsed
       @callpath= callpath
       @params= parsed[:args]
-      @params= @params.merge Hash[callpath[:params].zip @infos[:path]]
-      @params= @params.select{|k,v|k}
+      @params.merge! Hash[callpath[:params].zip @infos[:path]]
+      @params.select!{|k,v|k}
     end
 
     def arguments

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

@@ -11,8 +11,9 @@ module Nephos
         p.match(/:\w+/) ? {p: "[[:graph:]]+", name: p} : {p: p, name: nil}
       end
       url = params.map{|e| e[:p]}.join("/")
+      url = "/" if url.empty?
       what[:match] = /^#{url}$/
-      what[:params] = params.map{|e| e[:name] && e[:name][1..-1]}[1..-1]
+      what[:params] = params.map{|e| e[:name] && e[:name][1..-1]}[1..-1] || []
     end
 
     def self.check!(what)

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

@@ -8,15 +8,7 @@ module Nephos
     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]
@@ -26,39 +18,49 @@ module Nephos
       content_type(kind, type)
     end
 
-    # Fill params with default parameters (status, plain errors)
-    def self.set_default_params params
+    PRESET_CT = {
+      plain: "text/plain",
+      html: "text/html",
+      json: "text/javascript",
+    }
+
+    private
+    # if not :status entry, set to 200
+    def self.set_default_params_status params
       if (params.keys & [:status]).empty?
         params[:status] ||= 200
       end
-      if (params.keys & [:plain, :html, :json, :type]).empty?
+    end
+
+    def self.set_default_params_type params
+      return if not params[:type].nil?
+      params[:type] = PRESET_CT[(params.keys & [:plain, :html, :json]).first || :plain]
+      params[:type] = ct_specific(params)
+    end
+
+    def self.set_default_params_content params
+      type = (params.keys & [:plain, :html, :json, :content]).first
+      if type.nil?
         if params[:status].to_s.match(/^[45]\d\d$/)
-          params[:plain] ||= params[:content] || "Error: #{params[:status]} code"
+          params[:content] = "Error: #{params[:status]} code"
         elsif params[:status].to_s.match(/^[3]\d\d$/)
-          params[:plain] ||= params[:content] || "Redirected: #{params[:status]} code"
+          params[:content] = "Redirected: #{params[:status]} code"
         else
-          params[:plain] ||= params[:content] || "Status: #{params[:status]} code"
+          params[:content] = "Status: #{params[:status]} code"
         end
+      else
+        params[type] = params[type].to_json if type == :json
+        params[:content] = params[type]
       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
+    public
 
-    # 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
-        self.send("ct_specific", params)
-      end
+    # Fill params with default parameters (status, plain errors)
+    def self.set_default_params params
+      set_default_params_status(params)
+      set_default_params_type(params)
+      set_default_params_content(params)
+      params
     end
 
     # @param params [Hash, Symbol]
@@ -67,8 +69,8 @@ module Nephos
       params = set_default_params(params)
       return [
         params[:status],
-        params_content_type_value(params),
-        [params[params_content_type(params) || :content]],
+        params[:type],
+        [params[:content]],
       ]
     end
 

data/version

@@ -1 +1 @@
-0.1.10
+0.1.11

metadata

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