ires 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33c82f6045075a2fdb97d1ad5dc19194b899792d
-  data.tar.gz: 3152843aadd1e7fff8882e64b62f9f9a730bcc29
+  metadata.gz: 2042998a8a99e30b9d328bfb4e52993d2234fa18
+  data.tar.gz: a67df3fd4e441d1fa4314a2ab5008fe025016c31
 SHA512:
-  metadata.gz: 8581fcad0dab4c6a373104b5eb06eb017b8dad2bd8e6f420cbfb045e4c611fe148412fdb583df0d534d0f16e05ceebda06eeb758c6021228695f2dd313f3590d
-  data.tar.gz: 377f504cbe190e9f5df79e6dfc7ffc6b1f29d02060afd3df70e6596cea9be3d8f013ad6928cdd9abad17d4f825825a814e9d6966d59d30ccd24c2d3695feddd9
+  metadata.gz: 973d78a2170df39499f8e1b62bb5a501984aeaf58e48bc4e56f3d10344f6fd93754a3b1ce2a8ac24f8581ac79df5fdbcdbd847391181a0009b8db35063bdd32b
+  data.tar.gz: f744b48d1f87d9dcf2f2d33e2c518b3e9654e0017faf5217685f18cbab2b46fc3d77249e8b6e80d683e10b2e348c5182b4388cea8276bf66ed6cda5e61d8cc73

data/README.md

@@ -11,16 +11,16 @@
 
 ```erb
 <!-- Usually -->
-<%= ires_tag(path: "image_01.jpg", width: 90, height: 120) %>
+<%= ires_tag("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("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('<FULL IMAGE PATH>', width: 400, height: 300)
 => /ires/<resize image 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('/image.jpg', width: 400, height: 300, expire: 7.days) %>
 ```
 
 ### Saved directory
@@ -126,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/ires/ires.go

@@ -50,6 +50,25 @@ type (
 	}
 )
 
+// Init is ...
+func Init(size Size, rType int, uri, dir, expire string) (i *Ires) {
+	i = &Ires{
+		Size: 		size,
+		ResizeType: ResizeType(rType),
+		URI:        uri,
+		Dir:        dir,
+		Expire:     expire,
+	}
+
+	// If local image, True
+	i.CheckLocal()
+
+	// Delete the expiration date image
+	i.DeleteExpireImage()
+
+	return
+}
+
 // Resize is ...
 func (i *Ires) Resize() (string, error) {
 	i.Mode = Resize

data/ext/main.go

@@ -10,42 +10,49 @@ import (
 func init() {}
 func main() {}
 
-//export iresImagePath
-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{
-		Size: ires.Size{
-			Width:  width,
-			Height: height,
-		},
-		ResizeType: ires.ResizeType(rType),
-		URI:        uri,
-		Dir:        dir,
-		Expire:     expire,
+//export resizeImagePath
+func resizeImagePath(URI *C.char, width, height, rType int, Dir, Expire *C.char) *C.char {
+	uri, dir, expire := cToString(URI, Dir, Expire)
+	r := ires.Init(ires.Size{ Width: width, Height: height }, rType, uri, dir, expire)
+
+	distURI, err := r.Resize()
+	if err != nil {
+		log.Print(err)
+		return C.CString(r.URI)
 	}
+	return C.CString(distURI)
+}
+
+//export cropImagePath
+func cropImagePath(URI *C.char, width, height, rType int, Dir, Expire *C.char) *C.char {
+	uri, dir, expire := cToString(URI, Dir, Expire)
+	r := ires.Init(ires.Size{ Width: width, Height: height }, rType, uri, dir, expire)
 
-	// If local image, True
-	r.CheckLocal()
-	// Delete the expiration date image
-	r.DeleteExpireImage()
-
-	var distURI string
-	var err error
-	switch ires.Mode(mode) {
-	case ires.Resize:
-		distURI, err = r.Resize()
-	case ires.Crop:
-		distURI, err = r.Crop()
-	case ires.ResizeToCrop:
-		distURI, err = r.ResizeToCrop()
+	distURI, err := r.Crop()
+	if err != nil {
+		log.Print(err)
+		return C.CString(r.URI)
 	}
+	return C.CString(distURI)
+}
+
+//export resizeToCropImagePath
+func resizeToCropImagePath(URI *C.char, width, height, rType int, Dir, Expire *C.char) *C.char {
+	uri, dir, expire := cToString(URI, Dir, Expire)
+	r := ires.Init(ires.Size{ Width: width, Height: height }, rType, uri, dir, expire)
 
+	distURI, err := r.ResizeToCrop()
 	if err != nil {
 		log.Print(err)
 		return C.CString(r.URI)
 	}
 	return C.CString(distURI)
 }
+
+// Convert *C.char to String
+func cToString(uri, dir, expire *C.char) (u, d, e string){
+	u = C.GoString(uri)
+	d = C.GoString(dir)
+	e = C.GoString(expire)
+	return
+}

data/lib/ires/core.rb

@@ -6,15 +6,18 @@ module Ires
     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
     # 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
+    params = %i[string int int int string string]
+    attach_function :resizeImagePath, params, :string
+    attach_function :cropImagePath, params, :string
+    attach_function :resizeToCropImagePath, params, :string
   end
 end

data/lib/ires/service.rb

@@ -8,11 +8,15 @@ module Ires
     class << self
       # Resize image path
       # @return [String]
-      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?
+      def path(path, width: nil, height: nil, type: Type::ALL, mode: Mode::RESIZE, expire: 30.days)
+        raise StandardError, "#{path} is not string." unless path.kind_of?(String)
+        raise ArgumentError, "Either width or height is required." if width.nil? && height.nil?
         os = Ires::Os.current
         return nil if os.nil?
 
+        raise StandardError, "Nil location provided. Can't build URI." if path.nil?
+        return path if path.empty?
+
         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'
@@ -68,15 +72,18 @@ module Ires
       # Image path
       # @return [String]
       def ires_image_path(ires_element)
-        Core.iresImagePath(
-          ires_element[:path],
-          ires_element[:width],
-          ires_element[:height],
-          ires_element[:type],
-          ires_element[:mode],
-          ires_element[:dir],
-          ires_element[:expire]
-        )
+        mode = ires_element[:mode]
+        ires_element.delete(:mode)
+        case mode
+        when Mode::RESIZE
+          Core.resizeImagePath(*ires_element.values)
+        when Mode::CROP
+          Core.cropImagePath(*ires_element.values)
+        when Mode::RESIZE_TO_CROP
+          Core.resizeToCropImagePath(*ires_element.values)
+        else
+          Core.resizeImagePath(*ires_element.values)
+        end
       end
     end
   end

data/lib/ires/version.rb

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

data/lib/ires/view_helper.rb

@@ -8,21 +8,18 @@ module Ires
   module ViewHelper
     # Image resize
     # @return [image_tag]
-    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,
+    def ires_tag(path, width: nil, height: nil, type: Type::ALL, mode: Mode::RESIZE, expire: 30.days, **option)
+      image_path = Ires::Service.path(
+        path,
         width: width || 0,
         height: height || 0,
         mode: mode,
         type: type,
         expire: expire
       )
-      return nil if image.nil?
 
       # Set image_tag
-      image_tag(image, option)
+      image_tag(image_path, option)
     end
   end
 end

data/shared/darwin/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,11 @@ extern "C" {
 #endif
 
 
-extern char* iresImagePath(char* p0, GoInt p1, GoInt p2, GoInt p3, GoInt p4, char* p5, char* p6);
+extern char* resizeImagePath(char* p0, GoInt p1, GoInt p2, GoInt p3, char* p4, char* p5);
+
+extern char* cropImagePath(char* p0, GoInt p1, GoInt p2, GoInt p3, char* p4, char* p5);
+
+extern char* resizeToCropImagePath(char* p0, GoInt p1, GoInt p2, GoInt p3, char* p4, char* p5);
 
 #ifdef __cplusplus
 }

data/shared/linux/ires.h

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

metadata

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