wouter 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83e0fd10fd5d4cfd564ab573dc0602bc7752f8fc9219e7b4ef988ce8879e0902
-  data.tar.gz: 6e7613daede1879b938dbf481827b27ad15b52905a72c5742c1b16b8935f5ce0
+  metadata.gz: 8b80dbc3170d929c2d18d8dfd23513c2e834254de252d50daa55a197e79b3e7c
+  data.tar.gz: 1ff7108b371da999bb465b64a60b8621cba2d1ab90b4943f12eeef58e6e211d1
 SHA512:
-  metadata.gz: d73792353400cd5de74b1da3b57eace57bba19e7cb517401a3d09416a8be22e5c3b6a36a6ab8090af85334282c8bf2d8aece9299fc79fc7135ee37f8235f4560
-  data.tar.gz: ad2264f42d38ad8f02465a1e235125e3815306d868b53a37a7209880177b7a1844d85423f16879cbe5d50fc1b2f02f28a3287ea698bbe4ae7e05e55017ada17d
+  metadata.gz: df105c88fd3aba2c1747926041f08085f22ea7bfccbc896f35d280b49a578974d4b0e924b6385321cd88d05a931f7c89312cb8cfe2a1f4f002bd79d7bc7e2acb
+  data.tar.gz: fe5583ce266c4c10167e902f221283e37fd54d563f99d165323c9bdedf09e09e101f8f176ec0d9f90686da4a5ed41b245573cb4a9c03cdc202868d793763f0f6

data/lib/wouter.rb

@@ -3,53 +3,65 @@ Bundler.setup(:default)
 require "rack"
 
 class Wouter
+  # ========== Rack wrappers
+  class Request < Rack::Request; end
+  class Response < Rack::Response; end
 
-  # Incoming HTTP Request Wrapper
-  class Request < Rack::Request
-  end
+  # ========== Endpoint class to make life easier
+  class Endpoint
+    attr_accessor :req, :res
 
-  # Outgoing HTTP Response Wrapper
-  class Response < Rack::Response
-  end
+    # @req : Request
+    # @res : Response
+    def initialize(req, res)
+      @req = req
+      @res = res
+    end
 
-  # HTTP Endpoint Helper class
-  class Endpoint
-    attr_accessor :request, :response
-    attr_reader :params
+    def self.call(env)
+      endpoint = new(Rack::Request.new(env), Rack::Response.new)
+      final_resp = endpoint.respond
+      # Return a `Rack::Response` or write to the body of the response if the return value of `response` is not `Rack::Response`
+      if final_resp.is_a?(Rack::Response)
+        final_resp
+      else
+        endpoint.res.write final_resp
+        endpoint.res
+      end
+    end
 
-    def initialize
-      @request = nil
-      @response = nil
-      @params = nil
+    # Users of `Wouter::Endpoint` should implement their own `#response`
+    def respond
+      @res
     end
 
-    def call(req, res)
-      @request = req
-      @params = req.params
-      @response = res
-      r = respond
-      @response.write r
-      @response
+    ## ~~~~~ Convience methods
+
+    def params
+      @req.params
     end
 
     def json(body)
-      @response.set_header('Content-Type', 'application/json')
-      body
+      @res.set_header('Content-Type', 'application/json')
+      @res.write body
     end
 
     def status(code)
-      @response.status = code
-      ""
+      @res.status = code
     end
   end
 
-  ## Internal Data
+  ## ========== Internal
+
+  def self.app
+    @app ||= Rack::Builder.new
+  end
 
   def self.routes
     @routes ||= []
   end
 
-  ## DSL
+  ## ========== DSL
 
   class <<self
     %i[get post put delete].each do |m|
@@ -61,61 +73,82 @@ class Wouter
         })
       end
     end
+
+    def middleware(klass, *args, &block)
+      app.use(klass, *args, &block)
+    end
   end
 
-  ## Rack API
+  ## ========== Build a Rack entry point
 
-  def self.call(env)
-    request = Request.new(env)
+  def self.build
+    app.run(Wrapper.new(routes))
+    app.to_app
+  end
 
-    route_params = {}
+  class Wrapper
+    attr_reader :routes
 
-    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"
-          route_param_names = split_path.find_all { |s| s.size > 1 ? s[0] == ":" : false }.map { |s| s[1..-1] }
-          # 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?(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]
-            end
-            true
+    def initialize(routes)
+      @routes = routes
+    end
+
+    def call(env)
+      request = Rack::Request.new(env)
+
+      route = routes.find do |route|
+        if route[:method] == request.request_method.to_sym
+          if parameterized_path?(route[:path])
+            split_path = route[:path].split("/")
+            path_regex = build_path_regex(split_path)
+            path_regex.match?(request.path)
           else
-            false
+            route[:path] == request.path
           end
-        else
-          route[:path] == request.path
         end
       end
-    end
 
-    if route
-      route_params.each do |k, v|
-        request.update_param(k, v)
+      if route
+        if parameterized_path?(route[:path])
+          split_path = route[:path].split("/")
+          path_parameter_data = build_path_regex(split_path).match(request.path)
+          path_parameter_names = find_parameter_names_in_path(split_path)
+          path_parameter_names.each_with_index do |parameter_name, i|
+            request.update_param(parameter_name, path_parameter_data[i+1])
+          end
+        end
+
+        resp = route[:route_class].call(request.env)
+        resp.finish
+      else
+        not_found
       end
+    end
 
-      response = Response.new
+    private
 
-      rack_response = route[:route_class].new.call(request, response)
-      rack_response.finish
-    else
-      not_found.finish
+    # Does the path have a parameter in it? ex: "/user/:id"
+    def parameterized_path?(path)
+      path.include?(":")
     end
-  end
 
-  ### Helpers
+    # Find all the named parameters in the route, drop the ":" so we have the names: ":id" => "id"
+    def find_parameter_names_in_path(split_path)
+      split_path.find_all { |s| s.size > 1 ? s[0] == ":" : false }.map { |s| s[1..-1] }
+    end
 
-  def self.not_found
-    resp = Response.new
-    resp.status = 404
-    resp.write "Not Found"
-    resp
-  end
+    # Turn the route into a regex: "/hello/:name" => "\/hello\/(\w*)"
+    def build_path_regex(split_path)
+      regex_string = split_path.map { |s| s[0] == ":" ? "(\\w*)" : s }.join("\/")
+      Regexp.new(regex_string)
+    end
 
+    # Return HTTP 404
+    def not_found
+      resp = Rack::Response.new
+      resp.status = 404
+      resp.write "Not Found"
+      resp
+    end
+  end
 end

metadata

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