carrierwave 0.1 → 0.2.0

data/spec/sanitized_file_spec.rb

@@ -2,8 +2,6 @@ require File.dirname(__FILE__) + '/spec_helper'
 
 describe CarrierWave::SanitizedFile do
   
-  include SanitizedFileSpecHelper
-  
   before do
     unless File.exists?(file_path('llama.jpg'))
       FileUtils.cp(file_path('test.jpg'), file_path('llama.jpg'))
@@ -206,15 +204,9 @@ describe CarrierWave::SanitizedFile do
         @sanitized_file.extension.should == 'png'
       end
       
-      describe "with permissions set" do
-        before do
-          @sanitized_file.options[:permissions] = 0755
-        end
-
-        it "should set the right permissions" do
-          @sanitized_file.move_to(file_path('gurr.png'))
-          @sanitized_file.should have_permissions(0755)
-        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
@@ -266,15 +258,9 @@ describe CarrierWave::SanitizedFile do
         new_file.extension.should == 'png'
       end
       
-      describe "with permissions set" do
-        before do
-          @sanitized_file.options[:permissions] = 0755
-        end
-
-        it "should set the right permissions" do
-          new_file = @sanitized_file.copy_to(file_path('gurr.png'))
-          new_file.should have_permissions(0755)
-        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)
       end
 
     end
@@ -345,9 +331,9 @@ describe CarrierWave::SanitizedFile do
       end
     end
   
-    describe '#string?' do
+    describe '#is_path?' do
       it "should be false" do
-        @sanitized_file.string?.should be_false
+        @sanitized_file.is_path?.should be_false
       end
     end
   
@@ -363,9 +349,9 @@ describe CarrierWave::SanitizedFile do
 
     it_should_behave_like "all valid sanitized files that are stored on disk"
 
-    describe '#string?' do
+    describe '#is_path?' do
       it "should be false" do
-        @sanitized_file.string?.should be_false
+        @sanitized_file.is_path?.should be_false
       end
     end
     
@@ -391,9 +377,9 @@ describe CarrierWave::SanitizedFile do
       end
     end
     
-    describe '#string?' do
+    describe '#is_path?' do
       it "should be false" do
-        @sanitized_file.string?.should be_false
+        @sanitized_file.is_path?.should be_false
       end
     end
 
@@ -422,9 +408,9 @@ describe CarrierWave::SanitizedFile do
   
     it_should_behave_like "all valid sanitized files that are stored on disk"
 
-    describe '#string?' do
+    describe '#is_path?' do
       it "should be false" do
-        @sanitized_file.string?.should be_false
+        @sanitized_file.is_path?.should be_false
       end
     end
 
@@ -448,9 +434,9 @@ describe CarrierWave::SanitizedFile do
   
     it_should_behave_like "all valid sanitized files that are stored on disk"
 
-    describe '#string?' do
+    describe '#is_path?' do
       it "should be true" do
-        @sanitized_file.string?.should be_true
+        @sanitized_file.is_path?.should be_true
       end
     end
     
@@ -474,9 +460,9 @@ describe CarrierWave::SanitizedFile do
 
     it_should_behave_like "all valid sanitized files that are stored on disk"
 
-    describe '#string?' do
+    describe '#is_path?' do
       it "should be true" do
-        @sanitized_file.string?.should be_true
+        @sanitized_file.is_path?.should be_true
       end
     end
     
@@ -506,9 +492,9 @@ describe CarrierWave::SanitizedFile do
       end
     end
 
-    describe '#string?' do
+    describe '#is_path?' do
       it "should be false" do
-        @empty.string?.should be_false
+        @empty.is_path?.should be_false
       end
     end
 
@@ -572,9 +558,9 @@ describe CarrierWave::SanitizedFile do
       end
     end
 
-    describe '#string?' do
+    describe '#is_path?' do
       it "should be false" do
-        @empty.string?.should be_false
+        @empty.is_path?.should be_false
       end
     end
 

data/spec/spec_helper.rb

@@ -30,91 +30,55 @@ end
 CarrierWave.config[:public] = public_path
 CarrierWave.config[:root] = File.expand_path(File.dirname(__FILE__))
 
-module SanitizedFileSpecHelper
-  def stub_merb_tempfile(filename)
-    raise "#{path} file does not exist" unless File.exist?(file_path(filename))
-
-    t = Tempfile.new(filename)
-    FileUtils.copy_file(file_path(filename), t.path)
+module CarrierWave
+  module Test
+    module MockFiles
+      def stub_merb_tempfile(filename)
+        raise "#{path} file does not exist" unless File.exist?(file_path(filename))
+
+        t = Tempfile.new(filename)
+        FileUtils.copy_file(file_path(filename), t.path)
     
-    return t
-  end
+        return t
+      end
   
-  def stub_tempfile(filename, mime_type=nil, fake_name=nil)
-    raise "#{path} file does not exist" unless File.exist?(file_path(filename))
+      def stub_tempfile(filename, mime_type=nil, fake_name=nil)
+        raise "#{path} file does not exist" unless File.exist?(file_path(filename))
 
-    t = Tempfile.new(filename)
-    FileUtils.copy_file(file_path(filename), t.path)
+        t = Tempfile.new(filename)
+        FileUtils.copy_file(file_path(filename), t.path)
     
-    # This is stupid, but for some reason rspec won't play nice...
-    eval <<-EOF
-    def t.original_filename; '#{fake_name || filename}'; end
-    def t.content_type; '#{mime_type}'; end
-    def t.local_path; path; end
-    EOF
-
-    return t
-  end
-
-  def stub_stringio(filename, mime_type=nil, fake_name=nil)
-    if filename
-      t = StringIO.new( IO.read( file_path( filename ) ) )
-    else
-      t = StringIO.new
-    end
-    t.stub!(:local_path).and_return("")
-    t.stub!(:original_filename).and_return(filename || fake_name)
-    t.stub!(:content_type).and_return(mime_type)
-    return t
-  end
-
-  def stub_file(filename, mime_type=nil, fake_name=nil)
-    f = File.open(file_path(filename))
-    return f
-  end
-  
-  class BeIdenticalTo
-    def initialize(expected)
-      @expected = expected
-    end
-    def matches?(actual)
-      @actual = actual
-      FileUtils.identical?(@actual, @expected)
-    end
-    def failure_message
-      "expected #{@actual.inspect} to be identical to #{@expected.inspect}"
-    end
-    def negative_failure_message
-      "expected #{@actual.inspect} to not be identical to #{@expected.inspect}"
-    end
-  end
-
-  def be_identical_to(expected)
-    BeIdenticalTo.new(expected)
-  end
-
-  class HavePermissions
-    def initialize(expected)
-      @expected = expected
-    end
-
-    def matches?(actual)
-      @actual = actual
-      # Satisfy expectation here. Return false or raise an error if it's not met.
-      (File.stat(@actual.path).mode & 0777) == @expected
-    end
-
-    def failure_message
-      "expected #{@actual.inspect} to have permissions #{@expected.to_s(8)}, but they were #{(File.stat(@actual.path).mode & 0777).to_s(8)}"
-    end
-
-    def negative_failure_message
-      "expected #{@actual.inspect} not to have permissions #{@expected.to_s(8)}, but it did"
+        # This is stupid, but for some reason rspec won't play nice...
+        eval <<-EOF
+        def t.original_filename; '#{fake_name || filename}'; end
+        def t.content_type; '#{mime_type}'; end
+        def t.local_path; path; end
+        EOF
+
+        return t
+      end
+
+      def stub_stringio(filename, mime_type=nil, fake_name=nil)
+        if filename
+          t = StringIO.new( IO.read( file_path( filename ) ) )
+        else
+          t = StringIO.new
+        end
+        t.stub!(:local_path).and_return("")
+        t.stub!(:original_filename).and_return(filename || fake_name)
+        t.stub!(:content_type).and_return(mime_type)
+        return t
+      end
+
+      def stub_file(filename, mime_type=nil, fake_name=nil)
+        f = File.open(file_path(filename))
+        return f
+      end
     end
   end
+end
 
-  def have_permissions(expected)
-    HavePermissions.new(expected)
-  end
-  
+Spec::Runner.configure do |config|
+  config.include CarrierWave::Test::Matchers
+  config.include CarrierWave::Test::MockFiles
 end

data/spec/uploader_spec.rb

@@ -1,9 +1,11 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
 describe CarrierWave::Uploader do
-  
+
   before do
-    @uploader_class = Class.new(CarrierWave::Uploader)
+    @uploader_class = Class.new do
+      include CarrierWave::Uploader
+    end
     @uploader = @uploader_class.new
   end
   
@@ -34,10 +36,10 @@ describe CarrierWave::Uploader do
       @uploader.thumb.version_name.should == :thumb
     end
     
-    it "should set the version name on the class" do
+    it "should set the version names on the class" do
       @uploader_class.version :thumb
-      @uploader.class.version_name.should == nil
-      @uploader.thumb.class.version_name.should == :thumb
+      @uploader.class.version_names.should == []
+      @uploader.thumb.class.version_names.should == [:thumb]
     end
     
     it "should remember mount options" do
@@ -58,6 +60,45 @@ describe CarrierWave::Uploader do
       @uploader.store_dir.should == 'uploads'
       @uploader.thumb.store_dir.should == public_path('monkey/apache')
     end
+
+    it "should reopen the same class when called multiple times" do
+      @uploader_class.version :thumb do
+        def self.monkey
+          "monkey"
+        end
+      end
+      @uploader_class.version :thumb do
+        def self.llama
+          "llama"
+        end
+      end
+      @uploader_class.version(:thumb).monkey.should == "monkey"
+      @uploader_class.version(:thumb).llama.should == "llama"
+    end
+    
+    describe 'with nested versions' do
+      before do
+        @uploader_class.version :thumb do
+          version :mini
+          version :micro
+        end
+      end
+      
+      it "should add an array of version names" do
+        @uploader.class.version_names.should == []
+        @uploader.thumb.class.version_names.should == [:thumb]
+        @uploader.thumb.mini.class.version_names.should == [:thumb, :mini]
+        @uploader.thumb.micro.class.version_names.should == [:thumb, :micro]
+      end
+
+      it "should set the version name for the instances" do
+        @uploader.version_name.should be_nil
+        @uploader.thumb.version_name.should == :thumb
+        @uploader.thumb.mini.version_name.should == :thumb_mini
+        @uploader.thumb.micro.version_name.should == :thumb_micro
+      end
+
+    end
     
   end
   
@@ -133,7 +174,7 @@ describe CarrierWave::Uploader do
     end
   end
   
-  describe '#blank' do
+  describe '#blank?' do
     it "should be true when nothing has been done" do
       @uploader.should be_blank
     end
@@ -149,6 +190,17 @@ describe CarrierWave::Uploader do
     end
   end
   
+  describe '#read' do
+    it "should be nil by default" do
+      @uploader.read.should be_nil
+    end
+
+    it "should read the contents of a cached file" do
+      @uploader.cache!(File.open(file_path('test.jpg')))
+      @uploader.read.should == "this is stuff"
+    end
+  end
+  
   describe '#store_dir' do
     it "should default to the config option" do
       @uploader.store_dir.should == 'uploads'
@@ -290,6 +342,37 @@ describe CarrierWave::Uploader do
     it "should do nothing when trying to cache an empty file" do
       @uploader.cache!(nil)
     end
+    
+    it "should set permissions if options are given" do
+      old_permissions = CarrierWave.config[:permissions]
+      CarrierWave.config[:permissions] = 0777
+      
+      @uploader.cache!(File.open(file_path('test.jpg')))
+      @uploader.should have_permissions(0777)
+      
+      CarrierWave.config[:permissions] = old_permissions
+    end
+
+    it "should not raise an integiry error if there is no white list" do
+      @uploader.stub!(:extension_white_list).and_return(nil)
+      running {
+        @uploader.cache!(File.open(file_path('test.jpg')))
+      }.should_not raise_error(CarrierWave::IntegrityError)
+    end
+    
+    it "should not raise an integiry error if there is a white list and the file is on it" do
+      @uploader.stub!(:extension_white_list).and_return(%w(jpg gif png))
+      running {
+        @uploader.cache!(File.open(file_path('test.jpg')))
+      }.should_not raise_error(CarrierWave::IntegrityError)
+    end
+
+    it "should raise an integiry error if there is a white list and the file is not on it" do
+      @uploader.stub!(:extension_white_list).and_return(%w(txt doc xls))
+      running {
+        @uploader.cache!(File.open(file_path('test.jpg')))
+      }.should raise_error(CarrierWave::IntegrityError)
+    end
   end
   
   describe '#retrieve_from_cache!' do
@@ -479,6 +562,7 @@ describe CarrierWave::Uploader do
       @stored_file.stub!(:path).and_return('/path/to/somewhere')
       @stored_file.stub!(:url).and_return('http://www.example.com')
       @stored_file.stub!(:identifier).and_return('this-is-me')
+      @stored_file.stub!(:read).and_return('here be content')
 
       @uploader_class.storage.stub!(:retrieve!).and_return(@stored_file)
     end
@@ -497,6 +581,11 @@ describe CarrierWave::Uploader do
       @uploader.retrieve_from_store('monkey.txt')
       @uploader.identifier.should == 'this-is-me'
     end
+
+    it "should read out the contents" do
+      @uploader.retrieve_from_store('monkey.txt')
+      @uploader.read.should == 'here be content'
+    end
     
     it "should instruct the storage engine to retrieve the file and store the result" do
       @uploader_class.storage.should_receive(:retrieve!).with(@uploader, 'monkey.txt').and_return(@stored_file)
@@ -522,10 +611,11 @@ describe CarrierWave::Uploader do
         CarrierWave::Uploader.stub!(:generate_cache_id).and_return('20071201-1234-345-2255')
       end
 
-      it "should suffix the version's store_dir" do
+      it "should set store_path with versions" do
         @uploader.cache!(File.open(file_path('test.jpg')))
-        @uploader.store_dir.should == 'uploads'
-        @uploader.thumb.store_dir.should == 'uploads/thumb'
+        @uploader.store_path.should == 'uploads/test.jpg'
+        @uploader.thumb.store_path.should == 'uploads/thumb_test.jpg'
+        @uploader.thumb.store_path('kebab.png').should == 'uploads/thumb_kebab.png'
       end
       
       it "should move it to the tmp dir with the filename prefixed" do
@@ -544,10 +634,11 @@ describe CarrierWave::Uploader do
         @uploader.thumb.current_path.should == public_path('uploads/tmp/20071201-1234-345-2255/thumb_test.jpg')
       end
     
-      it "should suffix the version's store_dir" do
+      it "should set store_path with versions" do
         @uploader.retrieve_from_cache!('20071201-1234-345-2255/test.jpg')
-        @uploader.store_dir.should == 'uploads'
-        @uploader.thumb.store_dir.should == 'uploads/thumb'
+        @uploader.store_path.should == 'uploads/test.jpg'
+        @uploader.thumb.store_path.should == 'uploads/thumb_test.jpg'
+        @uploader.thumb.store_path('kebab.png').should == 'uploads/thumb_kebab.png'
       end
     end
     
@@ -579,17 +670,11 @@ describe CarrierWave::Uploader do
         @uploader.url.should == 'http://www.example.com'
       end
     
-      it "should, if a file is given as argument, suffix the version's store_dir" do
-        @uploader.store!(@file)
-        @uploader.store_dir.should == 'uploads'
-        @uploader.thumb.store_dir.should == 'uploads/thumb'
-      end
-    
-      it "should, if a files is given as an argument and use_cache is false, suffix the version's store_dir" do
-        CarrierWave.config[:use_cache] = false
+      it "should, if a file is given as argument, set the store_path" do
         @uploader.store!(@file)
-        @uploader.store_dir.should == 'uploads'
-        @uploader.thumb.store_dir.should == 'uploads/thumb'
+        @uploader.store_path.should == 'uploads/test.jpg'
+        @uploader.thumb.store_path.should == 'uploads/thumb_test.jpg'
+        @uploader.thumb.store_path('kebab.png').should == 'uploads/thumb_kebab.png'
       end
     
     end