carrierwave 0.4.1 → 0.4.2

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/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

@@ -9,7 +9,7 @@ if ENV['S3_SPEC']
       @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('carrierwave_test')
+      @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)
 

data/spec/uploader/processing_spec.rb

@@ -46,6 +46,17 @@ describe CarrierWave::Uploader do
       @uploader.should_receive(:format).with('png')
       @uploader.process!
     end
+    
+    context "with 'enable_processing' set to false" do
+      it "should not do any processing" do
+        @uploader_class.enable_processing = false
+        @uploader_class.process :sepiatone, :desaturate, :invert
+        @uploader.should_not_receive(:sepiatone)
+        @uploader.should_not_receive(:desaturate)
+        @uploader.should_not_receive(:invert)
+        @uploader.process!
+      end
+    end
   end
 
   describe '#cache!' do

data/spec/uploader/store_spec.rb

@@ -147,6 +147,27 @@ describe CarrierWave::Uploader do
       @uploader.file.should == @stored_file
     end
   end
+  
+  describe 'with an overridden filename' do
+    before do
+      @uploader_class.class_eval do
+        def filename; "foo.jpg"; end
+      end
+    end
+
+    it "should create new files if there is a file" do
+      @file = File.open(file_path('test.jpg'))
+      @uploader.store!(@file)
+      @path = ::File.expand_path(@uploader.store_path, @uploader.root)
+      File.exist?(@path).should be_true
+    end
+    
+    it "should not create new files if there is no file" do
+      @uploader.store!(nil)
+      @path = ::File.expand_path(@uploader.store_path, @uploader.root)
+      File.exist?(@path).should be_false
+    end
+  end
 
   describe 'with an overridden, reversing, filename' do
     before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: carrierwave
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-26 00:00:00 +01:00
+date: 2009-11-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,6 +112,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.10.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: mini_magick
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.5
+    version: 
 - !ruby/object:Gem::Dependency 
   name: mongo_mapper
   type: :development
@@ -120,7 +130,17 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.4
+        version: 0.5.8
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mongoid
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.5.11
     version: 
 - !ruby/object:Gem::Dependency 
   name: aws-s3
@@ -198,14 +218,17 @@ files:
 - lib/carrierwave/mount.rb
 - lib/carrierwave/orm/activerecord.rb
 - lib/carrierwave/orm/datamapper.rb
+- lib/carrierwave/orm/mongoid.rb
 - lib/carrierwave/orm/mongomapper.rb
 - lib/carrierwave/orm/sequel.rb
 - lib/carrierwave/processing/image_science.rb
+- lib/carrierwave/processing/mini_magick.rb
 - lib/carrierwave/processing/rmagick.rb
 - lib/carrierwave/sanitized_file.rb
 - lib/carrierwave/storage/abstract.rb
 - lib/carrierwave/storage/file.rb
 - lib/carrierwave/storage/grid_fs.rb
+- lib/carrierwave/storage/right_s3.rb
 - lib/carrierwave/storage/s3.rb
 - lib/carrierwave/test/matchers.rb
 - lib/carrierwave/uploader.rb
@@ -230,16 +253,23 @@ files:
 - script/generate
 - spec/compatibility/paperclip_spec.rb
 - spec/fixtures/bork.txt
+- spec/fixtures/landscape.jpg
+- spec/fixtures/portrait.jpg
 - spec/fixtures/test.jpeg
 - spec/fixtures/test.jpg
 - spec/mount_spec.rb
 - spec/orm/activerecord_spec.rb
 - spec/orm/datamapper_spec.rb
+- spec/orm/mongoid_spec.rb
 - spec/orm/mongomapper_spec.rb
 - spec/orm/sequel_spec.rb
+- spec/processing/image_science_spec.rb
+- spec/processing/mini_magick_spec.rb
+- spec/processing/rmagick_spec.rb
 - spec/sanitized_file_spec.rb
 - spec/spec_helper.rb
 - spec/storage/grid_fs_spec.rb
+- spec/storage/right_s3_spec.rb
 - spec/storage/s3_spec.rb
 - spec/uploader/cache_spec.rb
 - spec/uploader/configuration_spec.rb