yaframework 0.4.9 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cfe57c449982f1b19f548975c965a520181ae0f83937efbfd60cb51c3d20446
-  data.tar.gz: 237e0074011df90023813924fcf40217f0f168cd0237868e56f6903ca367df9c
+  metadata.gz: 374739919ee6fdbc46ee3fc95f5604c162a358d21d593b6709cefa1add1af42a
+  data.tar.gz: 1a021b3a32f2358f5444759b30316e6670cd300121a265e95787889e58fdcc70
 SHA512:
-  metadata.gz: 6459c931aaed3114f701f6d096dff733a007e94230d6d71320c64847ecba74d99656189a960ab299c58257542968e8e131c6f1dd54f6d96f2f1f1c1a6ea42cdd
-  data.tar.gz: 561ab785fcf23d3101249f79751b129678a3e00b0e6dd087a98ac8fb4773709e45b80363bd723b563d7f98b1066b035ab09c0911793c430ce99fc045e0771e1b
+  metadata.gz: cdca19d28dfdbc2e980357242811bda91e685b383f859e19b0aafdb2e9f66d69eab5c2201f5a9da751648bf6b667b33ffef6a494555a6258bd4dd36ed4efc914
+  data.tar.gz: 2029fec4b50c8c9039f7b4449c7ad09198a07e4f979cd36b5b197e8523846c5a3155038b4e7aa8d13e012397003b3822a1f630ceecf2d941f5c412f86f726114

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [0.5.0] - 2021-07-25
+
+- Templates rendering added
+
 ## [0.4.9] - 2021-07-25
 
 - Some useful aliases added

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    yaframework (0.4.9)
+    yaframework (0.5.0)
       rack (~> 2.2, >= 2.2.3)
+      tilt (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -29,6 +30,7 @@ GEM
     rubocop-ast (1.7.0)
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
+    tilt (2.0.10)
     unicode-display_width (2.0.0)
 
 PLATFORMS

data/examples/rendering/app.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require "yaframework"
+app = Yaframework::Application
+
+app.get "/" do
+  render "index"
+end
+
+app.listen(4567)

data/examples/rendering/config.ru

@@ -0,0 +1,3 @@
+require "yaframework"
+
+run app

data/lib/yaframework.rb

@@ -3,6 +3,7 @@
 require_relative "yaframework/base"
 require_relative "yaframework/request"
 require_relative "yaframework/response"
+require_relative "yaframework/render"
 
 module Yaframework
 end

data/lib/yaframework/base.rb

@@ -1,10 +1,13 @@
 # frozen_string_literal: true
 
 require "rack"
+require_relative "../yaframework/render"
 
 module Yaframework
   class Base
-    attr_reader :routes, :request, :response, :env
+    include Yaframework::Render
+
+    attr_reader :routes, :request, :response, :env, :settings
     alias req request
     alias res response
 
@@ -12,6 +15,7 @@ module Yaframework
       @routes = Hash.new([])
       @before_hooks = []
       @after_hooks  = []
+      @settings = {}
       @inbox = {}
     end
 
@@ -126,4 +130,5 @@ module Yaframework
   end
 
   Application = Base.new
+  Application.setup
 end

data/lib/yaframework/render.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require "tilt"
+
+module Yaframework
+  module Render
+    def setup(settings = {})
+      @settings = settings
+      @settings[:template_engine] ||= "erb"
+      @settings[:layout]  ||= "layout"
+      @settings[:views]   ||= File.expand_path("views", File.dirname($PROGRAM_NAME))
+      @settings[:options] ||= {
+        default_encoding: Encoding.default_external
+      }
+    end
+
+    def render(template, locals = {}, layout = @settings[:layout])
+      res.headers["Content-Type"] ||= "text/html; charset=utf-8"
+      res.write(view(template, locals, layout))
+    end
+
+    def view(template, locals = {}, layout = @settings[:layout])
+      partial(layout, locals.merge(content: partial(template, locals)))
+    end
+
+    def partial(template, locals = {})
+      _render(template_path(template), locals, @settings[:options])
+    end
+
+    def template_path(template)
+      dir = @settings[:views]
+      ext = @settings[:template_engine]
+      File.join(dir, "#{template}.#{ext}")
+    end
+
+    private
+
+    def _render(template, locals = {}, options = {}, &block)
+      _cache.fetch(template) {
+        Tilt.new(template, 1, options.merge(outvar: "@_output"))
+      }.render(self, locals, &block)
+    end
+
+    def _cache
+      Thread.current[:_cache] ||= Tilt::Cache.new
+    end
+  end
+end

data/lib/yaframework/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Yaframework
-  VERSION = "0.4.9"
+  VERSION = "0.5.0"
 end

data/yaframework.gemspec

@@ -33,5 +33,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake",     "~> 13.0"
   spec.add_development_dependency "rubocop",  "~> 1.7"
 
-  spec.add_runtime_dependency "rack", "~> 2.2", ">= 2.2.3"
+  spec.add_dependency "rack", "~> 2.2", ">= 2.2.3"
+  spec.add_dependency "tilt", "~> 2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yaframework
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.5.0
 platform: ruby
 authors:
 - maxbarsukov
@@ -86,6 +86,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.3
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: What could be better than one more Sinatra?
 email:
 - maximbarsukov@bk.ru
@@ -115,8 +129,13 @@ files:
 - examples/headers.rb
 - examples/hello_world.rb
 - examples/params.rb
+- examples/rendering/app.rb
+- examples/rendering/config.ru
+- examples/rendering/views/index.erb
+- examples/rendering/views/layout.erb
 - lib/yaframework.rb
 - lib/yaframework/base.rb
+- lib/yaframework/render.rb
 - lib/yaframework/request.rb
 - lib/yaframework/response.rb
 - lib/yaframework/version.rb