fix: composition operation has no required fields anymore

rokka-io · Mar 6, 2018 · a048b22 · a048b22
1 parent 685532c
commit a048b22
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 19 deletions.
diff --git a/cmd/gen/operations.go b/cmd/gen/operations.go
@@ -166,12 +166,12 @@ func (o *Operations) UnmarshalJSON(data []byte) error {
 		if err != nil {
 			return err
 		}
+		*o = append(*o, op.(Operation))
 		if err := json.Unmarshal(v.Options, op); err != nil {
 			// BUG(mweibel): We continue here when such an error is reached because rokka sometimes (legacy reasons)
 			//               has options on an operation which are not of the correct type. Should we write something to stdout? also not nice though..
 			continue
 		}
-		*o = append(*o, op.(Operation))
 	}
 	return nil
 }

diff --git a/cmd/gen/testdata/operations_object.go.snapshot b/cmd/gen/testdata/operations_object.go.snapshot
@@ -41,12 +41,12 @@ func (o *Operations) UnmarshalJSON(data []byte) error {
 		if err != nil {
 			return err
 		}
+		*o = append(*o, op.(Operation))
 		if err := json.Unmarshal(v.Options, op); err != nil {
 			// BUG(mweibel): We continue here when such an error is reached because rokka sometimes (legacy reasons)
 			//               has options on an operation which are not of the correct type. Should we write something to stdout? also not nice though..
 			continue
 		}
-		*o = append(*o, op.(Operation))
 	}
 	return nil
 }

diff --git a/rokka/operations_objects.go b/rokka/operations_objects.go
diff --git a/rokka/operations_objects_test.go b/rokka/operations_objects_test.go
@@ -91,7 +91,7 @@ var operationObjectsTests = []struct {
 	{"AutorotateOperation with multiple args", AutorotateOperation{Width: IntPtr(10), Height: IntPtr(20), RotationDirection: StrPtr("clockwise")}, true, "autorotate-height-20-rotation_direction-clockwise-width-10"},
 	{"BlurOperation with missing args", BlurOperation{}, false, "blur"},
 	{"BlurOperation with valid args", BlurOperation{Sigma: Float64Ptr(1.337)}, true, "blur-sigma-1.337"},
-	{"CompositionOperation missing args", CompositionOperation{}, false, "composition"},
+	{"CompositionOperation missing args", CompositionOperation{}, true, "composition"},
 	{"CompositionOperation with valid args", CompositionOperation{Anchor: StrPtr("top"), Height: IntPtr(10), Width: IntPtr(20), Mode: StrPtr("test")}, true, "composition-anchor-top-height-10-mode-test-width-20"},
 	{"CropOperation with missing args", CropOperation{}, false, "crop"},
 	{"CropOperation with valid args", CropOperation{Height: IntPtr(100), Width: IntPtr(200)}, true, "crop-height-100-width-200"},

diff --git a/rokka/render_test.go b/rokka/render_test.go
@@ -52,7 +52,7 @@ func TestGetURLWithCustomImageHost(t *testing.T) {
 
 func TestGetURLWithInvalidStackOperation(t *testing.T) {
 	operations := []Operation{
-		CompositionOperation{},
+		CropOperation{},
 	}
 
 	c := NewClient(&Config{})