retina_rails 1.0.4 → 2.0.0

data/spec/strategies/paperclip_spec.rb

@@ -1,138 +1,111 @@
 require 'spec_helper'
 
-ROOT = File.dirname(__FILE__)
-
-Paperclip::Attachment.default_options[:use_timestamp] = false
-
-class PaperclipUpload < ActiveRecord::Base
-
-  retina!
-
-  has_attached_file :avatar,
-    :styles => {
-       :original => ["800x800", :jpg],
-       :big => ["125x125#", :jpg]
-     },
-     :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]
-     },
-     :retina => true,
-     :path => "#{ROOT}/:class/:id/:basename_:style.:extension",
-     :url => "#{ROOT}/:class/:id/:basename_:style.:extension"
-
-  has_attached_file :avatar_string_styles,
-    :styles => {
-        :original => "800x800",
-        :big => "125x125#"
-    },
-    :retina => true,
-    :path => "#{ROOT}/:class/:id/:basename_:style.:extension",
-    :url => "#{ROOT}/:class/:id/:basename_:style.:extension"
-end
-
 describe RetinaRails::Strategies::Paperclip do
 
-  subject { PaperclipUpload }
-
-  context 'overriding options' 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 == "#{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("#{fixture_path}/images/avatar.jpeg")) }
-
-    it { subject.avatar.url(:big).should == "#{ROOT}/paperclip_uploads/#{subject.id}/avatar_big.jpg" }
-    it { subject.avatar.url(:big_retina).should == "#{ROOT}/paperclip_uploads/#{subject.id}/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' }
-
+  ##
+  # Store image so we can run tests against it
+  #
+  def upload!
+    @upload = PaperclipUpload.new(:avatar => File.open("#{fixture_path}/images/avatar.jpeg"))
+    @upload.save
   end
 
-  context 'uploads with string styles' do
-
-    subject { PaperclipUpload.create(:avatar_string_styles => File.open("#{fixture_path}/images/avatar.jpeg")) }
-
-    it { subject.avatar_string_styles.url(:big).should == "#{ROOT}/paperclip_uploads/#{subject.id}/avatar_big.jpeg" }
-    it { subject.avatar_string_styles.url(:big_retina).should == "#{ROOT}/paperclip_uploads/#{subject.id}/avatar_big@2x.jpeg" }
-
-    it { Paperclip::Geometry.from_file(subject.avatar_string_styles.url(:big)).to_s.should == '125x125' }
-    it { Paperclip::Geometry.from_file(subject.avatar_string_styles.url(:big_retina)).to_s.should == '250x250' }
-
+  ##
+  # Return image path so we can open image
+  #
+  def image_path
+    "#{File.dirname(__FILE__).gsub('spec/strategies', 'public')}#{@upload.avatar.url(:big)}"
   end
 
-  context 'file without extension name' do
-
-    let!(:stream) { FileStringIO.new('avatar', File.read("#{fixture_path}/images/avatar.jpeg")) }
-    subject       { PaperclipUpload.create(:avatar => stream) }
-
-    it { subject.avatar.url(:big).should == "#{ROOT}/paperclip_uploads/#{subject.id}/avatar_big.jpg" }
-    it { subject.avatar.url(:big_retina).should == "#{ROOT}/paperclip_uploads/#{subject.id}/avatar_big@2x.jpg" }
-
+  ##
+  # Make sure image get's destroyed after each test
+  #
+  after(:each) do
+    @upload.destroy if @upload
   end
 
-  context 'with retina quality' do
+  context 'defaults' do
 
-    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 }
-
-  end
+    before(:each) do
+      PaperclipUpload.class_eval do
+        has_attached_file :avatar,
+          :styles => {
+             :big      => ["30x40#", :jpg],
+             :original => ["800x800", :jpg]
+           }
+      end
+      upload!
+    end
 
-  context 'without retina quality' do
+    it 'should double the height and width of an image' do
+      Paperclip::Geometry.from_file(image_path).to_s.should == '60x80'
+    end
 
-    subject { PaperclipUpload.create(:avatar_without_quality => File.open("#{fixture_path}/images/avatar.jpeg")) }
+    it 'should store original width and height attributes for version' do
+      @upload.retina_dimensions[:avatar][:big].should == { :width => 30, :height => 40 }
+    end
 
-    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 }
+    it "should set quality to it's default 60%" do
+      quality = Magick::Image.read(image_path).first.quality
+      quality.should == 60
+    end
 
   end
 
-  describe :optimize_path do
-
-    subject { RetinaRails::Strategies::Paperclip::Uploader::Extensions }
-
-    it { subject.optimize_path('/:filename').should == '/:basename:retina.:extension' }
+  context 'file without extension name' do
 
-    it { subject.optimize_path('/:basename.:extension').should == '/:basename:retina.:extension' }
+    it 'should not fail' do
+      stream  = FileStringIO.new('avatar', File.read("#{fixture_path}/images/avatar.jpeg"))
+      @upload = PaperclipUpload.create(:avatar => stream)
+    end
 
   end
 
-  describe :override_default_options do
-
-    context 'Paperclip default' do
+  context 'with string styles' do
 
-      before { RetinaRails::Strategies::Paperclip::Uploader::Extensions.override_default_options }
+    before(:each) do
+      PaperclipUpload.class_eval do
+        has_attached_file :avatar,
+          :styles => {
+             :big      => "30x40#",
+             :original => "800x800"
+           }
+      end
+      upload!
+    end
 
-      it { Paperclip::Attachment.default_options[:url].should == '/system/:class/:attachment/:id_partition/:style/:basename:retina.:extension' }
+    it 'should double the height and width of an image' do
+      Paperclip::Geometry.from_file(image_path).to_s.should == '60x80'
+    end
 
+    it 'should store original width and height attributes for version' do
+      @upload.retina_dimensions[:avatar][:big].should == { :width => 30, :height => 40 }
     end
 
-    context 'User defined paperclip default' do
+    it "should set quality to it's default 60%" do
+      quality = Magick::Image.read(image_path).first.quality
+      quality.should == 60
+    end
 
-      before do
+  end
 
-        Paperclip::Attachment.default_options[:url] = '/:class/:attachment/:id/:style/:basename.:extension'
-        RetinaRails::Strategies::Paperclip::Uploader::Extensions.override_default_options
+  context 'override quality' do
 
+    before(:each) do
+      PaperclipUpload.class_eval do
+        has_attached_file :avatar,
+          :styles => {
+             :big      => ["30x40#", :jpg],
+             :original => ["800x800", :jpg]
+           },
+           :retina => { :quality => 25 }
       end
+      upload!
+    end
 
-      it { Paperclip::Attachment.default_options[:url].should == '/:class/:attachment/:id/:style/:basename:retina.:extension' }
-
+    it "should set quality" do
+      quality = Magick::Image.read(image_path).first.quality
+      quality.should == 25
     end
 
   end

data/spec/support/carrierwave.rb

@@ -0,0 +1,15 @@
+class AnonymousUploader < CarrierWave::Uploader::Base
+
+  include CarrierWave::RMagick
+
+  retina!
+
+end
+
+class CarrierWaveUpload < ActiveRecord::Base
+
+  extend CarrierWave::Mount
+
+  mount_uploader :avatar, AnonymousUploader
+
+end

data/spec/support/file_string_io.rb

@@ -1,4 +1,5 @@
 class FileStringIO < StringIO
+
   attr_accessor :filepath
 
   def initialize(*args)
@@ -9,4 +10,5 @@ class FileStringIO < StringIO
   def original_filename
     File.basename(@filepath)
   end
+
 end

data/spec/support/paperclip.rb

@@ -0,0 +1,9 @@
+class PaperclipUpload < ActiveRecord::Base
+
+  retina!
+
+  has_attached_file :avatar
+
+  validates_attachment :avatar, :presence => true, :content_type => { :content_type => ["image/jpg", "image/jpeg", "image/png"] }
+
+end

data/spec/support/rails.rb

@@ -6,17 +6,6 @@ module RetinaRailsTest
   class Application < Rails::Application
     config.active_support.deprecation = :log
 
-    config.assets.manifest = Rails.root.join("spec/fixtures")
-
-    ## Asset config
-
-    config.assets.version      = '1.0'
-    config.serve_static_assets = false
-    config.assets.enabled      = true
-    config.assets.compress     = true
-    config.assets.compile      = false
-    config.assets.digest       = true
-
     if Rails::VERSION::STRING >= "4.0.0"
       config.secret_token    = 'existing secret token'
       config.secret_key_base = 'new secret key base'

data/spec/support/schema.rb

@@ -3,8 +3,14 @@ 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.string :avatar_string_styles_file_name
+    t.string :avatar_content_type
+    t.text   :retina_dimensions
+    t.timestamps
+  end
+
+  create_table :carrier_wave_uploads, :force => true do |t|
+    t.string :avatar
+    t.text   :retina_dimensions
     t.timestamps
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: retina_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 2.0.0
 platform: ruby
 authors:
 - Johan van Zonneveld
@@ -9,157 +9,151 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-description: 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
+description: Retina Rails makes your application use high-resolution images by default.
+  It automatically optimizes uploaded images (CarrierWave or Paperclip) for retina
+  displays by making them twice the size and reducing the quality.
 email:
 - johan@vzonneveld.nl
 - mail@arjen.me
@@ -167,71 +161,78 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- UPGRADING
+- UPGRADING.md
 - lib/retina_rails.rb
-- lib/retina_rails/deprecation/carrierwave.rb
-- lib/retina_rails/deprecation/paperclip.rb
-- lib/retina_rails/exception.rb
+- lib/retina_rails/extensions.rb
+- lib/retina_rails/extensions/carrierwave.rb
+- lib/retina_rails/extensions/paperclip.rb
 - lib/retina_rails/helpers.rb
+- lib/retina_rails/processors.rb
+- lib/retina_rails/processors/carrierwave.rb
+- lib/retina_rails/processors/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/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/spec_helper.rb
 - spec/strategies/carrierwave_spec.rb
 - spec/strategies/paperclip_spec.rb
+- spec/support/carrierwave.rb
 - spec/support/file_string_io.rb
+- spec/support/paperclip.rb
 - spec/support/rails.rb
 - spec/support/schema.rb
-- vendor/assets/javascripts/retina.js
 homepage: https://github.com/jhnvz/retina_rails.git
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: |
+  ##################################################
+  #  NOTE FOR UPGRADING FROM PRE-2.0 VERSION       #
+  ##################################################
+
+  Retina Rails 2.0 introduces non-backward compatible changes.
+  Check https://github.com/jhnvz/retina_rails/blob/master/UPGRADING.md
+  for more details.
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Makes your life easier optimizing for retina displays
+summary: Makes your life easier optimizing your application for retina displays
 test_files:
-- 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/spec_helper.rb
 - spec/strategies/carrierwave_spec.rb
 - spec/strategies/paperclip_spec.rb
+- spec/support/carrierwave.rb
 - spec/support/file_string_io.rb
+- spec/support/paperclip.rb
 - spec/support/rails.rb
 - spec/support/schema.rb