ires 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0565bf2a942fa52271a911d75f8eff2472eaa57
-  data.tar.gz: 792f9f8516dcd41ac657c60e30de84a924f4f692
+  metadata.gz: 251701d58fac515d1934c13b3918f2f8b2bc78de
+  data.tar.gz: 1896850d80b1efacc2e2c9d30fdea8c54554090a
 SHA512:
-  metadata.gz: dc68f28de50c7e0ce82667540c6133453b9085085146781af6f3eb7a680ecd3906ebff4060d93fa08dcfd8c8c02b5adcf3123e50731f864bec2481d88b81908d
-  data.tar.gz: ba4c5bd6e0fea9b8d716793f4df0df790d8e8fed2bd00ad1775db891e781cf3d2afa274c0703b4b25a09e701b8fb72fd1fac77900cb2ead58242f8368057d2f9
+  metadata.gz: 53ce5e4d3f6772cc8e0693ba100ccfc597c1dc45b66cfb12725e654086e5f568e68b3f596e6ed6edf48e837def11d480ce2ae8a5848953da8aa27bf1958a3bd4
+  data.tar.gz: c51b9cac6a3057f9cb61c0be82e0590a5e0413f59cfebe6e61bd3b6aa4e4270dfd09b5d2125f19bd0c7600822b67c4116a25a63a2e4391a08cb707b0be5c461f

data/ext/ires/ires.go

@@ -0,0 +1,114 @@
+package ires
+
+import (
+	"strings"
+
+	"github.com/endotakuya/ires/ext/operate"
+	"github.com/endotakuya/ires/ext/util/uri"
+	"github.com/nfnt/resize"
+	"github.com/oliamb/cutter"
+)
+
+const (
+	IMAGE_MODE_RESIZE int = iota
+	IMAGE_MODE_CROP
+	IMAGE_MODE_RESIZE_TO_CROP
+	IMAGE_MODE_ORIGINAL
+)
+
+type Request struct {
+	Uri 	string
+	Width 	int
+	Height 	int
+	Dir 	string
+	Expire 	string
+}
+
+
+func (r *Request) Resize() string {
+	size := []int{r.Width, r.Height}
+
+	// Delete the expiration date image
+	util.DeleteExpireImage(r.Uri, r.Dir, IMAGE_MODE_RESIZE, size...)
+
+	path := r.fullPath(IMAGE_MODE_RESIZE)
+	// When the image exists, return the image path
+	if util.IsExistsImage(path) {
+		return r.imagePath(path)
+	}
+
+	inputImg, format, isImageExist := operate.InputImage(r.Uri, r.originalFullPath())
+	if !isImageExist {
+		return r.Uri
+	}
+
+	outputImg 		:= resize.Resize(uint(r.Width), uint(r.Height), inputImg, resize.Lanczos3)
+	_, fullPath, _ 	:= operate.CreateImage(outputImg, path, format)
+
+	return r.imagePath(fullPath)
+}
+
+func (r *Request) Crop() string {
+	size := []int{r.Width, r.Height}
+
+	// Delete the expiration date image
+	util.DeleteExpireImage(r.Uri, r.Dir, IMAGE_MODE_CROP, size...)
+
+	path := r.fullPath(IMAGE_MODE_CROP)
+	// When the image exists, return the image path
+	if util.IsExistsImage(path) {
+		return r.imagePath(path)
+	}
+
+	inputImg, format, isImageExist := operate.InputImage(r.Uri, r.originalFullPath())
+	if !isImageExist {
+		return r.Uri
+	}
+
+	outputImg, _ := cutter.Crop(inputImg, cutter.Config{
+		Width:  r.Width,
+		Height: r.Height,
+		Mode: cutter.Centered,
+		Options: cutter.Copy,
+	})
+	_, fullPath, _ := operate.CreateImage(outputImg, path, format)
+
+	return r.imagePath(fullPath)
+}
+
+func (r *Request) ResizeToCrop() string {
+	size := []int{r.Width, r.Height}
+
+	// Delete the expiration date image
+	util.DeleteExpireImage(r.Uri, r.Dir, IMAGE_MODE_RESIZE_TO_CROP, size...)
+
+	path := r.fullPath(IMAGE_MODE_RESIZE_TO_CROP)
+	// When the image exists, return the image path
+	if util.IsExistsImage(path) {
+		return r.imagePath(path)
+	}
+
+	originalImagePath := r.originalFullPath()
+	inputImg, format, isImageExist := operate.InputImage(r.Uri, originalImagePath)
+	if !isImageExist {
+		return r.Uri
+	}
+
+	outputImg 		:= operate.ResizeToCrop(originalImagePath, size, inputImg)
+	_, fullPath, _ 	:= operate.CreateImage(outputImg, path, format)
+
+	return r.imagePath(fullPath)
+}
+
+func (r *Request) fullPath(mode int) string {
+	size := []int{ r.Width, r.Height }
+	return util.NewImagePath(r.Uri, r.Dir, r.Expire, mode, size...)
+}
+
+func (r *Request) originalFullPath() string {
+	return util.NewImagePath(r.Uri, r.Dir, r.Expire, IMAGE_MODE_ORIGINAL)
+}
+
+func (r *Request) imagePath(fullPath string) string {
+	return strings.Replace(fullPath, r.Dir, "", -1)
+}

data/ext/main.go

@@ -2,19 +2,8 @@ package main
 
 import (
 	"C"
-	"strings"
 
-	"github.com/nfnt/resize"
-	"github.com/oliamb/cutter"
-	"github.com/endotakuya/ires/ext/util/uri"
-	"github.com/endotakuya/ires/ext/operate"
-)
-
-const (
-	IMAGE_MODE_RESIZE int = iota
-	IMAGE_MODE_CROP
-	IMAGE_MODE_RESIZE_TO_CROP
-	IMAGE_MODE_ORIGINAL
+	"github.com/endotakuya/ires/ext/ires"
 )
 
 func init() {}
@@ -26,28 +15,15 @@ func resizeImage(Uri *C.char, width, height int, Dir, Expire *C.char) *C.char {
 	dir 	:= C.GoString(Dir)
 	expire	:= C.GoString(Expire)
 
-	size := []int{width, height}
-	path := util.NewImagePath(uri, dir, expire, IMAGE_MODE_RESIZE, size...)
-	originalPath := util.NewImagePath(uri, dir, expire, IMAGE_MODE_ORIGINAL)
-
-	// Delete the expiration date image
-	util.DeleteExpireImage(uri, dir, IMAGE_MODE_RESIZE, size...)
-
-	// When the image exists, return the image path
-	if util.IsExistsImage(path) {
-		return C.CString(strings.Replace(path, dir, "", -1))
-	}
-
-	inputImg, _, isImageExist := operate.InputImage(uri, originalPath)
-	if !isImageExist {
-		return C.CString(uri)
+	r := &ires.Request{
+		Uri: uri,
+		Width: width,
+		Height: height,
+		Dir: dir,
+		Expire: expire,
 	}
-	outputImg 	:= resize.Resize(uint(width), uint(height), inputImg, resize.Lanczos3)
-
-	_, filePath, _ := operate.CreateImage(outputImg, path)
 
-	fileName := strings.Replace(filePath, dir, "", -1)
-	return C.CString(fileName)
+	return C.CString(r.Resize())
 }
 
 //export cropImage
@@ -56,33 +32,15 @@ func cropImage(Uri *C.char, width, height int, Dir, Expire *C.char) *C.char {
 	dir 	:= C.GoString(Dir)
 	expire	:= C.GoString(Expire)
 
-	size := []int{width, height}
-	path := util.NewImagePath(uri, dir, expire, IMAGE_MODE_CROP, size...)
-	originalPath := util.NewImagePath(uri, dir, expire, IMAGE_MODE_ORIGINAL)
-
-	// Delete the expiration date image
-	util.DeleteExpireImage(uri, dir, IMAGE_MODE_CROP, size...)
-
-	// When the image exists, return the image path
-	if util.IsExistsImage(path) {
-		return C.CString(strings.Replace(path, dir, "", -1))
-	}
-
-	inputImg, _, isImageExist := operate.InputImage(uri, originalPath)
-	if !isImageExist {
-		return C.CString(uri)
-	}
-	outputImg, _ := cutter.Crop(inputImg, cutter.Config{
-		Width:  width,
+	r := &ires.Request{
+		Uri: uri,
+		Width: width,
 		Height: height,
-		Mode: cutter.Centered,
-		Options: cutter.Copy,
-	})
-
-	_, filePath, _ := operate.CreateImage(outputImg, path)
+		Dir: dir,
+		Expire: expire,
+	}
 
-	fileName := strings.Replace(filePath, dir, "", -1)
-	return C.CString(fileName)
+	return C.CString(r.Crop())
 }
 
 //export resizeToCropImage
@@ -91,25 +49,13 @@ func resizeToCropImage(Uri *C.char, width, height int, Dir, Expire *C.char) *C.c
 	dir 	:= C.GoString(Dir)
 	expire	:= C.GoString(Expire)
 
-	size := []int{width, height}
-	path := util.NewImagePath(uri, dir, expire, IMAGE_MODE_RESIZE_TO_CROP, size...)
-	originalPath := util.NewImagePath(uri, dir, expire, IMAGE_MODE_ORIGINAL)
-
-	// Delete the expiration date image
-	util.DeleteExpireImage(uri, dir, IMAGE_MODE_RESIZE_TO_CROP, size...)
-
-	// When the image exists, return the image path
-	if util.IsExistsImage(path) {
-		return C.CString(strings.Replace(path, dir, "", -1))
-	}
-
-	inputImg, imgPath, isImageExist := operate.InputImage(uri, originalPath)
-	if !isImageExist {
-		return C.CString(uri)
+	r := &ires.Request{
+		Uri: uri,
+		Width: width,
+		Height: height,
+		Dir: dir,
+		Expire: expire,
 	}
-	outputImg := operate.ResizeToCrop(imgPath, size, inputImg)
-	_, filePath, _ := operate.CreateImage(outputImg, path)
 
-	fileName := strings.Replace(filePath, dir, "", -1)
-	return C.CString(fileName)
+	return C.CString(r.ResizeToCrop())
 }

data/ext/operate/image.go

@@ -1,8 +1,12 @@
 package operate
 
 import (
+	"bytes"
 	"image"
+	"image/gif"
 	"image/jpeg"
+	"image/png"
+	"io"
 	"net/http"
 	"os"
 
@@ -11,17 +15,19 @@ import (
 	"github.com/oliamb/cutter"
 )
 
-// 入力画像
+
 func InputImage(uri, path string) (image.Image, string, bool) {
 	if util.IsLocalFile(uri) {
-		return LocalImage(uri), uri, true
+		img, format := LocalImage(uri)
+		return img, format, true
 	} else {
 		img, path, isImageExist := DownloadImage(uri, path)
 		return img, path, isImageExist
 	}
 }
 
-// http経由での画像を保存
+
+// Save http image
 func DownloadImage(uri, path string) (image.Image, string, bool) {
 	res, err := http.Get(uri)
 	if err != nil {
@@ -29,28 +35,40 @@ func DownloadImage(uri, path string) (image.Image, string, bool) {
 	}
 	defer res.Body.Close()
 
-	img, _, err := image.Decode(res.Body)
+	header, r := copyReader(res.Body)
+	format := formatSearch(r)
+
+	img, _, err := image.Decode(io.MultiReader(header, res.Body))
 	if err != nil {
 		return nil, path, false
 	}
-	return CreateImage(img, path)
+	return CreateImage(img, path, format)
 }
 
-// 画像を作成
-func CreateImage(img image.Image, path string) (image.Image, string, bool) {
+
+func CreateImage(img image.Image, path, format string) (image.Image, string, bool) {
 	file, err := os.Create(path)
 	if err != nil {
 		panic(err)
 	}
 	defer file.Close()
 
-	jpeg.Encode(file, img, nil)
+	switch format {
+	case "jpeg":
+		jpeg.Encode(file, img, nil)
+	case "png":
+		png.Encode(file, img)
+	case "gif":
+		gif.Encode(file, img, nil)
+	default:
+		jpeg.Encode(file, img, nil)
+	}
 
-	return LocalImage(path), path, true
+	return img, path, true
 }
 
-// ローカルの画像を取得
-func LocalImage(uri string) image.Image {
+
+func LocalImage(uri string) (image.Image, string) {
 	file, err := os.Open(uri)
 	if err != nil{
 		panic(err)
@@ -58,14 +76,17 @@ func LocalImage(uri string) image.Image {
 	defer file.Close()
 
 	// Decode jpeg into image.Image
-	img, err := jpeg.Decode(file)
+	header, r := copyReader(file)
+	format := formatSearch(r)
+
+	img, _, err := image.Decode(io.MultiReader(header, file))
 	if err != nil {
 		panic(err)
 	}
-	return img
+	return img, format
 }
 
-// リサイズ + 切り取り
+
 func ResizeToCrop(path string, size []int, inputImg image.Image) image.Image {
 	var outputImg image.Image
 	isAsp, conf := isValidAspectRatio(path, size)
@@ -98,7 +119,7 @@ func ResizeToCrop(path string, size []int, inputImg image.Image) image.Image {
 	return outputImg
 }
 
-// 変更するサイズと画像のアスペクト比が一致するかどうか
+
 func isValidAspectRatio(path string, size []int) (bool, image.Config) {
 	conf := imageConfig(path)
 	aspH := (conf.Height * size[0]) / conf.Width
@@ -109,7 +130,7 @@ func isValidAspectRatio(path string, size []int) (bool, image.Config) {
 	}
 }
 
-// 入力画像の情報を取得
+
 func imageConfig(path string) image.Config {
 	file, err := os.Open(path)
 	if err != nil {
@@ -124,7 +145,7 @@ func imageConfig(path string) image.Config {
 	return conf
 }
 
-// アスペクト比の異なる画像に対するモード設定
+
 func resizeMode(conf image.Config, size []int) int {
 	if conf.Width >= conf.Height && size[0] >= size[1] {
 		return 1
@@ -136,4 +157,20 @@ func resizeMode(conf image.Config, size []int) int {
 		return 4
 	}
 	return 0
+}
+
+
+func formatSearch(r io.Reader) string{
+	_, format, err := image.DecodeConfig(r)
+	if err != nil {
+		return "jpeg"
+	}
+	return format
+}
+
+
+func copyReader(body io.Reader) (io.Reader, io.Reader) {
+	header := bytes.NewBuffer(nil)
+	r := io.TeeReader(body, header)
+	return header, r
 }

data/ext/vendor/github.com/satori/go.uuid/LICENSE

@@ -0,0 +1,20 @@
+Copyright (C) 2013-2016 by Maxim Bublis <b@codemonkey.ru>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/ext/vendor/github.com/satori/go.uuid/README.md

@@ -0,0 +1,65 @@
+# UUID package for Go language
+
+[![Build Status](https://travis-ci.org/satori/go.uuid.png?branch=master)](https://travis-ci.org/satori/go.uuid)
+[![Coverage Status](https://coveralls.io/repos/github/satori/go.uuid/badge.svg?branch=master)](https://coveralls.io/github/satori/go.uuid)
+[![GoDoc](http://godoc.org/github.com/satori/go.uuid?status.png)](http://godoc.org/github.com/satori/go.uuid)
+
+This package provides pure Go implementation of Universally Unique Identifier (UUID). Supported both creation and parsing of UUIDs.
+
+With 100% test coverage and benchmarks out of box.
+
+Supported versions:
+* Version 1, based on timestamp and MAC address (RFC 4122)
+* Version 2, based on timestamp, MAC address and POSIX UID/GID (DCE 1.1)
+* Version 3, based on MD5 hashing (RFC 4122)
+* Version 4, based on random numbers (RFC 4122)
+* Version 5, based on SHA-1 hashing (RFC 4122)
+
+## Installation
+
+Use the `go` command:
+
+	$ go get github.com/satori/go.uuid
+
+## Requirements
+
+UUID package requires Go >= 1.2.
+
+## Example
+
+```go
+package main
+
+import (
+	"fmt"
+	"github.com/satori/go.uuid"
+)
+
+func main() {
+	// Creating UUID Version 4
+	u1 := uuid.NewV4()
+	fmt.Printf("UUIDv4: %s\n", u1)
+
+	// Parsing UUID from string input
+	u2, err := uuid.FromString("6ba7b810-9dad-11d1-80b4-00c04fd430c8")
+	if err != nil {
+		fmt.Printf("Something gone wrong: %s", err)
+	}
+	fmt.Printf("Successfully parsed: %s", u2)
+}
+```
+
+## Documentation
+
+[Documentation](http://godoc.org/github.com/satori/go.uuid) is hosted at GoDoc project.
+
+## Links
+* [RFC 4122](http://tools.ietf.org/html/rfc4122)
+* [DCE 1.1: Authentication and Security Services](http://pubs.opengroup.org/onlinepubs/9696989899/chap5.htm#tagcjh_08_02_01_01)
+
+## Copyright
+
+Copyright (C) 2013-2016 by Maxim Bublis <b@codemonkey.ru>.
+
+UUID package released under MIT License.
+See [LICENSE](https://github.com/satori/go.uuid/blob/master/LICENSE) for details.