attachment_saver 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85fa08dd749414f94b27759b70315786273496c9
-  data.tar.gz: a541efb3e9c6e38fa6f3ccebfcdb308d7c6414fd
+  metadata.gz: c35a16fce5a99e7ed88cc052759edcfbe3888202
+  data.tar.gz: 79cb33e50d35f9dd4828a42e07cb11781637e3eb
 SHA512:
-  metadata.gz: c20d7843512f09a588f411f811cf2efb153e187ba9f16d081f06cf0a63d18a02ab2ca29311a37148bea9298d7cac90aa068b8e4eca76c37b8ac14ad3f92ca82a
-  data.tar.gz: 8b05537fe6deb1c98a8548159ab1c9102018f6b46ecba11c8cd3f0905537f7c1b434e931794bfb1e419127a8f06e965648fc16d5afecb467caf02934d0a4cdca
+  metadata.gz: '0911d907f27e14f6f75c1e3c80dc70f492e465868de2f38c6f7325d52eb7fa79dbaef9007070be838da7ddf76d4302b64e59b41fa268f8c176ac32191cb7612d'
+  data.tar.gz: 649583ca6636e12a6f3f4e03ea1a8ea71124c09f5c728f116b1765e4457cdbe8ef874800b5acdc4c3c08bdbdb346fc8f954b42ee1b8d6bb6a4802b9d43f5fe78

data/Gemfile

@@ -0,0 +1,11 @@
+source "http://rubygems.org"
+
+# Declare your gem's dependencies in transaction_isolation_level.gemspec.
+# Bundler will treat runtime dependencies like base dependencies, and
+# development dependencies will be added by default to the :development group.
+gemspec
+
+# Declare any dependencies that are still in development here instead of in
+# your gemspec. These might include edge Rails or gems from your path or
+# Git. Remember to move these dependencies to your gemspec before releasing
+# your gem to rubygems.org.

data/Gemfile.lock

@@ -0,0 +1,59 @@
+PATH
+  remote: .
+  specs:
+    attachment_saver (1.2.0)
+      activerecord
+      mimemagic
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    RubyInline (3.12.4)
+      ZenTest (~> 4.3)
+    ZenTest (4.11.1)
+    activemodel (5.1.4)
+      activesupport (= 5.1.4)
+    activerecord (5.1.4)
+      activemodel (= 5.1.4)
+      activesupport (= 5.1.4)
+      arel (~> 8.0)
+    activesupport (5.1.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (8.0.0)
+    concurrent-ruby (1.0.5)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
+    image_science (1.3.0)
+      RubyInline (~> 3.9)
+    image_size (1.5.0)
+    metaclass (0.0.4)
+    mimemagic (0.3.2)
+    mini_magick (4.8.0)
+    minitest (5.10.3)
+    mocha (1.3.0)
+      metaclass (~> 0.0.1)
+    rake (12.3.0)
+    rmagick (2.16.0)
+    sqlite3 (1.3.13)
+    thread_safe (0.3.6)
+    tzinfo (1.2.4)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  attachment_saver!
+  image_science
+  image_size
+  mini_magick
+  mocha
+  rake
+  rmagick
+  sqlite3
+
+BUNDLED WITH
+   1.15.3

data/attachment_saver.gemspec

@@ -32,5 +32,7 @@ EOF
   gem.add_development_dependency "image_science"
   gem.add_development_dependency "rmagick"
   gem.add_development_dependency "mini_magick"
+  gem.add_development_dependency "image_size"
   gem.add_development_dependency "sqlite3"
+  gem.add_development_dependency "mocha"
 end

data/lib/attachment_saver.rb

@@ -123,6 +123,8 @@ module AttachmentSaver
       process_attachment(filename)
     rescue AttachmentProcessorError
       raise # pass any exceptions of the correct type (which anything eminating from our processors should be) straight
+    rescue NotImplementedError
+      raise
     rescue Exception => ex
       raise AttachmentProcessorError, "#{ex.class}: #{ex.message}", ex.backtrace # wrap anything else
     end

data/lib/attachment_saver/version.rb

@@ -1,3 +1,3 @@
 module AttachmentSaver
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

data/lib/processors/image.rb

@@ -89,6 +89,8 @@ module AttachmentSaver
         end
       rescue AttachmentSaverError
         raise
+      rescue NotImplementedError
+        raise
       rescue Exception => ex
         raise ImageProcessorError, "#{ex.class}: #{ex.message}", ex.backtrace
       end

data/test/attachment_saver_test.rb

@@ -54,8 +54,8 @@ class AttachmentSaverTest < ActiveSupport::TestCase
   
   def test_default_methods
     model = SomeModel.new
-    assert_equal nil, model.uploaded_data
-    assert_equal nil, model.uploaded_file
+    assert_nil model.uploaded_data
+    assert_nil model.uploaded_file
     assert_equal false, model.process_attachment?
     assert File.directory?(model.tempfile_directory)
   end
@@ -66,10 +66,10 @@ class AttachmentSaverTest < ActiveSupport::TestCase
     model = SomeModel.new
     model.uploaded_data = 'test #1'
     assert_equal 7, model.size
-    assert_equal nil, model.content_type
-    assert_equal nil, model.original_filename
+    assert_nil model.content_type
+    assert_nil model.original_filename
     assert_equal 'test #1', model.uploaded_data # before converting to an uploaded_file
-    assert_not_equal nil, model.uploaded_file
+    assert_not_nil model.uploaded_file
     assert model.uploaded_file.is_a?(Tempfile)
     assert_equal model.uploaded_file.object_id, model.uploaded_file.object_id, 'uploaded_file should return the same instance each time'
     assert_equal 'test #1', model.uploaded_data # after converting to an uploaded_file
@@ -83,10 +83,10 @@ class AttachmentSaverTest < ActiveSupport::TestCase
     data = File.open(ImageFixtures::valid[:path], "rb").read
     model.uploaded_data = data
     assert_equal ImageFixtures::valid[:size], model.size
-    assert_equal nil, model.content_type
-    assert_equal nil, model.original_filename
+    assert_nil model.content_type
+    assert_nil model.original_filename
     assert_equal data, model.uploaded_data # before converting to an uploaded_file
-    assert_not_equal nil, model.uploaded_file
+    assert_not_nil model.uploaded_file
     assert model.uploaded_file.is_a?(Tempfile)
     assert_equal model.uploaded_file.object_id, model.uploaded_file.object_id, 'uploaded_file should return the same instance each time'
     assert_equal data, model.uploaded_data # after converting to an uploaded_file
@@ -99,9 +99,9 @@ class AttachmentSaverTest < ActiveSupport::TestCase
     model = SomeModel.new
     model.uploaded_data = StringIO.new('test #2')
     assert_equal 7, model.size
-    assert_equal nil, model.content_type
-    assert_equal nil, model.original_filename
-    assert_not_equal nil, model.uploaded_file
+    assert_nil model.content_type
+    assert_nil model.original_filename
+    assert_not_nil model.uploaded_file
     assert model.uploaded_file.is_a?(Tempfile)
     assert_equal model.uploaded_file.object_id, model.uploaded_file.object_id, 'uploaded_file should return the same instance each time'
     assert_equal 'test #2', model.uploaded_data
@@ -116,8 +116,8 @@ class AttachmentSaverTest < ActiveSupport::TestCase
       model = SomeModel.new
       model.uploaded_data = tempfile
       assert_equal 7, model.size
-      assert_equal nil, model.content_type
-      assert_equal nil, model.original_filename
+      assert_nil model.content_type
+      assert_nil model.original_filename
       assert_equal tempfile.object_id, model.uploaded_file.object_id, 'uploaded_file should return the originally given tempfile'
       assert_equal 'test #3', model.uploaded_data
       assert_equal 'test #3', contents_of(model.uploaded_file)
@@ -171,9 +171,9 @@ class AttachmentSaverTest < ActiveSupport::TestCase
     
     model = SomeModel.new
     model.uploaded_data = '' # this is what controllers get sent when there's a file field but no file selected; attachment_saver accordingly handles blank strings as a special case
-    assert_equal nil, model.uploaded_file
-    assert_equal nil, model.size
-    assert_equal nil, model.content_type
-    assert_equal nil, model.original_filename
+    assert_nil model.uploaded_file
+    assert_nil model.size
+    assert_nil model.content_type
+    assert_nil model.original_filename
   end
 end

data/test/file_system_datastore_test.rb

@@ -47,7 +47,8 @@ class FileSystemDatastoreTest < ActiveSupport::TestCase
     @saved_to = filename
     save_attachment_to_without_record(filename)
   end
-  alias_method_chain :save_attachment_to, :record
+  alias_method :save_attachment_to_without_record, :save_attachment_to
+  alias_method :save_attachment_to, :save_attachment_to_with_record
   
 
   def save_attachment_to_test(expected_data)
@@ -346,8 +347,8 @@ class FileSystemDatastoreTest < ActiveSupport::TestCase
 
     assert_raises(AttachmentProcessorError) { save_attachment }
 
-    assert_equal nil, storage_key, "storage key wasn't reset after processing failed"
-    assert_not_equal nil, @saved_to, "save_attachment_to not called"
+    assert_nil storage_key, "storage key wasn't reset after processing failed"
+    assert_not_nil @saved_to, "save_attachment_to not called"
     assert !File.exist?(@saved_to), "saved file wasn't removed after processing failed"
   end
   

data/test/fixtures/ssrf.png

@@ -0,0 +1,4 @@
+push graphic-context
+viewbox 0 0 640 480
+fill 'url(http://localhost:3000/)'
+pop graphic-context

data/test/image_fixtures.rb

@@ -73,6 +73,6 @@ class ImageFixtures
   end
   
   def self.all_unreadable
-    [corrupt, non_image_file]
+    [non_image_file, corrupt]
   end
 end

data/test/image_processor_test_common.rb

@@ -31,6 +31,10 @@ module ImageProcessorTestModel
 end
 
 module ImageProcessorTests
+  def processes_images?
+    true # overridden for examine-only processors
+  end
+
   def test_attributes_from_valid
     processor_model.attachment_options = {}
     ImageFixtures.all_readable.each do |fixture|
@@ -46,16 +50,33 @@ module ImageProcessorTests
     end
   end
   
-  def test_attributes_from_invalid
+  def test_attributes_from_non_image
     processor_model.attachment_options = {}
-    ImageFixtures.all_unreadable.each do |fixture|
+    (ImageFixtures.all_unreadable - [ImageFixtures.corrupt]).each do |fixture|
       model = processor_model.new(File.open(fixture[:path], 'rb'))
       model.content_type = fixture[:content_type]
       assert_raises(processor_exception) { model.examine_image }
       assert_equal fixture[:expected_content_type], model.content_type
-      assert_equal nil, model.width
-      assert_equal nil, model.height
-      assert_equal nil, model.image_size
+      assert_nil model.width
+      assert_nil model.height
+      assert_nil model.image_size
+      assert_equal 'bin', model.file_extension
+      model.original_filename = fixture[:original_filename]
+      assert_equal fixture[:expected_extension], model.file_extension
+    end
+  end
+
+  def test_attributes_from_corrupt
+    processor_model.attachment_options = {}
+    if processes_images?
+      fixture = ImageFixtures.corrupt
+      model = processor_model.new(File.open(fixture[:path], 'rb'))
+      model.content_type = fixture[:content_type]
+      assert_raises(processor_exception) { model.examine_image }
+      assert_equal fixture[:expected_content_type], model.content_type
+      assert_nil model.width
+      assert_nil model.height
+      assert_nil model.image_size
       assert_equal 'bin', model.file_extension
       model.original_filename = fixture[:original_filename]
       assert_equal fixture[:expected_extension], model.file_extension
@@ -78,14 +99,21 @@ module ImageProcessorTests
     model = processor_model.new(File.open(fixture[:path], 'rb'))
     model.content_type = fixture[:content_type]
     model.original_filename = fixture[:original_filename]
-    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"
-      assert_equal model.file_extension, derived[:file_extension], "#{format_name} file_extension incorrect"
+
+    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"
+        assert_equal model.file_extension, derived[:file_extension], "#{format_name} file_extension incorrect"
+      end
+    else
+      assert_raise(NotImplementedError) do
+        model.process_attachment(model.uploaded_file_path)
+      end
     end
   end
 end

data/test/in_column_datastore_test.rb

@@ -98,7 +98,7 @@ class InColumnDatastoreTest < ActiveSupport::TestCase
     expects(:process_attachment?).times(0)
     expects(:process_attachment).times(0)
     save_attachment
-    assert_equal nil, data
+    assert_nil data
   end
   
   

data/test/model_test.rb

@@ -155,7 +155,7 @@ class ModelTest < ActiveSupport::TestCase
     model.update_attributes(:uploaded_data => uploaded_file_from(ImageFixtures::valid))
     new_storage_filenames = [model.storage_filename] + model.formats.sort_by(&:format_name).collect(&:storage_filename)
     model.reload
-    model.formats(true)
+    model.formats.reload
     reloaded_storage_filenames = [model.storage_filename] + model.formats.sort_by(&:format_name).collect(&:storage_filename)
     
     assert_equal Image::FORMATS.size, model.formats.size
@@ -182,7 +182,7 @@ class ModelTest < ActiveSupport::TestCase
     OtherImage.want_smalls = false
     model.update_attributes!(:uploaded_data => uploaded_file_from(ImageFixtures::valid))
     #assert_equal ["normal"], model.formats.collect(&:format_name).sort # because we use formats.destroy(..ids..), they really should be removed from the formats collection in memory, but aren't in Rails 1.2.3 :/.  so the normal, expected semantics is that apps must reload to see collection changes.
-    assert_equal ["normal"], model.formats(true).collect(&:format_name).sort
+    assert_equal ["normal"], model.formats.reload.collect(&:format_name).sort
     # note that the small size has not only been not regenerated, it's been deleted
   end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attachment_saver
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Will Bryant
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-10 00:00:00.000000000 Z
+date: 2017-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: image_size
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   This plugin implements attachment storage and processing, integrated with
   ActiveRecord models and Ruby CGI/Rails-style uploads.  Image processing
@@ -123,6 +151,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- Gemfile
+- Gemfile.lock
 - MIT-LICENSE
 - README
 - Rakefile
@@ -146,6 +176,7 @@ files:
 - test/fixtures/broken.jpg
 - test/fixtures/emptyextension.
 - test/fixtures/noextension
+- test/fixtures/ssrf.png
 - test/fixtures/test.jpg
 - test/fixtures/test.js
 - test/fixtures/wrongextension.png
@@ -181,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Saves attachments in files, models, or columns.
@@ -192,6 +223,7 @@ test_files:
 - test/fixtures/broken.jpg
 - test/fixtures/emptyextension.
 - test/fixtures/noextension
+- test/fixtures/ssrf.png
 - test/fixtures/test.jpg
 - test/fixtures/test.js
 - test/fixtures/wrongextension.png
@@ -207,3 +239,4 @@ test_files:
 - test/rmagick_processor_test.rb
 - test/schema.rb
 - test/test_helper.rb
+has_rdoc: false