carrierwave_direct 0.0.13 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ba4e8171bac7dffd59212cdb0d05567072cae76
-  data.tar.gz: 0a1e05710c23fa992faf63773afc079187389e8b
+  metadata.gz: e4ad399ddf002036a40657b35ee0b50280a158b7
+  data.tar.gz: 793b4c2f7228322befc4fec1b658b8f94322950c
 SHA512:
-  metadata.gz: 8263b034630c1cbc1cdf8a92a276973dc70b879273cee525246813822702c045b7aab00a933279ccfbf7828010639f227fbab3d9cf12d26137f3c95e4a2bc43a
-  data.tar.gz: 43e72d866f555d57db0dc258116a9b23ac5358f4c7d80e7dd19e9527f8e1050c04cffb89e07436ca2b8f024ed5f63a4a7571bed707fb235fb7e46ea8410d5ae3
+  metadata.gz: 138bee67f0a6a9c78ebc483f2680dcd611dbb83ea5b2094f9e19d73e94015facaa782092d1200305bf966d974eca063fabb49383649f1864bed8726624e89551
+  data.tar.gz: 160672ced1119afff6b7e6960e51fc4c4e1e382c9be00e8e58488b7aa24662fc5dfb4b26458c0ba3fd1881f6e52979f35558a72c9e4a5c6851dfebb2e09fee53

data/.gitignore

@@ -4,5 +4,6 @@ Gemfile.lock
 .rvmrc
 .ruby-version
 pkg/*
+/.idea/
 vendor/ruby
 .ruby-version

data/.travis.yml

@@ -1,2 +1,16 @@
 rvm:
- - 1.9.3
+ - 2.0.0
+ - 2.1.0
+ - 2.2.0
+install:
+  - 'travis_retry bundle install'
+script: 'bundle exec rspec spec'
+gemfile:
+  - Gemfile
+  - gemfiles/3.2.gemfile
+  - gemfiles/4.0.gemfile
+  - gemfiles/4.1.gemfile
+# Move to containerized travis, see http://docs.travis-ci.com/user/migrating-from-legacy
+sudo: false
+cache: bundler
+

data/Changelog.md

@@ -0,0 +1,130 @@
+### 0.0.17
+
+Misc:
+  * Pin carrierwave to 0.11
+
+### 0.0.16
+
+Bug Fixes:
+  * Allow uploader columns to be named `file` (Diego Plentz @plentz and Moisés Viloria @mois3x)
+  * `["starts-with", "$utf8", ""]` is not needed as condition (Rocco Galluzzo @byterussian)
+
+Misc:
+  * Dropped support for ruby 1.9, it has [reached its end of life](https://www.ruby-lang.org/en/news/2014/01/10/ruby-1-9-3-will-end-on-2015/) 
+  * Add 2.2.0 support to travis. 
+  * Compatible with Capybara 2.7
+  * Replaced fog dependency with fog-aws; significantly reduces gem footprint
+
+### 0.0.15
+
+[Full Changes](https://github.com/dwilkie/carrierwave_direct/compare/v0.0.14...v0.0.15)
+
+Features:
+  * Allow format validators to be used on update (Grey Baker @greysteil)
+  * Add cache_dir to allowed paths (Grey Baker @greysteil)
+
+Bug Fixes:
+  * Use Carrierwave to generate URL's (Petrik de Heus @p8)
+
+Misc:
+  * README update (Samuel Reh @samuelreh)
+  * Fix typo in README (Brandon Conway @brandoncc)
+  * Fix specs for rspec 3 (Hanachin @hanachin)
+  * Fix typo in nl.yml (Petrik de Heus @p8)
+  * Add multiple rails versions support to travis (Petrik de Heus @p8)
+
+### 0.0.14
+
+[Full Changes](https://github.com/dwilkie/carrierwave_direct/compare/v0.0.13...v0.0.14)
+
+Features:
+ * Add ability to set content type in upload form (John Kamenik @jkamenik)
+ * Dutch language support (Ariejan de Vroom @ariejan)
+
+Bug Fixes:
+  * Escape characters in filenames (@geeky-sh)
+  * Use OpenSSL::Digest instead of OpenSSL::Digest::Digest (@dwiedenbruch)
+  * Fix signature race condition by caching policy (Louis Simoneau @lsimoneau)
+  * Fix multi-encoding issue when saving escaped filenames (Vincent Franco @vinniefranco)
+  * Use mounted-on column name for uniqueness validation (Stephan Schubert @jazen)
+
+Misc:
+  * Improve readme documentation for success action status support (Rafael Macedo @rafaelmacedo)
+  * Increase robutness of view rpsec matchers (@sony-phoenix-dev)
+  * Add ruby 2.1.0 support to travis (Luciano Sousa @lucianosousa)
+
+### 0.0.13
+
+[Full Changes](https://github.com/dwilkie/carrierwave_direct/compare/v0.0.12...v0.0.13)
+
+Features:
+  * Add option to use success_action_status instead of success_action_redirect (Nick DeLuca @nddeluca)
+
+Bug Fixes:
+ * Remove intial slash when generating key from url in order to fix updates (Enrique García @kikito)
+ * Fix key generation when #default_url is overriden (@dunghuynh)
+ * Fix policy glitch that allows other files to be overwritten (@dunghuynh)
+
+Misc:
+ * Update resque url in readme (Ever Daniel Barreto @everdaniel)
+ * update readme (Philip Arndt @parndt)
+
+
+### 0.0.12
+
+[Full Changes](https://github.com/dwilkie/carrierwave_direct/compare/v0.0.11...v0.0.12)
+
+Features:
+  * use uuidtools gem instead of uuid gem for uid generation (Filip Tepper @filiptepper)
+
+Bug Fixes:
+  * fix URI parsing issues with cetain filenames (Ricky Pai @rickypai)
+  * prevent double slashes in urls generated from direct_fog_url (Colin Young @colinyoung)
+
+Misc:
+ * fix typo in readme (@hartator)
+
+### 0.0.11
+
+[Full Changes](https://github.com/dwilkie/carrierwave_direct/compare/v0.0.10...v0.0.11)
+
+### 0.0.10
+
+[Full Changes](https://github.com/dwilkie/carrierwave_direct/compare/v0.0.9...v0.0.10)
+
+### 0.0.9
+
+[Full Changes](https://github.com/dwilkie/carrierwave_direct/compare/v0.0.8...v0.0.9)
+
+### 0.0.8
+
+[Full Changes](https://github.com/dwilkie/carrierwave_direct/compare/v0.0.7...v0.0.8)
+
+### 0.0.7
+
+[Full Changes](https://github.com/dwilkie/carrierwave_direct/compare/v0.0.6...v0.0.7)
+
+### 0.0.6
+
+[Full Changes](https://github.com/dwilkie/carrierwave_direct/compare/v0.0.5...v0.0.6)
+
+### 0.0.5
+
+[Full Changes](https://github.com/dwilkie/carrierwave_direct/compare/v0.0.4...v0.0.5)
+
+### 0.0.4
+
+[Full Changes](https://github.com/dwilkie/carrierwave_direct/compare/v0.0.3...v0.0.4)
+
+### 0.0.3
+
+[Full Changes](https://github.com/dwilkie/carrierwave_direct/compare/v0.0.2...v0.0.3)
+
+### 0.0.2
+
+[Full Changes](https://github.com/dwilkie/carrierwave_direct/compare/v0.0.1...v0.0.2)
+
+### 0.0.1
+
+[Full Changes](https://github.com/dwilkie/carrierwave_direct/compare/e68498587a4e4209d121512dbb0df529e15e9282...v0.0.1)
+

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in carrierwave_direct.gemspec
 gemspec

data/README.md

@@ -6,33 +6,6 @@
 
 [CarrierWaveDirect](https://github.com/dwilkie/carrierwave_direct) works on top of [CarrierWave](https://github.com/jnicklas/carrierwave) and provides a simple way to achieve this.
 
-## Project Maintainer(s) Wanted
-
-Meh. [I just want to use it already.](https://github.com/dwilkie/carrierwave_direct#example-application)
-
-### Why can't you do it?
-
-I'm no longer involved in building apps which require file uploads. Therefore I no longer feel that I can do a good job maintaining this project. I just want the community to take it where it needs to go.
-
-### What's in it for me?
-
-* Everything
-* Job Applications
-* Not much
-* What you make of it
-
-### What do I need to do?
-
-You can help by simply accepting pull requests and bumping versions. Or if you want to be more involved you could help resolve outstanding issues or develop new features.
-
-### Who are you looking for?
-
-Anybody who has previously contributed to CarrierWaveDirect (with tests) and/or who anybody who really wants to.
-
-### How can I apply?
-
-This is not a job application. I you want to maintain it, you've basically got the job. Just comment on this issue: https://github.com/dwilkie/carrierwave_direct/issues/83 and link to a contribution you've made on this gem, or some other gem.
-
 ## Example Application
 
 For a concrete example on how to use [CarrierWaveDirect](https://github.com/dwilkie/carrierwave_direct) in a Rails application check out the [Example Application](https://github.com/dwilkie/carrierwave_direct_example).
@@ -183,7 +156,7 @@ end
 After uploading to S3, You'll need to update the uploader object with the returned key in the controller action that corresponds to `new_user_url`:
 
 ```ruby
-@uploader.update_attribute :key, params[:key]
+@uploader.update_attribute :avatar_key, params[:key]
 ```
 
 You can also pass html options like this:
@@ -199,6 +172,9 @@ Note if `User` is not an ActiveRecord object e.g.
 
 ```ruby
 class User
+  extend CarrierWave::Mount
+  extend CarrierWaveDirect::Mount
+
   mount_uploader :avatar, AvatarUploader
 end
 ```
@@ -227,26 +203,45 @@ Once you've uploaded your file directly to the cloud you'll probably need a way
 
 The default amazon content-type is "binary/octet-stream" and for many cases this will work just fine.  But if you are trying to stream video or audio you will need to set the mime type manually as Amazon will not calculate it for you.  All mime types are supported: [http://en.wikipedia.org/wiki/Internet_media_type](http://en.wikipedia.org/wiki/Internet_media_type).
 
-First, tell CarrierWaveDirect that you will include your content type manually by adding to your initializer:
+First, tell CarrierWaveDirect what your default content type should be:
 
 ```ruby
 CarrierWave.configure do |config|
   # ... fog configuration and other options ...
   config.will_include_content_type = true
+
+  config.default_content_type = 'video/mpeg'
+  config.allowed_content_types = %w(video/mpeg video/mp4 video/ogg)
+end
+```
+
+or
+
+```ruby
+class VideoUploader < CarrierWave::Uploader::Base
+  include CarrierWaveDirect::Uploader
+
+  def will_include_content_type
+    true
+  end
+
+  default_content_type  'video/mpeg'
+  allowed_content_types %w(video/mpeg video/mp4 video/ogg)
 end
 ```
 
-Then, just add a content-type element to the form.
+*Note: If `will_include_content_type` is `true` and `default_content_type` is nil, the content type will default to 'binary/octet-stream'.*
+
+For the forms, no change is required to use the default_content_type.
 
 ```erb
 <%= direct_upload_form_for @uploader do |f| %>
-  <%= text_field_tag 'Content-Type', 'video/mpeg' %><br>
-  <%= f.file_field :avatar %>
+  <%= f.file_field :avatar %> # Content-Type will automatically be set to the default
   <%= f.submit %>
 <% end %>
 ```
 
-You could use a select as well.
+You could use a manual select as well.
 
 ```erb
 <%= direct_upload_form_for @uploader do |f| %>
@@ -255,11 +250,24 @@ You could use a select as well.
     ['Audio','audio/mpeg'],
     ['Image','image/jpeg']
   ], 'video/mpeg') %><br>
-  <%= f.file_field :avatar %>
+  <%= f.file_field :avatar, exclude_content_type: true %> # Must tell the file_field helper not to include content type
+  <%= f.submit %>
+<% end %>
+```
+
+Or you can use the helper which shows all possible content types as a select, with the default content type selected.
+
+```erb
+<%= direct_upload_form_for @uploader do |f| %>
+  <%= f.content_type_label %><br>
+  <%= f.content_type_select %><br><br>
+
+  <%= f.file_field :avatar, exclude_content_type: true %><br> # Must tell the file_field helper not to include its own content type
   <%= f.submit %>
 <% end %>
 ```
 
+
 ## Processing and referencing files in a background process
 
 Processing and saving file uploads are typically long running tasks and should be done in a background process. CarrierWaveDirect gives you a few methods to help you do this with your favorite background processor such as [DelayedJob](https://github.com/collectiveidea/delayed_job) or [Resque](https://github.com/resque/resque).
@@ -332,7 +340,7 @@ class AvatarProcessor
 end
 ```
 
-The method `self.remote_avatar_url=` from [CarrierWave](https://github.com/jnicklas/carrierwave) downloads the avatar from S3 and processes it. `save` then re-uploads the processed avatar to to S3
+The method `self.remote_avatar_url=` from [CarrierWave](https://github.com/jnicklas/carrierwave) downloads the avatar from S3 and processes it. `save` then re-uploads the processed avatar to S3
 
 ## Uploading from a remote location
 
@@ -407,14 +415,43 @@ CarrierWave.configure do |config|
   config.validate_filename_format = false        # defaults to true
   config.validate_remote_net_url_format = false  # defaults to true
 
-  config.min_file_size     = 5.kilobytes         # defaults to 1.byte
-  config.max_file_size     = 10.megabytes        # defaults to 5.megabytes
-  config.upload_expiration = 1.hour              # defaults to 10.hours
-  config.will_include_content_type = true        # defaults to false; if true, content-type will be set
-                                                 # on s3, but you must include an input field named
-                                                 # Content-Type on every direct upload form
+  config.min_file_size             = 5.kilobytes  # defaults to 1.byte
+  config.max_file_size             = 10.megabytes # defaults to 5.megabytes
+  config.upload_expiration         = 1.hour       # defaults to 10.hours
+  config.will_include_content_type = 'video/mp4'  # defaults to false; if true, content-type will be set
+                                                  # 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
 end
 ```
+
+## Bucket CORS configuration and usage with CloudFront
+
+If you are using a javascript uploader (e.g. Dropzone, jQuery Upload, Uploadify, etc.) you will need to add CORS configuration to your bucket, otherwise default bucket configuration will deny CORS requests. To do that open your bucket in Amazon console, click on its properties and add a CORS configuration similar to this
+
+```xml
+<CORSConfiguration>
+    <CORSRule>
+        <!--  Optionally change this with your domain, it should not be an issue since your bucket accepts only signed writes -->
+        <AllowedOrigin>*</AllowedOrigin>
+        <AllowedMethod>GET</AllowedMethod>
+        <AllowedMethod>POST</AllowedMethod>
+        <MaxAgeSeconds>3000</MaxAgeSeconds>
+        <AllowedHeader>Authorization</AllowedHeader>
+        <AllowedHeader>Content-Type</AllowedHeader>
+        <AllowedHeader>Origin</AllowedHeader>
+    </CORSRule>
+</CORSConfiguration>
+```
+
+When you use this gem in conjunction with CloudFront you'll need an additional step otherwise it won't work as expected. This is strictly necessary if you configured CarrierWave `asset_host` to use a CloudFront in front of your bucket because your forms will be posted to that url.
+
+To solve this issue you must enable POST requests in your CloudFront distribution settings. Here is a [step by step walkthrough](http://blog.celingest.com/en/2014/10/02/tutorial-using-cors-with-cloudfront-and-s3/) that explain this setup. It also explain CORS configuration.
+
 ## Testing with CarrierWaveDirect
 
 CarrierWaveDirect provides a couple of helpers to help with integration and unit testing. You don't want to contact the Internet during your tests as this is slow, expensive and unreliable. You should first put fog into mock mode by doing something like this.
@@ -517,8 +554,6 @@ en:
 
 ## Caveats
 
-Don't name your string column `file`. It will result in a stack level too deep exception. See [this issue](https://github.com/dwilkie/carrierwave_direct/issues/10) for more info.
-
 If you're Rails app was newly generated *after* version 3.2.3 and your testing this in development you may run into an issue where an `ActiveModel::MassAssignmentSecurity::Error` is raised when being redirected from S3. You can fix this by setting `config.active_record.mass_assignment_sanitizer = :logger` in your `config/environments/development.rb` file.
 
 ## Contributing to CarrierWaveDirect
@@ -538,10 +573,10 @@ After you have fixed a bug or added a feature please also use the [CarrierWaveDi
 
 ## Credits
 
-Thank you to everybody who has contributed to [CarrierWaveDirect](https://github.com/dwilkie/carrierwave_direct). A special thanks to [colinyoung (Colin Young)](https://github.com/colinyoung) and [nddeluca (Nicholas DeLuca)](https://github.com/nddeluca) who help maintain the gem.
+Thank you to everybody who has contributed to [CarrierWaveDirect](https://github.com/dwilkie/carrierwave_direct). A special thanks to [nddeluca (Nicholas DeLuca)](https://github.com/nddeluca) who does a great job maintaining this gem. If you'd like to help him out see [#83](https://github.com/dwilkie/carrierwave_direct/issues/83)
 
 ## Contributors
-
+* [geeky-sh](https://github.com/geeky-sh) - Allow filenames with '()+[]' characters
 * [cblunt (Chris Blunt)](https://github.com/cblunt) - Support for passing html options
 * [robyurkowski (Rob Yurkowski)](https://github.com/robyurkowski) - Fix deprecation warnings for Rails 3.2
 * [tylr (Tyler Love)](https://github.com/tylr) - Bug fix
@@ -559,4 +594,6 @@ Thank you to everybody who has contributed to [CarrierWaveDirect](https://github
 * [rsniezynski](https://github.com/rsniezynski) - Add min file size configuration
 * [philipp-spiess (Philipp Spieß)](https://github.com/philipp-spiess) - Direct fog url bugfix
 * [colinyoung (Colin Young)](https://github.com/colinyoung) - Content-Type support
+* [jkamenik (John Kamenik)](https://github.com/jkamenik) - Content-Type support
 * [filiptepper (Filip Tepper)](https://github.com/filiptepper) - Autoload UUID on heroku
+* [mois3x (Moisés Viloria)](https://github.com/mois3x) and [plentz (Diego Plentz)](https://github.com/plentz) - Allow uploader columns to be named `file`

data/carrierwave_direct.gemspec

@@ -10,13 +10,12 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/dwilkie/carrierwave_direct"
   s.summary     = %q{Upload direct to S3 using CarrierWave}
   s.description = %q{Process your uploads in the background by uploading directly to S3}
-  s.required_ruby_version = ">= 1.9.0"
+  s.required_ruby_version = ">= 2.0.0"
 
   s.rubyforge_project = "carrierwave_direct"
 
-  s.add_dependency "carrierwave"
-  s.add_dependency "uuidtools"
-  s.add_dependency "fog"
+  s.add_dependency "carrierwave", "~>0.11"
+  s.add_dependency "fog-aws"
 
   s.add_development_dependency "rspec"
   s.add_development_dependency "timecop"

data/gemfiles/3.2.gemfile

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

data/gemfiles/4.0.gemfile

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

data/gemfiles/4.1.gemfile

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

data/lib/carrierwave_direct/form_builder.rb

@@ -3,21 +3,58 @@
 module CarrierWaveDirect
   class FormBuilder < ActionView::Helpers::FormBuilder
     def file_field(method, options = {})
+      @object.policy(enforce_utf8: true)
+
       options.merge!(:name => "file")
-      fields = hidden_field(:key, :name => "key")
-      fields << hidden_field(:aws_access_key_id, :name => "AWSAccessKeyId")
-      fields << hidden_field(:acl, :name => "acl")
-      fields << hidden_field(:policy, :name => "policy")
-      fields << hidden_field(:signature, :name => "signature")
-
-      if options[:use_action_status]
-        fields << hidden_field(:success_action_status, :name => "success_action_status")
+
+      fields = required_base_fields
+
+      fields << content_type_field(options)
+
+      fields << success_action_field(options)
+
+      # The file field must be the last element in the form.
+      # Any element after this will be ignored by Amazon.
+      fields << super
+    end
+
+    def content_type_label(content=nil)
+      content ||= 'Content Type'
+      @template.label_tag('Content-Type', content)
+    end
+
+    def content_type_select(choices = [], selected = nil, options = {})
+      @template.select_tag('Content-Type', content_choices_options(choices, selected), options)
+    end
+
+    private
+
+    def required_base_fields
+      hidden_field(:key,                     :name => "key") <<
+      hidden_field(:aws_access_key_id,       :name => "AWSAccessKeyId") <<
+      hidden_field(:acl,                     :name => "acl") <<
+      hidden_field(:policy,                  :name => "policy") <<
+      hidden_field(:signature,               :name => "signature")
+    end
+
+    def content_type_field(options)
+      return ''.html_safe unless @object.will_include_content_type
+
+      hidden_field(:content_type, :name => 'Content-Type') unless options[:exclude_content_type]
+    end
+
+    def success_action_field(options)
+      if @object.use_action_status
+        hidden_field(:success_action_status, :name => "success_action_status")
       else
-        fields << hidden_field(:success_action_redirect, :name => "success_action_redirect")
+        hidden_field(:success_action_redirect, :name => "success_action_redirect")
       end
+    end
 
-      fields << super
+    def content_choices_options(choices, selected = nil)
+      choices = @object.content_types if choices.blank?
+      selected ||= @object.content_type
+      @template.options_for_select(choices, selected)
     end
   end
 end
-

data/lib/carrierwave_direct/locale/nl.yml

@@ -0,0 +1,9 @@
+nl:
+  errors:
+    messages:
+      carrierwave_direct_filename_taken: bestandsnaam is reeds in gebruik
+      carrierwave_direct_upload_missing: geüpload bestand ontbreekt
+      carrierwave_direct_attachment_missing: bestand ontbreekt
+      carrierwave_direct_filename_invalid: "is ongeldig. "
+      carrierwave_direct_allowed_extensions: Toegestane bestandstypen zijn %{extensions}
+      carrierwave_direct_allowed_schemes: "Toegestane schema's zijn %{schemes}"

data/lib/carrierwave_direct/mount.rb

@@ -9,10 +9,12 @@ module CarrierWaveDirect
       # Don't go further unless the class included CarrierWaveDirect::Uploader
       return unless uploader.ancestors.include?(CarrierWaveDirect::Uploader)
 
-      uploader.class_eval <<-RUBY, __FILE__, __LINE__+1
-        def #{column}; self; end
-      RUBY
-
+      unless uploader.instance_methods.include?(column)
+        uploader.class_eval <<-RUBY, __FILE__, __LINE__+1
+           def #{column}; self; end
+        RUBY
+      end
+ 
       self.instance_eval <<-RUBY, __FILE__, __LINE__+1
         attr_accessor :remote_#{column}_net_url
       RUBY
@@ -22,10 +24,20 @@ module CarrierWaveDirect
       mod.class_eval <<-RUBY, __FILE__, __LINE__+1
 
         def key
+          warn "key method is deprecated, please use column_key method instead."
           send(:#{column}).key
         end
 
         def key=(k)
+          warn "key= method is deprecated, please use column_key= method instead."
+          send(:#{column}).key = k
+        end
+
+        def #{column}_key
+          send(:#{column}).key
+        end
+
+        def #{column}_key=(k)
           send(:#{column}).key = k
         end
 

data/lib/carrierwave_direct/orm/activerecord.rb

@@ -25,14 +25,14 @@ module CarrierWaveDirect
 
       validates_is_attached column if uploader_option(column.to_sym, :validate_is_attached)
       validates_is_uploaded column if uploader_option(column.to_sym, :validate_is_uploaded)
-      validates_filename_uniqueness_of column if uploader_option(column.to_sym, :validate_unique_filename)
-      validates_filename_format_of column if uploader_option(column.to_sym, :validate_filename_format)
-      validates_remote_net_url_format_of column if uploader_option(column.to_sym, :validate_remote_net_url_format)
+      validates_filename_uniqueness_of(column, on: :create) if uploader_option(column.to_sym, :validate_unique_filename)
+      validates_filename_format_of(column, on: :create) if uploader_option(column.to_sym, :validate_filename_format)
+      validates_remote_net_url_format_of(column, on: :create) if uploader_option(column.to_sym, :validate_remote_net_url_format)
 
       self.instance_eval <<-RUBY, __FILE__, __LINE__+1
         attr_accessor   :skip_is_attached_validations
         unless defined?(ActiveModel::ForbiddenAttributesProtection) && ancestors.include?(ActiveModel::ForbiddenAttributesProtection)
-          attr_accessible :key, :remote_#{column}_net_url
+          attr_accessible :#{column}_key, :remote_#{column}_net_url
         end
       RUBY
 

data/lib/carrierwave_direct/test/capybara_helpers.rb

@@ -11,11 +11,11 @@ module CarrierWaveDirect
       end
 
       def find_key
-        key = page.find("input[@name='key']").value
+        key = page.find("input[name='key']", visible: false).value
       end
 
       def find_upload_path
-        page.find("input[@name='file']").value
+        page.find("input[name='file']", visible: false).value
       end
 
       def upload_directly(uploader, button_locator, options = {})
@@ -26,19 +26,21 @@ module CarrierWaveDirect
           # simulate a successful upload
 
           # form's success action redirect url
-          redirect_url = URI.parse(page.find("input[@name='success_action_redirect']").value)
+          redirect_url = URI.parse(page.find("input[name='success_action_redirect']", visible: false).value)
 
           unless options[:redirect_key]
             sample_key_args = [{:base => find_key, :filename => File.basename(find_upload_path)}]
             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],
             :etag => "\"d41d8cd98f00b204e9800998ecf8427\""
-          })
+          }.merge(redirect_url_params))
 
           # click the button
           click_button button_locator

data/lib/carrierwave_direct/uploader/configuration.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 module CarrierWaveDirect
-
   module Uploader
     module Configuration
       extend ActiveSupport::Concern
@@ -16,7 +15,10 @@ module CarrierWaveDirect
         add_config :min_file_size
         add_config :max_file_size
         add_config :upload_expiration
-        add_config :will_include_content_type
+
+        add_config :will_include_content_type #alias for default_content_type
+        add_config :default_content_type
+        add_config :allowed_content_types
 
         add_config :use_action_status