yaframework 0.4.5 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb7911725bae2b9c6c1a8e575f35c32002950733011474ef711ecfbb486349f7
-  data.tar.gz: 3aebe5de332841aa193423f2796415e9b5f7842a6f28f4d71f56d9d6f1fa6ff9
+  metadata.gz: 6cfe57c449982f1b19f548975c965a520181ae0f83937efbfd60cb51c3d20446
+  data.tar.gz: 237e0074011df90023813924fcf40217f0f168cd0237868e56f6903ca367df9c
 SHA512:
-  metadata.gz: 1155c9b2c1989b62ffa01d56134fa40e1c61babaed7a570b489db0c2b1e385b5c17158818fa1a61f23f7a94585a483ba897fb91ede42f1ce1948204c5566abf2
-  data.tar.gz: c14ad19ffb1e5504bac06a64534cabd590b2531798444d44773557e55111208f115b3d7a11b99df3fbf7c1583c5f7021274fdbe9063c5d3b54d454a864941c1a
+  metadata.gz: 6459c931aaed3114f701f6d096dff733a007e94230d6d71320c64847ecba74d99656189a960ab299c58257542968e8e131c6f1dd54f6d96f2f1f1c1a6ea42cdd
+  data.tar.gz: 561ab785fcf23d3101249f79751b129678a3e00b0e6dd087a98ac8fb4773709e45b80363bd723b563d7f98b1066b035ab09c0911793c430ce99fc045e0771e1b

data/.gitignore

@@ -13,3 +13,4 @@
 *.gem
 *.rbc
 /examples/**/Gemfile.lock
+/lib/app.rb

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [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
+
 ## [0.4.5] - 2021-07-25
 
 - Error handling added

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    yaframework (0.4.5)
+    yaframework (0.4.9)
       rack (~> 2.2, >= 2.2.3)
 
 GEM
@@ -10,29 +10,29 @@ GEM
     ast (2.4.2)
     minitest (5.14.4)
     parallel (1.20.1)
-    parser (3.0.2.0)
+    parser (3.0.1.1)
       ast (~> 2.4.1)
     rack (2.2.3)
     rainbow (3.0.0)
-    rake (13.0.6)
+    rake (13.0.3)
     regexp_parser (2.1.1)
     rexml (3.2.5)
-    rubocop (1.18.4)
+    rubocop (1.18.2)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.8.0, < 2.0)
+      rubocop-ast (>= 1.7.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.8.0)
+    rubocop-ast (1.7.0)
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
     unicode-display_width (2.0.0)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
   bundler (>= 2.2.10)

data/examples/README.md

@@ -2,16 +2,51 @@
 
 Here are some examples of applications created with Yaframework:
 
-1. ###[Hello World](https://github.com/maxbarsukov/yaframework/tree/master/examples/hello-world)
+1. [**Hello World**](https://github.com/maxbarsukov/yaframework/blob/master/examples/hello_world.rb)
 
    A simple application that displays "Hello world" to you.
 
 
-2. ###[Params](https://github.com/maxbarsukov/yaframework/tree/master/examples/params)
+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)
+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.
+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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require "yaframework"
+app = Yaframework::Application
+
+app.get "/" do
+  response.redirect "/html"
+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>,
+  <br/>Plain text <a href=\"/text\">here</a>"
+end
+
+app.get "/text" do
+  response.text "Just plain text.<br/>Boring, even tags don't work..."
+end
+
+app.get "/json" do
+  response.json "{ \"The awesomeness of this framework\": \"100/100\" }"
+end
+
+app.listen(4567)

data/examples/cookies.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require "yaframework"
+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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require "yaframework"
+app = Yaframework::Application
+
+app.get "/" do
+  "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!<br/>The dude from the previous page deceived you!"
+end
+
+app.handle 500 do
+  "Error 500, this shouldn't have happened..."
+end
+
+app.listen(4567)

data/examples/{halts-and-redirects/app.rb → 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/headers.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require "yaframework"
+app = Yaframework::Application
+
+app.get "/" do
+  request[:username] = "IVAN!"
+  "Now 'request[:username]': #{request[:username]} contains in 'request.params': #{request.params}"
+end
+
+app.listen(4567)

data/examples/{hello-world/app.rb → hello_world.rb}

@@ -3,6 +3,7 @@
 require "yaframework"
 app = Yaframework::Application
 
+# Just go to the root page and say hello
 app.get "/" do
   "Hello world!"
 end

data/examples/{params/app.rb → params.rb}

@@ -3,11 +3,13 @@
 require "yaframework"
 app = Yaframework::Application
 
+# Any route, like /max or /ivan
 app.get "/:name" do
   "Hello #{request.params[:name]}!"
 end
 
-app.get "/:name/foo/:bar" do
+# You can try /max/from/rnd and see it with your own eyes
+app.get "/:name/from/:bar" do
   "Hello #{request.params[:name]} from #{request.params[:bar]}!"
 end
 

data/lib/yaframework/base.rb

@@ -5,9 +5,13 @@ require "rack"
 module Yaframework
   class Base
     attr_reader :routes, :request, :response, :env
+    alias req request
+    alias res response
 
     def initialize
       @routes = Hash.new([])
+      @before_hooks = []
+      @after_hooks  = []
       @inbox = {}
     end
 
@@ -28,6 +32,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 +71,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,6 +99,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/response.rb

@@ -42,6 +42,7 @@ module Yaframework
       s = string.to_s
       @length += s.bytesize
       @body << s
+      nil
     end
 
     def [](key)

data/lib/yaframework/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yaframework
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.9
 platform: ruby
 authors:
 - maxbarsukov
@@ -105,19 +105,16 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- examples/Gemfile
 - examples/README.md
-- examples/halts-and-redirects/Gemfile
-- examples/halts-and-redirects/README.md
-- examples/halts-and-redirects/app.rb
-- examples/halts-and-redirects/config.ru
-- examples/hello-world/Gemfile
-- examples/hello-world/README.md
-- examples/hello-world/app.rb
-- examples/hello-world/config.ru
-- examples/params/Gemfile
-- examples/params/README.md
-- examples/params/app.rb
-- examples/params/config.ru
+- examples/before_after_hooks.rb
+- examples/content_types.rb
+- examples/cookies.rb
+- examples/error_handling.rb
+- examples/halts_and_redirects.rb
+- examples/headers.rb
+- examples/hello_world.rb
+- examples/params.rb
 - lib/yaframework.rb
 - lib/yaframework/base.rb
 - lib/yaframework/request.rb

data/examples/halts-and-redirects/README.md

@@ -1,12 +0,0 @@
-# Params
-
-Shows how to use halts and redirects
-
-## Installation
-
-Clone this repo and go to this folder.
-Then, run `bundle install` to install this gem.
-
-## Run
-
-Run with `ruby app.rb` or `rackup` and view at http://localhost:4567

data/examples/halts-and-redirects/config.ru

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-require "yaframework"
-require "./app"
-
-run app

data/examples/hello-world/Gemfile

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-source "https://rubygems.org"
-
-gem "yaframework"

data/examples/hello-world/README.md

@@ -1,12 +0,0 @@
-# Hello world
-
-A simple application that displays "Hello world" to you.
-
-## Installation
-
-Clone this repo and go to this folder.
-Then, run `bundle install` to install this gem.
-
-## Run
-
-Run with `ruby app.rb` or `rackup` and view at http://localhost:4567

data/examples/hello-world/config.ru

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-require "yaframework"
-require "./app"
-
-run app

data/examples/params/Gemfile

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-source "https://rubygems.org"
-
-gem "yaframework"

data/examples/params/README.md

@@ -1,12 +0,0 @@
-# Params
-
-Shows how the application parameters can be used
-
-## Installation
-
-Clone this repo and go to this folder.
-Then, run `bundle install` to install this gem.
-
-## Run
-
-Run with `ruby app.rb` or `rackup` and view at http://localhost:4567

data/examples/params/config.ru

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-require "yaframework"
-require "./app"
-
-run app