changes after review

Author: pawels-optimizely

optimizely/config/datafileProjectConfig/entities/entities.go

@@ -25,7 +25,6 @@ type Audience struct {
 
 // Experiment represents an Experiment object from the Optimizely datafile
 type Experiment struct {
-	// @TODO(mng): include audienceConditions
 	ID                 string              `json:"id"`
 	Key                string              `json:"key"`
 	LayerID            string              `json:"layerId"`

optimizely/decision/evaluator/condition.go

@@ -38,10 +38,9 @@ type ItemEvaluator interface {
 type CustomAttributeConditionEvaluator struct{}
 
 // Evaluate returns true if the given user's attributes match the condition
-func (c CustomAttributeConditionEvaluator) Evaluate(item interface{}, condTreeParams *entities.TreeParameters) (bool, error) {
+func (c CustomAttributeConditionEvaluator) Evaluate(condition entities.Condition, condTreeParams *entities.TreeParameters) (bool, error) {
 	// We should only be evaluating custom attributes
 
-	condition := item.(entities.Condition)
 	if condition.Type != customAttributeType {
 		return false, fmt.Errorf(`Unable to evaluator condition of type "%s"`, condition.Type)
 	}
@@ -78,18 +77,14 @@ func (c CustomAttributeConditionEvaluator) Evaluate(item interface{}, condTreePa
 type AudienceConditionEvaluator struct{}
 
 // Evaluate returns true if the given user's attributes match the condition
-func (c AudienceConditionEvaluator) Evaluate(item interface{}, condTreeParams *entities.TreeParameters) (bool, error) {
+func (c AudienceConditionEvaluator) Evaluate(audienceID string, condTreeParams *entities.TreeParameters) (bool, error) {
 
-	var ok bool
-	var audienceID string
+	if audience, ok := condTreeParams.AudienceMap[audienceID]; ok {
+		condTree := audience.ConditionTree
+		conditionTreeEvaluator := NewTreeEvaluator()
+		retValue := conditionTreeEvaluator.Evaluate(condTree, condTreeParams)
+		return retValue, nil
 
-	if audienceID, ok = item.(string); ok {
-		if audience, good := condTreeParams.AudienceMap[audienceID]; good {
-			condTree := audience.ConditionTree
-			conditionTreeEvaluator := NewTreeEvaluator()
-			retValue := conditionTreeEvaluator.Evaluate(condTree, condTreeParams)
-			return retValue, nil
-		}
 	}
 
 	return false, fmt.Errorf(`Unable to evaluate nested tree for audience ID "%s"`, audienceID)

optimizely/decision/evaluator/condition_tree.go

@@ -71,10 +71,10 @@ func (c TreeEvaluator) evaluate(node *entities.TreeNode, condTreeParams *entitie
 	switch v := node.Item.(type) {
 	case entities.Condition:
 		evaluator := CustomAttributeConditionEvaluator{}
-		result, err = evaluator.Evaluate(node.Item, condTreeParams)
+		result, err = evaluator.Evaluate(node.Item.(entities.Condition), condTreeParams)
 	case string:
 		evaluator := AudienceConditionEvaluator{}
-		result, err = evaluator.Evaluate(node.Item, condTreeParams)
+		result, err = evaluator.Evaluate(node.Item.(string), condTreeParams)
 	default:
 		fmt.Printf("I don't know about type %T!\n", v)
 		return false, false

optimizely/decision/experiment_targeting_service.go

@@ -46,7 +46,6 @@ func (s ExperimentTargetingService) GetDecision(decisionContext ExperimentDecisi
 		if !evalResult {
 			// user not targeted for experiment, return an empty variation
 			experimentDecision.DecisionMade = true
-			experimentDecision.Variation = entities.Variation{}
 		}
 		return experimentDecision, nil
 	}
@@ -58,7 +57,6 @@ func (s ExperimentTargetingService) GetDecision(decisionContext ExperimentDecisi
 		if !evalResult {
 			// user not targeted for experiment, return an empty variation
 			experimentDecision.DecisionMade = true
-			experimentDecision.Variation = entities.Variation{}
 		}
 	}
 	// user passes audience targeting, can move on to the next decision maker

scripts/coverage.sh

@@ -0,0 +1,56 @@
+#!/bin/bash
+# Generate test coverage statistics for Go packages.
+#
+# Works around the fact that `go test -coverprofile` currently does not work
+# with multiple packages, see https://code.google.com/p/go/issues/detail?id=6909
+#
+# Usage: script/coverage [--html|--coveralls]
+#
+#     --html      Additionally create HTML report and open it in browser
+#     --coveralls Push coverage statistics to coveralls.io
+#
+
+scriptdir=`dirname $0`
+cd $scriptdir && cd ..
+
+set -e
+
+workdir=.cover
+profile="$workdir/cover.out"
+mode=count
+
+generate_cover_data() {
+    rm -rf "$workdir"
+    mkdir "$workdir"
+
+    for pkg in "$@"; do
+        f="$workdir/$(echo $pkg | tr / -).cover"
+        go test -covermode="$mode" -coverprofile="$f" "$pkg"
+    done
+
+    echo "mode: $mode" >"$profile"
+    grep -h -v "^mode:" "$workdir"/*.cover >>"$profile"
+}
+
+show_cover_report() {
+    go tool cover -${1}="$profile"
+}
+
+push_to_coveralls() {
+    echo "Pushing coverage statistics to coveralls.io"
+    goveralls -coverprofile="$profile"
+}
+
+generate_cover_data $(go list ./... | grep -v vendor | grep -v mock)
+go tool cover -html="./${profile}" -o coverage.html
+show_cover_report func
+case "$1" in
+"")
+    ;;
+--html)
+    show_cover_report html ;;
+--coveralls)
+    push_to_coveralls ;;
+*)
+    echo >&2 "error: invalid option: $1"; exit 1 ;;
+esac