ires 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b257d1482a34c83c67287636a7370c3531aba5f2
-  data.tar.gz: 55d3577bf53d61dd0e1fa9084f1b0fe5889b96a1
+  metadata.gz: 51c855f31ee4c3154e6f11d0c58e47b1f4b1e360
+  data.tar.gz: 9529a56c17f521b8cc669c5169d2416a02e96915
 SHA512:
-  metadata.gz: 2aea5907a83563bf3cb4513ab58b8da397e40364e2b3048eb81171c5dbaed1fe48623d61bf21e4f12759161346a65de1d1efca10d0659afe6b0be798d39bd63e
-  data.tar.gz: 14471ef705b607b8277cccf03b68fa47a7b11de6c37cd9ac5b9d424525779c786eb3309451fd5ff361cd720932d99b0a046e038a97ef69d70a12f9495c883e29
+  metadata.gz: 74b58d89cb8f5062b1b1030d26f8ed4db13d298307cabab331b65e5294cc90e6665d4902d1f9775cfaecced305f63eb81d1ef47dff06aa5714d178f08171e3c8
+  data.tar.gz: 7a3d4a7eb98710e4ab36f17b96515e8449bb4ea5151de5ea325d3d48c956c83b95b31490aa07fa814b8840084eebb3b31ab1fabf626ad01008e33c55745b7af7

data/README.md

@@ -14,31 +14,40 @@
 <%= ires_tag( path: "image_01.jpg", width: 90, height: 120 ) %>
 
 <!-- Using image_tag options -->
-<%= ires_tag( path: "http://example.com/image_02.jpg", width: 200, height: 200, mode: "crop", alt: "example image" ) %>
+<%= ires_tag( path: "http://example.com/image_02.jpg", width: 200, height: 200, Ires::Mode::CROP, alt: "example image" ) %>
 ```
 
 ### Get resize path
 
 ```ruby
-Ires::Service.path( path: "<FULL IMAGE PATH>", width: 400, height: 300)
+Ires::Service.path(path: '<FULL IMAGE PATH>', width: 400, height: 300)
 => /ires/<resize image path>
 ```
 
 ### Select mode
 
-| info                       |     　　　mode 　　　  |
-|:---------------------------|:--------------------:|
-| Resize                     | resize (default)     |
-| Cropping                   | crop                 |
-| Rsize after Cropping       | rsize_to_crop        | 
+| info                       |     　　        mode       　　　  |
+|:---------------------------|:---------------------------------|
+| Resize                     | Ires::Mode::RESIZE (default)     |
+| Cropping                   | Ires::Mode::CROP                 |
+| Rsize after Cropping       | Ires::Mode::RESIZE_TO_CROP       |
 
+### Select type
+
+Filter of resize image.
+
+| info                       |     　　       type        　　　  |
+|:---------------------------|:---------------------------------|
+| All                        | Ires::Type::ALL (default)        |
+| Smaller than               | Ires::Type::SMALLER              |
+| Larger than                | Ires::Type::LARGER               |
 
 ### Specify cache expiration
 
 Default: **30days**
 
 ```erb
-<%= ires_tag( path: "/image.jpg", width: 400, height: 300, expire: 7.days ) %>
+<%= ires_tag( path: '/image.jpg', width: 400, height: 300, expire: 7.days ) %>
 ```
 
 ### Saved directory
@@ -117,7 +126,7 @@ $ dep ensure
 # Output to a shared object.
 $ CGO_ENABLED=1 GOOS=linux go build -v -buildmode=c-shared -o shared/linux/ires.so ext/main.go
 ```
-※ In the current Docker, you can build only linux environment.  
+※ In the current Docker, you can build only linux environment.
 ※ If you want to build in other environments, add GCC or install Go on the host side.🙇
 
 ### 2. Start rails server

data/ext/Gopkg.lock

@@ -2,50 +2,84 @@
 
 
 [[projects]]
+  digest = "1:8e47871087b94913898333f37af26732faaab30cdb41571136cf7aec9921dae7"
   name = "github.com/PuerkitoBio/purell"
   packages = ["."]
+  pruneopts = ""
   revision = "0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4"
   version = "v1.1.0"
 
 [[projects]]
   branch = "master"
+  digest = "1:331a419049c2be691e5ba1d24342fc77c7e767a80c666a18fd8a9f7b82419c1c"
   name = "github.com/PuerkitoBio/urlesc"
   packages = ["."]
+  pruneopts = ""
   revision = "de5bf2ad457846296e2031421a34e2568e304e35"
 
 [[projects]]
   branch = "master"
+  digest = "1:690e87555de96973ac79aae9fe51fef5e470f7e3cde3b1aa731ae01ec3f9ffe8"
   name = "github.com/goware/urlx"
   packages = ["."]
+  pruneopts = ""
   revision = "e22571dfbd216d3ca34207d9a1d877f38d8f051c"
 
 [[projects]]
   branch = "master"
+  digest = "1:74688aecdaaede7d4ea1ead4569dc5f9f8b169b3b9698470f8d107f347a7a2cd"
   name = "github.com/nfnt/resize"
   packages = ["."]
+  pruneopts = ""
   revision = "891127d8d1b52734debe1b3c3d7e747502b6c366"
 
 [[projects]]
+  digest = "1:8e8c82e661fc70a3dab1d1bb0f92b800ea32112f5926c08da9c13a46a57cc557"
   name = "github.com/oliamb/cutter"
   packages = ["."]
+  pruneopts = ""
   revision = "5cd9c24de6524b7251ac6b8600b0ba8f43a85963"
   version = "v0.2.0"
 
 [[projects]]
   branch = "master"
+  digest = "1:1418c6b5c10b5e07fb4c90a24227f6493e19ad4d31177d66458115fc47669fb5"
   name = "golang.org/x/net"
   packages = ["idna"]
+  pruneopts = ""
   revision = "1087133bc4af3073e18add999345c6ae75918503"
 
 [[projects]]
   branch = "master"
+  digest = "1:706747bb1e3f870cf0dc52459cb94324cd347142fff3b61db56c0157a5f598d0"
   name = "golang.org/x/text"
-  packages = ["collate","collate/build","internal/colltab","internal/gen","internal/tag","internal/triegen","internal/ucd","language","secure/bidirule","transform","unicode/bidi","unicode/cldr","unicode/norm","unicode/rangetable","width"]
+  packages = [
+    "collate",
+    "collate/build",
+    "internal/colltab",
+    "internal/gen",
+    "internal/tag",
+    "internal/triegen",
+    "internal/ucd",
+    "language",
+    "secure/bidirule",
+    "transform",
+    "unicode/bidi",
+    "unicode/cldr",
+    "unicode/norm",
+    "unicode/rangetable",
+    "width",
+  ]
+  pruneopts = ""
   revision = "c01e4764d870b77f8abe5096ee19ad20d80e8075"
 
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "3d6ab4a2e0add98d17152b4fad7a36186d53460b01e73cab8f775b505ce51736"
+  input-imports = [
+    "github.com/goware/urlx",
+    "github.com/nfnt/resize",
+    "github.com/oliamb/cutter",
+  ]
   solver-name = "gps-cdcl"
   solver-version = 1

data/ext/ires/image.go

@@ -1,57 +1,99 @@
 package ires
 
 import (
-	"bytes"
-	"image"
-	"image/gif"
-	"image/jpeg"
-	"image/png"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"os"
-	"path"
-	"time"
-
-	"github.com/nfnt/resize"
-	"github.com/oliamb/cutter"
+  "bytes"
+  "image"
+  "image/gif"
+  "image/jpeg"
+  "image/png"
+  "io"
+  "io/ioutil"
+  "net/http"
+  "os"
+  "path"
+  "strings"
+  "time"
+
+  "github.com/nfnt/resize"
+  "github.com/oliamb/cutter"
 )
 
+// Check expiration date
+func (i *Ires) DeleteExpireImage() {
+  today := time.Now().Format("20060102")
+  dir := i.readImageDir()
+  files, err := ioutil.ReadDir(dir)
+  if err != nil {
+    return
+  }
+
+  for _, file := range files {
+    findName := file.Name()
+    matched, _ := path.Match(today+"_*", findName)
+    if matched {
+      deleteImage(path.Join(dir, findName))
+    }
+  }
+}
+
+// Input image type is Local or HTTP
+func (i *Ires) CheckLocal() {
+  if strings.Index(i.URI, "http") == -1 {
+    i.IsLocal = true
+  } else {
+    i.IsLocal = false
+  }
+}
 
 // Input image
-func inputImage(i *Ires) (image.Image, string, bool) {
+func (i *Ires) inputImage() bool {
 	if i.IsLocal {
-		img, format := localImage(i.Uri)
-		return img, format, true
-	} else {
-		return downloadImage(i)
+		img, format := localImage(i.URI)
+		i.InputImage = &InputImage{
+		  Image: img,
+		  Format: format,
+		  URI: i.URI,
+    }
+    i.setConfig()
+		return true
 	}
+	return i.downloadImage()
 }
 
-
 // Save http image
-func downloadImage(i *Ires) (image.Image, string, bool) {
-	res, err := http.Get(i.Uri)
-	if err != nil {
-		panic(err)
-	}
-	defer res.Body.Close()
-
-	header, r := copyReader(res.Body)
-	format := formatSearch(r)
-
-	img, _, err := image.Decode(io.MultiReader(header, res.Body))
-	if err != nil {
-		return nil, "", false
-	}
-	return createImage(img, i.imagePath(IMAGE_MODE_ORIGINAL), format), format, true
+func (i *Ires) downloadImage() bool {
+	res, err := http.Get(i.URI)
+  if err != nil {
+    return false
+  }
+  defer res.Body.Close()
+
+  header, r := copyReader(res.Body)
+  format := formatSearch(r)
+
+  img, _, err := image.Decode(io.MultiReader(header, res.Body))
+  if err != nil {
+    return false
+  }
+
+  distURI := i.imageURI(true)
+  i.InputImage = &InputImage{
+    Image: img,
+    Format: format,
+    URI: distURI,
+  }
+
+  if createImage(img, distURI, format) {
+    i.setConfig()
+    return true
+  }
+	return false
 }
 
-
-func createImage(img image.Image, path, format string) image.Image {
+func createImage(img image.Image, path, format string) bool {
 	file, err := os.Create(path)
 	if err != nil {
-		panic(err)
+		return false
 	}
 	defer file.Close()
 
@@ -65,15 +107,14 @@ func createImage(img image.Image, path, format string) image.Image {
 	default:
 		jpeg.Encode(file, img, nil)
 	}
-	return img
+	return true
 }
 
-
 // Load image
 func localImage(uri string) (image.Image, string) {
 	file, err := os.Open(uri)
-	if err != nil{
-		panic(err)
+	if err != nil {
+    return nil, ""
 	}
 	defer file.Close()
 
@@ -83,24 +124,33 @@ func localImage(uri string) (image.Image, string) {
 
 	img, _, err := image.Decode(io.MultiReader(header, file))
 	if err != nil {
-		panic(err)
+    return nil, ""
 	}
 	return img, format
 }
 
+// Set image config
+func (i *Ires) setConfig() {
+  file, err := os.Open(i.InputImage.URI)
+  if err != nil {
+    panic(err)
+  }
+  defer file.Close()
+
+  conf, _, err := image.DecodeConfig(file)
+  if err != nil {
+    panic(err)
+  }
+  i.InputImage.Config = conf
+}
 
 // Resizing & Cropping
-func resizeToCrop(i *Ires, inputImg image.Image) image.Image {
+func (i *Ires) resizeToCrop() image.Image {
+  inputImg := i.InputImage.Image
 	var outputImg image.Image
-	var imagePath string
-	if i.IsLocal {
-		imagePath = i.Uri
-	} else {
-		imagePath = i.imagePath(IMAGE_MODE_ORIGINAL)
-	}
-	isAsp, conf := isValidAspectRatio(imagePath, i.Size)
+	isAsp, conf := i.isValidAspectRatio()
 
-	width  := i.Size.Width
+	width := i.Size.Width
 	height := i.Size.Height
 
 	if isAsp {
@@ -121,36 +171,15 @@ func resizeToCrop(i *Ires, inputImg image.Image) image.Image {
 
 		// Cropping
 		outputImg, _ = cutter.Crop(resizeImg, cutter.Config{
-			Width:  width,
-			Height: height,
-			Mode: cutter.Centered,
+			Width:   width,
+			Height:  height,
+			Mode:    cutter.Centered,
 			Options: cutter.Copy,
 		})
-
 	}
 	return outputImg
 }
 
-
-// Check expiration date
-func (i *Ires) deleteExpireImage(mode int) {
-	today := time.Now().Format("20060102")
-	dir := i.readImageDir(mode)
-	files, err := ioutil.ReadDir(dir)
-	if err != nil {
-		return
-	}
-
-	for _, file := range files {
-		findName := file.Name()
-		matched,_ := path.Match(today + "_*", findName)
-		if matched {
-			deleteImage(path.Join(dir, findName))
-		}
-	}
-}
-
-
 // Delete image
 func deleteImage(path string) {
 	_, err := os.Stat(path)
@@ -161,38 +190,20 @@ func deleteImage(path string) {
 	}
 }
 
-
 // Verify aspect ratio
-func isValidAspectRatio(path string, s Size) (bool, image.Config) {
-	conf := imageConfig(path)
+func (i *Ires) isValidAspectRatio() (bool, image.Config) {
+	conf := i.InputImage.Config
+	s := i.Size
 	aspH := (conf.Height * s.Width) / conf.Width
 	if aspH == s.Height {
 		return true, conf
-	} else {
-		return false, conf
-	}
-}
-
-
-// Image config
-func imageConfig(path string) image.Config {
-	file, err := os.Open(path)
-	if err != nil {
-		panic(err)
-	}
-	defer file.Close()
-
-	conf, _, err := image.DecodeConfig(file)
-	if err != nil {
-		panic(err)
 	}
-	return conf
+	return false, conf
 }
 
-
 // Select image resize mode
 func resizeMode(conf image.Config, s Size) int {
-	srcWidth  := s.Width
+	srcWidth := s.Width
 	srcHeight := s.Height
 
 	if conf.Width >= conf.Height && srcWidth >= srcHeight {
@@ -207,10 +218,9 @@ func resizeMode(conf image.Config, s Size) int {
 	return 0
 }
 
-
 // Search image format
 // if defined, return "jpeg"
-func formatSearch(r io.Reader) string{
+func formatSearch(r io.Reader) string {
 	_, format, err := image.DecodeConfig(r)
 	if err != nil {
 		return "jpeg"
@@ -218,10 +228,30 @@ 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
+  valid := false
+  switch i.ResizeType {
+  case All:
+    valid = true
+  case Smaller:
+    if config.Width < i.Width && config.Height < i.Height {
+      valid = true
+    }
+  case Larger:
+    if i.Width <= config.Width && i.Height <= config.Height {
+      valid = true
+    }
+  default:
+    valid = true
+  }
+  return valid
+}

data/ext/ires/ires.go

@@ -1,102 +1,123 @@
 package ires
 
 import (
-	"github.com/nfnt/resize"
-	"github.com/oliamb/cutter"
+  "image"
+
+  "github.com/nfnt/resize"
+  "github.com/oliamb/cutter"
 )
 
+type Mode int
 const (
-	IMAGE_MODE_RESIZE int = iota
-	IMAGE_MODE_CROP
-	IMAGE_MODE_RESIZE_TO_CROP
-	IMAGE_MODE_ORIGINAL
+  Resize Mode = iota
+  Crop
+  ResizeToCrop
 )
 
-type Size struct {
-	Width, Height int
-}
-
-type Ires struct {
-	Uri 		string
-	Size
-	Dir 		string
-	Expire 		string
-	IsLocal 	bool
-}
+type ResizeType int
+const (
+  All ResizeType = iota
+  Smaller
+  Larger
+)
 
+type (
+  // Size is ...
+  Size struct {
+    Width, Height int
+  }
+
+  // InputImage is ...
+  InputImage struct {
+    Image  image.Image
+    Config image.Config
+    Format string
+    URI    string
+  }
+
+  // Ires is ...
+  Ires struct {
+    Size
+    ResizeType
+    Mode
+    *InputImage
+    URI     string
+    Dir     string
+    Expire  string
+    IsLocal bool
+  }
+)
 
+// Resize is ...
 func (i *Ires) Resize() string {
-	// Check image type
-	i.isLocalFile()
-
-	// Delete the expiration date image
-	i.deleteExpireImage(IMAGE_MODE_RESIZE)
-
-	distPath := i.imagePath(IMAGE_MODE_RESIZE)
+  i.Mode = Resize
+	distURI := i.imageURI(false)
 	// When the image exists, return the image path
-	if isExistsImage(distPath) {
-		return i.targetImagePath(distPath)
+	if isExistsImage(distURI) {
+		return i.targetImageURI(distURI)
 	}
 
-	inputImg, format, isImageExist := inputImage(i)
-	if !isImageExist {
-		return i.Uri
+	if !i.inputImage() {
+		return i.URI
 	}
 
-	outputImg := resize.Resize(uint(i.Width), uint(i.Height), inputImg, resize.Lanczos3)
-	createImage(outputImg, distPath, format)
-	return i.targetImagePath(distPath)
+	var outputImg image.Image
+	if i.validResizeType() {
+   outputImg = resize.Resize(uint(i.Width), uint(i.Height), i.InputImage.Image, resize.Lanczos3)
+  } else {
+   outputImg = i.InputImage.Image
+  }
+	createImage(outputImg, distURI, i.InputImage.Format)
+	return i.targetImageURI(distURI)
 }
 
+// Crop is Crop ...
 func (i *Ires) Crop() string {
-	// Check image type
-	i.isLocalFile()
-
-	// Delete the expiration date image
-	i.deleteExpireImage(IMAGE_MODE_CROP)
-
-	distPath := i.imagePath(IMAGE_MODE_CROP)
+  i.Mode = Crop
+  distURI := i.imageURI(false)
 	// When the image exists, return the image path
-	if isExistsImage(distPath) {
-		return i.targetImagePath(distPath)
-	}
+	if isExistsImage(distURI) {
+    return i.targetImageURI(distURI)
+  }
 
-	inputImg, format, isImageExist := inputImage(i)
-	if !isImageExist {
-		return i.Uri
+	if !i.inputImage() {
+		return i.URI
 	}
 
-	outputImg, _ := cutter.Crop(inputImg, cutter.Config{
-		Width:  i.Width,
-		Height: i.Height,
-		Mode: cutter.Centered,
-		Options: cutter.Copy,
-	})
-	createImage(outputImg, distPath, format)
-
-	return i.targetImagePath(distPath)
+  var outputImg image.Image
+  if i.validResizeType() {
+    outputImg, _ = cutter.Crop(i.InputImage.Image, cutter.Config{
+      Width:   i.Width,
+      Height:  i.Height,
+      Mode:    cutter.Centered,
+      Options: cutter.Copy,
+    })
+  } else {
+    outputImg = i.InputImage.Image
+  }
+  createImage(outputImg, distURI, i.InputImage.Format)
+  return i.targetImageURI(distURI)
 }
 
+// ResizeToCrop is ...
 func (i *Ires) ResizeToCrop() string {
-	// Check image type
-	i.isLocalFile()
-
-	// Delete the expiration date image
-	i.deleteExpireImage(IMAGE_MODE_RESIZE_TO_CROP)
-
-	distPath := i.imagePath(IMAGE_MODE_RESIZE_TO_CROP)
+  i.Mode = ResizeToCrop
+  distURI := i.imageURI(false)
 	// When the image exists, return the image path
-	if isExistsImage(distPath) {
-		return i.targetImagePath(distPath)
+	if isExistsImage(distURI) {
+		return i.targetImageURI(distURI)
 	}
 
-	inputImg, format, isImageExist := inputImage(i)
-	if !isImageExist {
-		return i.Uri
+	if !i.inputImage() {
+		return i.URI
 	}
 
-	outputImg := resizeToCrop(i ,inputImg)
-	createImage(outputImg, distPath, format)
-
-	return i.targetImagePath(distPath)
+  var outputImg image.Image
+  if i.validResizeType() {
+    outputImg = i.resizeToCrop()
+  } else {
+    outputImg = i.InputImage.Image
+  }
+  createImage(outputImg, distURI, i.InputImage.Format)
+  return i.targetImageURI(distURI)
 }

data/ext/ires/uri.go

@@ -9,48 +9,8 @@ import (
 	"github.com/goware/urlx"
 )
 
-
-// Input image type is Local or HTTP
-func (i *Ires) isLocalFile()  {
-	if strings.Index(i.Uri, "http") == -1 {
-		i.IsLocal =  true
-	} else {
-		i.IsLocal =  false
-	}
-}
-
-
-// Generate image name
-func imageName(i *Ires, mode int) string {
-	splitPath 	:= strings.Split(i.Uri, "/")
-
-	// ex. sample.jpg
-	fileName := splitPath[len(splitPath)-1]
-	// ex. .jpg
-	ext := filepath.Ext(fileName)
-
-	name := strings.Replace(fileName, ext, "", 1)
-
-	extInfo := strings.Split(ext, "?")
-	if len(extInfo) > 1 {
-		ext = extInfo[0]
-		name += "_" + strings.Join(extInfo[1:], "")
-	}
-
-	var prefix string
-	switch mode {
-	case 0: prefix = prefixSize(i.Size) + "_resize"
-	case 1: prefix = prefixSize(i.Size) + "_crop"
-	case 2: prefix = prefixSize(i.Size) + "_resize_to_crop"
-	case 3: prefix = "original"
-	}
-
-	return i.Expire + "_" + name + "_" + prefix + ext
-}
-
-
 // Generate image path
-func (i *Ires) imagePath(mode int) string {
+func (i *Ires) imageURI(original bool) string {
 	paths := []rune(i.Dir)
 	pathsLastIndex := len(paths) - 1
 	lastChar := string(paths[pathsLastIndex])
@@ -61,9 +21,9 @@ func (i *Ires) imagePath(mode int) string {
 
 	var oDir string
 	if i.IsLocal {
-		oDir = localPath(mode)
+		oDir = localPath(i.Mode)
 	} else {
-		oDir = remotePath(i)
+		oDir = remotePath(i.URI)
 	}
 
 	// Create directory
@@ -74,10 +34,43 @@ func (i *Ires) imagePath(mode int) string {
 		}
 	}
 
-	name := imageName(i, mode)
+	name := i.imageName(original)
 	return filepath.Join(oPath, name)
 }
 
+// Generate image name
+func (i *Ires) imageName(original bool) string {
+  splitPath := strings.Split(i.URI, "/")
+
+  // ex. sample.jpg
+  fileName := splitPath[len(splitPath)-1]
+  // ex. .jpg
+  ext := filepath.Ext(fileName)
+
+  name := strings.Replace(fileName, ext, "", 1)
+
+  extInfo := strings.Split(ext, "?")
+  if len(extInfo) > 1 {
+    ext = extInfo[0]
+    name += "_" + strings.Join(extInfo[1:], "")
+  }
+
+  var prefix string
+  if original {
+    prefix = "original"
+  } else {
+    switch i.Mode {
+    case Resize:
+      prefix = prefixSize(i.Size) + "_resize"
+    case Crop:
+      prefix = prefixSize(i.Size) + "_crop"
+    case ResizeToCrop:
+      prefix = prefixSize(i.Size) + "_resize_to_crop"
+    }
+  }
+
+  return i.Expire + "_" + name + "_" + prefix + ext
+}
 
 // Create prefix by size
 // ex. 640x480
@@ -85,45 +78,43 @@ func prefixSize(s Size) string {
 	return strconv.Itoa(s.Width) + "x" + strconv.Itoa(s.Height)
 }
 
-
 // リサイズ済みのファイルがあれば、処理せず返す
 func isExistsImage(path string) bool {
 	_, err := os.Stat(path)
 	if err == nil {
 		return true
-	} else {
-		return false
 	}
+	return false
 }
 
-
 // Read directory
-func (i *Ires) readImageDir(mode int) string {
+func (i *Ires) readImageDir() string {
 	var dir string
 	if i.IsLocal {
-		dir = localPath(mode)
+		dir = localPath(i.Mode)
 	} else {
-		dir = remotePath(i)
+		dir = remotePath(i.URI)
 	}
 	return filepath.Join(i.Dir, dir)
 }
 
-
 // if local image, create ires directory
-func localPath(mode int) string {
+func localPath(mode Mode) string {
 	var dir string
 	switch mode {
-	case 0: dir = "ires/resize"
-	case 1: dir = "ires/crop"
-	case 2: dir = "ires/resize_to_crop"
+	case Resize:
+		dir = "ires/resize"
+	case Crop:
+		dir = "ires/crop"
+	case ResizeToCrop:
+		dir = "ires/resize_to_crop"
 	}
 	return dir
 }
 
-
 // if http image, parse URL & make directory
-func remotePath(i *Ires) string {
-	u, err := urlx.Parse(i.Uri)
+func remotePath(uri string) string {
+	u, err := urlx.Parse(uri)
 	dir := []string{"ires"}
 	if err != nil {
 		panic(err)
@@ -136,8 +127,7 @@ func remotePath(i *Ires) string {
 	return strings.Join(dir, "/")
 }
 
-
 // Optimize image path
-func (i *Ires) targetImagePath(path string) string {
-	return strings.Replace(path, i.Dir, "", -1)
+func (i *Ires) targetImageURI(uri string) string {
+	return strings.Replace(uri, i.Dir, "", -1)
 }

data/ext/main.go

@@ -10,32 +10,35 @@ func init() {}
 func main() {}
 
 //export iresImagePath
-func iresImagePath(Uri *C.char, width, height int, Mode, Dir, Expire *C.char) *C.char {
-	uri		:= C.GoString(Uri)
-	mode 	:= C.GoString(Mode)
-	dir 	:= C.GoString(Dir)
-	expire	:= C.GoString(Expire)
+func iresImagePath(URI *C.char, width, height, rType, mode int, Dir, Expire *C.char) *C.char {
+	uri := C.GoString(URI)
+	dir := C.GoString(Dir)
+	expire := C.GoString(Expire)
 
 	r := &ires.Ires{
-		Uri: uri,
 		Size: ires.Size{
-			Width: width,
+			Width:  width,
 			Height: height,
 		},
-		Dir: dir,
-		Expire: expire,
-		IsLocal: false,
+		ResizeType: ires.ResizeType(rType),
+		URI:        uri,
+		Dir:        dir,
+		Expire:     expire,
 	}
 
-	var imagePath string
-	switch mode {
-	case "resize":
-		imagePath = r.Resize()
-	case "crop":
-		imagePath = r.Crop()
-	case "resize_to_crop":
-		imagePath = r.ResizeToCrop()
-	}
+	// If local image, True
+	r.CheckLocal()
+	// Delete the expiration date image
+	r.DeleteExpireImage()
 
-	return C.CString(imagePath)
-}
+	var distURI string
+	switch ires.Mode(mode) {
+	case ires.Resize:
+		distURI = r.Resize()
+	case ires.Crop:
+		distURI = r.Crop()
+	case ires.ResizeToCrop:
+		distURI = r.ResizeToCrop()
+	}
+	return C.CString(distURI)
+}

data/lib/ires.rb

@@ -2,4 +2,4 @@ require 'ires/view_helper'
 
 ActiveSupport.on_load(:action_view) do
   include Ires::ViewHelper
-end
+end

data/lib/ires/core.rb

@@ -4,11 +4,17 @@ require 'ires/os'
 module Ires
   module Core
     extend FFI::Library
-    
     # NOTE: ires.so is golang object
     ffi_lib File.expand_path("../../shared/#{Ires::Os.current}/ires.so", File.dirname(__FILE__))
-    
     # resize func
-    attach_function :iresImagePath, [:string, :int, :int, :string, :string, :string], :string
+    # Type:
+    #   path:   :string
+    #   width:  :int
+    #   height: :int
+    #   type:   :int
+    #   mode:   :int
+    #   dir:    :string
+    #   expire: :string
+    attach_function :iresImagePath, %i[string int int int int string string], :string
   end
 end

data/lib/ires/mode.rb

@@ -0,0 +1,7 @@
+module Ires
+  module Mode
+    RESIZE = 0
+    CROP = 1
+    RESIZE_TO_CROP = 2
+  end
+end

data/lib/ires/os.rb

@@ -1,26 +1,25 @@
 module Ires
   module Os
     class << self
-
       # Reszie image directory
       # @return [none(ffi)]
       def current
-        if ['darwin', 'linux'].include?(os)
+        if %w[darwin linux].include?(os)
           os
         else
           logger.fatal "Ires is not supported by this #{os}"
           nil
         end
       end
-      
-      private 
+
+      private
 
       # Search OS
       # @return [String]
       def os
-        @os ||= (
-        host_os = RbConfig::CONFIG['host_os']
-        case host_os
+        @os ||= begin
+          host_os = RbConfig::CONFIG['host_os']
+          case host_os
           when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
             'windows'
           when /darwin|mac os/
@@ -31,10 +30,9 @@ module Ires
             'unix'
           else
             'unknown'
+          end
         end
-        )
       end
-
     end
   end
 end

data/lib/ires/service.rb

@@ -1,14 +1,14 @@
 require 'ires/core'
 require 'ires/os'
+require 'ires/mode'
+require 'ires/type'
 
 module Ires
   class Service
     class << self
-
       # Resize image path
       # @return [String]
-      def path(path:, width:, height:, mode: 'resize', expire: 30.days)
-
+      def path(path:, width:, height:, type: Type::ALL, mode: Mode::RESIZE, expire: 30.days)
         os = Ires::Os.current
         return nil if os.nil?
 
@@ -16,7 +16,7 @@ module Ires
 
         # if no image or could not find file path then perform the same action as 'image_tag'
         return nil if invalid_path?(full_path)
-        
+
         expiration_date = expiration_date(expire)
         dir = image_dir
 
@@ -25,6 +25,7 @@ module Ires
           width:  width,
           height: height,
           mode:   mode,
+          type:   type,
           dir:    dir,
           expire: expiration_date
         }
@@ -53,28 +54,29 @@ module Ires
       # Check file or URI
       # @return [Bool]
       def invalid_path?(path)
-        !File.exist?(path) && !path.include?("http")
+        !File.exist?(path) && !path.include?('http')
       end
 
       # Expiration date (default: 7.days)
       # ex. "20170101"
       # @return [String]
       def expiration_date(expire)
-        (Date.today + expire).strftime('%Y%m%d')
+        (Time.zone.today + expire).strftime('%Y%m%d')
       end
 
       # Image path
       # @return [String]
       def ires_image_path(ires_element)
-        Ires::Core.iresImagePath(
+        Core.iresImagePath(
           ires_element[:path],
           ires_element[:width],
           ires_element[:height],
+          ires_element[:type],
           ires_element[:mode],
           ires_element[:dir],
-          ires_element[:expire])
+          ires_element[:expire]
+        )
       end
-
     end
   end
-end
+end

data/lib/ires/type.rb

@@ -0,0 +1,7 @@
+module Ires
+  module Type
+    ALL = 0
+    SMALLER = 1
+    LARGER = 2
+  end
+end

data/lib/ires/version.rb

@@ -1,3 +1,3 @@
 module Ires
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'.freeze
 end

data/lib/ires/view_helper.rb

@@ -1,19 +1,26 @@
 require 'ires/core'
 require 'ires/service'
+require 'ires/mode'
+require 'ires/type'
 require 'action_view/helpers'
 
 module Ires
   module ViewHelper
-
     # Image resize
     # @return [image_tag]
-    def ires_tag(path:, width:, height:, mode: 'resize', expire: 30.days, **option)
-      image = Ires::Service.path(path: path, width: width, height: height, mode: mode, expire: expire)
+    def ires_tag(path:, width:, height:, type: Type::ALL, mode: Mode::RESIZE, expire: 30.days, **option)
+      image = Ires::Service.path(
+        path: path,
+        width: width,
+        height: height,
+        mode: mode,
+        type: type,
+        expire: expire
+      )
       return nil if image.nil?
 
       # Set image_tag
       image_tag(image, option)
     end
-
   end
-end
+end

data/lib/tasks/ires.rake

@@ -1,10 +1,10 @@
 require 'ires/os'
 
-desc "Build shared object"
+desc 'Build shared object'
 namespace :ires do
   task :build do
     os = Ires::Os.current
     return if os.nil?
     exec "CGO_ENABLED=1 GOOS=\"#{os}\" go build -v -buildmode=c-shared -o shared/\"#{os}\"/ires.so ext/main.go"
   end
-end
+end

data/shared/darwin/ires.h

@@ -53,7 +53,7 @@ extern "C" {
 #endif
 
 
-extern char* iresImagePath(char* p0, GoInt p1, GoInt p2, char* p3, char* p4, char* p5);
+extern char* iresImagePath(char* p0, GoInt p1, GoInt p2, GoInt p3, GoInt p4, char* p5, char* p6);
 
 #ifdef __cplusplus
 }

data/shared/linux/ires.h

@@ -1,7 +1,19 @@
-/* Created by "go tool cgo" - DO NOT EDIT. */
+/* Code generated by cmd/cgo; DO NOT EDIT. */
 
 /* package command-line-arguments */
 
+
+#line 1 "cgo-builtin-prolog"
+
+#include <stddef.h> /* for ptrdiff_t below */
+
+#ifndef GO_CGO_EXPORT_PROLOGUE_H
+#define GO_CGO_EXPORT_PROLOGUE_H
+
+typedef struct { const char *p; ptrdiff_t n; } _GoString_;
+
+#endif
+
 /* Start of preamble from import "C" comments.  */
 
 
@@ -38,7 +50,7 @@ typedef double _Complex GoComplex128;
 */
 typedef char _check_for_64_bit_pointer_matching_GoInt[sizeof(void*)==64/8 ? 1:-1];
 
-typedef struct { const char *p; GoInt n; } GoString;
+typedef _GoString_ GoString;
 typedef void *GoMap;
 typedef void *GoChan;
 typedef struct { void *t; void *v; } GoInterface;
@@ -53,7 +65,7 @@ extern "C" {
 #endif
 
 
-extern char* iresImagePath(char* p0, GoInt p1, GoInt p2, char* p3, char* p4, char* p5);
+extern char* iresImagePath(char* p0, GoInt p1, GoInt p2, GoInt p3, GoInt p4, char* p5, char* p6);
 
 #ifdef __cplusplus
 }

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: ires
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - enta0701
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2018-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ffi
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.1.8
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.8
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.8
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -1112,8 +1112,10 @@ files:
 - ext/vendor/golang.org/x/text/width/width.go
 - lib/ires.rb
 - lib/ires/core.rb
+- lib/ires/mode.rb
 - lib/ires/os.rb
 - lib/ires/service.rb
+- lib/ires/type.rb
 - lib/ires/version.rb
 - lib/ires/view_helper.rb
 - lib/tasks/ires.rake