nephos-server 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c19caddb625aa364f4db457946e82f11c9677cad
-  data.tar.gz: cfbda59dc9b76f3127738802b8fa5e32c7195daa
+  metadata.gz: 6c35f4d2f0547725d90cc6f979151bc978d41670
+  data.tar.gz: c65b023117aa32ab0ce732b9c0073f315b50ce5c
 SHA512:
-  metadata.gz: 976ab4a4c50704d349a41c47bc2d62f8d2ce8c358ad27ad6812dc122d3cbe09cbd375d22725a6002f524f616a9557e3484b54a69655ec747df4fd57858a9972c
-  data.tar.gz: 976677fcea7eee326490ef4811b6087e8d7403fed10952566370c29703dc8fc616c4abf0d73f65cd84151845e79efe4d12e68f15c3eda3bc4152120e3a4839b3
+  metadata.gz: 63d465d46581d22542a6dbfd4a7d7caf159080ef7e1d5d0a2e732bb774c86d1b9b2f53ce27140054a10301061c04d89a92cf41f41603cb86aa4ab470008b5033
+  data.tar.gz: 146add81a36a974479ab84d57be331c8e48e2e1137c84cdd1c860a66c1d727b166649a582d316b0b57cd4f31086b2a76ac0f5adc4bd9a794b44d5f9b0fd4c3ed

data/CHANGELOG

@@ -1,3 +1,6 @@
+v0.4.7
+	* fix parameters
+
 v0.4.7
 	* improve controller generator (names)
 	* add puma to change the default web server

data/lib/nephos-server/controller.rb

@@ -5,17 +5,17 @@ module Nephos
 
     # @param env [Hash] env extracted from the http request
     # @param parsed [Hash] pre-parsed env with parameters, ...
-    def initialize env={}, parsed={path: [], args: {}}, callpath={params: []}
+    def initialize env={}, parsed={path: [], params: {}}, callpath={params: []}
       raise ArgumentError, "env must be a Hash" unless env.is_a? Hash
       raise ArgumentError, "parsed must be a Hash" unless parsed.is_a? Hash
       raise ArgumentError, "callpath must be a Hash" unless callpath.is_a? Hash
       raise ArgumentError, "Invalid Parsed. :path must be associated with an Array" unless parsed[:path].is_a? Array
-      raise ArgumentError, "Invalid Parsed. :args must be associated with a Hash" unless parsed[:args].is_a? Hash
+      raise ArgumentError, "Invalid Parsed. :params must be associated with a Hash" unless parsed[:params].is_a? Hash
       raise ArgumentError, "Invalid Callpath. :params must be associated with an Array" unless callpath[:params].is_a? Array
       @env= env
       @infos= parsed
       @callpath= callpath
-      @params= parsed[:args]
+      @params= parsed[:params]
       @params.merge! Hash[callpath[:params].zip @infos[:path]]
       @params.select!{|k,v| not k.to_s.empty?}
       @params = Params.new(@params)

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

@@ -25,8 +25,9 @@ module Nephos
       verb = env["REQUEST_METHOD"]
       from = env["REMOTE_ADDR"]
       path = route.path.split("/").select{|e|not e.to_s.empty?}
-      args = Hash[route.query.to_s.split("&").map{|e| e.split("=")}]
-      return {route: route, verb: verb, from: from, path: path, args: args}
+      params = Rack::Request.new(env).params
+      # Hash[route.query.to_s.split("&").map{|e| e.split("=")}]
+      return {route: route, verb: verb, from: from, path: path, params: params}
     end
 
     def self.error(code, err=nil)

data/test/controller.rb

@@ -2,22 +2,22 @@ class TestNephosServerController < Test::Unit::TestCase
 
   def test_initialize_success
     assert Nephos::Controller.new()
-    assert Nephos::Controller.new(env={}, {path: [], args: {}}, {params: []})
+    assert Nephos::Controller.new(env={}, {path: [], params: {}}, {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
+    assert_raise do Nephos::Controller.new({}, {path: [], params: {}}, {}) end
+    assert_raise do Nephos::Controller.new({}, {path: [], params: {}}, {params: nil}) end
+    assert_raise do Nephos::Controller.new({}, {path: nil, params: nil}, params: nil) end
+    assert_raise do Nephos::Controller.new({}, {path: nil, params: {}}, {params: {}}) end
+    assert_raise do Nephos::Controller.new({}, {path: [], params: nil}, {params: {}}) end
   end
 
   def test_controller_params
-    c = Nephos::Controller.new(env={}, {path: ["value"], args: {}}, {params: ["param"]})
+    c = Nephos::Controller.new(env={}, {path: ["value"], params: {}}, {params: ["param"]})
     assert_equal "value", c.params[:param]
     assert_equal "value", c.params["param"]
   end

data/version

@@ -1 +1 @@
-0.4.7
+0.4.8

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nephos-server
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - poulet_a
@@ -162,6 +162,5 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: "* improve controller generator (names) * add puma to change the default
-  web server * add environments"
+summary: "* fix parameters"
 test_files: []