nephos-server 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8b7fa251ffb5faae0d07c460068da7b1462c69f
-  data.tar.gz: 7ef60b41475e3763ac0b9cfc6c177d0556099ec7
+  metadata.gz: a0c699cab58ca0ec6248b17674081ac621137843
+  data.tar.gz: 6ac12538e8f294cefe7c1881ef5eef6a182917b2
 SHA512:
-  metadata.gz: ab7e88e906675e7f39d5f736cf554719caaaf97eb5f6269b098b6371ac7f0fcdb3d7f9d8e7473325e8d412aa980b9c229e5dc3412c3ff9b5fe1f150274083020
-  data.tar.gz: e7002eca788be88b22dd135506afad8cc14b76775c33e323ea170c1d33c0d6305a9f5de1a0731afeb82ae7393afb3bc333073bebf421d7666b887ab1f510001e
+  metadata.gz: 5ff2cd7da5ee44559e590165c79c0530fdb3bf55b78a27c00f896e4c58e6106165db0d9be62669c33c6466607ff36288aef85a0ba4b191b19eb6103635d69077
+  data.tar.gz: 12f799ef408edcc5b8ef980999a62f35d0cd3277f22af71c6c0770945e4fa23cda3b871b465e84db69832ba87773fb511b9698b5effb9a9ca25ce4096fc53d68

data/README.md

@@ -29,13 +29,13 @@ nephos-server -p 8080 # port is not required
 ## Guides
 
 ### [Render API](DOCUMENTATION/API_RENDER.md)
-### [Routing GUIDE](DOCUMENTATION/GUIDE_ROUTING.md)
+### [Router GUIDE](DOCUMENTATION/GUIDE_ROUTER.md)
 
 ## Examples
 
 ### Controller
 
-To create a controller, simply add it to ``controllers/``.
+To create a controller, simply add a ruby code file to ``app/``, with a class inherited by ``Nephos::Controller``
 The basic code of a controller can be generated via ``nephos-generator controller NAME``.
 
 ```ruby
@@ -85,8 +85,6 @@ end
 ## TODO v0.3
 - Improve documentation (fix english, increase coverage, ...)
 - Improve unitary test coverage
-- Improve syntax coherence (router/render, file position, ...)
-- Directory app instead of controllers
 
 ## TODO v1
 - Improved Routing (more helper options)

data/bin/nephos-generator

@@ -26,6 +26,7 @@ class #{name} < Nephos::Controller
   end
 end
 EOF
+  puts "Controller \"#{name}\" created at location \"#{file}\""
 end
 
 def create_application_dir dir
@@ -41,7 +42,7 @@ def initialize_application
   raise "Not an empty dir" unless Dir[File.expand_path "*"].empty?
   File.write "routes.rb", ROUTE_RB
   File.write "Gemfile", GEMFILE
-  Dir.mkdir "controllers"
+  Dir.mkdir "app"
   begin
     `git init .`
     puts "Git repository initialized"
@@ -62,8 +63,10 @@ begin
 
   case ARGV[0]
   when "c", "controller"
-    if not ARGV[1].to_s.match(/[\w_\-\.]+/)
-      generate_controller("#{ARGV[1]}Controller", "src/#{ARGV[1]}.rb")
+    if ARGV[1].to_s.match(/[\w_\-\.]+/)
+      generate_controller("#{ARGV[1].capitalize}Controller", "app/#{ARGV[1].downcase}.rb")
+    else
+      puts "error"
     end
   when "a", "appli", "application"
     if not ARGV[1].to_s.empty?
@@ -73,6 +76,8 @@ begin
     end
     initialize_application
     puts "Application initialized"
+  else
+    puts "\"#{ARGV[0]}\" not recognized has a command"
   end
 
 rescue => err

data/lib/nephos-server/{routing → router}/load.rb

@@ -1,8 +1,8 @@
 module Nephos
-  module Route
+  module Router
 
     def self.add(what, verb)
-      Nephos::Route::ALL << what.merge(verb: verb)
+      Nephos::Router::ROUTES << what.merge(verb: verb)
       display = "[#{verb}] #{what[:url]} \t ---> \t #{what[:controller]}##{what[:method]}"
       puts display unless what[:silent]
       return display
@@ -64,9 +64,9 @@ end
 def add_route(what, verb)
   raise InvalidRoute unless what.is_a? Hash
   what[:url] = File.expand_path File.join(route_prefix, what[:url])
-  Nephos::Route.check!(what)
-  Nephos::Route.add_params!(what)
-  Nephos::Route.add(what, verb)
+  Nephos::Router.check!(what)
+  Nephos::Router.add_params!(what)
+  Nephos::Router.add(what, verb)
 end
 
 # @param what [Hash]

data/lib/nephos-server/{routing/execute.rb → router/main.rb}

@@ -1,12 +1,12 @@
-Dir[File.expand_path "controllers/*.rb"].each do |f|
+Dir[File.expand_path "app/*.rb"].each do |f|
   load(f) and puts "#{f} loaded"
 end
 puts
 
 module Nephos
-  module Route
+  module Router
 
-    ALL = []
+    ROUTES = []
 
     # @param arg [Hash or Symbol]
     # shortcut to #{Nephos::Responder.render}
@@ -18,7 +18,7 @@ module Nephos
     # find the right route to use from the url
     def self.parse_path path, verb
       route = File.join(["/"] + path)
-      return ALL.find{|e| e[:match] =~ route and e[:verb] == verb}
+      return ROUTES.find{|e| e[:match] =~ route and e[:verb] == verb}
     end
 
     def self.parse_env(env, route)

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

@@ -1,10 +1,9 @@
 require_relative 'responder'
-require_relative '../routing/execute'
 
 module Nephos
   class Server
 
-    SERVER = lambda {|env| return Route.execute(env)}
+    SERVER = lambda {|env| return Router.execute(env)}
 
     attr_accessor :port
 

data/lib/nephos-server.rb

@@ -6,7 +6,10 @@ require 'open-uri'
 require 'rack'
 require 'colorize'
 
+# lib
 require_relative 'nephos-server/basic_errors'
 require_relative 'nephos-server/params'
 require_relative 'nephos-server/controller'
+require_relative 'nephos-server/router/main'
+# server
 require_relative 'nephos-server/server/main'

data/nephos-server.gemspec

@@ -15,8 +15,8 @@ lib/nephos-server/params.rb
 lib/nephos-server/controller.rb
 lib/nephos-server/server/main.rb
 lib/nephos-server/server/responder.rb
-lib/nephos-server/routing/execute.rb
-lib/nephos-server/routing/load.rb
+lib/nephos-server/router/main.rb
+lib/nephos-server/router/load.rb
 README.md
 Rakefile
 Procfile
@@ -26,13 +26,13 @@ nephos-server.gemspec
 version
 test/test.rb
 test/responder.rb
-test/routing.rb
+test/router.rb
 test/params.rb
 test/controller.rb
 routes.rb
-controllers/dataset.rb
-controllers/image.jpg
-controllers/main.rb
+app/dataset.rb
+app/image.jpg
+app/main.rb
 bin/nephos-server
 bin/nephos-generator
 )

data/test/controller.rb

@@ -1,9 +1,19 @@
 class TestNephosServerController < Test::Unit::TestCase
 
-  def test_initialize
+  def test_initialize_success
     assert Nephos::Controller.new()
     assert Nephos::Controller.new(env={}, {path: [], args: {}}, {params: []})
+  end
+
+  def test_initialize_failure
     assert_raise do Nephos::Controller.new({}, {}, {}) end
+    assert_raise do Nephos::Controller.new({}, {path: nil}, {}) end
+    assert_raise do Nephos::Controller.new({}, {path: []}, {}) end
+    assert_raise do Nephos::Controller.new({}, {path: [], args: {}}, {}) end
+    assert_raise do Nephos::Controller.new({}, {path: [], args: {}}, {params: nil}) end
+    assert_raise do Nephos::Controller.new({}, {path: nil, args: nil}, params: nil) end
+    assert_raise do Nephos::Controller.new({}, {path: nil, args: {}}, {params: {}}) end
+    assert_raise do Nephos::Controller.new({}, {path: [], args: nil}, {params: {}}) end
   end
 
 end

data/test/{routing.rb → router.rb}

@@ -4,10 +4,10 @@ class TestController < Nephos::Controller
   end
 end
 
-class TestNephosServerRouting < Test::Unit::TestCase
+class TestNephosServerRouter < Test::Unit::TestCase
 
   # remove all seeds
-  Nephos::Route::ALL = []
+  Nephos::Router::ROUTES = []
 
   def test_valid_routes
     get url: "/", controller: "TestController", method: "method", silent: true

data/test/test.rb

@@ -5,6 +5,6 @@ class TestNephosServer < Test::Unit::TestCase
 end
 
 require_relative 'responder'
-require_relative 'routing'
+require_relative 'router'
 require_relative 'controller'
 require_relative 'params'

data/version

@@ -1 +1 @@
-0.2.3
+0.2.4

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nephos-server
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - poulet_a
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nomorebeer
@@ -62,8 +62,8 @@ email:
   - lib/nephos-server/controller.rb
   - lib/nephos-server/server/main.rb
   - lib/nephos-server/server/responder.rb
-  - lib/nephos-server/routing/execute.rb
-  - lib/nephos-server/routing/load.rb
+  - lib/nephos-server/router/main.rb
+  - lib/nephos-server/router/load.rb
   - README.md
   - Rakefile
   - Procfile
@@ -73,13 +73,13 @@ email:
   - version
   - test/test.rb
   - test/responder.rb
-  - test/routing.rb
+  - test/router.rb
   - test/params.rb
   - test/controller.rb
   - routes.rb
-  - controllers/dataset.rb
-  - controllers/image.jpg
-  - controllers/main.rb
+  - app/dataset.rb
+  - app/image.jpg
+  - app/main.rb
   - bin/nephos-server
   - bin/nephos-generator
 executables:
@@ -93,17 +93,17 @@ files:
 - Procfile
 - README.md
 - Rakefile
+- app/dataset.rb
+- app/image.jpg
+- app/main.rb
 - bin/nephos-generator
 - bin/nephos-server
-- controllers/dataset.rb
-- controllers/image.jpg
-- controllers/main.rb
 - lib/nephos-server.rb
 - lib/nephos-server/basic_errors.rb
 - lib/nephos-server/controller.rb
 - lib/nephos-server/params.rb
-- lib/nephos-server/routing/execute.rb
-- lib/nephos-server/routing/load.rb
+- lib/nephos-server/router/load.rb
+- lib/nephos-server/router/main.rb
 - lib/nephos-server/server/main.rb
 - lib/nephos-server/server/responder.rb
 - nephos-server.gemspec
@@ -111,7 +111,7 @@ files:
 - test/controller.rb
 - test/params.rb
 - test/responder.rb
-- test/routing.rb
+- test/router.rb
 - test/test.rb
 - version
 homepage: https://github.com/pouleta/NephosRubyServer