yaframework 0.4.6 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b91dd4a4391f3f01d24edba73230b3831874bb2449c321e7ae795b47334ef68
-  data.tar.gz: 8e3f1e8c24751c1591aad3c9d6602a51d270ab21ec574621dedc3a8a1a9c6df4
+  metadata.gz: 374739919ee6fdbc46ee3fc95f5604c162a358d21d593b6709cefa1add1af42a
+  data.tar.gz: 1a021b3a32f2358f5444759b30316e6670cd300121a265e95787889e58fdcc70
 SHA512:
-  metadata.gz: adfc2c9f9cc37361d5be76853ff5d42435748fbe3e2816f47d4163303c013f428f793a26dd080a7e7fd65119e1f5910ab50f49aee735fdb57a5d3fed49f7fdd5
-  data.tar.gz: 77677d979203ecda92b147618823084b0e054f2aec87feeb322624529415ac6bad573e739eaa09a1b2946c8903fe27fa205f6ac4521e7c5d86778cff32155457
+  metadata.gz: cdca19d28dfdbc2e980357242811bda91e685b383f859e19b0aafdb2e9f66d69eab5c2201f5a9da751648bf6b667b33ffef6a494555a6258bd4dd36ed4efc914
+  data.tar.gz: 2029fec4b50c8c9039f7b4449c7ad09198a07e4f979cd36b5b197e8523846c5a3155038b4e7aa8d13e012397003b3822a1f630ceecf2d941f5c412f86f726114

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [0.5.0] - 2021-07-25
+
+- Templates rendering added
+
+## [0.4.9] - 2021-07-25
+
+- Some useful aliases added
+
+## [0.4.8] - 2021-07-25
+
+- Before/after hooks added
+
+## [0.4.7] - 2021-07-25
+
+- Handling 404 error fixed
+
 ## [0.4.6] - 2021-07-25
 
 - Content duplication fixed

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    yaframework (0.4.6)
+    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/README.md

@@ -2,21 +2,46 @@
 
 Here are some examples of applications created with Yaframework:
 
-1. [**Hello World**](https://github.com/maxbarsukov/yaframework/tree/master/examples/hello_world.rb)
+1. [**Hello World**](https://github.com/maxbarsukov/yaframework/blob/master/examples/hello_world.rb)
 
-   A simple application that displays "Hello world" to you. Go to `http://localhost:4567/` and see `Hello World`!
+   A simple application that displays "Hello world" to you.
 
 
-2. [**Params**](https://github.com/maxbarsukov/yaframework/tree/master/examples/params.rb)
+2. [**Params**](https://github.com/maxbarsukov/yaframework/blob/master/examples/params.rb)
 
    Shows how the application parameters can be used
 
 
-3. [**Halts and Redirects**](https://github.com/maxbarsukov/yaframework/tree/master/examples/halts_and_redirects.rb)
+3. [**Halts and Redirects**](https://github.com/maxbarsukov/yaframework/blob/master/examples/halts_and_redirects.rb)
 
    Shows how to use halts and redirects
 
 
+4. [**Headers**](https://github.com/maxbarsukov/yaframework/blob/master/examples/headers.rb)
+
+   How to add and view headers.
+
+
+5. [**Error handling**](https://github.com/maxbarsukov/yaframework/blob/master/examples/error_handling.rb)
+
+   How to handle errors
+
+
+6. [**Content Types**](https://github.com/maxbarsukov/yaframework/blob/master/examples/content_types.rb)
+
+   Using json, html, or plain text
+
+
+7. [**Cookies**](https://github.com/maxbarsukov/yaframework/blob/master/examples/cookies.rb)
+
+   Adding and deleting cookies
+
+
+8. [**Hooks**](https://github.com/maxbarsukov/yaframework/blob/master/examples/before_after_hooks.rb)
+
+   How to use `before` and `after` hooks
+
+
 ## Installation
 
 Clone this repo and go to this folder.
@@ -25,4 +50,3 @@ Then, run `bundle install` to install this gem.
 ## Run
 
 Run with `ruby hello-world.rb` or any other file and view at http://localhost:4567
- 

data/examples/before_after_hooks.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require "yaframework"
+app = Yaframework::Application
+
+app.before do
+  @page_updates ||= 0
+  @page_updates += 1
+end
+
+app.after do
+  puts "Some log info: #{response.body}"
+  response.write "<br>Refresh the page and your next number will be #{@page_updates + 1}!"
+end
+
+app.get "/" do
+  "Hello, your num is: #{@page_updates}"
+end
+
+app.listen(4567)

data/examples/content_types.rb

@@ -8,7 +8,8 @@ app.get "/" do
 end
 
 app.get "/html" do
-  response.html "This is <b>HTML</b>, where you cat use some <small>tags</small>.<br/>JSON <a href=\"/json\">here</a>,
+  response.html "This is <b>HTML</b>, where you cat use some <small>tags</small>.
+  <br/>JSON <a href=\"/json\">here</a>,
   <br/>Plain text <a href=\"/text\">here</a>"
 end
 

data/examples/cookies.rb

@@ -5,8 +5,12 @@ app = Yaframework::Application
 
 app.get "/" do
   response.set_cookie("foo", "bar")
-
+  "Your cookies, sir: #{response["Set-Cookie"]}.<br/>Go <a href=\"/delete\">here</a> to delete them"
 end
 
+app.get "/delete" do
+  response.delete_cookie("foo")
+  "Your cookies, sir: #{response["Set-Cookie"]}"
+end
 
 app.listen(4567)

data/examples/error_handling.rb

@@ -4,11 +4,11 @@ require "yaframework"
 app = Yaframework::Application
 
 app.get "/" do
-  "This is the root, go somewhere else"
+  "This is the root, go somewhere else..<br/>Maybe <a href=\"/asdfg\">here</a>, idk"
 end
 
 app.handle 404 do
-  "Hey, I just handled a 404 error!"
+  "Hey, I just handled a 404 error!<br/>The dude from the previous page deceived you!"
 end
 
 app.handle 500 do

data/examples/halts_and_redirects.rb

@@ -8,7 +8,7 @@ app.get "/" do
 end
 
 app.get "/hello" do
-  "Hello world!"
+  "Hi, you were redirected here from the root page. You can go <a href=\"/error\"></a> to get a 401 error"
 end
 
 app.get "/error" do

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,13 +1,21 @@
 # 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
 
     def initialize
       @routes = Hash.new([])
+      @before_hooks = []
+      @after_hooks  = []
+      @settings = {}
       @inbox = {}
     end
 
@@ -28,6 +36,18 @@ module Yaframework
       throw :halt, response
     end
 
+    def before(&block)
+      @before_hooks << block
+    end
+
+    def after(&block)
+      @after_hooks << block
+    end
+
+    def params
+      request.params
+    end
+
     def handle(status, &block)
       @inbox[status] = block
     end
@@ -55,17 +75,18 @@ module Yaframework
     end
 
     def route_eval
+      route = find_route
+      response.status = 404 unless route
+
       if @inbox[response.status]
-        response.write instance_eval(&@inbox[response.status])
+        response.write exec(@inbox[response.status])
         return response.finish
       end
 
-      route = find_route
-      if route
-        response.write instance_eval(&route[:handler])
-      else
-        response.status = 404
-      end
+      exec_before_hooks
+      response.write exec(route[:handler]) if route
+      exec_after_hooks
+
       response.finish
     end
 
@@ -82,7 +103,32 @@ module Yaframework
       end
       route
     end
+
+    def exec(action)
+      if action.respond_to? :to_sym
+        send(action)
+      else
+        instance_exec(&action)
+      end
+    end
+
+    def exec_before_hooks
+      exec_hooks @before_hooks
+    end
+
+    def exec_after_hooks
+      exec_hooks @after_hooks
+    end
+
+    def exec_hooks(hooks)
+      return true if hooks.nil?
+
+      hooks.each do |hook|
+        return false if exec(hook) == false
+      end
+    end
   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.6"
+  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.6
+  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
@@ -107,6 +121,7 @@ files:
 - bin/setup
 - examples/Gemfile
 - examples/README.md
+- examples/before_after_hooks.rb
 - examples/content_types.rb
 - examples/cookies.rb
 - examples/error_handling.rb
@@ -114,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