carrierwave_direct 2.1.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc82b1086314ce00c9bda47de03a897ecd59f1e3dca2f0b7617de586c572e129
-  data.tar.gz: dea3d79dfd532cf823f49eb22790c39aeffa5d273b3010763345f0ccb00fb201
+  metadata.gz: bf462a9da6254f9a1b404f03443be9d9c21800aa378cbab7135da3ab08e2d1a5
+  data.tar.gz: 36e88bdcdc5f8e904109845546c47928eaf24dac894ba15a47820a131efd9576
 SHA512:
-  metadata.gz: f489411ef1403569962e800e548e0511a258d1861b577c13d822d26a3d662e216694c213f43ba07898feabc47d2f5b9e6b3ac2b4df27a11a2826e97b07ea685f
-  data.tar.gz: b604ac58fe82f7d10077855f562665f93f7edf54261bc2f3556b9ed6fd7f378c5626dc9f7a0fad9218b8fa05802b4cc8d2a29023c20f6f18b760b4b8b66a816d
+  metadata.gz: 3472e79f169583c76665f9c6a18cebe4b1f8b842e94d57dc4cfadba365382124d358243c229dd5bfcde36e23f9748cf278863f2b9283897e0f8c901b69866ef7
+  data.tar.gz: 180ef968f4d13946a93108e782f029b3c2de25509e7f321933a5203b3d06599e739b999ef1254da69b7153fe02205c72ea0679a4147251f572bdd4967d5cded1

data/.travis.yml

@@ -1,13 +1,18 @@
 rvm:
- - 2.3
- - 2.4
- - 2.5
+ - 2.6
+ - 2.7
 
 script: 'bundle exec rspec spec'
 gemfile:
-  - gemfiles/4.2.gemfile
   - gemfiles/5.1.gemfile
   - gemfiles/5.2.gemfile
+  - gemfiles/6.0.gemfile
+  - gemfiles/6.1.gemfile
+
+matrix:
+  exclude:
+  - rvm: 2.4
+    gemfile: gemfiles/6.0.gemfile
 
 # Move to containerized travis, see http://docs.travis-ci.com/user/migrating-from-legacy
 sudo: false

data/Changelog.md

@@ -1,3 +1,10 @@
+### Unreleased
+
+### 3.0.0
+  * Fixed Ruby 3 deprecation warnings
+  * [BREAKING CHANGE] Drop support for Carrierwave < 2.2.1 which renamed
+    extension_whitelist to extension_allowlist.
+
 ### 2.1.0
 
 Features:

data/README.md

@@ -20,7 +20,9 @@ Please be aware that this gem (and S3 in general) only support single file uploa
 
 Install the latest release:
 
-    gem install carrierwave_direct
+```bash
+gem install carrierwave_direct
+```
 
 In Rails, add it to your Gemfile:
 
@@ -52,11 +54,15 @@ end
 
 If you haven't already done so generate an uploader
 
-    rails generate uploader Avatar
+```bash
+rails generate uploader Avatar
+```
 
 this should give you a file in:
 
-    app/uploaders/avatar_uploader.rb
+```bash
+app/uploaders/avatar_uploader.rb
+```
 
 Check out this file for some hints on how you can customize your uploader. It should look something like this:
 
@@ -111,21 +117,17 @@ class UploaderTest < Sinatra::Base
   end
 end
 ```
+
 ```haml
 # index.haml
 # Now using AWS POST authentication V4
 # See http://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-authentication-HTTPPOST.html for more information
 
 %form{:action => @uploader.direct_fog_url, :method => "post", :enctype => "multipart/form-data"}
-  %input{:name => "utf8", :type => "hidden"}
-  %input{:type => "hidden", :name => "key", :value => @uploader.key}
-  %input{:type => "hidden", :name => "acl", :value => @uploader.acl}
+  - @uploader.direct_fog_hash.each do |key, value|
+    - if key != :uri
+      %input{:type => "hidden", :name => key, :value => value}
   %input{:type => "hidden", :name => "success_action_redirect", :value => @uploader.success_action_redirect}
-  %input{:type => "hidden", :name => "policy", :value => @uploader.policy}
-  %input{:type => "hidden", :name => "x-amz-algorithm", :value => @uploader.algorithm}
-  %input{:type => "hidden", :name => "x-amz-credential", :value => @uploader.credential}
-  %input{:type => "hidden", :name => "x-amz-date", :value => @uploader.date}
-  %input{:type => "hidden", :name => "x-amz-signature", :value => @uploader.signature}
   %input{:name => "file", :type => "file"}
   %input{:type => "submit", :value => "Upload to S3"}
 ```
@@ -280,7 +282,7 @@ If your upload was successful then you will be redirected to the `success_action
 
 The `key` is the most important piece of information as we can use it for validating the file extension, downloading the file from S3, processing it and re-uploading it.
 
-If you're using ActiveRecord, CarrierWaveDirect will by default validate the file extension based off your `extension_whitelist` in your uploader. See the [CarrierWave readme](https://github.com/jnicklas/carrierwave) for more info. You can then use the helper `filename_valid?` to check if the filename is valid. e.g.
+If you're using ActiveRecord, CarrierWaveDirect will by default validate the file extension based off your `extension_allowlist` in your uploader. See the [CarrierWave readme](https://github.com/jnicklas/carrierwave) for more info. You can then use the helper `filename_valid?` to check if the filename is valid. e.g.
 
 ```ruby
 class UsersController < ApplicationController
@@ -304,6 +306,7 @@ CarrierWaveDirect automatically gives you an accessible `key` attribute in your
   <%= f.submit %>
 <% end %>
 ```
+
 then in your controller you can do something like this:
 
 ```ruby
@@ -359,6 +362,7 @@ Your users may find it convenient to upload a file from a location on the Intern
   <%= f.submit %>
 <% end %>
 ```
+
 ```ruby
 class User < ActiveRecord::Base
   def save_and_process_avatar(options = {})
@@ -371,6 +375,7 @@ class User < ActiveRecord::Base
   end
 end
 ```
+
 The methods `has_avatar_upload?`, `remote_avatar_net_url` and `has_remote_avatar_net_url?` are automatically added to your mounted model
 
 ## Validations
@@ -399,13 +404,13 @@ Validates that the filename in the database is unique. Turned *on* by default
 validates :avatar, :filename_format => true
 ```
 
-Validates that the uploaded filename is valid. As well as validating the extension against the `extension_whitelist` it also validates that the `upload_dir` is correct. Turned *on* by default
+Validates that the uploaded filename is valid. As well as validating the extension against the `extension_allowlist` it also validates that the `upload_dir` is correct. Turned *on* by default
 
 ```ruby
 validates :avatar, :remote_net_url_format => true
 ```
 
-Validates that the remote net url is valid. As well as validating the extension against the `extension_whitelist` it also validates that url is valid and has only the schemes specified in the `url_scheme_whitelist`. Turned *on* by default
+Validates that the remote net url is valid. As well as validating the extension against the `extension_allowlist` it also validates that url is valid and has only the schemes specified in the `url_scheme_whitelist`. Turned *on* by default
 
 ## Configuration
 
@@ -426,10 +431,11 @@ CarrierWave.configure do |config|
                                                   # on s3, but you must include an input field named
                                                   # Content-Type on every direct upload form
 
-  config.use_action_status = true                 # defaults to false; if true you must set in your uploader
-                                                  # 'uploader.success_action_status = 201' and set
-                                                  # 'f.file_field :avatar, use_action_status: true' to works
-                                                  # properly
+  config.use_action_status = true                 # defaults to false; if true, you must set
+                                                  # success_action_status in your uploader:
+                                                  #   uploader.success_action_status = "201"
+                                                  # and add use_action_status to the file field:
+                                                  #   f.file_field :avatar, use_action_status: true'
 end
 ```
 
@@ -521,7 +527,7 @@ Factory.define :user |f|
 end
 ```
 
-This will return a valid key based off your `upload_dir` and your `extension_whitelist`
+This will return a valid key based off your `upload_dir` and your `extension_allowlist`
 
 ### Faking a background download
 
@@ -564,12 +570,16 @@ If you're Rails app was newly generated *after* version 3.2.3 and your testing t
 
 Pull requests are very welcome. Before submitting a pull request, please make sure that your changes are well tested. Pull requests without tests *will not* be accepted.
 
-    gem install bundler
-    bundle install
+```bash
+gem install bundler
+bundle install
+```
 
 You should now be able to run the tests
 
-    bundle exec rake
+```bash
+bundle exec rake
+```
 
 ### Using the Sample Application
 

data/carrierwave_direct.gemspec

@@ -14,12 +14,12 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "carrierwave_direct"
 
-  s.add_dependency "carrierwave", '>= 1.0.0'
+  s.add_dependency "carrierwave", '>= 2.2.0'
   s.add_dependency "fog-aws"
 
   s.add_development_dependency "rspec", '~> 3.0'
   s.add_development_dependency "timecop"
-  s.add_development_dependency "rails", ">= 3.2.12"
+  s.add_development_dependency "rails", ">= 5.1.0"
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "capybara"
   s.add_development_dependency "byebug"

data/gemfiles/{4.2.gemfile → 6.0.gemfile}

@@ -6,7 +6,7 @@ gem "fog-aws"
 group :test do
   gem "rspec", '~> 3.0'
   gem "timecop"
-  gem "rails", "~>4.2.0"
+  gem "rails", "~>6.0.0"
   gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
   gem "capybara"
   # gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby

data/gemfiles/6.1.gemfile

@@ -0,0 +1,13 @@
+source "https://rubygems.org"
+
+gem "carrierwave"
+gem "fog-aws"
+
+group :test do
+  gem "rspec", '~> 3.0'
+  gem "timecop"
+  gem "rails", "~>6.1.0"
+  gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
+  gem "capybara"
+  # gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
+end

data/lib/carrierwave_direct/test/capybara_helpers.rb

@@ -18,7 +18,7 @@ module CarrierWaveDirect
         page.find("input[name='file']", visible: false).value
       end
 
-      def upload_directly(uploader, button_locator, options = {})
+      def upload_directly(uploader, button_locator, **options)
         options[:success] = true unless options[:success] == false
         options[:success] &&= !options[:fail]
 
@@ -33,9 +33,9 @@ module CarrierWaveDirect
             sample_key_args.unshift(uploader) if method(:sample_key).arity == -2
             options[:redirect_key] = sample_key(*sample_key_args)
           end
-          
+
           redirect_url_params = Rack::Utils.parse_nested_query(redirect_url.query)
-          
+
           redirect_url.query = Rack::Utils.build_nested_query({
             :bucket => uploader.fog_directory,
             :key => options[:redirect_key],

data/lib/carrierwave_direct/test/helpers.rb

@@ -18,7 +18,7 @@ module CarrierWaveDirect
           options[:filename] = filename_parts.join(".")
         end
         options[:filename] ||= "filename"
-        valid_extension = uploader.extension_whitelist.first if uploader.extension_whitelist
+        valid_extension = uploader.extension_allowlist.first if uploader.extension_allowlist
         options[:extension] = options[:extension] ? options[:extension].gsub(".", "") : (valid_extension || "extension")
         key = options[:base].split("/")
         key.pop

data/lib/carrierwave_direct/uploader.rb

@@ -101,7 +101,7 @@ module CarrierWaveDirect
     end
 
     def extension_regexp
-      allowed_file_types = extension_whitelist
+      allowed_file_types = extension_allowlist
       extension_regexp = allowed_file_types.present? && allowed_file_types.any? ?  "(#{allowed_file_types.join("|")})" : "\\w+"
     end
 

data/lib/carrierwave_direct/validations/active_model.rb

@@ -23,7 +23,7 @@ module CarrierWaveDirect
       class FilenameFormatValidator < ::ActiveModel::EachValidator
         def validate_each(record, attribute, value)
           if record.send("has_#{attribute}_upload?") && record.send("#{attribute}_key") !~ record.send(attribute).key_regexp
-            extensions = record.send(attribute).extension_whitelist
+            extensions = record.send(attribute).extension_allowlist
             message = I18n.t("errors.messages.carrierwave_direct_filename_invalid")
 
             if extensions.present?
@@ -43,7 +43,7 @@ module CarrierWaveDirect
             url_scheme_white_list = uploader.url_scheme_white_list
 
             if (remote_net_url !~ URI.regexp(url_scheme_white_list) || remote_net_url !~ /#{uploader.extension_regexp}\z/)
-              extensions = uploader.extension_whitelist
+              extensions = uploader.extension_allowlist
 
               message = I18n.t("errors.messages.carrierwave_direct_filename_invalid")
 

data/lib/carrierwave_direct/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
 module CarrierwaveDirect
-  VERSION = "2.1.0"
+  VERSION = "3.0.0"
 end
 

data/spec/orm/activerecord_spec.rb

@@ -104,8 +104,8 @@ describe CarrierWaveDirect::ActiveRecord do
         messages = I18n.t("errors.messages.carrierwave_direct_filename_invalid")
 
         if i18n_options
-          if i18n_options[:extension_whitelist]
-            extensions = i18n_options[:extension_whitelist].to_sentence
+          if i18n_options[:extension_allowlist]
+            extensions = i18n_options[:extension_allowlist].to_sentence
             messages += I18n.t("errors.messages.carrierwave_direct_allowed_extensions", :extensions => extensions)
           end
 
@@ -244,7 +244,7 @@ describe CarrierWaveDirect::ActiveRecord do
 
       context "where the uploader has an extension white list" do
         before do
-          subject.video.stub(:extension_whitelist).and_return(%w{avi mp4})
+          subject.video.stub(:extension_allowlist).and_return(%w{avi mp4})
         end
 
         context "and the uploaded file's extension is included in the list" do
@@ -302,7 +302,7 @@ describe CarrierWaveDirect::ActiveRecord do
         context "on create" do
           context "where the uploader has an extension white list" do
             before do
-              subject.video.stub(:extension_whitelist).and_return(%w{avi mp4})
+              subject.video.stub(:extension_allowlist).and_return(%w{avi mp4})
             end
 
             context "and the url's extension is included in the list" do
@@ -325,7 +325,7 @@ describe CarrierWaveDirect::ActiveRecord do
               end
 
               it_should_behave_like "a remote net url i18n error message" do
-                let(:i18n_options) { {:extension_whitelist => %w{avi mp4} } }
+                let(:i18n_options) { {:extension_allowlist => %w{avi mp4} } }
               end
 
               it "should include the white listed extensions in the error message" do

data/spec/test/capybara_helpers_spec.rb

@@ -15,8 +15,8 @@ describe CarrierWaveDirect::Test::CapybaraHelpers do
     allow(subject).to receive(:page).and_return(page)
   end
 
-  def find_element_value(css, value, options = nil)
-    if options
+  def find_element_value(css, value, **options)
+    if options.keys.any?
       allow(page).to receive(:find).with(css, options).and_return(selector)
     else
       allow(page).to receive(:find).with(css).and_return(selector)
@@ -36,10 +36,10 @@ describe CarrierWaveDirect::Test::CapybaraHelpers do
   describe "#upload_directly" do
     let(:uploader) { DirectUploader.new }
 
-    def upload_directly(options = {})
+    def upload_directly(**options)
       options[:button_locator] ||= ""
       button_locator = options.delete(:button_locator)
-      subject.upload_directly(uploader, button_locator, options)
+      subject.upload_directly(uploader, button_locator, **options)
     end
 
     def stub_common

data/spec/test/helpers_spec.rb

@@ -19,7 +19,7 @@ describe CarrierWaveDirect::Test::Helpers do
 
         context "['exe', 'bmp']" do
           before do
-            allow(direct_uploader).to receive(:extension_whitelist).and_return(%w{exe bmp})
+            allow(direct_uploader).to receive(:extension_allowlist).and_return(%w{exe bmp})
           end
 
           it "should return '*/guid/filename.exe'" do
@@ -29,7 +29,7 @@ describe CarrierWaveDirect::Test::Helpers do
 
         context "[]" do
           before do
-            allow(direct_uploader).to receive(:extension_whitelist).and_return([])
+            allow(direct_uploader).to receive(:extension_allowlist).and_return([])
           end
 
           it_should_behave_like "returning the default extension"
@@ -37,7 +37,7 @@ describe CarrierWaveDirect::Test::Helpers do
 
         context "nil" do
           before do
-            allow(direct_uploader).to receive(:extension_whitelist).and_return(nil)
+            allow(direct_uploader).to receive(:extension_allowlist).and_return(nil)
           end
 
           it_should_behave_like "returning the default extension"

data/spec/uploader_spec.rb

@@ -145,26 +145,26 @@ describe CarrierWaveDirect::Uploader do
       expect(subject.extension_regexp).to be_a(String)
     end
 
-    context "where #extension_whitelist returns nil" do
+    context "where #extension_allowlist returns nil" do
       before do
-        allow(subject).to receive(:extension_whitelist).and_return(nil)
+        allow(subject).to receive(:extension_allowlist).and_return(nil)
       end
 
       it_should_behave_like "a globally allowed file extension"
     end
 
-    context "where #extension_whitelist returns []" do
+    context "where #extension_allowlist returns []" do
       before do
-        allow(subject).to receive(:extension_whitelist).and_return([])
+        allow(subject).to receive(:extension_allowlist).and_return([])
       end
 
       it_should_behave_like "a globally allowed file extension"
     end
 
-    context "where #extension_whitelist returns ['exe', 'bmp']" do
+    context "where #extension_allowlist returns ['exe', 'bmp']" do
 
       before do
-        allow(subject).to receive(:extension_whitelist).and_return(%w{exe bmp})
+        allow(subject).to receive(:extension_allowlist).and_return(%w{exe bmp})
       end
 
       it "should return '(exe|bmp)'" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave_direct
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - David Wilkie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-25 00:00:00.000000000 Z
+date: 2021-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: fog-aws
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.12
+        version: 5.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.12
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -137,9 +137,10 @@ files:
 - README.md
 - Rakefile
 - carrierwave_direct.gemspec
-- gemfiles/4.2.gemfile
 - gemfiles/5.1.gemfile
 - gemfiles/5.2.gemfile
+- gemfiles/6.0.gemfile
+- gemfiles/6.1.gemfile
 - lib/carrierwave_direct.rb
 - lib/carrierwave_direct/action_view_extensions/form_helper.rb
 - lib/carrierwave_direct/form_builder.rb
@@ -197,8 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: carrierwave_direct
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Upload direct to S3 using CarrierWave