durran-carrierwave 0.3.2.3 → 0.4.3

data/spec/spec_helper.rb

@@ -21,7 +21,6 @@ require 'spec/autorun'
 require 'carrierwave'
 
 require 'logger'
-CarrierWave.logger = Logger.new(nil)
 
 alias :running :lambda
 
@@ -33,8 +32,7 @@ def public_path( *paths )
   File.expand_path(File.join(File.dirname(__FILE__), 'public', *paths))
 end
 
-CarrierWave.config[:public] = public_path
-CarrierWave.config[:root] = File.expand_path(File.dirname(__FILE__))
+CarrierWave.root = public_path
 
 module CarrierWave
   module Test

data/spec/storage/grid_fs_spec.rb

@@ -0,0 +1,78 @@
+# encoding: utf-8
+
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe CarrierWave::Storage::GridFS do
+
+  before do
+    @database = Mongo::Connection.new('localhost').db('carrierwave_test')
+    @uploader = mock('an uploader')
+    @uploader.stub!(:grid_fs_database).and_return("carrierwave_test")
+    @uploader.stub!(:grid_fs_host).and_return("localhost")
+    @uploader.stub!(:grid_fs_access_url).and_return(nil)
+    @uploader.stub!(:grid_fs_username).and_return(nil)
+    @uploader.stub!(:grid_fs_password).and_return(nil)
+
+    @storage = CarrierWave::Storage::GridFS.new(@uploader)
+    @file = CarrierWave::SanitizedFile.new(file_path('test.jpg'))
+  end
+  
+  after do
+    GridFS::GridStore.unlink(@database, 'uploads/bar.txt')
+  end
+
+  describe '#store!' do
+    before do
+      @uploader.stub!(:store_path).and_return('uploads/bar.txt')
+      @grid_fs_file = @storage.store!(@file)
+    end
+    
+    it "should upload the file to gridfs" do
+      GridFS::GridStore.read(@database, 'uploads/bar.txt').should == 'this is stuff'
+    end
+    
+    it "should not have a path" do
+      @grid_fs_file.path.should be_nil
+    end
+    
+    it "should not have a URL" do
+      @grid_fs_file.url.should be_nil
+    end
+    
+    it "should be deletable" do
+      @grid_fs_file.delete
+      GridFS::GridStore.read(@database, 'uploads/bar.txt').should == ''
+    end
+  end
+  
+  describe '#retrieve!' do
+    before do
+      GridFS::GridStore.open(@database, 'uploads/bar.txt', 'w') { |f| f.puts "A test, 1234" }
+      @uploader.stub!(:store_path).with('bar.txt').and_return('uploads/bar.txt')
+      @grid_fs_file = @storage.retrieve!('bar.txt')
+    end
+
+    it "should retrieve the file contents from gridfs" do
+      @grid_fs_file.read.chomp.should == "A test, 1234"
+    end
+    
+    it "should not have a path" do
+      @grid_fs_file.path.should be_nil
+    end
+    
+    it "should not have a URL unless set" do
+      @grid_fs_file.url.should be_nil
+    end
+    
+    it "should return a URL if configured" do
+      @uploader.stub!(:grid_fs_access_url).and_return("/image/show")
+      @grid_fs_file.url.should == "/image/show/uploads/bar.txt"
+    end
+    
+    it "should be deletable" do
+      @grid_fs_file.delete
+      GridFS::GridStore.read(@database, 'uploads/bar.txt').should == ''
+    end
+  end
+
+end

data/spec/storage/right_s3_spec.rb

@@ -0,0 +1,75 @@
+# encoding: utf-8
+
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'right_aws'
+
+if ENV['S3_SPEC']
+  describe CarrierWave::Storage::RightS3 do
+    before do
+      @bucket = ENV['CARRIERWAVE_TEST_BUCKET']
+      @uploader = mock('an uploader')
+      @uploader.stub!(:s3_access_key_id).and_return(ENV["S3_ACCESS_KEY_ID"])
+      @uploader.stub!(:s3_secret_access_key).and_return(ENV["S3_SECRET_ACCESS_KEY"])
+      @uploader.stub!(:s3_bucket).and_return(@bucket)
+      @uploader.stub!(:s3_access_policy).and_return('public-read')
+      @uploader.stub!(:s3_cnamed).and_return(false)
+
+      @storage = CarrierWave::Storage::RightS3.new(@uploader)
+      @file = CarrierWave::SanitizedFile.new(file_path('test.jpg'))
+    end
+  
+    after do
+      @storage.connection.delete(@bucket, 'uploads/bar.txt')
+    end
+
+    describe '#store!' do
+      before do
+        @uploader.stub!(:store_path).and_return('uploads/bar.txt')
+        @s3_file = @storage.store!(@file)
+      end
+    
+      it "should upload the file to s3" do
+        @storage.connection.get_object(@bucket, 'uploads/bar.txt').should == 'this is stuff'
+      end
+    
+      it "should have a path" do
+        @s3_file.path.should == 'uploads/bar.txt'
+      end
+    
+      it "should have an Amazon URL" do
+        @s3_file.url.should == "http://#{@bucket}.s3.amazonaws.com/uploads/bar.txt"
+      end
+    
+      it "should be deletable" do
+        @s3_file.delete
+        lambda {@storage.connection.head(@bucket, 'uploads/bar.txt')}.should raise_error(RightAws::AwsError)
+      end
+    end
+  
+    describe '#retrieve!' do
+      before do
+        @storage.connection.put(@bucket, "uploads/bar.txt", "A test, 1234", {'a-amz-acl' => 'public-read'})
+        @uploader.stub!(:store_path).with('bar.txt').and_return('uploads/bar.txt')
+        @s3_file = @storage.retrieve!('bar.txt')
+      end
+
+      it "should retrieve the file contents from s3" do
+        @s3_file.read.chomp.should == "A test, 1234"
+      end
+    
+      it "should have a path" do
+        @s3_file.path.should == 'uploads/bar.txt'
+      end
+    
+      it "should have an Amazon URL" do
+        @s3_file.url.should == "http://#{@bucket}.s3.amazonaws.com/uploads/bar.txt"
+      end
+    
+      it "should be deletable" do
+        @s3_file.delete
+        lambda {@storage.connection.head(@bucket, 'uploads/bar.txt')}.should raise_error(RightAws::AwsError)
+      end
+    end
+
+  end
+end

data/spec/storage/s3_spec.rb

@@ -0,0 +1,83 @@
+# encoding: utf-8
+
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'aws/s3'
+
+if ENV['S3_SPEC']
+  describe CarrierWave::Storage::S3 do
+    before do
+      @uploader = mock('an uploader')
+      @uploader.stub!(:s3_access_key_id).and_return(ENV["S3_ACCESS_KEY_ID"])
+      @uploader.stub!(:s3_secret_access_key).and_return(ENV["S3_SECRET_ACCESS_KEY"])
+      @uploader.stub!(:s3_bucket).and_return(ENV['CARRIERWAVE_TEST_BUCKET'])
+      @uploader.stub!(:s3_access).and_return(:public_read)
+      @uploader.stub!(:s3_cnamed).and_return(false)
+
+      @storage = CarrierWave::Storage::S3.new(@uploader)
+      @file = CarrierWave::SanitizedFile.new(file_path('test.jpg'))
+    end
+  
+    after do
+      AWS::S3::S3Object.delete('uploads/bar.txt', 'carrierwave_test')
+    end
+
+    describe '#store!' do
+      before do
+        @uploader.stub!(:store_path).and_return('uploads/bar.txt')
+        @s3_file = @storage.store!(@file)
+      end
+    
+      it "should upload the file to s3" do
+        AWS::S3::S3Object.value('uploads/bar.txt', 'carrierwave_test').should == 'this is stuff'
+      end
+    
+      it "should have a path" do
+        @s3_file.path.should == 'uploads/bar.txt'
+      end
+    
+      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
+        AWS::S3::S3Object.exists?('uploads/bar.txt', 'carrierwave_test').should be_false
+      end
+    end
+  
+    describe '#retrieve!' do
+      before do
+        AWS::S3::S3Object.store('uploads/bar.txt', "A test, 1234", 'carrierwave_test')
+  
+        @uploader.stub!(:store_path).with('bar.txt').and_return('uploads/bar.txt')
+        @s3_file = @storage.retrieve!('bar.txt')
+      end
+
+      it "should retrieve the file contents from s3" do
+        @s3_file.read.chomp.should == "A test, 1234"
+      end
+    
+      it "should have a path" do
+        @s3_file.path.should == 'uploads/bar.txt'
+      end
+    
+      it "should have an Amazon URL" do
+        @s3_file.url.should == 'http://s3.amazonaws.com/carrierwave_test/uploads/bar.txt'
+      end
+    
+      it "should be deletable" do
+        @s3_file.delete
+        AWS::S3::S3Object.exists?('uploads/bar.txt', 'carrierwave_test').should be_false
+      end
+    end
+
+  end
+end

data/spec/uploader/cache_spec.rb

@@ -51,15 +51,6 @@ describe CarrierWave::Uploader do
       @uploader.file.exists?.should be_true
     end
 
-    it "should not move it if cache_to_cache_dir is false" do
-      CarrierWave.config[:cache_to_cache_dir] = false
-      path = file_path('test.jpg')
-      @uploader.cache!(File.open(path))
-      @uploader.current_path.should == path
-      @uploader.file.exists?.should be_true
-      CarrierWave.config[:cache_to_cache_dir] = true
-    end
-
     it "should set the url" do
       @uploader.cache!(File.open(file_path('test.jpg')))
       @uploader.url.should == '/uploads/tmp/20071201-1234-345-2255/test.jpg'
@@ -82,13 +73,10 @@ describe CarrierWave::Uploader do
     end
 
     it "should set permissions if options are given" do
-      old_permissions = CarrierWave.config[:permissions]
-      CarrierWave.config[:permissions] = 0777
+      @uploader_class.permissions = 0777
 
       @uploader.cache!(File.open(file_path('test.jpg')))
       @uploader.should have_permissions(0777)
-
-      CarrierWave.config[:permissions] = old_permissions
     end
   end
 

data/spec/uploader/configuration_spec.rb

@@ -0,0 +1,105 @@
+# encoding: utf-8
+
+require File.dirname(__FILE__) + '/../spec_helper'
+
+
+describe CarrierWave do
+  before do
+    @uploader_class = Class.new(CarrierWave::Uploader::Base)
+  end
+
+  describe '.configure' do
+    it "should proxy to Uploader configuration" do
+      CarrierWave::Uploader::Base.add_config :test_config
+      CarrierWave.configure do |config|
+        config.test_config = "foo"
+      end
+      CarrierWave::Uploader::Base.test_config.should == 'foo'
+    end
+  end
+end
+
+describe CarrierWave::Uploader::Base do
+  before do
+    @uploader_class = Class.new(CarrierWave::Uploader::Base)
+  end
+
+  describe '.configure' do
+    it "should set a configuration parameter" do
+      @uploader_class.add_config :foo_bar
+      @uploader_class.configure do |config|
+        config.foo_bar = "monkey"
+      end
+      @uploader_class.foo_bar.should == 'monkey'
+    end
+  end
+  
+  describe ".storage" do
+    it "should set the storage if an argument is given" do
+      storage = mock('some kind of storage')
+      @uploader_class.storage storage
+      @uploader_class.storage.should == storage
+    end
+
+    it "should default to file" do
+      @uploader_class.storage.should == CarrierWave::Storage::File
+    end
+
+    it "should set the storage from the configured shortcuts if a symbol is given" do
+      @uploader_class.storage :file
+      @uploader_class.storage.should == CarrierWave::Storage::File
+    end
+
+    it "should remember the storage when inherited" do
+      @uploader_class.storage :s3
+      subclass = Class.new(@uploader_class)
+      subclass.storage.should == CarrierWave::Storage::S3
+    end
+
+    it "should be changeable when inherited" do
+      @uploader_class.storage :s3
+      subclass = Class.new(@uploader_class)
+      subclass.storage.should == CarrierWave::Storage::S3
+      subclass.storage :file
+      subclass.storage.should == CarrierWave::Storage::File
+    end
+  end
+  
+  
+  describe '.add_config' do
+    it "should add a class level accessor" do
+      @uploader_class.add_config :foo_bar
+      @uploader_class.foo_bar = 'foo'
+      @uploader_class.foo_bar.should == 'foo'
+    end
+    
+    ['foo', :foo, 45, ['foo', :bar]].each do |val|
+      it "should be inheritable for a #{val.class}" do
+        @uploader_class.add_config :foo_bar
+        @child_class = Class.new(@uploader_class)
+
+        @uploader_class.foo_bar = val
+        @uploader_class.foo_bar.should == val
+        @child_class.foo_bar.should == val
+
+        @child_class.foo_bar = "bar"
+        @child_class.foo_bar.should == "bar"
+
+        @uploader_class.foo_bar.should == val
+      end
+    end
+    
+    
+    it "should add an instance level accessor" do
+      @uploader_class.add_config :foo_bar
+      @uploader_class.foo_bar = 'foo'
+      @uploader_class.new.foo_bar.should == 'foo'
+    end
+    
+    it "should add a convenient in-class setter" do
+      @uploader_class.add_config :foo_bar
+      @uploader_class.foo_bar "monkey"
+      @uploader_class.foo_bar.should == "monkey"
+    end
+  end
+end

data/spec/uploader/{default_path_spec.rb → default_url_spec.rb}

@@ -13,11 +13,12 @@ describe CarrierWave::Uploader do
     FileUtils.rm_rf(public_path)
   end
 
-  describe 'with a default path' do
+  describe 'with a default url' do
     before do
       @uploader_class.class_eval do
-        def default_path
-          file_path('test.jpg')
+        version :thumb
+        def default_url
+          ["http://someurl.example.com", version_name].compact.join('/')
         end
       end
       @uploader = @uploader_class.new
@@ -30,8 +31,18 @@ describe CarrierWave::Uploader do
     end
 
     describe '#current_path' do
-      it "should return the default path" do
-        @uploader.current_path.should == file_path('test.jpg')
+      it "should return nil" do
+        @uploader.current_path.should be_nil
+      end
+    end
+    
+    describe '#url' do
+      it "should return the default url" do
+        @uploader.url.should == 'http://someurl.example.com'
+      end
+      
+      it "should return the default url with version when given" do
+        @uploader.url(:thumb).should == 'http://someurl.example.com/thumb'
       end
     end
 
@@ -60,6 +71,12 @@ describe CarrierWave::Uploader do
         @uploader.cache!(File.open(file_path('test.jpg')))
         @uploader.current_path.should == public_path('uploads/tmp/20071201-1234-345-2255/test.jpg')
       end
+      
+      it "should set the url" do
+        @uploader.cache!(File.open(file_path('test.jpg')))
+        @uploader.url.should_not == 'http://someurl.example.com'
+        @uploader.url.should == '/uploads/tmp/20071201-1234-345-2255/test.jpg'
+      end
 
     end
 

data/spec/uploader/paths_spec.rb

@@ -15,7 +15,7 @@ describe CarrierWave::Uploader do
 
   describe '#root' do
     it "should default to the config option" do
-      @uploader.root.should == public_path('..')
+      @uploader.root.should == public_path
     end
   end