paperclip 3.4.0 → 6.1.0
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/.github/issue_template.md +3 -0
- data/.gitignore +0 -6
- data/.hound.yml +1055 -0
- data/.rubocop.yml +1 -0
- data/.travis.yml +19 -12
- data/Appraisals +4 -11
- data/CONTRIBUTING.md +29 -13
- data/Gemfile +13 -4
- data/LICENSE +1 -3
- data/MIGRATING-ES.md +317 -0
- data/MIGRATING.md +375 -0
- data/NEWS +390 -71
- data/README.md +607 -152
- data/RELEASING.md +17 -0
- data/Rakefile +6 -8
- data/UPGRADING +12 -9
- data/features/basic_integration.feature +34 -21
- data/features/migration.feature +0 -24
- data/features/rake_tasks.feature +2 -3
- data/features/step_definitions/attachment_steps.rb +44 -36
- data/features/step_definitions/html_steps.rb +2 -2
- data/features/step_definitions/rails_steps.rb +125 -26
- data/features/step_definitions/s3_steps.rb +3 -3
- data/features/step_definitions/web_steps.rb +1 -103
- data/features/support/env.rb +3 -2
- data/features/support/fakeweb.rb +4 -1
- data/features/support/file_helpers.rb +12 -2
- data/features/support/fixtures/gemfile.txt +1 -1
- data/features/support/paths.rb +1 -1
- data/features/support/rails.rb +4 -11
- 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 +215 -82
- data/lib/paperclip/attachment_registry.rb +60 -0
- data/lib/paperclip/callbacks.rb +13 -1
- data/lib/paperclip/content_type_detector.rb +48 -24
- data/lib/paperclip/errors.rb +8 -1
- data/lib/paperclip/file_command_content_type_detector.rb +6 -8
- data/lib/paperclip/filename_cleaner.rb +15 -0
- data/lib/paperclip/geometry_detector_factory.rb +12 -5
- data/lib/paperclip/geometry_parser_factory.rb +1 -1
- data/lib/paperclip/glue.rb +1 -2
- data/lib/paperclip/has_attached_file.rb +115 -0
- data/lib/paperclip/helpers.rb +15 -20
- data/lib/paperclip/interpolations/plural_cache.rb +18 -0
- data/lib/paperclip/interpolations.rb +36 -14
- data/lib/paperclip/io_adapters/abstract_adapter.rb +42 -5
- data/lib/paperclip/io_adapters/attachment_adapter.rb +20 -9
- data/lib/paperclip/io_adapters/data_uri_adapter.rb +22 -0
- data/lib/paperclip/io_adapters/empty_string_adapter.rb +19 -0
- data/lib/paperclip/io_adapters/file_adapter.rb +13 -7
- data/lib/paperclip/io_adapters/http_url_proxy_adapter.rb +16 -0
- 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 +11 -7
- data/lib/paperclip/io_adapters/uri_adapter.rb +43 -19
- data/lib/paperclip/locales/en.yml +1 -0
- data/lib/paperclip/logger.rb +1 -1
- data/lib/paperclip/matchers/have_attached_file_matcher.rb +3 -6
- data/lib/paperclip/matchers/validate_attachment_content_type_matcher.rb +4 -4
- data/lib/paperclip/matchers/validate_attachment_presence_matcher.rb +7 -2
- data/lib/paperclip/matchers/validate_attachment_size_matcher.rb +2 -1
- data/lib/paperclip/matchers.rb +1 -1
- data/lib/paperclip/media_type_spoof_detector.rb +93 -0
- data/lib/paperclip/missing_attachment_styles.rb +11 -16
- data/lib/paperclip/processor.rb +15 -43
- data/lib/paperclip/processor_helpers.rb +50 -0
- data/lib/paperclip/rails_environment.rb +25 -0
- data/lib/paperclip/schema.rb +10 -8
- data/lib/paperclip/storage/filesystem.rb +20 -5
- data/lib/paperclip/storage/fog.rb +49 -23
- data/lib/paperclip/storage/s3.rb +153 -82
- data/lib/paperclip/style.rb +8 -3
- data/lib/paperclip/tempfile_factory.rb +6 -4
- data/lib/paperclip/thumbnail.rb +35 -19
- data/lib/paperclip/url_generator.rb +26 -14
- data/lib/paperclip/validators/attachment_content_type_validator.rb +15 -2
- 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 +12 -8
- data/lib/paperclip/validators/attachment_size_validator.rb +17 -10
- data/lib/paperclip/validators/media_type_spoof_detection_validator.rb +31 -0
- data/lib/paperclip/validators.rb +31 -3
- data/lib/paperclip/version.rb +3 -1
- data/lib/paperclip.rb +41 -55
- data/lib/tasks/paperclip.rake +56 -9
- data/paperclip.gemspec +18 -17
- data/shoulda_macros/paperclip.rb +13 -3
- data/spec/paperclip/attachment_definitions_spec.rb +13 -0
- data/spec/paperclip/attachment_processing_spec.rb +79 -0
- data/spec/paperclip/attachment_registry_spec.rb +158 -0
- data/{test/attachment_test.rb → spec/paperclip/attachment_spec.rb} +597 -389
- data/spec/paperclip/content_type_detector_spec.rb +48 -0
- data/spec/paperclip/file_command_content_type_detector_spec.rb +40 -0
- data/spec/paperclip/filename_cleaner_spec.rb +13 -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} +179 -199
- data/{test/interpolations_test.rb → spec/paperclip/interpolations_spec.rb} +79 -46
- data/spec/paperclip/io_adapters/abstract_adapter_spec.rb +160 -0
- data/{test/io_adapters/attachment_adapter_test.rb → spec/paperclip/io_adapters/attachment_adapter_spec.rb} +54 -25
- 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 +138 -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/spec/paperclip/io_adapters/stringio_adapter_spec.rb +64 -0
- data/spec/paperclip/io_adapters/uploaded_file_adapter_spec.rb +146 -0
- data/spec/paperclip/io_adapters/uri_adapter_spec.rb +220 -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 +120 -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/spec/paperclip/rake_spec.rb +103 -0
- 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 +254 -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} +186 -141
- data/spec/paperclip/url_generator_spec.rb +221 -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} +87 -59
- 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 +46 -0
- data/spec/support/assertions.rb +82 -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 +395 -346
- data/Gemfile.lock +0 -200
- 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/lib/paperclip/attachment_options.rb +0 -9
- data/lib/paperclip/instance_methods.rb +0 -35
- data/test/attachment_options_test.rb +0 -27
- data/test/attachment_processing_test.rb +0 -29
- data/test/content_type_detector_test.rb +0 -40
- data/test/file_command_content_type_detector_test.rb +0 -25
- data/test/generator_test.rb +0 -80
- data/test/geometry_detector_test.rb +0 -24
- data/test/helper.rb +0 -199
- data/test/io_adapters/abstract_adapter_test.rb +0 -50
- data/test/io_adapters/file_adapter_test.rb +0 -100
- data/test/io_adapters/identity_adapter_test.rb +0 -8
- data/test/io_adapters/stringio_adapter_test.rb +0 -51
- data/test/io_adapters/uploaded_file_adapter_test.rb +0 -123
- data/test/io_adapters/uri_adapter_test.rb +0 -86
- 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 -47
- 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 -94
- data/test/paperclip_test.rb +0 -259
- 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 -1236
- 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 -292
- data/test/validators_test.rb +0 -25
- /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
@@ -1,110 +0,0 @@
|
|
1
|
-
require './test/helper'
|
2
|
-
|
3
|
-
class ValidateAttachmentContentTypeMatcherTest < Test::Unit::TestCase
|
4
|
-
context "validate_attachment_content_type" do
|
5
|
-
setup do
|
6
|
-
reset_table("dummies") do |d|
|
7
|
-
d.string :title
|
8
|
-
d.string :avatar_file_name
|
9
|
-
d.string :avatar_content_type
|
10
|
-
end
|
11
|
-
@dummy_class = reset_class "Dummy"
|
12
|
-
@dummy_class.has_attached_file :avatar
|
13
|
-
@matcher = self.class.validate_attachment_content_type(:avatar).
|
14
|
-
allowing(%w(image/png image/jpeg)).
|
15
|
-
rejecting(%w(audio/mp3 application/octet-stream))
|
16
|
-
end
|
17
|
-
|
18
|
-
context "given a class with no validation" do
|
19
|
-
should_reject_dummy_class
|
20
|
-
end
|
21
|
-
|
22
|
-
context "given a class with a validation that doesn't match" do
|
23
|
-
setup do
|
24
|
-
@dummy_class.validates_attachment_content_type :avatar, :content_type => %r{audio/.*}
|
25
|
-
end
|
26
|
-
|
27
|
-
should_reject_dummy_class
|
28
|
-
end
|
29
|
-
|
30
|
-
context "given a class with a matching validation" do
|
31
|
-
setup do
|
32
|
-
@dummy_class.validates_attachment_content_type :avatar, :content_type => %r{image/.*}
|
33
|
-
end
|
34
|
-
|
35
|
-
should_accept_dummy_class
|
36
|
-
end
|
37
|
-
|
38
|
-
context "given a class with other validations but matching types" do
|
39
|
-
setup do
|
40
|
-
@dummy_class.validates_presence_of :title
|
41
|
-
@dummy_class.validates_attachment_content_type :avatar, :content_type => %r{image/.*}
|
42
|
-
end
|
43
|
-
|
44
|
-
should_accept_dummy_class
|
45
|
-
end
|
46
|
-
|
47
|
-
context "given a class that matches and a matcher that only specifies 'allowing'" do
|
48
|
-
setup do
|
49
|
-
@dummy_class.validates_attachment_content_type :avatar, :content_type => %r{image/.*}
|
50
|
-
@matcher = self.class.validate_attachment_content_type(:avatar).
|
51
|
-
allowing(%w(image/png image/jpeg))
|
52
|
-
end
|
53
|
-
|
54
|
-
should_accept_dummy_class
|
55
|
-
end
|
56
|
-
|
57
|
-
context "given a class that does not match and a matcher that only specifies 'allowing'" do
|
58
|
-
setup do
|
59
|
-
@dummy_class.validates_attachment_content_type :avatar, :content_type => %r{audio/.*}
|
60
|
-
@matcher = self.class.validate_attachment_content_type(:avatar).
|
61
|
-
allowing(%w(image/png image/jpeg))
|
62
|
-
end
|
63
|
-
|
64
|
-
should_reject_dummy_class
|
65
|
-
end
|
66
|
-
|
67
|
-
context "given a class that matches and a matcher that only specifies 'rejecting'" do
|
68
|
-
setup do
|
69
|
-
@dummy_class.validates_attachment_content_type :avatar, :content_type => %r{image/.*}
|
70
|
-
@matcher = self.class.validate_attachment_content_type(:avatar).
|
71
|
-
rejecting(%w(audio/mp3 application/octet-stream))
|
72
|
-
end
|
73
|
-
|
74
|
-
should_accept_dummy_class
|
75
|
-
end
|
76
|
-
|
77
|
-
context "given a class that does not match and a matcher that only specifies 'rejecting'" do
|
78
|
-
setup do
|
79
|
-
@dummy_class.validates_attachment_content_type :avatar, :content_type => %r{audio/.*}
|
80
|
-
@matcher = self.class.validate_attachment_content_type(:avatar).
|
81
|
-
rejecting(%w(audio/mp3 application/octet-stream))
|
82
|
-
end
|
83
|
-
|
84
|
-
should_reject_dummy_class
|
85
|
-
end
|
86
|
-
|
87
|
-
context "using an :if to control the validation" do
|
88
|
-
setup do
|
89
|
-
@dummy_class.class_eval do
|
90
|
-
validates_attachment_content_type :avatar, :content_type => %r{image/*} , :if => :go
|
91
|
-
attr_accessor :go
|
92
|
-
end
|
93
|
-
@matcher = self.class.validate_attachment_content_type(:avatar).
|
94
|
-
allowing(%w(image/png image/jpeg)).
|
95
|
-
rejecting(%w(audio/mp3 application/octet-stream))
|
96
|
-
@dummy = @dummy_class.new
|
97
|
-
end
|
98
|
-
|
99
|
-
should "run the validation if the control is true" do
|
100
|
-
@dummy.go = true
|
101
|
-
assert_accepts @matcher, @dummy
|
102
|
-
end
|
103
|
-
|
104
|
-
should "not run the validation if the control is false" do
|
105
|
-
@dummy.go = false
|
106
|
-
assert_rejects @matcher, @dummy
|
107
|
-
end
|
108
|
-
end
|
109
|
-
end
|
110
|
-
end
|
@@ -1,47 +0,0 @@
|
|
1
|
-
require './test/helper'
|
2
|
-
|
3
|
-
class ValidateAttachmentPresenceMatcherTest < Test::Unit::TestCase
|
4
|
-
context "validate_attachment_presence" do
|
5
|
-
setup do
|
6
|
-
reset_table("dummies") do |d|
|
7
|
-
d.string :avatar_file_name
|
8
|
-
end
|
9
|
-
@dummy_class = reset_class "Dummy"
|
10
|
-
@dummy_class.has_attached_file :avatar
|
11
|
-
@matcher = self.class.validate_attachment_presence(:avatar)
|
12
|
-
end
|
13
|
-
|
14
|
-
context "given a class with no validation" do
|
15
|
-
should_reject_dummy_class
|
16
|
-
end
|
17
|
-
|
18
|
-
context "given a class with a matching validation" do
|
19
|
-
setup do
|
20
|
-
@dummy_class.validates_attachment_presence :avatar
|
21
|
-
end
|
22
|
-
|
23
|
-
should_accept_dummy_class
|
24
|
-
end
|
25
|
-
|
26
|
-
context "using an :if to control the validation" do
|
27
|
-
setup do
|
28
|
-
@dummy_class.class_eval do
|
29
|
-
validates_attachment_presence :avatar, :if => :go
|
30
|
-
attr_accessor :go
|
31
|
-
end
|
32
|
-
@dummy = @dummy_class.new
|
33
|
-
@dummy.avatar = nil
|
34
|
-
end
|
35
|
-
|
36
|
-
should "run the validation if the control is true" do
|
37
|
-
@dummy.go = true
|
38
|
-
assert_accepts @matcher, @dummy
|
39
|
-
end
|
40
|
-
|
41
|
-
should "not run the validation if the control is false" do
|
42
|
-
@dummy.go = false
|
43
|
-
assert_rejects @matcher, @dummy
|
44
|
-
end
|
45
|
-
end
|
46
|
-
end
|
47
|
-
end
|
@@ -1,86 +0,0 @@
|
|
1
|
-
require './test/helper'
|
2
|
-
|
3
|
-
class ValidateAttachmentSizeMatcherTest < Test::Unit::TestCase
|
4
|
-
context "validate_attachment_size" do
|
5
|
-
setup do
|
6
|
-
reset_table("dummies") do |d|
|
7
|
-
d.string :avatar_file_name
|
8
|
-
d.integer :avatar_file_size
|
9
|
-
end
|
10
|
-
@dummy_class = reset_class "Dummy"
|
11
|
-
@dummy_class.has_attached_file :avatar
|
12
|
-
end
|
13
|
-
|
14
|
-
context "of limited size" do
|
15
|
-
setup{ @matcher = self.class.validate_attachment_size(:avatar).in(256..1024) }
|
16
|
-
|
17
|
-
context "given a class with no validation" do
|
18
|
-
should_reject_dummy_class
|
19
|
-
end
|
20
|
-
|
21
|
-
context "given a class with a validation that's too high" do
|
22
|
-
setup { @dummy_class.validates_attachment_size :avatar, :in => 256..2048 }
|
23
|
-
should_reject_dummy_class
|
24
|
-
end
|
25
|
-
|
26
|
-
context "given a class with a validation that's too low" do
|
27
|
-
setup { @dummy_class.validates_attachment_size :avatar, :in => 0..1024 }
|
28
|
-
should_reject_dummy_class
|
29
|
-
end
|
30
|
-
|
31
|
-
context "given a class with a validation that matches" do
|
32
|
-
setup { @dummy_class.validates_attachment_size :avatar, :in => 256..1024 }
|
33
|
-
should_accept_dummy_class
|
34
|
-
end
|
35
|
-
end
|
36
|
-
|
37
|
-
context "allowing anything" do
|
38
|
-
setup{ @matcher = self.class.validate_attachment_size(:avatar) }
|
39
|
-
|
40
|
-
context "given a class with an upper limit" do
|
41
|
-
setup { @dummy_class.validates_attachment_size :avatar, :less_than => 1 }
|
42
|
-
should_accept_dummy_class
|
43
|
-
end
|
44
|
-
|
45
|
-
context "given a class with a lower limit" do
|
46
|
-
setup { @dummy_class.validates_attachment_size :avatar, :greater_than => 1 }
|
47
|
-
should_accept_dummy_class
|
48
|
-
end
|
49
|
-
end
|
50
|
-
|
51
|
-
context "using an :if to control the validation" do
|
52
|
-
setup do
|
53
|
-
@dummy_class.class_eval do
|
54
|
-
validates_attachment_size :avatar, :greater_than => 1024, :if => :go
|
55
|
-
attr_accessor :go
|
56
|
-
end
|
57
|
-
@dummy = @dummy_class.new
|
58
|
-
@matcher = self.class.validate_attachment_size(:avatar).greater_than(1024)
|
59
|
-
end
|
60
|
-
|
61
|
-
should "run the validation if the control is true" do
|
62
|
-
@dummy.go = true
|
63
|
-
assert_accepts @matcher, @dummy
|
64
|
-
end
|
65
|
-
|
66
|
-
should "not run the validation if the control is false" do
|
67
|
-
@dummy.go = false
|
68
|
-
assert_rejects @matcher, @dummy
|
69
|
-
end
|
70
|
-
end
|
71
|
-
|
72
|
-
context "post processing" do
|
73
|
-
setup do
|
74
|
-
@dummy_class.validates_attachment_size :avatar, :greater_than => 1024
|
75
|
-
|
76
|
-
@dummy = @dummy_class.new
|
77
|
-
@matcher = self.class.validate_attachment_size(:avatar).greater_than(1024)
|
78
|
-
end
|
79
|
-
|
80
|
-
should "be skipped" do
|
81
|
-
@dummy.avatar.expects(:post_process).never
|
82
|
-
assert_accepts @matcher, @dummy
|
83
|
-
end
|
84
|
-
end
|
85
|
-
end
|
86
|
-
end
|
data/test/meta_class_test.rb
DELETED
@@ -1,32 +0,0 @@
|
|
1
|
-
require './test/helper'
|
2
|
-
|
3
|
-
class MetaClassTest < Test::Unit::TestCase
|
4
|
-
context "A meta-class of dummy" do
|
5
|
-
setup do
|
6
|
-
rebuild_model
|
7
|
-
@file = File.new(fixture_file("5k.png"), 'rb')
|
8
|
-
end
|
9
|
-
|
10
|
-
teardown { @file.close }
|
11
|
-
|
12
|
-
should "be able to use Paperclip like a normal class" do
|
13
|
-
reset_class("Dummy")
|
14
|
-
@dummy = Dummy.new
|
15
|
-
|
16
|
-
assert_nothing_raised do
|
17
|
-
rebuild_meta_class_of(@dummy)
|
18
|
-
end
|
19
|
-
end
|
20
|
-
|
21
|
-
should "work like any other instance" do
|
22
|
-
reset_class("Dummy")
|
23
|
-
@dummy = Dummy.new
|
24
|
-
rebuild_meta_class_of(@dummy)
|
25
|
-
|
26
|
-
assert_nothing_raised do
|
27
|
-
@dummy.avatar = @file
|
28
|
-
end
|
29
|
-
assert @dummy.save
|
30
|
-
end
|
31
|
-
end
|
32
|
-
end
|
@@ -1,94 +0,0 @@
|
|
1
|
-
require './test/helper'
|
2
|
-
|
3
|
-
class PaperclipMissingAttachmentStylesTest < Test::Unit::TestCase
|
4
|
-
|
5
|
-
context "Paperclip" do
|
6
|
-
setup do
|
7
|
-
Paperclip.classes_with_attachments = Set.new
|
8
|
-
end
|
9
|
-
|
10
|
-
teardown do
|
11
|
-
File.unlink(Paperclip.registered_attachments_styles_path) rescue nil
|
12
|
-
end
|
13
|
-
|
14
|
-
should "be able to keep list of models using it" do
|
15
|
-
assert_kind_of Set, Paperclip.classes_with_attachments
|
16
|
-
assert Paperclip.classes_with_attachments.empty?, 'list should be empty'
|
17
|
-
rebuild_model
|
18
|
-
assert_equal ['Dummy'].to_set, Paperclip.classes_with_attachments
|
19
|
-
end
|
20
|
-
|
21
|
-
should "enable to get and set path to registered styles file" do
|
22
|
-
assert_equal ROOT.join('tmp/public/system/paperclip_attachments.yml').to_s, Paperclip.registered_attachments_styles_path
|
23
|
-
Paperclip.registered_attachments_styles_path = '/tmp/config/paperclip_attachments.yml'
|
24
|
-
assert_equal '/tmp/config/paperclip_attachments.yml', Paperclip.registered_attachments_styles_path
|
25
|
-
Paperclip.registered_attachments_styles_path = nil
|
26
|
-
assert_equal ROOT.join('tmp/public/system/paperclip_attachments.yml').to_s, Paperclip.registered_attachments_styles_path
|
27
|
-
end
|
28
|
-
|
29
|
-
should "be able to get current attachment styles" do
|
30
|
-
assert_equal Hash.new, Paperclip.send(:current_attachments_styles)
|
31
|
-
rebuild_model :styles => {:croppable => '600x600>', :big => '1000x1000>'}
|
32
|
-
expected_hash = { :Dummy => {:avatar => [:big, :croppable]}}
|
33
|
-
assert_equal expected_hash, Paperclip.send(:current_attachments_styles)
|
34
|
-
end
|
35
|
-
|
36
|
-
should "be able to save current attachment styles for further comparison" do
|
37
|
-
rebuild_model :styles => {:croppable => '600x600>', :big => '1000x1000>'}
|
38
|
-
Paperclip.save_current_attachments_styles!
|
39
|
-
expected_hash = { :Dummy => {:avatar => [:big, :croppable]}}
|
40
|
-
assert_equal expected_hash, YAML.load_file(Paperclip.registered_attachments_styles_path)
|
41
|
-
end
|
42
|
-
|
43
|
-
should "be able to read registered attachment styles from file" do
|
44
|
-
rebuild_model :styles => {:croppable => '600x600>', :big => '1000x1000>'}
|
45
|
-
Paperclip.save_current_attachments_styles!
|
46
|
-
expected_hash = { :Dummy => {:avatar => [:big, :croppable]}}
|
47
|
-
assert_equal expected_hash, Paperclip.send(:get_registered_attachments_styles)
|
48
|
-
end
|
49
|
-
|
50
|
-
should "be able to calculate differences between registered styles and current styles" do
|
51
|
-
rebuild_model :styles => {:croppable => '600x600>', :big => '1000x1000>'}
|
52
|
-
Paperclip.save_current_attachments_styles!
|
53
|
-
rebuild_model :styles => {:thumb => 'x100', :export => 'x400>', :croppable => '600x600>', :big => '1000x1000>'}
|
54
|
-
expected_hash = { :Dummy => {:avatar => [:export, :thumb]} }
|
55
|
-
assert_equal expected_hash, Paperclip.missing_attachments_styles
|
56
|
-
|
57
|
-
ActiveRecord::Base.connection.create_table :books, :force => true
|
58
|
-
class ::Book < ActiveRecord::Base
|
59
|
-
has_attached_file :cover, :styles => {:small => 'x100', :large => '1000x1000>'}
|
60
|
-
has_attached_file :sample, :styles => {:thumb => 'x100'}
|
61
|
-
end
|
62
|
-
|
63
|
-
expected_hash = {
|
64
|
-
:Dummy => {:avatar => [:export, :thumb]},
|
65
|
-
:Book => {:sample => [:thumb], :cover => [:large, :small]}
|
66
|
-
}
|
67
|
-
assert_equal expected_hash, Paperclip.missing_attachments_styles
|
68
|
-
Paperclip.save_current_attachments_styles!
|
69
|
-
assert_equal Hash.new, Paperclip.missing_attachments_styles
|
70
|
-
end
|
71
|
-
|
72
|
-
should "be able to calculate differences when a new attachment is added to a model" do
|
73
|
-
rebuild_model :styles => {:croppable => '600x600>', :big => '1000x1000>'}
|
74
|
-
Paperclip.save_current_attachments_styles!
|
75
|
-
|
76
|
-
class ::Dummy
|
77
|
-
has_attached_file :photo, :styles => {:small => 'x100', :large => '1000x1000>'}
|
78
|
-
end
|
79
|
-
|
80
|
-
expected_hash = {
|
81
|
-
:Dummy => {:photo => [:large, :small]}
|
82
|
-
}
|
83
|
-
assert_equal expected_hash, Paperclip.missing_attachments_styles
|
84
|
-
Paperclip.save_current_attachments_styles!
|
85
|
-
assert_equal Hash.new, Paperclip.missing_attachments_styles
|
86
|
-
end
|
87
|
-
|
88
|
-
# It's impossible to build styles hash without loading from database whole bunch of records
|
89
|
-
should "skip lambda-styles" do
|
90
|
-
rebuild_model :styles => lambda{ |attachment| attachment.instance.other == 'a' ? {:thumb => "50x50#"} : {:large => "400x400"} }
|
91
|
-
assert_equal Hash.new, Paperclip.send(:current_attachments_styles)
|
92
|
-
end
|
93
|
-
end
|
94
|
-
end
|
data/test/paperclip_test.rb
DELETED
@@ -1,259 +0,0 @@
|
|
1
|
-
require './test/helper'
|
2
|
-
|
3
|
-
class PaperclipTest < Test::Unit::TestCase
|
4
|
-
context "Calling Paperclip.run" do
|
5
|
-
setup do
|
6
|
-
Paperclip.options[:log_command] = false
|
7
|
-
Cocaine::CommandLine.expects(:new).with("convert", "stuff", {}).returns(stub(:run))
|
8
|
-
@original_command_line_path = Cocaine::CommandLine.path
|
9
|
-
end
|
10
|
-
|
11
|
-
teardown do
|
12
|
-
Paperclip.options[:log_command] = true
|
13
|
-
Cocaine::CommandLine.path = @original_command_line_path
|
14
|
-
end
|
15
|
-
|
16
|
-
should "run the command with Cocaine" do
|
17
|
-
Paperclip.run("convert", "stuff")
|
18
|
-
end
|
19
|
-
|
20
|
-
should "save Cocaine::CommandLine.path that set before" do
|
21
|
-
Cocaine::CommandLine.path = "/opt/my_app/bin"
|
22
|
-
Paperclip.run("convert", "stuff")
|
23
|
-
assert_equal [Cocaine::CommandLine.path].flatten.include?("/opt/my_app/bin"), true
|
24
|
-
end
|
25
|
-
|
26
|
-
should "not duplicate Cocaine::CommandLine.path on multiple runs" do
|
27
|
-
Cocaine::CommandLine.expects(:new).with("convert", "more_stuff", {}).returns(stub(:run))
|
28
|
-
Cocaine::CommandLine.path = nil
|
29
|
-
Paperclip.options[:command_path] = "/opt/my_app/bin"
|
30
|
-
Paperclip.run("convert", "stuff")
|
31
|
-
Paperclip.run("convert", "more_stuff")
|
32
|
-
assert_equal 1, [Cocaine::CommandLine.path].flatten.size
|
33
|
-
end
|
34
|
-
end
|
35
|
-
|
36
|
-
should 'not raise errors when doing a lot of running' do
|
37
|
-
Paperclip.options[:command_path] = ["/usr/local/bin"] * 1024
|
38
|
-
Cocaine::CommandLine.path = "/something/else"
|
39
|
-
100.times do |x|
|
40
|
-
Paperclip.run("echo", x.to_s)
|
41
|
-
end
|
42
|
-
end
|
43
|
-
|
44
|
-
context "Calling Paperclip.log without options[:logger] set" do
|
45
|
-
setup do
|
46
|
-
Paperclip.logger = nil
|
47
|
-
Paperclip.options[:logger] = nil
|
48
|
-
end
|
49
|
-
|
50
|
-
teardown do
|
51
|
-
Paperclip.options[:logger] = ActiveRecord::Base.logger
|
52
|
-
Paperclip.logger = ActiveRecord::Base.logger
|
53
|
-
end
|
54
|
-
|
55
|
-
should "not raise an error when log is called" do
|
56
|
-
silence_stream(STDOUT) do
|
57
|
-
Paperclip.log('something')
|
58
|
-
end
|
59
|
-
end
|
60
|
-
end
|
61
|
-
context "Calling Paperclip.run with a logger" do
|
62
|
-
should "pass the defined logger if :log_command is set" do
|
63
|
-
Paperclip.options[:log_command] = true
|
64
|
-
Cocaine::CommandLine.expects(:new).with("convert", "stuff", :logger => Paperclip.logger).returns(stub(:run))
|
65
|
-
Paperclip.run("convert", "stuff")
|
66
|
-
end
|
67
|
-
end
|
68
|
-
|
69
|
-
context "Paperclip.each_instance_with_attachment" do
|
70
|
-
setup do
|
71
|
-
@file = File.new(fixture_file("5k.png"), 'rb')
|
72
|
-
d1 = Dummy.create(:avatar => @file)
|
73
|
-
d2 = Dummy.create
|
74
|
-
d3 = Dummy.create(:avatar => @file)
|
75
|
-
@expected = [d1, d3]
|
76
|
-
end
|
77
|
-
|
78
|
-
teardown { @file.close }
|
79
|
-
|
80
|
-
should "yield every instance of a model that has an attachment" do
|
81
|
-
actual = []
|
82
|
-
Paperclip.each_instance_with_attachment("Dummy", "avatar") do |instance|
|
83
|
-
actual << instance
|
84
|
-
end
|
85
|
-
assert_same_elements @expected, actual
|
86
|
-
end
|
87
|
-
end
|
88
|
-
|
89
|
-
should "raise when sent #processor and the name of a class that doesn't exist" do
|
90
|
-
assert_raises(NameError){ Paperclip.processor(:boogey_man) }
|
91
|
-
end
|
92
|
-
|
93
|
-
should "return a class when sent #processor and the name of a class under Paperclip" do
|
94
|
-
assert_equal ::Paperclip::Thumbnail, Paperclip.processor(:thumbnail)
|
95
|
-
end
|
96
|
-
|
97
|
-
should "get a class from a namespaced class name" do
|
98
|
-
class ::One; class Two; end; end
|
99
|
-
assert_equal ::One::Two, Paperclip.class_for("One::Two")
|
100
|
-
end
|
101
|
-
|
102
|
-
should "raise when class doesn't exist in specified namespace" do
|
103
|
-
class ::Three; end
|
104
|
-
class ::Four; end
|
105
|
-
assert_raise NameError do
|
106
|
-
Paperclip.class_for("Three::Four")
|
107
|
-
end
|
108
|
-
end
|
109
|
-
|
110
|
-
context "Attachments with clashing URLs should raise error" do
|
111
|
-
setup do
|
112
|
-
class Dummy2 < ActiveRecord::Base
|
113
|
-
include Paperclip::Glue
|
114
|
-
end
|
115
|
-
end
|
116
|
-
|
117
|
-
should "generate warning if attachment is redefined with the same path string" do
|
118
|
-
expected_log_msg = "Duplicate path for blah with /system/:id/:style/:filename. This will clash with attachment defined in Dummy class"
|
119
|
-
Paperclip.expects(:log).with(expected_log_msg)
|
120
|
-
Dummy.class_eval do
|
121
|
-
has_attached_file :blah, :path => '/system/:id/:style/:filename'
|
122
|
-
end
|
123
|
-
Dummy2.class_eval do
|
124
|
-
has_attached_file :blah, :path => '/system/:id/:style/:filename'
|
125
|
-
end
|
126
|
-
end
|
127
|
-
|
128
|
-
should "not generate warning if attachment is redefined with the same path string but has :class in it" do
|
129
|
-
Paperclip.expects(:log).never
|
130
|
-
Dummy.class_eval do
|
131
|
-
has_attached_file :blah, :path => "/system/:class/:attachment/:id/:style/:filename"
|
132
|
-
end
|
133
|
-
Dummy2.class_eval do
|
134
|
-
has_attached_file :blah, :path => "/system/:class/:attachment/:id/:style/:filename"
|
135
|
-
end
|
136
|
-
end
|
137
|
-
|
138
|
-
should "not generate warning if attachment is defined with the same URL string" do
|
139
|
-
Paperclip.expects(:log).never
|
140
|
-
Dummy.class_eval do
|
141
|
-
has_attached_file :blah, :path => "/system/:class/:attachment/:id/:style/:filename", :url => ":s3_alias_url"
|
142
|
-
end
|
143
|
-
Dummy2.class_eval do
|
144
|
-
has_attached_file :blah, :path => "/system/:class/:attachment/:id/:style/:filename", :url => ":s3_alias_url"
|
145
|
-
end
|
146
|
-
end
|
147
|
-
end
|
148
|
-
|
149
|
-
context "An ActiveRecord model with an 'avatar' attachment" do
|
150
|
-
setup do
|
151
|
-
rebuild_model :path => "tmp/:class/omg/:style.:extension"
|
152
|
-
@file = File.new(fixture_file("5k.png"), 'rb')
|
153
|
-
end
|
154
|
-
|
155
|
-
teardown { @file.close }
|
156
|
-
|
157
|
-
should "not error when trying to also create a 'blah' attachment" do
|
158
|
-
assert_nothing_raised do
|
159
|
-
Dummy.class_eval do
|
160
|
-
has_attached_file :blah
|
161
|
-
end
|
162
|
-
end
|
163
|
-
end
|
164
|
-
|
165
|
-
context "that is attr_protected" do
|
166
|
-
setup do
|
167
|
-
Dummy.class_eval do
|
168
|
-
attr_protected :avatar
|
169
|
-
end
|
170
|
-
@dummy = Dummy.new
|
171
|
-
end
|
172
|
-
|
173
|
-
should "not assign the avatar on mass-set" do
|
174
|
-
@dummy.attributes = { :other => "I'm set!",
|
175
|
-
:avatar => @file }
|
176
|
-
|
177
|
-
assert_equal "I'm set!", @dummy.other
|
178
|
-
assert ! @dummy.avatar?
|
179
|
-
end
|
180
|
-
|
181
|
-
should "still allow assigment on normal set" do
|
182
|
-
@dummy.other = "I'm set!"
|
183
|
-
@dummy.avatar = @file
|
184
|
-
|
185
|
-
assert_equal "I'm set!", @dummy.other
|
186
|
-
assert @dummy.avatar?
|
187
|
-
end
|
188
|
-
end
|
189
|
-
|
190
|
-
context "with a subclass" do
|
191
|
-
setup do
|
192
|
-
class ::SubDummy < Dummy; end
|
193
|
-
end
|
194
|
-
|
195
|
-
should "be able to use the attachment from the subclass" do
|
196
|
-
assert_nothing_raised do
|
197
|
-
@subdummy = SubDummy.create(:avatar => @file)
|
198
|
-
end
|
199
|
-
end
|
200
|
-
|
201
|
-
should "be able to see the attachment definition from the subclass's class" do
|
202
|
-
assert_equal "tmp/:class/omg/:style.:extension",
|
203
|
-
SubDummy.attachment_definitions[:avatar][:path]
|
204
|
-
end
|
205
|
-
|
206
|
-
teardown do
|
207
|
-
SubDummy.delete_all
|
208
|
-
Object.send(:remove_const, "SubDummy") rescue nil
|
209
|
-
end
|
210
|
-
end
|
211
|
-
|
212
|
-
should "have an #avatar method" do
|
213
|
-
assert Dummy.new.respond_to?(:avatar)
|
214
|
-
end
|
215
|
-
|
216
|
-
should "have an #avatar= method" do
|
217
|
-
assert Dummy.new.respond_to?(:avatar=)
|
218
|
-
end
|
219
|
-
|
220
|
-
context "that is valid" do
|
221
|
-
setup do
|
222
|
-
@dummy = Dummy.new
|
223
|
-
@dummy.avatar = @file
|
224
|
-
end
|
225
|
-
|
226
|
-
should "be valid" do
|
227
|
-
assert @dummy.valid?
|
228
|
-
end
|
229
|
-
end
|
230
|
-
|
231
|
-
should "not have Attachment in the ActiveRecord::Base namespace" do
|
232
|
-
assert_raises(NameError) do
|
233
|
-
ActiveRecord::Base::Attachment
|
234
|
-
end
|
235
|
-
end
|
236
|
-
end
|
237
|
-
|
238
|
-
context "configuring a custom processor" do
|
239
|
-
setup do
|
240
|
-
@freedom_processor = Class.new do
|
241
|
-
def make(file, options = {}, attachment = nil)
|
242
|
-
file
|
243
|
-
end
|
244
|
-
end.new
|
245
|
-
|
246
|
-
Paperclip.configure do |config|
|
247
|
-
config.register_processor(:freedom, @freedom_processor)
|
248
|
-
end
|
249
|
-
end
|
250
|
-
|
251
|
-
should "be able to find the custom processor" do
|
252
|
-
assert_equal @freedom_processor, Paperclip.processor(:freedom)
|
253
|
-
end
|
254
|
-
|
255
|
-
teardown do
|
256
|
-
Paperclip.clear_processors!
|
257
|
-
end
|
258
|
-
end
|
259
|
-
end
|