nekonote-framework 1.0.0.pre.beta7 → 1.0.0.pre.beta8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5f37d86fafd6edc28102e4ad2b6ddbc2e7451d5bdaae8fddaf98d8e0014e23f
-  data.tar.gz: 51adff55ec9e987b9bcbd4422215fe7c1af36360610b4d6f00fe22b333b0311f
+  metadata.gz: c90694ebb2f95129d0cc03e078cf4be8584d1357cd1db9877105f7c93228d8e0
+  data.tar.gz: d782253bf9b884629c34f08467c31398cf4194aa5d2bc066c59ec3443b37b7e6
 SHA512:
-  metadata.gz: 933b166ee71a739536a3a10ea44a9bc600744b450d2bda6408a76da83949244b98a2e276fdb734941aacc1160d57de2108704f91e87a208a717aef8570007a0c
-  data.tar.gz: 207c81d0d37ca4dd7a2ad51ef11a2488b17ba30f9f034524a4f7d50935826f35a90c473f9ed7ec7432a2e0c48b7bcccebbd7ee5044d647c726f45fd0c6c176b9
+  metadata.gz: 8074f388ff578cd78239da26a6e8f7116927c33c375064152c26208fe7624ede71bc6dfef211774484cf871271d46b517b52a29376f0fd0abe4aa216eac8df12
+  data.tar.gz: bffa8feaa2d47e409bb4cfa9660ce26451d231ed21129af8bc03694ca41c8deab23322467164d5ded801a059e3d78287145173fc8cc779a04a0a969948d458c7

data/README.md

@@ -43,7 +43,7 @@ The templating engine on Nekonote Framework is Liquid.
 
 Please see [Getting Started](https://nekonote-framework.github.io/document/1.0.0-beta/getting-started.html) on the reference manual.
 
-You need to use `--pre` option when install pre-beta version like:
+You need to use `--pre` option when installing pre-beta version.
 
         $ gem install nekonote-framework --pre
 

data/data/structure/preference/development/route.yml

@@ -2,29 +2,20 @@
 #
 # e.g.
 # FooHandler:
-#    path: /foo                                                    # This is required. The following directives are optional.
-#    execute: foo                                                  # It says FooHandler#foo method is called when route matches.
-#    method: GET, POST                                             # It says GET or POST requests are accepted.
-#    params: foo=int, bar=string, baz=array, qux=float, quux=bool  # The listed parameters are accepted and are coverted to its expected types.
-#    content: json                                                 # It says Content-Type: application/json is set to response.
-#    template: foo                                                 # static/template/foo.tpl is rendered.
-#    layout: common                                                # static/layout/common.tpl is rendered
-#    # page_cache_time: 3600                                       # if you need page caching this route, need to comment out it.
-#    custom: some value                                            # unknown fields are not directive. It will be assigned into your templates.
+#    path: /foo               # This directive is required. The following directives are optional.
+#    execute: foo             # It says FooHandler#foo will be called.
+#    method: POST             # It says requests only with POST method are accepted.
+#    content: json            # It says Content-Type: application/json will be set to response.
+#    template: foo            # template/foo.tpl will be used.
+#    layout: common           # template/layout/common.tpl will be used
+#    page_cache_time: 3600    # Setting an integer in seconds to turning on page caching.
+#    include: common          # Includes a group of the directives from route_include.yml.
+#    custom: some value       # Unknown directives are custom fields and are assigned into your templates.
 
-# ----------------------
-# routing options
-# ----------------------
-preference:
-    path_as_regexp: false
-    allow_dup_slash: false
-
-# ----------------------
-# Routes
-# ----------------------
 WelcomeHandler:
     path: /
     execute: index
     template: welcome/index
+    layout: default
     css: /css/welcome.css
     page-title: Welcome

data/data/structure/preference/development/route_error.yml

@@ -1,28 +1,32 @@
-# Routing for Error Pages
+# Error Routes
+#
+# It's possible to comment out the directives below then error routes does not be used.
 
 # This route is used when any route does not match a URL.
-# You must set “path_as_regexp” directive to “true” which in route.yml to use this route.
 missing_route:
     handler: ErrorHandler
     execute: missing_route
+    template: error
     layout: error
 
-# This route is used when some value is set to “method” directive in route.y
-#   and a request HTTP method is not declared in that value.
+# This route is used when a HTTP method in request does not much the value set in "method" directive in route.yml.
 wrong_http_method:
     handler: ErrorHandler
     execute: wrong_http_method
+    template: error
     layout: error
 
-# This route is used when a fatal error raised in program.
-# The exception object is set to a property called @error in a Handler you specified.
+# This route is used when a fatal error raised in your program.
+# The exception object will be set to the property named @error.
 fatal:
     handler: ErrorHandler
     execute: fatal
+    template: error
     layout: error
 
-# This route is used when a requested file dosen’t exist under the “public” directo
+# This route is used when a request file does not exist under the "public" directory.
 not_found:
     handler: ErrorHandler
     execute: not_found
-    layout: error
+    template: error
+    layout: error

data/data/structure/preference/development/route_include.yml

@@ -4,19 +4,18 @@
 # e.g.
 # common:
 #     method: GET
-#     params: id=int
 #     content: json
 #     template: false
 #     layoute: false
 #
-# In order to set the above preferences you must write 'include' directive like:
+# In order to set the above preferences you must write 'include' directive
 #
 # FooHandler:
 #     path: /foo
-#     method: foo
+#     execute: foo
 #     include: common 
 #
 # BarHandler:
 #     path: /bar
-#     method: bar
-#     include: common
+#     execute: bar
+#     include: common

data/data/structure/preference/development/setting/welcome.yml

@@ -5,3 +5,4 @@ url:
     github: https://github.com/khotta/Nekonote-Framework
     contribute: https://nekonote-framework.github.io/contribute
     license: https://github.com/khotta/Nekonote-Framework/blob/master/LICENSE
+    changelog: https://github.com/khotta/Nekonote-Framework/blob/master/CHANGELOG.md

data/data/structure/template/welcome/index.tpl

@@ -2,7 +2,7 @@
     <h3>Welcome to Nekonote Framework!</h3>
     <p class="description">{{description}}</p>
 
-    <h4>Information</h4>
+    <h4>Environments</h4>
     <ul>
         <li>The version is <em>{{version}}</em></li>
         <li>Current Environment: <em>{{env}}</em></li>
@@ -11,15 +11,16 @@
 
     <h4>Do you need help?</h4>
     <ul>
-        <li>Reference Manual <a href="{% setting_get url, document %}">{% setting_get url, document %}</a></li>
-        <li>Contribute <a href="{% setting_get url, contribute %}">{% setting_get url, contribute %}</a></li>
+        <li>Reference Manual <a target="_blank" href="{% setting_get url, document %}">{% setting_get url, document %}</a></li>
+        <li>Contribute <a target="_blank" href="{% setting_get url, contribute %}">{% setting_get url, contribute %}</a></li>
+        <li>Changelog <a target="_blank" href="{% setting_get url, changelog %}">{% setting_get url, changelog %}</a></li>
     </ul>
 
     <h4>Nekonote Framework is open-source software</h4>
     <ul>
-        <li>License <a href="{% setting_get url, license %}">{% setting_get url, license %}</a></li>
-        <li>GitHub <a href="{% setting_get url, github %}">{% setting_get url, github %}</a></li>
-        <li>Repository <a href="{% setting_get url, gem %}">{% setting_get url, gem %}</a></li>
+        <li>License <a target="_blank" href="{% setting_get url, license %}">{% setting_get url, license %}</a></li>
+        <li>GitHub <a target="_blank" href="{% setting_get url, github %}">{% setting_get url, github %}</a></li>
+        <li>Repository <a target="_blank" href="{% setting_get url, gem %}">{% setting_get url, gem %}</a></li>
     </ul>
 
     <div id="footer-logo"></div>

data/lib/nekonote/exception/handler_error.rb

@@ -1,5 +1,6 @@
 module Nekonote
     class HandlerError < Error
-        MSG_MISSING_ERR_HANDLER = 'No Handler in route_error.yml.';
+        MSG_NO_ERROR_ROUTE      = %('%s' is required to handle this error.);
+        MSG_MISSING_ERR_HANDLER = %(No Handler in route_error.yml.);
     end
 end

data/lib/nekonote/handler.rb

@@ -4,45 +4,10 @@ module Nekonote
         require Nekonote.get_lib_root_path + 'handler/protected_methods'
         include ProtectedMethods
 
-        # =============================================
         # Accessors
-        # =============================================
         attr_accessor :route_regexp,
                       :url_path_params_mapper
 
-        # =============================================
-        # Static method
-        # =============================================
-        # make error handler and execute it
-        # @param string field
-        # @param hash env
-        # @param nil e
-        # @return array
-        def self.call_error_handler(field, env = {}, e = nil)
-            pref = Preference.instance.get_route_error
-
-            # field is expected String and pref[field] is expected Hash
-            if !field.is_a?(String) || !pref[field].is_a?(Hash)
-                raise HandlerError, HandlerError::MSG_MISSING_FIELD%[field, Preference.instance.path_route_error_yml]
-            end
-
-            # make handler newly
-            handler_name = pref[field][Preference::FIELD_ROUTE_HANDLER]
-            if handler_name.is_a? String
-                begin
-                    handler_class = Object.const_get handler_name
-                    error_handler = handler_class.new pref[field].clone, field, e
-                rescue
-                    raise HandlerError, HandlerError::MSG_MISSING_CONST% handler_name
-                end
-            else
-                raise HandlerError, HandlerError::MSG_MISSING_ERR_HANDLER
-            end
-
-            return error_handler.call env
-        end
-
-
         # It would be called only one time
         # @param hash info route information
         # @param bool|nil error_field_name
@@ -63,32 +28,17 @@ module Nekonote
             @custom_fields = Preference.get_custom_fields info, error_field_name.is_a?(String)
         end
 
-        # reload preferences
-        private
-        def pref_reloader
-            path = Nekonote.get_root_path + Preference::FILE_NAME_FOR_RELOAD
-            if File.exist? path
-                # reload logger
-                Nekonote.init_logger
-
-                # reload setting
-                Setting.init
-
-                Util::Filer::safe_delete_empty_file path
-            end
-        end
-
         # This method would be called from rack and called in every request
         # @param hash env rack environment
         public
         def call(env)
             # reload preferences if needed
-            pref_reloader
+            reload_pref
 
             # get reponse data from page cache if it's available
             if @view.can_get_from_page_cache?(env['REQUEST_URI'])
                 response_data = @view.get_response_data_from_page_cache env['REQUEST_URI']
-                if response_data.size == 3
+                if response_data.size == 3 # response code, headers, body
                     # return the cache
                     return response_data
                 else
@@ -107,9 +57,9 @@ module Nekonote
             @session = Env.get 'rack.session'
 
             # set request
-            @request = Request.new env, @view.info_params
+            @request = Request.new env
 
-            # set request body to request object if it exists
+            # set request body from payload if it exists
             if env['rack.input'].is_a? StringIO
                 # reverting file pointer I don't know why the pointer moved just one...?
                 env['rack.input'].rewind
@@ -150,17 +100,6 @@ module Nekonote
             return View.get_default_error_response
         end
 
-        # @param StandardError|ScriptError e
-        # @throws StandardError|ScriptError
-        private
-        def process_exception_raised(e)
-            # logging if logger is enabled
-            Error.logging_error e
-
-            # raise the exception for ShowExceptions if it's enabled
-            raise e if Preference.instance.is_enabled_show_exceptions
-        end
-
         # It would be called by every request
         # @param hash env
         # @return array
@@ -188,28 +127,34 @@ module Nekonote
             return get_response_data
         end
 
-        # Check does requested path correspond with the given value to #map
-        # @return bool
-        private
-        def matched_route_strictly?(requested_path, expected_path)
-            match_data = @route_regexp.match requested_path
-            if match_data.is_a? MatchData
-                # set URL path parameters to Request object
-                if @url_path_params_mapper.is_a? Hash
-                    stack = requested_path.split('/')
-                    map   = {}
-                    @url_path_params_mapper.each_pair do |name, index|
-                        map[name] = stack[index] 
-                    end
-                    @request.assign_from_url map
-                end
+        # make error handler and execute it
+        # @param string field
+        # @param hash env
+        # @param nil e
+        # @return array
+        def self.call_error_handler(field, env = {}, e = nil)
+            pref = Preference.instance.get_route_error
 
-                return true
+            # check if there is a route for it?
+            if !pref.is_a?(Hash) || !pref[field].is_a?(Hash)
+                # no route for it
+                raise HandlerError, HandlerError::MSG_NO_ERROR_ROUTE% field
+            end
 
+            # make error handler
+            handler_name = pref[field][Preference::FIELD_ROUTE_HANDLER]
+            if handler_name.is_a? String
+                begin
+                    handler_class = Object.const_get handler_name
+                    error_handler = handler_class.new pref[field].clone, field, e
+                rescue
+                    raise HandlerError, HandlerError::MSG_MISSING_CONST% handler_name
+                end
             else
-                # doesn't match, the requested path is wrong
-                return false
+                raise HandlerError, HandlerError::MSG_MISSING_ERR_HANDLER
             end
+
+            return error_handler.call env
         end
 
         # Get response data and return values as rack needed
@@ -232,6 +177,66 @@ module Nekonote
             return @view.get_response_data
         end
 
+        # reload preferences
+        # only for logger.yml setting/**/*.yml
+        private
+        def reload_pref
+            path = Nekonote.get_root_path + Preference::FILE_NAME_FOR_RELOAD
+
+            if File.exist? path
+                # reload logger
+                Nekonote.init_logger
+
+                # reload setting
+                Setting.init
+
+                Util::Filer::safe_delete_empty_file path
+            end
+        end
+
+        # @param StandardError|ScriptError e
+        # @throws StandardError|ScriptError
+        private
+        def process_exception_raised(e)
+            # logging if logger is enabled
+            Error.logging_error e
+
+            # raise the exception for ShowExceptions if it's enabled
+            raise e if Preference.instance.is_enabled_show_exceptions
+        end
+
+        # Check does requested path correspond with the given value to #map
+        # @return bool
+        private
+        def matched_route_strictly?(requested_path, expected_path)
+            match_data = @route_regexp.match requested_path
+            if match_data.is_a? MatchData
+                # set URL path parameters to Request object
+                set_url_path_params requested_path
+                return true
+
+            else
+                # doesn't match, the requested path is wrong
+                return false
+            end
+        end
+
+        # set url path params to@request object
+        # @param string requested_path
+        private
+        def set_url_path_params(requested_path)
+            # if there is URL path parameters
+            if @url_path_params_mapper.is_a?(Hash) && @url_path_params_mapper.size > 0
+                stack = requested_path.split('/')
+                map   = {}
+                @url_path_params_mapper.each_pair do |name, index|
+                    map[name] = stack[index]
+                end
+
+                @request.assign_from_url map
+            end
+        end
+
         # @param string|symbol|nil task method name defined in 'klass'
         private
         def execute_handler_methods(task)
@@ -261,14 +266,19 @@ module Nekonote
         # @return false|nil|int
         private
         def is_allowed_http_method(method)
+            # invalid input to NG
             return false if !method.is_a? String
-            http_methods = @view.info_allow_methods
-            return true if http_methods == nil
-            http_methods = http_methods.split(',')
-            http_methods.map! do |val|
-                val.strip
-            end
-            return http_methods.index method
+
+            # expecting http method
+            allow_method = @view.info_allow_method
+
+            # no configuration to OK
+            return true if !allow_method.is_a? String
+
+            allow_method.strip!
+
+            # case-insensitive judge
+            return allow_method.casecmp(method) == 0
         end
     end
 end

data/lib/nekonote/preference.rb

@@ -8,14 +8,7 @@ module Nekonote
         # for route.yml
         FIELD_ROUTE_INCLUDE = 'include'
 
-        # routing options
-        FIELD_ROUTING_OPTIONS = 'preference'
-        FIELD_OPTION_ROUTE_REGEXP    = 'path_as_regexp'
-        FIELD_OPTION_ALLOW_DUP_SLASH = 'allow_dup_slash'
-
         # default values for routing options
-        DEFAULT_OPTION_ROUTE_REGEXP      = false
-        DEFAULT_OPTION_ALLOW_DUP_SLASH   = false
         DEFAULT_OPTION_TEMPLATE_FILE_EXT = 'tpl'
         DEFAULT_OPTION_LAYOUT_FILE_EXT   = 'tpl'
 
@@ -28,8 +21,7 @@ module Nekonote
         # for route.yml and route_error.yml
         FIELD_ROUTE_PATH            = 'path'
         FIELD_ROUTE_EXEC_METHOD     = 'execute'
-        FIELD_ROUTE_ALLOW_METHODS   = 'method'
-        FIELD_ROUTE_PARAMS          = 'params'
+        FIELD_ROUTE_ALLOW_METHOD    = 'method'
         FIELD_ROUTE_CONTENT_TYPE    = 'content'
         FIELD_ROUTE_TEMPLATE        = 'template'
         FIELD_ROUTE_LAYOUT          = 'layout'
@@ -40,8 +32,7 @@ module Nekonote
         FIELDS_IN_ROUTE = [
             FIELD_ROUTE_PATH,
             FIELD_ROUTE_EXEC_METHOD,
-            FIELD_ROUTE_ALLOW_METHODS,
-            FIELD_ROUTE_PARAMS,
+            FIELD_ROUTE_ALLOW_METHOD,
             FIELD_ROUTE_CONTENT_TYPE,
             FIELD_ROUTE_TEMPLATE,
             FIELD_ROUTE_LAYOUT,
@@ -129,11 +120,7 @@ module Nekonote
         # @return bool
         public
         def has_error_route?(field)
-            # not found route_error.yml just return false, error pages is not required
-            if @parsed_route_error_yml == nil
-                return false
-            end
-
+            # not found route_error.yml just return false
             # check if the field exists
             if !@parsed_route_error_yml.is_a?(Hash) || !@parsed_route_error_yml[field].is_a?(Hash)
                 return false
@@ -142,18 +129,6 @@ module Nekonote
             return @parsed_route_error_yml[field][FIELD_ROUTE_HANDLER].is_a?(String)
         end
 
-        # @return bool
-        public
-        def is_path_regexp?
-            return @is_path_regexp
-        end
-
-        # @return bool
-        public
-        def is_allow_dup_slash?
-            return @is_allow_dup_slash
-        end
-
         # @return string
         public
         def get_template_file_extension
@@ -180,42 +155,8 @@ module Nekonote
                 raise PreferenceError, PreferenceError::MSG_EMPTY_YAML% @path_route_yml
             end
 
-            # set route options
-            init_routing_options
-        end
-
-        # initialize routing options
-        public
-        def init_routing_options
-            @is_path_regexp          = nil
-            @is_allow_dup_slash      = nil
-            @template_file_extension = nil
-            @layout_file_extension   = nil
-
-            # read route.yml
-            pref = YamlAccess::get_parsed @path_route_yml
-
-            # not found but already it's checked though
-            return if !pref.is_a?(Hash)
-
-            routing_options = pref['preference']
-
-            # not found routing options to default
-            return if !routing_options.is_a?(Hash)
-
-            # set value to property
-            # true -> Nekonote::URLMapper, false -> :Rack::URLMap            
-            @is_path_regexp          = routing_options[FIELD_OPTION_ROUTE_REGEXP]    || DEFAULT_OPTION_ROUTE_REGEXP
-            @is_allow_dup_slash      = routing_options[FIELD_OPTION_ALLOW_DUP_SLASH] || DEFAULT_OPTION_ALLOW_DUP_SLASH
             @template_file_extension = DEFAULT_OPTION_TEMPLATE_FILE_EXT
             @layout_file_extension   = DEFAULT_OPTION_LAYOUT_FILE_EXT
-
-            # validation for file extension
-            if !@template_file_extension.is_a?(String) || @template_file_extension == ''
-                raise PreferenceError, Error::MSG_WRONG_TYPE% [FIELD_OPTION_TEMPLATE_EXT, 'String']
-            elsif !@layout_file_extension.is_a?(String) || @layout_file_extension == ''
-                raise PreferenceError, Error::MSG_WRONG_TYPE% [FIELD_OPTION_LAYOUT_EXT, 'String']
-            end
         end
 
         # @param array info information about route

data/lib/nekonote/rack/url_mapper.rb

@@ -20,79 +20,29 @@ module Nekonote
 
         # replace variable with wildcard
         url_path_params_mapper.each_key do |name|
-          pattern.sub! (':' + name), '.+'
+          pattern.sub! (':' + name), '\w+'
         end
-      end
-
-      return url_path_params_mapper, pattern
-    end
-
-    # @param string pattern
-    # @returns regexp, hash, string
-    def get_route_regexp(pattern)
-      # if home page
-      pattern = '/' if pattern == ''
-
-      # escape special meaning characters in regexp
-      pattern = Regexp.quote pattern
-
-      # parse path for url path parameters
-      url_path_params_mapper, pattern = parse_url_path_params pattern
-
-      pattern = %(^#{pattern}$)
 
-      # If duplocate slashes are allowed change regexp a little bit for it
-      if Preference.instance.is_allow_dup_slash?
-          pattern.gsub! '/', '/+'
+        # todo think in case of "path: /path/to/:something" -> It can match /path/to/foo/bar with {"something"=>"foo"}
       end
 
-      match = Regexp.new pattern, nil, 'n'
-
-      return match, url_path_params_mapper, pattern
+      return url_path_params_mapper, pattern
     end
 
-    # @param string pattern
+    # @param string path
     # @returns regexp, hash, string
-    def get_route_regexp_custom(pattern)
-      option = nil
-      code   = nil
-
+    def get_route_regexp_custom(path)
       # parse path for url path parameters
-      url_path_params_mapper, pattern = parse_url_path_params pattern
-
-      if pattern == ''
-        # home page
-        pattern = '/$'
-
-      elsif /\/[ixmn]+$/ =~ pattern
-        # there is regexp option
-        matched_str = $&.delete '/'
-        pattern     = pattern.sub /\/[ixmn]+$/, ''
-        option = 0
-        matched_str.each_char do |char|
-          case char
-          when 'i'
-            option = option | Regexp::IGNORECASE
-          when 'm'
-            option = option | Regexp::MULTILINE
-          when 'x'
-            option = option | Regexp::EXTENDED
-          when 'n'
-            code = 'n'
-          end
-        end
-      end
+      url_path_params_mapper, path = parse_url_path_params path
 
-      pattern = '^' + pattern
-
-      # If duplocate slashes are allowed change regexp a little bit for it
-      if Preference.instance.is_allow_dup_slash?
-          pattern.gsub! '/', '/+'
+      if path == ''
+        # home page, it doesn't matter '' or '/'
+        pattern = /^\/?$/
+      else
+        pattern = /^#{path}$/
       end
 
-      match = Regexp.new pattern, option, code
-
-      return match, url_path_params_mapper, pattern
+      return pattern, url_path_params_mapper
     end
     # =========================================================================
     # End adding source code
@@ -116,11 +66,8 @@ module Nekonote
         # Start adding source code for Nekonote Framework
         # =========================================================================
         # get regexp for matching URL
-        if Preference.instance.is_path_regexp?
-          match, url_path_params_mapper, location = get_route_regexp_custom location # path will be evaluated as regexp
-        else
-          match, url_path_params_mapper, location = get_route_regexp location
-        end
+        # path will be evaluated as regexp
+        match, url_path_params_mapper = get_route_regexp_custom location
 
         # set the values to Nekonote::Handler class
         app.route_regexp = match

data/lib/nekonote/rackup.rb

@@ -262,13 +262,8 @@ EOS
                         # include directive has been set in the route
                         if pref_common[info[Preference::FIELD_ROUTE_INCLUDE]].is_a? Hash
                             pref_common[info[Preference::FIELD_ROUTE_INCLUDE]].each_pair do |k, v|
-                                if info[k] == nil
-                                    info[k] = v
-                                else
-                                    # directive name is duplicate between route.yml and route_include.yml
-                                    # values in route.yml takes precedence over values in route_include.yml that without method or params
-                                    info[k] += ',' + v if k == Preference::FIELD_ROUTE_PARAMS || k == Preference::FIELD_ROUTE_ALLOW_METHODS
-                                end
+                                # duplicated then values in route.yml should take precedence
+                                info[k] = v
                             end
                             info.delete Preference::FIELD_ROUTE_INCLUDE
                         else

data/lib/nekonote/request.rb

@@ -1,11 +1,5 @@
 module Nekonote
     class Request
-        STRING  = 'string'
-        INTEGER = 'int'
-        ARRAY   = 'array'
-        FLOAT   = 'float'
-        BOOL    = 'bool'
-
         # accessor
         attr_reader :path,
                     :uri,
@@ -13,43 +7,36 @@ module Nekonote
                     :payload
 
         # @param hash env
-        # @param string|nil restricted
-        def initialize(env, restricted = nil)
+        def initialize(env)
             # set properties
             @path   = env['REQUEST_PATH']
             @uri    = env['REQUEST_URI']
             @method = env['REQUEST_METHOD']
-            @accepted_list = get_accepted_list restricted
 
             # query string
-            @query_string     = {}
-            @query_string_raw = {}
+            @query_string = {}
 
             # POST data
-            @post_data     = {}
-            @post_data_raw = {}
+            @post_data = {}
 
             # URL path parameters
-            @path_params     = {}
-            @path_params_raw = {}
+            @path_params = {} # this will be set from handler
 
             # request body
             @payload = nil
 
             # set query string
             if env['QUERY_STRING'].is_a? String
-                @query_string_raw = get_param_maps env['QUERY_STRING']
-                @query_string     = get_sanitized @query_string_raw
+                @query_string = get_param_maps env['QUERY_STRING']
             end
 
             # set POST data
             if env['rack.input'].is_a? StringIO
-                @post_data_raw = get_param_maps env['rack.input'].gets
-                @post_data     = get_sanitized @post_data_raw
+                @post_data = get_param_maps env['rack.input'].gets
             end
         end
 
-        # Returns sanitized query string
+        # Returns query string
         # @params string|symbol name
         # @return mixed
         public
@@ -57,15 +44,7 @@ module Nekonote
             return get_value name, @query_string
         end
 
-        # Returns raw query string
-        # @params string|symbol name
-        # @return mixed
-        public
-        def query_string_raw(name = nil)
-            return get_value name, @query_string_raw
-        end
-
-        # Returns sanitized POST data
+        # Returns POST data
         # @params string|symbol name
         # @return mixed
         public
@@ -73,15 +52,7 @@ module Nekonote
             return get_value name, @post_data
         end
 
-        # Returns raw POST data
-        # @params string|symbol name
-        # @return mixed
-        public
-        def post_data_raw(name = nil)
-            return get_value name, @post_data_raw
-        end
-
-        # Returns sanitized URL parameters
+        # Returns URL parameters
         # @params string|symbol name
         # @return mixed
         public
@@ -89,14 +60,6 @@ module Nekonote
             return get_value name, @path_params
         end
 
-        # Returns raw URL parameters
-        # @params string|symbol name
-        # @return mixed
-        public
-        def path_params_raw(name = nil)
-            return get_value name, @path_params_raw
-        end
-
         # Returns sanitized parameters
         # @params string|symbol name
         # @return mixed
@@ -113,22 +76,6 @@ module Nekonote
             return get_value name, maps
         end
 
-        # Returns raw parameters
-        # @params string|symbol name
-        # @return mixed
-        public
-        def params_raw(name = nil)
-            case @method
-            when 'GET'
-                maps = @query_string_raw
-            when 'POST'
-                maps = @post_data_raw
-            else
-                maps = {}
-            end
-            return get_value name, maps
-        end
-
         # Returns parsed payload as json format
         # @return hash|nil|false
         public
@@ -154,8 +101,7 @@ module Nekonote
             return nil if !map.is_a? Hash
 
             # set url params
-            @path_params_raw = map
-            @path_params     = get_sanitized @path_params_raw
+            @path_params = map
         end
 
         # @param mixed payload
@@ -193,27 +139,6 @@ module Nekonote
             end
         end
 
-        # Returns the accepable name list
-        # @param string|nil restricted
-        # @return array
-        private
-        def get_accepted_list(restricted)
-            accepted_list = []
-            if restricted.is_a? String
-                restricted.split(',').each do |data|
-                    data.strip!
-                    pair = data.split('=')
-                    if pair.size != 2
-                        raise Error, Error::MSG_INVALID_FIELD%['params', Preference.instance.path_route_yml]
-                    end
-                    # add field name and hash as Hash into array
-                    accepted_list << {pair[0] => pair[1]}
-                end
-            end
-
-            return accepted_list
-        end
-
         # @param string str query string
         # @return hash
         private
@@ -233,63 +158,5 @@ module Nekonote
 
             return maps
         end
-
-        # Removing waste parameter and converting to the exected type
-        # @param hash maps
-        # @param bool decode
-        # @return hash
-        private
-        def get_sanitized(maps, decode = false)
-            return maps if @accepted_list.size == 0
-
-            sanitized_maps = {}
-            @accepted_list.each do |field|
-                field.each_pair do |name, type|
-                    converted = get_expected type, maps[name]
-
-                    # URL decode if necessary
-                    if decode || converted.is_a?(String)
-                        converted = URI.decode_www_form_component converted
-                    end
-
-                    sanitized_maps[name] = converted
-                end
-            end
-
-            return sanitized_maps
-        end
-
-        # @param string type type expected
-        # @param mixed value real value
-        # @param string converted value by the expected type
-        private
-        def get_expected(type, value)
-            return nil if value == nil
-
-            v = nil
-            begin
-                case type
-                when INTEGER
-                    v = value.to_i
-                when STRING
-                    v = value.to_s
-                when ARRAY
-                    v = value.to_s.split(',')
-                    v.map! { |val| val.strip }
-                when FLOAT
-                    v = value.to_f
-                when BOOL
-                    if value == nil || value == false || value == 'false' || value == 0 || value == '0' || value == 'no' || value == ''
-                        v = false
-                    else
-                        v = true
-                    end
-                end
-            rescue
-                # value is nil if failed to convert value to expected type
-            end
-
-            return v
-        end
     end
 end

data/lib/nekonote/spec.rb

@@ -1,22 +1,17 @@
 module Nekonote
     LIBS_NAME   = %(nekonote-framework).freeze
-    VERSION     = %(1.0.0-beta7).freeze
+    VERSION     = %(1.0.0-beta8).freeze
     HOMEPAGE    = %(https://nekonote-framework.github.io).freeze
     SUMMARY     = %(Simple and Lightweight Ruby Framework for Web Development).freeze
     DESCRIPTION = %(Nekonote Framework is a small web application framework that helps your web development.).freeze
     INSTALL_MESSAGE = <<EOS
 
-.*･゜ﾟ･*:.｡..｡.:･Thanks installing Nekonote Framework .*･゜ﾟ･*:.｡..｡.:*･
+.*･゜ﾟ･*:.｡..｡.:･ Thank you for installing Nekonote Framework .*･゜ﾟ･*:.｡..｡.:*･
 
        ^___^
-      (=^x^=) < meow
-   ~  /    )                   !
- .  \(  h h  . .   .     .  . . =(**=)~~
-
-Note:
-  Installing dependent libraries is not completed yet.
-  After generating an application structure by 'nekonote new app some_app_name', you are supposed to get a Gemfile to install the dependencies.
-  Please install the dependent libraries from the Gemfile by Bundler.
+      (=^x^=) < meow meow                | |
+   ~  /    )                             | |
+ w  \(  h h  w w   w     w  w   =(**=)~~ | | w   w  .
 
 EOS
-end
+end

data/lib/nekonote/view.rb

@@ -13,8 +13,7 @@ module Nekonote
         attr_reader   :is_error_route,
                       :info_path,
                       :info_exec_method,
-                      :info_allow_methods,
-                      :info_params,
+                      :info_allow_method,
                       :info_content_type,
                       :info_template,
                       :info_layout,
@@ -259,8 +258,7 @@ module Nekonote
         def register_info_properies(info)
             @info_path            = info[Preference::FIELD_ROUTE_PATH]
             @info_exec_method     = info[Preference::FIELD_ROUTE_EXEC_METHOD]
-            @info_allow_methods   = info[Preference::FIELD_ROUTE_ALLOW_METHODS]
-            @info_params          = info[Preference::FIELD_ROUTE_PARAMS]
+            @info_allow_method    = info[Preference::FIELD_ROUTE_ALLOW_METHOD]
             @info_content_type    = info[Preference::FIELD_ROUTE_CONTENT_TYPE]
             @info_template        = info[Preference::FIELD_ROUTE_TEMPLATE]
             @info_layout          = info[Preference::FIELD_ROUTE_LAYOUT]

data/lib/nekonote/yaml_access.rb

@@ -35,7 +35,7 @@ module Nekonote
                 route_list = []
                 ast.root.children.each_with_index do |node, index|
                     cnt = index / 2
-                    if node.is_a?(Psych::Nodes::Scalar) && node.value != Preference::FIELD_ROUTING_OPTIONS
+                    if node.is_a?(Psych::Nodes::Scalar)
                         route_list[cnt] = {Preference::FIELD_ROUTE_HANDLER => node.value}
                     elsif node.is_a? Psych::Nodes::Mapping
                         if route_list[cnt].is_a? Hash

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nekonote-framework
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta7
+  version: 1.0.0.pre.beta8
 platform: ruby
 authors:
 - khotta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-20 00:00:00.000000000 Z
+date: 2018-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: color_echo
@@ -111,17 +111,12 @@ licenses:
 metadata: {}
 post_install_message: |2+
 
-  .*･゜ﾟ･*:.｡..｡.:･Thanks installing Nekonote Framework .*･゜ﾟ･*:.｡..｡.:*･
+  .*･゜ﾟ･*:.｡..｡.:･ Thank you for installing Nekonote Framework .*･゜ﾟ･*:.｡..｡.:*･
 
          ^___^
-        (=^x^=) < meow
-     ~  /    )                   !
-   .  (  h h  . .   .     .  . . =(**=)~~
-
-  Note:
-    Installing dependent libraries is not completed yet.
-    After generating an application structure by 'nekonote new app some_app_name', you are supposed to get a Gemfile to install the dependencies.
-    Please install the dependent libraries from the Gemfile by Bundler.
+        (=^x^=) < meow meow                | |
+     ~  /    )                             | |
+   w  (  h h  w w   w     w  w   =(**=)~~ | | w   w  .
 
 rdoc_options: []
 require_paths: