ires 0.3.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a02ee558f8ff8d664769a8a1da291eb828434ac0
-  data.tar.gz: 3a3a08b79dda490833e1c50840347c454c236598
+  metadata.gz: 573e3e3d26bbe6a54df1d21e5445287b94eb628e
+  data.tar.gz: a29209459ec9bb7dea651db214c3440db9cbd09c
 SHA512:
-  metadata.gz: f51c3bdd1589c058775c63caf82249f6778338e57885ad2bbbc5f6cd1383d9f8fb06f87240288cd758bc361a1625351979f6f091b65368d7541ee220817f056b
-  data.tar.gz: 2cc66ddb1eb3340afde84026893ff9eae5e36401981e9760e11d91f7649a5ef5016105e112d2c07feef2ac0cc90135c9fa5053fb4e284b46045f28e584992bb8
+  metadata.gz: 7dfe086ce436074e319636b71eafa3736721c71a0c3c7bb175723e4279c15f6282d3aa72bc181d080798440612f2f70ba8ccaa3b40b2deebaad40f58a86ea3dc
+  data.tar.gz: f10ae44af632f4ed0fae261a3e26cba54985006e95913350fcde7cbba1e618037bccd5e0c69775c28cc9c2648f1498a37d51f78d115c061d87f440211feb1cde

data/README.md

@@ -11,10 +11,10 @@
 
 ```erb
 <!-- Usually -->
-<%= ires_tag( path: "image_01.jpg", width: 90, height: 120 ) %>
+<%= 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, Ires::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
@@ -47,7 +47,7 @@ Filter of resize image.
 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

data/ext/ires/image.go

@@ -1,48 +1,48 @@
 package ires
 
 import (
-  "bytes"
-  "image"
-  "image/gif"
-  "image/jpeg"
-  "image/png"
-  "io"
-  "io/ioutil"
-  "net/http"
-  "os"
-  "path"
-  "strings"
-  "time"
+	"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"
+	"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
-  }
+	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))
-    }
-  }
+	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
-  }
+	if strings.Index(i.URI, "http") == -1 {
+		i.IsLocal = true
+	} else {
+		i.IsLocal = false
+	}
 }
 
 // Input image
@@ -50,11 +50,11 @@ func (i *Ires) inputImage() bool {
 	if i.IsLocal {
 		img, format := localImage(i.URI)
 		i.InputImage = &InputImage{
-		  Image: img,
-		  Format: format,
-		  URI: i.URI,
-    }
-    i.setConfig()
+			Image:  img,
+			Format: format,
+			URI:    i.URI,
+		}
+		i.setConfig()
 		return true
 	}
 	return i.downloadImage()
@@ -63,30 +63,30 @@ func (i *Ires) inputImage() bool {
 // Save http image
 func (i *Ires) downloadImage() bool {
 	res, err := http.Get(i.URI)
-  if err != nil {
-    return false
-  }
-  defer res.Body.Close()
+	if err != nil {
+		return false
+	}
+	defer res.Body.Close()
 
-  header, r := copyReader(res.Body)
-  format := formatSearch(r)
+	header, r := copyReader(res.Body)
+	format := formatSearch(r)
 
-  img, _, err := image.Decode(io.MultiReader(header, res.Body))
-  if err != nil {
-    return false
-  }
+	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,
-  }
+	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) {
+		i.setConfig()
+		return true
+	}
 	return false
 }
 
@@ -114,7 +114,7 @@ func createImage(img image.Image, path, format string) bool {
 func localImage(uri string) (image.Image, string) {
 	file, err := os.Open(uri)
 	if err != nil {
-    return nil, ""
+		return nil, ""
 	}
 	defer file.Close()
 
@@ -124,29 +124,29 @@ func localImage(uri string) (image.Image, string) {
 
 	img, _, err := image.Decode(io.MultiReader(header, file))
 	if err != nil {
-    return nil, ""
+		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()
+	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
+	conf, _, err := image.DecodeConfig(file)
+	if err != nil {
+		panic(err)
+	}
+	i.InputImage.Config = conf
 }
 
 // Resizing & Cropping
 func (i *Ires) resizeToCrop() image.Image {
-  inputImg := i.InputImage.Image
+	inputImg := i.InputImage.Image
 	var outputImg image.Image
 	isAsp, conf := i.isValidAspectRatio()
 
@@ -237,21 +237,21 @@ func copyReader(body io.Reader) (io.Reader, io.Reader) {
 
 // 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
+	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,56 +1,58 @@
 package ires
 
 import (
-  "image"
+	"image"
 
-  "github.com/nfnt/resize"
-  "github.com/oliamb/cutter"
+	"github.com/nfnt/resize"
+	"github.com/oliamb/cutter"
 )
 
 type Mode int
+
 const (
-  Resize Mode = iota
-  Crop
-  ResizeToCrop
+	Resize Mode = iota
+	Crop
+	ResizeToCrop
 )
 
 type ResizeType int
+
 const (
-  All ResizeType = iota
-  Smaller
-  Larger
+	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
-  }
+	// 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 {
-  i.Mode = Resize
+	i.Mode = Resize
 	distURI := i.imageURI(false)
 	// When the image exists, return the image path
 	if isExistsImage(distURI) {
@@ -63,46 +65,46 @@ func (i *Ires) Resize() string {
 
 	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
-  }
+		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 {
-  i.Mode = Crop
-  distURI := i.imageURI(false)
+	i.Mode = Crop
+	distURI := i.imageURI(false)
 	// When the image exists, return the image path
 	if isExistsImage(distURI) {
-    return i.targetImageURI(distURI)
-  }
+		return i.targetImageURI(distURI)
+	}
 
 	if !i.inputImage() {
 		return i.URI
 	}
 
-  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)
+	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 {
-  i.Mode = ResizeToCrop
-  distURI := i.imageURI(false)
+	i.Mode = ResizeToCrop
+	distURI := i.imageURI(false)
 	// When the image exists, return the image path
 	if isExistsImage(distURI) {
 		return i.targetImageURI(distURI)
@@ -112,12 +114,12 @@ func (i *Ires) ResizeToCrop() string {
 		return i.URI
 	}
 
-  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)
+	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

@@ -40,36 +40,36 @@ func (i *Ires) imageURI(original bool) string {
 
 // 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
+	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

data/lib/ires/service.rb

@@ -8,7 +8,8 @@ module Ires
     class << self
       # Resize image path
       # @return [String]
-      def path(path:, width:, height:, type: Type::ALL, mode: Mode::RESIZE, expire: 30.days)
+      def path(path:, width: nil, height: nil, type: Type::ALL, mode: Mode::RESIZE, expire: 30.days)
+        raise ArgumentError, "Either width or height is required" if width.nil? && height.nil?
         os = Ires::Os.current
         return nil if os.nil?
 
@@ -22,8 +23,8 @@ module Ires
 
         ires_element = {
           path:   full_path,
-          width:  width,
-          height: height,
+          width:  width || 0,
+          height: height || 0,
           mode:   mode,
           type:   type,
           dir:    dir,

data/lib/ires/version.rb

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

data/lib/ires/view_helper.rb

@@ -8,11 +8,13 @@ module Ires
   module ViewHelper
     # Image resize
     # @return [image_tag]
-    def ires_tag(path:, width:, height:, type: Type::ALL, mode: Mode::RESIZE, expire: 30.days, **option)
+    def ires_tag(path:, width: nil, height: nil, type: Type::ALL, mode: Mode::RESIZE, expire: 30.days, **option)
+      raise ArgumentError, "Either width or height is required" if width.nil? && height.nil?
+
       image = Ires::Service.path(
         path: path,
-        width: width,
-        height: height,
+        width: width || 0,
+        height: height || 0,
         mode: mode,
         type: type,
         expire: expire

metadata

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