ires 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66797c484af9e7c031cc342f26b4665b7f76313f
-  data.tar.gz: fc97bea1182999376c00f08fdfb087995dcd84cd
+  metadata.gz: 023001af021142239fda30dfb1e8175965e7d88c
+  data.tar.gz: b7680a40d6a9a75cdc543db2e74e5a3a3f87d483
 SHA512:
-  metadata.gz: a1188b7281b891486501c101d71843a7d89ac1be0e006413cdf98459693fd2a3735ac388b8d529e6459d43d298a906d18ea27c6844a8a68df27a181b0f0c17ee
-  data.tar.gz: 83e1fa789edf1182ccb60976889a510148c8889f51aed4561b953a7b340e583c2af67d249e10e4649a0cf822f56f3136aabae4010b0e8d2aa8e9e412b741e468
+  metadata.gz: 7a87de597b8b366c7351030ed3cd902f1b1b8f9fe9f0f62bbd6bf8a7868dbd543f31451b6b0727c1a7abf836688faa8788df5314bb700d3c251ae599ce0b180b
+  data.tar.gz: 5b09fde65eb7f157cdc29a0f92722c279c04684995fa9c5e4c18de609582ba029ffd9a45dd669e2cf328828ba00d8ddec2f5869b1fda27be9a86b8d7e2ad4d3c

data/README.md

@@ -1,4 +1,8 @@
 # Ires
+
+[![Gem Version](https://badge.fury.io/rb/ires.svg)](https://badge.fury.io/rb/ires)
+
+
 `Ires` is image resizer gem.
 
 ## Usage
@@ -19,32 +23,51 @@
 | Cropping                   | crop                 |
 | Rsize after Cropping       | rsize_to_crop        | 
 
+
+### Specify cache expiration
+
+Default: **30days**
+
+```erb
+<%= ires_tag( path: "/image.jpg", width: 400, height: 300, expire: 7.days ) %>
+```
+
 ### Saved directory
 
 ```
 .
-└── public
-    └── ires
-        ├── crop
-        │   └── 300x220
-        │       └── image_300x220.jpg
-        ├── original
-        │   └── original
-        │       └── image.jpg
-        ├── resize
-        │   ├── 200x150
-        │   │   └── image_200x150.jpg
-        │   ├── 300x220
-        │   │   └── image_300x220.jpg
-        │   ├── 300x400
-        │   │   └── image_300x400.jpg
-        │   ├── 400x300
-        │   │   └── image_400x300.jpg
-        │   └── 90x120
-        │       └── image_90x120.jpg
-        └── resize_to_crop
-            └── 300x220
-                └── image_300x220.jpg
+└──  public
+    ├── image.jpg
+    └── ires
+        ├── crop
+        │   ├── 150x150
+        │   │   └── 20171012_image.jpg
+        │   ├── 200x170
+        │   │   └── 20171019_image.jpg
+        │   ├── 400x300
+        │   │   └── 20171028_image.jpg
+        │   └── 640x480
+        │       └── 20171005_image.jpg
+        ├── original
+        │   └── original
+        ├── resize
+        │   ├── 150x150
+        │   │   └── 20171012_image.jpg
+        │   ├── 200x170
+        │   │   └── 20171019_image.jpg
+        │   ├── 400x300
+        │   │   └── 20171028_image.jpg
+        │   └── 640x480
+        │       └── 20171005_image.jpg
+        └── resize_to_crop
+            ├── 150x150
+            │   └── 20171012_image.jpg
+            ├── 200x170
+            │   └── 20171019_image.jpg
+            ├── 400x300
+            │   └── 20171028_image.jpg
+            └── 640x480
+                └── 20171005_image.jpg
 ```
 
 `original` directory where downloaded images are saved.

data/ext/main.go

@@ -14,47 +14,64 @@ const (
 	IMAGE_MODE_RESIZE int = iota
 	IMAGE_MODE_CROP
 	IMAGE_MODE_RESIZE_TO_CROP
+	IMAGE_MODE_ORIGINAL
 )
 
 func init() {}
 func main() {}
 
 //export resizeImage
-func resizeImage(Uri *C.char, width, height int, Dir *C.char) *C.char {
-	dir := C.GoString(Dir)
-	uri := C.GoString(Uri)
+func resizeImage(Uri *C.char, width, height int, Dir, Expire *C.char) *C.char {
+	uri		:= C.GoString(Uri)
+	dir 	:= C.GoString(Dir)
+	expire	:= C.GoString(Expire)
 
 	size := []int{width, height}
-	path := util.NewImagePath(uri, dir, IMAGE_MODE_RESIZE, size...)
+	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.IsEmptyImage(path) {
+	if util.IsExistsImage(path) {
 		return C.CString(strings.Replace(path, dir, "", -1))
 	}
 
-	inputImg, _ := operate.InputImage(uri, dir)
+	inputImg, _, isImageExist := operate.InputImage(uri, originalPath)
+	if !isImageExist {
+		return C.CString(uri)
+	}
 	outputImg 	:= resize.Resize(uint(width), uint(height), inputImg, resize.Lanczos3)
 
-	_, filePath := operate.CreateImage(outputImg, path)
+	_, filePath, _ := operate.CreateImage(outputImg, path)
 
 	fileName := strings.Replace(filePath, dir, "", -1)
 	return C.CString(fileName)
 }
 
 //export cropImage
-func cropImage(Uri *C.char, width, height int, Dir *C.char) *C.char {
-	dir := C.GoString(Dir)
-	uri := C.GoString(Uri)
+func cropImage(Uri *C.char, width, height int, Dir, Expire *C.char) *C.char {
+	uri		:= C.GoString(Uri)
+	dir 	:= C.GoString(Dir)
+	expire	:= C.GoString(Expire)
 
 	size := []int{width, height}
-	path := util.NewImagePath(uri, dir, IMAGE_MODE_CROP, size...)
+	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.IsEmptyImage(path) {
+	if util.IsExistsImage(path) {
 		return C.CString(strings.Replace(path, dir, "", -1))
 	}
 
-	inputImg, _ := operate.InputImage(uri, dir)
+	inputImg, _, isImageExist := operate.InputImage(uri, originalPath)
+	if !isImageExist {
+		return C.CString(uri)
+	}
 	outputImg, _ := cutter.Crop(inputImg, cutter.Config{
 		Width:  width,
 		Height: height,
@@ -62,28 +79,36 @@ func cropImage(Uri *C.char, width, height int, Dir *C.char) *C.char {
 		Options: cutter.Copy,
 	})
 
-	_, filePath := operate.CreateImage(outputImg, path)
+	_, filePath, _ := operate.CreateImage(outputImg, path)
 
 	fileName := strings.Replace(filePath, dir, "", -1)
 	return C.CString(fileName)
 }
 
 //export resizeToCropImage
-func resizeToCropImage(Uri *C.char, width, height int, Dir *C.char) *C.char {
-	dir := C.GoString(Dir)
-	uri := C.GoString(Uri)
+func resizeToCropImage(Uri *C.char, width, height int, Dir, Expire *C.char) *C.char {
+	uri		:= C.GoString(Uri)
+	dir 	:= C.GoString(Dir)
+	expire	:= C.GoString(Expire)
 
 	size := []int{width, height}
-	path := util.NewImagePath(uri, dir, IMAGE_MODE_RESIZE_TO_CROP, size...)
+	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.IsEmptyImage(path) {
+	if util.IsExistsImage(path) {
 		return C.CString(strings.Replace(path, dir, "", -1))
 	}
 
-	inputImg, imgPath := operate.InputImage(uri, dir)
+	inputImg, imgPath, isImageExist := operate.InputImage(uri, originalPath)
+	if !isImageExist {
+		return C.CString(uri)
+	}
 	outputImg := operate.ResizeToCrop(imgPath, size, inputImg)
-	_, filePath := operate.CreateImage(outputImg, path)
+	_, filePath, _ := operate.CreateImage(outputImg, path)
 
 	fileName := strings.Replace(filePath, dir, "", -1)
 	return C.CString(fileName)

data/ext/operate/image.go

@@ -12,17 +12,17 @@ import (
 )
 
 // 入力画像
-func InputImage(uri, dir string) (image.Image, string) {
+func InputImage(uri, path string) (image.Image, string, bool) {
 	if util.IsLocalFile(uri) {
-		return LocalImage(uri), uri
+		return LocalImage(uri), uri, true
 	} else {
-		img, path := DownloadImage(uri, util.NewImagePath(uri, dir, 3))
-		return img, path
+		img, path, isImageExist := DownloadImage(uri, path)
+		return img, path, isImageExist
 	}
 }
 
 // http経由での画像を保存
-func DownloadImage(uri, path string) (image.Image, string) {
+func DownloadImage(uri, path string) (image.Image, string, bool) {
 	res, err := http.Get(uri)
 	if err != nil {
 		panic(err)
@@ -31,13 +31,13 @@ func DownloadImage(uri, path string) (image.Image, string) {
 
 	img, _, err := image.Decode(res.Body)
 	if err != nil {
-		panic(err)
+		return nil, path, false
 	}
 	return CreateImage(img, path)
 }
 
 // 画像を作成
-func CreateImage(img image.Image, path string) (image.Image, string) {
+func CreateImage(img image.Image, path string) (image.Image, string, bool) {
 	file, err := os.Create(path)
 	if err != nil {
 		panic(err)
@@ -46,7 +46,7 @@ func CreateImage(img image.Image, path string) (image.Image, string) {
 
 	jpeg.Encode(file, img, nil)
 
-	return LocalImage(path), path
+	return LocalImage(path), path, true
 }
 
 // ローカルの画像を取得

data/ext/util/uri/uri.go

@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"strconv"
 	"strings"
-	"io/ioutil"
+	"time"
 )
 
 // ローカルの画像かどうか
@@ -26,19 +26,16 @@ func getImageName(uri string) (string, string) {
 }
 
 // 画像のフルパスを生成
-func NewImagePath(uri, dir string, mode int, size ...int) string {
-	name := NewImageName(uri, size...)
+func NewImagePath(uri, dir, expire string, mode int, size ...int) string {
+	name := NewImageName(uri, expire)
 	return FilePath(name, dir, mode, size...)
 }
 
 // ファイル名を生成
-func NewImageName(uri string, size ...int) string {
+func NewImageName(uri, expire string) string {
 	imageName, ext := getImageName(uri)
-	if len(size) == 2 {
-		imageName += "_" + PrefixSize(size...)
-	}
-	imageName += ext
-	return imageName
+	fullImageName := expire + "_" + imageName + ext
+	return fullImageName
 }
 
 // 画像を保存するパスの設定
@@ -53,10 +50,10 @@ func FilePath(name string, d string, mode int, size ...int) string {
 	// 画像格納先
 	var oDir string
 	switch mode {
-	case 0: 	oDir = "ires/resize"
-	case 1: 	oDir = "ires/crop"
-	case 2: 	oDir = "ires/resize_to_crop"
-	default: 	oDir = "ires/original"
+	case 0: oDir = "ires/resize"
+	case 1: oDir = "ires/crop"
+	case 2: oDir = "ires/resize_to_crop"
+	case 3: oDir = "ires/original"
 	}
 
 	var prefix string
@@ -86,11 +83,23 @@ func PrefixSize(size ...int) string {
 }
 
 // リサイズ済みのファイルがあれば、処理せず返す
-func IsEmptyImage(path string) bool {
-	_, err := ioutil.ReadFile(path)
-	if err != nil {
+func IsExistsImage(path string) bool {
+	_, err := os.Stat(path)
+	if err == nil {
 		return true
 	} else {
 		return false
 	}
+}
+
+// 有効期限に達した画像を削除
+func DeleteExpireImage(uri, dir string, mode int, size ...int) {
+	today := time.Now().Format("20060102")
+	path := NewImagePath(uri, dir, today, mode, size...)
+	_, err := os.Stat(path)
+	if err == nil {
+		if err := os.Remove(path); err != nil {
+			panic(err)
+		}
+	}
 }

data/lib/ires/service.rb

@@ -1,4 +1,4 @@
-require "ffi"
+require 'ffi'
 require 'ires/util'
 
 module Ires
@@ -12,8 +12,8 @@ module Ires
     ffi_lib File.expand_path("../../shared/#{os}/ires.so", File.dirname(__FILE__))
     
     # resize func
-    attach_function :resizeImage,       [:string, :int, :int, :string], :string
-    attach_function :cropImage,         [:string, :int, :int, :string], :string
-    attach_function :resizeToCropImage, [:string, :int, :int, :string], :string  
+    attach_function :resizeImage,       [:string, :int, :int, :string, :string], :string
+    attach_function :cropImage,         [:string, :int, :int, :string, :string], :string
+    attach_function :resizeToCropImage, [:string, :int, :int, :string, :string], :string  
   end
 end

data/lib/ires/version.rb

@@ -1,3 +1,3 @@
 module Ires
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/ires/view_helper.rb

@@ -1,19 +1,43 @@
+require 'net/http'
+
 module Ires
   module ViewHelper
 
     # Image resize
     # return [image_tag]
-    def ires_tag(path:, width:, height:, mode: "resize", **option)
+    def ires_tag(path:, width:, height:, mode: "resize", expire: 30.days, **option)
       full_path = image_full_path(path.to_s)
 
+      # if no image or could not find file path then perform the same action as 'image_tag'
+      return image_tag(path, option) if !File.exist?(full_path) && !full_path.include?("http")
+
+      # Expiration date (default: 7.days)
+      # ex. "20170101"
+      expiration_date = (Date.today + expire).strftime("%Y%m%d")
+    
       # Reszie image 
       case mode
       when "resize"
-        @image = Ires::Service.resizeImage(full_path, width, height, image_dir)
+        @image = Ires::Service.resizeImage(
+          full_path,
+          width,
+          height,
+          image_dir,
+          expiration_date)
       when "crop"
-        @image = Ires::Service.cropImage(full_path, width, height, image_dir)
+        @image = Ires::Service.cropImage(
+          full_path,
+          width,
+          height,
+          image_dir,
+          expiration_date)
       when "resize_to_crop"
-        @image = Ires::Service.resizeToCropImage(full_path, width, height, image_dir)  
+        @image = Ires::Service.resizeToCropImage(
+          full_path,
+          width,
+          height,
+          image_dir,
+          expiration_date)  
       end
 
       return nil if @image.nil?

data/shared/darwin/ires.h

@@ -53,11 +53,11 @@ extern "C" {
 #endif
 
 
-extern char* resizeImage(char* p0, GoInt p1, GoInt p2, char* p3);
+extern char* resizeImage(char* p0, GoInt p1, GoInt p2, char* p3, char* p4);
 
-extern char* cropImage(char* p0, GoInt p1, GoInt p2, char* p3);
+extern char* cropImage(char* p0, GoInt p1, GoInt p2, char* p3, char* p4);
 
-extern char* resizeToCropImage(char* p0, GoInt p1, GoInt p2, char* p3);
+extern char* resizeToCropImage(char* p0, GoInt p1, GoInt p2, char* p3, char* p4);
 
 #ifdef __cplusplus
 }

data/shared/linux/ires.h

@@ -53,11 +53,11 @@ extern "C" {
 #endif
 
 
-extern char* resizeImage(char* p0, GoInt p1, GoInt p2, char* p3);
+extern char* resizeImage(char* p0, GoInt p1, GoInt p2, char* p3, char* p4);
 
-extern char* cropImage(char* p0, GoInt p1, GoInt p2, char* p3);
+extern char* cropImage(char* p0, GoInt p1, GoInt p2, char* p3, char* p4);
 
-extern char* resizeToCropImage(char* p0, GoInt p1, GoInt p2, char* p3);
+extern char* resizeToCropImage(char* p0, GoInt p1, GoInt p2, char* p3, char* p4);
 
 #ifdef __cplusplus
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ires
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - enta0701
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-27 00:00:00.000000000 Z
+date: 2017-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi