nephos-server 0.4.8 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c35f4d2f0547725d90cc6f979151bc978d41670
-  data.tar.gz: c65b023117aa32ab0ce732b9c0073f315b50ce5c
+  metadata.gz: 829761db1101c722504e7778ec2cd55f8edca2d1
+  data.tar.gz: 16741f9f42c3754172f69b43fdec9d1c07449d90
 SHA512:
-  metadata.gz: 63d465d46581d22542a6dbfd4a7d7caf159080ef7e1d5d0a2e732bb774c86d1b9b2f53ce27140054a10301061c04d89a92cf41f41603cb86aa4ab470008b5033
-  data.tar.gz: 146add81a36a974479ab84d57be331c8e48e2e1137c84cdd1c860a66c1d727b166649a582d316b0b57cd4f31086b2a76ac0f5adc4bd9a794b44d5f9b0fd4c3ed
+  metadata.gz: 9236bd2cc50a63baed30ad1c092bcb17b8d2863c40d09dce2d0e605f3a91b457d13738f7036ce7961a98135604095a6857298a866bfa9879f9d783f39439d7bf
+  data.tar.gz: 345df24516023c3b0d5417a77ab4a86a75e0cc33f353c6d582c5bb8c64a3ecb3a3b52dcef13d97c1b61e3e523f5d7da97588e40c653fd0870f7a1ba29a0b6860

data/CHANGELOG

@@ -1,120 +1,82 @@
-v0.4.7
+v0.5.0
+	* improve executables: version taking in count
+
+v0.4
+	* fix route matching
+	* improve generator (help and display)
+	* improve generator (usage of optparser)
+	* improve documentation (and update)
+	* change generator option --debug with --test
+	* add lot of unitary tests on router
+	* add test on application generator
+	* add generator option (--no-build, --no-git, ...)
 	* fix parameters
-
-v0.4.7
 	* improve controller generator (names)
 	* add puma to change the default web server
 	* add environments
-
-v0.4.6
 	* improve router errors
 	* improve documentation (production mode)
 	* add listen network parameter to run the server
-
-v0.4.5
 	* fix server executable
-
-v0.4.4
 	* improve errors
 	* fix unitary tests about controller generator
-
-v0.4.3
 	* improve gemspec changelog
 	* improve generator
 	* improve responder (with integer argument)
 	* fix router helpers
-
-v0.4.2
 	* add version to code
 	* fix a file permissions
 	* add generator route --rm
 	* add test for generator (routes and route --rm)
 	* improve routes generator with a 4th optional argument
-
-v0.4.1
 	* fix regression for binary with --debug feature
 	* improve routes generator
-
-v0.4.0
 	* add nephos-status executable
 	* add nephos-generator route option
 
-v0.3.2
+v0.3
 	* fix gem
 	* add tests for generator
-
-v0.3.1
 	* fix controller parameters
 	* add new unitary tests
-
-v0.3.0
 	* improve documentation (and fix it)
 	* add documentation (guide for slim, sequel, generator)
 
-v0.2.4
+v0.2
 	* improve global coherence (file, class, consts names)
 	* rename directory "controllers/" -> "app/"
-
-v0.2.3
 	* add class params
 	* change file place (controller)
 	* improve controller
 	* add unitary tests (params, controller)
-
-v0.2.2
 	* minor fix bug
-
-v0.2.0
 	* add documentation
 
-v0.1.12
+v0.1
 	* fix regressions from v0.1.11 and previous (routing)
 	* add complet unitary tests (rendering)
 	* add partial unitary tests (routing)
 	* update gemspec
 	* factorize some code
-
-v0.1.11
 	* fix regressions from v0.1.10
 	* improve rendering code
-
-v0.1.10
 	* improve status content
 	* add url's parameters like /u/:param
-
-v0.1.9
 	* minor fixes
 	* improve exceptions
 	* improve generator
-
-v0.1.8
 	* improve rendering
 	* add html rendering
 	* improve documentation
 	* improve exceptions
-
-v0.1.7
 	* improve routing error
-
-v0.1.6
 	* fix documentation
-
-v0.1.5
 	* improve routing (resource and matching)
-
-v0.1.4
 	* improve routing
-
-v0.1.3
 	* improve generators (errors and arguments)
-
-v0.1.2
 	* fix procfile
-
-v0.1.1
 	* rename src to controllers
 	* improve generator
-v0.1
 	* basic routing, rendering, and controllers
 	* valid gemspec
 	* basic working server

data/README.md

@@ -2,13 +2,13 @@
 
 [![GitHub version](https://badge.fury.io/gh/pouleta%2FNephosRubyServer.svg)](http://badge.fury.io/gh/pouleta%2FNephosRubyServer)
 
-[![Gem Version](https://badge.fury.io/rb/nephos-server.svg)](http://badge.fury.io/rb/nephos-server)
+[![Gem Version](https://badge.fury.io/rb/nserver.svg)](http://badge.fury.io/rb/nserver)
 
 [![Code Climate](https://codeclimate.com/github/pouleta/NephosRubyServer/badges/gpa.svg)](https://codeclimate.com/github/pouleta/NephosRubyServer)
 
 This is a minimal web server, based on [rack](TODO LINK) and [puma](TODO LINK).
 It is written in ruby. It also gives you a minimal architecture
-to speed up your application creation.
+to speed up your application bootstrap.
 
 Features provided:
 
@@ -16,23 +16,23 @@ Features provided:
 - Render: easier render content to the client.
 - Router: create a robust and simple routing system, with url variables.
 
-Features wich will not be provided by nephos-server:
+Features which will not be provided by nserver:
 
-- Templating (HTML with variables, loops, ...): It already exists and they are easy to implement.
+- Templating (HTML with variables, loops, ...): It already exists and it is easy to implement.
   - [Slim](DOCUMENTATION/TEMPLATING/SLIM.md)
-- Database orm and connector: It already exists and simple to implement
+- Database orm and connector: It already exists and simple to implement too.
   - [Sequel](DOCUMENTATION/DATABASE/SEQUEL.md)
 
 # Start
 
 ```sh
-gem install nephos-server # download the server
-nephos-generator application MyApp # generate the application
+gem install nephos # download the server and executables
+ngenerator application MyApp # generate the application
 cd MyApp # go in
-nephos-server -p 8080 -h 0.0.0.0 # start the server. port is not required, neither host
+nserver -p 8080 -h 0.0.0.0 # start the server. port is not required, neither host
 ```
 
-``nephos-server`` is a binary designed to start the server easly. It can take few arguments, all optionnal:
+``nserver`` is an executable designed to start the server easly. It can take few arguments, all optionnal:
 
 - ``-p``: port to listen
 - ``-h``: host to listen (network address)
@@ -53,13 +53,14 @@ Theses guides will provide you knowlegde about everything you can use in the app
 
 ### Production
 
-To avoid information leaks from your application, set the environment variable ``export ENVIRONMENT=production``.
+To avoid information leaks from your application, set the environment variable ``export ENVIRONMENT=production``,
+or run the server with ``-e production`` parameter.
 It will disable ruby error messages when an error occurs in the controller.
 
 ### Controller
 
 To create a controller, add a ruby file to ``app/``, with a class inherited by ``Nephos::Controller``
-The basic code of a controller can be generated via ``nephos-generator controller NAME``.
+The basic code of a controller can be generated via ``ngenerator controller NAME``.
 
 ```ruby
 class Example < Nephos::Controller
@@ -91,28 +92,23 @@ return :empty
 ### Routing
 
 The routing (rules to execute the action the user wants), you have to write the ``/routes.rb`` file.
-if the user try to access to an url not described in the file, it will automaticaly render a 404 not found.
+If the user try to access an url not described in the file, it will automaticaly render a 404 not found.
 
 ```ruby
 get url: "/", controller: "MainController", method: "root"       # /
-get url: "/add", controller: "MainController", method: "add_url" # /add
-get url: "/add/:url", controller: "MainController", method: "add_url" # /add with parameter :url
-get url: "/rm", controller: "MainController", method: "rm_url"   # /rm
-get url: "/rm/:url", controller: "MainController", method: "rm_url"   # /rm with parameter :url
+post url: "/add", controller: "MainController", method: "add_url" # /add
+post url: "/add/:url", controller: "MainController", method: "add_url" # /add with parameter :url
+put url: "/rm", controller: "MainController", method: "rm_url"   # /rm
+put url: "/rm/:url", controller: "MainController", method: "rm_url"   # /rm with parameter :url
 resource "infos" do
   get url: "/", controller: "MainController", method: "root" # generate /infos
-  get url: "/abbout", controller: "MainController", method: "root" # generate /infos/about
+  get url: "/about", controller: "MainController", method: "root" # generate /infos/about
 end
 ```
 
 
 # Developers: Roadmap
 
-## TODO v0.4
-- improve generator with application tests
-- improve executables (tests, arguments)
-- improve documentation (bin)
-
 ## TODO v0.5
 - executables with version
 - cookies, ...
@@ -121,6 +117,8 @@ end
 ## TODO v0.6
 - startable as daemon
 - hooks for controller
+- feature to change HTTP header from controller
+- customisable default 404 errors and 500 errors
 
 ## v1 requierements
 - Environement, Daemons, Port, Listen Host, Routables, Arguments

data/app/main.rb

@@ -11,7 +11,7 @@ class MainController < Nephos::Controller
   end
 
   def add_url
-    url = arguments["url"]
+    url = params["url"]
     if url
       Dataset << url
       return {plain: "#{url} added"}
@@ -21,7 +21,7 @@ class MainController < Nephos::Controller
   end
 
   def rm_url
-    url = arguments[:url]
+    url = params[:url]
     if url
       Dataset.rm url
       return {plain: "#{url} removed"}

data/bin/nephos-generator

@@ -2,6 +2,8 @@
 
 require 'colorize'
 require 'optparse'
+
+require 'nephos-server/version'
 require 'nephos-server/bin-helpers'
 
 GEMFILE = <<EOF
@@ -17,8 +19,8 @@ ROUTE_RB = <<EOF
 EOF
 
 def raise_invalid_appli
-  if not Nephos::Bin.is_a_valid_application? and not $debug
-    raise "You are not in a valid application directory"
+  if not Nephos::Bin.is_a_valid_application? and not $test
+    raise BinError, "You are not in a valid application directory"
   end
 end
 
@@ -39,11 +41,11 @@ module Nephos
 
       def self.generate!(verb, url, dest_c, dest_m=nil)
         raise_invalid_appli
-        raise InvalidVerb, "\"#{verb}\" doesn't match with /\w+/" if not verb.to_s.match(/^\w+$/)
-        raise InvalidUrl if not url.match(/^\/?(:?\w+)(\/:?\w+)*\/?$/)
-        raise "Option dest_c must match with \"controller#method\"" if not dest_c.match(/^\w+\#\w+$/) and dest_m.nil?
-        raise "Option dest_c must match with \"controllerName\"" if not dest_m.nil? and not dest_c.match(/^\w+$/)
-        raise "Option dest_m must match with \"methodName\"" if not dest_m.nil? and not dest_c.match(/^\w+$/)
+        raise BinError, "\"#{verb}\" doesn't match with /\w+/" if not verb.to_s.match(/^\w+$/)
+        raise BinError, "\"#{url}\" is not a valid url" if not url.match(/^\/?(:?\w+)(\/:?\w+)*\/?$/)
+        raise BinError, "Option dest_c must match with \"controller#method\"" if not dest_c.match(/^\w+\#\w+$/) and dest_m.nil?
+        raise BinError, "Option dest_c must match with \"controllerName\"" if not dest_m.nil? and not dest_c.match(/^\w+$/)
+        raise BinError, "Option dest_m must match with \"methodName\"" if not dest_m.nil? and not dest_c.match(/^\w+$/)
         controller, method = dest_c, dest_m
         if dest_m.nil?
           controller = dest_c.split("#")[0]
@@ -54,14 +56,14 @@ module Nephos
         if exists? line
           if $remove
             routes = File.read("routes.rb").split("\n")
-            puts "Route deleted: ".green + routes.delete(line).to_s
+            puts "Success: ".green + "Route deleted: " + routes.delete(line).to_s
             File.write("routes.rb", routes.join("\n") + "\n")
           else
-            puts("Route already exists: ".yellow + line)
+            puts("Warning: ".yellow + "Route already exists: " + line)
           end
         else
           if $remove
-            puts("Route doesn't exists: ".yellow + line)
+            puts("Warning: ".yellow + "Route doesn't exists: " + line)
           else
             write!(line)
           end
@@ -75,26 +77,35 @@ module Nephos
         lname = uname.gsub(/([A-Z])/, '_\1')[1..-1].downcase
         file = "app/#{lname}.rb"
         raise_invalid_appli
-        if File.exists? file
-          print "The file #{file} already exists. Are you sure to erase it ? (y/N)"
-          r = STDIN.gets.to_s.chomp
-          raise "File #{file} already exists" unless r.match(/y(es)?/)
-        end
-        f = File.open(file, 'w')
-        f << <<EOF
+        if $remove
+          if File.exists?(file) and File.read(file).include? "class #{uname} < Nephos::Controller"
+            File.delete(file)
+            puts "Success: ".yellow + "\"#{file}\" removed"
+          else
+            raise BinError, "\"#{file}\" is not a valid Controller file."
+          end
+        else
+          if File.exists? file
+            print "Warning: ".yellow + "The file #{file} already exists. Are you sure to erase it ? (y/N) : "
+            r = STDIN.gets.to_s.chomp
+            raise BinError, "File #{file} already exists" unless r.match(/y(es)?/)
+          end
+          f = File.open(file, 'w')
+          f << <<EOF
 class #{uname} < Nephos::Controller
   def root
     return {plain: "index"}
   end
 end
 EOF
-        puts "Controller \"#{name}\" created at location \"#{file}\""
+          puts "Success: ".green + "Controller \"#{uname}\" created at location \"#{file}\""
+        end
       end
     end
 
     module Application
       def self.create_application_dir dir
-        raise "Directory #{dir} already exists" if Dir.exists? dir
+        raise BinError, "Directory #{dir} already exists" if Dir.exists? dir
         Dir.mkdir dir
       end
 
@@ -103,7 +114,7 @@ EOF
       end
 
       def self.initialize!
-        raise "Not an empty dir" unless Dir[File.expand_path "*"].empty?
+        raise BinError, "Not an empty dir" unless Dir[File.expand_path "*"].empty?
         File.write "routes.rb", ROUTE_RB
         File.write "Gemfile", GEMFILE
         Dir.mkdir "app"
@@ -111,34 +122,32 @@ EOF
           `git init .`
           puts "Git repository initialized"
         rescue Errno::ENOENT => err
-          puts "Warning: git repository not initialized"
+          puts "Git Init Error: ".yellow + "git repository not initialized"
         rescue => err
-          puts "Error: #{err.message}"
-        end
-        exec("bundle install")
+          puts "Git Init Error: ".yellow + " #{err.message}"
+        end if $git
+        exec("bundle install") if $build
       end
     end
 
     def self.main opt
-      case opt[0]
-      when "c", "controller"
-        if opt[1].to_s.match(/[\w\-\.]+/)
-          Controller.generate!(opt[1])
-        else
-          puts "error"
-        end
-      when "a", "appli", "application"
-        if not opt[1].to_s.empty?
-          Application.create_application_dir(opt[1])
-          puts "Application #{opt[1]} created"
-          Application.move_to_application_dir(opt[1])
+      case $mode
+      when :controller
+        raise BinError, "Invalid Controller name" if not opt[0].to_s.match(/[\w\-\.]+/)
+        Controller.generate!(opt[0])
+      when :application
+        if not opt[0].to_s.empty?
+          Application.create_application_dir(opt[0])
+          puts "Application #{opt[0]} created"
+          Application.move_to_application_dir(opt[0])
         end
         Application.initialize!
         puts "Application initialized"
-      when "r", "route"
-        Route.generate!(*(opt[1..4]))
+      when :route
+        raise BinError, "Need more arguments (verb url controller method)" if opt.size < 3
+        Route.generate!(*(opt[0..3]))
       else
-        puts "\"#{opt[0]}\" not recognized has a command"
+        puts "nephos-generator --help"
       end
     end
 
@@ -147,19 +156,48 @@ end
 
 begin
   opt = OptionParser.new do |opts|
-    opts.banner = "Usage: nephos-generator [controller name] [appli [name]]"
+    opts.banner = "Usage<#{Nephos::VERSION}>: nephos-generator <options>"
+
+    $git = true
+    opts.on("--no-git", "Disable the git initialization when create new application") do
+      $git = false
+    end
 
-    opts.on("--rm") do
+    $build = true
+    opts.on("--no-build", "Disable the `bundle install` execution when create new application") do
+      $build = false
+    end
+
+    opts.on("--application", "-a", "Create new application") do
+      $mode = :application
+    end
+
+    opts.on("--route", "-r", "Create and remove routes") do
+      $mode = :route
+    end
+
+    opts.on("--controller", "-c", "Create and remove controller") do
+      $mode = :controller
+    end
+
+    opts.on("--rm", "Remove") do
       $remove = true
     end
 
-    opts.on("--debug") do
+    opts.on("--debug", "Enable debugging mode") do
       $debug = true
     end
+
+    opts.on("--test", "Enable testing mode (for nephos developpers)") do
+      $test = true
+    end
   end.parse!
 
   Nephos::Generator.main(opt)
 
+rescue BinError => err
+  puts "Error:".red + " #{err.message}"
+
 rescue => err
   puts "Error:".red + " #{err.message}"
   puts err.backtrace

data/bin/nephos-server

@@ -3,14 +3,17 @@
 require 'colorize'
 require 'optparse'
 
+require 'nephos-server/version'
+require 'nephos-server/bin-helpers'
+
 class RoutingError < StandardError; end
 
 begin
   OptionParser.new do |opts|
-    opts.banner = "Usage: nephos-server [-p=port] [-h=listen] [--debug]"
+    opts.banner = "Usage<#{Nephos::VERSION}>: nephos-server <options>"
 
     $server_port = ENV["SERVER_PORT"] || 8080
-    opts.on("-p=nb", "--port=nb", "Port") do |port|
+    opts.on("-p=nb", "--port=nb", "Port to listen") do |port|
       $server_port = Integer(port)
     end
 
@@ -24,18 +27,22 @@ begin
       $server_env = env
     end
 
-    opts.on("--debug") do
+    opts.on("--debug", "Enable debugging mode") do
       $debug = true
     end
+
+    opts.on("--test", "Enable testing mode (for nephos developpers)") do
+      $test = true
+    end
   end.parse!
 
-  if $debug
+  if $test
     require_relative "../lib/nephos-server"
   else
     require 'nephos-server'
   end
 
-  if not $debug and
+  if not $test and
     (not File.exists? "Gemfile.lock" or
      not File.read("Gemfile.lock").split.index("nephos-server"))
     raise InvalidApplication

data/bin/nephos-status

@@ -1,10 +1,12 @@
 #!/usr/bin/env ruby
 
 require 'optparse'
+
+require 'nephos-server/version'
 require 'nephos-server/bin-helpers'
 
 opt = OptionParser.new do |opts|
-  opts.banner = "Usage: nephos-status [appli directory]"
+  opts.banner = "Usage<#{Nephos::VERSION}>: nephos-status [appli directory]"
 
   opts.on("--rm") do
     $remove = true

data/lib/nephos-server/bin-helpers.rb

@@ -11,3 +11,5 @@ module Nephos
 
   end
 end
+
+class BinError < StandardError; end

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

@@ -10,7 +10,7 @@ module Nephos
 
     def self.add_params!(what)
       params = what[:url].split('/').map do |p|
-        p.match(/:\w+/) ? {p: "[[:graph:]]+", name: p} : {p: p, name: nil}
+        p.match(/:\w+/) ? {p: "[^\/]+", name: p} : {p: p, name: nil}
       end
       url = params.map{|e| e[:p]}.join("/")
       url = "/" if url.empty?

data/lib/nephos-server/version.rb

@@ -0,0 +1,9 @@
+module Nephos
+  VERSION_FILE = __FILE__.split("/")[0..-4].join("/") + "/version"
+  VERSION = File.read(VERSION_FILE).strip
+
+  @@env = $server_env
+  def self.env
+    @@env
+  end
+end

data/lib/nephos-server.rb

@@ -6,6 +6,8 @@ require 'open-uri'
 require 'rack'
 require 'colorize'
 
+require_relative 'nephos-server/version'
+
 # lib
 require_relative 'nephos-server/basic_errors'
 require_relative 'nephos-server/params'
@@ -13,13 +15,3 @@ require_relative 'nephos-server/controller'
 require_relative 'nephos-server/router/main'
 # server
 require_relative 'nephos-server/server/main'
-
-module Nephos
-  VERSION_FILE = __FILE__.split("/")[0..-3].join("/") + "/version"
-  VERSION = File.read(VERSION_FILE).strip
-
-  @@env = $server_env
-  def self.env
-    @@env
-  end
-end

data/nephos-server.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   s.email       = 'poulet_a@epitech.eu',
   s.files       = %w(
 lib/nephos-server.rb
+lib/nephos-server/version.rb
 lib/nephos-server/basic_errors.rb
 lib/nephos-server/params.rb
 lib/nephos-server/controller.rb
@@ -51,6 +52,7 @@ nephos-status
   #s.cert_chain  = ['certs/poulet_a.pem']
   #s.signing_key = File.expand_path('~/.ssh/gem-private_key.pem') if $0 =~ /gem\z/
 
+  # s.add_dependency 'nephos', '~> 1.0'
   s.add_dependency 'nomorebeer', '~> 1.1'
   s.add_dependency 'rack', '~> 1.6'
   s.add_dependency 'colorize', '~> 0.7'

data/routes.rb

@@ -1,8 +1,8 @@
 resource "home" do
   resource "/index" do
     get url: "/", controller: "MainController", method: "root"
-    get url: "/add", controller: "MainController", method: "add_url"
-    get url: "/rm", controller: "MainController", method: "rm_url"
+    post url: "/add", controller: "MainController", method: "add_url"
+    put url: "/rm", controller: "MainController", method: "rm_url"
   end
   get url: "/", controller: "MainController", method: "root"
 end

data/test/generator.rb

@@ -1,25 +1,32 @@
 class TestNephosServerGenerator < Test::Unit::TestCase
 
   def test_generator_application
-    # Dir.chdir("/tmp")
-    # name = Time.now.to_i.to_s
-    # `nephos-server a #{name}`
+    `rm -rf /tmp/nephos-server-test 2> /tmp/null`
+
+    `./bin/nephos-generator -a /tmp/nephos-server-test --no-build --no-git`
+    assert(Dir.exists? "/tmp/nephos-server-test")
+    assert(File.exists? "/tmp/nephos-server-test/Gemfile")
+    assert(File.exists? "/tmp/nephos-server-test/routes.rb")
+    assert(Dir.exists? "/tmp/nephos-server-test/app")
+    gemfile_data = File.read("/tmp/nephos-server-test/Gemfile").split("\n")
+    assert(gemfile_data.include? "gem 'nephos-server'")
+    `rm -rf /tmp/nephos-server-test 2> /tmp/null`
   end
 
   def test_generator_controller
     `rm -f app/test_controller.rb`
 
-    `nephos-generator --debug c test`
+    `./bin/nephos-generator --test -c test`
     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`
+    `./bin/nephos-generator -c test --test`
     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 testController --debug`
+    `./bin/nephos-generator -c testController --test`
     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`
@@ -28,9 +35,9 @@ class TestNephosServerGenerator < Test::Unit::TestCase
   # test simple and rm
   def test_generator_route1
     s1 = File.read("routes.rb")
-    `./bin/nephos-generator --debug r get test ctr#mth`
+    `./bin/nephos-generator --test -r get test ctr#mth`
     s2 = File.read("routes.rb")
-    `./bin/nephos-generator --debug r get test ctr#mth --rm`
+    `./bin/nephos-generator --test -r get test ctr#mth --rm`
     s3 = File.read("routes.rb")
     assert_equal s1, s3
     assert_not_equal s1, s2
@@ -39,11 +46,11 @@ class TestNephosServerGenerator < Test::Unit::TestCase
   # test if ctr#mth == ctr mth
   def test_generator_route2
     s1 = File.read("routes.rb")
-    `./bin/nephos-generator --debug r get test ctr#mth`
+    `./bin/nephos-generator --test -r get test ctr#mth`
     s2 = File.read("routes.rb")
-    `./bin/nephos-generator --debug r get test ctr mth`
+    `./bin/nephos-generator --test -r get test ctr mth`
     s3 = File.read("routes.rb")
-    `./bin/nephos-generator --debug r get test ctr mth --rm`
+    `./bin/nephos-generator --test -r get test ctr mth --rm`
     s4 = File.read("routes.rb")
     assert_equal s2, s3
     assert_equal s1, s4

data/test/router.rb

@@ -2,6 +2,12 @@ class TestController < Nephos::Controller
   def method
     {plain: "test"}
   end
+  def method1
+    {plain: "test1"}
+  end
+  def method2
+    {plain: "test2"}
+  end
 end
 
 class TestNephosServerRouter < Test::Unit::TestCase
@@ -61,7 +67,7 @@ class TestNephosServerRouter < Test::Unit::TestCase
     reset_routes!
     get url: "/:what", controller: "TestController", method: "method", silent: true
     assert_equal "/:what", first[:url]
-    assert_equal /^\/[[:graph:]]+$/, first[:match]
+    assert_equal /^\/[^\/]+$/, first[:match]
   end
 
   def test_valid_resources
@@ -81,16 +87,55 @@ class TestNephosServerRouter < Test::Unit::TestCase
       get url: "/:what", controller: "TestController", method: "method", silent: true
     end
     assert_equal "/home/:what", first[:url]
-    assert_equal /^\/home\/[[:graph:]]+$/, first[:match]
+    assert_equal /^\/home\/[^\/]+$/, first[:match]
   end
 
-    def test_valid_resources_params2
+  def test_valid_resources_params2
     reset_routes!
     resource "/:id" do
       get url: "/show", controller: "TestController", method: "method", silent: true
     end
     assert_equal "/:id/show", first[:url]
-    assert_equal /^\/[[:graph:]]+\/show$/, first[:match]
+    assert_equal /^\/[^\/]+\/show$/, first[:match]
+  end
+
+  def test_routing_matching_simple
+    reset_routes!
+    get url: "/index", controller: "TestController", method: "method", silent: true
+    post url: "/index", controller: "TestController", method: "method", silent: true
+    assert(Nephos::Router::parse_path(["index"], "GET"))
+    assert(Nephos::Router::parse_path(["index"], "POST"))
+    assert(Nephos::Router::parse_path(["index"], "PUT") == nil)
+    assert(Nephos::Router::parse_path(["indexx"], "GET") == nil)
+    assert(Nephos::Router::parse_path(["inde"], "GET") == nil)
+  end
+
+  def test_routing_matching_simple_with_arguments1
+    reset_routes!
+    get url: "/:id", controller: "TestController", method: "method1", silent: true
+    get url: "/:id/index", controller: "TestController", method: "method2", silent: true
+    assert(Nephos::Router::parse_path(["id", "index"], "GET"))
+    assert(Nephos::Router::parse_path(["XXX", "index"], "GET"))
+    assert(Nephos::Router::parse_path(["id"], "GET"))
+    assert(Nephos::Router::parse_path(["XXX"], "GET"))
+    assert(Nephos::Router::parse_path(["index", "id"], "GET") == nil)
+  end
+
+  def test_routing_matching_simple_with_arguments2
+    reset_routes!
+    get url: "/index", controller: "TestController", method: "method1", silent: true
+    get url: "/index/:id", controller: "TestController", method: "method1", silent: true
+    post url: "/index/:id/index", controller: "TestController", method: "method2", silent: true
+    assert(Nephos::Router::parse_path(["id", "index"], "GET") == nil)
+    assert(Nephos::Router::parse_path(["XXX", "index"], "GET") == nil)
+    assert(Nephos::Router::parse_path(["id"], "GET") == nil)
+    assert(Nephos::Router::parse_path(["XXX"], "GET") == nil)
+    assert(Nephos::Router::parse_path(["index", "id"], "GET"))
+    assert(Nephos::Router::parse_path(["index", "XXX"], "GET"))
+    assert(Nephos::Router::parse_path(["index", "XXX", "index"], "POST"))
+    assert(Nephos::Router::parse_path(["index", "XXX", "index"], "GET") == nil)
+    assert(Nephos::Router::parse_path(["index", "XXX", "id"], "POST") == nil)
+    assert(Nephos::Router::parse_path(["index", "XXX", "XXX"], "POST") == nil)
   end
 
 end

data/test/test.rb

@@ -1,8 +1,6 @@
 require "test/unit"
-require_relative "../lib/nephos-server"
 
-class TestNephosServer < Test::Unit::TestCase
-end
+require_relative "../lib/nephos-server"
 
 require_relative 'responder'
 require_relative 'router'

data/version

@@ -1 +1 @@
-0.4.8
+0.5.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nephos-server
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.5.0
 platform: ruby
 authors:
 - poulet_a
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2015-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nomorebeer
@@ -71,6 +71,7 @@ description: " a minimalist server, based on rack/puma, with routing, rendering,
 email:
 - poulet_a@epitech.eu
 - - lib/nephos-server.rb
+  - lib/nephos-server/version.rb
   - lib/nephos-server/basic_errors.rb
   - lib/nephos-server/params.rb
   - lib/nephos-server/controller.rb
@@ -130,6 +131,7 @@ files:
 - lib/nephos-server/router/main.rb
 - lib/nephos-server/server/main.rb
 - lib/nephos-server/server/responder.rb
+- lib/nephos-server/version.rb
 - nephos-server.gemspec
 - routes.rb
 - test/controller.rb
@@ -162,5 +164,5 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: "* fix parameters"
+summary: "* improve executables: version taking in count"
 test_files: []