yaframework 0.4.3 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef685ddc4ab38b92f223ce779b2e57b27473556cdbdcb8a93bdf8269f7cb27ff
-  data.tar.gz: f89e2a1d07968d32b50ac56fe1aa7669d7f02c31ede5d7e7d0ccb09deb48c36d
+  metadata.gz: 63212eea1f540904cec647bd269e65ed74c5f17569d211c5e2df1cacf5e906eb
+  data.tar.gz: c0d422d3fbcf9f05fb3110062730cfbfa6e943aff65112c2c5262188c79189bf
 SHA512:
-  metadata.gz: 8bad4c17c6e830f8c2897112375da39947326a8f204db2a52dd41d99ed7c963a31f8f0b2ad05228bd50226cb4d82e995e5752c2be73f0ede1306e24b79f48ead
-  data.tar.gz: 32ee2f926d51b6324427f295bcebfd46958da7f364d7dbbdf80270777a486e5513ce75f50725fbe1c466ac304271fb2edbef0e864e3b5441a7af8b225bca30bf
+  metadata.gz: 4c03d0a6d9a2e8a0b59403f4814a79f32169f06984f40a0f62f41d1ed03e3cea55ee7cb53e677d557de3763dbf1e3846152429026983d59b3871e3d813fad60f
+  data.tar.gz: 9f07579ed44407f75a5431f5c65d33c3f7824c133e672a0ed2278f8033307c37c2b8456eff10a10c8864ad128f69f289a4450bc0143e2d4fb9b34a7c5916953d

data/.gitignore

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

data/CHANGELOG.md

@@ -1,4 +1,24 @@
-## [0.4.3] - 2021-07-24
+## [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
+
+## [0.4.4] - 2021-07-25
+
+- Interaction with cookies has been updated
+
+## [0.4.3] - 2021-07-25
 
 - Updated the method for changing the Content-Type
 - Interaction with headers has been improved

data/Gemfile

@@ -3,6 +3,3 @@
 source "https://rubygems.org"
 
 gemspec
-
-gem "minitest", "~> 5.0"
-gem "rack", "~> 2.2", ">= 2.2.3"

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    yaframework (0.4.2)
-      rack (~> 2.2)
+    yaframework (0.4.8)
+      rack (~> 2.2, >= 2.2.3)
 
 GEM
   remote: https://rubygems.org/
@@ -10,36 +10,33 @@ 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)
-    pg (1.2.3)
     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)
   minitest (~> 5.0)
-  pg (~> 1.2, >= 1.2.3)
-  rack (~> 2.2, >= 2.2.3)
   rake (~> 13.0)
   rubocop (~> 1.7)
   yaframework!

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

@@ -8,6 +8,9 @@ module Yaframework
 
     def initialize
       @routes = Hash.new([])
+      @before_hooks = []
+      @after_hooks  = []
+      @inbox = {}
     end
 
     %w[GET POST PATCH PUT DELETE HEAD OPTIONS].each do |verb|
@@ -27,6 +30,18 @@ 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
+
     def listen(port = 5000)
       Rack::Handler::WEBrick.run self, Port: port
     end
@@ -51,11 +66,17 @@ module Yaframework
 
     def route_eval
       route = find_route
-      if route
-        response.write instance_eval(&route[:handler])
-      else
-        response.status = 404
+      response.status = 404 unless route
+
+      if @inbox[response.status]
+        response.write exec(@inbox[response.status])
+        return response.finish
       end
+
+      exec_before_hooks
+      response.write exec(route[:handler]) if route
+      exec_after_hooks
+
       response.finish
     end
 
@@ -72,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/response.rb

@@ -42,6 +42,7 @@ module Yaframework
       s = string.to_s
       @length += s.bytesize
       @body << s
+      nil
     end
 
     def [](key)
@@ -66,5 +67,13 @@ module Yaframework
       @headers[Rack::CONTENT_TYPE] = ContentType::JSON
       write(str)
     end
+
+    def set_cookie(key, value)
+      Rack::Utils.set_cookie_header!(@headers, key, value)
+    end
+
+    def delete_cookie(key, value = {})
+      Rack::Utils.delete_cookie_header!(@headers, key, value)
+    end
   end
 end

data/lib/yaframework/version.rb

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

data/yaframework.gemspec

@@ -29,8 +29,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
 
   spec.add_development_dependency "bundler",  ">= 2.2.10"
+  spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "rake",     "~> 13.0"
   spec.add_development_dependency "rubocop",  "~> 1.7"
 
-  spec.add_runtime_dependency "rack", "~> 2.2"
+  spec.add_runtime_dependency "rack", "~> 2.2", ">= 2.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaframework
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.8
 platform: ruby
 authors:
 - maxbarsukov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-24 00:00:00.000000000 Z
+date: 2021-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.10
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +73,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -66,6 +83,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.3
 description: What could be better than one more Sinatra?
 email:
 - maximbarsukov@bk.ru
@@ -85,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