carrierwave_direct 0.0.4 → 0.0.5

data/README.md

@@ -359,6 +359,10 @@ The Active Record validations use the Rails i18n framework. Add these keys to yo
           carrierwave_direct_filename_invalid: is invalid. Allowed file types are ${extension_white_list}
           carrierwave_direct_remote_net_url_invalid: is invalid. Allowed file types are ${extension_white_list}. Allowed url schemes are ${url_scheme_white_list}
 
+## 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
+
 ## Contributing to CarrierWaveDirect
 
 Pull requests are very welcome. Before submitting a pull request, please make sure that your changes are well tested.
@@ -372,6 +376,8 @@ You should now be able to run the tests
 
 ## Contributors
 
-* cblunt (Chris Blunt) - Support for passing html options
-* robyurkowski (Rob Yurkowski) - Fix deprecation warnings for Rails 3.2
-* tylr (Tyler Love) - Bug fix
+* [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
+* [vlado (Vlado Cingel)](https://github.com/vlado) - Properly sanitize filename
+* [travisp (Travis Pew)](https://github.com/travisp) - Compatibility for CarrierWave 0.6.0

data/lib/carrierwave_direct/uploader.rb

@@ -48,7 +48,7 @@ module CarrierWaveDirect
     end
 
     def acl
-      s3_access_policy.to_s.gsub('_', '-')
+      fog_public ? 'public-read' : 'private'
     end
 
     def policy(options = {})
@@ -87,7 +87,7 @@ module CarrierWaveDirect
       unless has_key?
         # Use the attached models remote url to generate a new key otherwise return nil
         remote_url = model.send("remote_#{mounted_as}_url")
-        remote_url ? key_from_file(remote_url.split("/").pop) : return
+        remote_url ? key_from_file(CarrierWave::SanitizedFile.new(remote_url).filename) : return
       end
 
       key_path = key.split("/")

data/lib/carrierwave_direct/version.rb

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

data/spec/uploader_spec.rb

@@ -284,7 +284,20 @@ describe CarrierWaveDirect::Uploader do
           mounted_subject.filename
         end
       end
-
+      
+      context "and the model's remote #{sample(:mounted_as)} url has whitespace in it" do
+        before do
+          mounted_model.stub(
+            "remote_#{mounted_subject.mounted_as}_url"
+          ).and_return("http://anyurl.com/any_path/video_dir/filename 2.avi")
+        end
+        
+        it "should be sanitized (whitespace replaced with _)" do
+          mounted_subject.filename
+          mounted_subject.key.should =~ /filename_2.avi$/
+        end
+      end
+      
       context "and the model's remote #{sample(:mounted_as)} url is blank" do
         before do
           mounted_model.stub(
@@ -300,8 +313,8 @@ describe CarrierWaveDirect::Uploader do
   end
 
   describe "#acl" do
-    it "should return the sanitized s3 access policy" do
-      subject.acl.should == subject.s3_access_policy.to_s.gsub("_", "-")
+    it "should return the correct s3 access policy" do
+      subject.acl.should == (subject.fog_public ? 'public-read' : 'private')
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave_direct
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-08 00:00:00.000000000Z
+date: 2012-04-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &72575860 !ruby/object:Gem::Requirement
+  requirement: &75422450 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72575860
+  version_requirements: *75422450
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &72575510 !ruby/object:Gem::Requirement
+  requirement: &75422160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72575510
+  version_requirements: *75422160
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &72575190 !ruby/object:Gem::Requirement
+  requirement: &75421880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72575190
+  version_requirements: *75421880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &72574880 !ruby/object:Gem::Requirement
+  requirement: &75421510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72574880
+  version_requirements: *75421510
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &72574590 !ruby/object:Gem::Requirement
+  requirement: &75421180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72574590
+  version_requirements: *75421180
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &72574320 !ruby/object:Gem::Requirement
+  requirement: &75420760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72574320
+  version_requirements: *75420760
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &72574040 !ruby/object:Gem::Requirement
+  requirement: &75420100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72574040
+  version_requirements: *75420100
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &72573710 !ruby/object:Gem::Requirement
+  requirement: &75419660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72573710
+  version_requirements: *75419660
 description: Process your uploads in the background by uploading directly to S3
 email:
 - dwilkie@gmail.com
@@ -156,7 +156,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 386717071
+      hash: 300511313
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 386717071
+      hash: 300511313
 requirements: []
 rubyforge_project: carrierwave_direct
 rubygems_version: 1.8.10