Finished routing, simple website now works yay

lib/Request.rb

@@ -2,14 +2,13 @@ class Request
     attr_reader :method, :resource, :version, :headers, :params
 
     def initialize(input)
-        @input = input
-        variable_definer(@input)
+        variable_definer(input)
     end
 
     private 
     
     def variable_definer(input) ##Defines required class variables by splitting up the input text
-        rows = input.split(/\n/)
+        rows = input.split(/\r\n/)
         @method, @resource, @version = rows[0].split(' ')
         @headers, @params = {}, {}
         if rows.find_index("") != nil then

lib/route.rb

@@ -1,20 +1,34 @@
-class Route
+require 'debug'
+class Router
     attr_reader :routes
     def initialize()
-        @routes = {}
+        @routes = []
     end
 
-    def add_route(input)
-        @routes.merge!(input)
+    def add_route(method, input, &block)
+        routeHash = {method: method, resource: input, block: block}
+        @routes << routeHash
         p "added successfully, @routes are: #{@routes}"
     end
 
-    def match_route(input)
-        resource = input.resource
-        if @routes[resource]
-            return @routes[resource]
+    def match_route(request)
+        
+        #spec ["3" "bostongurka"] 
+
+        match = @routes.find {|route| (route[:method] == request.method) && (request.resource.match?(route[:resource]))}
+
+        if match != nil
+            print("\nMatch: ", match, "\n")
+            return 200
         else
-            p "failed to find: #{resource} route"
+            if request.resource.match?(@routes[0][:resource]) != true
+                p "failed to find: #{request.resource} resource.\nExpected: #{String(@routes[0][:resource])} resource"
+            elsif @routes[0][:method] != request.method
+                p "failed to find #{request.method} method.\nExpected: #{@routes[0][:method]} method"
+            else
+                p "Failed to match, got no reason, just kinda didn't feel like it"
+            end
+            return 404
         end
     end
 

lib/tcp_server.rb

@@ -0,0 +1,57 @@
+require 'socket'
+require_relative 'request'
+require_relative 'route'
+
+class HTTPServer
+
+    def initialize(port)
+        @port = port
+    end
+
+    def start
+        server = TCPServer.new(@port)
+        puts "Listening on #{@port}"
+        
+        router = Router.new
+        router.add_route("GET",/\/grillkorv\/\d/) do |id, senap|
+            puts "woot #{senap}"
+        end
+        router.add_route("GET","/favicon.ico")
+
+        while session = server.accept
+            data = ""
+            while line = session.gets and line !~ /^\s*$/
+                data += line
+            end
+            puts "RECEIVED REQUEST"
+            puts "-" * 40
+            puts data
+            puts "-" * 40 
+
+            request = Request.new(data)
+            pp request
+            
+            routeReturn = router.match_route(request)
+            if routeReturn == 200
+                html = "<h1>Hello, World!</h1>"
+                status = 200
+            elsif routeReturn == 404
+                html = "<h1>Not found!</h1>"
+                status = 404
+            end
+
+
+
+            #Sen kolla om resursen (filen finns)
+
+
+            # Nedanstående bör göras i er Response-klass
+            
+            session.print "HTTP/1.1 #{status}\r\n"
+            session.print "Content-Type: text/html\r\n"
+            session.print "\r\n"
+            session.print html
+            session.close
+        end
+    end
+end