retina_rails 1.0.4 → 2.0.0

data/spec/helpers_spec.rb

@@ -1,35 +1,109 @@
 require 'spec_helper'
 
-describe ActionView::Helpers::AssetTagHelper, :type => :helper do
+class Image
 
-  class SomeWrapperClassForUrl
-    def to_s
-      'image.png'
-    end
+  def url(version)
+    '/some_image.png'
+  end
+
+end
+
+class Upload
+
+  attr_accessor :avatar
+
+  def initialize
+    self.avatar = Image.new
+  end
+
+  def retina_dimensions
+    {
+      :avatar => {
+        :small => {
+          :width  => 40,
+          :height => 30
+        }
+      }
+    }
   end
 
+end
+
+describe ActionView::Helpers::AssetTagHelper, :type => :helper do
+
   subject { helper }
 
-  describe :image_tag do
+  describe '#retina_image_tag' do
+
+    context 'with dimensions present' do
+
+      it 'should set correct width and height' do
+        image = helper.retina_image_tag(Upload.new, :avatar, :small)
+
+        image.should include('width="40"')
+        image.should include('height="30"')
+      end
+
+      it 'should be able to add a class' do
+        image = helper.retina_image_tag(Upload.new, :avatar, :small, :class => 'foo')
+        image.should include('class="foo"')
+      end
+
+    end
+
+    context 'without dimensions present' do
+
+      before(:each) { Upload.any_instance.stub(:retina_dimensions).and_return(nil) }
 
-    context 'with retina option' do
+      it 'should set correct width and height' do
+        image = helper.retina_image_tag(Upload.new, :avatar, :small, :default => { :width => 25, :height => 40 })
 
-      it { subject.image_tag('image.png', :retina => true).should == '<img alt="Image" data-at2x="/assets/image@2x-0842b16379ded9ddcc299912621f76bc.png" src="/assets/image-e8de7f87c2b9d08490575267a4c9eddc.png" />' }
+        image.should include('width="25"')
+        image.should include('height="40"')
 
-      it { subject.image_tag('image.some.png', :retina => true).should == '<img alt="Image.some" data-at2x="/assets/image.some@2x-0842b16379ded9ddcc299912621f76bc.png" src="/assets/image.some-e8de7f87c2b9d08490575267a4c9eddc.png" />' }
+        image = helper.retina_image_tag(Upload.new, :avatar, :small, :default => [25, 40])
 
-      context 'with class' do
+        image.should include('width="25"')
+        image.should include('height="40"')
+      end
+
+      it 'should set no height and width if no defaults present' do
+        image = helper.retina_image_tag(Upload.new, :avatar, :small)
+
+        image.should_not include('width')
+        image.should_not include('height')
+      end
 
-        it { subject.image_tag(SomeWrapperClassForUrl.new, :retina => true).should == '<img alt="Image" data-at2x="/assets/image@2x-0842b16379ded9ddcc299912621f76bc.png" src="/assets/image-e8de7f87c2b9d08490575267a4c9eddc.png" />' }
+      it 'should be able to add a class' do
+        image = helper.retina_image_tag(Upload.new, :avatar, :small, :default => { :width => 25, :height => 40 }, :class => 'foo')
 
+        image.should include('class="foo"')
+      end
+
+      it 'should strip default attributes' do
+        image = helper.retina_image_tag(Upload.new, :avatar, :small, :default => { :width => 25, :height => 40 })
+
+        image.should_not include('default')
       end
 
     end
 
-    context 'without retina' do
+  end
+
+  describe '#image_tag' do
+
+    it 'should show a deprecation warning when used with retina option' do
+      ActiveSupport::Deprecation.should_receive(:warn)
+        .with("`image_tag('image.png', :retina => true)` is deprecated use `retina_image_tag` instead")
+
+      image_tag('image.png', :retina => true)
+    end
 
-      it { subject.image_tag('image.png').should == '<img alt="Image" src="/assets/image-e8de7f87c2b9d08490575267a4c9eddc.png" />' }
+    it 'should not show a deprecation warning when used without retina option' do
+      ActiveSupport::Deprecation.should_not_receive(:warn)
+        .with("`image_tag('image.png', :retina => true)` is deprecated use `retina_image_tag` instead")
 
+      image_tag('image.png')
     end
 
   end

data/spec/spec_helper.rb

@@ -25,20 +25,26 @@ ActiveRecord::Base.establish_connection(
   :database => File.dirname(__FILE__) + "/fixtures/db/retina_rails.sqlite3"
 )
 
-## Load support files
-
-Dir["spec/support/**/*.rb"].each { |f| load f }
-
 ## Load rspec rails after initializing rails app
 
+load 'spec/support/rails.rb'
+load 'spec/support/schema.rb'
 require 'rspec/rails'
 
 ## Load retina_rails
 
 require 'retina_rails'
 
+RetinaRails::Extensions.include_extensions
+RetinaRails::Processors.include_processors
 RetinaRails::Strategies.include_strategies
 
+## Load support files
+
+load 'spec/support/carrierwave.rb'
+load 'spec/support/paperclip.rb'
+load 'spec/support/file_string_io.rb'
+
 RSpec.configure do |config|
   config.fixture_path = "#{File.dirname(__FILE__)}/fixtures"
 end

data/spec/strategies/carrierwave_spec.rb

@@ -1,207 +1,170 @@
-require 'stringio'
 require 'spec_helper'
 
-class AnonymousUploader < CarrierWave::Uploader::Base
-
-  include CarrierWave::RMagick
-
-  retina!
-
-  version :small do
-    process :resize_to_fill => [30, 30]
-    process :quality => 60
-    process :retina_quality => 20
-  end
-
-  version :small_without_quality do
-    process :resize_to_fill => [30, 30]
-  end
-
-  version :small_without_dimensions do
-    process :desaturate
-  end
-
-  version :small_multiple_processors do
-    process :resize_to_fill => [30, 30]
-    process :desaturate
-  end
-
-  version :small_without_retina, :retina => false do
-    process :quality => 60
-  end
-
-  version :small_custom_processor, :retina => false do
-    process :resize_to_fill_with_gravity => [100, 100, 'North', :jpg, 75]
-  end
-
-  version :small_custom_processor_retina, :retina => false do
-    process :resize_to_fill_with_gravity => [200, 200, 'North', :jpg, 40]
-  end
-
-  version :small_with_failing_conditional, :if => ->(img, opts) { false } do
-    process :resize_to_fill => [30, 30]
-  end
-
-  def desaturate
-    manipulate! do |img|
-      img = img.quantize 256, Magick::GRAYColorspace
-    end
-  end
-
-  def resize_to_fill_with_gravity(width, height, gravity, format, quality); end
-
-  def quality(percentage)
-    manipulate! do |img|
-      img.write(current_path) { self.quality = percentage } unless img.quality == percentage
-      img = yield(img) if block_given?
-      img
-    end
-  end
-
-  version :small_without_processor
-
-end
-
-class CarrierWaveUpload
-
-  extend CarrierWave::Mount
-
-  attr_accessor :avatar
-  attr_accessor :id
-
-  mount_uploader :avatar, AnonymousUploader
-
-  def initialize
-    self.id = 999
-  end
-
-end
-
 describe RetinaRails::Strategies::CarrierWave do
 
   include CarrierWave::Test::Matchers
 
-  subject { AnonymousUploader }
-
-  before do
+  ##
+  # Store image so we can run tests against it
+  #
+  def upload!
     AnonymousUploader.enable_processing = true
     @uploader = AnonymousUploader.new(CarrierWaveUpload.new, :avatar)
     @uploader.store!(File.open("#{fixture_path}/images/avatar.jpeg"))
   end
 
-  after do
+  ##
+  # Remove image after testing
+  #
+  after(:each) do
     AnonymousUploader.enable_processing = false
     @uploader.remove!
+    AnonymousUploader.versions[:small][:uploader].processors = [] ## Reset processors
   end
 
+  ##
+  # Actual tests
+  #
   context 'with dimensions processor' do
 
-    its(:versions) { should include :small_retina }
-
-    it { @uploader.small.should have_dimensions(30, 30) }
-    it { @uploader.small_retina.should have_dimensions(60, 60) }
-
-    it { File.basename(@uploader.small.current_path, 'jpeg').should include 'small_'}
-
-    it { File.basename(@uploader.small_retina.current_path, 'jpeg').should include '@2x'}
-    it { File.basename(@uploader.small_retina.current_path, 'jpeg').should_not include 'retina_'}
-
-  end
-
-  context 'with quality processor' do
-
-    it { Magick::Image.read(@uploader.small.current_path).first.quality.should == 60 }
-
-    it { Magick::Image.read(@uploader.small_retina.current_path).first.quality.should == 20 }
-
-  end
-
-  context 'without quality processor' do
-
-    it { Magick::Image.read(@uploader.small_without_quality.current_path).first.quality.should == 84 }
-
-    it { Magick::Image.read(@uploader.small_without_quality_retina.current_path).first.quality.should == 40 }
+    ##
+    # Setup Anonymous uploader with a resize processor
+    #
+    before(:each) do
+      AnonymousUploader.class_eval do
+        version :small do
+          process :resize_to_fill => [30, 40]
+        end
+      end
+      upload!
+    end
 
-  end
+    it 'should double the height and width of an image' do
+      @uploader.small.should have_dimensions(60, 80)
+    end
 
-  context 'without dimensions processor' do
+    it 'should store original width and height attributes for version' do
+      @uploader.model.retina_dimensions[:avatar][:small].should == { :width => 30, :height => 40 }
+    end
 
-    its(:versions) { should_not include :small_without_dimensions_retina }
+    it "should set quality to it's default 60%" do
+      quality = Magick::Image.read(@uploader.small.current_path).first.quality
+      quality.should == 60
+    end
 
   end
 
-  context 'with multiple processors' do
-
-    its(:versions) { should include :small_multiple_processors_retina }
+  context 'override quality' do
 
-    it { subject.versions[:small_multiple_processors][:uploader].processors.should include([:desaturate, [], nil]) }
-
-    it { @uploader.small_multiple_processors.should have_dimensions(30, 30) }
-    it { @uploader.small_multiple_processors_retina.should have_dimensions(60, 60) }
-
-    it { File.basename(@uploader.small_multiple_processors.current_path, 'jpeg').should include 'small_'}
-
-    it { File.basename(@uploader.small_multiple_processors_retina.current_path, 'jpeg').should include '@2x'}
-    it { File.basename(@uploader.small_multiple_processors_retina.current_path, 'jpeg').should_not include 'retina_'}
+    ##
+    # Setup Anonymous uploader with a resize processor and override quality
+    #
+    before(:each) do
+      AnonymousUploader.class_eval do
+        version :small do
+          process :resize_to_fill => [30, 40]
+          process :retina_quality => 80
+        end
+      end
+    end
 
-  end
+    it "should override quality" do
+      upload!
+      quality = Magick::Image.read(@uploader.small.current_path).first.quality
+      quality.should == 80
+    end
 
-  context 'without processor' do
+    it 'should receive quality processor once' do
+      AnonymousUploader.any_instance.should_receive(:retina_quality).once
 
-    its(:versions) { should include :small_without_processor }
-    its(:versions) { should_not include :small_without_processor_retina }
+      upload!
+    end
 
   end
 
-  context 'with failing conditional version' do
+  context 'multiple processors' do
 
-    it { @uploader.version_exists?(:small_with_failing_conditional).should == false }
-    it { @uploader.small_with_failing_conditional.current_path.should_not be_present }
+    ##
+    # Setup Anonymous uploader with a custom processor
+    #
+    before(:each) do
+      AnonymousUploader.class_eval do
+        version :small do
+          process :resize_to_fill => [30, 40]
+          process :desaturate
+        end
 
-  end
+        def desaturate
+          manipulate! do |img|
+            img = img.quantize 256, Magick::GRAYColorspace
+          end
+        end
+      end
 
-  context 'file with multiple dots' do
+      upload!
+    end
 
-    before do
-      AnonymousUploader.enable_processing = true
-      @uploader = AnonymousUploader.new(CarrierWaveUpload.new, :avatar)
-      @uploader.store!(File.open("#{fixture_path}/images/avatar.with.dots.jpeg"))
+    it 'should double the height and width of an image' do
+      @uploader.small.should have_dimensions(60, 80)
     end
 
-    it { File.basename(@uploader.small.current_path, 'jpeg').should == 'small_avatar.with.dots.' }
-    it { File.basename(@uploader.small_retina.current_path, 'jpeg').should == 'small_avatar.with.dots@2x.' }
+    it 'should store original width and height attributes for version' do
+      @uploader.model.retina_dimensions[:avatar][:small].should == { :width => 30, :height => 40 }
+    end
 
   end
 
-  context 'without retina' do
+  context 'with custom resize processor' do
 
-    its(:versions) { should_not include :small_without_retina_retina }
+    ##
+    # Setup Anonymous uploader with a custom resize processor
+    #
+    before(:each) do
+      AnonymousUploader.class_eval do
+        version :small, :retina => false do
+          process :custom_resize => [200, 200]
+          process :store_retina_dimensions
+        end
 
-  end
+        def custom_resize(width, height)
+          manipulate! do |img|
+            img.resize_to_fill!(width, height)
+          end
+        end
+      end
 
-  context 'custom processor' do
-
-    its(:versions) { should_not include :small_custom_processor_retina_retina }
+      upload!
+    end
 
-    it { File.basename(@uploader.small_custom_processor.current_path, 'jpeg').should include 'small_custom_processor_'}
+    it 'should double the height and width of an image' do
+      @uploader.small.should have_dimensions(200, 200)
+    end
 
-    it { File.basename(@uploader.small_custom_processor_retina.current_path, 'jpeg').should include '@2x'}
-    it { File.basename(@uploader.small_custom_processor_retina.current_path, 'jpeg').should_not include 'retina_'}
+    it 'should store original width and height attributes for version' do
+      @uploader.model.retina_dimensions[:avatar][:small].should == { :width => 100, :height => 100 }
+    end
 
   end
 
-  context 'file without extension name' do
+  context 'with failing conditional version' do
 
-    before do
-      AnonymousUploader.enable_processing = true
-      @uploader = AnonymousUploader.new(CarrierWaveUpload.new, :avatar)
-      stream = FileStringIO.new('avatar', File.read("#{fixture_path}/images/avatar.jpeg"))
-      @uploader.store!(stream)
+    ##
+    # Setup Anonymous uploader with a failing condition
+    #
+    before(:each) do
+      AnonymousUploader.class_eval do
+        version :small_conditional, :if => ->(img, opts) { false } do
+          process :resize_to_fill => [30, 30]
+        end
+      end
+
+      upload!
     end
 
-    it { File.basename(@uploader.small.current_path, 'jpeg').should include 'small_'}
-    it { File.basename(@uploader.small_retina.current_path, 'jpeg').should include '@2x'}
-    it { File.basename(@uploader.small_retina.current_path, 'jpeg').should_not include 'retina_'}
+    it 'should not create a version' do
+      @uploader.version_exists?(:small_conditional).should be_false
+      @uploader.small_conditional.current_path.should_not be_present
+    end
 
   end