Merge pull request #604 from goby-lang/implement-#602

Implement #602 and fix simple server

vm/call_frame.go

@@ -33,6 +33,7 @@ type callFrame interface {
 	IsBlock() bool
 	IsSourceBlock() bool
 	IsRemoved() bool
+	setAsRemoved()
 	EP() *normalCallFrame
 	Locals() []*Pointer
 	LocalPtr() int
@@ -55,9 +56,7 @@ type goMethodCallFrame struct {
 	name   string
 }
 
-func (cf *goMethodCallFrame) stopExecution() {
-	cf.isRemoved = true
-}
+func (cf *goMethodCallFrame) stopExecution() {}
 
 type normalCallFrame struct {
 	*baseFrame
@@ -71,7 +70,6 @@ func (n *normalCallFrame) instructionsCount() int {
 }
 
 func (n *normalCallFrame) stopExecution() {
-	n.isRemoved = true
 	n.pc = n.instructionsCount()
 }
 
@@ -91,6 +89,10 @@ func (b *baseFrame) IsRemoved() bool {
 	return b.isRemoved
 }
 
+func (b *baseFrame) setAsRemoved() {
+	b.isRemoved = true
+}
+
 func (b *baseFrame) IsSourceBlock() bool {
 	return b.isSourceBlock
 }

vm/instruction.go

@@ -337,9 +337,16 @@ var builtinActions = map[operationType]*action{
 			*/
 
 			if cf.IsBlock() {
-				t.callFrameStack.pop().stopExecution() // Remove block execution frame
-				t.callFrameStack.pop().stopExecution() // Remove method call frame
-				t.callFrameStack.pop().stopExecution() // Remove block source frame
+				/*
+				  1. Remove block execution frame
+				  2. Remove method call frame
+				  3. Remove block source frame
+				*/
+				for i := 0; i < 3; i++ {
+					frame := t.callFrameStack.pop()
+					frame.stopExecution()
+					frame.setAsRemoved()
+				}
 			}
 		},
 	},

vm/simple_server.go

@@ -10,9 +10,11 @@ import (
 	"path/filepath"
 	"unicode"
 
+	"fmt"
 	"github.com/fatih/structs"
 	"github.com/goby-lang/goby/vm/classes"
 	"github.com/gorilla/mux"
+	"strconv"
 )
 
 type request struct {
@@ -71,12 +73,19 @@ func builtinSimpleServerInstanceMethods() []*BuiltinMethodObject {
 					var serveStatic bool
 					server := receiver.(*RObject)
 
-					portVar, ok := server.InstanceVariables.get("@port")
+					portVar, ok := server.instanceVariableGet("@port")
 
 					if !ok {
 						port = "8080"
 					} else {
-						port = portVar.(*StringObject).value
+						switch p := portVar.(type) {
+						case *StringObject:
+							port = p.value
+						case *IntegerObject:
+							port = strconv.Itoa(p.value)
+						default:
+							fmt.Printf("Unexpected type %s for port setting\n", portVar.Class().Name)
+						}
 					}
 
 					log.Println("SimpleServer start listening on port: " + port)

vm/simple_server_test.go

@@ -1,9 +1,12 @@
 package vm
 
 import (
+	"io/ioutil"
+	"net/http"
 	"net/http/httptest"
 	"strings"
 	"testing"
+	"time"
 )
 
 func TestServerInitialization(t *testing.T) {
@@ -28,6 +31,66 @@ func TestServerInitialization(t *testing.T) {
 	}
 }
 
+func TestServerSetupResponse(t *testing.T) {
+	serverScript := `
+	require "net/simple_server"
+
+	server = Net::SimpleServer.new(4000)
+	server.get "/" do |req, res|
+	  res.body = req.method + " Hello World"
+	  res.status = 200
+	end
+
+	server.get "/not_found" do |req, res|
+	  res.body = String.fmt("Path \"%s\" not found", req.path)
+	  res.status = 404
+	end
+		
+	server.start
+
+`
+	tests := []struct {
+		path           string
+		expectedBody   string
+		expectedStatus int
+	}{
+		{
+			"/",
+			"GET Hello World",
+			200},
+		{
+			"/not_found",
+			"Path \"/not_found\" not found",
+			404},
+	}
+
+	go func() {
+		v := initTestVM()
+		v.testEval(t, serverScript, getFilename())
+	}()
+
+	time.Sleep(1 * time.Second)
+
+	for _, tt := range tests {
+		resp, err := http.Get("http://localhost:4000" + tt.path)
+
+		if err != nil {
+			t.Fatal(err.Error())
+		}
+
+		defer resp.Body.Close()
+		body, err := ioutil.ReadAll(resp.Body)
+
+		if string(body) != tt.expectedBody {
+			t.Fatalf("Expect response body to be: \n %s, got \n %s", tt.expectedBody, string(body))
+		}
+
+		if resp.StatusCode != tt.expectedStatus {
+			t.Fatalf("Expect response status to be %d, got %d", tt.expectedStatus, resp.StatusCode)
+		}
+	}
+}
+
 func TestSetupResponseDefaultValue(t *testing.T) {
 	reader := strings.NewReader("")
 	recorder := httptest.NewRecorder()