yaframework 0.3.0 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f292d6a4e199c7cbd9d9375649f311bfc3889c86212d8a30316a37d65685b90d
-  data.tar.gz: a3715a27f85ef444a996edd039323dc15e6621f518c33c278d06fceeb6cf75c1
+  metadata.gz: ef685ddc4ab38b92f223ce779b2e57b27473556cdbdcb8a93bdf8269f7cb27ff
+  data.tar.gz: f89e2a1d07968d32b50ac56fe1aa7669d7f02c31ede5d7e7d0ccb09deb48c36d
 SHA512:
-  metadata.gz: 2f152b5b3f1198fa48e2eb434ce38a9254970c3f4a82571d6ea9359ee531c2c39c663a65fa674c512c897d3bed269d6aa3d7858937047c22f911d5c5cfd8af73
-  data.tar.gz: ad9ddf07e7ce153c3b55cbb48389628dcbc055f3dd23101eede3e28040961a47cd7c83a26fe46de824c96995cf35502ab2cb49856e50fba0aa2a04f48a5d9318
+  metadata.gz: 8bad4c17c6e830f8c2897112375da39947326a8f204db2a52dd41d99ed7c963a31f8f0b2ad05228bd50226cb4d82e995e5752c2be73f0ede1306e24b79f48ead
+  data.tar.gz: 32ee2f926d51b6324427f295bcebfd46958da7f364d7dbbdf80270777a486e5513ce75f50725fbe1c466ac304271fb2edbef0e864e3b5441a7af8b225bca30bf

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,24 @@
+## [0.4.3] - 2021-07-24
+
+- 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

@@ -5,5 +5,4 @@ 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,7 +1,7 @@
 PATH
   remote: .
   specs:
-    yaframework (0.2.2)
+    yaframework (0.4.2)
       rack (~> 2.2)
 
 GEM
@@ -36,7 +36,7 @@ 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)
@@ -45,4 +45,4 @@ DEPENDENCIES
   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/Gemfile

@@ -2,4 +2,4 @@
 
 source "https://rubygems.org"
 
-gem "yaframework", path: "/home/max/prog/ruby/yaframework"
+gem "yaframework"

data/examples/hello-world/app.rb

@@ -7,8 +7,4 @@ 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

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
 require_relative "yaframework/base"
-require_relative "yaframework/database"
-require_relative 'yaframework/request'
-require_relative 'yaframework/response'
+require_relative "yaframework/request"
+require_relative "yaframework/response"
 
 module Yaframework
 end

data/lib/yaframework/base.rb

@@ -4,11 +4,10 @@ require "rack"
 
 module Yaframework
   class Base
-    attr_reader :routes, :request, :response, :env, :hello
+    attr_reader :routes, :request, :response, :env
 
     def initialize
-      @routes = Hash.new { |h, k| h[k] = [] }
-      # @routes = Hash.new([])
+      @routes = Hash.new([])
     end
 
     %w[GET POST PATCH PUT DELETE HEAD OPTIONS].each do |verb|
@@ -36,12 +35,10 @@ module Yaframework
 
     def add_route(verb, path, &handler)
       path = "/#{path}" unless path[0] == "/"
-
-      @routes[verb] ||= []
-      @routes[verb] << compile_route(path, &handler)
+      @routes[verb] << compile(path, &handler)
     end
 
-    def compile_route(path, &handler)
+    def compile(path, &handler)
       route = { handler: handler, compiled_path: nil, extra_params: [], path: path }
 
       compiled_path = path.gsub(/:\w+/) do |match|
@@ -59,17 +56,16 @@ module Yaframework
       else
         response.status = 404
       end
-
       response.finish
     end
 
     def find_route
-      route = @routes[request.request_method].detect do |r|
+      route = routes[request.request_method].detect do |r|
         r[:compiled_path] =~ request.path_info
       end
 
       if route
-        $LAST_MATCH_INFO.captures.each_with_index do |value, index|
+        $~.captures.each_with_index do |value, index|
           param = route[:extra_params][index]
           request.params[param] = value
         end

data/lib/yaframework/request.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require "rack/request"
+
+module Yaframework
+  class Request < Rack::Request
+    def initialize(env)
+      env["PATH_INFO"] = "/" if env["PATH_INFO"].empty?
+      super
+    end
+  end
+end

data/lib/yaframework/response.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+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
+
+    def initialize(body = [], status = 200, headers = { "Content-Type" => "text/html; charset=utf-8" })
+      @body = []
+      @headers = headers
+      @status = status
+      @length = 0
+
+      if body.respond_to? :to_str
+        write body.to_str
+      elsif body.respond_to? :each
+        body.each { |i| write i.to_s }
+      else
+        raise TypeError, "Body must #respond_to? #to_str or #each"
+      end
+    end
+
+    def finish
+      @headers[Rack::CONTENT_LENGTH] = @length.to_s unless (100..199).include?(status) || status == 204
+      [status, headers, body]
+    end
+
+    def redirect(target, status = 302)
+      @status = status
+      @headers[LOCATION] = target
+    end
+
+    def write(string)
+      s = string.to_s
+      @length += s.bytesize
+      @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
+  end
+end

data/lib/yaframework/version.rb

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

data/yaframework.gemspec

@@ -28,7 +28,7 @@ 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 "rake",     "~> 13.0"
   spec.add_development_dependency "rubocop",  "~> 1.7"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yaframework
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.3
 platform: ruby
 authors:
 - maxbarsukov
@@ -14,16 +14,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -86,13 +86,22 @@ 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/request.rb
+- lib/yaframework/response.rb
 - lib/yaframework/version.rb
 - test/test_helper.rb
 - test/yaframework_test.rb

data/examples/hello-world/Gemfile.lock

@@ -1,19 +0,0 @@
-PATH
-  remote: /home/max/prog/ruby/yaframework
-  specs:
-    yaframework (0.3.0)
-      rack (~> 2.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    rack (2.2.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  yaframework!
-
-BUNDLED WITH
-   2.1.4