carrierwave_direct 0.0.8 → 0.0.9

data/.gitignore

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

data/.travis.yml

@@ -1,4 +1,2 @@
 rvm:
- - 1.8.7
- - 1.9.2
-
+ - 1.9.3

data/README.md

@@ -163,6 +163,30 @@ 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).
+
+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).
@@ -291,6 +315,7 @@ As well as the built in validations CarrierWaveDirect provides, some validations
       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
     end
@@ -409,3 +434,9 @@ You should now be able to run the tests
 * [rhalff (Rob Halff)](https://github.com/rhalff) - Doc fix
 * [nicknovitski (Nick Novitski)](https://github.com/nicknovitski) - Update old link in README
 * [gabrielengel (Gabriel Engel)](https://github.com/gabrielengel) - Refactor I18n not to use procs
+* [evanlok](https://github.com/evanlok) - Don't be case sensitive with filename extension validation
+* [jkamenik (John Kamenik)](https://github.com/jkamenik) - Support for Content-Type
+* [davesherratt (Dave Sherratt)](https://github.com/davesherratt) - Initial support for Rails 4 strong parameters
+* [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

data/carrierwave_direct.gemspec

@@ -7,9 +7,10 @@ Gem::Specification.new do |s|
   s.version     = CarrierwaveDirect::VERSION
   s.authors     = ["David Wilkie"]
   s.email       = ["dwilkie@gmail.com"]
-  s.homepage    = ""
+  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.rubyforge_project = "carrierwave_direct"
 
@@ -19,7 +20,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rspec"
   s.add_development_dependency "timecop"
-  s.add_development_dependency "rails"
+  s.add_development_dependency "rails", ">= 3.2.12"
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "capybara"
 
@@ -28,4 +29,3 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 end
-

data/lib/carrierwave_direct/orm/activerecord.rb

@@ -31,7 +31,9 @@ module CarrierWaveDirect
 
       self.instance_eval <<-RUBY, __FILE__, __LINE__+1
         attr_accessor   :skip_is_attached_validations
-        attr_accessible :key, :remote_#{column}_net_url
+        unless defined?(ActiveModel::ForbiddenAttributesProtection) && ancestors.include?(ActiveModel::ForbiddenAttributesProtection)
+          attr_accessible :key, :remote_#{column}_net_url
+        end
       RUBY
 
       mod = Module.new

data/lib/carrierwave_direct/uploader.rb

@@ -23,8 +23,8 @@ module CarrierWaveDirect
       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)
-        path = "/#{key}"
-        uri.path = URI.escape(path)
+        path = "#{key}"
+        uri.path += URI.escape(path)
         fog_uri = uri.to_s
       end
       fog_uri
@@ -42,7 +42,7 @@ module CarrierWaveDirect
     def key
       return @key if @key.present?
       if url.present?
-        self.key = URI.parse(url).path # explicitly set key
+        self.key = CGI.unescape(URI.parse(url).path) # explicitly set key
       else
         @key = "#{store_dir}/#{guid}/#{FILENAME_WILDCARD}"
       end
@@ -59,18 +59,20 @@ module CarrierWaveDirect
 
     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
 
       Base64.encode64(
         {
           'expiration' => Time.now.utc + options[:expiration],
           'conditions' => [
+            ["starts-with", "$Content-Type", ""],
             ["starts-with", "$utf8", ""],
             ["starts-with", "$key", store_dir],
             {"bucket" => fog_directory},
             {"acl" => acl},
             {"success_action_redirect" => success_action_redirect},
-            ["content-length-range", 1, options[:max_file_size]]
+            ["content-length-range", options[:min_file_size], options[:max_file_size]]
           ]
         }.to_json
       ).gsub("\n","")
@@ -105,7 +107,7 @@ module CarrierWaveDirect
     end
 
     def key_regexp
-      /\A#{store_dir}\/[a-f\d\-]+\/.+\.#{extension_regexp}\z/
+      /\A#{store_dir}\/[a-f\d\-]+\/.+\.(?i)#{extension_regexp}(?-i)\z/
     end
 
     def extension_regexp

data/lib/carrierwave_direct/uploader/configuration.rb

@@ -13,6 +13,7 @@ module CarrierWaveDirect
         add_config :validate_filename_format
         add_config :validate_remote_net_url_format
 
+        add_config :min_file_size
         add_config :max_file_size
         add_config :upload_expiration
         reset_direct_config
@@ -27,6 +28,7 @@ module CarrierWaveDirect
             config.validate_filename_format = true
             config.validate_remote_net_url_format = true
 
+            config.min_file_size = 1
             config.max_file_size = 5242880
             config.upload_expiration = 36000
           end

data/lib/carrierwave_direct/version.rb

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

data/spec/form_builder_spec.rb

@@ -56,4 +56,3 @@ describe CarrierWaveDirect::FormBuilder do
     end
   end
 end
-

data/spec/support/form_builder_helpers.rb

@@ -3,7 +3,7 @@
 require 'action_view'
 require 'action_view/template'
 
-require File.join(File.dirname(__FILE__), 'view_helpers') 
+require File.join(File.dirname(__FILE__), 'view_helpers')
 
 require 'carrierwave_direct/form_builder'
 require 'carrierwave_direct/action_view_extensions/form_helper'
@@ -34,4 +34,3 @@ module FormBuilderHelpers
     direct_upload_form_for(direct_uploader, options, &blk)
   end
 end
-

data/spec/uploader_spec.rb

@@ -15,6 +15,7 @@ describe CarrierWaveDirect::Uploader do
     :extension_regexp => "(avi)",
     :url => "http://example.com/some_url",
     :expiration => 60,
+    :min_file_size => 1024,
     :max_file_size => 10485760,
     :file_url => "http://anyurl.com/any_path/video_dir/filename.avi",
     :mounted_model_name => "Porno",
@@ -55,6 +56,12 @@ describe CarrierWaveDirect::Uploader do
     end
   end
 
+  describe ".min_file_size" do
+    it "should be 1 byte" do
+      subject.class.min_file_size.should == 1
+    end
+  end
+
   describe ".max_file_size" do
     it "should be 5 MB" do
       subject.class.max_file_size.should == 5242880
@@ -158,7 +165,7 @@ describe CarrierWaveDirect::Uploader do
         end
 
         it "should return /\\A#{sample(:store_dir)}\\/#{GUID_REGEXP}\\/.+\\.#{sample(:extension_regexp)}\\z/" do
-          subject.key_regexp.should ==  /\A#{sample(:store_dir)}\/#{GUID_REGEXP}\/.+\.#{sample(:extension_regexp)}\z/
+          subject.key_regexp.should ==  /\A#{sample(:store_dir)}\/#{GUID_REGEXP}\/.+\.(?i)#{sample(:extension_regexp)}(?-i)\z/
         end
       end
     end
@@ -241,7 +248,10 @@ describe CarrierWaveDirect::Uploader do
         before { subject.key = sample(:path_with_special_chars) }
 
         it "should return the full url with '/#{URI.escape(sample(:path_with_special_chars))}' as the path" do
-          URI.parse(subject.direct_fog_url(:with_path => true)).path.should == "/#{URI.escape(sample(:path_with_special_chars))}"
+          direct_fog_url = CarrierWave::Storage::Fog::File.new(
+            subject, nil, nil
+          ).public_url
+          subject.direct_fog_url(:with_path => true).should == direct_fog_url + "#{URI.escape(sample(:path_with_special_chars))}"
         end
       end
 
@@ -249,7 +259,10 @@ describe CarrierWaveDirect::Uploader do
         before { subject.key = sample(:path) }
 
         it "should return the full url with '/#{sample(:path)}' as the path" do
-          URI.parse(subject.direct_fog_url(:with_path => true)).path.should == "/#{sample(:path)}"
+          direct_fog_url = CarrierWave::Storage::Fog::File.new(
+            subject, nil, nil
+          ).public_url
+          subject.direct_fog_url(:with_path => true).should == direct_fog_url + "#{sample(:path)}"
         end
       end
     end
@@ -422,20 +435,38 @@ describe CarrierWaveDirect::Uploader do
           conditions.should have_condition("success_action_redirect" => "http://example.com/some_url")
         end
 
+        it "'content-type'" do
+          conditions.should have_condition('Content-Type')
+        end
+
         context "'content-length-range of'" do
 
-          def have_content_length_range(max_file_size = DirectUploader.max_file_size)
-            include(["content-length-range", 1, max_file_size])
+          def have_content_length_range(options = {})
+            include([
+              "content-length-range",
+              options[:min_file_size] || DirectUploader.min_file_size,
+              options[:max_file_size] || DirectUploader.max_file_size,
+            ])
+          end
+
+          it "#{DirectUploader.min_file_size} bytes" do
+            conditions.should have_content_length_range
           end
 
           it "#{DirectUploader.max_file_size} bytes" do
             conditions.should have_content_length_range
           end
 
+          it "#{sample(:min_file_size)} bytes when passing {:min_file_size => #{sample(:min_file_size)}}" do
+            conditions(
+              :min_file_size => sample(:min_file_size)
+            ).should have_content_length_range(:min_file_size => sample(:min_file_size))
+          end
+
           it "#{sample(:max_file_size)} bytes when passing {:max_file_size => #{sample(:max_file_size)}}" do
             conditions(
               :max_file_size => sample(:max_file_size)
-            ).should have_content_length_range(sample(:max_file_size))
+            ).should have_content_length_range(:max_file_size => sample(:max_file_size))
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave_direct
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-19 00:00:00.000000000Z
+date: 2013-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &80672100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80672100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &80671730 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80671730
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &80671380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80671380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &80671060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80671060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &80670780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,21 +85,31 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80670780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &80670500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.12
   type: :development
   prerelease: false
-  version_requirements: *80670500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.12
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &80670220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80670220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &80669910 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +133,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80669910
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Process your uploads in the background by uploading directly to S3
 email:
 - dwilkie@gmail.com
@@ -142,7 +182,7 @@ files:
 - spec/test/capybara_helpers_spec.rb
 - spec/test/helpers_spec.rb
 - spec/uploader_spec.rb
-homepage: ''
+homepage: https://github.com/dwilkie/carrierwave_direct
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -153,10 +193,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 763991155
+      version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -165,10 +202,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 763991155
+      hash: 353468527
 requirements: []
 rubyforge_project: carrierwave_direct
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Upload direct to S3 using CarrierWave