fixed imports path

CONTRIBUTING.md

@@ -19,7 +19,7 @@ First step is to fork it at http://help.github.com/fork-a-repo/ and create your
 
 Running the tests is as easy as:
 
-    make test
+    make tests
 
 You should see the results of running your tests after an instant.
 

Dockerfile

@@ -51,11 +51,11 @@ ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
 RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
 WORKDIR $GOPATH
 RUN curl -fsSL -o /usr/local/bin/dep https://github.com/golang/dep/releases/download/$DEP_VERSION/dep-linux-amd64 && chmod +x /usr/local/bin/dep
-ADD . /go/src/mort
+ADD . /go/src/github.com/aldor007/mort
 
-RUN cd /go/src/mort &&  dep ensure -vendor-only
+RUN cd /go/src/github.com/aldor007/mort &&  dep ensure -vendor-only
 # RUN build
-RUN cd /go/src/mort; go build cmd/mort.go; cp mort /go/mort; cp -r /go/src/mort/configuration /go/
+RUN cd /go/src/github.com/aldor007/mort; go build cmd/mort.go; cp mort /go/mort; cp -r /go/src/github.com/aldor007/mort/configuration /go/
 # clean up
 RUN rm -rf /go/src; rm -rf /go/pkg; rm -rf /usr/share/; rm -rf /usr/include/
 

Gopkg.toml

@@ -160,3 +160,7 @@
 [[constraint]]
   name = "github.com/spaolacci/murmur3"
   branch = "master"
+
+[[constraint]]
+  name = "github.com/aldor007/go-aws-auth"
+  branch = "master"

README.md

@@ -11,7 +11,9 @@ S3 compatible image processing server written in Go.
 * Convert (JPEG, , PNG , BMP, TIFF, ...)
 * Multiple storage backends (disk, S3, http)
 * Fully modular
-* S3 API for listing and uploading files 
+* S3 API for listing and uploading files
+* Request collapsing
+* Build in rate limiter
 
 # Demo
 -------
@@ -32,7 +34,7 @@ S3 compatible image processing server written in Go.
             </td>
             <td>
                 <a href="https://mort.mkaciuba.com/demo/small/cat.jpg" target="_blank">
-                <img src="https://mort.mkaciuba.com/demo/small/cat.jpg">
+                ![small](https://mort.mkaciuba.com/demo/small/cat.jpg)
                 </a>
             </td>
         </tr>
@@ -47,7 +49,7 @@ S3 compatible image processing server written in Go.
             </td>
             <td>
                 <a href="https://mort.mkaciuba.com/demo/blur/cat.jpg" target="_blank">
-                <img src="https://mort.mkaciuba.com/demo/blur/cat.jpg">
+                ![blur](https://mort.mkaciuba.com/demo/blur/cat.jpg")
                 </a>
             </td>
         </tr>
@@ -62,7 +64,7 @@ S3 compatible image processing server written in Go.
             </td>
             <td>
                 <a href="https://mort.mkaciuba.com/demo/webp/cat.jpg" target="_blank">
-                <img src="https://mort.mkaciuba.com/demo/webp/cat.jpg">
+                ![webp](https://mort.mkaciuba.com/demo/webp/cat.jpg)
                 </a>
             </td>
         </tr>
@@ -77,7 +79,7 @@ S3 compatible image processing server written in Go.
             </td>
             <td>
                 <a href="https://mort.mkaciuba.com/watermark/webp/cat.jpg" target="_blank">
-                <img src="https://mort.mkaciuba.com/watermark/webp/cat.jpg">
+                ![watermark](https://mort.mkaciuba.com/watermark/cat.jpg)
                 </a>
             </td>
         </tr>
@@ -88,6 +90,13 @@ S3 compatible image processing server written in Go.
 
 Mort can be used direct from Internet and behind any proxy. 
 
+## Install
+
+```bash
+go get github.com/aldor007/mort/cmd/mort.go
+```
+
+
 ## Command line help
 ```bash
 $ ./mort
@@ -109,7 +118,7 @@ headers: # overwritten all response headers of given status. This field is optio
 
 buckets: # list of available buckets 
     demo:    # bucket name 
-        keys: # list of S3 keys (optiona
+        keys: # list of S3 keys (optional)
           - accessKey: "access"
             secretAccessKey: "random"
         transform: # config for transforms
@@ -156,7 +165,7 @@ buckets: # list of available buckets
 
 ## Debian and Ubuntu
 
-We will provide Debian package when we will be completely stable ;)
+I will provide Debian package when we will be completely stable ;)
 
 ## Docker
 Pull docker image

cmd/mort.go

@@ -9,14 +9,14 @@ import (
 	"github.com/go-chi/chi"
 	"go.uber.org/zap"
 
-	"mort"
-	"mort/config"
-	"mort/lock"
-	"mort/log"
-	mortMiddleware "mort/middleware"
-	"mort/object"
-	"mort/response"
-	"mort/throttler"
+	"github.com/aldor007/mort"
+	"github.com/aldor007/mort/config"
+	"github.com/aldor007/mort/lock"
+	"github.com/aldor007/mort/log"
+	mortMiddleware "github.com/aldor007/mort/middleware"
+	"github.com/aldor007/mort/object"
+	"github.com/aldor007/mort/response"
+	"github.com/aldor007/mort/throttler"
 )
 
 const (
@@ -70,7 +70,7 @@ func main() {
 			res.Set("Access-Control-Allow-Methods", "POST, GET, OPTIONS, HEAD")
 			defer logger.Sync() // flushes buffer, if any
 			if res.HasError() {
-				log.Log().Warn("Mort process error", zap.String("obj.Key", obj.Key), zap.Error(res.Error()))
+				log.Log().Warn("github.com/aldor007/mort process error", zap.String("obj.Key", obj.Key), zap.Error(res.Error()))
 			}
 
 			res.Send(resWriter)
@@ -79,7 +79,7 @@ func main() {
 
 	router.HandleFunc("/", http.HandlerFunc(func(resWriter http.ResponseWriter, req *http.Request) {
 		resWriter.WriteHeader(400)
-		log.Log().Warn("Mort error request shouldn't go here")
+		log.Log().Warn("github.com/aldor007/mort error request shouldn't go here")
 	}))
 
 	s := &http.Server{

config/config.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"sync"
 
-	"mort/log"
+	"github.com/aldor007/mort/log"
 )
 
 // Config contains configuration for buckets etc

engine/image_engine.go

@@ -10,10 +10,10 @@ import (
 	"go.uber.org/zap"
 	"gopkg.in/h2non/bimg.v1"
 
-	"mort/log"
-	"mort/object"
-	"mort/response"
-	"mort/transforms"
+	"github.com/aldor007/mort/log"
+	"github.com/aldor007/mort/object"
+	"github.com/aldor007/mort/response"
+	"github.com/aldor007/mort/transforms"
 	"runtime"
 )
 

lock/lock.go

@@ -1,7 +1,7 @@
 package lock
 
 import (
-	"mort/response"
+	"github.com/aldor007/mort/response"
 )
 
 // Lock is responding for collapsing request for same object

lock/memory.go

@@ -1,7 +1,7 @@
 package lock
 
 import (
-	"mort/response"
+	"github.com/aldor007/mort/response"
 	"sync"
 )
 

lock/memory_test.go

@@ -3,7 +3,7 @@ package lock
 import (
 	"errors"
 	"github.com/stretchr/testify/assert"
-	"mort/response"
+	"github.com/aldor007/mort/response"
 	"testing"
 	"time"
 )

middleware/s3.go

@@ -7,8 +7,8 @@ import (
 	"strings"
 	"time"
 
-	"mort/config"
-	"mort/response"
+	"github.com/aldor007/mort/config"
+	"github.com/aldor007/mort/response"
 
 	"github.com/aldor007/go-aws-auth"
 )

object/file_object.go

@@ -6,9 +6,9 @@ import (
 	"strings"
 
 	"go.uber.org/zap"
-	"mort/config"
-	"mort/log"
-	"mort/transforms"
+	"github.com/aldor007/mort/config"
+	"github.com/aldor007/mort/log"
+	"github.com/aldor007/mort/transforms"
 	"strconv"
 )
 

object/file_object_test.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"mort/config"
-	"mort/transforms"
+	"github.com/aldor007/mort/config"
+	"github.com/aldor007/mort/transforms"
 )
 
 var imageInfo = transforms.ImageInfo{}