wouter 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a103da6e9f11d0e96881ccaf75062ef5a6a5322e78e3010300465645d5a9bd62
-  data.tar.gz: e10e000a61b9a304156429f1c22244ab6af4b456bb17d1960a901eb9c1579a4d
+  metadata.gz: 83e0fd10fd5d4cfd564ab573dc0602bc7752f8fc9219e7b4ef988ce8879e0902
+  data.tar.gz: 6e7613daede1879b938dbf481827b27ad15b52905a72c5742c1b16b8935f5ce0
 SHA512:
-  metadata.gz: 3ae45cbb20ba4659e9ef46d44fdb9deafef6fb252ab17acdad3eef68a4a3f446113c2641e672e165d3b9e97cf32d8399932141f4db223a0bbcbfb8f0bcd9c6db
-  data.tar.gz: 95239729b7a893187eb60d126bbd75aab7901718c21e28b47053c491bea3b0eb613539618f2245b69b55cdb4a18a0f3155781179216d173c19f6cd47d2c680f4
+  metadata.gz: d73792353400cd5de74b1da3b57eace57bba19e7cb517401a3d09416a8be22e5c3b6a36a6ab8090af85334282c8bf2d8aece9299fc79fc7135ee37f8235f4560
+  data.tar.gz: ad2264f42d38ad8f02465a1e235125e3815306d868b53a37a7209880177b7a1844d85423f16879cbe5d50fc1b2f02f28a3287ea698bbe4ae7e05e55017ada17d

data/lib/wouter.rb

@@ -5,37 +5,11 @@ require "rack"
 class Wouter
 
   # Incoming HTTP Request Wrapper
-  class Request
-    attr_reader :params
-
-    def initialize(params:)
-      @params = params
-    end
+  class Request < Rack::Request
   end
 
   # Outgoing HTTP Response Wrapper
-  class Response
-    attr_accessor :headers
-
-    def initialize
-      @headers = {'Content-Type' => 'text/html'}
-      @body = ""
-      @status = 200
-    end
-
-    def body(b)
-      @body = b
-      self
-    end
-
-    def status(s)
-      @status = s
-      self
-    end
-
-    def build_response
-      [@status, @headers, [@body]]
-    end
+  class Response < Rack::Response
   end
 
   # HTTP Endpoint Helper class
@@ -44,8 +18,9 @@ class Wouter
     attr_reader :params
 
     def initialize
-      @request = request
-      @response = response
+      @request = nil
+      @response = nil
+      @params = nil
     end
 
     def call(req, res)
@@ -53,30 +28,33 @@ class Wouter
       @params = req.params
       @response = res
       r = respond
-      @response.body r
+      @response.write r
+      @response
     end
 
     def json(body)
-      @response.headers['Content-Type'] = 'application/json'
+      @response.set_header('Content-Type', 'application/json')
       body
     end
 
     def status(code)
-      @response.status code
+      @response.status = code
       ""
     end
   end
 
-  ## Route Definitions
+  ## Internal Data
 
-  @@routes = []
+  def self.routes
+    @routes ||= []
+  end
 
   ## DSL
 
   class <<self
     %i[get post put delete].each do |m|
       define_method(m) do |path, route_class|
-        @@routes.push({
+        routes.push({
           method: m.to_s.upcase.to_sym,
           path: path,
           route_class: route_class
@@ -88,13 +66,12 @@ class Wouter
   ## Rack API
 
   def self.call(env)
-    path = env["PATH_INFO"]
-    method = env["REQUEST_METHOD"].to_sym
+    request = Request.new(env)
 
     route_params = {}
 
-    route = @@routes.find do |route|
-      if route[:method] == method
+    route = routes.find do |route|
+      if route[:method] == request.request_method.to_sym
         if route[:path].include?(":")
           split_path = route[:path].split("/")
           # Find all the named parameters in the route, drop the ":" so we have the names: ":id" => "id"
@@ -102,8 +79,8 @@ class Wouter
           # Turn the route into a regex: "/hello/:name" => "\/hello\/(\w*)"
           path_regex_string = split_path.map { |s| s[0] == ":" ? "(\\w*)" : s }.join("\/")
           r = Regexp.new(path_regex_string)
-          if r.match?(path)
-            match_data = r.match(path)
+          if r.match?(request.path)
+            match_data = r.match(request.path)
             # Match the match data with the named params, ex { "id" => 123 }
             route_param_names.each_with_index do |n, i|
               route_params[n] = match_data[i+1]
@@ -113,21 +90,22 @@ class Wouter
             false
           end
         else
-          route[:path] == path
+          route[:path] == request.path
         end
       end
     end
 
     if route
-      params = generate_params(env["rack.input"].gets).merge(route_params)
+      route_params.each do |k, v|
+        request.update_param(k, v)
+      end
 
-      request = Request.new(params: params)
       response = Response.new
 
-      route_response = route[:route_class].new.call(request, response)
-      response route_response
+      rack_response = route[:route_class].new.call(request, response)
+      rack_response.finish
     else
-      response not_found
+      not_found.finish
     end
   end
 
@@ -135,22 +113,9 @@ class Wouter
 
   def self.not_found
     resp = Response.new
-    resp.status 404
-    resp.body "Not Found"
+    resp.status = 404
+    resp.write "Not Found"
+    resp
   end
 
-  # Query string comes in as "key=value&key=value" and we turn it into { "key" => "value", "key" => "value" }
-  def self.generate_params(params)
-    return {} if params.nil? || params.empty?
-    params_hash = {}
-    params.split("&").each do |param_pair|
-      key, value = param_pair.split("=")
-      params_hash[key] = value
-    end
-    params_hash
-  end
-
-  def self.response(route_response)
-    route_response.build_response
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wouter
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Robert Peterson