paperclip-vips 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63602051cfbe3b16594382670e89a02c80556e81c2c784c347b2f5aac8a249a8
-  data.tar.gz: a474e9c00ec8505915ed84e9d2221e2a63ebef2b18a7c56042f3066d971abbf5
+  metadata.gz: 25b4601f012a9e1916a415fb83af8ea29e4f5d0a1a961bdd2a8780fb9eb09891
+  data.tar.gz: 07e04b8e2b8de1bdef06679ccfd759a1e13d88ad7c5a739710c9903e857297e4
 SHA512:
-  metadata.gz: eeaed4e84227d859bfc7fa599aa3cad2ec60fec4dded3fb5cc0eb7f23e45d57211d8ed4b42f7bfd6b7fd55647d0ec5c994ada9185bd10d66da680e67936412fd
-  data.tar.gz: 598322f555a1545a3eb8ff1a0c8eaaaedb741313deee6fa05f0469562d7eab09c33864156d0f639d7ab5e643b0c3779125b77cbf43fcc57edac39b1d0bc50e6d
+  metadata.gz: 78c286fd9428cee69a9c9e87edf2808e45eebd611f1e87e2cb48bb0f554548d82c1ddfd78dcaffc6de621cae4095bbdf257327cf0dc7330dc741169f36d2d16e
+  data.tar.gz: 8e1349c141065d91940c6ef4b504ea9bfd8e11dcf139f73b92304e9f8ca55436e43346bc8301e24f1d63a00e34590b48a881d799ce4740d0bf8e27808204f2fe

data/.gitignore

@@ -9,3 +9,5 @@
 
 # rspec failure tracking
 .rspec_status
+.byebug_history
+*.gem

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    paperclip-vips (1.0.0)
-      paperclip (>= 5.2.1)
+    paperclip-vips (1.1.0)
+      paperclip (>= 5.0.0)
       ruby-vips (~> 2.0.13)
 
 GEM
@@ -15,6 +15,7 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+    byebug (11.0.1)
     climate_control (0.2.0)
     concurrent-ruby (1.1.5)
     diff-lcs (1.3)
@@ -59,6 +60,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 2.0)
+  byebug (~> 11.0)
   paperclip-vips!
   rake (~> 10.0)
   rspec (~> 3.0)

data/lib/paperclip-vips/paperclip/vips.rb

@@ -12,20 +12,12 @@ module Paperclip
       @current_geometry = options.fetch(:file_geometry_parser, Geometry).from_file(@file)
       @whiny = options.fetch(:whiny, true)
       
-      @current_format = File.extname(@file.path)&.downcase
+      @current_format = current_format(file).downcase
       @format = options[:format] || @current_format
 
       @basename = File.basename(@file.path, @current_format)
     end
 
-    def crop
-      if @should_crop
-        return @options[:crop] || :centre
-      end
-
-      nil
-    end
-
     def make
       source = @file
       filename = [@basename, @format ? ".#{@format}" : ""].join
@@ -47,46 +39,65 @@ module Paperclip
       return destination
     end
 
-    def width
-      @target_geometry&.width || @current_geometry.width
-    end
-
-    def height
-      @target_geometry&.height || @current_geometry.height
-    end
-    
-    def process_convert_options(image)
-      if image && @options[:convert_options].present?
-        commands = JSON.parse(@options[:convert_options], symbolize_names: true)
-        commands.each do |cmd|
-          image = ::Vips::Operation.call(cmd[:cmd], [image, *cmd[:args]], cmd[:optional] || {})
+    private
+      def crop
+        if @should_crop
+          return @options[:crop] || :centre
         end
+
+        nil
       end
 
-      return image
-    end
+      def current_format(file)
+        extension = File.extname(file.path)
+        return extension if extension.present?
 
-    def save_thumbnail(thumbnail, path)
-      case @current_format
-      when ".jpeg", ".jpg"
-        save_jpg(thumbnail, path)
-      when ".gif"
-        save_gif(thumbnail, path)
-      when ".png"
-        save_png(thumbnail, path)
+        extension = File.extname(file.original_filename)
+        return extension if extension.present?
+
+        return ""
       end
-    end
 
-    def save_jpg(thumbnail, path)
-      thumbnail.jpegsave(path)
-    end
+      def width
+        @target_geometry&.width || @current_geometry.width
+      end
 
-    def save_gif(thumbnail, path)
-      thumbnail.magicksave(path)
-    end
+      def height
+        @target_geometry&.height || @current_geometry.height
+      end
+      
+      def process_convert_options(image)
+        if image && @options[:convert_options].present?
+          commands = JSON.parse(@options[:convert_options], symbolize_names: true)
+          commands.each do |cmd|
+            image = ::Vips::Operation.call(cmd[:cmd], [image, *cmd[:args]], cmd[:optional] || {})
+          end
+        end
 
-    def save_png(thumbnail, path)
-      thumbnail.pngsave(path)
-    end
+        return image
+      end
+
+      def save_thumbnail(thumbnail, path)
+        case @current_format
+        when ".jpeg", ".jpg"
+          save_jpg(thumbnail, path)
+        when ".gif"
+          save_gif(thumbnail, path)
+        when ".png"
+          save_png(thumbnail, path)
+        end
+      end
+
+      def save_jpg(thumbnail, path)
+        thumbnail.jpegsave(path)
+      end
+
+      def save_gif(thumbnail, path)
+        thumbnail.magicksave(path)
+      end
+
+      def save_png(thumbnail, path)
+        thumbnail.pngsave(path)
+      end
   end
 end

data/lib/paperclip-vips/version.rb

@@ -1,3 +1,3 @@
 module PaperclipVips
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/paperclip-vips.gemspec

@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "byebug", "~> 11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-vips
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Ken Greeff
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-31 00:00:00.000000000 Z
+date: 2019-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.0'
 description: 
 email:
 - ken@kengreeff.com
@@ -101,7 +115,6 @@ files:
 - lib/paperclip-vips.rb
 - lib/paperclip-vips/paperclip/vips.rb
 - lib/paperclip-vips/version.rb
-- paperclip-vips-1.0.0.gem
 - paperclip-vips.gemspec
 homepage: https://github.com/realhub/paperclip-vips
 licenses: