added test

Author: aldor007

cmd/mort.go

@@ -20,7 +20,7 @@ func main() {
 
 	// Route => handler
 	e.GET("/*", func(ctx echo.Context) error {
-		obj, err := object.NewFileObject(ctx.Request().URL.Path)
+		obj, err := object.NewFileObject(ctx.Request().URL.Path, imgConfig)
 		if err != nil {
 			return ctx.NoContent(400)
 		}

config/config.go

@@ -31,8 +31,10 @@ func (self *Config) Init(filePath string) {
 	errYaml := yaml.Unmarshal([]byte(data), self)
 
 	for name, bucket := range self.Buckets {
-		bucket.Transform.PathRegexp = regexp.MustCompile(bucket.Transform.Path)
-		self.Buckets[name] = bucket
+		if bucket.Transform != nil && bucket.Transform.Path != "" {
+			bucket.Transform.PathRegexp = regexp.MustCompile(bucket.Transform.Path)
+			self.Buckets[name] = bucket
+		}
 	}
 
 	if errYaml != nil {

config/yaml.go

@@ -50,7 +50,7 @@ type StorageTypes struct {
 }
 
 type Bucket struct {
-	Transform TransformYaml `yaml:"transform"`
+	Transform *TransformYaml `yaml:"transform",omitempty`
 	Storages  StorageTypes `yaml:"storages"`
 }
 

gopher.png

@@ -34,30 +34,30 @@ type FileObject struct {
 	Uri        string                `json:"uri"`
 	Bucket     string                `json:"bucket"`
 	Key        string                `json:"key"`
-	Parent     string                `json:"parent"`
 	Transforms transforms.Transforms `json:"transforms"`
 	Storage    config.Storage        `json:"storage"`
+	Parent    *FileObject
 }
 
-func NewFileObject(path string) (*FileObject, error) {
+func NewFileObject(path string, mortConfig *config.Config) (*FileObject, error) {
 	obj := FileObject{}
 	obj.Uri = path
 
-	err := obj.decode()
+	err := obj.decode(mortConfig)
 	Logger.Infof("key = %s bucket = %s parent = %s\n", obj.Key, obj.Bucket, obj.Parent)
 	return &obj, err
 }
 
-func (self *FileObject) decode() error {
+func (self *FileObject) decode(mortConfig *config.Config) error {
 	elements := strings.Split(self.Uri, "/")
 	if len(elements) < 3 {
 		return errors.New("Invalid path")
 	}
 
 	self.Bucket = elements[1]
 	self.Key = "/" + strings.Join(elements[2:], "/")
-	if bucket, ok := config.GetInstance().Buckets[self.Bucket]; ok {
-		self.decodeKey(bucket)
+	if bucket, ok := mortConfig.Buckets[self.Bucket]; ok {
+		self.decodeKey(bucket, mortConfig)
 		if self.HasTransform() {
 			self.Storage = bucket.Storages.Transform
 		} else {
@@ -71,29 +71,33 @@ func (self *FileObject) decode() error {
 	return nil
 }
 
-func (self *FileObject) decodeKey(bucket config.Bucket) error {
+func (self *FileObject) decodeKey(bucket config.Bucket, mortConfig *config.Config) error {
+	if bucket.Transform == nil {
+		return nil
+	}
+
 	trans := bucket.Transform
 	matches := trans.PathRegexp.FindStringSubmatch(self.Key)
-	if len(matches) == 0 {
+	if len(matches)  < 3 {
 		return nil
 	}
 
 	presetName := string(matches[trans.Order.PresetName + 1])
 	parent := "/" + string(matches[trans.Order.Parent + 1])
 
 	self.Transforms = presetToTransform(bucket.Transform.Presets[presetName])
-	self.Parent = parent
+	parentObj, _ := NewFileObject(parent, mortConfig)
+	self.Parent = parentObj
 	return nil
 }
 
 
 func (self *FileObject) GetParent() *FileObject {
-	parent, _ := NewFileObject(self.Parent)
-	return parent
+	return self.Parent
 }
 
 func (self *FileObject) HasParent() bool {
-	return self.Parent != ""
+	return self.Parent != nil
 }
 
 func (self *FileObject) HasTransform() bool {

object/file_object.go

@@ -0,0 +1,6 @@
+buckets:
+    bucket:
+        storages:
+            basic:
+                kind: "local"
+                rootPath: "/Users/aldor/workspace/mkaciubacom/web"

object/testdata/bucket-no-transform.yml

@@ -0,0 +1,21 @@
+buckets:
+    bucket:
+        transform:
+            path: "\\/+(?:[a-z)+\\/([a-z0-9_]+)\\/(.*)"
+            kind: "presets"
+            order:
+              presetName: 0
+              parent: 1
+            presets:
+                blog_small:
+                    quality: 75
+                    filters:
+                        thumbnail: { size: [100, 70], mode: outbound }
+                        interlace:
+                            mode: line
+        storages:
+            basic:
+                kind: "local"
+                rootPath: "/Users/aldor/workspace/mkaciubacom/web"
+            transform:
+                kind: "local"