carrierwave_direct 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b64419d902b8c1afba920fafe9a7029dd4c3d94a
-  data.tar.gz: 5dfbb28ea14db2c7ae9bd665192c009534cbef90
+  metadata.gz: 2e621e1fb10f3bba48a832af319f33b716bd776f
+  data.tar.gz: 23229444c9b6dd113103e936540595ce02043a85
 SHA512:
-  metadata.gz: c8f39ac6ced22656b3a96821356d92333f9ca141f215bb66125b3d2a8fa282718341adb133b0baa33308f9268cf1ef2014e59e3e21bb1f7949a389f170b4c1be
-  data.tar.gz: b2e2fe378dfed399fc011fb4ebcb8a94d5d4ffe4cb4c982ed71b918aa53fa7767a1b1c6d226e6fda5ad2169af24af2a43c83b80b300650367ad49aa0e6faa9d6
+  metadata.gz: d3aba2a7b886f6d49d29dc76be5a0de541809dc3056da4c56bf7c93cf35b5437f3b231cbed14b45773f024fcfbddcd08c27e771369a238ba442da780177db5c3
+  data.tar.gz: 50b38cd5b7fe29eb7c0037390e712f3618ec68eb8e28d491bd2b0b9097c45b581698ff6e9573507cefa1aa58431a2900f92adf593ded249c87cd972b2936e6d7

data/.travis.yml

@@ -1,12 +1,14 @@
 rvm:
- - 2.3.0
- - 2.4.0
- - 2.5.0
+ - 2.3
+ - 2.4
+ - 2.5
+
 script: 'bundle exec rspec spec'
 gemfile:
   - Gemfile
   - gemfiles/4.2.gemfile
   - gemfiles/5.1.gemfile
+  
 # Move to containerized travis, see http://docs.travis-ci.com/user/migrating-from-legacy
 sudo: false
 cache: bundler

data/Changelog.md

@@ -1,8 +1,27 @@
+### 2.0.0
+
+Features:
+  * [BREAKING CHANGE] Add support for Carrierwave 1.x. Drops support for Carrierwave < 1.0 (Kevin Reintjes @kreintjes).
+
+Misc:
+  * Dropped support for ruby 2.0 and 2.1, they have [reached their end of life](https://www.ruby-lang.org/en/news/2017/04/01/support-of-ruby-2-1-has-ended/)
+  * Update Ruby and Rails versions for Travis so builds succeed once again (Kevin Reintjes @kreintjes)
+
+### 1.1.0
+
+Deprecations:
+  * Calling `direct_for_url` with `:with_path` is deprecated, please use `url` instead.
+
 ### 1.0.0
 
 Features:
   * Upgraded signing algorithm to use [AWS V4 POST authentication](http://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-authentication-HTTPPOST.html). This is a breaking change if you are constructing your own upload forms or submitting your own POST requests. See the Sinatra section of the README for a summary of the new fields required in your V4 POST request. (Fran Worley @fran-worley)
 
+### 0.0.17
+
+Misc:
+  * Pin carrierwave to 0.11
+
 ### 0.0.16
 
 Bug Fixes:

data/README.md

@@ -280,7 +280,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_white_list` 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_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.
 
 ```ruby
 class UsersController < ApplicationController
@@ -326,7 +326,7 @@ Now that the basic building blocks are in place you can process and save your av
 class User < ActiveRecord::Base
   def save_and_process_avatar(options = {})
     if options[:now]
-      self.remote_avatar_url = avatar.direct_fog_url(:with_path => true)
+      self.remote_avatar_url = avatar.url
       save
     else
       Resque.enqueue(AvatarProcessor, attributes)
@@ -399,13 +399,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_white_list` 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_whitelist` 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_white_list` 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_whitelist` it also validates that url is valid and has only the schemes specified in the `url_scheme_whitelist`. Turned *on* by default
 
 ## Configuration
 
@@ -521,7 +521,7 @@ Factory.define :user |f|
 end
 ```
 
-This will return a valid key based off your `upload_dir` and your `extension_white_list`
+This will return a valid key based off your `upload_dir` and your `extension_whitelist`
 
 ### Faking a background download
 
@@ -534,7 +534,7 @@ upload_path = find_upload_path
 redirect_key = sample_key(:base => find_key, :filename => File.basename(upload_path))
 
 uploader.key = redirect_key
-download_url = uploader.direct_fog_url(:with_path => true)
+download_url = uploader.url
 
 # Register the download url and return the uploaded file in the body
 FakeWeb.register_uri(:get, download_url, :body => File.open(upload_path))

data/carrierwave_direct.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "carrierwave_direct"
 
-  s.add_dependency "carrierwave", "~>0.11"
+  s.add_dependency "carrierwave", '>= 1.0.0'
   s.add_dependency "fog-aws"
 
   s.add_development_dependency "rspec"
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rails", ">= 3.2.12"
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "capybara"
+  s.add_development_dependency "byebug"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/gemfiles/4.2.gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "carrierwave", "~>0.11"
+gem "carrierwave"
 gem "fog-aws"
 
 group :test do

data/gemfiles/5.1.gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "carrierwave", "~>0.11"
+gem "carrierwave"
 gem "fog-aws"
 
 group :test do

data/lib/carrierwave_direct/action_view_extensions/form_helper.rb

@@ -18,7 +18,7 @@ module CarrierWaveDirect
         options = args.extract_options!
 
         html_options = {
-          :multipart => true 
+          :multipart => true
         }.update(options[:html] || {})
 
         form_for(

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_white_list.first if uploader.extension_white_list
+        valid_extension = uploader.extension_whitelist.first if uploader.extension_whitelist
         options[:extension] = options[:extension] ? options[:extension].gsub(".", "") : (valid_extension || "extension")
         key = options[:base].split("/")
         key.pop

data/lib/carrierwave_direct/uploader.rb

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

data/lib/carrierwave_direct/uploader/direct_url.rb

@@ -4,6 +4,7 @@ module CarrierWaveDirect
 
       def direct_fog_url(options = {})
         if options[:with_path]
+          warn "calling `#direct_for_url` with :with_path is deprecated, please use `#url` instead."
           url
         else
           CarrierWave::Storage::Fog::File.new(self, CarrierWave::Storage::Fog.new(self), nil).public_url

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_white_list
+            extensions = record.send(attribute).extension_whitelist
             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_white_list
+              extensions = uploader.extension_whitelist
 
               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 = "1.0.0"
+  VERSION = "2.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_white_list]
-            extensions = i18n_options[:extension_white_list].to_sentence
+          if i18n_options[:extension_whitelist]
+            extensions = i18n_options[:extension_whitelist].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_white_list).and_return(%w{avi mp4})
+          subject.video.stub(:extension_whitelist).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_white_list).and_return(%w{avi mp4})
+              subject.video.stub(:extension_whitelist).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_white_list => %w{avi mp4} } }
+                let(:i18n_options) { {:extension_whitelist => %w{avi mp4} } }
               end
 
               it "should include the white listed extensions in the error message" do

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@
 require 'carrierwave_direct'
 require 'json'
 require 'timecop'
+require 'byebug'
 
 require File.dirname(__FILE__) << '/support/view_helpers' # Catch dependency order
 

data/spec/support/carrier_wave_config.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 CarrierWave.configure do |config|
+  config.fog_provider = 'fog/aws'
   config.fog_credentials = {
     :provider               => 'AWS',
     :aws_access_key_id      => 'AWS_ACCESS_KEY_ID',

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_white_list).and_return(%w{exe bmp})
+            allow(direct_uploader).to receive(:extension_whitelist).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_white_list).and_return([])
+            allow(direct_uploader).to receive(:extension_whitelist).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_white_list).and_return(nil)
+            allow(direct_uploader).to receive(:extension_whitelist).and_return(nil)
           end
 
           it_should_behave_like "returning the default extension"

data/spec/uploader_spec.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave_direct
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - David Wilkie
@@ -14,16 +14,16 @@ dependencies:
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: fog-aws
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Process your uploads in the background by uploading directly to S3
 email:
 - dwilkie@gmail.com