yaframework 0.4.1 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23a8af14273443627664b65feb652bc03336d5fbe829f672cae4ef9c8ca4604e
-  data.tar.gz: 848d0e46585695fe4756bf91b6c286b9cacb4ec684a535491e7a348f4a2c081a
+  metadata.gz: 4b91dd4a4391f3f01d24edba73230b3831874bb2449c321e7ae795b47334ef68
+  data.tar.gz: 8e3f1e8c24751c1591aad3c9d6602a51d270ab21ec574621dedc3a8a1a9c6df4
 SHA512:
-  metadata.gz: 35fa5d015af06f258f7b7fff290a14a3f60329aeb2e713b4cad172f86b55bde28a01d371a114ed89b77a48862146d78c53721fa21bcd86beaa155c0cec7a13f8
-  data.tar.gz: 47a8a7be5c253fb3a1bf788c6256613f85c9132725a328e456b8e7e27f82da322f5f2ff5691e8267dd3fce9139d0db13fcab6ca71e424436bdf1a1b165a88b3b
+  metadata.gz: adfc2c9f9cc37361d5be76853ff5d42435748fbe3e2816f47d4163303c013f428f793a26dd080a7e7fd65119e1f5910ab50f49aee735fdb57a5d3fed49f7fdd5
+  data.tar.gz: 77677d979203ecda92b147618823084b0e054f2aec87feeb322624529415ac6bad573e739eaa09a1b2946c8903fe27fa205f6ac4521e7c5d86778cff32155457

data/.gitignore

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

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [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
+
+## [0.4.2] - 2021-07-24
+
+- DB module removed
+
 ## [0.4.1] - 2021-07-24
 
 - A little fix. Fixed an error with the wrong order of declaring variables (lol)

data/Gemfile

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

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    yaframework (0.4.0)
-      rack (~> 2.2)
+    yaframework (0.4.6)
+      rack (~> 2.2, >= 2.2.3)
 
 GEM
   remote: https://rubygems.org/
@@ -10,39 +10,36 @@ 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.1.4)
+  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!
 
 BUNDLED WITH
-   2.1.4
+   2.2.16

data/README.md

@@ -1,6 +1,6 @@
 # Yaframework
 
-[![Gem Version](https://badge.fury.io/rb/yaframework.svg)](https://badge.fury.io/rb/sinatra)
+[![Gem Version](https://badge.fury.io/rb/yaframework.svg)](https://badge.fury.io/rb/yaframework)
 [![Build Status](https://app.travis-ci.com/maxbarsukov/yaframework.svg?token=T4CL2EqKG6FY816F3W3F&branch=master)](https://app.travis-ci.com/maxbarsukov/yaframework)
 
 Yaframework is a [DSL](https://en.wikipedia.org/wiki/Domain-specific_language) for

data/examples/README.md

@@ -2,16 +2,27 @@
 
 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/tree/master/examples/hello_world.rb)
 
-   A simple application that displays "Hello world" to you.
+   A simple application that displays "Hello world" to you. Go to `http://localhost:4567/` and see `Hello World`!
 
 
-2. ###[Params](https://github.com/maxbarsukov/yaframework/tree/master/examples/params)
+2. [**Params**](https://github.com/maxbarsukov/yaframework/tree/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/tree/master/examples/halts_and_redirects.rb)
 
    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 hello-world.rb` or any other file and view at http://localhost:4567
+ 

data/examples/content_types.rb

@@ -0,0 +1,23 @@
+# 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,12 @@
+# frozen_string_literal: true
+
+require "yaframework"
+app = Yaframework::Application
+
+app.get "/" do
+  response.set_cookie("foo", "bar")
+
+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"
+end
+
+app.handle 404 do
+  "Hey, I just handled a 404 error!"
+end
+
+app.handle 500 do
+  "Error 500, this shouldn't have happened..."
+end
+
+app.listen(4567)

data/examples/halts_and_redirects.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require "yaframework"
+app = Yaframework::Application
+
+app.get "/" do
+  response.redirect "/hello"
+end
+
+app.get "/hello" do
+  "Hello world!"
+end
+
+app.get "/error" do
+  response.status = 401
+  halt response.finish
+end
+
+app.listen(4567)

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}

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
-require_relative "../../lib/yaframework"
+require "yaframework"
 app = Yaframework::Application
 
+# Just go to the root page and say hello
 app.get "/" do
   "Hello world!"
 end

data/examples/params.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require "yaframework"
+app = Yaframework::Application
+
+# Any route, like /max or /ivan
+app.get "/:name" do
+  "Hello #{request.params[:name]}!"
+end
+
+# 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
+
+app.listen(4567)

data/lib/yaframework.rb

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

data/lib/yaframework/base.rb

@@ -8,6 +8,7 @@ module Yaframework
 
     def initialize
       @routes = Hash.new([])
+      @inbox = {}
     end
 
     %w[GET POST PATCH PUT DELETE HEAD OPTIONS].each do |verb|
@@ -27,6 +28,10 @@ module Yaframework
       throw :halt, response
     end
 
+    def handle(status, &block)
+      @inbox[status] = block
+    end
+
     def listen(port = 5000)
       Rack::Handler::WEBrick.run self, Port: port
     end
@@ -50,6 +55,11 @@ module Yaframework
     end
 
     def route_eval
+      if @inbox[response.status]
+        response.write instance_eval(&@inbox[response.status])
+        return response.finish
+      end
+
       route = find_route
       if route
         response.write instance_eval(&route[:handler])

data/lib/yaframework/response.rb

@@ -2,6 +2,14 @@
 
 module Yaframework
   class Response
+    LOCATION = "Location"
+
+    module ContentType
+      HTML = "text/html"
+      TEXT = "text/plain"
+      JSON = "application/json"
+    end
+
     attr_accessor :status
     attr_reader :headers, :body
 
@@ -21,19 +29,51 @@ module Yaframework
     end
 
     def finish
-      headers["Content-Length"] = @length.to_s unless (100..199).include?(status) || status == 204
+      @headers[Rack::CONTENT_LENGTH] = @length.to_s unless (100..199).include?(status) || status == 204
       [status, headers, body]
     end
 
     def redirect(target, status = 302)
-      self.status = status
-      headers["Location"] = target
+      @status = status
+      @headers[LOCATION] = target
     end
 
     def write(string)
       s = string.to_s
       @length += s.bytesize
-      body << s
+      @body << s
+      nil
+    end
+
+    def [](key)
+      @headers[key]
+    end
+
+    def []=(key, value)
+      @headers[key] = value
+    end
+
+    def html(str)
+      @headers[Rack::CONTENT_TYPE] = ContentType::HTML
+      write(str)
+    end
+
+    def text(str)
+      @headers[Rack::CONTENT_TYPE] = ContentType::TEXT
+      write(str)
+    end
+
+    def json(str)
+      @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.1"
+  VERSION = "0.4.6"
 end

data/yaframework.gemspec

@@ -28,9 +28,10 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
 
-  spec.add_development_dependency "bundler",  "~> 2.1.4"
+  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,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: yaframework
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.6
 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
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.10
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !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: 2.1.4
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        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,14 +105,17 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- examples/Gemfile
 - examples/README.md
-- examples/hello-world/Gemfile
-- examples/hello-world/README.md
-- examples/hello-world/app.rb
-- examples/hello-world/config.ru
+- 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/database.rb
 - lib/yaframework/request.rb
 - lib/yaframework/response.rb
 - lib/yaframework/version.rb

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/lib/yaframework/database.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-require "pg"
-
-class Database
-  def self.connect(db_name)
-    pg_conn = PG.connect(dbname: db_name)
-    new(pg_conn)
-  end
-
-  def initialize(pg_conn)
-    @pg_conn = pg_conn
-  end
-
-  def exec(sql)
-    @pg_conn.exec(sql).to_a
-  end
-end