yaframework 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4aec9734b89fbd8a9c87fb63506f49f53df83c0f141efd612d5cdceb9d4d8c64
-  data.tar.gz: 8d43e4889c14798d20400ae36bfa9c6b76797bf7348eac539d85c690dcf250a3
+  metadata.gz: 63212eea1f540904cec647bd269e65ed74c5f17569d211c5e2df1cacf5e906eb
+  data.tar.gz: c0d422d3fbcf9f05fb3110062730cfbfa6e943aff65112c2c5262188c79189bf
 SHA512:
-  metadata.gz: 00af9a420fd2edffe78d77d6a2ecfc81973cbadb9543424153a6a5e689409a06d4c98a5ff54e7ddbda2a122cbe3bcd2d5b563968f8820738c6f21747269201d7
-  data.tar.gz: ba55916ef3b9776ab8711e82af51406b5d4e00b6991acf04418fc1526f6a0aa803757b9744296180843cf201534f4ed14292ac2f738a92d00bb8d5ad11bf6925
+  metadata.gz: 4c03d0a6d9a2e8a0b59403f4814a79f32169f06984f40a0f62f41d1ed03e3cea55ee7cb53e677d557de3763dbf1e3846152429026983d59b3871e3d813fad60f
+  data.tar.gz: 9f07579ed44407f75a5431f5c65d33c3f7824c133e672a0ed2278f8033307c37c2b8456eff10a10c8864ad128f69f289a4450bc0143e2d4fb9b34a7c5916953d

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [0.4.8] - 2021-07-25
+
+- Before/after hooks added
+
 ## [0.4.7] - 2021-07-25
 
 - Handling 404 error fixed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    yaframework (0.4.7)
+    yaframework (0.4.8)
       rack (~> 2.2, >= 2.2.3)
 
 GEM

data/examples/README.md

@@ -2,21 +2,45 @@
 
 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.

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/error_handling.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../lib/yaframework"
+require "yaframework"
 app = Yaframework::Application
 
 app.get "/" 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/lib/yaframework/base.rb

@@ -8,6 +8,8 @@ module Yaframework
 
     def initialize
       @routes = Hash.new([])
+      @before_hooks = []
+      @after_hooks  = []
       @inbox = {}
     end
 
@@ -28,6 +30,14 @@ module Yaframework
       throw :halt, response
     end
 
+    def before(&block)
+      @before_hooks << block
+    end
+
+    def after(&block)
+      @after_hooks << block
+    end
+
     def handle(status, &block)
       @inbox[status] = block
     end
@@ -59,11 +69,14 @@ module Yaframework
       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
 
-      response.write instance_eval(&route[:handler]) if route
+      exec_before_hooks
+      response.write exec(route[:handler]) if route
+      exec_after_hooks
+
       response.finish
     end
 
@@ -80,6 +93,30 @@ 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

data/lib/yaframework/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yaframework
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - maxbarsukov
@@ -107,6 +107,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