tidyv0.1.0

3 files changed, 24 insertions, 21 deletions

diff --git a/cmd/lulu/test b/cmd/lulu/test
index 3aacc99..3a98d91 100755
--- a/cmd/lulu/test
+++ b/cmd/lulu/test
@@ -10,21 +10,20 @@ export money='[0-9]+(\.[0-9]+)? [A-Z]{3}'
 export pkgid='[0-9]{4}X[0-9]{4}\.[A-Z]{2}\.[A-Z]{3}\.[A-Z]{2}\.[A-Z0-9]{5,8}\.[A-Z]{3}'
 export time='[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z'
 
-
-
-[[ ! -d testout ]] && mkdir testout
-[[ ! -d testerr ]] && mkdir testerr
+[[ -d testout ]] || mkdir testout
+[[ -d testerr ]] || mkdir testerr
 
 [[ $# -gt 0 ]] && tests="tests/$1" || tests=tests/*
 for test in $tests
 do
-	echo $test...
+	echo $test
 	base=${test##*/}
 	want=testdata/$base
 	check=testchecks/$base
 	out=testout/$base
 	err=testerr/$base
-	if [ -f $want ]; then # check against expected output
+	if [ -f $want ]
+	then # check against expected output
 		if ! sh ${flags} $test >$out 2>$err
 		then
 			echo "FAIL $test: error: $err"
@@ -36,7 +35,8 @@ do
 			diff $want $out
 			exit 1
 		fi
-	elif [ -f $check ]; then # use script to check output
+	elif [ -f $check ]
+	then # use script to check output
 		if ! sh ${flags} $test >$out 2>$err
 		then
 			echo "FAIL $test: error: $err"
@@ -48,7 +48,8 @@ do
 			echo "FAIL $test: check failed: $check"
 			exit 1
 		fi
-	elif [ -f $test ]; then # test should fail
+	elif [ -f $test ]
+	then # test should fail
 		if sh ${flags} $test >$out 2>$err
 		then
 			echo "FAIL $test: expected error; got \"$(cat $out)\""
diff --git a/cost.go b/cost.go
index ac7ad7d..de2080e 100644
--- a/cost.go
+++ b/cost.go
@@ -60,7 +60,9 @@ type printJobCostReq struct {
 	ShipOpt   ShippingLevel           `json:"shipping_option"`
 }
 
-// TODO: just use ShippingAddress?
+// printJobCostReqShipAddr is a subset of a shipping address. It is
+// necessary because the API returns an error if the address in a
+// /print-job-cost-calculations/ request has any extra fields.
 type printJobCostReqShipAddr struct {
 	City     string      `json:"city"`
 	Country  string      `json:"country_code"`
diff --git a/lulu.go b/lulu.go
index 53ce2fd..69a8ede 100644
--- a/lulu.go
+++ b/lulu.go
@@ -135,9 +135,9 @@ func (c *Client) StartInteriorValidationBasic(srcUrl string) (uint, error) {
 }
 
 func (c *Client) startInteriorValidation(payload any) (uint, error) {
-	var rec InteriorValidation
-	err := c.postDecode(validateInteriorPath, payload, http.StatusCreated, &rec)
-	return rec.Id, err
+	var val InteriorValidation
+	err := c.postDecode(validateInteriorPath, payload, http.StatusCreated, &val)
+	return val.Id, err
 }
 
 // GetInteriorValidation retrieves information about an interior file
@@ -149,11 +149,11 @@ func (c *Client) GetInteriorValidation(id uint) (InteriorValidation, error) {
 	if err != nil {
 		return InteriorValidation{}, pkgErr(err)
 	}
-	var rec InteriorValidation
-	if err := c.getDecode(path, &rec); err != nil {
+	var val InteriorValidation
+	if err := c.getDecode(path, &val); err != nil {
 		return InteriorValidation{}, pkgErr(err)
 	}
-	return rec, nil
+	return val, nil
 }
 
 // CoverDimensions calculates the required dimensions of the cover for a
@@ -193,12 +193,12 @@ func (c *Client) ValidateCover(ctx context.Context, srcUrl string, mfg PkgId, np
 // https://api.lulu.com/docs/#tag/Files-validation/operation/Validate-Cover_create
 func (c *Client) StartCoverValidation(srcUrl string, mfg PkgId, npages uint) (uint, error) {
 	payload := validateCoverReq{srcUrl, mfg, npages}
-	var rec CoverValidation
-	err := c.postDecode(validateCoverPath, payload, http.StatusCreated, &rec)
+	var val CoverValidation
+	err := c.postDecode(validateCoverPath, payload, http.StatusCreated, &val)
 	if err != nil {
 		return 0, pkgErr(err)
 	}
-	return rec.Id, nil
+	return val.Id, nil
 }
 
 // GetCoverValidiation retrieves information about a cover file
@@ -210,11 +210,11 @@ func (c *Client) GetCoverValidation(id uint) (CoverValidation, error) {
 	if err != nil {
 		return CoverValidation{}, pkgErr(err)
 	}
-	var rec CoverValidation
-	if err := c.getDecode(path, &rec); err != nil {
+	var val CoverValidation
+	if err := c.getDecode(path, &val); err != nil {
 		return CoverValidation{}, pkgErr(err)
 	}
-	return rec, nil
+	return val, nil
 }
 
 // Cost calculates the cost of a hypothetical print order without