RubyGems - paperclip - Versions diffs - 3.5.4 → 5.3.0 - Mend

paperclip 3.5.4 → 5.3.0

Files changed (212) hide show

checksums.yaml +4 -4
data/.codeclimate.yml +17 -0
data/.gitignore +0 -6
data/.hound.yml +1055 -0
data/.rubocop.yml +1 -0
data/.travis.yml +17 -20
data/Appraisals +4 -16
data/CONTRIBUTING.md +29 -13
data/Gemfile +11 -3
data/LICENSE +1 -3
data/NEWS +241 -49
data/README.md +471 -166
data/RELEASING.md +17 -0
data/Rakefile +6 -8
data/UPGRADING +12 -9
data/features/basic_integration.feature +27 -8
data/features/migration.feature +0 -24
data/features/step_definitions/attachment_steps.rb +36 -28
data/features/step_definitions/html_steps.rb +2 -2
data/features/step_definitions/rails_steps.rb +68 -37
data/features/step_definitions/s3_steps.rb +2 -2
data/features/step_definitions/web_steps.rb +1 -103
data/features/support/env.rb +3 -2
data/features/support/file_helpers.rb +2 -2
data/features/support/fixtures/gemfile.txt +1 -1
data/features/support/paths.rb +1 -1
data/features/support/rails.rb +2 -25
data/gemfiles/4.2.gemfile +17 -0
data/gemfiles/5.0.gemfile +17 -0
data/lib/generators/paperclip/paperclip_generator.rb +9 -3
data/lib/generators/paperclip/templates/paperclip_migration.rb.erb +2 -2
data/lib/paperclip/attachment.rb +151 -46
data/lib/paperclip/attachment_registry.rb +3 -2
data/lib/paperclip/callbacks.rb +13 -1
data/lib/paperclip/content_type_detector.rb +26 -22
data/lib/paperclip/errors.rb +8 -1
data/lib/paperclip/file_command_content_type_detector.rb +6 -8
data/lib/paperclip/geometry_detector_factory.rb +5 -3
data/lib/paperclip/geometry_parser_factory.rb +1 -1
data/lib/paperclip/glue.rb +1 -1
data/lib/paperclip/has_attached_file.rb +17 -1
data/lib/paperclip/helpers.rb +15 -11
data/lib/paperclip/interpolations/plural_cache.rb +6 -5
data/lib/paperclip/interpolations.rb +26 -13
data/lib/paperclip/io_adapters/abstract_adapter.rb +32 -4
data/lib/paperclip/io_adapters/attachment_adapter.rb +13 -8
data/lib/paperclip/io_adapters/data_uri_adapter.rb +11 -16
data/lib/paperclip/io_adapters/empty_string_adapter.rb +5 -4
data/lib/paperclip/io_adapters/file_adapter.rb +12 -6
data/lib/paperclip/io_adapters/http_url_proxy_adapter.rb +7 -7
data/lib/paperclip/io_adapters/identity_adapter.rb +12 -6
data/lib/paperclip/io_adapters/nil_adapter.rb +8 -5
data/lib/paperclip/io_adapters/registry.rb +6 -2
data/lib/paperclip/io_adapters/stringio_adapter.rb +15 -16
data/lib/paperclip/io_adapters/uploaded_file_adapter.rb +10 -6
data/lib/paperclip/io_adapters/uri_adapter.rb +41 -19
data/lib/paperclip/locales/en.yml +1 -0
data/lib/paperclip/matchers/have_attached_file_matcher.rb +2 -1
data/lib/paperclip/matchers/validate_attachment_content_type_matcher.rb +4 -4
data/lib/paperclip/matchers/validate_attachment_presence_matcher.rb +2 -1
data/lib/paperclip/matchers/validate_attachment_size_matcher.rb +2 -1
data/lib/paperclip/media_type_spoof_detector.rb +90 -0
data/lib/paperclip/processor.rb +5 -41
data/lib/paperclip/processor_helpers.rb +50 -0
data/lib/paperclip/rails_environment.rb +25 -0
data/lib/paperclip/schema.rb +9 -7
data/lib/paperclip/storage/filesystem.rb +14 -3
data/lib/paperclip/storage/fog.rb +37 -19
data/lib/paperclip/storage/s3.rb +129 -69
data/lib/paperclip/style.rb +8 -2
data/lib/paperclip/tempfile_factory.rb +5 -1
data/lib/paperclip/thumbnail.rb +30 -18
data/lib/paperclip/url_generator.rb +26 -14
data/lib/paperclip/validators/attachment_content_type_validator.rb +4 -0
data/lib/paperclip/validators/attachment_file_name_validator.rb +80 -0
data/lib/paperclip/validators/attachment_file_type_ignorance_validator.rb +29 -0
data/lib/paperclip/validators/attachment_presence_validator.rb +4 -0
data/lib/paperclip/validators/attachment_size_validator.rb +5 -3
data/lib/paperclip/validators/media_type_spoof_detection_validator.rb +27 -0
data/lib/paperclip/validators.rb +11 -4
data/lib/paperclip/version.rb +3 -1
data/lib/paperclip.rb +30 -11
data/lib/tasks/paperclip.rake +34 -5
data/paperclip.gemspec +21 -16
data/shoulda_macros/paperclip.rb +0 -1
data/spec/paperclip/attachment_definitions_spec.rb +13 -0
data/{test/attachment_processing_test.rb → spec/paperclip/attachment_processing_spec.rb} +17 -20
data/spec/paperclip/attachment_registry_spec.rb +158 -0
data/{test/attachment_test.rb → spec/paperclip/attachment_spec.rb} +502 -407
data/{test/content_type_detector_test.rb → spec/paperclip/content_type_detector_spec.rb} +17 -20
data/spec/paperclip/file_command_content_type_detector_spec.rb +40 -0
data/spec/paperclip/filename_cleaner_spec.rb +14 -0
data/spec/paperclip/geometry_detector_spec.rb +39 -0
data/{test/geometry_parser_test.rb → spec/paperclip/geometry_parser_spec.rb} +27 -27
data/{test/geometry_test.rb → spec/paperclip/geometry_spec.rb} +50 -52
data/spec/paperclip/glue_spec.rb +44 -0
data/spec/paperclip/has_attached_file_spec.rb +158 -0
data/{test/integration_test.rb → spec/paperclip/integration_spec.rb} +137 -128
data/{test/interpolations_test.rb → spec/paperclip/interpolations_spec.rb} +70 -46
data/spec/paperclip/io_adapters/abstract_adapter_spec.rb +132 -0
data/{test/io_adapters/attachment_adapter_test.rb → spec/paperclip/io_adapters/attachment_adapter_spec.rb} +33 -32
data/spec/paperclip/io_adapters/data_uri_adapter_spec.rb +89 -0
data/spec/paperclip/io_adapters/empty_string_adapter_spec.rb +17 -0
data/{test/io_adapters/file_adapter_test.rb → spec/paperclip/io_adapters/file_adapter_spec.rb} +38 -42
data/spec/paperclip/io_adapters/http_url_proxy_adapter_spec.rb +121 -0
data/spec/paperclip/io_adapters/identity_adapter_spec.rb +8 -0
data/{test/io_adapters/nil_adapter_test.rb → spec/paperclip/io_adapters/nil_adapter_spec.rb} +7 -7
data/{test/io_adapters/registry_test.rb → spec/paperclip/io_adapters/registry_spec.rb} +12 -9
data/{test/io_adapters/stringio_adapter_test.rb → spec/paperclip/io_adapters/stringio_adapter_spec.rb} +21 -18
data/{test/io_adapters/uploaded_file_adapter_test.rb → spec/paperclip/io_adapters/uploaded_file_adapter_spec.rb} +46 -46
data/spec/paperclip/io_adapters/uri_adapter_spec.rb +172 -0
data/spec/paperclip/matchers/have_attached_file_matcher_spec.rb +19 -0
data/spec/paperclip/matchers/validate_attachment_content_type_matcher_spec.rb +109 -0
data/spec/paperclip/matchers/validate_attachment_presence_matcher_spec.rb +69 -0
data/spec/paperclip/matchers/validate_attachment_size_matcher_spec.rb +88 -0
data/spec/paperclip/media_type_spoof_detector_spec.rb +94 -0
data/spec/paperclip/meta_class_spec.rb +30 -0
data/spec/paperclip/paperclip_missing_attachment_styles_spec.rb +84 -0
data/spec/paperclip/paperclip_spec.rb +192 -0
data/spec/paperclip/plural_cache_spec.rb +37 -0
data/spec/paperclip/processor_helpers_spec.rb +57 -0
data/{test/processor_test.rb → spec/paperclip/processor_spec.rb} +7 -7
data/spec/paperclip/rails_environment_spec.rb +33 -0
data/{test/rake_test.rb → spec/paperclip/rake_spec.rb} +15 -15
data/spec/paperclip/schema_spec.rb +248 -0
data/{test/storage/filesystem_test.rb → spec/paperclip/storage/filesystem_spec.rb} +18 -18
data/spec/paperclip/storage/fog_spec.rb +566 -0
data/spec/paperclip/storage/s3_live_spec.rb +188 -0
data/spec/paperclip/storage/s3_spec.rb +1693 -0
data/spec/paperclip/style_spec.rb +255 -0
data/spec/paperclip/tempfile_factory_spec.rb +33 -0
data/spec/paperclip/tempfile_spec.rb +35 -0
data/{test/thumbnail_test.rb → spec/paperclip/thumbnail_spec.rb} +153 -134
data/spec/paperclip/url_generator_spec.rb +222 -0
data/spec/paperclip/validators/attachment_content_type_validator_spec.rb +322 -0
data/spec/paperclip/validators/attachment_file_name_validator_spec.rb +160 -0
data/{test/validators/attachment_presence_validator_test.rb → spec/paperclip/validators/attachment_presence_validator_spec.rb} +20 -20
data/{test/validators/attachment_size_validator_test.rb → spec/paperclip/validators/attachment_size_validator_spec.rb} +77 -64
data/spec/paperclip/validators/media_type_spoof_detection_validator_spec.rb +52 -0
data/spec/paperclip/validators_spec.rb +164 -0
data/spec/spec_helper.rb +47 -0
data/spec/support/assertions.rb +82 -0
data/spec/support/conditional_filter_helper.rb +5 -0
data/spec/support/fake_model.rb +25 -0
data/spec/support/fake_rails.rb +12 -0
data/spec/support/fixtures/empty.html +1 -0
data/spec/support/fixtures/empty.xlsx +0 -0
data/spec/support/fixtures/spaced file.jpg +0 -0
data/spec/support/matchers/accept.rb +5 -0
data/spec/support/matchers/exist.rb +5 -0
data/spec/support/matchers/have_column.rb +23 -0
data/{test → spec}/support/mock_attachment.rb +2 -0
data/{test → spec}/support/mock_url_generator_builder.rb +2 -2
data/spec/support/model_reconstruction.rb +68 -0
data/spec/support/reporting.rb +11 -0
data/spec/support/test_data.rb +13 -0
data/spec/support/version_helper.rb +9 -0
metadata +348 -225
data/RUNNING_TESTS.md +0 -4
data/cucumber/paperclip_steps.rb +0 -6
data/gemfiles/3.0.gemfile +0 -11
data/gemfiles/3.1.gemfile +0 -11
data/gemfiles/3.2.gemfile +0 -11
data/gemfiles/4.0.gemfile +0 -11
data/test/attachment_definitions_test.rb +0 -12
data/test/attachment_registry_test.rb +0 -88
data/test/file_command_content_type_detector_test.rb +0 -27
data/test/filename_cleaner_test.rb +0 -14
data/test/generator_test.rb +0 -84
data/test/geometry_detector_test.rb +0 -24
data/test/has_attached_file_test.rb +0 -125
data/test/helper.rb +0 -232
data/test/io_adapters/abstract_adapter_test.rb +0 -58
data/test/io_adapters/data_uri_adapter_test.rb +0 -74
data/test/io_adapters/empty_string_adapter_test.rb +0 -18
data/test/io_adapters/http_url_proxy_adapter_test.rb +0 -102
data/test/io_adapters/identity_adapter_test.rb +0 -8
data/test/io_adapters/uri_adapter_test.rb +0 -102
data/test/matchers/have_attached_file_matcher_test.rb +0 -24
data/test/matchers/validate_attachment_content_type_matcher_test.rb +0 -110
data/test/matchers/validate_attachment_presence_matcher_test.rb +0 -69
data/test/matchers/validate_attachment_size_matcher_test.rb +0 -86
data/test/meta_class_test.rb +0 -32
data/test/paperclip_missing_attachment_styles_test.rb +0 -90
data/test/paperclip_test.rb +0 -217
data/test/plural_cache_test.rb +0 -36
data/test/schema_test.rb +0 -200
data/test/storage/fog_test.rb +0 -473
data/test/storage/s3_live_test.rb +0 -179
data/test/storage/s3_test.rb +0 -1356
data/test/style_test.rb +0 -213
data/test/support/mock_model.rb +0 -2
data/test/tempfile_factory_test.rb +0 -17
data/test/url_generator_test.rb +0 -187
data/test/validators/attachment_content_type_validator_test.rb +0 -324
data/test/validators_test.rb +0 -61
/data/{test → spec}/database.yml +0 -0
/data/{test → spec/support}/fixtures/12k.png +0 -0
/data/{test → spec/support}/fixtures/50x50.png +0 -0
/data/{test → spec/support}/fixtures/5k.png +0 -0
/data/{test → spec/support}/fixtures/animated +0 -0
/data/{test → spec/support}/fixtures/animated.gif +0 -0
/data/{test → spec/support}/fixtures/animated.unknown +0 -0
/data/{test → spec/support}/fixtures/bad.png +0 -0
/data/{test → spec/support}/fixtures/fog.yml +0 -0
/data/{test → spec/support}/fixtures/rotated.jpg +0 -0
/data/{test → spec/support}/fixtures/s3.yml +0 -0
/data/{test → spec/support}/fixtures/spaced file.png +0 -0
/data/{test → spec/support}/fixtures/text.txt +0 -0
/data/{test → spec/support}/fixtures/twopage.pdf +0 -0
/data/{test → spec/support}/fixtures/uppercase.PNG +0 -0
/data/{test → spec}/support/mock_interpolator.rb +0 -0

data/spec/support/assertions.rb ADDED Viewed

@@ -0,0 +1,82 @@
+module Assertions
+  def assert(truthy, message = nil)
+    expect(!!truthy).to(eq(true), message)
+  end
+  def assert_equal(expected, actual, message = nil)
+    expect(actual).to(eq(expected), message)
+  end
+  def assert_not_equal(expected, actual, message = nil)
+    expect(actual).to_not(eq(expected), message)
+  end
+  def assert_raises(exception_class, message = nil, &block)
+    expect(&block).to raise_error(exception_class, message)
+  end
+  def assert_nothing_raised(&block)
+    expect(&block).to_not raise_error
+  end
+  def assert_nil(thing)
+    expect(thing).to be_nil
+  end
+  def assert_contains(haystack, needle)
+    expect(haystack).to include(needle)
+  end
+  def assert_match(pattern, value)
+    expect(value).to match(pattern)
+  end
+  def assert_no_match(pattern, value)
+    expect(value).to_not match(pattern)
+  end
+  def assert_file_exists(path_to_file)
+    expect(path_to_file).to exist
+  end
+  def assert_file_not_exists(path_to_file)
+    expect(path_to_file).to_not exist
+  end
+  def assert_empty(object)
+    expect(object).to be_empty
+  end
+  def assert_success_response(url)
+    url = "http:#{url}" unless url =~ /http/
+    Net::HTTP.get_response(URI.parse(url)) do |response|
+      assert_equal "200",
+        response.code,
+        "Expected HTTP response code 200, got #{response.code}"
+    end
+  end
+  def assert_not_found_response(url)
+    url = "http:#{url}" unless url =~ /http/
+    Net::HTTP.get_response(URI.parse(url)) do |response|
+      assert_equal "404", response.code,
+        "Expected HTTP response code 404, got #{response.code}"
+    end
+  end
+  def assert_forbidden_response(url)
+    url = "http:#{url}" unless url =~ /http/
+    Net::HTTP.get_response(URI.parse(url)) do |response|
+      assert_equal "403", response.code,
+        "Expected HTTP response code 403, got #{response.code}"
+    end
+  end
+  def assert_frame_dimensions(range, frames)
+    frames.each_with_index do |frame, frame_index|
+      frame.split('x').each_with_index do |dimension, dimension_index |
+        assert range.include?(dimension.to_i), "Frame #{frame_index}[#{dimension_index}] should have been within #{range.inspect}, but was #{dimension}"
+      end
+    end
+  end
+end

data/spec/support/conditional_filter_helper.rb ADDED Viewed

@@ -0,0 +1,5 @@
+module ConditionalFilterHelper
+  def aws_accelerate_available?
+    (Gem::Version.new(Aws::VERSION) >= Gem::Version.new("2.3.0"))
+  end
+end

data/spec/support/fake_model.rb ADDED Viewed

@@ -0,0 +1,25 @@
+class FakeModel
+  attr_accessor(
+    :avatar_file_name,
+    :avatar_file_size,
+    :avatar_updated_at,
+    :avatar_content_type,
+    :avatar_fingerprint,
+    :id
+  )
+  def errors
+    @errors ||= []
+  end
+  def run_paperclip_callbacks name, *args
+  end
+  def valid?
+    errors.empty?
+  end
+  def new_record?
+    false
+  end
+end

data/spec/support/fake_rails.rb ADDED Viewed

@@ -0,0 +1,12 @@
+class FakeRails
+  def initialize(env, root)
+    @env = env
+    @root = root
+  end
+  attr_accessor :env, :root
+  def const_defined?(const)
+    false
+  end
+end

data/spec/support/fixtures/empty.html ADDED Viewed

	@@ -0,0 +1 @@
1	+ <html></html>

data/spec/support/fixtures/empty.xlsx ADDED Viewed

Binary file

data/spec/support/fixtures/spaced file.jpg ADDED Viewed

Binary file

data/spec/support/matchers/accept.rb ADDED Viewed

@@ -0,0 +1,5 @@
+RSpec::Matchers.define :accept do |expected|
+  match do |actual|
+    actual.matches?(expected)
+  end
+end

data/spec/support/matchers/exist.rb ADDED Viewed

@@ -0,0 +1,5 @@
+RSpec::Matchers.define :exist do |expected|
+  match do |actual|
+    File.exist?(actual)
+  end
+end

data/spec/support/matchers/have_column.rb ADDED Viewed

@@ -0,0 +1,23 @@
+RSpec::Matchers.define :have_column do |column_name|
+  chain :with_default do |default|
+    @default = default
+  end
+  match do |columns|
+    column = columns.detect{|column| column.name == column_name }
+    column && column.default.to_s == @default.to_s
+  end
+  failure_message_method =
+    if RSpec::Version::STRING.to_i >= 3
+      :failure_message
+    else
+      :failure_message_for_should
+    end
+  send(failure_message_method) do |columns|
+    "expected to find '#{column_name}', " +
+      "default '#{@default}' " +
+      "in #{columns.map { |column| [column.name, column.default] }}"
+  end
+end

data/{test → spec}/support/mock_attachment.rb RENAMED Viewed

@@ -1,7 +1,9 @@
 class MockAttachment
   attr_accessor :updated_at, :original_filename
+  attr_reader :options
   def initialize(options = {})
+    @options = options
     @model = options[:model]
     @responds_to_updated_at = options[:responds_to_updated_at]
     @updated_at = options[:updated_at]

data/{test → spec}/support/mock_url_generator_builder.rb RENAMED Viewed

@@ -2,9 +2,9 @@ class MockUrlGeneratorBuilder
   def initializer
   end
-  def new(attachment, attachment_options)
+  def new(attachment)
     @attachment = attachment
-    @attachment_options = attachment_options
+    @attachment_options = @attachment.options
     self
   end

data/spec/support/model_reconstruction.rb ADDED Viewed

@@ -0,0 +1,68 @@
+module ModelReconstruction
+  def reset_class class_name
+    ActiveRecord::Base.send(:include, Paperclip::Glue)
+    Object.send(:remove_const, class_name) rescue nil
+    klass = Object.const_set(class_name, Class.new(ActiveRecord::Base))
+    klass.class_eval do
+      include Paperclip::Glue
+    end
+    klass.reset_column_information
+    klass.connection_pool.clear_table_cache!(klass.table_name) if klass.connection_pool.respond_to?(:clear_table_cache!)
+    if klass.connection.respond_to?(:schema_cache)
+      if ActiveRecord::VERSION::STRING >= "5.0"
+        klass.connection.schema_cache.clear_data_source_cache!(klass.table_name)
+      else
+        klass.connection.schema_cache.clear_table_cache!(klass.table_name)
+      end
+    end
+    klass
+  end
+  def reset_table table_name, &block
+    block ||= lambda { |table| true }
+    ActiveRecord::Base.connection.create_table :dummies, {force: true}, &block
+  end
+  def modify_table table_name, &block
+    ActiveRecord::Base.connection.change_table :dummies, &block
+  end
+  def rebuild_model options = {}
+    ActiveRecord::Base.connection.create_table :dummies, force: true do |table|
+      table.column :title, :string
+      table.column :other, :string
+      table.column :avatar_file_name, :string
+      table.column :avatar_content_type, :string
+      table.column :avatar_file_size, :integer
+      table.column :avatar_updated_at, :datetime
+      table.column :avatar_fingerprint, :string
+    end
+    rebuild_class options
+  end
+  def rebuild_class options = {}
+    reset_class("Dummy").tap do |klass|
+      klass.has_attached_file :avatar, options
+      klass.do_not_validate_attachment_file_type :avatar
+      Paperclip.reset_duplicate_clash_check!
+    end
+  end
+  def rebuild_meta_class_of obj, options = {}
+    meta_class_of(obj).tap do |metaklass|
+      metaklass.has_attached_file :avatar, options
+      metaklass.do_not_validate_attachment_file_type :avatar
+      Paperclip.reset_duplicate_clash_check!
+    end
+  end
+  def meta_class_of(obj)
+    class << obj
+      self
+    end
+  end
+end

data/spec/support/reporting.rb ADDED Viewed

@@ -0,0 +1,11 @@
+module Reporting
+  def silence_stream(stream)
+    old_stream = stream.dup
+    stream.reopen(RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')
+    stream.sync = true
+    yield
+  ensure
+    stream.reopen(old_stream)
+    old_stream.close
+  end
+end

data/spec/support/test_data.rb ADDED Viewed

@@ -0,0 +1,13 @@
+module TestData
+  def attachment(options={})
+    Paperclip::Attachment.new(:avatar, FakeModel.new, options)
+  end
+  def stringy_file
+    StringIO.new('.\n')
+  end
+  def fixture_file(filename)
+    File.join(File.dirname(__FILE__), 'fixtures', filename)
+  end
+end

data/spec/support/version_helper.rb ADDED Viewed

@@ -0,0 +1,9 @@
+module VersionHelper
+  def active_support_version
+    ActiveSupport::VERSION::STRING
+  end
+  def ruby_version
+    RUBY_VERSION
+  end
+end