retina_rails 0.0.4 → 0.0.5

data/README.md

@@ -1,4 +1,6 @@
-## Retina Rails [![Build Status](https://secure.travis-ci.org/jhnvz/retina_rails.png?branch=master)](http://travis-ci.org/jhnvz/retina_rails)
+## Retina Rails
+
+[![Gem Version](https://badge.fury.io/rb/retina_rails.png)](http://badge.fury.io/rb/retina_rails) [![Build Status](https://secure.travis-ci.org/jhnvz/retina_rails.png?branch=master)](http://travis-ci.org/jhnvz/retina_rails) [![Coverage Status](https://coveralls.io/repos/jhnvz/retina_rails/badge.png?branch=master)](https://coveralls.io/r/jhnvz/retina_rails) [![Code Climate](https://codeclimate.com/github/jhnvz/retina_rails.png)](https://codeclimate.com/github/jhnvz/retina_rails) [![Dependency Status](https://gemnasium.com/jhnvz/retina_rails.png)](https://gemnasium.com/jhnvz/retina_rails)
 
 Makes your live easier optimizing an application for retina displays.
 
@@ -80,4 +82,4 @@ Note on Patches/Pull Requests
 Copyright
 ------------
 
-Copyright (c) 2012 Johan van Zonneveld. See LICENSE for details.
+Copyright (c) 2012 Johan van Zonneveld. See LICENSE for details.

data/lib/retina_rails/carrierwave.rb

@@ -9,17 +9,18 @@ module RetinaRails
       ## Define retina version based on defined versions in the uploader class
       versions.each do |v|
 
-        processor = nil
+        processors = v[1][:uploader].processors.dup
+        dimensions_processor = nil
 
         ## Check if there's a resize processor to get the dimensions
-        v[1][:uploader].processors.each do |p|
-          processor = p if p[0].to_s.scan(/resize_to_fill|resize_to_limit|resize_to_fit|resize_and_pad/).any?
+        processors.each do |p|
+          dimensions_processor = processors.delete(p) if p[0].to_s.scan(/resize_to_fill|resize_to_limit|resize_to_fit|resize_and_pad/).any?
         end
 
         ## Define a retina version if processor is present
-        if processor
+        if dimensions_processor
 
-          options = processor[1].dup
+          options = dimensions_processor[1].dup
 
           width  = options[0] * 2
           height = options[1] * 2
@@ -30,7 +31,12 @@ module RetinaRails
           options.insert(0, width)
 
           version "#{v[0]}_retina" do
-            process processor[0] => options
+            process dimensions_processor[0] => options
+
+            ## Set other processors
+            processors.each do |processor|
+              process processor[0] => processor[1]
+            end
           end
 
         end

data/lib/retina_rails/version.rb

@@ -1,3 +1,3 @@
 module RetinaRails
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/retina_rails.gemspec

@@ -4,10 +4,10 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'retina_rails/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = "retina_rails"
+  gem.name          = 'retina_rails'
   gem.version       = RetinaRails::VERSION
-  gem.authors       = ["Johan van Zonneveld"]
-  gem.email         = ["johan@vzonneveld.nl"]
+  gem.authors       = ['Johan van Zonneveld']
+  gem.email         = ['johan@vzonneveld.nl']
   gem.homepage      = 'https://github.com/jhnvz/retina_rails.git'
   gem.summary       = %q{Makes your live easier optimizing for retina displays}
   gem.description   = %q{Retina Rails automatically generates retina versions of your uploaded images (CarrierWave or Paperclip). It detects if a visitor has a retina display and if so it displays the @2x version}
@@ -15,15 +15,16 @@ Gem::Specification.new do |gem|
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  gem.require_paths = ['lib']
 
-  gem.add_development_dependency "bundler", ">= 1.0.0"
-  gem.add_development_dependency "rake"
-  gem.add_development_dependency "rspec", ">= 2.3"
-  gem.add_development_dependency "rspec-rails", "~> 2.0"
+  gem.add_development_dependency 'bundler', '>= 1.0.0'
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rspec', '>= 2.3'
+  gem.add_development_dependency 'rspec-rails', '~> 2.0'
   gem.add_development_dependency 'carrierwave'
   gem.add_development_dependency 'paperclip'
-  gem.add_development_dependency "sqlite3"
+  gem.add_development_dependency 'sqlite3'
+  gem.add_development_dependency 'coveralls'
 
   gem.add_dependency 'rails', '>= 3.0'
   gem.add_dependency 'rmagick'

data/spec/carrierwave_spec.rb

@@ -8,6 +8,21 @@ class AnonymousUploader < CarrierWave::Uploader::Base
     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
+
+  def desaturate
+    manipulate! do |img|
+      img = img.quantize 256, Magick::GRAYColorspace
+    end
+  end
+
   version :small_without_processor
 
   include RetinaRails::CarrierWave
@@ -46,7 +61,7 @@ describe RetinaRails::CarrierWave do
     @uploader.remove!
   end
 
-  context 'with processor' do
+  context 'with dimensions processor' do
 
     its(:versions) { should include :small_retina }
 
@@ -60,6 +75,28 @@ describe RetinaRails::CarrierWave do
 
   end
 
+  context 'without dimensions processor' do
+
+    its(:versions) { should_not include :small_without_dimensions_retina }
+
+  end
+
+  context 'with multiple processors' do
+
+    its(:versions) { should include :small_multiple_processors_retina }
+
+    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_'}
+
+  end
+
   context 'without processor' do
 
     its(:versions) { should include :small_without_processor }

data/spec/spec_helper.rb

@@ -1,4 +1,10 @@
-require 'rubygems'
+## Test coverage
+
+require 'coveralls'
+Coveralls.wear!
+
+## Rails
+
 require 'active_support'
 require 'active_record'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: retina_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-07 00:00:00.000000000 Z
+date: 2013-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,6 +123,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement