attachment_saver 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f6490e7e2047044a90f1e1173bde73a2f8d35a74
-  data.tar.gz: 0ca89b3a3ee2ef6ab30edbda1ca24dc33cf733bc
+SHA256:
+  metadata.gz: 88bee0b1c6ab4d3d068770c288a4f724cf7c6486570b59b00141cfce744a3596
+  data.tar.gz: 0db2e591edefa6b2c9b1fb1ac3466bd76c8432acd885dd6c6387fa7441f6a749
 SHA512:
-  metadata.gz: c4e7a26570502f01844906d7c2d2bdd258b80cc4abaf41f44fffeb358875b87b6600de35f98e74757ace80f93a4e23f34fad1142a9544ac4c844cbb8dfbd43f6
-  data.tar.gz: ad2e45480b8c97d37878bb4f98a60d3a6899b865519bea7c510f8a6f1a9c264393f183f0b30bc63dfdf0c7a6740dba4371fa8dd42319200f754b416cdc13d981
+  metadata.gz: d837872c933bcc2fc557ddc210d05d1a0d46fe27f0f4c2b484cab5b6c47b836eb0dfbb6e3e00dfb24d32df51eb96520890dc92d0f20da9870924c61851db2e3e
+  data.tar.gz: 19577ea9e1c123a5b265943911d3f1c1a601a962fb6f5e5c79853a3bdf7ac3045f99257d59860e306815c3a5ea046fe489d577353d72b641fc0079118d8ed06a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    attachment_saver (1.5.1)
+    attachment_saver (1.6.0)
       activerecord
       mimemagic
 
@@ -10,48 +10,47 @@ GEM
   specs:
     RubyInline (3.12.4)
       ZenTest (~> 4.3)
-    ZenTest (4.11.1)
-    activemodel (5.2.0.beta2)
-      activesupport (= 5.2.0.beta2)
-    activerecord (5.2.0.beta2)
-      activemodel (= 5.2.0.beta2)
-      activesupport (= 5.2.0.beta2)
+    ZenTest (4.11.2)
+    activemodel (5.2.3)
+      activesupport (= 5.2.3)
+    activerecord (5.2.3)
+      activemodel (= 5.2.3)
+      activesupport (= 5.2.3)
       arel (>= 9.0)
-    activesupport (5.2.0.beta2)
+    activesupport (5.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (9.0.0)
-    concurrent-ruby (1.0.5)
-    gdk_pixbuf2 (3.2.1)
-      gio2 (= 3.2.1)
-    gio2 (3.2.1)
-      glib2 (= 3.2.1)
-      gobject-introspection (= 3.2.1)
-    glib2 (3.2.1)
+    concurrent-ruby (1.1.5)
+    gdk_pixbuf2 (3.3.6)
+      gio2 (= 3.3.6)
+    gio2 (3.3.6)
+      gobject-introspection (= 3.3.6)
+    glib2 (3.3.6)
       native-package-installer (>= 1.0.3)
-      pkg-config (>= 1.2.2)
-    gobject-introspection (3.2.1)
-      glib2 (= 3.2.1)
-    i18n (0.9.1)
+      pkg-config (>= 1.3.5)
+    gobject-introspection (3.3.6)
+      glib2 (= 3.3.6)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     image_science (1.3.0)
       RubyInline (~> 3.9)
-    image_size (1.5.0)
+    image_size (2.0.2)
     metaclass (0.0.4)
-    mimemagic (0.3.2)
-    mini_magick (4.8.0)
-    minitest (5.11.0)
-    mocha (1.3.0)
+    mimemagic (0.3.3)
+    mini_magick (4.9.5)
+    minitest (5.11.3)
+    mocha (1.9.0)
       metaclass (~> 0.0.1)
-    native-package-installer (1.0.6)
-    pkg-config (1.2.9)
-    rake (12.3.0)
-    rmagick (2.16.0)
-    sqlite3 (1.3.13)
+    native-package-installer (1.0.7)
+    pkg-config (1.3.7)
+    rake (12.3.3)
+    rmagick (4.0.0)
+    sqlite3 (1.4.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.4)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -70,4 +69,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.16.1
+   1.16.4

data/lib/attachment_saver/version.rb

@@ -1,3 +1,3 @@
 module AttachmentSaver
-  VERSION = '1.5.1'
+  VERSION = '1.6.0'
 end

data/lib/processors/gdk_pixbuf.rb

@@ -1,5 +1,4 @@
 require 'gdk_pixbuf2'
-require 'misc/extended_tempfile'
 require 'processors/image'
 
 class GdkPixbufProcessorError < ImageProcessorError; end
@@ -67,7 +66,7 @@ module AttachmentSaver
           end
 
           # we leverage tempfiles as discussed in the uploaded_file method
-          temp = ExtendedTempfile.new("asgtemp", tempfile_directory, derived_extension)
+          temp = Tempfile.new(["asgtemp", ".#{derived_extension}"], tempfile_directory)
           temp.binmode
           temp.close
           derived_image.save(temp.path, format)
@@ -98,7 +97,8 @@ module AttachmentSaver
         end
 
         def crop_to(new_width, new_height, &block) # crops to the center
-          image = new_subpixbuf((width - new_width)/2, (height - new_height)/2, new_width, new_height)
+          method = respond_to?(:subpixbuf) ? :subpixbuf : :new_subpixbuf
+          image = send(method, (width - new_width)/2, (height - new_height)/2, new_width, new_height)
           image.extend Operations
           image.format = format
           image.file_extension = file_extension

data/lib/processors/image_science.rb

@@ -1,6 +1,5 @@
 require 'image_science'
 require 'misc/image_science_extensions'
-require 'misc/extended_tempfile'
 require 'processors/image'
 
 class ImageScienceProcessorError < ImageProcessorError; end
@@ -51,7 +50,7 @@ module AttachmentSaver
           end
       
           # we leverage tempfiles as discussed in the uploaded_file method
-          temp = ExtendedTempfile.new("asitemp", tempfile_directory, derived_extension)
+          temp = Tempfile.new(["asitemp", ".#{derived_extension}"], tempfile_directory)
           temp.binmode
           temp.close
           derived_image.save(temp.path)

data/lib/processors/image_size.rb

@@ -1,5 +1,4 @@
 require 'image_size'
-require 'misc/extended_tempfile'
 require 'processors/image'
 
 class ImageSizeProcessorError < ImageProcessorError; end

data/lib/processors/mini_magick.rb

@@ -1,6 +1,5 @@
 require 'mini_magick'
 require 'misc/mini_magick_extensions'
-require 'misc/extended_tempfile'
 require 'processors/image'
 
 class MiniMagickProcessorError < ImageProcessorError; end
@@ -53,7 +52,7 @@ module AttachmentSaver
           derived_extension = derived_image.file_type_extension
       
           # we leverage tempfiles as discussed in the uploaded_file method
-          temp = ExtendedTempfile.new("asmtemp", tempfile_directory, derived_extension)
+          temp = Tempfile.new(["asmtemp", ".#{derived_extension}"], tempfile_directory)
           temp.binmode
           temp.close
           derived_image.write(temp.path)

data/lib/processors/r_magick.rb

@@ -3,7 +3,6 @@ begin
 rescue LoadError
   require 'RMagick'
 end
-require 'misc/extended_tempfile'
 require 'processors/image'
 
 class RMagickProcessorError < ImageProcessorError; end
@@ -48,7 +47,7 @@ module AttachmentSaver
           derived_extension = derived_image.file_type_extension
       
           # we leverage tempfiles as discussed in the uploaded_file method
-          temp = ExtendedTempfile.new("asrtemp", tempfile_directory, derived_extension)
+          temp = Tempfile.new(["asrtemp", ".#{derived_extension}"], tempfile_directory)
           temp.binmode
           temp.close
           derived_image.write(temp.path)

data/test/file_system_datastore_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
-require 'mocha/test_unit'
+require 'mocha/minitest'
 require 'datastores/file_system'
 
 class FileSystemDatastoreTest < ActiveSupport::TestCase

data/test/image_processor_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
-require 'mocha/test_unit'
+require 'mocha/minitest'
 require 'processors/image'
 require File.expand_path(File.join(File.dirname(__FILE__), 'image_operations'))
 
@@ -43,19 +43,24 @@ class ImageProcessorTest < ActiveSupport::TestCase
     model_without_upload.expects(:examine_image).times(0)
     model_without_upload.before_validate_attachment
     
-    model_with_upload = SomeModel.new('application/octet-stream')
-    model_with_upload.expects(:uploaded_file).at_least(:once).returns(StringIO.new('dummy'))
-    model_with_upload.expects(:examine_image).times(1)
-    model_with_upload.before_validate_attachment
-    
-    model_with_non_image_upload = SomeModel.new('text/plain')
-    model_with_non_image_upload.expects(:uploaded_file).at_least(:once).returns(StringIO.new('dummy'))
-    model_with_non_image_upload.expects(:examine_image).times(1).raises(ImageProcessorError)
-    model_with_non_image_upload.before_validate_attachment
-    assert_equal 'text/plain', model_with_non_image_upload.content_type
-    
+    model_with_upload_with_non_image_magic = SomeModel.new('application/octet-stream')
+    model_with_upload_with_non_image_magic.expects(:uploaded_file).at_least_once.returns(StringIO.new('dummy'))
+    model_with_upload_with_non_image_magic.expects(:examine_image).times(0)
+    model_with_upload_with_non_image_magic.before_validate_attachment
+
+    model_with_upload_with_image_magic = SomeModel.new('application/octet-stream')
+    model_with_upload_with_image_magic.expects(:uploaded_file).at_least_once.returns(StringIO.new(File.read(ImageFixtures.fixture_path('test.jpg'))))
+    model_with_upload_with_image_magic.expects(:examine_image).times(1)
+    model_with_upload_with_image_magic.before_validate_attachment
+
+    model_with_invalid_upload_with_image_magic = SomeModel.new('text/plain')
+    model_with_invalid_upload_with_image_magic.expects(:uploaded_file).at_least_once.returns(StringIO.new(File.read(ImageFixtures.fixture_path('test.jpg'))))
+    model_with_invalid_upload_with_image_magic.expects(:examine_image).times(1).raises(ImageProcessorError)
+    model_with_invalid_upload_with_image_magic.before_validate_attachment
+    assert_equal 'text/plain', model_with_invalid_upload_with_image_magic.content_type
+
     model_with_mislabelled_non_image_upload = SomeModel.new('image/png')
-    model_with_mislabelled_non_image_upload.expects(:uploaded_file).at_least(:once).returns(StringIO.new('dummy'))
+    model_with_mislabelled_non_image_upload.expects(:uploaded_file).at_least_once.returns(StringIO.new(File.read(ImageFixtures.fixture_path('test.jpg'))))
     model_with_mislabelled_non_image_upload.expects(:examine_image).times(1).raises(ImageProcessorError)
     model_with_mislabelled_non_image_upload.before_validate_attachment
     assert_equal 'application/octet-stream', model_with_mislabelled_non_image_upload.content_type

data/test/in_column_datastore_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
-require 'mocha/test_unit'
+require 'mocha/minitest'
 require 'datastores/in_column'
 
 class InColumnDatastoreTest < ActiveSupport::TestCase

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attachment_saver
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Will Bryant
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-12 00:00:00.000000000 Z
+date: 2019-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -234,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Saves attachments in files, models, or columns.
@@ -265,4 +265,3 @@ test_files:
 - test/rmagick_processor_test.rb
 - test/schema.rb
 - test/test_helper.rb
-has_rdoc: false