carrierwave 0.4.2 → 0.4.3

data/README.rdoc

@@ -23,7 +23,7 @@ Install the latest stable release:
 CarrierWave is hosted *only* on {Gemcutter}[http://gemcutter.org] as of version 0.4.0.
 
 In Merb, add it as a dependency to your config/dependencies.rb:
-    
+
     dependency 'carrierwave'
 
 In Rails, add it to your environment.rb:
@@ -54,9 +54,9 @@ should look something like this:
 You can use your uploader class to store and retrieve files like this:
 
     uploader = AvatarUploader.new
-    
+
     uploader.store!(my_file)
-    
+
     uploader.retrieve_from_store!('my_file.png')
 
 CarrierWave gives you a +store+ for permanent storage, and a +cache+ for
@@ -74,6 +74,10 @@ need to require the relevant extension manually, e.g.:
 
     require 'carrierwave/orm/activerecord'
 
+Add a string column to the model you want to mount the uploader on:
+
+    add_column :user, :avatar, :string
+
 Open your model file and mount the uploader:
 
     class User
@@ -125,12 +129,12 @@ example is image thumbnails. There is built in support for this:
     class MyUploader < CarrierWave::Uploader::Base
       include CarrierWave::RMagick
 
-      process :resize => [800, 800]
+      process :resize_to_fit => [800, 800]
 
       version :thumb do
         process :resize_to_fill => [200,200]
       end
-      
+
     end
 
 When this uploader is used, an uploaded image would be scaled to be no larger
@@ -139,7 +143,7 @@ and cropped to exactly 200 by 200 pixels. The uploader could be used like this:
 
     uploader = AvatarUploader.new
     uploader.store!(my_file)                              # size: 1024x768
-    
+
     uploader.url # => '/url/to/my_file.png'               # size: 800x600
     uploader.thumb.url # => '/url/to/thumb_my_file.png'   # size: 200x200
 
@@ -282,7 +286,7 @@ And then in your uploader, set the storage to :s3
 That's it! You can still use the +CarrierWave::Uploader#url+ method to return
 the url to the file on Amazon S3.
 
-Alternatively, and especially if your bucket is located in Europe, you can use the 
+Alternatively, and especially if your bucket is located in Europe, you can use the
 RightAWS library by setting the storage to :right_s3
 
     class AvatarUploader < CarrierWave::Uploader::Base
@@ -337,10 +341,10 @@ file is uploaded.
 
     class AvatarUploader < CarrierWave::Uploader::Base
       include CarrierWave::RMagick
-      
+
       process :resize_to_fill => [200, 200]
       process :convert => 'png'
-      
+
       def filename
         super + '.png'
       end
@@ -355,7 +359,7 @@ ImageScience works the same way as RMagick.
 
     class AvatarUploader < CarrierWave::Uploader::Base
       include CarrierWave::ImageScience
-      
+
       process :resize_to_fill => [200, 200]
     end
 
@@ -378,7 +382,7 @@ for the RMagick processor.
 
     class AvatarUploader < CarrierWave::Uploader::Base
       include CarrierWave::MiniMagick
-      
+
       process :resize_to_fill => [200, 200]
     end
 

data/Rakefile

@@ -25,8 +25,8 @@ $hoe = Hoe.spec 'carrierwave' do
   self.extra_dev_deps << ['sequel', '>=3.2.0']
   self.extra_dev_deps << ['rmagick', '>=2.10.0']
   self.extra_dev_deps << ['mini_magick', '>=1.2.5']
-  self.extra_dev_deps << ['mongo_mapper', '>=0.5.8']
-  self.extra_dev_deps << ['mongoid', '>=0.5.11']
+  self.extra_dev_deps << ['mongo_mapper', '>=0.6.8']
+  self.extra_dev_deps << ['mongoid', '>=0.9.9']
   self.extra_dev_deps << ['aws-s3', '>=0.6.2']
   self.extra_rdoc_files << 'README.rdoc'
 end

data/features/support/activerecord.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require 'activerecord'
+require 'active_record'
 require 'carrierwave/mount'
 require 'carrierwave/orm/activerecord'
 

data/lib/carrierwave.rb

@@ -7,7 +7,7 @@ require 'carrierwave/core_ext/inheritable_attributes'
 
 module CarrierWave
 
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 
   class << self
     attr_accessor :root

data/lib/carrierwave/orm/activerecord.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require 'activerecord'
+require 'active_record'
 
 module CarrierWave
   module ActiveRecord

data/lib/carrierwave/sanitized_file.rb

@@ -254,18 +254,19 @@ module CarrierWave
       return name.downcase
     end
 
-    def split_extension(fn)
+    def split_extension(filename)
       # regular expressions to try for identifying extensions
-      ext_regexps = [
-        /\A(.+)\.([^\.]{1,3}\.[^\.]{1,4})\z/, # matches "something.tar.gz"
+      extension_matchers = [
+        /\A(.+)\.(tar\.gz)\z/, # matches "something.tar.gz"
         /\A(.+)\.([^\.]+)\z/ # matches "something.jpg"
       ]
-      ext_regexps.each do |regexp|
-        if fn =~ regexp
+
+      extension_matchers.each do |regexp|
+        if filename =~ regexp
           return $1, $2
         end
       end
-      return fn, "" # In case we weren't able to split the extension
+      return filename, "" # In case we weren't able to split the extension
     end
 
   end # SanitizedFile

data/lib/carrierwave/storage/s3.rb

@@ -96,7 +96,7 @@ module CarrierWave
         #
         def url
           if @uploader.s3_cnamed 
-            ["http://", @uploader.s3_bucket, @path].compact.join('/')
+            ["http://", @uploader.s3_bucket, "/", @path].compact.join
           else
             ["http://s3.amazonaws.com", @uploader.s3_bucket, @path].compact.join('/')
           end

data/spec/orm/mongoid_spec.rb

@@ -3,7 +3,8 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 require 'carrierwave/orm/mongoid'
 
-Mongoid.connect_to("carrierwave_test")
+connection = Mongo::Connection.new
+Mongoid.database = connection.db("carrierwave_test")
 
 describe CarrierWave::Mongoid do
 
@@ -185,13 +186,13 @@ describe CarrierWave::Mongoid do
 
       it "deletes the instance of @class after save" do
         @doc.save
-        @class.count(:all, {}).should eql(1)
+        @class.count.should eql(1)
         @doc.destroy
       end
 
       it "deletes the instance of @class after save and then re-looking up the instance" do
         @doc.save
-        @class.count(:all, {}).should eql(1)
+        @class.count.should eql(1)
         @doc = @class.first
         @doc.destroy
       end

data/spec/sanitized_file_spec.rb

@@ -3,27 +3,27 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
 describe CarrierWave::SanitizedFile do
-  
+
   before do
     unless File.exists?(file_path('llama.jpg'))
       FileUtils.cp(file_path('test.jpg'), file_path('llama.jpg'))
     end
   end
-  
+
   after(:all) do
     if File.exists?(file_path('llama.jpg'))
       FileUtils.rm(file_path('llama.jpg'))
     end
     FileUtils.rm_rf(public_path)
   end
-  
+
   describe '#empty?' do
-    
+
     it "should be empty for nil" do
       @sanitized_file = CarrierWave::SanitizedFile.new(nil)
       @sanitized_file.should be_empty
     end
-        
+
     it "should be empty for an empty string" do
       @sanitized_file = CarrierWave::SanitizedFile.new("")
       @sanitized_file.should be_empty
@@ -33,106 +33,116 @@ describe CarrierWave::SanitizedFile do
       @sanitized_file = CarrierWave::SanitizedFile.new(StringIO.new(""))
       @sanitized_file.should be_empty
     end
-    
+
     it "should be empty for a file with a zero size" do
       empty_file = mock('emptyfile')
       empty_file.should_receive(:size).at_least(:once).and_return(0)
       @sanitized_file = CarrierWave::SanitizedFile.new(empty_file)
       @sanitized_file.should be_empty
     end
-    
+
   end
-  
+
   describe '#original_filename' do
     it "should default to the original_filename" do
       file = mock('file', :original_filename => 'llama.jpg')
       sanitized_file = CarrierWave::SanitizedFile.new(file)
       sanitized_file.original_filename.should == "llama.jpg"
     end
-    
+
     it "should defer to the base name of the path if original_filename is unavailable" do
       file = mock('file', :path => '/path/to/test.jpg')
       sanitized_file = CarrierWave::SanitizedFile.new(file)
       sanitized_file.original_filename.should == "test.jpg"
     end
-    
+
     it "should be nil otherwise" do
       file = mock('file')
       sanitized_file = CarrierWave::SanitizedFile.new(file)
       sanitized_file.original_filename.should be_nil
     end
   end
-  
+
   describe '#basename' do
     it "should return the basename for complicated extensions" do
       @sanitized_file = CarrierWave::SanitizedFile.new(file_path('complex.filename.tar.gz'))
       @sanitized_file.basename.should == "complex.filename"
     end
-    
+
     it "should be the filename if the file has no extension" do
       @sanitized_file = CarrierWave::SanitizedFile.new(file_path('complex'))
       @sanitized_file.basename.should == "complex"
     end
   end
-  
+
   describe '#extension' do
     it "should return the extension for complicated extensions" do
       @sanitized_file = CarrierWave::SanitizedFile.new(file_path('complex.filename.tar.gz'))
       @sanitized_file.extension.should == "tar.gz"
     end
-    
+
+    it "should return the extension for real-world user file names" do
+      @sanitized_file = CarrierWave::SanitizedFile.new(file_path('Photo on 2009-12-01 at 11.12.jpg'))
+      @sanitized_file.extension.should == "jpg"
+    end
+
+    it "should return the extension for basic filenames" do
+      @sanitized_file = CarrierWave::SanitizedFile.new(file_path('something.png'))
+      @sanitized_file.extension.should == "png"
+    end
+
     it "should be an empty string if the file has no extension" do
       @sanitized_file = CarrierWave::SanitizedFile.new(file_path('complex'))
       @sanitized_file.extension.should == ""
     end
   end
-  
+
   describe '#filename' do
-    
+
     before do
       @sanitized_file = CarrierWave::SanitizedFile.new(nil)
     end
-  
+
     it "should default to the original filename if it is valid" do
       @sanitized_file.should_receive(:original_filename).at_least(:once).and_return("llama.jpg")
       @sanitized_file.filename.should == "llama.jpg"
     end
-  
+
     it "should remove illegal characters from a filename" do
       @sanitized_file.should_receive(:original_filename).at_least(:once).and_return("test-s,%&m#st?.jpg")
       @sanitized_file.filename.should == "test-s___m_st_.jpg"
     end
-  
+
     it "should remove slashes from the filename" do
       @sanitized_file.should_receive(:original_filename).at_least(:once).and_return("../../very_tricky/foo.bar")
       @sanitized_file.filename.should_not =~ /[\\\/]/
     end
-  
+
     it "should remove illegal characters if there is no extension" do
       @sanitized_file.should_receive(:original_filename).at_least(:once).and_return('`*foo')
       @sanitized_file.filename.should == "__foo"
     end
-  
+
     it "should remove the path prefix on Windows" do
       @sanitized_file.should_receive(:original_filename).at_least(:once).and_return('c:\temp\foo.txt')
       @sanitized_file.filename.should == "foo.txt"
     end
-  
+
     it "should make sure the *nix directory thingies can't be used as filenames" do
       @sanitized_file.should_receive(:original_filename).at_least(:once).and_return(".")
       @sanitized_file.filename.should == "_."
     end
-  
+
     it "should downcase uppercase filenames" do
       @sanitized_file.should_receive(:original_filename).at_least(:once).and_return("DSC4056.JPG")
       @sanitized_file.filename.should == "dsc4056.jpg"
     end
-  
+
   end
 
   shared_examples_for "all valid sanitized files" do
-  
-    describe '#empty?' do 
+
+    describe '#empty?' do
       it "should not be empty" do
         @sanitized_file.should_not be_empty
       end
@@ -161,7 +171,7 @@ describe CarrierWave::SanitizedFile do
         @sanitized_file.extension.should == "jpg"
       end
     end
-    
+
     describe "#read" do
       it "should return the contents of the file" do
         @sanitized_file.read.should == "this is stuff"
@@ -175,22 +185,22 @@ describe CarrierWave::SanitizedFile do
     end
 
     describe '#move_to' do
-    
+
       after do
         FileUtils.rm(file_path('gurr.png'))
       end
-    
+
       it "should be moved to the correct location" do
         @sanitized_file.move_to(file_path('gurr.png'))
-        
+
         File.exists?( file_path('gurr.png') ).should be_true
       end
-      
+
       it "should have changed its path when moved" do
         @sanitized_file.move_to(file_path('gurr.png'))
         @sanitized_file.path.should == file_path('gurr.png')
       end
-      
+
       it "should have changed its filename when moved" do
         @sanitized_file.move_to(file_path('gurr.png'))
         @sanitized_file.filename.should == 'gurr.png'
@@ -200,46 +210,46 @@ describe CarrierWave::SanitizedFile do
         @sanitized_file.move_to(file_path('gurr.png'))
         @sanitized_file.basename.should == 'gurr'
       end
-      
+
       it "should have changed its extension when moved" do
         @sanitized_file.move_to(file_path('gurr.png'))
         @sanitized_file.extension.should == 'png'
       end
-      
+
       it "should set the right permissions" do
         @sanitized_file.move_to(file_path('gurr.png'), 0755)
         @sanitized_file.should have_permissions(0755)
       end
-      
+
     end
-  
+
     describe '#copy_to' do
-      
+
       after do
         FileUtils.rm(file_path('gurr.png'))
       end
-      
+
       it "should be copied to the correct location" do
         @sanitized_file.copy_to(file_path('gurr.png'))
 
         File.exists?( file_path('gurr.png') ).should be_true
-        
+
         file_path('gurr.png').should be_identical_to(file_path('llama.jpg'))
       end
-  
+
       it "should not have changed its path when copied" do
         running { @sanitized_file.copy_to(file_path('gurr.png')) }.should_not change(@sanitized_file, :path)
       end
-  
+
       it "should not have changed its filename when copied" do
         running { @sanitized_file.copy_to(file_path('gurr.png')) }.should_not change(@sanitized_file, :filename)
       end
-  
+
       it "should return an object of the same class when copied" do
         new_file = @sanitized_file.copy_to(file_path('gurr.png'))
         new_file.should be_an_instance_of(@sanitized_file.class)
       end
-  
+
       it "should adjust the path of the object that is returned when copied" do
         new_file = @sanitized_file.copy_to(file_path('gurr.png'))
         new_file.path.should == file_path('gurr.png')
@@ -249,17 +259,17 @@ describe CarrierWave::SanitizedFile do
         new_file = @sanitized_file.copy_to(file_path('gurr.png'))
         new_file.filename.should == 'gurr.png'
       end
-      
+
       it "should adjust the basename of the object that is returned when copied" do
         new_file = @sanitized_file.copy_to(file_path('gurr.png'))
         new_file.basename.should == 'gurr'
       end
-      
+
       it "should adjust the extension of the object that is returned when copied" do
         new_file = @sanitized_file.copy_to(file_path('gurr.png'))
         new_file.extension.should == 'png'
       end
-      
+
       it "should set the right permissions" do
         new_file = @sanitized_file.copy_to(file_path('gurr.png'), 0755)
         new_file.should have_permissions(0755)
@@ -268,7 +278,7 @@ describe CarrierWave::SanitizedFile do
     end
 
   end
-  
+
   shared_examples_for "all valid sanitized files that are stored on disk" do
     describe '#move_to' do
       it "should not raise an error when moved to its own location" do
@@ -296,13 +306,13 @@ describe CarrierWave::SanitizedFile do
         File.exist?(new_file.path).should be_true
       end
     end
-    
+
     describe '#exists?' do
       it "should be true" do
         @sanitized_file.exists?.should be_true
       end
     end
-    
+
     describe '#delete' do
       it "should remove it from the filesystem" do
         File.exists?(@sanitized_file.path).should be_true
@@ -321,24 +331,24 @@ describe CarrierWave::SanitizedFile do
       }
       @sanitized_file = CarrierWave::SanitizedFile.new(@hash)
     end
-  
+
     it_should_behave_like "all valid sanitized files"
 
     it_should_behave_like "all valid sanitized files that are stored on disk"
-    
+
     describe '#path' do
       it "should return the path of the tempfile" do
         @sanitized_file.path.should_not be_nil
         @sanitized_file.path.should == @hash["tempfile"].path
       end
     end
-  
+
     describe '#is_path?' do
       it "should be false" do
         @sanitized_file.is_path?.should be_false
       end
     end
-  
+
   end
 
   describe "with a valid Tempfile" do
@@ -356,7 +366,7 @@ describe CarrierWave::SanitizedFile do
         @sanitized_file.is_path?.should be_false
       end
     end
-    
+
     describe '#path' do
       it "should return the path of the tempfile" do
         @sanitized_file.path.should_not be_nil
@@ -370,15 +380,15 @@ describe CarrierWave::SanitizedFile do
     before do
       @sanitized_file = CarrierWave::SanitizedFile.new(stub_stringio('llama.jpg', 'image/jpeg'))
     end
-  
+
     it_should_behave_like "all valid sanitized files"
-  
+
     describe '#exists?' do
       it "should be false" do
         @sanitized_file.exists?.should be_false
       end
     end
-    
+
     describe '#is_path?' do
       it "should be false" do
         @sanitized_file.is_path?.should be_false
@@ -390,13 +400,13 @@ describe CarrierWave::SanitizedFile do
         @sanitized_file.path.should be_nil
       end
     end
-    
+
     describe '#delete' do
       it "should not raise an error" do
         running { @sanitized_file.delete }.should_not raise_error
       end
     end
-  
+
   end
 
   describe "with a valid File object" do
@@ -405,9 +415,9 @@ describe CarrierWave::SanitizedFile do
       @sanitized_file = CarrierWave::SanitizedFile.new(stub_file('llama.jpg', 'image/jpeg'))
       @sanitized_file.should_not be_empty
     end
-  
+
     it_should_behave_like "all valid sanitized files"
-  
+
     it_should_behave_like "all valid sanitized files that are stored on disk"
 
     describe '#is_path?' do
@@ -431,9 +441,9 @@ describe CarrierWave::SanitizedFile do
       @sanitized_file = CarrierWave::SanitizedFile.new(file_path('llama.jpg'))
       @sanitized_file.should_not be_empty
     end
-  
+
     it_should_behave_like "all valid sanitized files"
-  
+
     it_should_behave_like "all valid sanitized files that are stored on disk"
 
     describe '#is_path?' do
@@ -441,7 +451,7 @@ describe CarrierWave::SanitizedFile do
         @sanitized_file.is_path?.should be_true
       end
     end
-    
+
     describe '#path' do
       it "should return the path of the file" do
         @sanitized_file.path.should_not be_nil
@@ -450,14 +460,14 @@ describe CarrierWave::SanitizedFile do
     end
 
   end
-  
+
   describe "with a valid Pathname" do
     before do
       FileUtils.copy_file(file_path('test.jpg'), file_path('llama.jpg'))
       @sanitized_file = CarrierWave::SanitizedFile.new(Pathname.new(file_path('llama.jpg')))
       @sanitized_file.should_not be_empty
     end
-  
+
     it_should_behave_like "all valid sanitized files"
 
     it_should_behave_like "all valid sanitized files that are stored on disk"
@@ -467,7 +477,7 @@ describe CarrierWave::SanitizedFile do
         @sanitized_file.is_path?.should be_true
       end
     end
-    
+
     describe '#path' do
       it "should return the path of the file" do
         @sanitized_file.path.should_not be_nil
@@ -487,7 +497,7 @@ describe CarrierWave::SanitizedFile do
         @empty.should be_empty
       end
     end
-  
+
     describe '#exists?' do
       it "should be false" do
         @empty.exists?.should be_false
@@ -518,7 +528,7 @@ describe CarrierWave::SanitizedFile do
       end
     end
 
-    describe '#filename' do      
+    describe '#filename' do
       it "should be nil" do
         @empty.filename.should be_nil
       end
@@ -535,14 +545,14 @@ describe CarrierWave::SanitizedFile do
         @empty.extension.should be_nil
       end
     end
-    
+
     describe '#delete' do
       it "should not raise an error" do
         running { @empty.delete }.should_not raise_error
       end
     end
   end
-  
+
   describe "that is an empty string" do
     before do
       @empty = CarrierWave::SanitizedFile.new("")
@@ -584,7 +594,7 @@ describe CarrierWave::SanitizedFile do
       end
     end
 
-    describe '#filename' do      
+    describe '#filename' do
       it "should be nil" do
         @empty.filename.should be_nil
       end
@@ -608,5 +618,5 @@ describe CarrierWave::SanitizedFile do
       end
     end
   end
-  
-end
+
+end

data/spec/storage/s3_spec.rb

@@ -38,6 +38,14 @@ if ENV['S3_SPEC']
       it "should have an Amazon URL" do
         @s3_file.url.should == 'http://s3.amazonaws.com/carrierwave_test/uploads/bar.txt'
       end
+      
+      context "with cnamed bucket" do
+        it "should have a CNAMED URL" do
+          @uploader.stub!(:s3_cnamed).and_return(true)
+          @uploader.stub!(:s3_bucket).and_return('foo.bar')
+          @s3_file.url.should == 'http://foo.bar/uploads/bar.txt'
+        end
+      end
     
       it "should be deletable" do
         @s3_file.delete

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: carrierwave
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-26 00:00:00 +01:00
+date: 2009-12-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -130,7 +130,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.8
+        version: 0.6.8
     version: 
 - !ruby/object:Gem::Dependency 
   name: mongoid
@@ -140,7 +140,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.11
+        version: 0.9.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: aws-s3
@@ -160,7 +160,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
+        version: 2.4.0
     version: 
 description: |-
   * RDoc Documentation {available at Rubyforge}[http://carrierwave.rubyforge.org/rdoc].