attachment_saver 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4361cefbe15f73658b90fcdd5257d3f2dfedc449
-  data.tar.gz: 3667eabf22adae5ecdd045993b5a4882f0120f17
+  metadata.gz: f6490e7e2047044a90f1e1173bde73a2f8d35a74
+  data.tar.gz: 0ca89b3a3ee2ef6ab30edbda1ca24dc33cf733bc
 SHA512:
-  metadata.gz: 9301f20ce8cc4c68e0873df7b6cb7c4bb41a1f119c7dad7e20d1486fad0f5acacbb59eeaf564476730d839c7699f7dc3a615e6e32cbe9c8defe541b4398c8f3d
-  data.tar.gz: 717eacc83e814b18d03b8857e28ccd8c89c97ef190cbab5c5fdedc3044ff329302b759fafd2ba9608b05d33c6f31894949d2ef45616f1a8d3eb8235bbe3c7058
+  metadata.gz: c4e7a26570502f01844906d7c2d2bdd258b80cc4abaf41f44fffeb358875b87b6600de35f98e74757ace80f93a4e23f34fad1142a9544ac4c844cbb8dfbd43f6
+  data.tar.gz: ad2e45480b8c97d37878bb4f98a60d3a6899b865519bea7c510f8a6f1a9c264393f183f0b30bc63dfdf0c7a6740dba4371fa8dd42319200f754b416cdc13d981

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    attachment_saver (1.5.0)
+    attachment_saver (1.5.1)
       activerecord
       mimemagic
 

data/lib/attachment_saver/version.rb

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

data/lib/processors/gdk_pixbuf.rb

@@ -53,16 +53,24 @@ module AttachmentSaver
         result = original_image.send(*resize_format) do |derived_image|
           return nil unless want_format?(derived_format_name, derived_image.width, derived_image.height)
 
-          # both original_filename and content_type must be defined for parents when using image processing
-          # - but apps can just define them using attr_accessor if they don't want them persisted to db
-          derived_content_type = content_type
-          derived_extension = derived_image.file_extension
+          if original_image.format == 'gif'
+            # as a special case hack, don't try and save derived images into GIF format (gdk_pixbuf2 doesn't support that)
+            derived_content_type = 'image/png'
+            derived_extension = 'png'
+            format = 'png'
+          else
+            # both original_filename and content_type must be defined for parents when using image processing
+            # - but apps can just define them using attr_accessor if they don't want them persisted to db
+            derived_content_type = content_type
+            derived_extension = derived_image.file_extension
+            format = original_image.format
+          end
 
           # we leverage tempfiles as discussed in the uploaded_file method
           temp = ExtendedTempfile.new("asgtemp", tempfile_directory, derived_extension)
           temp.binmode
           temp.close
-          derived_image.save(temp.path, original_image.format)
+          derived_image.save(temp.path, format)
           temp.open # we close & reopen so we see the file the processor wrote to, even if it created a new file rather than writing into our tempfile
 
           { :format_name => derived_format_name.to_s,

data/test/gdk_pixbuf_processor_test.rb

@@ -17,4 +17,8 @@ class GdkPixbufProcessorTest < ActiveSupport::TestCase
   end
 
   include ImageProcessorTests
+
+  def saves_to_gif_format?
+    false
+  end
 end

data/test/image_operations.rb

@@ -8,7 +8,15 @@ class ImageOperations
       :width => 448,
       :height => 600 }
   end
-  
+
+  def self.original_gif_image
+    { :path => ImageFixtures::fixture_path('test.gif'),
+      :content_type => 'image/gif',
+      :original_filename => 'test.gif',
+      :width => 100,
+      :height => 73 }
+  end
+
   def self.resize_operations
     {
       :squish1 =>         [:squish, 100, 50],

data/test/image_processor_test_common.rb

@@ -35,6 +35,10 @@ module ImageProcessorTests
     true # overridden for examine-only processors
   end
 
+  def saves_to_gif_format?
+    true
+  end
+
   def test_attributes_from_valid
     processor_model.attachment_options = {}
     ImageFixtures.all_readable.each do |fixture|
@@ -116,4 +120,36 @@ module ImageProcessorTests
       end
     end
   end
+
+  def test_derived_attributes_from_gif
+    processor_model.attachment_options = {:formats => ImageOperations.resize_operations}
+
+    fixture = ImageOperations.original_gif_image
+    model = processor_model.new(File.open(fixture[:path], 'rb'))
+    model.content_type = fixture[:content_type]
+    model.original_filename = fixture[:original_filename]
+
+    if processes_images?
+      model.process_attachment(model.uploaded_file_path)
+
+      ImageOperations.expected_results.each do |format_name, size|
+        derived = model.find_derived(format_name)
+        assert !derived.nil?, "no derived image named #{format_name} generated"
+        assert_equal size.first, derived[:width], "#{format_name} width incorrect"
+        assert_equal size.last, derived[:height], "#{format_name} height incorrect"
+
+        if saves_to_gif_format?
+          assert_equal model.file_extension, derived[:file_extension], "#{format_name} file_extension incorrect"
+          assert_equal fixture[:content_type], derived[:content_type]
+        else
+          assert_equal "png", derived[:file_extension], "#{format_name} file_extension incorrect"
+          assert_equal "image/png", derived[:content_type]
+        end
+      end
+    else
+      assert_raise(NotImplementedError) do
+        model.process_attachment(model.uploaded_file_path)
+      end
+    end
+  end
 end

data/test/image_science_processor_test.rb

@@ -17,4 +17,8 @@ class ImageScienceProcessorTest < ActiveSupport::TestCase
   end
 
   include ImageProcessorTests
+
+  def saves_to_gif_format?
+    false
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attachment_saver
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Will Bryant
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-15 00:00:00.000000000 Z
+date: 2018-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -195,6 +195,7 @@ files:
 - test/fixtures/noextension
 - test/fixtures/pd.png
 - test/fixtures/ssrf.png
+- test/fixtures/test.gif
 - test/fixtures/test.jpg
 - test/fixtures/test.js
 - test/fixtures/wrongextension.png
@@ -246,6 +247,7 @@ test_files:
 - test/fixtures/noextension
 - test/fixtures/pd.png
 - test/fixtures/ssrf.png
+- test/fixtures/test.gif
 - test/fixtures/test.jpg
 - test/fixtures/test.js
 - test/fixtures/wrongextension.png