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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e8590189de70e359db4f9bfa8a491bbafc1becc543460ffef6f3424c4d5a355
-  data.tar.gz: 5c126bb0ea314fbd8393a76088f3b9abcc49b37f3db21780bba6c0998a8edf0e
+  metadata.gz: e5f37d86fafd6edc28102e4ad2b6ddbc2e7451d5bdaae8fddaf98d8e0014e23f
+  data.tar.gz: 51adff55ec9e987b9bcbd4422215fe7c1af36360610b4d6f00fe22b333b0311f
 SHA512:
-  metadata.gz: a6af6b480387f047aaf6b0b951bee0d2b71bb5f6abe2aa36d33bb7acbd7ba851bca52c6f49fe0b438e41222093de9721d56adb346b70c090f480457bf0681bc1
-  data.tar.gz: 8a14b10a3187236f5924c10c6c2c3dc2cfe5d8c3f774e5c8296f265d0124c5f821ed78e420ca0413e4750a7c72d3aa83ecaad97720e544bafbdafc5e9df095eb
+  metadata.gz: 933b166ee71a739536a3a10ea44a9bc600744b450d2bda6408a76da83949244b98a2e276fdb734941aacc1160d57de2108704f91e87a208a717aef8570007a0c
+  data.tar.gz: 207c81d0d37ca4dd7a2ad51ef11a2488b17ba30f9f034524a4f7d50935826f35a90c473f9ed7ec7432a2e0c48b7bcccebbd7ee5044d647c726f45fd0c6c176b9

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

@@ -18,8 +18,6 @@
 preference:
     path_as_regexp: false
     allow_dup_slash: false
-    template_file_extension: tpl
-    layout_file_extension: tpl
 
 # ----------------------
 # Routes

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

@@ -28,6 +28,7 @@ bind "tcp://#{_host}:#{_port}"
 # }
 
 # Minimum to maximum number of threads to answer.
+# @comment well actually, seems this number plus 6 threads exist ...
 threads 0, 16
 
 # The environment in which the rack's app will run.

data/lib/loader.rb

@@ -65,8 +65,8 @@ module Nekonote
         {:class => :Setting,         :file => 'setting'},
         {:class => :PageCache,       :file => 'page_cache'},
         {:class => :View,            :file => 'view'},
-        {:class => :TagEnvGet,       :file => 'liquid/tag_env_get'},
         {:class => :TagSettingGet,   :file => 'liquid/tag_setting_get'},
+        {:class => :TagPartial,      :file => 'liquid/tag_partial'},
         {:class => :Request,         :file => 'request'},
         {:class => :Handler,         :file => 'handler.rb'},
         {:class => :Rackup,          :file => 'rackup'},

data/lib/nekonote/liquid/tag_partial.rb

@@ -0,0 +1,30 @@
+module Nekonote
+    class TagPartial < Liquid::Tag
+        def initialize(tag_name, val, parse_context)
+            super
+            @filepath = val.strip
+        end
+
+        def render(context)
+            # get assign list from Liquid::Context
+            assigns = {}
+            context.environments[0].each_pair do |k, v|
+                assigns[k] = v
+            end
+
+            # absolute path to the partial template
+            filepath = Nekonote.get_root + '/' + View::PATH_TO_PARTIAL + '/' + @filepath + '.tpl'
+
+            # read data and parse it and render it
+            data = ''
+            begin
+                liquid = Liquid::Template.parse IO.read(filepath)
+                data   =  liquid.render assigns
+            rescue => e
+                # ignore this exception
+            end
+
+            return data
+        end
+    end
+end

data/lib/nekonote/preference.rb

@@ -12,8 +12,6 @@ module Nekonote
         FIELD_ROUTING_OPTIONS = 'preference'
         FIELD_OPTION_ROUTE_REGEXP    = 'path_as_regexp'
         FIELD_OPTION_ALLOW_DUP_SLASH = 'allow_dup_slash'
-        FIELD_OPTION_TEMPLATE_EXT    = 'template_file_extension'
-        FIELD_OPTION_LAYOUT_EXT      = 'layout_file_extension'
 
         # default values for routing options
         DEFAULT_OPTION_ROUTE_REGEXP      = false
@@ -209,8 +207,8 @@ module Nekonote
             # 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 = routing_options[FIELD_OPTION_TEMPLATE_EXT]    || DEFAULT_OPTION_TEMPLATE_FILE_EXT
-            @layout_file_extension   = routing_options[FIELD_OPTION_LAYOUT_EXT]      || DEFAULT_OPTION_LAYOUT_FILE_EXT
+            @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 == ''

data/lib/nekonote/spec.rb

@@ -1,6 +1,6 @@
 module Nekonote
     LIBS_NAME   = %(nekonote-framework).freeze
-    VERSION     = %(1.0.0-beta6).freeze
+    VERSION     = %(1.0.0-beta7).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

data/lib/nekonote/view.rb

@@ -1,11 +1,12 @@
 module Nekonote
     # define original liquid tag
-    ::Liquid::Template.register_tag 'env_get', TagEnvGet
     ::Liquid::Template.register_tag 'setting_get', TagSettingGet
+    ::Liquid::Template.register_tag 'partial', TagPartial
 
     class View
         PATH_TO_TEMPLATE = 'template'
         PATH_TO_LAYOUT   = 'template/layout'
+        PATH_TO_PARTIAL  = 'template/partial'
 
         # accessor
         attr_accessor :is_redirect
@@ -19,6 +20,7 @@ module Nekonote
                       :info_layout,
                       :info_page_cache_time
 
+        # Returns default response for error
         # @return array
         def self.get_default_error_response
             return [
@@ -219,10 +221,10 @@ module Nekonote
             list_cnv = {}
             list.map {|pair| list_cnv[pair[0].to_s] = pair[1] }
 
-            if defined?(@mapping) && @mapping.is_a?(Hash)
-                @mapping.merge! list_cnv
+            if defined?(@assign_list) && @assign_list.is_a?(Hash)
+                @assign_list.merge! list_cnv
             else
-                @mapping = list_cnv
+                @assign_list = list_cnv
             end
         end
 
@@ -354,47 +356,41 @@ module Nekonote
         # @return string
         private
         def get_parsed
-            data = ''
-            liq_tpl_template = nil
-            liq_tpl_layout   = nil
             begin
-                if @template_path.is_a? String
-                    liq_tpl_template = Liquid::Template.parse IO.read(@template_path)
-                end
+                # parse data in template file
+                template_data = render_data_with_liquid(@template_path, @assign_list)
 
-                if @layout_path.is_a? String
-                    liq_tpl_layout = Liquid::Template.parse IO.read(@layout_path)
+                # assign it into variable [content] if template was avalable
+                if template_data != nil
+                    @assign_list['content'] = template_data 
                 end
 
-                # parse and render template
-                if liq_tpl_template.is_a? Liquid::Template
-                    content = liq_tpl_template.render @mapping
-                else
-                    content = nil
-                end
+                # parse data in layout file with template data
+                layout_data = render_data_with_liquid(@layout_path, @assign_list)
 
-                # parse and render layout
-                if liq_tpl_layout.is_a? Liquid::Template
-                    if content != nil
-                        # assgin tempalte for layout
-                        mapping = {
-                            'content' => content
-                        }
-                        # and put it to @mapping
-                        @mapping.merge! mapping
-                    end
-                    data = liq_tpl_layout.render @mapping
-
-                else
-                    # if template data is available set it to data
-                    data = content if content != nil
+                response_body = ''
+                if layout_data != nil
+                    # just layout or with template
+                    response_body = layout_data
+                elsif template_data != nil
+                    # just template
+                    response_body = template_data
                 end
-
             rescue => e
                 raise ViewError, e.message
             end
 
-            return data
+            return response_body
+        end
+
+        # @param string filepath path to file
+        # @param hash assigns variables to assign
+        # @return Liquid::Template|nil
+        # @throw Exception
+        def render_data_with_liquid(filepath, assigns)
+            return nil if !filepath.is_a? String
+            liquid = Liquid::Template.parse IO.read(filepath)
+            return liquid.render assigns
         end
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nekonote-framework
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta6
+  version: 1.0.0.pre.beta7
 platform: ruby
 authors:
 - khotta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-11 00:00:00.000000000 Z
+date: 2018-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: color_echo
@@ -70,6 +70,7 @@ files:
 - data/structure/template/error.tpl
 - data/structure/template/layout/default.tpl
 - data/structure/template/layout/error.tpl
+- data/structure/template/partial/.gitkeep
 - data/structure/template/welcome/index.tpl
 - data/structure/tmp/pids/.gitkeep
 - lib/loader.rb
@@ -87,7 +88,7 @@ files:
 - lib/nekonote/exception/view_error.rb
 - lib/nekonote/handler.rb
 - lib/nekonote/handler/protected_methods.rb
-- lib/nekonote/liquid/tag_env_get.rb
+- lib/nekonote/liquid/tag_partial.rb
 - lib/nekonote/liquid/tag_setting_get.rb
 - lib/nekonote/logger.rb
 - lib/nekonote/page_cache.rb

data/lib/nekonote/liquid/tag_env_get.rb

@@ -1,12 +0,0 @@
-module Nekonote
-    class TagEnvGet < Liquid::Tag
-        def initialize(tag_name, val, parse_context)
-            super
-            @val = val.strip
-        end
-
-        def render(context)
-            return Env.get @val
-        end
-    end
-end