retina_rails 0.0.6 → 0.1.0

data/README.md

@@ -28,12 +28,14 @@ class ExampleUploader < CarrierWave::Uploader::Base
 
   version :small do
     process :resize_to_fill => [30, 30]
+    process :retina_quality => 25
   end
 
   include RetinaRails::CarrierWave
 
 end
 ```
+By default it sets the retina image quality to 40 which can be overriden with `process :retina_quality => 25`
 
 Paperclip
 ------------
@@ -47,12 +49,14 @@ class ExampleUploader < ActiveRecord::Base
     :styles => {
        :original => ["800x800", :jpg],
        :big => ["125x125#", :jpg]
-     }
+     },
+     :retina_quality => 25
 
   include RetinaRails::Paperclip
 
 end
 ```
+By default it sets the retina image quality to 40 which can be overriden by adding a `retina_quality` option
 
 For retina images use
 ------------

data/lib/retina_rails/carrierwave.rb

@@ -33,13 +33,21 @@ module RetinaRails
           version "#{v[0]}_retina" do
             process dimensions_processor[0] => options
 
+            quality_processor = nil
+
             ## Set other processors
             processors.each do |processor|
               process processor[0] => processor[1]
+
+              quality_processor = true if processor[0] == :retina_quality
             end
+
+            ## Set default quality if retina_quality is not defined
+            process :retina_quality => 40 if quality_processor.nil?
           end
 
         end
+
       end
 
     end
@@ -51,6 +59,17 @@ module RetinaRails
       end
     end
 
+    ## Set retina image quality
+    def retina_quality(percentage)
+      if version_name.to_s.include?('retina')
+        manipulate! do |img|
+          img.write(current_path) { self.quality = percentage } unless img.quality == percentage
+          img = yield(img) if block_given?
+          img
+        end
+      end
+    end
+
   end
 
 end

data/lib/retina_rails/paperclip.rb

@@ -15,9 +15,14 @@ module RetinaRails
         ## Check for style definitions
         styles = attachment_definitions[key][:styles]
 
+        ## Get retina quality
+        retina_quality = attachment_definitions[key][:retina_quality] || 40
+
         if styles
 
           retina_styles = {}
+          retina_convert_options = {}
+          convert_options = attachment_definitions[key][:convert_options]
 
           ## Iterate over styles and set optimzed dimensions
           styles.each_pair do |key, value|
@@ -31,11 +36,20 @@ module RetinaRails
 
             retina_styles["#{key}_retina".to_sym] = ["#{width}x#{height}#{processor}", value[1]]
 
+            ## Set quality convert option
+            convert_option = convert_options[key] if convert_options
+            convert_option = convert_option ? "#{convert_option} -quality #{retina_quality}" : "-quality #{retina_quality}"
+            retina_convert_options["#{key}_retina".to_sym] = convert_option
+
           end
 
           ## Append new retina optimzed styles
           value[:styles].merge!(retina_styles)
 
+          ## Set quality convert options
+          value[:convert_options] = {} if value[:convert_options].nil?
+          value[:convert_options].merge!(retina_convert_options)
+
           ## Make path work with retina optimization
           original_path = attachment_definitions[key][:path]
           value[:path] = RetinaRails::Extensions.optimize_path(original_path) if original_path

data/lib/retina_rails/version.rb

@@ -1,3 +1,3 @@
 module RetinaRails
-  VERSION = "0.0.6"
+  VERSION = "0.1.0"
 end

data/spec/carrierwave_spec.rb

@@ -6,6 +6,12 @@ class AnonymousUploader < CarrierWave::Uploader::Base
 
   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
@@ -23,6 +29,14 @@ class AnonymousUploader < CarrierWave::Uploader::Base
     end
   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
 
   include RetinaRails::CarrierWave
@@ -75,6 +89,22 @@ describe RetinaRails::CarrierWave do
 
   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 }
+
+  end
+
   context 'without dimensions processor' do
 
     its(:versions) { should_not include :small_without_dimensions_retina }

data/spec/paperclip_spec.rb

@@ -1,5 +1,7 @@
 require 'spec_helper'
 
+ROOT = File.dirname(__FILE__)
+
 class PaperclipUpload < ActiveRecord::Base
 
   has_attached_file :avatar,
@@ -7,8 +9,17 @@ class PaperclipUpload < ActiveRecord::Base
        :original => ["800x800", :jpg],
        :big => ["125x125#", :jpg]
      },
-     :path => "#{File.dirname(__FILE__)}/:class/:id/:basename_:style.:extension",
-     :url => "#{File.dirname(__FILE__)}/:class/:id/:basename_:style.:extension"
+     :retina_quality => 60,
+     :path => "#{ROOT}/:class/:id/:basename_:style.:extension",
+     :url => "#{ROOT}/:class/:id/:basename_:style.:extension"
+
+  has_attached_file :avatar_without_quality,
+    :styles => {
+       :original => ["800x800", :jpg],
+       :big => ["125x125#", :jpg]
+     },
+     :path => "#{ROOT}/:class/:id/:basename_:style.:extension",
+     :url => "#{ROOT}/:class/:id/:basename_:style.:extension"
 
   include RetinaRails::Paperclip
 
@@ -23,21 +34,39 @@ describe RetinaRails::Paperclip do
     it { subject.attachment_definitions[:avatar][:styles][:original_retina].should == ['1600x1600', :jpg] }
     it { subject.attachment_definitions[:avatar][:styles][:big_retina].should == ['250x250#', :jpg] }
 
-    it { subject.attachment_definitions[:avatar][:path].should == "#{File.dirname(__FILE__)}/:class/:id/:basename_:style:retina.:extension" }
-    it { subject.attachment_definitions[:avatar][:url].should == "#{File.dirname(__FILE__)}/:class/:id/:basename_:style:retina.:extension" }
+    it { subject.attachment_definitions[:avatar][:path].should == "#{ROOT}/:class/:id/:basename_:style:retina.:extension" }
+    it { subject.attachment_definitions[:avatar][:url].should == "#{ROOT}/:class/:id/:basename_:style:retina.:extension" }
 
   end
 
   context 'uploads' do
 
-    subject { PaperclipUpload.create(:avatar => File.open("#{File.dirname(__FILE__)}/fixtures/images/avatar.jpeg")) }
+    subject { PaperclipUpload.create(:avatar => File.open("#{ROOT}/fixtures/images/avatar.jpeg")) }
 
-    it { subject.avatar.url(:big).should == "#{File.dirname(__FILE__)}/paperclip_uploads/1/avatar_big.jpg" }
-    it { subject.avatar.url(:big_retina).should == "#{File.dirname(__FILE__)}/paperclip_uploads/2/avatar_big@2x.jpg" }
+    it { subject.avatar.url(:big).should == "#{ROOT}/paperclip_uploads/1/avatar_big.jpg" }
+    it { subject.avatar.url(:big_retina).should == "#{ROOT}/paperclip_uploads/2/avatar_big@2x.jpg" }
 
     it { Paperclip::Geometry.from_file(subject.avatar.url(:big)).to_s.should == '125x125' }
     it { Paperclip::Geometry.from_file(subject.avatar.url(:big_retina)).to_s.should == '250x250' }
 
   end
 
+  context 'with retina quality' do
+
+    subject { PaperclipUpload.create(:avatar => File.open("#{ROOT}/fixtures/images/avatar.jpeg")) }
+
+    it { Magick::Image.read(subject.avatar.url(:big)).first.quality.should == 84 }
+    it { Magick::Image.read(subject.avatar.url(:big_retina)).first.quality.should == 60 }
+
+  end
+
+  context 'without retina quality' do
+
+    subject { PaperclipUpload.create(:avatar_without_quality => File.open("#{ROOT}/fixtures/images/avatar.jpeg")) }
+
+    it { Magick::Image.read(subject.avatar_without_quality.url(:big)).first.quality.should == 84 }
+    it { Magick::Image.read(subject.avatar_without_quality.url(:big_retina)).first.quality.should == 40 }
+
+  end
+
 end

data/spec/support/schema.rb

@@ -3,6 +3,7 @@ ActiveRecord::Schema.define do
 
   create_table :paperclip_uploads, :force => true do |t|
     t.string :avatar_file_name
+    t.string :avatar_without_quality_file_name
     t.timestamps
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: retina_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler