nephos-server 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1203bd481ae96bab872a8b513b5ca43e4deb905c
-  data.tar.gz: 34e8f81c66ba25156a0c060a2eb72ea0ce6de8e6
+  metadata.gz: a8b7fa251ffb5faae0d07c460068da7b1462c69f
+  data.tar.gz: 7ef60b41475e3763ac0b9cfc6c177d0556099ec7
 SHA512:
-  metadata.gz: b29c622c41367e8988b7c39ac92957d097597f0a02d1d82194333a0ef73e3dabf60cc3b3a016fcbb89aaf66e7f1c6577dd5cbe0cd088db7fe649d9be184b55cf
-  data.tar.gz: 60652986c5c4f8227298e1e48531318f0b648415fd247ff7cc8523b364785ec0780ea5c5d93863617144d7770ffb44f041671f4593cd78b1318aaf63f95808e4
+  metadata.gz: ab7e88e906675e7f39d5f736cf554719caaaf97eb5f6269b098b6371ac7f0fcdb3d7f9d8e7473325e8d412aa980b9c229e5dc3412c3ff9b5fe1f150274083020
+  data.tar.gz: e7002eca788be88b22dd135506afad8cc14b76775c33e323ea170c1d33c0d6305a9f5de1a0731afeb82ae7393afb3bc333073bebf421d7666b887ab1f510001e

data/README.md

@@ -41,7 +41,11 @@ The basic code of a controller can be generated via ``nephos-generator controlle
 ```ruby
 class Example < Nephos::Controller
   def root
-    return {plain: "index"}
+    if params["index"] == "true"
+      return {plain: "index"}
+    else
+	  return :empty
+	end
   end
 end
 ```

data/lib/nephos-server.rb

@@ -7,4 +7,6 @@ require 'rack'
 require 'colorize'
 
 require_relative 'nephos-server/basic_errors'
+require_relative 'nephos-server/params'
+require_relative 'nephos-server/controller'
 require_relative 'nephos-server/server/main'

data/lib/nephos-server/basic_errors.rb

@@ -7,3 +7,6 @@ class InvalidRouteMethod < InvalidRoute; end
 class InvalidApplication < RuntimeError; end
 class InvalidGit < InvalidApplication; end
 class NoGitBinary < InvalidGit; end
+
+class ParsingError < StandardError; end
+class MissingKey < ParsingError; end

data/lib/nephos-server/controller.rb

@@ -0,0 +1,29 @@
+module Nephos
+  class Controller
+
+    attr_reader :env, :infos, :callpath
+
+    # @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: []}
+      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 Callpath. :params must be associated with an Array" unless callpath[:params].is_a? Array
+      @env= env
+      @infos= parsed
+      @callpath= callpath
+      @params= parsed[:args]
+      @params.merge! Params.new(Hash[callpath[:params].zip @infos[:path]])
+      @params.select!{|k,v|k}
+    end
+
+    def arguments
+      @params
+    end
+    alias :params :arguments
+
+  end
+end

data/lib/nephos-server/params.rb

@@ -0,0 +1,25 @@
+# coding: utf-8
+
+module Nephos
+  class Params
+
+    def initialize(hash={})
+      raise ArgumentError, "the first argument must be a Hash" unless hash.is_a? Hash
+      @hash = Hash[hash.map{|k,v| [k.to_s, v]}]
+    end
+
+    def method_missing m, *a
+      @hash.send(m, *(a.map(&:to_s)))
+      @hash.send(m, *a)
+    end
+
+    def [] i
+      @hash[i.to_s]
+    end
+
+    def []= i, v
+      @hash[i.to_s] = v.to_s
+    end
+
+  end
+end

data/lib/nephos-server/routing/execute.rb

@@ -1,5 +1,3 @@
-require_relative 'controller'
-
 Dir[File.expand_path "controllers/*.rb"].each do |f|
   load(f) and puts "#{f} loaded"
 end

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

@@ -27,7 +27,7 @@ module Nephos
     def self.check_controller! what
       begin
         controller = Module.const_get(what[:controller])
-      rescue
+      rescue => err
         raise InvalidRouteController, "Controller \"#{what[:controller]}\" doesn't exists"
       end
       if not controller.ancestors.include? Nephos::Controller
@@ -35,7 +35,7 @@ module Nephos
       end
       begin
         instance = controller.new
-      rescue
+      rescue => err
         raise InvalidRouteController, "Cannot initialize controller"
       end
       return instance

data/nephos-server.gemspec

@@ -11,11 +11,12 @@ Gem::Specification.new do |s|
   s.files       = %w(
 lib/nephos-server.rb
 lib/nephos-server/basic_errors.rb
+lib/nephos-server/params.rb
+lib/nephos-server/controller.rb
 lib/nephos-server/server/main.rb
 lib/nephos-server/server/responder.rb
 lib/nephos-server/routing/execute.rb
 lib/nephos-server/routing/load.rb
-lib/nephos-server/routing/controller.rb
 README.md
 Rakefile
 Procfile
@@ -26,6 +27,8 @@ version
 test/test.rb
 test/responder.rb
 test/routing.rb
+test/params.rb
+test/controller.rb
 routes.rb
 controllers/dataset.rb
 controllers/image.jpg

data/test/controller.rb

@@ -0,0 +1,9 @@
+class TestNephosServerController < Test::Unit::TestCase
+
+  def test_initialize
+    assert Nephos::Controller.new()
+    assert Nephos::Controller.new(env={}, {path: [], args: {}}, {params: []})
+    assert_raise do Nephos::Controller.new({}, {}, {}) end
+  end
+
+end

data/test/params.rb

@@ -0,0 +1,14 @@
+class TestNephosServerParams < Test::Unit::TestCase
+
+  def test_basic
+    p = Nephos::Params.new
+    assert p.empty?
+    p[:a] = "1"
+    assert_equal p[:a], "1"
+    assert_equal p["a"], "1"
+    p["a"] = "2"
+    assert_equal p[:a], "2"
+    assert_equal p["a"], "2"
+  end
+
+end

data/test/responder.rb

@@ -1,4 +1,3 @@
-
 class TestNephosServerResponder < Test::Unit::TestCase
 
   def test_content_type

data/test/test.rb

@@ -6,3 +6,5 @@ end
 
 require_relative 'responder'
 require_relative 'routing'
+require_relative 'controller'
+require_relative 'params'

data/version

@@ -1 +1 @@
-0.2.2
+0.2.3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nephos-server
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - poulet_a
@@ -58,11 +58,12 @@ email:
 - poulet_a@epitech.eu
 - - lib/nephos-server.rb
   - lib/nephos-server/basic_errors.rb
+  - lib/nephos-server/params.rb
+  - lib/nephos-server/controller.rb
   - lib/nephos-server/server/main.rb
   - lib/nephos-server/server/responder.rb
   - lib/nephos-server/routing/execute.rb
   - lib/nephos-server/routing/load.rb
-  - lib/nephos-server/routing/controller.rb
   - README.md
   - Rakefile
   - Procfile
@@ -73,6 +74,8 @@ email:
   - test/test.rb
   - test/responder.rb
   - test/routing.rb
+  - test/params.rb
+  - test/controller.rb
   - routes.rb
   - controllers/dataset.rb
   - controllers/image.jpg
@@ -97,13 +100,16 @@ files:
 - controllers/main.rb
 - lib/nephos-server.rb
 - lib/nephos-server/basic_errors.rb
-- lib/nephos-server/routing/controller.rb
+- lib/nephos-server/controller.rb
+- lib/nephos-server/params.rb
 - lib/nephos-server/routing/execute.rb
 - lib/nephos-server/routing/load.rb
 - lib/nephos-server/server/main.rb
 - lib/nephos-server/server/responder.rb
 - nephos-server.gemspec
 - routes.rb
+- test/controller.rb
+- test/params.rb
 - test/responder.rb
 - test/routing.rb
 - test/test.rb

data/lib/nephos-server/routing/controller.rb

@@ -1,23 +0,0 @@
-module Nephos
-  class Controller
-
-    attr_reader :env, :infos, :callpath
-
-    # @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: []}
-      @env= env
-      @infos= parsed
-      @callpath= callpath
-      @params= parsed[:args]
-      @params.merge! Hash[callpath[:params].zip @infos[:path]]
-      @params.select!{|k,v|k}
-    end
-
-    def arguments
-      @params
-    end
-    alias :params :arguments
-
-  end
-end