nephos-server 0.6.5 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8bb785df5db4f9f8b7a8e4821582700962d0fe4
-  data.tar.gz: f681de7959a63e202b03f80caf0d730142eaef0d
+  metadata.gz: 8f56113d904ac347a19a06e151745a8a86ac3824
+  data.tar.gz: c558a51379e268a046fd2f8c1915d762a7fd61e3
 SHA512:
-  metadata.gz: ec1e2f6a1d7afe305c39b7664787a31806a60d4f0bc9ed08a1add184f77408b87d09eeb10dbb913662f19ea992a2e3af993584648b0e138f95226c34514f6ac4
-  data.tar.gz: 41f1943b9e313ee1a45e998565e6628e118ba95fcf434cc591c8f993dd633a15b070b076b0fb2cfed1bcde47d059d56b89a284d8c1923785dc6e04045f4a4432
+  metadata.gz: 3ee29b97d3682d7fa4cf571f9112be21fbd73e49f4dc2de3325b1b543a853f2bdde98093608bbd8d17c5b37acaac684322aceb1a9da62dce55c0cc48e0758283
+  data.tar.gz: 294375556d2a690a2813404dd68d38c0d56d25055a6ea45057eaabf69fd8e2033a5d67974182c1c4f1ca1954451a4e7dba9b12c4d960658da2264e3a0fb1dfb8

data/CHANGELOG

@@ -1,3 +1,15 @@
+v0.6.7
+	* Fix gemspec
+
+v0.6.6
+	* Improve functional tests (router)
+	* Improve executables (status)
+	* Improve router (disable verbose)
+	* Fix executables (status)
+	* Update "nephos" gem to 1.0.4
+	* Add new feature Controller.url_for
+	* Add new feature log
+
 v0.6.5
 	* Improve routing helpers (optional url parameter)
 	* Add new functional tests (router)

data/DOCUMENTATION/GUIDE_CONTROLLER.md

@@ -11,6 +11,7 @@ Example:
     cookies.delete("b") # remove a cookie named "b"
 ```
 
+
 ### Params
 You can access to the parameters (defined by http or via the URI, based on your
 routing rules).
@@ -28,8 +29,11 @@ This format is accessible via the ``format`` method. (alias for ``extension``)
 It is also provided few helpers ``html?`` ``json?`` ``plain?``
 
 
-### Hooks
+### Environment
+From your controllers, you can access to the HTTP request via ``req.env``.
+You can also generate valid url via ``url_for("/resource")``.
 
+### Hooks
 A hook is a method, triggered automatically after an action.
 
 Actually, NephosServer allows you to create 2 kinds of triggers for your hooks:
@@ -89,3 +93,11 @@ class MainController < Nephos::Controller
 
 end
 ```
+
+### Log
+You can log errors, particular data, etc, simply by using the helper ```log(...)```
+
+You can set the fd the of file via
+```ruby
+Nephos::Logger.fd = File.open("/tmp/app_#{Time.now}.log", "a")
+```

data/DOCUMENTATION/TEMPLATING/SLIM.md

@@ -12,9 +12,15 @@ gem install slim
 ## Usage in Nephos Server
 
 ```ruby
+require 'slim'
+
 class UserController < Nephos::Controller
+
+  # /user/:id
   def show
-    #TODO: read a file, use slim with parameters
+    user = User.find(params[:id])
+    Slim::Template.new() { File.read('app/views/user/show.slim') }.render(nil, {login: user.login})
   end
+
 end
 ```

data/README.md

@@ -62,13 +62,13 @@ You should user ``ngenerator --controller NAME`` to generate a new controller.
 
 ```ruby
 class Example < Nephos::Controller
-def root
+  def root
     cookies["last_visit"] = Time.now
     if params["index"] == "true"
       return {plain: "index"}
     else
-	  return :empty
-	end
+      return :empty
+    end
   end
 end
 ```

data/app/main.rb

@@ -82,6 +82,11 @@ class MainController < Nephos::Controller
     {}
   end
 
+  def log_param_x
+    Logger.fd = File.open '/tmp/nephos_ftest.log', 'w'
+    log "#{params[:x]}"
+  end
+
   def err500
     tessssssssss
   end

data/bin/nephos-status

@@ -28,8 +28,10 @@ begin
        not File.read($gfl).split.index("nephos-server")
       raise "\"#{$dir}\" is not a valid nephos-server application"
     else
-      i = File.read($gfl).split.index("nephos-server") + 1
-      version = File.read($gfl).split[i]
+      data = File.read($gfl).split("\n").map(&:strip)
+      version = data.map{|e| e.match /nephos-server \((?<version>\d+(\.\d+)+)\)/ }.compact.first
+      raise "\"#{$gfl}\" doesn't contain a valid nephos-server version" unless version
+      version = version["version"]
       path = $gfl.gsub(/Gemfile\.lock$/, "")
       n_controllers = 0
       Dir[File.expand_path 'app/*.rb'].each do |f|
@@ -38,6 +40,8 @@ begin
       puts "Full path: #{path}"
       puts "Installed nephos-version: #{version}"
       puts "Controllers (#{n_controllers})"
+      daemon = $dir + "/.pid"
+      puts "The application is deploye as daemon (#{File.read(daemon)})" if File.exists? daemon
     end
   else
     raise "\"#{$dir}\" is not a valid directory"

data/lib/nephos-server/controller.rb

@@ -40,6 +40,11 @@ module Nephos
       %w(txt raw).include? extension
     end
 
+    # @return [String] an url formated as "scheme://host:port/path"
+    def url_for(path="")
+      (URI(req.env["rack.url_scheme"] + "://" + req.env['HTTP_HOST'] + "/") + path).to_s
+    end
+
     @@before_action = {:'*' =>  []}
     @@after_action = {:'*' =>  []}
 

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

@@ -73,8 +73,8 @@ module Nephos
       begin
         return render_controller(req, call)
       rescue => err
-        STDERR.puts "Error: #{err.message}"
-        STDERR.puts err.backtrace
+        STDERR.puts "Error: #{err.message}" unless @silent
+        STDERR.puts err.backtrace unless @silent
         return error_custom(req, 500, "#{err.message}\n---Backtrace---\n#{err.backtrace.join("\n")}\n")
       end
     end

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

@@ -0,0 +1,23 @@
+# coding: utf-8
+
+module Nephos
+
+  module Logger
+
+    @@fd = STDOUT
+    def self.write(*what)
+      what.flatten.each{|e| @@fd.write("#{e}\n")}
+      @@fd.flush
+    end
+
+    def self.fd= fd
+      @@fd = fd
+    end
+
+  end
+
+  def self.log *what
+    Logger.write what
+  end
+
+end

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

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require_relative 'responder'
 
 module Nephos
@@ -26,4 +28,5 @@ module Nephos
     end
 
   end
+
 end

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

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 module Nephos
 
   class Responder

data/lib/nephos-server.rb

@@ -3,6 +3,7 @@
 # require 'yaml'
 require 'json'
 require 'open-uri'
+require 'uri'
 require 'rack'
 require 'colorize'
 
@@ -13,5 +14,7 @@ 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/logger'
 require_relative 'nephos-server/server/main'

data/nephos-server.gemspec

@@ -15,6 +15,7 @@ lib/nephos-server/params.rb
 lib/nephos-server/router/main.rb
 lib/nephos-server/router/load.rb
 lib/nephos-server/router/helpers.rb
+lib/nephos-server/server/logger.rb
 lib/nephos-server/server/main.rb
 lib/nephos-server/server/responder.rb
 lib/nephos-server/version.rb
@@ -39,7 +40,9 @@ test/test.rb
 test/responder.rb
 test/router.rb
 test/params.rb
+test/logger.rb
 test/controller.rb
+
 test/functional.rb
 test/functional/generator.rb
 test/functional/global.rb

data/test/controller.rb

@@ -27,4 +27,27 @@ class TestNephosServerController < Test::Unit::TestCase
     assert_equal "v", c.params["k"]
   end
 
+  def test_url_for
+    r1 = ReqWithWritableParams.new({"REQUEST_METHOD"=>"GET",
+                                    "PATH_INFO"=>"/",
+                                    "REQUEST_URI"=>"/",
+                                    "HTTP_HOST"=>"localhost:8080",
+                                    "rack.url_scheme"=>"http"})
+    r2 = ReqWithWritableParams.new({"REQUEST_METHOD"=>"GET",
+                                    "PATH_INFO"=>"/index",
+                                    "REQUEST_URI"=>"/index?k=v",
+                                    "HTTP_HOST"=>"localhost:8081",
+                                    "rack.url_scheme"=>"https"})
+    c1 = Nephos::Controller.new(r1, {params: []})
+    c2 = Nephos::Controller.new(r2, {params: []})
+    assert_equal("http://localhost:8080/", c1.url_for(""))
+    assert_equal("http://localhost:8080/", c1.url_for("/"))
+    assert_equal("http://localhost:8080/sh", c1.url_for("sh"))
+    assert_equal("http://localhost:8080/sh/oh", c1.url_for("sh/oh"))
+    assert_equal("https://localhost:8081/", c2.url_for(""))
+    assert_equal("https://localhost:8081/", c2.url_for("/"))
+    assert_equal("https://localhost:8081/sh", c2.url_for("sh"))
+    assert_equal("https://localhost:8081/sh/oh", c2.url_for("sh/oh"))
+  end
+
 end

data/test/functional/router.rb

@@ -51,6 +51,8 @@ class TestNephosServerAppRouter < Test::Unit::TestCase
         raise
       end
     end
+    rep = router.execute(Rack::Request.new({"REQUEST_METHOD"=>"GET", "PATH_INFO"=>"/err500"}))
+    assert_equal(500, rep.status)
   end
 
   def test_router_on_invalid

data/test/logger.rb

@@ -0,0 +1,29 @@
+# coding: utf-8
+
+class TestNephosServerLogger < Test::Unit::TestCase
+
+  FILE = "/tmp/nephos_test_#{Time.now}.log"
+
+  def test_basic
+    fd = File.open(FILE, "w")
+    Nephos::Logger.fd = fd
+    Nephos::Logger.write "coucou"
+    assert_equal("coucou\n", File.read(FILE))
+    File.delete FILE
+
+    fd = File.open(FILE, "w")
+    Nephos::Logger.fd = fd
+    Nephos::Logger.write %w(hello wôrld)
+    assert_equal("hello\nwôrld\n", File.read(FILE))
+    File.delete FILE
+  end
+
+  def test_basic_shortcut
+    fd = File.open(FILE, "w")
+    Nephos::Logger.fd = fd
+    Nephos.log %w(hello wôrld)
+    assert_equal("hello\nwôrld\n", File.read(FILE))
+    File.delete FILE
+  end
+
+end

data/test/router.rb

@@ -149,12 +149,13 @@ 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))
-    assert(!Nephos::Router.new.find_route(REQ_GET_INDEXX))
-    assert(!Nephos::Router.new.find_route(REQ_GET_INDE))
+    r = Nephos::Router.new(silent: true)
+    assert(r.find_route(REQ_GET_INDEX_ROOTx2))
+    assert(r.find_route(REQ_GET_INDEX))
+    assert(r.find_route(REQ_POST_INDEX))
+    assert(!r.find_route(REQ_PUT_INDEX))
+    assert(!r.find_route(REQ_GET_INDEXX))
+    assert(!r.find_route(REQ_GET_INDE))
   end
 
   REQ_GET_ID_INDEX = Rack::Request.new({"REQUEST_METHOD"=>"GET", "PATH_INFO"=>"/id/index"})
@@ -167,11 +168,12 @@ class TestNephosServerRouter < Test::Unit::TestCase
     reset_routes!
     get url: "/:id", controller: "TestController", method: "method1", silent: true
     get url: "/:id/index", controller: "TestController", method: "method2", silent: true
-    assert(Nephos::Router.new.find_route(REQ_GET_ID_INDEX))
-    assert(Nephos::Router.new.find_route(REQ_GET_XXX_INDEX))
-    assert(Nephos::Router.new.find_route(REQ_GET_ID))
-    assert(Nephos::Router.new.find_route(REQ_GET_XXX))
-    assert(!Nephos::Router.new.find_route(REQ_GET_INDEX_ID))
+    r = Nephos::Router.new(silent: true)
+    assert(r.find_route(REQ_GET_ID_INDEX))
+    assert(r.find_route(REQ_GET_XXX_INDEX))
+    assert(r.find_route(REQ_GET_ID))
+    assert(r.find_route(REQ_GET_XXX))
+    assert(!r.find_route(REQ_GET_INDEX_ID))
   end
 
   REQ_GET_IDX_INDEX = Rack::Request.new({"REQUEST_METHOD"=>"GET", "PATH_INFO"=>"/idx/index"})
@@ -192,25 +194,27 @@ class TestNephosServerRouter < Test::Unit::TestCase
     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
+    r = Nephos::Router.new(silent: true)
 
-    assert(!Nephos::Router.new.find_route(REQ_GET_IDX_INDEX))
-    assert(!Nephos::Router.new.find_route(REQ_GET_XXX_INDEX))
-    assert(!Nephos::Router.new.find_route(REQ_GET_ID))
-    assert(!Nephos::Router.new.find_route(REQ_GET_XXX))
+    assert(!r.find_route(REQ_GET_IDX_INDEX))
+    assert(!r.find_route(REQ_GET_XXX_INDEX))
+    assert(!r.find_route(REQ_GET_ID))
+    assert(!r.find_route(REQ_GET_XXX))
 
-    assert(Nephos::Router.new.find_route(REQ_GET_INDEX_ID))
-    assert(Nephos::Router.new.find_route(REQ_GET_INDEX_XXX))
-    assert(Nephos::Router.new.find_route(REQ_POST_INDEX_XXX_INDEX))
+    assert(r.find_route(REQ_GET_INDEX_ID))
+    assert(r.find_route(REQ_GET_INDEX_XXX))
+    assert(r.find_route(REQ_POST_INDEX_XXX_INDEX))
 
-    assert(!Nephos::Router.new.find_route(REQ_GET_INDEX_XXX_INDEX))
-    assert(!Nephos::Router.new.find_route(REQ_POST_INDEX_XXX_ID))
-    assert(!Nephos::Router.new.find_route(REQ_POST_INDEX_XXX_XXX))
+    assert(!r.find_route(REQ_GET_INDEX_XXX_INDEX))
+    assert(!r.find_route(REQ_POST_INDEX_XXX_ID))
+    assert(!r.find_route(REQ_POST_INDEX_XXX_XXX))
   end
 
   def test_routing_extension
     reset_routes!
     get url: "/index", controller: "TestController", method: "method1", silent: true
     get url: "/indexno", controller: "TestController", method: "method1", silent: true, postfix: false
+    r = Nephos::Router.new(silent: true)
     ok1 = Rack::Request.new({"REQUEST_METHOD"=>"GET", "PATH_INFO"=>"/index"})
     ok2 = Rack::Request.new({"REQUEST_METHOD"=>"GET", "PATH_INFO"=>"/index.html"})
     ok3 = Rack::Request.new({"REQUEST_METHOD"=>"GET", "PATH_INFO"=>"/index.json"})
@@ -220,15 +224,15 @@ class TestNephosServerRouter < Test::Unit::TestCase
     ko2 = Rack::Request.new({"REQUEST_METHOD"=>"GET", "PATH_INFO"=>"/indexno.html"})
     ko3 = Rack::Request.new({"REQUEST_METHOD"=>"GET", "PATH_INFO"=>"/indexno.json"})
     ko4 = Rack::Request.new({"REQUEST_METHOD"=>"GET", "PATH_INFO"=>"/indexno.xhr"})
-    assert(Nephos::Router.new.find_route(ok1))
-    assert(Nephos::Router.new.find_route(ok2))
-    assert(Nephos::Router.new.find_route(ok3))
-    assert(Nephos::Router.new.find_route(ok4))
-    assert(Nephos::Router.new.find_route(ok5))
-    assert(!Nephos::Router.new.find_route(ko1))
-    assert(!Nephos::Router.new.find_route(ko2))
-    assert(!Nephos::Router.new.find_route(ko3))
-    assert(!Nephos::Router.new.find_route(ko4))
+    assert(r.find_route(ok1))
+    assert(r.find_route(ok2))
+    assert(r.find_route(ok3))
+    assert(r.find_route(ok4))
+    assert(r.find_route(ok5))
+    assert(!r.find_route(ko1))
+    assert(!r.find_route(ko2))
+    assert(!r.find_route(ko3))
+    assert(!r.find_route(ko4))
   end
 
   def test_routing_eze_router

data/test/test.rb

@@ -6,3 +6,4 @@ require_relative 'responder'
 require_relative 'router'
 require_relative 'controller'
 require_relative 'params'
+require_relative 'logger'

data/version

@@ -1 +1 @@
-0.6.5
+0.6.7

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nephos-server
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.7
 platform: ruby
 authors:
 - poulet_a
@@ -31,7 +31,7 @@ cert_chain:
   tcYkgfqUJPitIJx1RvWZpIyH5uJhRUYK3+vU9nMOxez5WbIlC1TtpByKAPMX+sht
   gib3AoIT8jh/2w==
   -----END CERTIFICATE-----
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2015-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nomorebeer
@@ -126,6 +126,7 @@ files:
 - lib/nephos-server/router/helpers.rb
 - lib/nephos-server/router/load.rb
 - lib/nephos-server/router/main.rb
+- lib/nephos-server/server/logger.rb
 - lib/nephos-server/server/main.rb
 - lib/nephos-server/server/responder.rb
 - lib/nephos-server/version.rb
@@ -137,6 +138,7 @@ files:
 - test/functional/global.rb
 - test/functional/router.rb
 - test/functional/server.rb
+- test/logger.rb
 - test/params.rb
 - test/responder.rb
 - test/router.rb
@@ -165,8 +167,6 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: "* Improve routing helpers (optional url parameter) * Add new functional
-  tests (router) * Add extension for url (.html, ...) * Add improved router helper
-  (simple destination, alias)"
+summary: "* Fix gemspec"
 test_files: []
 has_rdoc: