retina_rails 0.1.3 → 1.0.0.beta1

data/.gitignore

@@ -14,6 +14,7 @@ pkg
 rdoc
 spec/reports
 spec/paperclip_uploads
+spec/retina_rails/strategies/paperclip_uploads
 test/tmp
 test/version_tmp
 tmp

data/README.md

@@ -2,7 +2,7 @@
 
 [![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.
+Makes your life easier optimizing an application for retina displays.
 
 How it works
 ------------
@@ -21,42 +21,70 @@ Installation
 CarrierWave
 ------------
 
-Add `include RetinaRails::CarrierWave` to the bottom of your uploader
+Simply add `retina!` to your uploader.
 
 ```ruby
 class ExampleUploader < CarrierWave::Uploader::Base
 
+  retina!
+
   version :small do
     process :resize_to_fill => [30, 30]
     process :retina_quality => 25
   end
 
-  include RetinaRails::CarrierWave
+  version :large, :retina => false do
+    process :resize_to_fill => [1000, 1000]
+  end
 
 end
 ```
-By default it sets the retina image quality to 40 which can be overriden with `process :retina_quality => 25`
+By default it sets the retina image quality to 40 which can be overriden with `process :retina_quality => 25`. To disable the creation of a retina version simply call `version :small, :retina => false`.
+
+### Custom processors
+
+You can also use your custom processors like so:
+
+```ruby
+class ExampleUploader < CarrierWave::Uploader::Base
+
+  retina!
+
+  version :small, :retina => false do
+    process :resize_to_fill_with_gravity => [100, 100, 'North', :jpg, 75]
+  end
+
+  version :small_retina, :retina => false do
+    process :resize_to_fill_with_gravity => [200, 200, 'North', :jpg, 40]
+  end
+
+end
+```
+
+This will generate `small.jpg` and `small@2x.jpg`.
+
 
 Paperclip
 ------------
 
-Add `include RetinaRails::Paperclip` to the bottom of your class
+Simply add `retina!` to your model and set `:retina` to true.
 
 ```ruby
 class ExampleUploader < ActiveRecord::Base
 
+  retina!
+
   has_attached_file :image,
     :styles => {
        :original => ["800x800", :jpg],
        :big => ["125x125#", :jpg]
      },
-     :retina_quality => 25
-
-  include RetinaRails::Paperclip
+     :retina => true
+     # :retina => { :quality => 25 }
 
 end
 ```
-By default it sets the retina image quality to 40 which can be overriden by adding a `retina_quality` option
+By default it sets the retina image quality to 40 which can be overriden by adding a `quality` option.
 
 For retina images use
 ------------

data/lib/retina_rails.rb

@@ -1,8 +1,10 @@
-require "retina_rails/version"
-require 'retina_rails/extensions'
-require "retina_rails/paperclip"
-require "retina_rails/carrierwave"
-require "retina_rails/helpers"
+require 'retina_rails/version'
+require 'retina_rails/strategies'
+require 'retina_rails/helpers'
+require 'retina_rails/exception'
+
+require 'retina_rails/deprecation/carrierwave'
+require 'retina_rails/deprecation/paperclip'
 
 module RetinaRails
 

data/lib/retina_rails/deprecation/carrierwave.rb

@@ -0,0 +1,23 @@
+module RetinaRails
+
+  module CarrierWave
+
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+
+      def raise_depraction_error!
+        raise RetinaRails::DeprecationError.new("As of version 1.0.0.beta1 activating RetinaRails by including `RetinaRails::Carrierwave` is depracted. Add `retina!` to your uploader instead.")
+      end
+
+    end
+
+    included do
+
+      raise_depraction_error!
+
+    end
+
+  end
+
+end

data/lib/retina_rails/deprecation/paperclip.rb

@@ -0,0 +1,23 @@
+module RetinaRails
+
+  module Paperclip
+
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+
+      def raise_depraction_error!
+        raise RetinaRails::DeprecationError.new("As of version 1.0.0.beta1 activating RetinaRails by including `RetinaRails::Paperclip` is depracted. Add `retina!` to your model instead.")
+      end
+
+    end
+
+    included do
+
+      raise_depraction_error!
+
+    end
+
+  end
+
+end

data/lib/retina_rails/exception.rb

@@ -0,0 +1,15 @@
+module RetinaRails
+
+  class Exception < StandardError
+
+    attr_accessor :message
+
+    def initialize(message = nil)
+      self.message = message
+    end
+
+  end
+
+  class DeprecationError < Exception; end
+
+end

data/lib/retina_rails/strategies.rb

@@ -0,0 +1,19 @@
+require 'retina_rails/strategies/carrierwave'
+require 'retina_rails/strategies/paperclip'
+
+module RetinaRails
+  module Strategies
+
+    def self.include_strategies
+      if defined?(::CarrierWave)
+        ::CarrierWave::Uploader::Base.send(:include, RetinaRails::Strategies::CarrierWave::Base)
+      end
+      if defined?(::Paperclip)
+        ::ActiveRecord::Base.send(:include, RetinaRails::Strategies::Paperclip::Base)
+      end
+    end
+
+  end
+end
+
+RetinaRails::Strategies.include_strategies

data/lib/retina_rails/strategies/carrierwave.rb

@@ -0,0 +1,101 @@
+module RetinaRails
+  module Strategies
+    module CarrierWave
+      module Base
+
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+
+          def retina!
+            include Uploader
+          end
+
+        end
+
+      end
+
+      module Uploader
+
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+
+          def version(name, options={}, &block)
+            super
+
+            retina_version name unless options[:retina] == false
+          end
+
+          # Define a retina version
+          # This method will simply copy all settings and add a larger (retina) version
+          def retina_version(name)
+            config = versions[name]
+
+            processors = config[:uploader].processors.dup
+            dimensions_processor = nil
+
+            ## Check if there's a resize processor to get the dimensions
+            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 dimensions_processor
+
+              options = dimensions_processor[1].dup
+
+              width  = options[0] * 2
+              height = options[1] * 2
+
+              2.times { options.delete_at(0) }
+
+              options.insert(0, height)
+              options.insert(0, width)
+
+              version "#{name}_retina", :retina => false 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
+
+        ## Set the correct filename for storage according to the convention (append @2x to filename)
+        def full_filename(for_file)
+          super.tap do |file_name|
+            file_name.sub!(/(.*)\./, '\1@2x.').gsub!('retina_', '') if version_name.to_s.include?('retina')
+          end
+        end
+
+        ## Set retina image quality
+        def retina_quality(percentage)
+          if version_name.to_s.include?('retina')
+            manipulate! do |img|
+              if defined?(Magick)
+                img.write(current_path) { self.quality = percentage } unless img.quality == percentage
+              elsif defined?(MiniMagick)
+                img.quality(percentage.to_s)
+              end
+              img = yield(img) if block_given?
+              img
+            end
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/retina_rails/strategies/paperclip.rb

@@ -0,0 +1,129 @@
+module RetinaRails
+  module Strategies
+    module Paperclip
+
+      module Base
+
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+
+          def retina!
+            include Uploader
+          end
+
+        end
+
+      end
+
+      module Uploader
+
+        extend ActiveSupport::Concern
+
+        included do
+
+          ## Override paperclip default options
+          Extensions.override_default_options
+
+        end
+
+        module ClassMethods
+
+          def has_attached_file(name, options={})
+            super
+
+            has_attached_retina_file name if options[:retina]
+          end
+
+          def has_attached_retina_file(name)
+            attachment = attachment_definitions[name]
+
+            ## Check for style definitions
+            styles = attachment[:styles]
+
+            retina_options = if attachment[:retina].is_a?(Hash)
+              attachment[:retina]
+            else
+              { :quality => 40 }
+            end
+
+            ## Get retina quality
+            retina_quality = retina_options[:quality] || 40
+
+            if styles
+
+              retina_styles = {}
+              retina_convert_options = {}
+              convert_options = attachment[:convert_options]
+
+              ## Iterate over styles and set optimzed dimensions
+              styles.each_pair do |key, value|
+
+                dimensions = value[0]
+
+                width  = dimensions.scan(/\d+/)[0].to_i * 2
+                height = dimensions.scan(/\d+/)[1].to_i * 2
+
+                processor = dimensions.scan(/#|</).first
+
+                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
+              attachment[:styles].merge!(retina_styles)
+
+              ## Set quality convert options
+              attachment[:convert_options] = {} if attachment[:convert_options].nil?
+              attachment[:convert_options].merge!(retina_convert_options)
+
+              ## Make path work with retina optimization
+              original_path = attachment[:path]
+              attachment[:path] = Extensions.optimize_path(original_path) if original_path
+
+              ## Make url work with retina optimization
+              original_url = attachment[:url]
+              attachment[:url] = Extensions.optimize_path(original_url) if original_url
+
+            end
+          end
+
+        end
+
+        module Extensions
+
+          ## Insert :retina interpolation in url or path
+          def self.optimize_path(path)
+            path.scan(':retina').empty? ? path.gsub(':filename', ':basename.:extension').split('.').insert(-2, ':retina.').join : path
+          end
+
+          def self.override_default_options
+
+            ## Remove _retina from style so it doesn't end up in filename
+            ::Paperclip.interpolates :style do |attachment, style|
+              style.to_s.end_with?('_retina') ? style.to_s[0..-8] : style
+            end
+
+            ## Replace :retina with @2x if style ends with _retina
+            ::Paperclip.interpolates :retina do |attachment, style|
+              style.to_s.end_with?('_retina') ? '@2x' : ''
+            end
+
+            ## Make default url compatible with retina optimzer
+            url = ::Paperclip::Attachment.default_options[:url]
+            ::Paperclip::Attachment.default_options[:url] = optimize_path(url)
+
+          end
+
+        end
+
+      end
+
+    end
+  end
+end

data/lib/retina_rails/version.rb

@@ -1,3 +1,3 @@
 module RetinaRails
-  VERSION = "0.1.3"
+  VERSION = "1.0.0.beta1"
 end

data/spec/deprecation/carrierwave_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe RetinaRails::CarrierWave do
+
+  it 'should raise a deprection error when included the old way' do
+    expect do
+      class DeprecatedUploader < CarrierWave::Uploader::Base
+        include RetinaRails::CarrierWave
+      end
+    end.to raise_error(RetinaRails::DeprecationError)
+  end
+
+end

data/spec/deprecation/paperclip_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe RetinaRails::Paperclip do
+
+  it 'should raise a deprection error when included the old way' do
+    expect do
+      class PaperclipUpload < ActiveRecord::Base
+        include RetinaRails::Paperclip
+      end
+    end.to raise_error(RetinaRails::DeprecationError)
+  end
+
+end
+

data/spec/spec_helper.rb

@@ -35,4 +35,8 @@ require 'rspec/rails'
 
 ## Load retina_rails
 
-require 'retina_rails'
+require 'retina_rails'
+
+RSpec.configure do |config|
+  config.fixture_path = "#{File.dirname(__FILE__)}/fixtures"
+end

data/spec/{carrierwave_spec.rb → strategies/carrierwave_spec.rb}

@@ -4,6 +4,8 @@ class AnonymousUploader < CarrierWave::Uploader::Base
 
   include CarrierWave::RMagick
 
+  retina!
+
   version :small do
     process :resize_to_fill => [30, 30]
     process :quality => 60
@@ -23,12 +25,26 @@ class AnonymousUploader < CarrierWave::Uploader::Base
     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
+
   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
@@ -39,8 +55,6 @@ class AnonymousUploader < CarrierWave::Uploader::Base
 
   version :small_without_processor
 
-  include RetinaRails::CarrierWave
-
 end
 
 class CarrierWaveUpload
@@ -58,7 +72,7 @@ class CarrierWaveUpload
 
 end
 
-describe RetinaRails::CarrierWave do
+describe RetinaRails::Strategies::CarrierWave do
 
   include CarrierWave::Test::Matchers
 
@@ -67,7 +81,7 @@ describe RetinaRails::CarrierWave do
   before do
     AnonymousUploader.enable_processing = true
     @uploader = AnonymousUploader.new(CarrierWaveUpload.new, :avatar)
-    @uploader.store!(File.open("#{File.dirname(__FILE__)}/fixtures/images/avatar.jpeg"))
+    @uploader.store!(File.open("#{fixture_path}/images/avatar.jpeg"))
   end
 
   after do
@@ -139,7 +153,7 @@ describe RetinaRails::CarrierWave do
     before do
       AnonymousUploader.enable_processing = true
       @uploader = AnonymousUploader.new(CarrierWaveUpload.new, :avatar)
-      @uploader.store!(File.open("#{File.dirname(__FILE__)}/fixtures/images/avatar.with.dots.jpeg"))
+      @uploader.store!(File.open("#{fixture_path}/images/avatar.with.dots.jpeg"))
     end
 
     it { File.basename(@uploader.small.current_path, 'jpeg').should == 'small_avatar.with.dots.' }
@@ -147,4 +161,21 @@ describe RetinaRails::CarrierWave do
 
   end
 
-end
+  context 'without retina' do
+
+    its(:versions) { should_not include :small_without_retina_retina }
+
+  end
+
+  context 'custom processor' do
+
+    its(:versions) { should_not include :small_custom_processor_retina_retina }
+
+    it { File.basename(@uploader.small_custom_processor.current_path, 'jpeg').should include 'small_custom_processor_'}
+
+    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_'}
+
+  end
+
+end

data/spec/{paperclip_spec.rb → strategies/paperclip_spec.rb}

@@ -4,12 +4,14 @@ ROOT = File.dirname(__FILE__)
 
 class PaperclipUpload < ActiveRecord::Base
 
+  retina!
+
   has_attached_file :avatar,
     :styles => {
        :original => ["800x800", :jpg],
        :big => ["125x125#", :jpg]
      },
-     :retina_quality => 60,
+     :retina => { :quality => 60 },
      :path => "#{ROOT}/:class/:id/:basename_:style.:extension",
      :url => "#{ROOT}/:class/:id/:basename_:style.:extension"
 
@@ -18,14 +20,13 @@ class PaperclipUpload < ActiveRecord::Base
        :original => ["800x800", :jpg],
        :big => ["125x125#", :jpg]
      },
+     :retina => true,
      :path => "#{ROOT}/:class/:id/:basename_:style.:extension",
      :url => "#{ROOT}/:class/:id/:basename_:style.:extension"
 
-  include RetinaRails::Paperclip
-
 end
 
-describe RetinaRails::Paperclip do
+describe RetinaRails::Strategies::Paperclip do
 
   subject { PaperclipUpload }
 
@@ -41,7 +42,7 @@ describe RetinaRails::Paperclip do
 
   context 'uploads' do
 
-    subject { PaperclipUpload.create(:avatar => File.open("#{ROOT}/fixtures/images/avatar.jpeg")) }
+    subject { PaperclipUpload.create(:avatar => File.open("#{fixture_path}/images/avatar.jpeg")) }
 
     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" }
@@ -53,7 +54,7 @@ describe RetinaRails::Paperclip do
 
   context 'with retina quality' do
 
-    subject { PaperclipUpload.create(:avatar => File.open("#{ROOT}/fixtures/images/avatar.jpeg")) }
+    subject { PaperclipUpload.create(:avatar => File.open("#{fixture_path}/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 }
@@ -62,11 +63,46 @@ describe RetinaRails::Paperclip do
 
   context 'without retina quality' do
 
-    subject { PaperclipUpload.create(:avatar_without_quality => File.open("#{ROOT}/fixtures/images/avatar.jpeg")) }
+    subject { PaperclipUpload.create(:avatar_without_quality => File.open("#{fixture_path}/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
+  describe :optimze_path do
+
+    subject { RetinaRails::Strategies::Paperclip::Uploader::Extensions }
+
+    it { subject.optimize_path('/:filename').should == '/:basename:retina.:extension' }
+
+    it { subject.optimize_path('/:basename.:extension').should == '/:basename:retina.:extension' }
+
+  end
+
+  describe :override_default_options do
+
+    context 'Paperclip default' do
+
+      before { RetinaRails::Strategies::Paperclip::Uploader::Extensions.override_default_options }
+
+      it { Paperclip::Attachment.default_options[:url].should == '/system/:class/:attachment/:id_partition/:style/:basename:retina.:extension' }
+
+    end
+
+    context 'User defined paperclip default' do
+
+      before do
+
+        Paperclip::Attachment.default_options[:url] = '/:class/:attachment/:id/:style/:basename.:extension'
+        RetinaRails::Strategies::Paperclip::Uploader::Extensions.override_default_options
+
+      end
+
+      it { Paperclip::Attachment.default_options[:url].should == '/:class/:attachment/:id/:style/:basename:retina.:extension' }
+
+    end
+
+  end
+
+end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: retina_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.3
-  prerelease: 
+  version: 1.0.0.beta1
+  prerelease: 6
 platform: ruby
 authors:
 - Johan van Zonneveld
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-10 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -189,21 +189,25 @@ files:
 - README.md
 - Rakefile
 - lib/retina_rails.rb
-- lib/retina_rails/carrierwave.rb
-- lib/retina_rails/extensions.rb
+- lib/retina_rails/deprecation/carrierwave.rb
+- lib/retina_rails/deprecation/paperclip.rb
+- lib/retina_rails/exception.rb
 - lib/retina_rails/helpers.rb
-- lib/retina_rails/paperclip.rb
+- lib/retina_rails/strategies.rb
+- lib/retina_rails/strategies/carrierwave.rb
+- lib/retina_rails/strategies/paperclip.rb
 - lib/retina_rails/version.rb
 - retina_rails.gemspec
-- spec/carrierwave_spec.rb
-- spec/extensions_spec.rb
+- spec/deprecation/carrierwave_spec.rb
+- spec/deprecation/paperclip_spec.rb
 - spec/fixtures/db/retina_rails.sqlite3
 - spec/fixtures/images/avatar.jpeg
 - spec/fixtures/images/avatar.with.dots.jpeg
 - spec/fixtures/manifest.yml
 - spec/helpers_spec.rb
-- spec/paperclip_spec.rb
 - spec/spec_helper.rb
+- spec/strategies/carrierwave_spec.rb
+- spec/strategies/paperclip_spec.rb
 - spec/support/rails.rb
 - spec/support/schema.rb
 - vendor/assets/javascripts/retina.js
@@ -222,9 +226,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -232,14 +236,15 @@ signing_key:
 specification_version: 3
 summary: Makes your live easier optimizing for retina displays
 test_files:
-- spec/carrierwave_spec.rb
-- spec/extensions_spec.rb
+- spec/deprecation/carrierwave_spec.rb
+- spec/deprecation/paperclip_spec.rb
 - spec/fixtures/db/retina_rails.sqlite3
 - spec/fixtures/images/avatar.jpeg
 - spec/fixtures/images/avatar.with.dots.jpeg
 - spec/fixtures/manifest.yml
 - spec/helpers_spec.rb
-- spec/paperclip_spec.rb
 - spec/spec_helper.rb
+- spec/strategies/carrierwave_spec.rb
+- spec/strategies/paperclip_spec.rb
 - spec/support/rails.rb
 - spec/support/schema.rb

data/lib/retina_rails/carrierwave.rb

@@ -1,79 +0,0 @@
-module RetinaRails
-
-  module CarrierWave
-
-    extend ActiveSupport::Concern
-
-    included do
-
-      ## Define retina version based on defined versions in the uploader class
-      versions.each do |v|
-
-        processors = v[1][:uploader].processors.dup
-        dimensions_processor = nil
-
-        ## Check if there's a resize processor to get the dimensions
-        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 dimensions_processor
-
-          options = dimensions_processor[1].dup
-
-          width  = options[0] * 2
-          height = options[1] * 2
-
-          2.times { options.delete_at(0) }
-
-          options.insert(0, height)
-          options.insert(0, width)
-
-          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
-
-    ## Set the correct filename for storage according to the convention (append @2x to filename)
-    def full_filename(for_file)
-      super.tap do |file_name|
-        file_name.sub!(/(.*)\./, '\1@2x.').gsub!('retina_', '') if version_name.to_s.include?('retina')
-      end
-    end
-
-    ## Set retina image quality
-    def retina_quality(percentage)
-      if version_name.to_s.include?('retina')
-        manipulate! do |img|
-          if defined?(Magick)
-            img.write(current_path) { self.quality = percentage } unless img.quality == percentage
-          elsif defined?(MiniMagick)
-            img.quality(percentage.to_s)
-          end
-          img = yield(img) if block_given?
-          img
-        end
-      end
-    end
-
-  end
-
-end

data/lib/retina_rails/extensions.rb

@@ -1,26 +0,0 @@
-module RetinaRails::Extensions
-
-  ## Insert :retina interpolation in url or path
-  def self.optimize_path(path)
-    path.scan(':retina').empty? ? path.gsub(':filename', ':basename.:extension').split('.').insert(-2, ':retina.').join : path
-  end
-
-  def self.override_default_options
-
-    ## Remove _retina from style so it doesn't end up in filename
-    Paperclip.interpolates :style do |attachment, style|
-      style.to_s.end_with?('_retina') ? style.to_s[0..-8] : style
-    end
-
-    ## Replace :retina with @2x if style ends with _retina
-    Paperclip.interpolates :retina do |attachment, style|
-      style.to_s.end_with?('_retina') ? '@2x' : ''
-    end
-
-    ## Make default url compatible with retina optimzer
-    url = Paperclip::Attachment.default_options[:url]
-    Paperclip::Attachment.default_options[:url] = optimize_path(url)
-
-  end
-
-end

data/lib/retina_rails/paperclip.rb

@@ -1,69 +0,0 @@
-module RetinaRails
-
-  module Paperclip
-
-    extend ActiveSupport::Concern
-
-    included do
-
-      ## Override paperclip default options
-      RetinaRails::Extensions.override_default_options
-
-      ## Iterate over each has_attached_file
-      attachment_definitions.each_pair do |key, value|
-
-        ## 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|
-
-            dimensions = value[0]
-
-            width  = dimensions.scan(/\d+/)[0].to_i * 2
-            height = dimensions.scan(/\d+/)[1].to_i * 2
-
-            processor = dimensions.scan(/#|</).first
-
-            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
-
-          ## Make url work with retina optimization
-          original_url = attachment_definitions[key][:url]
-          value[:url] = RetinaRails::Extensions.optimize_path(original_url) if original_url
-
-        end
-
-      end
-
-    end
-
-  end
-
-end

data/spec/extensions_spec.rb

@@ -1,38 +0,0 @@
-describe RetinaRails::Extensions do
-
-  describe :optimze_path do
-
-    subject { RetinaRails::Extensions }
-
-    it { subject.optimize_path('/:filename').should == '/:basename:retina.:extension' }
-
-    it { subject.optimize_path('/:basename.:extension').should == '/:basename:retina.:extension' }
-
-  end
-
-  describe :override_default_options do
-
-    context 'Paperclip default' do
-
-      before { RetinaRails::Extensions.override_default_options }
-
-      it { Paperclip::Attachment.default_options[:url].should == '/system/:class/:attachment/:id_partition/:style/:basename:retina.:extension' }
-
-    end
-
-    context 'User defined paperclip default' do
-
-      before do
-
-        Paperclip::Attachment.default_options[:url] = '/:class/:attachment/:id/:style/:basename.:extension'
-        RetinaRails::Extensions.override_default_options
-
-      end
-
-      it { Paperclip::Attachment.default_options[:url].should == '/:class/:attachment/:id/:style/:basename:retina.:extension' }
-
-    end
-
-  end
-
-end