nephos-server 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfb43f920b7062248d844802dbd96135df959937
-  data.tar.gz: 3e90d530f635a27f4f677c31209e45e3017f779b
+  metadata.gz: fe9427a82fb27f38d05a61d389a4908310c1d943
+  data.tar.gz: 70968b136a8816c7b91fef7c4d5c8b3b4a3c8941
 SHA512:
-  metadata.gz: e2f24d53c42f4649b223181a5cfc35734b3cd9038ebf61f83a21b421c3f5ec4db6d4cbab6833f521207b7c6d45b44951b2a76bf65c64a3a523b05f539896cae8
-  data.tar.gz: 05afd2f2b0e6c2ce436c52f63b7887362575ab6c38f2b45405a0f4111020cd9e8c2430d99c3f2805a8d5326cbd7d837a93b6fe86576415777cc9f28f3a6c6c1a
+  metadata.gz: 0dc889edb2267acd90ca1606b9f999fe70aa7bab5baeec9fd87734d06a307bcd66a0609139695549bdb6189fd51ccab8920201cfe323d4a48dc9b51839c6d7a1
+  data.tar.gz: 130a86745ed28082f987b755f1a42ba96d03cdf05b00cb1dc1745ffd3608d7e06bf1bcd8a6d177beb1d477635029fc6e07c27f35a41232e1d8c194e5f6c08df0

data/CHANGELOG

@@ -1,3 +1,9 @@
+v0.6.9
+        * 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

data/Rakefile

@@ -12,15 +12,18 @@ namespace :test do
 
   desc "Unitary tests. Fasts and on the sources."
   task :test do
-    puts
     ruby "test/test.rb"
   end
 
   desc "Functional tests. Slow, test real the features under real conditions of usage."
   task :functional do
-    puts "!!! Important !!!".yellow
-    puts "You have to access to internet to test the generator.".yellow
-    puts
     ruby "test/functional.rb"
   end
+
+  namespace :functional do
+    task :internet do
+      ruby "test/functional.rb internet"
+    end
+  end
+
 end

data/bin/nephos-server

@@ -51,8 +51,9 @@ begin
 
   if $kill_daemon
     raise "No Daemon started" if not Nephos::Bin::Daemon.started?
-    puts "Daemon #{Nephos::Bin::Daemon.get_pid} stopped"
+    pid = Nephos::Bin::Daemon.get_pid
     Nephos::Bin::Daemon.kill!
+    puts "Daemon #{pid} stopped"
     exit 0
   end
   if $daemon and Nephos::Bin::Daemon.started?

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

@@ -29,8 +29,9 @@ module Nephos
         d = get_pid
         return false unless d
         begin
-          Process::kill(10, d)
+          Process::kill(2, d)
         rescue => err
+          raise "Cannot kill #{d} ! (#{err.message})" if $debug
           raise "Cannot kill #{d} !"
         ensure
           File.delete(get_pid_file)

data/lib/nephos-server/controller.rb

@@ -107,5 +107,9 @@ module Nephos
       end
     end
 
+    def log *args
+      Logger.write(*args)
+    end
+
   end
 end

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

@@ -97,7 +97,7 @@ module Nephos
       params = set_default_params(params)
       resp.status = params[:status]
       resp["Content-Type"] = params[:type]
-      resp.body = [params[:content]]
+      resp.body = [params[:content] + "\n"]
       return resp
     end
 

data/nephos-server.gemspec

@@ -44,6 +44,7 @@ test/logger.rb
 test/controller.rb
 
 test/functional.rb
+test/functional/controller.rb
 test/functional/generator.rb
 test/functional/global.rb
 test/functional/router.rb

data/test/functional/controller.rb

@@ -0,0 +1,39 @@
+# coding: utf-8
+
+class FakeController1241525 < Nephos::Controller
+  DATA = %w(hello wôrld)
+  def log_test
+    Nephos::Logger.fd = File.open '/tmp/nephos_ftest.log', 'w'
+    log DATA
+    return {json: DATA}
+  end
+
+  def set_cookie
+    cookies["name"] = "value"
+    return {code: 200}
+  end
+end
+
+class TestController < Test::Unit::TestCase
+
+  FILE = "/tmp/nephos_ftest.log"
+
+  def test_log_with_one_controller
+    # fd = File.open(FILE, "w")
+    # Nephos::Logger.fd = fd
+    # Nephos.log %w(hello wôrld)
+    r = Rack::Request.new({})
+    c = FakeController1241525.new(r, {params: []})
+    c.log_test
+    assert_equal("hello\nwôrld\n", File.read(FILE))
+    File.delete FILE
+  end
+
+  def test_set_cookies
+    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"]
+  end
+
+end

data/test/functional/global.rb

@@ -1,6 +1,44 @@
+require 'open-uri'
+
 class TestGlobal < Test::Unit::TestCase
 
+  def start_server
+    stop_server
+    s = `./bin/nephos-server --test -d`
+    sleep 1
+    s
+  end
+
+  def stop_server
+    `./bin/nephos-server --test -k`
+  end
+
   def test_simpe_requests_on_app
+    start_server
+    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 ["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 ["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 ["200", "OK"], r.status
+
+    r = open("http://127.0.0.1:8080/hello")
+    assert_equal "<html><body><h1>hello world</h1><p>lol</p></body></html>\n", r.read
+    assert_equal ["200", "OK"], r.status
+
+    assert_raise do open("http://127.0.0.1:8080/err500") end
+
+    stop_server
   end
 
 end

data/test/functional/server.rb

@@ -2,35 +2,45 @@ class TestNephosServerBinServer < Test::Unit::TestCase
 
   def test_daemon
     # WARNING: be sure there is no instance before running theses tests
+    `./bin/nephos-server --test -k`
 
     # test start and kill
     `./bin/nephos-server --test -d`
+    sleep 2
     assert_equal 0, $?.exitstatus
     `./bin/nephos-server --test -k`
+    sleep 0.5
     assert_equal 0, $?.exitstatus
 
     # test kill after killed
     `./bin/nephos-server --test -k`
+    sleep 0.5
     assert_equal 1, $?.exitstatus
     `./bin/nephos-server --test -k`
+    sleep 0.5
     assert_equal 1, $?.exitstatus
 
     # test start after killed
     `./bin/nephos-server --test -d`
+    sleep 2
     assert_equal 0, $?.exitstatus
 
     # test start after started
     `./bin/nephos-server --test -d`
+    sleep 0.5
     assert_equal 1, $?.exitstatus
     `./bin/nephos-server --test -d`
+    sleep 0.5
     assert_equal 1, $?.exitstatus
 
     # test kill after started N times
     `./bin/nephos-server --test -k`
+    sleep 0.5
     assert_equal 0, $?.exitstatus
 
     # test kill after started N times and then killed
     `./bin/nephos-server --test -k`
+    sleep 0.5
     assert_equal 1, $?.exitstatus
   end
 

data/test/functional.rb

@@ -2,8 +2,13 @@ require "test/unit"
 
 require_relative "../lib/nephos-server"
 
-require_relative 'functional/generator'
-require_relative 'functional/server'
+# tests global
 require_relative 'functional/global'
+require_relative 'functional/server'
 
+# tests on master classes
+require_relative 'functional/controller'
 require_relative 'functional/router'
+
+# test global with internet required
+require_relative 'functional/generator' if ARGV[0] == "internet"

data/test/responder.rb

@@ -111,13 +111,13 @@ class TestNephosServerResponder < Test::Unit::TestCase
     r3 = Nephos::Responder.new.render(status: 201, html: "<p>p</p>")
     assert_equal(201, r1.status)
     assert_equal("text/plain; charset=UTF-8", r1["Content-type"])
-    assert_equal(["plaaaain"], r1.body)
+    assert_equal(["plaaaain\n"], r1.body)
     assert_equal(201, r2.status)
     assert_equal("application/json; charset=UTF-8", r2["Content-type"])
-    assert_equal(["{\"data\":[1,2]}"], r2.body)
+    assert_equal(["{\"data\":[1,2]}\n"], r2.body)
     assert_equal(201, r3.status)
     assert_equal("text/html; charset=UTF-8", r3["Content-type"])
-    assert_equal(["<p>p</p>"], r3.body)
+    assert_equal(["<p>p</p>\n"], r3.body)
   end
 
 end

data/version

@@ -1 +1 @@
-0.6.8
+0.6.9

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nephos-server
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - poulet_a
@@ -31,7 +31,7 @@ cert_chain:
   tcYkgfqUJPitIJx1RvWZpIyH5uJhRUYK3+vU9nMOxez5WbIlC1TtpByKAPMX+sht
   gib3AoIT8jh/2w==
   -----END CERTIFICATE-----
-date: 2015-11-01 00:00:00.000000000 Z
+date: 2015-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nomorebeer
@@ -134,6 +134,7 @@ files:
 - routes.rb
 - test/controller.rb
 - test/functional.rb
+- test/functional/controller.rb
 - test/functional/generator.rb
 - test/functional/global.rb
 - test/functional/router.rb