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,158 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
describe Paperclip::HasAttachedFile do
|
4
|
+
context '#define_on' do
|
5
|
+
it 'defines a setter on the class object' do
|
6
|
+
assert_adding_attachment('avatar').defines_method('avatar=')
|
7
|
+
end
|
8
|
+
|
9
|
+
it 'defines a getter on the class object' do
|
10
|
+
assert_adding_attachment('avatar').defines_method('avatar')
|
11
|
+
end
|
12
|
+
|
13
|
+
it 'defines a query on the class object' do
|
14
|
+
assert_adding_attachment('avatar').defines_method('avatar?')
|
15
|
+
end
|
16
|
+
|
17
|
+
it 'defines a method on the class to get all of its attachments' do
|
18
|
+
assert_adding_attachment('avatar').defines_class_method('attachment_definitions')
|
19
|
+
end
|
20
|
+
|
21
|
+
it 'flushes errors as part of validations' do
|
22
|
+
assert_adding_attachment('avatar').defines_validation
|
23
|
+
end
|
24
|
+
|
25
|
+
it 'registers the attachment with Paperclip::AttachmentRegistry' do
|
26
|
+
assert_adding_attachment('avatar').registers_attachment
|
27
|
+
end
|
28
|
+
|
29
|
+
it 'defines an after_save callback' do
|
30
|
+
assert_adding_attachment('avatar').defines_callback('after_save')
|
31
|
+
end
|
32
|
+
|
33
|
+
it 'defines a before_destroy callback' do
|
34
|
+
assert_adding_attachment('avatar').defines_callback('before_destroy')
|
35
|
+
end
|
36
|
+
|
37
|
+
it 'defines an after_commit callback' do
|
38
|
+
assert_adding_attachment('avatar').defines_callback('after_commit')
|
39
|
+
end
|
40
|
+
|
41
|
+
context 'when the class does not allow after_commit callbacks' do
|
42
|
+
it 'defines an after_destroy callback' do
|
43
|
+
assert_adding_attachment(
|
44
|
+
'avatar',
|
45
|
+
unstub_methods: [:after_commit]
|
46
|
+
).defines_callback('after_destroy')
|
47
|
+
end
|
48
|
+
end
|
49
|
+
|
50
|
+
it 'defines the Paperclip-specific callbacks' do
|
51
|
+
assert_adding_attachment('avatar').defines_callback('define_paperclip_callbacks')
|
52
|
+
end
|
53
|
+
|
54
|
+
it 'does not define a media_type check if told not to' do
|
55
|
+
assert_adding_attachment('avatar').does_not_set_up_media_type_check_validation
|
56
|
+
end
|
57
|
+
|
58
|
+
it 'does define a media_type check if told to' do
|
59
|
+
assert_adding_attachment('avatar').sets_up_media_type_check_validation
|
60
|
+
end
|
61
|
+
end
|
62
|
+
|
63
|
+
private
|
64
|
+
|
65
|
+
def assert_adding_attachment(attachment_name, options={})
|
66
|
+
AttachmentAdder.new(attachment_name, options)
|
67
|
+
end
|
68
|
+
|
69
|
+
class AttachmentAdder
|
70
|
+
include Mocha::API
|
71
|
+
include RSpec::Matchers
|
72
|
+
|
73
|
+
def initialize(attachment_name, options = {})
|
74
|
+
@attachment_name = attachment_name
|
75
|
+
@stubbed_class = stub_class
|
76
|
+
if options.present?
|
77
|
+
options[:unstub_methods].each do |method|
|
78
|
+
@stubbed_class.unstub(method)
|
79
|
+
end
|
80
|
+
end
|
81
|
+
end
|
82
|
+
|
83
|
+
def defines_method(method_name)
|
84
|
+
a_class = @stubbed_class
|
85
|
+
|
86
|
+
Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {})
|
87
|
+
|
88
|
+
expect(a_class).to have_received(:define_method).with(method_name)
|
89
|
+
end
|
90
|
+
|
91
|
+
def defines_class_method(method_name)
|
92
|
+
a_class = @stubbed_class
|
93
|
+
a_class.class.stubs(:define_method)
|
94
|
+
|
95
|
+
Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {})
|
96
|
+
|
97
|
+
expect(a_class).to have_received(:extend).with(Paperclip::HasAttachedFile::ClassMethods)
|
98
|
+
end
|
99
|
+
|
100
|
+
def defines_validation
|
101
|
+
a_class = @stubbed_class
|
102
|
+
|
103
|
+
Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {})
|
104
|
+
|
105
|
+
expect(a_class).to have_received(:validates_each).with(@attachment_name)
|
106
|
+
end
|
107
|
+
|
108
|
+
def registers_attachment
|
109
|
+
a_class = @stubbed_class
|
110
|
+
Paperclip::AttachmentRegistry.stubs(:register)
|
111
|
+
|
112
|
+
Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {size: 1})
|
113
|
+
|
114
|
+
expect(Paperclip::AttachmentRegistry).to have_received(:register).with(a_class, @attachment_name, {size: 1})
|
115
|
+
end
|
116
|
+
|
117
|
+
def defines_callback(callback_name)
|
118
|
+
a_class = @stubbed_class
|
119
|
+
|
120
|
+
Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {})
|
121
|
+
|
122
|
+
expect(a_class).to have_received(callback_name.to_sym)
|
123
|
+
end
|
124
|
+
|
125
|
+
def does_not_set_up_media_type_check_validation
|
126
|
+
a_class = stub_class
|
127
|
+
|
128
|
+
Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, { validate_media_type: false })
|
129
|
+
|
130
|
+
expect(a_class).to have_received(:validates_media_type_spoof_detection).never
|
131
|
+
end
|
132
|
+
|
133
|
+
def sets_up_media_type_check_validation
|
134
|
+
a_class = stub_class
|
135
|
+
|
136
|
+
Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, { validate_media_type: true })
|
137
|
+
|
138
|
+
expect(a_class).to have_received(:validates_media_type_spoof_detection)
|
139
|
+
end
|
140
|
+
|
141
|
+
private
|
142
|
+
|
143
|
+
def stub_class
|
144
|
+
stub('class',
|
145
|
+
validates_each: nil,
|
146
|
+
define_method: nil,
|
147
|
+
after_save: nil,
|
148
|
+
before_destroy: nil,
|
149
|
+
after_commit: nil,
|
150
|
+
after_destroy: nil,
|
151
|
+
define_paperclip_callbacks: nil,
|
152
|
+
extend: nil,
|
153
|
+
name: 'Billy',
|
154
|
+
validates_media_type_spoof_detection: nil
|
155
|
+
)
|
156
|
+
end
|
157
|
+
end
|
158
|
+
end
|