yaframework 0.4.0 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33b8bd38ee7fbf3d16bdef94f830384f979ad465ff674d085378caa6a46b6971
-  data.tar.gz: 1da887439ec28a18fc4ee8a4812d9bf3d9f70be894636f181a6af98a965d0dd2
+  metadata.gz: bb7911725bae2b9c6c1a8e575f35c32002950733011474ef711ecfbb486349f7
+  data.tar.gz: 3aebe5de332841aa193423f2796415e9b5f7842a6f28f4d71f56d9d6f1fa6ff9
 SHA512:
-  metadata.gz: 6ff977d266bccebbc67aa17c7ff2116be8f51c057be070807afa4d2c6e6a090c1053f146434e3a9ed78defa9ee840dfaa08b760f4807b0976b7bef9a09b181db
-  data.tar.gz: a62b06535d579d4b552aec2c1a0856514d5b27628aec77e267cfa4d98bc9b4b6185d00d6c919cae5fdf198a295870a7d0a8233eb4b3df08e39c967663791887f
+  metadata.gz: 1155c9b2c1989b62ffa01d56134fa40e1c61babaed7a570b489db0c2b1e385b5c17158818fa1a61f23f7a94585a483ba897fb91ede42f1ce1948204c5566abf2
+  data.tar.gz: c14ad19ffb1e5504bac06a64534cabd590b2531798444d44773557e55111208f115b3d7a11b99df3fbf7c1583c5f7021274fdbe9063c5d3b54d454a864941c1a

data/.gitignore

@@ -12,3 +12,4 @@
 /tmp/
 *.gem
 *.rbc
+/examples/**/Gemfile.lock

data/.rubocop.yml

@@ -16,5 +16,11 @@ Style/Documentation:
 Metrics/MethodLength:
   Enabled: false
 
+Metrics/AbcSize:
+  Max: 25
+
 Layout/LineLength:
   Max: 120
+
+Style/SpecialGlobalVars:
+  Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,32 @@
+## [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)
+
+## [0.4.0] - 2021-07-24
+
+- Global routing update and large-scale code base changes
+
+## [0.3.0] - 2021-07-24
+
+- Added tools for interacting with the database
+
 ## [0.2.2] - 2021-07-23
 
 - Params fixed

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.2.2)
-      rack (~> 2.2)
+    yaframework (0.4.5)
+      rack (~> 2.2, >= 2.2.3)
 
 GEM
   remote: https://rubygems.org/
@@ -12,7 +12,6 @@ GEM
     parallel (1.20.1)
     parser (3.0.2.0)
       ast (~> 2.4.1)
-    pg (1.2.3)
     rack (2.2.3)
     rainbow (3.0.0)
     rake (13.0.6)
@@ -36,13 +35,11 @@ PLATFORMS
   ruby
 
 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,9 +2,16 @@
 
 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)
 
    A simple application that displays "Hello world" to you.
 
 
-2. Be soon...
+2. ###[Params](https://github.com/maxbarsukov/yaframework/tree/master/examples/params)
+
+   Shows how the application parameters can be used
+
+
+3. ###[Halts and Redirects](https://github.com/maxbarsukov/yaframework/tree/master/examples/halts-and-redirects)
+
+   Shows how to use halts and redirects

data/examples/halts-and-redirects/Gemfile

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

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

@@ -0,0 +1,12 @@
+# 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/app.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/halts-and-redirects/config.ru

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

data/examples/hello-world/app.rb

@@ -1,14 +1,10 @@
 # frozen_string_literal: true
 
-require_relative "../../lib/yaframework"
+require "yaframework"
 app = Yaframework::Application
 
 app.get "/" do
   "Hello world!"
 end
 
-app.get "/hi/:name" do
-  "Hello #{request.params[:name]}"
-end
-
 app.listen(4567)

data/examples/params/Gemfile

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

data/examples/params/README.md

@@ -0,0 +1,12 @@
+# 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/app.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require "yaframework"
+app = Yaframework::Application
+
+app.get "/:name" do
+  "Hello #{request.params[:name]}!"
+end
+
+app.get "/:name/foo/:bar" do
+  "Hello #{request.params[:name]} from #{request.params[:bar]}!"
+end
+
+app.listen(4567)

data/examples/params/config.ru

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

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|
@@ -17,9 +18,9 @@ module Yaframework
     end
 
     def call(env)
+      @env = env
       @request  = Yaframework::Request.new @env
       @response = Yaframework::Response.new
-      @env = env
       catch(:halt) { route_eval }
     end
 
@@ -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,50 @@ 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
+    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.0"
+  VERSION = "0.4.5"
 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.0
+  version: 0.4.5
 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
@@ -86,14 +106,20 @@ files:
 - bin/console
 - bin/setup
 - 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/Gemfile.lock
 - 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
 - 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/Gemfile.lock

@@ -1,15 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    rack (2.2.3)
-    yaframework (0.2.2)
-      rack (~> 2.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  yaframework
-
-BUNDLED WITH
-   2.1.4

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