paperclip 3.5.2 → 5.2.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +7 -0
- data/.codeclimate.yml +17 -0
- data/.gitignore +0 -6
- data/.hound.yml +1055 -0
- data/.rubocop.yml +1 -0
- data/.travis.yml +19 -13
- data/Appraisals +4 -16
- data/CONTRIBUTING.md +29 -13
- data/Gemfile +10 -7
- data/LICENSE +1 -3
- data/NEWS +226 -23
- data/README.md +494 -152
- 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 +0 -2
- data/lib/generators/paperclip/templates/paperclip_migration.rb.erb +1 -1
- data/lib/paperclip/attachment.rb +160 -47
- data/lib/paperclip/attachment_registry.rb +4 -1
- data/lib/paperclip/callbacks.rb +13 -1
- data/lib/paperclip/content_type_detector.rb +26 -24
- 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 +10 -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 +14 -10
- data/lib/paperclip/interpolations/plural_cache.rb +6 -5
- data/lib/paperclip/interpolations.rb +27 -14
- data/lib/paperclip/io_adapters/abstract_adapter.rb +28 -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 +8 -8
- 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 +89 -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 +47 -22
- data/lib/paperclip/storage/s3.rb +144 -73
- data/lib/paperclip/style.rb +8 -2
- data/lib/paperclip/tempfile_factory.rb +6 -4
- data/lib/paperclip/thumbnail.rb +26 -14
- data/lib/paperclip/url_generator.rb +25 -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 +12 -3
- data/lib/paperclip/version.rb +3 -1
- data/lib/paperclip.rb +31 -11
- data/lib/tasks/paperclip.rake +34 -5
- data/paperclip.gemspec +18 -17
- data/shoulda_macros/paperclip.rb +13 -3
- data/{test → spec}/database.yml +0 -0
- 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} +524 -400
- data/{test/content_type_detector_test.rb → spec/paperclip/content_type_detector_spec.rb} +17 -19
- data/{test/file_command_content_type_detector_test.rb → spec/paperclip/file_command_content_type_detector_spec.rb} +7 -6
- 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} +141 -133
- data/{test/interpolations_test.rb → spec/paperclip/interpolations_spec.rb} +70 -46
- data/spec/paperclip/io_adapters/abstract_adapter_spec.rb +101 -0
- data/{test/io_adapters/attachment_adapter_test.rb → spec/paperclip/io_adapters/attachment_adapter_spec.rb} +38 -34
- 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/spec/paperclip/io_adapters/file_adapter_spec.rb +131 -0
- 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 +79 -0
- data/spec/paperclip/meta_class_spec.rb +30 -0
- data/spec/paperclip/paperclip_missing_attachment_styles_spec.rb +84 -0
- data/{test/paperclip_test.rb → spec/paperclip/paperclip_spec.rb} +46 -71
- 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} +5 -5
- 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 +561 -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} +150 -131
- 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/{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/spec/support/fixtures/empty.html +1 -0
- data/spec/support/fixtures/empty.xlsx +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/spec/support/fixtures/spaced file.jpg +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/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_interpolator.rb +0 -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 +262 -297
- 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 -77
- data/test/filename_cleaner_test.rb +0 -14
- data/test/generator_test.rb +0 -80
- data/test/geometry_detector_test.rb +0 -24
- data/test/has_attached_file_test.rb +0 -125
- data/test/helper.rb +0 -215
- data/test/io_adapters/abstract_adapter_test.rb +0 -58
- data/test/io_adapters/data_uri_adapter_test.rb +0 -67
- data/test/io_adapters/empty_string_adapter_test.rb +0 -17
- data/test/io_adapters/file_adapter_test.rb +0 -119
- 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/plural_cache_test.rb +0 -36
- data/test/schema_test.rb +0 -200
- data/test/storage/fog_test.rb +0 -453
- data/test/storage/s3_live_test.rb +0 -179
- data/test/storage/s3_test.rb +0 -1348
- data/test/style_test.rb +0 -213
- data/test/support/mock_model.rb +0 -2
- data/test/tempfile_factory_test.rb +0 -13
- data/test/url_generator_test.rb +0 -187
- data/test/validators/attachment_content_type_validator_test.rb +0 -323
- data/test/validators_test.rb +0 -32
@@ -0,0 +1,82 @@
|
|
1
|
+
module Assertions
|
2
|
+
def assert(truthy, message = nil)
|
3
|
+
expect(!!truthy).to(eq(true), message)
|
4
|
+
end
|
5
|
+
|
6
|
+
def assert_equal(expected, actual, message = nil)
|
7
|
+
expect(actual).to(eq(expected), message)
|
8
|
+
end
|
9
|
+
|
10
|
+
def assert_not_equal(expected, actual, message = nil)
|
11
|
+
expect(actual).to_not(eq(expected), message)
|
12
|
+
end
|
13
|
+
|
14
|
+
def assert_raises(exception_class, message = nil, &block)
|
15
|
+
expect(&block).to raise_error(exception_class, message)
|
16
|
+
end
|
17
|
+
|
18
|
+
def assert_nothing_raised(&block)
|
19
|
+
expect(&block).to_not raise_error
|
20
|
+
end
|
21
|
+
|
22
|
+
def assert_nil(thing)
|
23
|
+
expect(thing).to be_nil
|
24
|
+
end
|
25
|
+
|
26
|
+
def assert_contains(haystack, needle)
|
27
|
+
expect(haystack).to include(needle)
|
28
|
+
end
|
29
|
+
|
30
|
+
def assert_match(pattern, value)
|
31
|
+
expect(value).to match(pattern)
|
32
|
+
end
|
33
|
+
|
34
|
+
def assert_no_match(pattern, value)
|
35
|
+
expect(value).to_not match(pattern)
|
36
|
+
end
|
37
|
+
|
38
|
+
def assert_file_exists(path_to_file)
|
39
|
+
expect(path_to_file).to exist
|
40
|
+
end
|
41
|
+
|
42
|
+
def assert_file_not_exists(path_to_file)
|
43
|
+
expect(path_to_file).to_not exist
|
44
|
+
end
|
45
|
+
|
46
|
+
def assert_empty(object)
|
47
|
+
expect(object).to be_empty
|
48
|
+
end
|
49
|
+
|
50
|
+
def assert_success_response(url)
|
51
|
+
url = "http:#{url}" unless url =~ /http/
|
52
|
+
Net::HTTP.get_response(URI.parse(url)) do |response|
|
53
|
+
assert_equal "200",
|
54
|
+
response.code,
|
55
|
+
"Expected HTTP response code 200, got #{response.code}"
|
56
|
+
end
|
57
|
+
end
|
58
|
+
|
59
|
+
def assert_not_found_response(url)
|
60
|
+
url = "http:#{url}" unless url =~ /http/
|
61
|
+
Net::HTTP.get_response(URI.parse(url)) do |response|
|
62
|
+
assert_equal "404", response.code,
|
63
|
+
"Expected HTTP response code 404, got #{response.code}"
|
64
|
+
end
|
65
|
+
end
|
66
|
+
|
67
|
+
def assert_forbidden_response(url)
|
68
|
+
url = "http:#{url}" unless url =~ /http/
|
69
|
+
Net::HTTP.get_response(URI.parse(url)) do |response|
|
70
|
+
assert_equal "403", response.code,
|
71
|
+
"Expected HTTP response code 403, got #{response.code}"
|
72
|
+
end
|
73
|
+
end
|
74
|
+
|
75
|
+
def assert_frame_dimensions(range, frames)
|
76
|
+
frames.each_with_index do |frame, frame_index|
|
77
|
+
frame.split('x').each_with_index do |dimension, dimension_index |
|
78
|
+
assert range.include?(dimension.to_i), "Frame #{frame_index}[#{dimension_index}] should have been within #{range.inspect}, but was #{dimension}"
|
79
|
+
end
|
80
|
+
end
|
81
|
+
end
|
82
|
+
end
|
@@ -0,0 +1,25 @@
|
|
1
|
+
class FakeModel
|
2
|
+
attr_accessor(
|
3
|
+
:avatar_file_name,
|
4
|
+
:avatar_file_size,
|
5
|
+
:avatar_updated_at,
|
6
|
+
:avatar_content_type,
|
7
|
+
:avatar_fingerprint,
|
8
|
+
:id
|
9
|
+
)
|
10
|
+
|
11
|
+
def errors
|
12
|
+
@errors ||= []
|
13
|
+
end
|
14
|
+
|
15
|
+
def run_paperclip_callbacks name, *args
|
16
|
+
end
|
17
|
+
|
18
|
+
def valid?
|
19
|
+
errors.empty?
|
20
|
+
end
|
21
|
+
|
22
|
+
def new_record?
|
23
|
+
false
|
24
|
+
end
|
25
|
+
end
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
@@ -0,0 +1 @@
|
|
1
|
+
<html></html>
|
Binary file
|
File without changes
|
File without changes
|
File without changes
|
Binary file
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
@@ -0,0 +1,23 @@
|
|
1
|
+
RSpec::Matchers.define :have_column do |column_name|
|
2
|
+
chain :with_default do |default|
|
3
|
+
@default = default
|
4
|
+
end
|
5
|
+
|
6
|
+
match do |columns|
|
7
|
+
column = columns.detect{|column| column.name == column_name }
|
8
|
+
column && column.default.to_s == @default.to_s
|
9
|
+
end
|
10
|
+
|
11
|
+
failure_message_method =
|
12
|
+
if RSpec::Version::STRING.to_i >= 3
|
13
|
+
:failure_message
|
14
|
+
else
|
15
|
+
:failure_message_for_should
|
16
|
+
end
|
17
|
+
|
18
|
+
send(failure_message_method) do |columns|
|
19
|
+
"expected to find '#{column_name}', " +
|
20
|
+
"default '#{@default}' " +
|
21
|
+
"in #{columns.map { |column| [column.name, column.default] }}"
|
22
|
+
end
|
23
|
+
end
|
@@ -1,7 +1,9 @@
|
|
1
1
|
class MockAttachment
|
2
2
|
attr_accessor :updated_at, :original_filename
|
3
|
+
attr_reader :options
|
3
4
|
|
4
5
|
def initialize(options = {})
|
6
|
+
@options = options
|
5
7
|
@model = options[:model]
|
6
8
|
@responds_to_updated_at = options[:responds_to_updated_at]
|
7
9
|
@updated_at = options[:updated_at]
|
File without changes
|
@@ -0,0 +1,68 @@
|
|
1
|
+
module ModelReconstruction
|
2
|
+
def reset_class class_name
|
3
|
+
ActiveRecord::Base.send(:include, Paperclip::Glue)
|
4
|
+
Object.send(:remove_const, class_name) rescue nil
|
5
|
+
klass = Object.const_set(class_name, Class.new(ActiveRecord::Base))
|
6
|
+
|
7
|
+
klass.class_eval do
|
8
|
+
include Paperclip::Glue
|
9
|
+
end
|
10
|
+
|
11
|
+
klass.reset_column_information
|
12
|
+
klass.connection_pool.clear_table_cache!(klass.table_name) if klass.connection_pool.respond_to?(:clear_table_cache!)
|
13
|
+
|
14
|
+
if klass.connection.respond_to?(:schema_cache)
|
15
|
+
if ActiveRecord::VERSION::STRING >= "5.0"
|
16
|
+
klass.connection.schema_cache.clear_data_source_cache!(klass.table_name)
|
17
|
+
else
|
18
|
+
klass.connection.schema_cache.clear_table_cache!(klass.table_name)
|
19
|
+
end
|
20
|
+
end
|
21
|
+
|
22
|
+
klass
|
23
|
+
end
|
24
|
+
|
25
|
+
def reset_table table_name, &block
|
26
|
+
block ||= lambda { |table| true }
|
27
|
+
ActiveRecord::Base.connection.create_table :dummies, {force: true}, &block
|
28
|
+
end
|
29
|
+
|
30
|
+
def modify_table table_name, &block
|
31
|
+
ActiveRecord::Base.connection.change_table :dummies, &block
|
32
|
+
end
|
33
|
+
|
34
|
+
def rebuild_model options = {}
|
35
|
+
ActiveRecord::Base.connection.create_table :dummies, force: true do |table|
|
36
|
+
table.column :title, :string
|
37
|
+
table.column :other, :string
|
38
|
+
table.column :avatar_file_name, :string
|
39
|
+
table.column :avatar_content_type, :string
|
40
|
+
table.column :avatar_file_size, :integer
|
41
|
+
table.column :avatar_updated_at, :datetime
|
42
|
+
table.column :avatar_fingerprint, :string
|
43
|
+
end
|
44
|
+
rebuild_class options
|
45
|
+
end
|
46
|
+
|
47
|
+
def rebuild_class options = {}
|
48
|
+
reset_class("Dummy").tap do |klass|
|
49
|
+
klass.has_attached_file :avatar, options
|
50
|
+
klass.do_not_validate_attachment_file_type :avatar
|
51
|
+
Paperclip.reset_duplicate_clash_check!
|
52
|
+
end
|
53
|
+
end
|
54
|
+
|
55
|
+
def rebuild_meta_class_of obj, options = {}
|
56
|
+
meta_class_of(obj).tap do |metaklass|
|
57
|
+
metaklass.has_attached_file :avatar, options
|
58
|
+
metaklass.do_not_validate_attachment_file_type :avatar
|
59
|
+
Paperclip.reset_duplicate_clash_check!
|
60
|
+
end
|
61
|
+
end
|
62
|
+
|
63
|
+
def meta_class_of(obj)
|
64
|
+
class << obj
|
65
|
+
self
|
66
|
+
end
|
67
|
+
end
|
68
|
+
end
|
@@ -0,0 +1,13 @@
|
|
1
|
+
module TestData
|
2
|
+
def attachment(options={})
|
3
|
+
Paperclip::Attachment.new(:avatar, FakeModel.new, options)
|
4
|
+
end
|
5
|
+
|
6
|
+
def stringy_file
|
7
|
+
StringIO.new('.\n')
|
8
|
+
end
|
9
|
+
|
10
|
+
def fixture_file(filename)
|
11
|
+
File.join(File.dirname(__FILE__), 'fixtures', filename)
|
12
|
+
end
|
13
|
+
end
|