paperclip 4.3.7 → 6.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (123) hide show
  1. checksums.yaml +5 -5
  2. data/.codeclimate.yml +17 -0
  3. data/.github/issue_template.md +3 -0
  4. data/.hound.yml +5 -16
  5. data/.travis.yml +15 -12
  6. data/Appraisals +4 -8
  7. data/CONTRIBUTING.md +16 -5
  8. data/Gemfile +3 -8
  9. data/LICENSE +1 -1
  10. data/MIGRATING-ES.md +317 -0
  11. data/MIGRATING.md +375 -0
  12. data/NEWS +126 -31
  13. data/README.md +264 -156
  14. data/Rakefile +1 -1
  15. data/UPGRADING +12 -9
  16. data/features/basic_integration.feature +3 -2
  17. data/features/migration.feature +0 -24
  18. data/features/step_definitions/attachment_steps.rb +14 -14
  19. data/features/step_definitions/rails_steps.rb +29 -28
  20. data/features/step_definitions/s3_steps.rb +2 -2
  21. data/features/support/env.rb +1 -0
  22. data/features/support/paths.rb +1 -1
  23. data/features/support/rails.rb +0 -24
  24. data/gemfiles/4.2.gemfile +3 -5
  25. data/gemfiles/{3.2.gemfile → 5.0.gemfile} +4 -6
  26. data/lib/generators/paperclip/paperclip_generator.rb +9 -1
  27. data/lib/generators/paperclip/templates/paperclip_migration.rb.erb +1 -1
  28. data/lib/paperclip.rb +14 -12
  29. data/lib/paperclip/attachment.rb +44 -20
  30. data/lib/paperclip/attachment_registry.rb +2 -1
  31. data/lib/paperclip/callbacks.rb +8 -6
  32. data/lib/paperclip/content_type_detector.rb +3 -2
  33. data/lib/paperclip/errors.rb +3 -1
  34. data/lib/paperclip/file_command_content_type_detector.rb +1 -1
  35. data/lib/paperclip/filename_cleaner.rb +0 -1
  36. data/lib/paperclip/geometry_detector_factory.rb +3 -3
  37. data/lib/paperclip/glue.rb +1 -1
  38. data/lib/paperclip/has_attached_file.rb +7 -1
  39. data/lib/paperclip/helpers.rb +15 -11
  40. data/lib/paperclip/interpolations.rb +7 -2
  41. data/lib/paperclip/io_adapters/abstract_adapter.rb +31 -4
  42. data/lib/paperclip/io_adapters/attachment_adapter.rb +17 -6
  43. data/lib/paperclip/io_adapters/data_uri_adapter.rb +8 -8
  44. data/lib/paperclip/io_adapters/empty_string_adapter.rb +5 -4
  45. data/lib/paperclip/io_adapters/file_adapter.rb +12 -6
  46. data/lib/paperclip/io_adapters/http_url_proxy_adapter.rb +8 -7
  47. data/lib/paperclip/io_adapters/identity_adapter.rb +12 -6
  48. data/lib/paperclip/io_adapters/nil_adapter.rb +8 -5
  49. data/lib/paperclip/io_adapters/registry.rb +6 -2
  50. data/lib/paperclip/io_adapters/stringio_adapter.rb +9 -6
  51. data/lib/paperclip/io_adapters/uploaded_file_adapter.rb +10 -6
  52. data/lib/paperclip/io_adapters/uri_adapter.rb +22 -17
  53. data/lib/paperclip/logger.rb +1 -1
  54. data/lib/paperclip/matchers/validate_attachment_content_type_matcher.rb +4 -4
  55. data/lib/paperclip/media_type_spoof_detector.rb +11 -7
  56. data/lib/paperclip/processor.rb +15 -6
  57. data/lib/paperclip/schema.rb +3 -9
  58. data/lib/paperclip/storage/filesystem.rb +13 -2
  59. data/lib/paperclip/storage/fog.rb +21 -14
  60. data/lib/paperclip/storage/s3.rb +81 -61
  61. data/lib/paperclip/style.rb +0 -1
  62. data/lib/paperclip/thumbnail.rb +22 -9
  63. data/lib/paperclip/url_generator.rb +17 -13
  64. data/lib/paperclip/validators.rb +1 -1
  65. data/lib/paperclip/validators/attachment_size_validator.rb +1 -7
  66. data/lib/paperclip/validators/media_type_spoof_detection_validator.rb +4 -0
  67. data/lib/paperclip/version.rb +3 -1
  68. data/lib/tasks/paperclip.rake +18 -4
  69. data/paperclip.gemspec +13 -10
  70. data/spec/paperclip/attachment_processing_spec.rb +2 -5
  71. data/spec/paperclip/attachment_registry_spec.rb +28 -0
  72. data/spec/paperclip/attachment_spec.rb +89 -20
  73. data/spec/paperclip/content_type_detector_spec.rb +1 -1
  74. data/spec/paperclip/file_command_content_type_detector_spec.rb +15 -1
  75. data/spec/paperclip/filename_cleaner_spec.rb +0 -1
  76. data/spec/paperclip/has_attached_file_spec.rb +24 -8
  77. data/spec/paperclip/integration_spec.rb +42 -5
  78. data/spec/paperclip/interpolations_spec.rb +9 -0
  79. data/spec/paperclip/io_adapters/abstract_adapter_spec.rb +104 -22
  80. data/spec/paperclip/io_adapters/attachment_adapter_spec.rb +6 -3
  81. data/spec/paperclip/io_adapters/data_uri_adapter_spec.rb +7 -1
  82. data/spec/paperclip/io_adapters/file_adapter_spec.rb +2 -2
  83. data/spec/paperclip/io_adapters/http_url_proxy_adapter_spec.rb +47 -13
  84. data/spec/paperclip/io_adapters/identity_adapter_spec.rb +1 -1
  85. data/spec/paperclip/io_adapters/registry_spec.rb +2 -2
  86. data/spec/paperclip/io_adapters/stringio_adapter_spec.rb +1 -1
  87. data/spec/paperclip/io_adapters/uploaded_file_adapter_spec.rb +5 -5
  88. data/spec/paperclip/io_adapters/uri_adapter_spec.rb +104 -11
  89. data/spec/paperclip/matchers/validate_attachment_content_type_matcher_spec.rb +10 -0
  90. data/spec/paperclip/matchers/validate_attachment_size_matcher_spec.rb +1 -1
  91. data/spec/paperclip/media_type_spoof_detector_spec.rb +41 -0
  92. data/spec/paperclip/paperclip_spec.rb +15 -45
  93. data/spec/paperclip/processor_spec.rb +4 -4
  94. data/spec/paperclip/schema_spec.rb +46 -46
  95. data/spec/paperclip/storage/fog_spec.rb +31 -0
  96. data/spec/paperclip/storage/s3_live_spec.rb +20 -14
  97. data/spec/paperclip/storage/s3_spec.rb +359 -192
  98. data/spec/paperclip/style_spec.rb +0 -1
  99. data/spec/paperclip/tempfile_spec.rb +35 -0
  100. data/spec/paperclip/thumbnail_spec.rb +43 -38
  101. data/spec/paperclip/url_generator_spec.rb +54 -44
  102. data/spec/paperclip/validators/attachment_size_validator_spec.rb +26 -20
  103. data/spec/paperclip/validators_spec.rb +5 -5
  104. data/spec/spec_helper.rb +5 -2
  105. data/spec/support/assertions.rb +12 -1
  106. data/spec/support/mock_attachment.rb +2 -0
  107. data/spec/support/mock_url_generator_builder.rb +2 -2
  108. data/spec/support/model_reconstruction.rb +11 -3
  109. data/spec/support/reporting.rb +11 -0
  110. metadata +64 -61
  111. data/cucumber/paperclip_steps.rb +0 -6
  112. data/gemfiles/4.1.gemfile +0 -19
  113. data/lib/paperclip/deprecations.rb +0 -42
  114. data/lib/paperclip/locales/de.yml +0 -18
  115. data/lib/paperclip/locales/es.yml +0 -18
  116. data/lib/paperclip/locales/ja.yml +0 -18
  117. data/lib/paperclip/locales/pt-BR.yml +0 -18
  118. data/lib/paperclip/locales/zh-CN.yml +0 -18
  119. data/lib/paperclip/locales/zh-HK.yml +0 -18
  120. data/lib/paperclip/locales/zh-TW.yml +0 -18
  121. data/spec/paperclip/deprecations_spec.rb +0 -65
  122. data/spec/support/deprecations.rb +0 -9
  123. data/spec/support/rails_helpers.rb +0 -7
@@ -1,6 +0,0 @@
1
- When /^I attach an? "([^\"]*)" "([^\"]*)" file to an? "([^\"]*)" on S3$/ do |attachment, extension, model|
2
- stub_paperclip_s3(model, attachment, extension)
3
- attach_file attachment,
4
- "features/support/paperclip/#{model.gsub(" ", "_").underscore}/#{attachment}.#{extension}"
5
- end
6
-
data/gemfiles/4.1.gemfile DELETED
@@ -1,19 +0,0 @@
1
- # This file was generated by Appraisal
2
-
3
- source "https://rubygems.org"
4
-
5
- gem "sqlite3", "~> 1.3.8", :platforms => :ruby
6
- gem "jruby-openssl", :platforms => :jruby
7
- gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
8
- gem "rubysl", :platforms => :rbx
9
- gem "racc", :platforms => :rbx
10
- gem "pry"
11
- gem "rails", "~> 4.1.0"
12
-
13
- group :development, :test do
14
- gem "mime-types", "~> 1.16"
15
- gem "builder"
16
- gem "rubocop", :require => false
17
- end
18
-
19
- gemspec :path => "../"
@@ -1,42 +0,0 @@
1
- require "active_support/deprecation"
2
-
3
- module Paperclip
4
- class Deprecations
5
- class << self
6
- def check
7
- warn_aws_sdk_v1 if aws_sdk_v1?
8
- warn_outdated_rails if active_model_version < "4.2"
9
- end
10
-
11
- private
12
-
13
- def active_model_version
14
- ::ActiveModel::VERSION::STRING
15
- end
16
-
17
- def aws_sdk_v1?
18
- defined?(::AWS) && aws_sdk_version < "2"
19
- end
20
-
21
- def warn_aws_sdk_v1
22
- warn "[paperclip] [deprecation] AWS SDK v1 has been deprecated in " \
23
- "paperclip 5. Please consider upgrading to AWS 2 before " \
24
- "upgrading paperclip."
25
- end
26
-
27
- def warn_outdated_rails
28
- warn "[paperclip] [deprecation] Rails 3.2 and 4.1 are unsupported as " \
29
- "of Rails 5 release. Please upgrade to Rails 4.2 before " \
30
- "upgrading paperclip."
31
- end
32
-
33
- def aws_sdk_version
34
- ::AWS::VERSION
35
- end
36
-
37
- def warn(message)
38
- ActiveSupport::Deprecation.warn(message)
39
- end
40
- end
41
- end
42
- end
@@ -1,18 +0,0 @@
1
- de:
2
- errors:
3
- messages:
4
- in_between: "muss zwischen %{min} und %{max} sein"
5
- spoofed_media_type: "trägt eine Dateiendung, die nicht mit dem Inhalt der Datei übereinstimmt"
6
-
7
- number:
8
- human:
9
- storage_units:
10
- format: "%n %u"
11
- units:
12
- byte:
13
- one: "Byte"
14
- other: "Bytes"
15
- kb: "KB"
16
- mb: "MB"
17
- gb: "GB"
18
- tb: "TB"
@@ -1,18 +0,0 @@
1
- es:
2
- errors:
3
- messages:
4
- in_between: "debe estar entre %{min} y %{max}"
5
- spoofed_media_type: "tiene una extensión que no coincide con su contenido"
6
-
7
- number:
8
- human:
9
- storage_units:
10
- format: "%n %u"
11
- units:
12
- byte:
13
- one: "Byte"
14
- other: "Bytes"
15
- kb: "KB"
16
- mb: "MB"
17
- gb: "GB"
18
- tb: "TB"
@@ -1,18 +0,0 @@
1
- ja:
2
- errors:
3
- messages:
4
- in_between: "の容量は%{min}以上%{max}以下にしてください。"
5
- spoofed_media_type: "の拡張子と内容が一致していません。"
6
-
7
- number:
8
- human:
9
- storage_units:
10
- format: "%n %u"
11
- units:
12
- byte:
13
- one: "Byte"
14
- other: "Bytes"
15
- kb: "KB"
16
- mb: "MB"
17
- gb: "GB"
18
- tb: "TB"
@@ -1,18 +0,0 @@
1
- pt-BR:
2
- errors:
3
- messages:
4
- in_between: "deve ter entre %{min} e %{max}"
5
- spoofed_media_type: "tem uma extensão que não corresponde ao seu conteúdo"
6
-
7
- number:
8
- human:
9
- storage_units:
10
- format: "%n %u"
11
- units:
12
- byte:
13
- one: "Byte"
14
- other: "Bytes"
15
- kb: "KB"
16
- mb: "MB"
17
- gb: "GB"
18
- tb: "TB"
@@ -1,18 +0,0 @@
1
- zh-CN:
2
- errors:
3
- messages:
4
- in_between: "文件大小必须介于 %{min} 到 %{max} 之间"
5
- spoofed_media_type: "扩展名与内容类型不符"
6
-
7
- number:
8
- human:
9
- storage_units:
10
- format: "%n %u"
11
- units:
12
- byte:
13
- one: "Byte"
14
- other: "Bytes"
15
- kb: "KB"
16
- mb: "MB"
17
- gb: "GB"
18
- tb: "TB"
@@ -1,18 +0,0 @@
1
- zh-HK:
2
- errors:
3
- messages:
4
- in_between: "必須介於%{min}到%{max}之間"
5
- spoofed_media_type: "副檔名與內容類型不匹配"
6
-
7
- number:
8
- human:
9
- storage_units:
10
- format: "%n %u"
11
- units:
12
- byte:
13
- one: "Byte"
14
- other: "Bytes"
15
- kb: "KB"
16
- mb: "MB"
17
- gb: "GB"
18
- tb: "TB"
@@ -1,18 +0,0 @@
1
- zh-TW:
2
- errors:
3
- messages:
4
- in_between: "檔案大小必須介於 %{min} 到 %{max} 之間"
5
- spoofed_media_type: "副檔名與內容類型不符"
6
-
7
- number:
8
- human:
9
- storage_units:
10
- format: "%n %u"
11
- units:
12
- byte:
13
- one: "Byte"
14
- other: "Bytes"
15
- kb: "KB"
16
- mb: "MB"
17
- gb: "GB"
18
- tb: "TB"
@@ -1,65 +0,0 @@
1
- require "spec_helper"
2
- require "aws-sdk"
3
- require "active_support/testing/deprecation"
4
-
5
- describe Paperclip::Deprecations do
6
- include ActiveSupport::Testing::Deprecation
7
-
8
- describe ".check" do
9
- before do
10
- ActiveSupport::Deprecation.silenced = false
11
- end
12
-
13
- after do
14
- ActiveSupport::Deprecation.silenced = true
15
- end
16
-
17
- context "when active model version is < 4.2" do
18
- it "displays deprecation warning" do
19
- Paperclip::Deprecations.stubs(:active_model_version).returns("4.1")
20
-
21
- assert_deprecated("Rails 3.2 and 4.1 are unsupported") do
22
- Paperclip::Deprecations.check
23
- end
24
- end
25
- end
26
-
27
- context "when active model version is 4.2" do
28
- it "do not display deprecation warning" do
29
- Paperclip::Deprecations.stubs(:active_model_version).returns("4.2")
30
-
31
- assert_not_deprecated do
32
- Paperclip::Deprecations.check
33
- end
34
- end
35
- end
36
-
37
- context "when aws sdk version is < 2" do
38
- before do
39
- ::AWS.stub! if !defined?(::AWS)
40
- end
41
-
42
- it "displays deprecation warning" do
43
- Paperclip::Deprecations.stubs(:aws_sdk_version).returns("1.68.0")
44
-
45
- assert_deprecated("AWS SDK v1 has been deprecated") do
46
- Paperclip::Deprecations.check
47
- end
48
- end
49
- end
50
-
51
- context "when aws sdk version is 2" do
52
- before do
53
- ::AWS.stub! if !defined?(::AWS)
54
- end
55
-
56
- it "do not display deprecation warning" do
57
- Paperclip::Deprecations.stubs(:aws_sdk_version).returns("2.0.0")
58
-
59
- assert_not_deprecated do
60
- Paperclip::Deprecations.check
61
- end
62
- end
63
- end
64
- end
65
- end
@@ -1,9 +0,0 @@
1
- RSpec.configure do |config|
2
- config.before(:all) do
3
- ActiveSupport::Deprecation.silenced = true
4
- end
5
- config.before(:each) do
6
- Paperclip::Deprecations.stubs(:active_model_version).returns("4.2")
7
- Paperclip::Deprecations.stubs(:aws_sdk_version).returns("2.0.0")
8
- end
9
- end
@@ -1,7 +0,0 @@
1
- module RailsHelpers
2
- module ClassMethods
3
- def using_protected_attributes?
4
- ActiveRecord::VERSION::MAJOR < 4
5
- end
6
- end
7
- end