Merge pull request #16 from Talento90/feature-context

Feature context
Talento90 · Oct 21, 2018 · ccedd6b · ccedd6b
2 parents bcd2b77 + 6e03ef3
commit ccedd6b
Show file tree

Hide file tree

Showing 34 changed files with 153 additions and 54 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,8 @@
 *.so
 *.dylib
 gin-bin
+debug
+imgartapi
 
 # Test binary, build with `go test -c`
 *.test

diff --git a/debug b/debug
diff --git a/effect/blur.go b/effect/blur.go
@@ -1,6 +1,7 @@
 package effect
 
 import (
+	"context"
 	"image"
 
 	"github.com/disintegration/imaging"
@@ -29,7 +30,7 @@ func NewBlur() imgart.Effect {
 	}
 }
 
-func (r *blur) Transform(img image.Image, params map[string]interface{}) (image.Image, error) {
+func (r *blur) Transform(ctx context.Context, img image.Image, params map[string]interface{}) (image.Image, error) {
 	sigma, err := floatBinder("sigma", params)
 
 	if err != nil {
@@ -38,5 +39,5 @@ func (r *blur) Transform(img image.Image, params map[string]interface{}) (image.
 
 	img = imaging.Blur(img, sigma)
 
-	return img, nil
+	return img, ctx.Err()
 }
diff --git a/effect/blur_test.go b/effect/blur_test.go
@@ -1,6 +1,7 @@
 package effect
 
 import (
+	"context"
 	"image"
 	"testing"
 
@@ -31,7 +32,7 @@ func TestBlurTransform(t *testing.T) {
 			img := image.NewRGBA(image.Rect(0, 0, 100, 50))
 			blur := NewBlur()
 
-			_, err := blur.Transform(img, tc.params)
+			_, err := blur.Transform(context.Background(), img, tc.params)
 
 			if tc.err != "" {
 				if err == nil || !errors.Is(tc.err, err) {

diff --git a/effect/brightness.go b/effect/brightness.go
@@ -1,6 +1,7 @@
 package effect
 
 import (
+	"context"
 	"image"
 
 	"github.com/disintegration/imaging"
@@ -29,7 +30,7 @@ func NewBrightness() imgart.Effect {
 	}
 }
 
-func (r *brightness) Transform(img image.Image, params map[string]interface{}) (image.Image, error) {
+func (r *brightness) Transform(ctx context.Context, img image.Image, params map[string]interface{}) (image.Image, error) {
 	percentage, err := floatBinder("percentage", params)
 
 	if err != nil {
@@ -38,5 +39,5 @@ func (r *brightness) Transform(img image.Image, params map[string]interface{}) (
 
 	img = imaging.AdjustBrightness(img, percentage)
 
-	return img, nil
+	return img, ctx.Err()
 }
diff --git a/effect/brightness_test.go b/effect/brightness_test.go
@@ -1,6 +1,7 @@
 package effect
 
 import (
+	"context"
 	"image"
 	"testing"
 
@@ -31,7 +32,7 @@ func TestBrightnessTransform(t *testing.T) {
 			img := image.NewRGBA(image.Rect(0, 0, 100, 50))
 			brightness := NewBrightness()
 
-			_, err := brightness.Transform(img, tc.params)
+			_, err := brightness.Transform(context.Background(), img, tc.params)
 
 			if tc.err != "" {
 				if err == nil || !errors.Is(tc.err, err) {

diff --git a/effect/contrast.go b/effect/contrast.go
@@ -1,6 +1,7 @@
 package effect
 
 import (
+	"context"
 	"image"
 
 	"github.com/disintegration/imaging"
@@ -29,7 +30,7 @@ func NewContrast() imgart.Effect {
 	}
 }
 
-func (r *contrast) Transform(img image.Image, params map[string]interface{}) (image.Image, error) {
+func (r *contrast) Transform(ctx context.Context, img image.Image, params map[string]interface{}) (image.Image, error) {
 	percentage, err := floatBinder("percentage", params)
 
 	if err != nil {
@@ -38,5 +39,5 @@ func (r *contrast) Transform(img image.Image, params map[string]interface{}) (im
 
 	img = imaging.AdjustContrast(img, percentage)
 
-	return img, nil
+	return img, ctx.Err()
 }
diff --git a/effect/contrast_test.go b/effect/contrast_test.go
@@ -1,6 +1,7 @@
 package effect
 
 import (
+	"context"
 	"image"
 	"testing"
 
@@ -26,7 +27,7 @@ func TestContrastTransform(t *testing.T) {
 			img := image.NewRGBA(image.Rect(0, 0, 100, 50))
 			constrast := NewContrast()
 
-			_, err := constrast.Transform(img, tc.params)
+			_, err := constrast.Transform(context.Background(), img, tc.params)
 
 			if tc.err != "" {
 				if err == nil || !errors.Is(tc.err, err) {

diff --git a/effect/crop.go b/effect/crop.go
@@ -1,6 +1,7 @@
 package effect
 
 import (
+	"context"
 	"image"
 
 	"github.com/disintegration/imaging"
@@ -29,7 +30,7 @@ func NewCrop() imgart.Effect {
 	}
 }
 
-func (o *crop) Transform(img image.Image, params map[string]interface{}) (image.Image, error) {
+func (o *crop) Transform(ctx context.Context, img image.Image, params map[string]interface{}) (image.Image, error) {
 	rectangle, err := rectangleBinder("rectangle", params)
 
 	if err != nil {
@@ -38,5 +39,5 @@ func (o *crop) Transform(img image.Image, params map[string]interface{}) (image.
 
 	img = imaging.Crop(img, rectangle)
 
-	return img, nil
+	return img, ctx.Err()
 }
diff --git a/effect/crop_test.go b/effect/crop_test.go
@@ -1,6 +1,7 @@
 package effect
 
 import (
+	"context"
 	"image"
 	"testing"
 
@@ -30,7 +31,7 @@ func TestCropTransform(t *testing.T) {
 			img := image.NewRGBA(image.Rect(0, 0, 100, 50))
 			crop := NewCrop()
 
-			_, err := crop.Transform(img, tc.params)
+			_, err := crop.Transform(context.Background(), img, tc.params)
 
 			if tc.err != "" {
 				if err == nil || !errors.Is(tc.err, err) {

diff --git a/effect/gamma.go b/effect/gamma.go
@@ -1,6 +1,7 @@
 package effect
 
 import (
+	"context"
 	"image"
 
 	"github.com/disintegration/imaging"
@@ -29,7 +30,7 @@ func NewGamma() imgart.Effect {
 	}
 }
 
-func (r *gamma) Transform(img image.Image, params map[string]interface{}) (image.Image, error) {
+func (r *gamma) Transform(ctx context.Context, img image.Image, params map[string]interface{}) (image.Image, error) {
 	gamma, err := floatBinder("gamma", params)
 
 	if err != nil {
@@ -38,5 +39,5 @@ func (r *gamma) Transform(img image.Image, params map[string]interface{}) (image
 
 	img = imaging.AdjustGamma(img, gamma)
 
-	return img, nil
+	return img, ctx.Err()
 }
diff --git a/effect/gamma_test.go b/effect/gamma_test.go
@@ -1,6 +1,7 @@
 package effect
 
 import (
+	"context"
 	"image"
 	"testing"
 
@@ -27,7 +28,7 @@ func TestGammaTransform(t *testing.T) {
 			img := image.NewRGBA(image.Rect(0, 0, 100, 50))
 			gamma := NewGamma()
 
-			_, err := gamma.Transform(img, tc.params)
+			_, err := gamma.Transform(context.Background(), img, tc.params)
 
 			if tc.err != "" {
 				if err == nil || !errors.Is(tc.err, err) {

diff --git a/effect/overlay.go b/effect/overlay.go
@@ -1,6 +1,7 @@
 package effect
 
 import (
+	"context"
 	"image"
 
 	"github.com/disintegration/imaging"
@@ -44,7 +45,7 @@ func NewOverlay(imgRepository imgart.ImageRepository) imgart.Effect {
 	}
 }
 
-func (o *overlay) Transform(img image.Image, params map[string]interface{}) (image.Image, error) {
+func (o *overlay) Transform(ctx context.Context, img image.Image, params map[string]interface{}) (image.Image, error) {
 	position, err := pointBinder("position", params)
 
 	if err != nil {
@@ -63,13 +64,13 @@ func (o *overlay) Transform(img image.Image, params map[string]interface{}) (ima
 		opacity = 100
 	}
 
-	overlayImg, _, err := o.imgRepository.Get(url.String())
+	overlayImg, _, err := o.imgRepository.Get(ctx, url.String())
 
 	if err != nil {
 		return nil, err
 	}
 
 	img = imaging.Overlay(img, overlayImg, position, opacity)
 
-	return img, nil
+	return img, ctx.Err()
 }
diff --git a/effect/overlay_test.go b/effect/overlay_test.go
@@ -1,6 +1,7 @@
 package effect
 
 import (
+	"context"
 	"image"
 	"testing"
 
@@ -40,7 +41,7 @@ func TestOverlayTransform(t *testing.T) {
 			img := image.NewRGBA(image.Rect(0, 0, 100, 50))
 			overlay := NewOverlay(mock.NewImageRepository())
 
-			_, err := overlay.Transform(img, tc.params)
+			_, err := overlay.Transform(context.Background(), img, tc.params)
 
 			if tc.err != "" {
 				if err == nil || !errors.Is(tc.err, err) {

diff --git a/effect/resize.go b/effect/resize.go
@@ -1,6 +1,7 @@
 package effect
 
 import (
+	"context"
 	"image"
 
 	"github.com/disintegration/imaging"
@@ -43,7 +44,7 @@ func NewResize() imgart.Effect {
 	}
 }
 
-func (r *resize) Transform(img image.Image, params map[string]interface{}) (image.Image, error) {
+func (r *resize) Transform(ctx context.Context, img image.Image, params map[string]interface{}) (image.Image, error) {
 	width, err := integerBinder("width", params)
 
 	if err != nil {
@@ -64,5 +65,5 @@ func (r *resize) Transform(img image.Image, params map[string]interface{}) (imag
 
 	img = imaging.Resize(img, width, height, filter)
 
-	return img, nil
+	return img, ctx.Err()
 }
diff --git a/effect/resize_test.go b/effect/resize_test.go
@@ -1,6 +1,7 @@
 package effect
 
 import (
+	"context"
 	"image"
 	"testing"
 
@@ -39,7 +40,7 @@ func TestResizeTransform(t *testing.T) {
 			img := image.NewRGBA(image.Rect(0, 0, 100, 50))
 			resize := NewResize()
 
-			_, err := resize.Transform(img, tc.params)
+			_, err := resize.Transform(context.Background(), img, tc.params)
 
 			if tc.err != "" {
 				if err == nil || !errors.Is(tc.err, err) {

diff --git a/effect/rotate.go b/effect/rotate.go
@@ -1,6 +1,7 @@
 package effect
 
 import (
+	"context"
 	"image"
 	"image/color"
 
@@ -38,7 +39,7 @@ func NewRotate() imgart.Effect {
 	}
 }
 
-func (r *rotate) Transform(img image.Image, params map[string]interface{}) (image.Image, error) {
+func (r *rotate) Transform(ctx context.Context, img image.Image, params map[string]interface{}) (image.Image, error) {
 	angle, err := floatBinder("angle", params)
 
 	if err != nil {
@@ -53,5 +54,5 @@ func (r *rotate) Transform(img image.Image, params map[string]interface{}) (imag
 
 	img = imaging.Rotate(img, angle, bgColor)
 
-	return img, nil
+	return img, ctx.Err()
 }
diff --git a/effect/rotate_test.go b/effect/rotate_test.go
@@ -1,6 +1,7 @@
 package effect
 
 import (
+	"context"
 	"image"
 	"testing"
 
@@ -34,7 +35,7 @@ func TestRotateTransform(t *testing.T) {
 			img := image.NewRGBA(image.Rect(0, 0, 100, 50))
 			rotate := NewRotate()
 
-			_, err := rotate.Transform(img, tc.params)
+			_, err := rotate.Transform(context.Background(), img, tc.params)
 
 			if tc.err != "" {
 				if err == nil || !errors.Is(tc.err, err) {

diff --git a/errors/errors.go b/errors/errors.go
@@ -1,5 +1,9 @@
 package errors
 
+import (
+	"context"
+)
+
 // Error applicational
 type Error struct {
 	Type    Type
@@ -35,6 +39,10 @@ const (
 	Validation Type = "validation"
 	// AlreadyExists error
 	AlreadyExists Type = "already_exists"
+	// Timeout error
+	Timeout Type = "timeout"
+	// Cancelled error
+	Cancelled Type = "cancelled"
 )
 
 func (t Type) String() string {
@@ -49,6 +57,10 @@ func (t Type) String() string {
 		return "Validation error"
 	case AlreadyExists:
 		return "Item already exists"
+	case Cancelled:
+		return "Cancelled error"
+	case Timeout:
+		return "Timeout error"
 	}
 
 	return "Unknown error"
@@ -88,6 +100,19 @@ func EInternal(msg string, err error) error {
 	return New(Internal, msg, err)
 }
 
+// IsContextError creates an error of type Cancelled or Deadline
+func IsContextError(err error) error {
+	if err == context.Canceled {
+		return New(Cancelled, "Operation cancelled", err)
+	}
+
+	if err.Error() == context.DeadlineExceeded.Error() {
+		return New(Timeout, "Operation timeout", err)
+	}
+
+	return nil
+}
+
 // Is method checks if an error is of a specific type
 func Is(t Type, err error) bool {
 	e, ok := err.(*Error)