carrierwave_direct 0.0.10 → 0.0.11

data/.gitignore

@@ -4,3 +4,4 @@ Gemfile.lock
 .rvmrc
 pkg/*
 vendor/ruby
+.ruby-version

data/README.md

@@ -68,7 +68,10 @@ Remove the line `storage :file` and replace it with `include CarrierWaveDirect::
 
 This adds the extra functionality for direct uploading.
 
-Finally, remove the `store_dir` method in order to default CarrierWaveDirect to its own storage directory.
+**Optional**: Remove the `store_dir` method in order to default CarrierWaveDirect to its own storage directory.
+
+    /uploads/<unique_guid>/foo.png
+
 
 If you're *not* using Rails you can generate a direct upload form to S3 similar to [this example](http://doc.s3.amazonaws.com/proposals/post.html#A_Sample_Form)) by making use of the CarrierWaveDirect helper methods.
 
@@ -134,6 +137,10 @@ things just got a whole lot easier. You can generate a direct upload form like t
       <%= f.submit %>
     <% 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`:
+
+    @uploader.update_attribute :key, params[:key]
+
 You can also pass html options like this:
 
     <%= direct_upload_form_for @uploader, :html => { :target => "_blank_iframe" } do |f| %>
@@ -163,6 +170,37 @@ Note if you're using Rails 3.0.x you'll also need to disable forgery protection
 
 Once you've uploaded your file directly to the cloud you'll probably need a way to reference it with an ORM and process it.
 
+## Content-Type / Mime
+
+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:
+
+    CarrierWave.configure do |config|
+      # ... fog configuration and other options ...
+      config.will_include_content_type = true
+    end
+
+Then, just add a content-type element to the form.
+
+    <%= direct_upload_form_for @uploader do |f| %>
+      <%= text_field_tag 'Content-Type', 'video/mpeg' %><br>
+      <%= f.file_field :avatar %>
+      <%= f.submit %>
+    <% end %>
+
+You could use a select as well.
+
+    <%= direct_upload_form_for @uploader do |f| %>
+      <%= select_tag 'Content-Type', options_for_select([
+        ['Video','video/mpeg'],
+        ['Audio','audio/mpeg'],
+        ['Image','image/jpeg']
+      ], 'video/mpeg') %><br>
+      <%= f.file_field :avatar %>
+      <%= 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/defunkt/resque).
@@ -294,6 +332,9 @@ As well as the built in validations CarrierWaveDirect provides, some validations
       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
     end
 
 ## Testing with CarrierWaveDirect
@@ -388,7 +429,7 @@ If you're Rails app was newly generated *after* version 3.2.3 and your testing t
 
 ## Contributing to CarrierWaveDirect
 
-Pull requests are very welcome. Before submitting a pull request, please make sure that your changes are well tested.
+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
@@ -397,6 +438,10 @@ You should now be able to run the tests
 
     bundle exec rake
 
+### Using the Sample Application
+
+After you have fixed a bug or added a feature please also use the [CarrierWaveDirect Sample Application](https://github.com/dwilkie/carrierwave_direct_example) to ensure that the gem still works correctly.
+
 ## Contributors
 
 * [cblunt (Chris Blunt)](https://github.com/cblunt) - Support for passing html options
@@ -415,3 +460,5 @@ You should now be able to run the tests
 * [kylecrum (Kyle Crum)](https://github.com/kylecrum) - Fix double url encoding bug
 * [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
+* [filiptepper (Filip Tepper)](https://github.com/filiptepper) - Autoload UUID on heroku

data/lib/carrierwave_direct.rb

@@ -4,7 +4,8 @@ require "carrierwave_direct/version"
 
 require "carrierwave"
 require "fog"
-require "uuid"
+
+autoload :UUID, "uuid"
 
 module CarrierWaveDirect
 

data/lib/carrierwave_direct/uploader.rb

@@ -61,13 +61,14 @@ module CarrierWaveDirect
       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", store_dir] ]
+      conditions << ["starts-with", "$Content-Type", ""] if self.class.will_include_content_type
 
       Base64.encode64(
         {
           'expiration' => Time.now.utc + options[:expiration],
-          'conditions' => [
-            ["starts-with", "$utf8", ""],
-            ["starts-with", "$key", store_dir],
+          'conditions' => conditions + [
             {"bucket" => fog_directory},
             {"acl" => acl},
             {"success_action_redirect" => success_action_redirect},

data/lib/carrierwave_direct/uploader/configuration.rb

@@ -16,6 +16,7 @@ module CarrierWaveDirect
         add_config :min_file_size
         add_config :max_file_size
         add_config :upload_expiration
+        add_config :will_include_content_type
         reset_direct_config
       end
 

data/lib/carrierwave_direct/version.rb

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

data/spec/uploader_spec.rb

@@ -434,6 +434,10 @@ describe CarrierWaveDirect::Uploader do
           subject.success_action_redirect = "http://example.com/some_url"
           conditions.should have_condition("success_action_redirect" => "http://example.com/some_url")
         end
+        
+        it "'content-type' only if enabled" do
+          conditions.should have_condition('Content-Type') if subject.class.will_include_content_type
+        end
 
         context "'content-length-range of'" do
           def have_content_length_range(options = {})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave_direct
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-14 00:00:00.000000000 Z
+date: 2013-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -202,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -382049357
+      hash: 681164957
 requirements: []
 rubyforge_project: carrierwave_direct
 rubygems_version: 1.8.24