ires 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 573e3e3d26bbe6a54df1d21e5445287b94eb628e
-  data.tar.gz: a29209459ec9bb7dea651db214c3440db9cbd09c
+  metadata.gz: 33c82f6045075a2fdb97d1ad5dc19194b899792d
+  data.tar.gz: 3152843aadd1e7fff8882e64b62f9f9a730bcc29
 SHA512:
-  metadata.gz: 7dfe086ce436074e319636b71eafa3736721c71a0c3c7bb175723e4279c15f6282d3aa72bc181d080798440612f2f70ba8ccaa3b40b2deebaad40f58a86ea3dc
-  data.tar.gz: f10ae44af632f4ed0fae261a3e26cba54985006e95913350fcde7cbba1e618037bccd5e0c69775c28cc9c2648f1498a37d51f78d115c061d87f440211feb1cde
+  metadata.gz: 8581fcad0dab4c6a373104b5eb06eb017b8dad2bd8e6f420cbfb045e4c611fe148412fdb583df0d534d0f16e05ceebda06eeb758c6021228695f2dd313f3590d
+  data.tar.gz: 377f504cbe190e9f5df79e6dfc7ffc6b1f29d02060afd3df70e6596cea9be3d8f013ad6928cdd9abad17d4f825825a814e9d6966d59d30ccd24c2d3695feddd9

data/ext/ires/image.go

@@ -19,21 +19,30 @@ import (
 )
 
 // Check expiration date
-func (i *Ires) DeleteExpireImage() {
+func (i *Ires) DeleteExpireImage() error {
 	today := time.Now().Format("20060102")
-	dir := i.readImageDir()
+	dir, err := i.readImageDir()
+	if err != nil {
+		return err
+	}
 	files, err := ioutil.ReadDir(dir)
 	if err != nil {
-		return
+		return err
 	}
 
 	for _, file := range files {
 		findName := file.Name()
-		matched, _ := path.Match(today+"_*", findName)
+		matched, err := path.Match(today+"_*", findName)
+		if err != nil {
+			return err
+		}
 		if matched {
-			deleteImage(path.Join(dir, findName))
+			if err := deleteImage(path.Join(dir, findName)); err != nil {
+				return err
+			}
 		}
 	}
+	return nil
 }
 
 // Input image type is Local or HTTP
@@ -46,7 +55,7 @@ func (i *Ires) CheckLocal() {
 }
 
 // Input image
-func (i *Ires) inputImage() bool {
+func (i *Ires) inputImage() error {
 	if i.IsLocal {
 		img, format := localImage(i.URI)
 		i.InputImage = &InputImage{
@@ -55,45 +64,53 @@ func (i *Ires) inputImage() bool {
 			URI:    i.URI,
 		}
 		i.setConfig()
-		return true
+		return nil
 	}
 	return i.downloadImage()
 }
 
 // Save http image
-func (i *Ires) downloadImage() bool {
+func (i *Ires) downloadImage() error {
 	res, err := http.Get(i.URI)
 	if err != nil {
-		return false
+		return err
 	}
 	defer res.Body.Close()
 
-	header, r := copyReader(res.Body)
-	format := formatSearch(r)
+	buf := new(bytes.Buffer)
+	io.Copy(buf, res.Body)
+	format := formatSearch(res.Body)
 
-	img, _, err := image.Decode(io.MultiReader(header, res.Body))
+	img, _, err := image.Decode(buf)
 	if err != nil {
-		return false
+		return err
+	}
+
+	var distURI string
+	if distURI, err = i.imageURI(true); err != nil {
+		return err
 	}
 
-	distURI := i.imageURI(true)
 	i.InputImage = &InputImage{
 		Image:  img,
 		Format: format,
 		URI:    distURI,
 	}
 
-	if createImage(img, distURI, format) {
-		i.setConfig()
-		return true
+	if createImage(img, distURI, format) != nil {
+		return err
+	} else {
+		if err := i.setConfig(); err != nil {
+			return err
+		}
 	}
-	return false
+	return nil
 }
 
-func createImage(img image.Image, path, format string) bool {
+func createImage(img image.Image, path, format string) error {
 	file, err := os.Create(path)
 	if err != nil {
-		return false
+		return err
 	}
 	defer file.Close()
 
@@ -107,7 +124,7 @@ func createImage(img image.Image, path, format string) bool {
 	default:
 		jpeg.Encode(file, img, nil)
 	}
-	return true
+	return nil
 }
 
 // Load image
@@ -118,11 +135,11 @@ func localImage(uri string) (image.Image, string) {
 	}
 	defer file.Close()
 
-	// Decode jpeg into image.Image
-	header, r := copyReader(file)
-	format := formatSearch(r)
+	buf := new(bytes.Buffer)
+	io.Copy(buf, file)
+	format := formatSearch(file)
 
-	img, _, err := image.Decode(io.MultiReader(header, file))
+	img, _, err := image.Decode(buf)
 	if err != nil {
 		return nil, ""
 	}
@@ -130,22 +147,26 @@ func localImage(uri string) (image.Image, string) {
 }
 
 // Set image config
-func (i *Ires) setConfig() {
+func (i *Ires) setConfig() error {
 	file, err := os.Open(i.InputImage.URI)
 	if err != nil {
-		panic(err)
+		return err
 	}
 	defer file.Close()
 
-	conf, _, err := image.DecodeConfig(file)
+	buf := new(bytes.Buffer)
+	io.Copy(buf, file)
+
+	conf, _, err := image.DecodeConfig(buf)
 	if err != nil {
-		panic(err)
+		return err
 	}
 	i.InputImage.Config = conf
+	return nil
 }
 
 // Resizing & Cropping
-func (i *Ires) resizeToCrop() image.Image {
+func (i *Ires) resizeToCrop() (image.Image, error) {
 	inputImg := i.InputImage.Image
 	var outputImg image.Image
 	isAsp, conf := i.isValidAspectRatio()
@@ -170,30 +191,36 @@ func (i *Ires) resizeToCrop() image.Image {
 		}
 
 		// Cropping
-		outputImg, _ = cutter.Crop(resizeImg, cutter.Config{
+		var err error
+		if outputImg, err = cutter.Crop(resizeImg, cutter.Config{
 			Width:   width,
 			Height:  height,
 			Mode:    cutter.Centered,
 			Options: cutter.Copy,
-		})
+		}); err != nil {
+			return nil, err
+		}
 	}
-	return outputImg
+	return outputImg, nil
 }
 
 // Delete image
-func deleteImage(path string) {
-	_, err := os.Stat(path)
-	if err == nil {
+func deleteImage(path string) error {
+	if _, err := os.Stat(path); err != nil {
+		return err
+	} else {
 		if err := os.Remove(path); err != nil {
-			panic(err)
+			return err
 		}
 	}
+	return nil
 }
 
 // Verify aspect ratio
 func (i *Ires) isValidAspectRatio() (bool, image.Config) {
 	conf := i.InputImage.Config
 	s := i.Size
+	println("\n")
 	aspH := (conf.Height * s.Width) / conf.Width
 	if aspH == s.Height {
 		return true, conf
@@ -228,13 +255,6 @@ func formatSearch(r io.Reader) string {
 	return format
 }
 
-// Copy Reader
-func copyReader(body io.Reader) (io.Reader, io.Reader) {
-	header := bytes.NewBuffer(nil)
-	r := io.TeeReader(body, header)
-	return header, r
-}
-
 // Valid resize type
 func (i *Ires) validResizeType() bool {
 	config := i.InputImage.Config

data/ext/ires/ires.go

@@ -51,16 +51,19 @@ type (
 )
 
 // Resize is ...
-func (i *Ires) Resize() string {
+func (i *Ires) Resize() (string, error) {
 	i.Mode = Resize
-	distURI := i.imageURI(false)
+	distURI, err := i.imageURI(false)
+	if err != nil {
+		return "", err
+	}
 	// When the image exists, return the image path
 	if isExistsImage(distURI) {
-		return i.targetImageURI(distURI)
+		return i.targetImageURI(distURI), nil
 	}
 
-	if !i.inputImage() {
-		return i.URI
+	if err := i.inputImage(); err != nil {
+		return "", err
 	}
 
 	var outputImg image.Image
@@ -70,20 +73,23 @@ func (i *Ires) Resize() string {
 		outputImg = i.InputImage.Image
 	}
 	createImage(outputImg, distURI, i.InputImage.Format)
-	return i.targetImageURI(distURI)
+	return i.targetImageURI(distURI), nil
 }
 
 // Crop is Crop ...
-func (i *Ires) Crop() string {
+func (i *Ires) Crop() (string, error) {
 	i.Mode = Crop
-	distURI := i.imageURI(false)
+	distURI, err := i.imageURI(false)
+	if err != nil {
+		return "", err
+	}
 	// When the image exists, return the image path
 	if isExistsImage(distURI) {
-		return i.targetImageURI(distURI)
+		return i.targetImageURI(distURI), nil
 	}
 
-	if !i.inputImage() {
-		return i.URI
+	if err := i.inputImage(); err != nil {
+		return "", err
 	}
 
 	var outputImg image.Image
@@ -98,28 +104,35 @@ func (i *Ires) Crop() string {
 		outputImg = i.InputImage.Image
 	}
 	createImage(outputImg, distURI, i.InputImage.Format)
-	return i.targetImageURI(distURI)
+	return i.targetImageURI(distURI), nil
 }
 
 // ResizeToCrop is ...
-func (i *Ires) ResizeToCrop() string {
+func (i *Ires) ResizeToCrop() (string, error) {
 	i.Mode = ResizeToCrop
-	distURI := i.imageURI(false)
+	distURI, err := i.imageURI(false)
+	if err != nil {
+		return "", err
+	}
 	// When the image exists, return the image path
 	if isExistsImage(distURI) {
-		return i.targetImageURI(distURI)
+		return i.targetImageURI(distURI), nil
 	}
 
-	if !i.inputImage() {
-		return i.URI
+	if err := i.inputImage(); err != nil {
+		return "", err
 	}
 
 	var outputImg image.Image
 	if i.validResizeType() {
-		outputImg = i.resizeToCrop()
+		if img, err := i.resizeToCrop(); err != nil {
+			return "", err
+		} else {
+			outputImg = img
+		}
 	} else {
 		outputImg = i.InputImage.Image
 	}
 	createImage(outputImg, distURI, i.InputImage.Format)
-	return i.targetImageURI(distURI)
+	return i.targetImageURI(distURI), nil
 }

data/ext/ires/uri.go

@@ -10,7 +10,7 @@ import (
 )
 
 // Generate image path
-func (i *Ires) imageURI(original bool) string {
+func (i *Ires) imageURI(original bool) (string, error) {
 	paths := []rune(i.Dir)
 	pathsLastIndex := len(paths) - 1
 	lastChar := string(paths[pathsLastIndex])
@@ -23,19 +23,23 @@ func (i *Ires) imageURI(original bool) string {
 	if i.IsLocal {
 		oDir = localPath(i.Mode)
 	} else {
-		oDir = remotePath(i.URI)
+		if d, err := remotePath(i.URI); err != nil {
+			return "", nil
+		} else {
+			oDir = d
+		}
 	}
 
 	// Create directory
 	oPath := filepath.Join(dir, oDir)
 	if _, err := os.Stat(oPath); err != nil {
 		if err := os.MkdirAll(oPath, 0777); err != nil {
-			panic(err)
+			return "", err
 		}
 	}
 
 	name := i.imageName(original)
-	return filepath.Join(oPath, name)
+	return filepath.Join(oPath, name), nil
 }
 
 // Generate image name
@@ -88,14 +92,18 @@ func isExistsImage(path string) bool {
 }
 
 // Read directory
-func (i *Ires) readImageDir() string {
+func (i *Ires) readImageDir() (string, error) {
 	var dir string
 	if i.IsLocal {
 		dir = localPath(i.Mode)
 	} else {
-		dir = remotePath(i.URI)
+		if d, err := remotePath(i.URI); err != nil {
+			return "", err
+		} else {
+			dir = d
+		}
 	}
-	return filepath.Join(i.Dir, dir)
+	return filepath.Join(i.Dir, dir), nil
 }
 
 // if local image, create ires directory
@@ -112,19 +120,19 @@ func localPath(mode Mode) string {
 	return dir
 }
 
-// if http image, parse URL & make directory
-func remotePath(uri string) string {
+// if http image, parse URI & make directory
+func remotePath(uri string) (string, error) {
 	u, err := urlx.Parse(uri)
-	dir := []string{"ires"}
 	if err != nil {
-		panic(err)
+		return "", err
 	}
+	dir := []string{"ires"}
 
 	dir = append(dir, u.Host)
 	path := strings.Split(u.Path, "/")
 	dir = append(dir, path[1:len(path)-1]...)
 
-	return strings.Join(dir, "/")
+	return strings.Join(dir, "/"), nil
 }
 
 // Optimize image path

data/ext/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"C"
+	"log"
 
 	"github.com/endotakuya/ires/ext/ires"
 )
@@ -32,13 +33,19 @@ func iresImagePath(URI *C.char, width, height, rType, mode int, Dir, Expire *C.c
 	r.DeleteExpireImage()
 
 	var distURI string
+	var err error
 	switch ires.Mode(mode) {
 	case ires.Resize:
-		distURI = r.Resize()
+		distURI, err = r.Resize()
 	case ires.Crop:
-		distURI = r.Crop()
+		distURI, err = r.Crop()
 	case ires.ResizeToCrop:
-		distURI = r.ResizeToCrop()
+		distURI, err = r.ResizeToCrop()
+	}
+
+	if err != nil {
+		log.Print(err)
+		return C.CString(r.URI)
 	}
 	return C.CString(distURI)
 }

data/lib/ires/version.rb

@@ -1,3 +1,3 @@
 module Ires
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ires
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - enta0701
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-27 00:00:00.000000000 Z
+date: 2018-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport