nephos-server 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0198ab59046527552ad7b7f66c25dcd04ca3727f
-  data.tar.gz: aeb7527f299c85860b4941a528c15635ed6024a8
+  metadata.gz: c470980b6da991d95c060efa740e0a89cc82eb30
+  data.tar.gz: d7236c0810fd2c019e5d1a180b63270d950e0a06
 SHA512:
-  metadata.gz: b6aee265e6d6fb09239476dcb545c6ea282fea41ef548432cd28134d94bff3fdf6698399a933a8eca2411f30b08ae0452c9ec00301e8be989682d4feaa61b118
-  data.tar.gz: 66fc08b9fe7a964d87e34eb8e4113f0aa2d68eedc3127ef4f0374ff8a24fa6e5b96be526bd7ab78448fe87b39489e13bf68300b1c7818a1d4f38dd801b798ef6
+  metadata.gz: d9d1b932659d821538bc1dd5d706cd9581fb19e6ccc9ab688d96cd745e9be9d2c80b6c6cb39c6bd34209b74d817d93d10f2fabeac6c1cfe7cdd10e68541e3a6a
+  data.tar.gz: a267ce338cc75df3ca25e91e71dd29473bb952dccb6244ed99ccaf5dfccd35d80bcb2c15a492225506192d16e336890b0dfad48882e4b2093e808b45d8169fb8

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

@@ -3,6 +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, ...
     def initialize env, parsed
       @env= env
       @infos= parsed

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

@@ -10,13 +10,17 @@ module Nephos
 
     ALL = []
 
+    # @params: arg [Hash or Symbol]
+    # shortcut to #{Nephos::Responder.render}
     def self.render arg
       Responder.render arg
     end
 
-    def self.parse_path path
+    # @params: path [Array]
+    # find the right route to use from the url
+    def self.parse_path path, verb
       route = "/" + path.join("/")
-      return ALL.find{|e| e[:url] == route}
+      return ALL.find{|e| e[:url] == route and e[:verb] == verb}
     end
 
     def self.execute(env)
@@ -27,9 +31,8 @@ module Nephos
       args = Hash[route.query.to_s.split("&").map{|e| e.split("=")}]
       puts "#{from} [#{verb}] \t ---> \t #{route}"
       parsed = {route: route, verb: verb, from: from, path: path, args: args}
-      call = parse_path(path)
+      call = parse_path(path, verb)
       return render status: 404 if call.nil?
-      call = parse_path(path)
       begin
         controller = Module.const_get(call[:controller]).new(env, parsed)
         return render(controller.send(call[:method]) || {status: 500})

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

@@ -2,17 +2,41 @@ class RoutingError < Exception; end
 class InvalidRoute < RoutingError; end
 class InvalidGetRoute < InvalidRoute; end
 
-# @param: what [Hash]
+module Nephos
+  module Route
+
+    def self.add(what, verb)
+      Nephos::Route::ALL << what.merge(verb: verb)
+      puts "[#{verb}] #{what[:url]} \t ---> \t #{what[:controller]}##{what[:method]}"
+    end
+
+    def self.check!(what)
+      raise InvalidGetRoute if not what.keys.include? :url
+      raise InvalidGetRoute if not what.keys.include? :controller
+      raise InvalidGetRoute if not what.keys.include? :method
+      # TODO: more check to do
+    end
+
+  end
+end
+
+# @params: what [Hash]
 def get what
-  raise InvalidGetRoute if not what.keys.include? :url
-  raise InvalidGetRoute if not what.keys.include? :controller
-  raise InvalidGetRoute if not what.keys.include? :method
+  Nephos::Route.check!(what)
+  Nephos::Route.add(what, "GET")
+end
 
-  # TODO: more check to do
+# @params: what [Hash]
+def post what
+  Nephos::Route.check!(what)
+  Nephos::Route.add(what, "POST")
+end
 
-  Nephos::Route::ALL << what
-  puts "get route: #{what}"
+# @params: what [Hash]
+def put what
+  Nephos::Route.check!(what)
+  Nephos::Route.add(what, "PUT")
 end
 
-# require_relative '../../../routes.rb'
 load 'routes.rb'
+puts

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

@@ -0,0 +1 @@
+class InvalidApplicationError < RuntimeError ; end

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

@@ -7,14 +7,19 @@ module Nephos
 
     SERVER = lambda {|env| return Route.execute(env)}
 
+    attr_accessor :port
+
+    # @params: port [Integer] port to listen
     def initialize port
-      @port = port
+      @port = Integer(port)
     end
 
+    # start the Rack server
     def start
       Rack::Server.start :app => SERVER, :Port => @port
     end
 
+    # start the Rack server on a instance of Nephos::Server
     def self.start port
       Server.new(port).start
     end

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

@@ -5,6 +5,8 @@ module Nephos
     CT_TP = {'Content-type' => 'text/plain' + CT_CHARSET_}
     CT_TJ = {'Content-type' => 'text/javascript' + CT_CHARSET_}
     CT_TH = {'Content-type' => 'text/html' + CT_CHARSET_}
+
+    # @params: params [Hash, Symbol]
     def self.render params
       if params == :empty
         return [204, CT_TP, [""]]

data/nephos-server.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |s|
                	  'lib/nephos-server.rb',
                	  'lib/nephos-server/server/main.rb',
                	  'lib/nephos-server/server/responder.rb',
+               	  'lib/nephos-server/server/basic_errors.rb',
                	  'lib/nephos-server/routing/execute.rb',
                	  'lib/nephos-server/routing/load.rb',
                	  'lib/nephos-server/routing/controller.rb',

data/version

@@ -1 +1 @@
-0.1.3
+0.1.4

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nephos-server
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - poulet_a
@@ -45,6 +45,7 @@ email:
 - - lib/nephos-server.rb
   - lib/nephos-server/server/main.rb
   - lib/nephos-server/server/responder.rb
+  - lib/nephos-server/server/basic_errors.rb
   - lib/nephos-server/routing/execute.rb
   - lib/nephos-server/routing/load.rb
   - lib/nephos-server/routing/controller.rb
@@ -76,6 +77,7 @@ files:
 - lib/nephos-server/routing/controller.rb
 - lib/nephos-server/routing/execute.rb
 - lib/nephos-server/routing/load.rb
+- lib/nephos-server/server/basic_errors.rb
 - lib/nephos-server/server/main.rb
 - lib/nephos-server/server/responder.rb
 - nephos-server.gemspec