nephos-server 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: deb3406763cd858becf11305040bd3916c3151ef
-  data.tar.gz: 840624b4879a929ce7b1555d598b7555b28f1f50
+  metadata.gz: 837711f9cdfb6dbb77a5c9c5a0964bd3f603c0c5
+  data.tar.gz: 1d69471c358c7a4e042dcabbbeb6d2002f55c1ed
 SHA512:
-  metadata.gz: 2ce1336de3d50ec9e9dc42b1c3dab71f071f61c87158770191a62b42642220156aa729446b739f2438e0f758dadc28781934e94ddf4dbd41eb0465d89ea6d865
-  data.tar.gz: a6c4b3d0cd26ed3d4c7f20d8ee81e4dee557df41d31b952225b9417cebcc075fc6b623f59c5b78351672fee16aad8c442918fb67064be51807826e94efdb98e0
+  metadata.gz: 807f30fb29bdc799e41180f9af31357aaae7c62118a551ff0e674419e6a6431b994e2a02c241a2e187d102dc3e5fea4349408c95fda63431f81f13dc62f0f4a9
+  data.tar.gz: 69442d3daba27976f008181bfaa7bff0746d0278267e24749962fae8320ee1961ed0a3ac5ec610021b8416e50ae45db67a7213a37551d4160a8243589f25b22a

data/CHANGELOG

@@ -1,3 +1,9 @@
+v0.6.2
+        * Fix generator (bug when --application on current directory)
+	* Improve hooks (add the :only option)
+	* Improve documentation
+	* Improve routing (more tests, better duplicate / handlement)
+
 v0.6.1
 	* Improve daemons
 	* Improve Rakefile and tests structure

data/DOCUMENTATION/GUIDE_ROUTER.md

@@ -62,6 +62,10 @@ It will generate the route ``/home/index``, calling the ``MainController#root``
 
 ## URL Parameters
 
-**TODO**
+**TODO: more documentation**
 
 place a ``/:param`` in your route. The parameter will be placed in the controller in the ``params`` method
+
+## Notes
+
+* When a request is done, duplicate / are not counted. So, ``/resource/id`` is equivalent to ``////resource//id`` etc.

data/README.md

@@ -128,10 +128,17 @@ end
   - Database creation
   - Web HTML with templating
 
+Gitlab Continuous Integration:
 [![Gitlab Tests](https://gitlab.com/ci/projects/8973/status.png?ref=master)](https://gitlab.com/ci/projects/8973?ref=master)
 
+Github version
 [![GitHub version](https://badge.fury.io/gh/pouleta%2FNephosRubyServer.svg)](http://badge.fury.io/gh/pouleta%2FNephosRubyServer)
 
+Released version on ruby-gems
+[![Gem Version](https://badge.fury.io/rb/nephos-server.svg)](http://badge.fury.io/rb/nephos-server)
+
+Code Quality
 [![Code Climate](https://codeclimate.com/github/pouleta/NephosRubyServer/badges/gpa.svg)](https://codeclimate.com/github/pouleta/NephosRubyServer)
 
+Nephos gem version
 [![Nephos Executables](https://badge.fury.io/rb/nephos.svg)](http://badge.fury.io/rb/nephos)

data/app/main.rb

@@ -1,8 +1,8 @@
 class MainController < Nephos::Controller
 
   before_action :fct_before_all
-  before_action :fct_before_root, :root
-  after_action :fct_after_root, :root
+  before_action :fct_before_root, only: [:root]
+  after_action :fct_after_root, only: :root
 
   def fct_before_all
     # puts "BEFORE ALL"

data/bin/nephos-generator

@@ -105,7 +105,7 @@ EOF
 
     module Application
       def self.create_application_dir dir
-        raise BinError, "Directory #{dir} already exists" if Dir.exists? dir
+        raise BinError, "Directory #{dir} already exists" if Dir.exists? dir and dir != "."
         Dir.mkdir dir
       end
 

data/lib/nephos-server/controller.rb

@@ -32,14 +32,17 @@ module Nephos
 
     def self.parse_action_opts(opt)
       if opt.nil?
-        return :'*'
+        if block_given? then yield :'*' else return [:'*'] end
       elsif opt.is_a? Hash
-        raise "No implemented yet"
+        only = Array(opt[:only])
+        if block_given? then only.each{|e| yield e} else return only end
+        except = opt[:except]
+        raise "No implemented yet (except)" if except
         # parse :only and :except
       elsif opt.is_a? String or opt.is_a? Symbol
-        return opt.to_sym
+        if block_given? then yield opt else return [opt] end
       else
-        raise ArgumentError, "Invalid opts"
+        raise ArgumentError, "Invalid opt"
       end
     end
 
@@ -49,18 +52,22 @@ module Nephos
     #   - if Hash, it will be parsed with rules :only and :except
     #   - if String or Symbol, it will be parsed as :only
     def self.before_action(method, opt=nil)
-      call = parse_action_opts(opt)
-      @@before_action[call] ||= []
-      @@before_action[call] << method.to_sym
+      parse_action_opts(opt) do |call|
+        @@before_action[call] ||= []
+        @@before_action[call] << method.to_sym
+      end
     end
 
     # see {#self.before_action}
     def self.after_action(method, opt=nil)
-      call = parse_action_opts(opt)
-      @@after_action[call] ||= []
-      @@after_action[call] << method.to_sym
+      parse_action_opts(opt) do |call|
+        @@after_action[call] ||= []
+        @@after_action[call] << method.to_sym
+      end
     end
 
+    # It calls every registred hooks added to the @before_action list,
+    # including '*'
     def execute_before_action(call)
       call = call.to_sym
       methods = []
@@ -71,6 +78,7 @@ module Nephos
       end
     end
 
+    # see {#self.execute_before_action}
     def execute_after_action(call)
       call = call.to_sym
       methods = []

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

@@ -14,9 +14,10 @@ module Nephos
       params = what[:url].split('/').map do |p|
         p.match(/:\w+/) ? {p: "[^\/]+", name: p} : {p: p, name: nil}
       end
-      url = params.map{|e| e[:p]}.join("/")
+      url = params.map{|e| e[:p]}.join("/+")
       url = "/" if url.empty?
       what[:match] = /^#{url}\/*$/
+      # remove : in :param, and / in /param
       what[:params] = params.map{|e| e[:name] && e[:name][1..-1]}[1..-1] || []
     end
 

data/test/router.rb

@@ -59,7 +59,9 @@ class TestNephosServerRouter < Test::Unit::TestCase
     assert_equal "GET", first[:verb]
     assert_equal "TestController", first[:controller]
     assert_equal "method", first[:method]
-    assert_equal /^\/\/*$/, first[:match]
+    assert "/".match(first[:match])
+    assert "//".match(first[:match])
+    assert "///".match(first[:match])
 
     reset_routes!
     post url: "/", controller: "TestController", method: "method", silent: true
@@ -67,7 +69,9 @@ class TestNephosServerRouter < Test::Unit::TestCase
     assert_equal "POST", first[:verb]
     assert_equal "TestController", first[:controller]
     assert_equal "method", first[:method]
-    assert_equal /^\/\/*$/, first[:match]
+    assert "/".match(first[:match])
+    assert "//".match(first[:match])
+    assert "///".match(first[:match])
 
     reset_routes!
     put url: "/", controller: "TestController", method: "method", silent: true
@@ -75,14 +79,21 @@ class TestNephosServerRouter < Test::Unit::TestCase
     assert_equal "PUT", first[:verb]
     assert_equal "TestController", first[:controller]
     assert_equal "method", first[:method]
-    assert_equal /^\/\/*$/, first[:match]
+    assert "/".match(first[:match])
+    assert "//".match(first[:match])
+    assert "///".match(first[:match])
   end
 
   def test_valid_routes_params
     reset_routes!
     get url: "/:what", controller: "TestController", method: "method", silent: true
     assert_equal "/:what", first[:url]
-    assert_equal /^\/[^\/]+\/*$/, first[:match]
+    assert !"/".match(first[:match])
+    assert !"//".match(first[:match])
+    assert !"///".match(first[:match])
+    assert "/data".match(first[:match])
+    assert "/111".match(first[:match])
+    assert "/--_--".match(first[:match])
   end
 
   def test_valid_resources
@@ -102,7 +113,11 @@ class TestNephosServerRouter < Test::Unit::TestCase
       get url: "/:what", controller: "TestController", method: "method", silent: true
     end
     assert_equal "/home/:what", first[:url]
-    assert_equal /^\/home\/[^\/]+\/*$/, first[:match]
+    assert !"/JOME/data".match(first[:match])
+    assert !"/1".match(first[:match])
+    assert !"/home".match(first[:match])
+    assert "/home/data".match(first[:match])
+    assert "/home/1".match(first[:match])
   end
 
   def test_valid_resources_params2
@@ -111,9 +126,19 @@ class TestNephosServerRouter < Test::Unit::TestCase
       get url: "/show", controller: "TestController", method: "method", silent: true
     end
     assert_equal "/:id/show", first[:url]
-    assert_equal /^\/[^\/]+\/show\/*$/, first[:match]
+    assert !"/".match(first[:match])
+    assert !"/x".match(first[:match])
+    assert !"/xx".match(first[:match])
+    assert !"//1".match(first[:match])
+    assert !"/x/1".match(first[:match])
+    assert !"/1/x".match(first[:match])
+    assert !"/x//1".match(first[:match])
+    assert "/1/show".match(first[:match])
+    assert "/show/show".match(first[:match])
+    assert "/1//show".match(first[:match])
   end
 
+  REQ_GET_INDEX_ROOTx2 = Rack::Request.new({"REQUEST_METHOD"=>"GET", "PATH_INFO"=>"//index"})
   REQ_GET_INDEX = Rack::Request.new({"REQUEST_METHOD"=>"GET", "PATH_INFO"=>"/index"})
   REQ_POST_INDEX = Rack::Request.new({"REQUEST_METHOD"=>"POST", "PATH_INFO"=>"/index"})
   REQ_PUT_INDEX = Rack::Request.new({"REQUEST_METHOD"=>"PUT", "PATH_INFO"=>"/index"})
@@ -124,6 +149,7 @@ class TestNephosServerRouter < Test::Unit::TestCase
     reset_routes!
     get url: "/index", controller: "TestController", method: "method", silent: true
     post url: "/index", controller: "TestController", method: "method", silent: true
+    assert(Nephos::Router.new.find_route(REQ_GET_INDEX_ROOTx2))
     assert(Nephos::Router.new.find_route(REQ_GET_INDEX))
     assert(Nephos::Router.new.find_route(REQ_POST_INDEX))
     assert(!Nephos::Router.new.find_route(REQ_PUT_INDEX))

data/version

@@ -1 +1 @@
-0.6.1
+0.6.2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nephos-server
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - poulet_a
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nomorebeer