paperclip-vips 1.0.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83158c22bc04735dc1f466e6abb2ea88fe7b8c21ecf46abc95c22737bcdd90f6
-  data.tar.gz: a922e67d9223c6097977437754dfc29b0181d3cd9f7587fb86d03e9a3b44538a
+  metadata.gz: 3ee434152fdb78f28ebf9c7c284947f5f1ead3341b419b518f3ba546f4c32578
+  data.tar.gz: 72a3e1263f7c165ec096cec5111bab762693992507bc769678cd5f1ad7a0e42e
 SHA512:
-  metadata.gz: 60b424796be1bd14b8ae5d202d97eac2ae1c80719d5087e06ea1649661aa1c6271a60d728e03b8e0f32c141a7334186dfc6dd088515b849b7775579e498a55e5
-  data.tar.gz: 3bb6bac77224fc613d5d1e2f026da27d83bbc08b2096c255fad5e03de949fae636e6d1c3a60355e3f28a9d8b6c88bf5a21ee793ef35c99420c82a72dd250bf56
+  metadata.gz: 5c505d092254d9dc6ad9170cf7fc1a1b6ed45302e9a6eb77feb7d7be2d1f8950688ea1d1aa86698f0dd392a59e29cb3cc52cf0b299ea0a861195934d2a9daa60
+  data.tar.gz: 3ee2067929f1bf42765f52c3e7986254cce4dbe52d83393f7a1743c5589a9854a08970fc12afafb88a50f05e89ba984719098d4455731fcb6356e272c23d3afd

data/.gitignore

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

data/CHANGELOG.md

@@ -0,0 +1,15 @@
+## [1.2.1] - 2022-01-31
+
+- Update dev dependencies
+
+## [1.2.0] - 2022-01-31
+
+- Update ruby-vips and dependencies
+
+## [1.1.0] - 2019-06-06
+
+- Check paperclip filename to get file format
+
+## [1.0.0] - 2019-05-31
+
+- Setup the initial project and base components.

data/Gemfile.lock

@@ -1,67 +1,75 @@
 PATH
   remote: .
   specs:
-    paperclip-vips (1.0.0)
-      paperclip (>= 5.2.1)
-      ruby-vips (~> 2.0.13)
+    paperclip-vips (1.2.1)
+      paperclip (>= 5.0.0)
+      ruby-vips (~> 2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activesupport (5.2.3)
+    activemodel (6.1.4.4)
+      activesupport (= 6.1.4.4)
+    activesupport (6.1.4.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    byebug (11.1.3)
     climate_control (0.2.0)
-    concurrent-ruby (1.1.5)
-    diff-lcs (1.3)
-    ffi (1.11.1)
-    i18n (1.6.0)
+    concurrent-ruby (1.1.9)
+    diff-lcs (1.5.0)
+    ffi (1.15.5)
+    i18n (1.9.1)
       concurrent-ruby (~> 1.0)
-    mime-types (3.2.2)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0331)
-    mimemagic (0.3.3)
-    minitest (5.11.3)
+    mime-types-data (3.2022.0105)
+    mimemagic (0.3.10)
+      nokogiri (~> 1)
+      rake
+    minitest (5.15.0)
+    nokogiri (1.12.5)
+      racc (~> 1.4)
     paperclip (6.1.0)
       activemodel (>= 4.2.0)
       activesupport (>= 4.2.0)
       mime-types
       mimemagic (~> 0.3.0)
       terrapin (~> 0.6.0)
-    rake (10.5.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.3)
+    racc (1.6.0)
+    rake (13.0.6)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.2)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    ruby-vips (2.0.13)
-      ffi (~> 1.9)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
+    ruby-vips (2.1.4)
+      ffi (~> 1.12)
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 2.0)
+  byebug (~> 11.0)
   paperclip-vips!
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
 
 BUNDLED WITH
-   2.0.1
+   2.0.2

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.0"
+  VERSION = "1.2.1"
 end

data/paperclip-vips.gemspec

@@ -22,10 +22,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'paperclip', '>= 5.2.1'
-  spec.add_runtime_dependency "ruby-vips", "~> 2.0.13"
+  spec.add_runtime_dependency 'paperclip', ">= 5.0.0"
+  spec.add_runtime_dependency "ruby-vips", "~> 2.1"
 
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.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.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Ken Greeff
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-05-31 00:00:00.000000000 Z
+date: 2022-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: ruby-vips
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.13
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.13
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +80,21 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: 
+- !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
 executables: []
@@ -90,6 +104,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -106,7 +121,7 @@ homepage: https://github.com/realhub/paperclip-vips
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -121,9 +136,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.10
+signing_key:
 specification_version: 4
 summary: Uses Ruby Vips to when creating thumbnails for faster generation.
 test_files: []