nekonote-framework 1.0.0.pre.beta → 1.0.0.pre.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5de2cc68d527ef357666746ae5cc4423a2c2a0a3
-  data.tar.gz: 68348bd3c64514ea3738588c5678158fb07fe42f
+SHA256:
+  metadata.gz: 0a343528a091a4bfe3b21f2594fbc199f2953b4a9bc563a5b25bc426b06177e4
+  data.tar.gz: 453e2a25ed4ebbf0283f73b5b6d7b3bca39eb27e07b5a3ae3074cf9d265d9840
 SHA512:
-  metadata.gz: af4a645150d95e69f18663b56b31d0cb28c54187d1e286df35e9d89254e7295b40eb681b9fcc42dcbe34527be5912cff3c64aef9cf1b926ed2a8a8540de228c6
-  data.tar.gz: 441702f028749ca8df4b0d0770c66cde538f17ff52882d7803e61e23725e1d193cfcd1e67858a45edc4f3e560195c6518cf057b90c292121c9a88618833d4d3d
+  metadata.gz: 1380fd33c592621e1168d17a429014a7a235df3f9182942d7d543ab6a0fad95f4d6f1a5500312fc33bab6c23335054eeca00fff80c29b6d3ac8c25d75b6c099a
+  data.tar.gz: 61de9d860e68b232e3969c6504bb770ab8ada5df13814f8b289103664a0ed3f50085c2b0f82302a11c357fa70850a632db73869aad532b98b71541d1745fdb03

data/README.md

@@ -44,6 +44,10 @@ Liquid is a well-known powerful template engine. Templates are rendered by Liqui
 
 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:
+
+        $ gem install nekonote-framework --pre
+
 ## License
 
 Nekonote Framework is friendly license and is released under the [MIT License](https://opensource.org/licenses/MIT).

data/data/structure/config.ru

@@ -1,10 +1,15 @@
 # This is a configuration file about Rack which created automatically.
 # You must NOT delete this file.
 
-# for starting web server withouht 'nekonote server'
+# for starting web server without 'nekonote server'
 if !defined? Nekonote
-    require 'bundler/setup'
-    require 'nekonote'
+    begin
+        require 'nekonote'
+    rescue LoadError
+        # installed via bundler? change LOAD_PATH to bundler's
+        require 'bundler/setup'
+        require 'nekonote'
+    end
 end
 
 # set-up your application

data/data/structure/handler/error.rb

@@ -2,7 +2,7 @@ class ErrorHandler < BaseHandler
     def missing_route
         @subject = 'Invalid URL'
         @msg     = 'The URL does not match any route'
-        @detail  = %('#{Nekonote::Env.get :REQUEST_URI}' does not match any route.)
+        @detail  = %('#{Nekonote::Env.get :REQUEST_URI}' is not valid URL.)
     end
 
     def wrong_http_method

data/data/structure/preference/development/server/puma.rb

@@ -10,7 +10,7 @@ _app_root = 'REPLACE_ME_TO_APP_ROOT'
 _host = '0.0.0.0'
 
 # listen port
-_port = '2002'
+_port = 2002
 
 # the directory to oparate out of
 directory _app_root
@@ -34,7 +34,7 @@ threads 0, 16
 environment 'none'
 
 # true to server is daemonize
-daemonize true
+daemonize false
 
 # PID and state for puma web server
 pidfile "#{_app_root}/tmp/pids/puma.pid"

data/lib/nekonote.rb

@@ -1,9 +1,5 @@
 begin
     require_relative 'loader'
 rescue StandardError, ScriptError => e
-    begin
-        Nekonote::Error.abort e
-    rescue
-        raise e
-    end
+    Nekonote::Error.abort e
 end

data/lib/nekonote/cli.rb

@@ -369,7 +369,7 @@ EOS
             # generate files and directories
             cp_from  = @path_structure + '/'
             files = ['Gemfile', 'config.ru']
-            dirs  = ['handler', 'lib', 'preference', 'public', 'static', 'tmp']
+            dirs  = ['handler', 'lib', 'preference', 'public', 'template', 'tmp']
             free_dirs_to_make = ['cache', 'log']
 
             # copy files

data/lib/nekonote/exception/error.rb

@@ -3,18 +3,18 @@ module Nekonote
     class Error < StandardError
         SPACE = '    '
         MSG_MISSING_ENV          = %(Environment variable NEKONOTE_ENV is empty or invalid environment name is set.)
-        MSG_MISSING_ROOT         = %(Missing root directory to the application structure.)
-        MSG_NOT_DEFINED_ROOT     = %(Application root is not defined yet.)
+        MSG_MISSING_ROOT         = %(Not found a root directory to the application structure.)
+        MSG_NOT_DEFINED_ROOT     = %(Application root has not set yet.)
         MSG_MISSING_FILE         = %(No such file '%s' or can't read it.)
         MSG_MISSING_DIR          = %(No such directory '%s' or can't read it.)
-        MSG_MISSING_RACKUP       = %(Missing config.ru under '%s' or can't read it.)
+        MSG_MISSING_RACKUP       = %(No found config.ru under '%s' or can't read it.)
         MSG_LACK_FIELD_IN_YAML   = %(Lack of the required field '%s'. Please check if '%s' is set properly.)
         MSG_EMPTY_YAML           = %('%s' is empty. You must configure something.)
         MSG_WRONG_ROOT           = %(You'd better run the command at the application root, or --root option will solve the problem.)
-        MSG_WRONG_TYPE           = %(You gave %s but the expected type is '%s'.)
+        MSG_WRONG_TYPE           = %([%s] is invalid type. It must be passed [%s].)
         MSG_MISSING_FIELD        = %(The required field '%s' was not found in '%s'.)
         MSG_INVALID_FIELD        = %(Invalid format field '%s' in '%s'.)
-        MSG_MISSING_CONST        = %(Missing such class or module or contant -> '%s'.)
+        MSG_MISSING_CONST        = %(Not found such class or module or contant -> '%s'.)
         MSG_EMPTY_FILE_NOT_EMPTY = %('%s' is not empty. Failed to create an empty file.)
 
         # write message as warning to log file if logging is enabled

data/lib/nekonote/exception/preference_error.rb

@@ -4,8 +4,8 @@ module Nekonote
         MSG_WRONG_YAML_SYNTAX    = %(The yaml file '%s' is invalid syntax.)
         MSG_MISSING_INCLUDE      = %(No such field '%s' in %s.)
         MSG_INVALID_HANDLER_NAME = %(Handler class name '%s' is invalid.)
-        MSG_NO_SUCH_HANDLER      = %(No such handler class '%s'. You must make it at first.)
         MSG_DUPLICATE_PATH       = %(There is the duplicate path in %s. Values of 'path' directive are supposed to be uniq.)
         MSG_EVAL_MIDDLEWARES     = %(Unable to evaluate '%s' because there's something wrong.)
+        MSG_FAILED_INI_HANDLER   = %(Failed to make a %s class object.)
     end
 end

data/lib/nekonote/handler/protected_methods.rb

@@ -94,6 +94,23 @@ module Nekonote
                 return Nekonote::Env.keys
             end
 
+            # @param string path
+            protected
+            def __set_template(path)
+                @view.set_template path
+            end
+
+            # @param string path
+            protected
+            def __set_layout(path)
+                @view.set_layout path
+            end
+
+            # @return string
+            protected
+            def __root
+                return Nekonote::Env.root
+            end
 
             # @param string dest
             # @param int code

data/lib/nekonote/puma.rb

@@ -59,7 +59,7 @@ module Nekonote
                 case cmd
                 when :start
                     if pid != nil
-                        puts %(Already started with pid #{pid})
+                        puts %(Already started -> pid #{pid})
                         nothing_to_do = true
                     end
 
@@ -67,7 +67,7 @@ module Nekonote
                     if pid == nil
                         puts %(Server is stopped)
                     else
-                        puts %(Server is running with pid #{pid})
+                        puts %(Server is running -> pid #{pid})
                     end
                     nothing_to_do = true
 

data/lib/nekonote/rackup.rb

@@ -301,7 +301,7 @@ EOS
                     begin
                         routes[info[Preference::FIELD_ROUTE_PATH].strip] = Object.const_get(handler).new(info)
                     rescue NameError
-                        raise PreferenceError, PreferenceError::MSG_NO_SUCH_HANDLER% info[Preference::FIELD_ROUTE_HANDLER]
+                        raise PreferenceError, PreferenceError::MSG_FAILED_INI_HANDLER% info[Preference::FIELD_ROUTE_HANDLER]
                     end
 
                     paths << path

data/lib/nekonote/spec.rb

@@ -1,6 +1,6 @@
 module Nekonote
     LIBS_NAME   = %(nekonote-framework).freeze
-    VERSION     = %(1.0.0-beta).freeze
+    VERSION     = %(1.0.0-beta2).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
@@ -9,9 +9,9 @@ module Nekonote
 .*･゜ﾟ･*:.｡..｡.:･Thanks installing Nekonote Framework .*･゜ﾟ･*:.｡..｡.:*･
 
        ^___^
-      (=^x^=) < meow meow
-      /    )                   !
- . ~~(  h h  . .   .     .  . . =(**=)~~
+      (=^x^=) < meow
+   ~  /    )                   !
+ .  \(  h h  . .   .     .  . . =(**=)~~
 
 Note:
   Installing dependent libraries is not completed yet.

data/lib/nekonote/view.rb

@@ -6,8 +6,8 @@ module Nekonote
     class View
         NO_USING_NAME       = 'none'
         DEFAULT_LAYOUT_NAME = 'default'
-        PATH_TO_TEMPLATE    = 'static/template'
-        PATH_TO_LAYOUT      = 'static/layout'
+        PATH_TO_TEMPLATE    = 'template'
+        PATH_TO_LAYOUT      = 'template/layout'
 
         # accessor
         attr_accessor :is_redirect
@@ -49,33 +49,9 @@ module Nekonote
                 @is_error_route = false
             end
 
-            # set template
-            if @info_template.is_a? String
-                # use template described in route.yml
-                @template_path = Nekonote.get_root_path + PATH_TO_TEMPLATE + '/' + @info_template + '.tpl'
-            elsif @info_template == nil
-                # set default if no template is specified
-                @template_path = get_default_template_path handler_name
-            else
-                # no template with response
-                @template_path = nil
-            end
-
-            # set layout
-            if @info_layout.is_a? String
-                # use layout described in route.yml
-                @layout_path = Nekonote.get_root_path + PATH_TO_LAYOUT + '/' + @info_layout + '.tpl'
-            elsif @info_layout == nil
-                # if no layout is specified, try to use default layout
-                @layout_path = Nekonote.get_root_path + PATH_TO_LAYOUT + '/' + DEFAULT_LAYOUT_NAME + '.tpl'
-                if !Util::Filer.available_file? @layout_path
-                    # but if it's not available, no layout with response
-                    @layout_path = nil
-                end
-            else
-                # no layout with response
-                @layout_path = nil
-            end
+            # initialize template and layout
+            init_template handler_name
+            init_layout
 
             # assign extra fields into templates
             assign_custom_fields info
@@ -263,6 +239,22 @@ module Nekonote
             end
         end
 
+        # Need reload after method was called and commented out it because view object will alive
+        # @param string path relative path from app root to template file
+        public
+        def set_template(path)
+            @info_template = path
+            init_template
+        end
+
+        # Need reload after method was called and commented out it because view object will alive
+        # @param string path relative path from app root to layout file
+        public
+        def set_layout(path)
+            @info_layout = path
+            init_layout
+        end
+
         # @param hash info
         private
         def register_info_properies(info)
@@ -283,6 +275,54 @@ module Nekonote
             @is_redirect = false
         end
 
+        # initialize conf about template by @info_template
+        # @param string|nil handler_name
+        private
+        def init_template(handler_name = nil)
+            if @info_template.is_a? String
+                # check exists later
+                @template_path = get_template_path @info_template
+            elsif @info_template == nil && handler_name.is_a?(String)
+                # try to set a default template
+                @template_path = get_default_template_path handler_name
+            else
+                # no use template
+                @template_path = nil
+            end
+        end
+
+        # initialize conf about layout by @info_layout
+        private
+        def init_layout
+            if @info_layout.is_a? String
+                # check exists later
+                @layout_path = get_layout_path @info_layout
+            elsif @info_layout == nil
+                # try to set a default layout
+                @layout_path = get_layout_path DEFAULT_LAYOUT_NAME
+                if !Util::Filer.available_file? @layout_path
+                    @layout_path = nil
+                end
+            else
+                # no use layout
+                @layout_path = nil
+            end
+        end
+
+        # @param string template relative path to template file
+        # @return string absolute path
+        private
+        def get_template_path(template)
+            return Nekonote.get_root_path + PATH_TO_TEMPLATE + '/' + template + '.tpl'
+        end
+
+        # @param string layout relative path to layout file
+        # @return string absolute path
+        private
+        def get_layout_path(layout)
+            return Nekonote.get_root_path + PATH_TO_LAYOUT + '/' + layout + '.tpl'
+        end
+
         # Returns template path for the default when it was found and available
         # @param string|nil
         private
@@ -296,10 +336,13 @@ module Nekonote
                 template = nil
             end
 
-            # invalid template
+            # return nil if invalid template name
             return nil if (template.nil? || template == '')
 
-            template_path = Nekonote.get_root_path + PATH_TO_TEMPLATE + '/' + template + '.tpl'
+            # get absolute path
+            template_path = get_template_path template
+
+            # set if available
             if Util::Filer.available_file? template_path
                 template_path = template_path
             else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nekonote-framework
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta
+  version: 1.0.0.pre.beta2
 platform: ruby
 authors:
 - khotta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-14 00:00:00.000000000 Z
+date: 2018-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: color_echo
@@ -66,11 +66,11 @@ files:
 - data/structure/public/img/.gitkeep
 - data/structure/public/img/logo.png
 - data/structure/public/js/.gitkeep
-- data/structure/static/layout/default.tpl
-- data/structure/static/layout/error.tpl
-- data/structure/static/sass/welcome.scss
-- data/structure/static/template/error.tpl
-- data/structure/static/template/welcome/index.tpl
+- data/structure/public/sass/welcome.scss
+- data/structure/template/error.tpl
+- data/structure/template/layout/default.tpl
+- data/structure/template/layout/error.tpl
+- data/structure/template/welcome/index.tpl
 - data/structure/tmp/pids/.gitkeep
 - lib/loader.rb
 - lib/nekonote.rb
@@ -113,9 +113,9 @@ post_install_message: |2+
   .*･゜ﾟ･*:.｡..｡.:･Thanks installing Nekonote Framework .*･゜ﾟ･*:.｡..｡.:*･
 
          ^___^
-        (=^x^=) < meow meow
-        /    )                   !
-   . ~~(  h h  . .   .     .  . . =(**=)~~
+        (=^x^=) < meow
+     ~  /    )                   !
+   .  (  h h  . .   .     .  . . =(**=)~~
 
   Note:
     Installing dependent libraries is not completed yet.
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Simple and Lightweight Ruby Framework for Web Development