nephos-server 0.6.9 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe9427a82fb27f38d05a61d389a4908310c1d943
-  data.tar.gz: 70968b136a8816c7b91fef7c4d5c8b3b4a3c8941
+  metadata.gz: 1342d8a4e7a96a441515aa0cd1d051e455004078
+  data.tar.gz: 11d0fafb7cc67d032ac12732d1605998f8065440
 SHA512:
-  metadata.gz: 0dc889edb2267acd90ca1606b9f999fe70aa7bab5baeec9fd87734d06a307bcd66a0609139695549bdb6189fd51ccab8920201cfe323d4a48dc9b51839c6d7a1
-  data.tar.gz: 130a86745ed28082f987b755f1a42ba96d03cdf05b00cb1dc1745ffd3608d7e06bf1bcd8a6d177beb1d477635029fc6e07c27f35a41232e1d8c194e5f6c08df0
+  metadata.gz: 2efc129fbaa523bf5499a43d4ce1172e7733ab23100590ef8ebca08cbbba979414b65b62ce441bf74e3d2474bca6e6c70b3166cbc84ca60f8fa9d8ea2a6f1bc6
+  data.tar.gz: 2e02115d5e1b76a40f36f4509ce42bc28221c76719d5e9ffa9c74e638ead1ebe34129ff51d9668a4aab5f9a7926a25bfd9fb7777bcc89540ba7b6f2e718cb247

data/CHANGELOG

@@ -1,17 +1,15 @@
-v0.6.9
+v0.7.0
+        * Remove depreciated method
+        * Large cookie improvement (can change the path)
+
+v0.6
         * Fix unitary tests
         * Fix binary server to handle daemons better
         * Add unitary test to test the server globaly
         * Log can be called from the controller
-
-v0.6.8
 	* Update urls and links
 	* Important fix for cookies
-
-v0.6.7
 	* Fix gemspec
-
-v0.6.6
 	* Improve functional tests (router)
 	* Improve executables (status)
 	* Improve router (disable verbose)
@@ -19,34 +17,22 @@ v0.6.6
 	* 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)
 	* Add extension for url (.html, ...)
 	* Add improved router helper (simple destination, alias)
-
-v0.6.4
 	* Fix application generator (replace in the gemfile nephos-server by nephos)
         * Improve guides (more doc, corrections, update)
 	* Certificate for sign the gem
-
-v0.6.3
         * Add customisable default error page
-
-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
 	* Add few functional (router, server, generator) tests
 	* Add new unitary tests
-
-v0.6.0
 	* Big change (ea49dfb0b429f03327447477bfee9bef30dda7ad) on the architecture, massive usage of Rack::Request, review the global architecture, update all unitary tests
 	* add hook before_action and after_action
 	* improve params

data/DOCUMENTATION/DATABASE/SEQUEL.md

@@ -8,12 +8,12 @@ It handles connection with DB, sql request creation, caching, etc.
 [Sequel documentation](http://sequel.jeremyevans.net/documentation.html)
 
 ## Installation
-
 ```bash
 gem install sequel
 ```
 
 ## Usage
+You can add the following code in ``/sequel.rb``:
 
 ```ruby
 require 'sequel'

data/DOCUMENTATION/GUIDE_CONTROLLER.md

@@ -9,8 +9,12 @@ Example:
 ```ruby
     cookies["a"] = "b" # add a cookie named "a"
     cookies.delete("b") # remove a cookie named "b"
+    cookies.set_path("a", "/a")
 ```
 
+* TODO: Change expiration date, domain, ...
+* Note: By default, every cookie's path is "/"
+
 
 ### Params
 You can access to the parameters (defined by http or via the URI, based on your

data/DOCUMENTATION/TEMPLATING/SLIM.md

@@ -4,13 +4,20 @@ Slim is a HTML templating langage, simple to implement in the Nephos Server.
 [Slim documentation](http://slim-lang.com)
 
 ## Installation
-
 ```bash
 gem install slim
 ```
 
 ## Usage in Nephos Server
+You can add the following code in ``/slim.rb``:
+
+```ruby
+def slim(file, locals)
+  Slim::Template.new() { File.read('app/views/' + file) }.render(nil, locals)
+end
+```
 
+### Example
 ```ruby
 require 'slim'
 

data/app/main.rb

@@ -60,7 +60,7 @@ class MainController < Nephos::Controller
     file = File.expand_path(params["image"], dir)
     if not file[0..(dir.size-1)] == dir or not AUTH_IMG_EXT.include?(File.extname(file))
       return {status: 500, content: "invalid path #{params['image']}"}
-    elsif not File.exists? file
+    elsif not File.exist? file
       return {status: 404, content: "invalid path #{params['image']}"}
     else
       return {type: 'image/jpeg', content: File.read(file)}
@@ -76,9 +76,9 @@ class MainController < Nephos::Controller
     {json: cookies.to_h}
   end
 
-  # require 'pry'
   def debug
-    # binding.pry
+    #require 'pry'
+    #binding.pry
     {}
   end
 

data/bin/nephos-generator

@@ -78,14 +78,14 @@ module Nephos
         file = "app/#{lname}.rb"
         raise_invalid_appli
         if $remove
-          if File.exists?(file) and File.read(file).include? "class #{uname} < Nephos::Controller"
+          if File.exist?(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
+          if File.exist? 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)?/)

data/bin/nephos-server

@@ -9,40 +9,46 @@ require_relative '../lib/nephos-server/version'
 class RoutingError < StandardError; end
 
 begin
-  opts = OptionParser.new do |opts|
-    opts.banner = "Usage<#{Nephos::VERSION}>: nephos-server <options>"
+  opts = OptionParser.new do |opt|
+    opt.banner = "Usage<#{Nephos::VERSION}>: nephos-server <options>"
 
     $server_port = ENV["SERVER_PORT"] || 8080
-    opts.on("-p=nb", "--port=nb", "Port to listen") do |port|
+    opt.on("-p=nb", "--port=nb", "Port to listen") do |port|
       $server_port = Integer(port)
     end
 
     $server_host = ENV["SERVER_HOST"] || "0.0.0.0"
-    opts.on("-h=listen", "--host=listen", "Listen on the network") do |host|
+    opt.on("-h=listen", "--host=listen", "Listen on the network") do |host|
       $server_host = host
     end
 
     $server_env = ENV["ENVIRONMENT"] || "development"
-    opts.on("-e=env", "--env=env", "Environment") do |env|
+    opt.on("-e=env", "--env=env", "Environment") do |env|
       $server_env = env
     end
 
-    opts.on("--debug", "Enable debugging mode") do
+    opt.on("--debug", "Enable debugging mode") do
       $debug = true
     end
 
-    opts.on("--test", "Enable testing mode (for nephos developpers)") do
+    opt.on("--test", "Enable testing mode (for nephos developpers)") do
       $test = true
     end
 
-    opts.on("-d", "--daemon", "Start in background") do
+    opt.on("-d", "--daemon", "Start in background") do
       $daemon = true
     end
 
-    opts.on("-k", "--kill", "Kill the daemon if started") do
+    opt.on("-k", "--kill", "Kill the daemon if started") do
       $kill_daemon = true
     end
 
+    opt.on("-r", "--restart", "Restart the daemon if started") do
+      $restart_daemon = true
+      $kill_daemon = true
+      $daemon = true
+    end
+
   end.parse!
 
   Nephos.env = $server_env
@@ -54,7 +60,7 @@ begin
     pid = Nephos::Bin::Daemon.get_pid
     Nephos::Bin::Daemon.kill!
     puts "Daemon #{pid} stopped"
-    exit 0
+    exit 0 unless $restart_daemon
   end
   if $daemon and Nephos::Bin::Daemon.started?
     raise "Unable to start the server: the daemon #{Nephos::Bin::Daemon.get_pid} already exists"
@@ -67,7 +73,7 @@ begin
   end
 
   if not $test and
-    (not File.exists? "Gemfile.lock" or
+    (not File.exist? "Gemfile.lock" or
      not File.read("Gemfile.lock").split.index("nephos-server"))
     raise InvalidApplication
   end

data/bin/nephos-status

@@ -24,12 +24,12 @@ $dir = opt[0] || "."
 begin
   if Dir.exists? $dir
     $gfl = File.expand_path "Gemfile.lock", $dir
-    if not File.exists? $gfl or
+    if not File.exist? $gfl or
        not File.read($gfl).split.index("nephos-server")
       raise "\"#{$dir}\" is not a valid nephos-server application"
     else
       data = File.read($gfl).split("\n").map(&:strip)
-      version = data.map{|e| e.match /nephos-server \((?<version>\d+(\.\d+)+)\)/ }.compact.first
+      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$/, "")
@@ -41,7 +41,7 @@ begin
       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
+      puts "The application is deploye as daemon (#{File.read(daemon)})" if File.exist? daemon
     end
   else
     raise "\"#{$dir}\" is not a valid directory"

data/lib/nephos-server.rb

@@ -12,6 +12,7 @@ require_relative 'nephos-server/version'
 # lib
 require_relative 'nephos-server/basic_errors'
 require_relative 'nephos-server/params'
+require_relative 'nephos-server/cookies'
 require_relative 'nephos-server/controller'
 require_relative 'nephos-server/router/main'
 

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

@@ -14,7 +14,7 @@ module Nephos
     def self.is_a_valid_application? dir="."
       return false if not Dir.exists? dir
       gfl = File.expand_path "Gemfile.lock", dir
-      return false if not File.exists? gfl
+      return false if not File.exist? gfl
       return false if not File.read(gfl).split.index("nephos-server")
       return true
     end
@@ -49,7 +49,7 @@ module Nephos
       end
 
       def self.get_pid
-        return nil if not File.exists?(get_pid_file)
+        return nil if not File.exist?(get_pid_file)
         v = File.read(get_pid_file)
         v = Integer(v) rescue nil
         return v

data/lib/nephos-server/controller.rb

@@ -25,7 +25,7 @@ module Nephos
       @params.select!{|k,v| not k.to_s.empty?}
 
       @params = Params.new(@params)
-      @cookies = Params.new(@req.cookies)
+      @cookies = Cookies.new(@req.cookies)
 
       @extension = extension.to_s.split(".").last
     end

data/lib/nephos-server/cookies.rb

@@ -0,0 +1,52 @@
+# coding: utf-8
+
+module Nephos
+
+  # Params to a hash, where every elements are accessibles via a stringified key
+  # so, even if the entry was added with the key :KEY, it will be accessible via
+  # a string equivalent to :key.to_s
+  #   param["key"] == param[:key]
+  #
+  # Every methods present in {Hash} are usable in {Param}.
+  class Cookies < Params
+
+    # @param hash [Hash] hash containing the parameters
+    def initialize(hash={})
+      raise ArgumentError, "the first argument must be a Hash" unless hash.is_a? Hash
+      # TODO: take care of the path
+      @hash = Hash[hash.map{|k,v| [k.to_s, {content: v, path: "/"}]}]
+    end
+
+    def method_missing m, *a
+      @hash.send(m, *(a.map(&:to_s)))
+      @hash.send(m, *a)
+    end
+
+    def [] i
+      @hash[i.to_s][:content]
+    end
+
+    def []= i, v, path="/"
+      @hash[i.to_s] = {content: v.to_s, path: path.to_s}
+    end
+
+    def path i
+      @hash[i.to_s][:path]
+    end
+
+    def set_path i, v
+      raise InvalidPath, v unless v.is_a? String
+      @hash[i.to_s][:path] = URI.encode(v)
+    end
+
+    def to_h
+      return @hash
+    end
+    alias :to_hash :to_h
+
+    def to_s
+      return to_h.to_s
+    end
+
+  end
+end

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

@@ -17,9 +17,9 @@ end
 # if the client request match with the verb and the url provided.
 #
 # Checkout the documentation about the parameters and API for more informations
-def add_route(verb, url=nil, what)
+def add_route(verb, option_url=nil, what)
   raise InvalidRoute, "what must be a hash" unless what.is_a? Hash
-  what[:url] ||= url
+  what[:url] ||= option_url
   Array(what[:url]).each do |url|
     route = what.dup
     route[:url] = url

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

@@ -41,7 +41,7 @@ module Nephos
     end
 
     def error_custom(req, code, default=nil)
-      if File.exists? "app/#{code}.html"
+      if File.exist? "app/#{code}.html"
         @responder.render(status: code, html: File.read("app/#{code}.html"))
       else
         render_error(req, code, default || "Error: #{req.status}")

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

@@ -83,7 +83,8 @@ module Nephos
       # puts "--- Params #{params.class} ---", "<<", params, ">>"
       resp = render(params)
       controller.cookies.to_h.each do |k, v|
-        resp.set_cookie k, v
+        resp.set_cookie k, v[:content]
+        resp.header["Set-Cookie"] += ";path=" + v[:path]
       end
       return resp
     end

data/nephos-server.gemspec

@@ -9,6 +9,7 @@ Gem::Specification.new do |s|
   s.files       = %w(
 lib/nephos-server.rb
 lib/nephos-server/basic_errors.rb
+lib/nephos-server/cookies.rb
 lib/nephos-server/bin-helpers.rb
 lib/nephos-server/controller.rb
 lib/nephos-server/params.rb

data/routes.rb

@@ -25,3 +25,5 @@ get url: "/get_cookies", controller: "MainController", method: "get_cookies"
 get url: "/add_cookie", controller: "MainController", method: "add_cookie"
 
 get "/err500", controller: "MainController", method: "err500"
+
+get "/;/cookie", to: "MainController#root"

data/test/functional/controller.rb

@@ -33,7 +33,7 @@ class TestController < Test::Unit::TestCase
     router = Nephos::Router.new(silent: true)
     r = Rack::Request.new({"REQUEST_METHOD"=>"GET", "PATH_INFO"=>"/add_cookie"})
     out = router.execute(r)
-    assert_equal "UN_COOKIE_VAUT%3A=UN+BON+MOMENT+%21", out.header["Set-Cookie"]
+    assert_equal "UN_COOKIE_VAUT%3A=UN+BON+MOMENT+%21;path=/", out.header["Set-Cookie"]
   end
 
 end

data/test/functional/generator.rb

@@ -5,8 +5,8 @@ class TestNephosServerGenerator < Test::Unit::TestCase
 
     `./bin/nephos-generator --test -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(File.exist? "/tmp/nephos-server-test/Gemfile")
+    assert(File.exist? "/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'")
@@ -18,14 +18,14 @@ class TestNephosServerGenerator < Test::Unit::TestCase
 
     `./bin/nephos-generator --test -a /tmp/nephos-server-test --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(File.exist? "/tmp/nephos-server-test/Gemfile")
+    assert(File.exist? "/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'")
 
     # if connected to internet only
-    assert(File.exists? "/tmp/nephos-server-test/Gemfile.lock")
+    assert(File.exist? "/tmp/nephos-server-test/Gemfile.lock")
     gemfile_lock_data = File.read("/tmp/nephos-server-test/Gemfile.lock").split
     assert(gemfile_lock_data.include? "nephos")
     assert(gemfile_lock_data.include? "nephos-server")
@@ -37,17 +37,17 @@ class TestNephosServerGenerator < Test::Unit::TestCase
     `rm -f app/test_controller.rb`
 
     `./bin/nephos-generator --test -c test`
-    assert File.exists? "app/test_controller.rb"
+    assert File.exist? "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`
 
     `./bin/nephos-generator -c test --test`
-    assert File.exists? "app/test_controller.rb"
+    assert File.exist? "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`
 
     `./bin/nephos-generator -c testController --test`
-    assert File.exists? "app/test_controller.rb"
+    assert File.exist? "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`
   end

data/test/functional/global.rb

@@ -18,13 +18,13 @@ class TestGlobal < Test::Unit::TestCase
     r = open("http://127.0.0.1:8080/")
     assert_equal "{\"list\":[],\"add\":\"/add\",\"rm\":\"/rm\"}\n", r.read
     assert_equal "application/json; charset=UTF-8", r.meta["content-type"]
-    assert_equal "a=b", r.meta["set-cookie"]
+    assert_equal "a=b;path=/", r.meta["set-cookie"]
     assert_equal ["200", "OK"], r.status
 
     r = open("http://127.0.0.1:8080/home")
     assert_equal "{\"list\":[],\"add\":\"/add\",\"rm\":\"/rm\"}\n", r.read
     assert_equal "application/json; charset=UTF-8", r.meta["content-type"]
-    assert_equal "a=b", r.meta["set-cookie"]
+    assert_equal "a=b;path=/", r.meta["set-cookie"]
     assert_equal ["200", "OK"], r.status
 
     r = open("http://127.0.0.1:8080/home/")

data/version

@@ -1 +1 @@
-0.6.9
+0.7.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nephos-server
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.7.0
 platform: ruby
 authors:
 - poulet_a
@@ -31,7 +31,7 @@ cert_chain:
   tcYkgfqUJPitIJx1RvWZpIyH5uJhRUYK3+vU9nMOxez5WbIlC1TtpByKAPMX+sht
   gib3AoIT8jh/2w==
   -----END CERTIFICATE-----
-date: 2015-11-06 00:00:00.000000000 Z
+date: 2015-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nomorebeer
@@ -122,6 +122,7 @@ files:
 - lib/nephos-server/basic_errors.rb
 - lib/nephos-server/bin-helpers.rb
 - lib/nephos-server/controller.rb
+- lib/nephos-server/cookies.rb
 - lib/nephos-server/params.rb
 - lib/nephos-server/router/helpers.rb
 - lib/nephos-server/router/load.rb
@@ -168,6 +169,12 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: "* Update urls and links * Important fix for cookies"
+summary: "* fix regression on empty response * add unitary tests * improve gemspec
+  * fix severe regression on responder * fix environment bug * add continuous integration
+  with gitlab * fix executables requirements to be testable * add cookies management
+  * fix regression on content-type from v0.4 * fix nephos gem (binaries can be used
+  out of an application) * improve code documentation (annotations above the methods
+  and classes) * fix content type for json to application/json * improve executables:
+  version taking in count"
 test_files: []
 has_rdoc: