durran-carrierwave 0.3.2.3 → 0.4.3

data/spec/orm/mongomapper_spec.rb

@@ -164,7 +164,7 @@ describe CarrierWave::MongoMapper do
       @doc = @class.new
     end
     
-    context "when file assigned" do
+    describe "when file assigned" do
     
       it "removes the file from the filesystem" do
         @doc.image = stub_file('test.jpeg')
@@ -178,6 +178,24 @@ describe CarrierWave::MongoMapper do
       
     end
     
+    describe "when file is not assigned" do
+      
+      it "deletes the instance of @class after save" do
+        @doc.save
+        @class.count.should eql(1)
+        @doc.destroy
+      end
+      
+      it "deletes the instance of @class after save and then re-looking up the instance" do
+        # this fails with TypeError in 'CarrierWave::MongoMapper#destroy when file is not assigned deletes the instance of @class' can't modify frozen object
+        @doc.save
+        @class.count.should eql(1)
+        @doc = @class.first
+        @doc.destroy
+      end
+      
+    end
+    
   end
   
   

data/spec/orm/sequel_spec.rb

@@ -111,18 +111,9 @@ describe CarrierWave::Sequel do
       describe 'with validation' do
 
         before do
-          # Add validations
-          if CarrierWave::Sequel.new_sequel?
-            @class.class_eval do
-              def validate
-                errors.add(:image, 'FAIL!')
-              end
-            end
-          else
-            @class.class_eval do
-              validates_each(:image) do |o,a,v|
-                o.errors.add(a, 'FAIL!')
-              end
+          @class.class_eval do
+            def validate
+              errors.add(:image, 'FAIL!')
             end
           end
           # Turn off raising the exceptions on save

data/spec/processing/image_science_spec.rb

@@ -0,0 +1,56 @@
+# encoding: utf-8
+
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe CarrierWave::ImageScience do
+
+  before do
+    @klass = Class.new do
+      include CarrierWave::ImageScience
+    end
+    @instance = @klass.new
+    FileUtils.cp(file_path('landscape.jpg'), file_path('landscape_copy.jpg'))
+    @instance.stub(:current_path).and_return(file_path('landscape_copy.jpg'))
+  end
+  
+  after do
+    FileUtils.rm(file_path('landscape_copy.jpg'))
+  end
+
+  describe '#resize_to_fill' do
+    it "should resize the image to exactly the given dimensions" do
+      @instance.resize_to_fill(200, 200)
+      @instance.should have_dimensions(200, 200)
+    end
+    
+    it "should scale up the image if it smaller than the given dimensions" do
+      @instance.resize_to_fill(1000, 1000)
+      @instance.should have_dimensions(1000, 1000)
+    end
+  end
+
+  describe '#resize_to_fit' do
+    it "should resize the image to fit within the given dimensions" do
+      @instance.resize_to_fit(200, 200)
+      @instance.should have_dimensions(200, 150)
+    end
+    
+    it "should scale up the image if it smaller than the given dimensions" do
+      @instance.resize_to_fit(1000, 1000)
+      @instance.should have_dimensions(1000, 750)
+    end
+  end
+
+  describe '#resize_to_limit' do
+    it "should resize the image to fit within the given dimensions" do
+      @instance.resize_to_limit(200, 200)
+      @instance.should have_dimensions(200, 150)
+    end
+    
+    it "should not scale up the image if it smaller than the given dimensions" do
+      @instance.resize_to_limit(1000, 1000)
+      @instance.should have_dimensions(640, 480)
+    end
+  end
+
+end

data/spec/processing/mini_magick_spec.rb

@@ -0,0 +1,76 @@
+# encoding: utf-8
+
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe CarrierWave::MiniMagick do
+
+  before do
+    @klass = Class.new do
+      include CarrierWave::MiniMagick
+    end
+    @instance = @klass.new
+    FileUtils.cp(file_path('landscape.jpg'), file_path('landscape_copy.jpg'))
+    @instance.stub(:current_path).and_return(file_path('landscape_copy.jpg'))
+  end
+  
+  after do
+    FileUtils.rm(file_path('landscape_copy.jpg'))
+  end
+
+  describe "#convert" do
+    it "should convert from one format to another" do
+      @instance.convert('png')
+      img = ::MiniMagick::Image.from_file(@instance.current_path)
+      img['format'].should =~ /PNG/
+    end
+  end
+
+  describe '#resize_to_fill' do
+    it "should resize the image to exactly the given dimensions" do
+      @instance.resize_to_fill(200, 200)
+      @instance.should have_dimensions(200, 200)
+    end
+    
+    it "should scale up the image if it smaller than the given dimensions" do
+      @instance.resize_to_fill(1000, 1000)
+      @instance.should have_dimensions(1000, 1000)
+    end
+  end
+  
+  describe '#resize_and_pad' do
+    it "should resize the image to exactly the given dimensions" do
+      @instance.resize_and_pad(200, 200)
+      @instance.should have_dimensions(200, 200)
+    end
+    
+    it "should scale up the image if it smaller than the given dimensions" do
+      @instance.resize_and_pad(1000, 1000)
+      @instance.should have_dimensions(1000, 1000)
+    end
+  end
+
+  describe '#resize_to_fit' do
+    it "should resize the image to fit within the given dimensions" do
+      @instance.resize_to_fit(200, 200)
+      @instance.should have_dimensions(200, 150)
+    end
+    
+    it "should scale up the image if it smaller than the given dimensions" do
+      @instance.resize_to_fit(1000, 1000)
+      @instance.should have_dimensions(1000, 750)
+    end
+  end
+
+  describe '#resize_to_limit' do
+    it "should resize the image to fit within the given dimensions" do
+      @instance.resize_to_limit(200, 200)
+      @instance.should have_dimensions(200, 150)
+    end
+    
+    it "should not scale up the image if it smaller than the given dimensions" do
+      @instance.resize_to_limit(1000, 1000)
+      @instance.should have_dimensions(640, 480)
+    end
+  end
+
+end

data/spec/processing/rmagick_spec.rb

@@ -0,0 +1,68 @@
+# encoding: utf-8
+
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe CarrierWave::RMagick do
+
+  before do
+    @klass = Class.new do
+      include CarrierWave::RMagick
+    end
+    @instance = @klass.new
+    FileUtils.cp(file_path('landscape.jpg'), file_path('landscape_copy.jpg'))
+    @instance.stub(:current_path).and_return(file_path('landscape_copy.jpg'))
+  end
+  
+  after do
+    FileUtils.rm(file_path('landscape_copy.jpg'))
+  end
+
+  describe '#resize_to_fill' do
+    it "should resize the image to exactly the given dimensions" do
+      @instance.resize_to_fill(200, 200)
+      @instance.should have_dimensions(200, 200)
+    end
+    
+    it "should scale up the image if it smaller than the given dimensions" do
+      @instance.resize_to_fill(1000, 1000)
+      @instance.should have_dimensions(1000, 1000)
+    end
+  end
+  
+  describe '#resize_and_pad' do
+    it "should resize the image to exactly the given dimensions" do
+      @instance.resize_and_pad(200, 200)
+      @instance.should have_dimensions(200, 200)
+    end
+    
+    it "should scale up the image if it smaller than the given dimensions" do
+      @instance.resize_and_pad(1000, 1000)
+      @instance.should have_dimensions(1000, 1000)
+    end
+  end
+
+  describe '#resize_to_fit' do
+    it "should resize the image to fit within the given dimensions" do
+      @instance.resize_to_fit(200, 200)
+      @instance.should have_dimensions(200, 150)
+    end
+    
+    it "should scale up the image if it smaller than the given dimensions" do
+      @instance.resize_to_fit(1000, 1000)
+      @instance.should have_dimensions(1000, 750)
+    end
+  end
+
+  describe '#resize_to_limit' do
+    it "should resize the image to fit within the given dimensions" do
+      @instance.resize_to_limit(200, 200)
+      @instance.should have_dimensions(200, 150)
+    end
+    
+    it "should not scale up the image if it smaller than the given dimensions" do
+      @instance.resize_to_limit(1000, 1000)
+      @instance.should have_dimensions(640, 480)
+    end
+  end
+
+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