carrierwave_direct 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ba4e8171bac7dffd59212cdb0d05567072cae76
-  data.tar.gz: 0a1e05710c23fa992faf63773afc079187389e8b
+  metadata.gz: df532738055d7fe9993268699211f219bdf0eeb2
+  data.tar.gz: 73234daa2e001178a73ef9caec211d2aaecfd3c6
 SHA512:
-  metadata.gz: 8263b034630c1cbc1cdf8a92a276973dc70b879273cee525246813822702c045b7aab00a933279ccfbf7828010639f227fbab3d9cf12d26137f3c95e4a2bc43a
-  data.tar.gz: 43e72d866f555d57db0dc258116a9b23ac5358f4c7d80e7dd19e9527f8e1050c04cffb89e07436ca2b8f024ed5f63a4a7571bed707fb235fb7e46ea8410d5ae3
+  metadata.gz: fa994ea1bdab12573044260fc76389f0bde0866a355eb648c82726637e26247dca2aaab1e08c2122380f9704a8a59c90c4c422754e3d79fc581651fd83563452
+  data.tar.gz: b4c5109688c2dfe132686f9ea3f86e7ae7d08d8c7f66216d7385569b9f715e5ca0e41325b00c25bbe2e519aa864164d2483b3a400d88754ad92bbef67db04950

data/.gitignore

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

data/.travis.yml

@@ -1,2 +1,4 @@
 rvm:
  - 1.9.3
+ - 2.0.0
+ - 2.1.0

data/Changelog.md

@@ -0,0 +1,94 @@
+### 0.0.14
+
+[Full Changes](https://github.com/dwilkie/carrierwave_direct/compare/v0.0.13...master)
+
+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).
@@ -227,26 +200,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 +247,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).
@@ -407,14 +412,20 @@ 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
 ```
+
 ## 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.
@@ -538,10 +549,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 +570,5 @@ 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

data/lib/carrierwave_direct.rb

@@ -1,18 +1,13 @@
 # encoding: utf-8
 
-require "carrierwave_direct/version"
-
 require "carrierwave"
 require "uuidtools"
 require "fog"
 
 module CarrierWaveDirect
 
-  autoload :Uploader, "carrierwave_direct/uploader"
-  autoload :Mount, "carrierwave_direct/mount"
-
   module Uploader
-    autoload :Configuration, 'carrierwave_direct/uploader/configuration'
+    require "carrierwave_direct/uploader/configuration"
 
     CarrierWave::Uploader::Base.send(:include, Configuration)
   end
@@ -43,3 +38,7 @@ if defined?(Rails)
   end
 end
 
+require "carrierwave_direct/mount"
+require "carrierwave_direct/uploader"
+require "carrierwave_direct/version"
+

data/lib/carrierwave_direct/form_builder.rb

@@ -4,20 +4,55 @@ module CarrierWaveDirect
   class FormBuilder < ActionView::Helpers::FormBuilder
     def file_field(method, options = {})
       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 betandstypen zijn %{extensions}
+      carrierwave_direct_allowed_schemes: "Toegestane schema's zijn %{schemes}"

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,7 +26,7 @@ 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)}]

data/lib/carrierwave_direct/uploader.rb

@@ -1,8 +1,10 @@
 # encoding: utf-8
 
+require "carrierwave_direct/uploader/content_type"
+require "carrierwave_direct/uploader/direct_url"
+
 module CarrierWaveDirect
   module Uploader
-
     extend ActiveSupport::Concern
 
     FILENAME_WILDCARD = "${filename}"
@@ -20,84 +22,72 @@ module CarrierWaveDirect
       end
     end
 
-    def direct_fog_url(options = {})
-      fog_uri = CarrierWave::Storage::Fog::File.new(self, CarrierWave::Storage::Fog.new(self), nil).public_url
-      if options[:with_path]
-        uri = URI.parse(fog_uri.chomp('/'))
-        path = "/#{key}"
-        uri.path += URI.escape(path)
-        fog_uri = uri.to_s
-      end
-      fog_uri
+    include CarrierWaveDirect::Uploader::ContentType
+    include CarrierWaveDirect::Uploader::DirectUrl
+
+    def acl
+      fog_public ? 'public-read' : 'private'
     end
 
-    def guid
-      UUIDTools::UUID.random_create
+    def policy(options = {})
+      options[:expiration] ||= upload_expiration
+      options[:min_file_size] ||= min_file_size
+      options[:max_file_size] ||= max_file_size
+
+      @policy ||= generate_policy(options)
     end
 
-    def key=(k)
-      @key = k
-      update_version_keys(:with => @key)
+    def clear_policy!
+      @policy = nil
+    end
+
+    def signature
+      Base64.encode64(
+        OpenSSL::HMAC.digest(
+          OpenSSL::Digest.new('sha1'),
+          aws_secret_access_key, policy
+        )
+      ).gsub("\n","")
+    end
+
+    def url_scheme_white_list
+      nil
+    end
+
+    def persisted?
+      false
     end
 
     def key
       return @key if @key.present?
       if present?
-        self.key = URI.parse(URI.encode(url)).path[1 .. -1] # explicitly set key
+        self.key = URI.parse(encoded_url).path[1 .. -1] # explicitly set key
       else
         @key = "#{store_dir}/#{guid}/#{FILENAME_WILDCARD}"
       end
       @key
     end
 
-    def has_key?
-      key !~ /#{Regexp.escape(FILENAME_WILDCARD)}\z/
+    def key=(k)
+      @key = k
+      update_version_keys(:with => @key)
     end
 
-    def acl
-      fog_public ? 'public-read' : 'private'
+    def guid
+      UUIDTools::UUID.random_create
     end
 
-    def policy(options = {})
-      options[:expiration] ||= self.class.upload_expiration
-      options[:min_file_size] ||= self.class.min_file_size
-      options[:max_file_size] ||= self.class.max_file_size
-
-      conditions = [
-        ["starts-with", "$utf8", ""],
-        ["starts-with", "$key", key.sub(/#{Regexp.escape(FILENAME_WILDCARD)}\z/, "")]
-      ]
-      conditions << ["starts-with", "$Content-Type", ""] if self.class.will_include_content_type
-      conditions << {"bucket" => fog_directory}
-      conditions << {"acl" => acl}
-
-      if self.class.use_action_status
-        conditions << {"success_action_status" => success_action_status}
-      else
-        conditions << {"success_action_redirect" => success_action_redirect}
-      end
-
-      conditions << ["content-length-range", options[:min_file_size], options[:max_file_size]]
-
-      Base64.encode64(
-        {
-          'expiration' => Time.now.utc + options[:expiration],
-          'conditions' => conditions
-        }.to_json
-      ).gsub("\n","")
+    def has_key?
+      key !~ /#{Regexp.escape(FILENAME_WILDCARD)}\z/
     end
 
-    def signature
-      Base64.encode64(
-        OpenSSL::HMAC.digest(
-          OpenSSL::Digest::Digest.new('sha1'),
-          aws_secret_access_key, policy
-        )
-      ).gsub("\n","")
+    def key_regexp
+      /\A#{store_dir}\/[a-f\d\-]+\/.+\.(?i)#{extension_regexp}(?-i)\z/
     end
 
-    def persisted?
-      false
+    def extension_regexp
+      allowed_file_types = extension_white_list
+      extension_regexp = allowed_file_types.present? && allowed_file_types.any? ?  "(#{allowed_file_types.join("|")})" : "\\w+"
     end
 
     def filename
@@ -115,21 +105,12 @@ module CarrierWaveDirect
       filename_parts.join("/")
     end
 
-    def key_regexp
-      /\A#{store_dir}\/[a-f\d\-]+\/.+\.(?i)#{extension_regexp}(?-i)\z/
-    end
+    private
 
-    def extension_regexp
-      allowed_file_types = extension_white_list
-      extension_regexp = allowed_file_types.present? && allowed_file_types.any? ?  "(#{allowed_file_types.join("|")})" : "\\w+"
+    def encoded_url
+      URI.encode(URI.decode(url), " []+()")
     end
 
-    def url_scheme_white_list
-      nil
-    end
-
-    private
-
     def key_from_file(fname)
       new_key_parts = key.split("/")
       new_key_parts.pop
@@ -150,5 +131,31 @@ module CarrierWaveDirect
       extname = File.extname(for_file)
       [for_file.chomp(extname), version_name].compact.join('_') << extname
     end
+
+    def generate_policy(options)
+      conditions = [
+        ["starts-with", "$utf8", ""],
+        ["starts-with", "$key", key.sub(/#{Regexp.escape(FILENAME_WILDCARD)}\z/, "")]
+      ]
+
+      conditions << ["starts-with", "$Content-Type", ""] if will_include_content_type
+      conditions << {"bucket" => fog_directory}
+      conditions << {"acl" => acl}
+
+      if use_action_status
+        conditions << {"success_action_status" => success_action_status}
+      else
+        conditions << {"success_action_redirect" => success_action_redirect}
+      end
+
+      conditions << ["content-length-range", options[:min_file_size], options[:max_file_size]]
+
+      Base64.encode64(
+        {
+          'expiration' => Time.now.utc + options[:expiration],
+          'conditions' => conditions
+        }.to_json
+      ).gsub("\n","")
+    end
   end
 end