yaframework 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f292d6a4e199c7cbd9d9375649f311bfc3889c86212d8a30316a37d65685b90d
-  data.tar.gz: a3715a27f85ef444a996edd039323dc15e6621f518c33c278d06fceeb6cf75c1
+  metadata.gz: 33b8bd38ee7fbf3d16bdef94f830384f979ad465ff674d085378caa6a46b6971
+  data.tar.gz: 1da887439ec28a18fc4ee8a4812d9bf3d9f70be894636f181a6af98a965d0dd2
 SHA512:
-  metadata.gz: 2f152b5b3f1198fa48e2eb434ce38a9254970c3f4a82571d6ea9359ee531c2c39c663a65fa674c512c897d3bed269d6aa3d7858937047c22f911d5c5cfd8af73
-  data.tar.gz: ad9ddf07e7ce153c3b55cbb48389628dcbc055f3dd23101eede3e28040961a47cd7c83a26fe46de824c96995cf35502ab2cb49856e50fba0aa2a04f48a5d9318
+  metadata.gz: 6ff977d266bccebbc67aa17c7ff2116be8f51c057be070807afa4d2c6e6a090c1053f146434e3a9ed78defa9ee840dfaa08b760f4807b0976b7bef9a09b181db
+  data.tar.gz: a62b06535d579d4b552aec2c1a0856514d5b27628aec77e267cfa4d98bc9b4b6185d00d6c919cae5fdf198a295870a7d0a8233eb4b3df08e39c967663791887f

data/Gemfile

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

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/Gemfile.lock

@@ -1,19 +1,15 @@
-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)
+    yaframework (0.2.2)
+      rack (~> 2.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  yaframework!
+  yaframework
 
 BUNDLED WITH
    2.1.4

data/examples/hello-world/app.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "yaframework"
+require_relative "../../lib/yaframework"
 app = Yaframework::Application
 
 app.get "/" do

data/lib/yaframework.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 require_relative "yaframework/base"
+require_relative "yaframework/request"
+require_relative "yaframework/response"
 require_relative "yaframework/database"
-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|
@@ -18,9 +17,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
 
@@ -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/database.rb

@@ -0,0 +1,18 @@
+# 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

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,39 @@
+# frozen_string_literal: true
+
+module Yaframework
+  class Response
+    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["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
+    end
+
+    def write(string)
+      s = string.to_s
+      @length += s.bytesize
+      body << s
+    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.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yaframework
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - maxbarsukov
@@ -93,6 +93,9 @@ files:
 - examples/hello-world/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
 - test/test_helper.rb
 - test/yaframework_test.rb