retina_rails 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca5a50c307c9f07f0c43faf40cf993b2e11b7943
-  data.tar.gz: 8a421d0bfe4c2a56edc9bcf125995510c1888dc2
+  metadata.gz: 3c0460e350f4f6ca0e30e636d2852e48c7e427e7
+  data.tar.gz: 7b5eba9c1dd3c5004db9646bef6eab5a1bcf7936
 SHA512:
-  metadata.gz: b2fe87a9fad43534abdb6d027b25e26d26f2c72d6a423e43ad28593c28ab9f8aa78f5f8f0ee61fd5eff88f0259e29af68d38eeffbc0ce0f9cf826d1a2da28b39
-  data.tar.gz: a7cb72e4f38cf76b7090c741b04d1aeb00bd73817a5e86ad6e2c01fb1cad51f4ca5aeccdc5d90a63bc7904dd02ce243c924e40ec2e31a6a9d2b0697eedef2bf2
+  metadata.gz: 0ad3514926e9aa320311bfc25dd1d1d742f6a8d03f50593493f7aff322389f131f5ff452cf10296c7e4e69eb2a1dcf115a240ed3b81c93991e78b6257fde4bff
+  data.tar.gz: aa46aedbb24c9197645eb88886b2737d3896b356267eb0383ac602cb06b17355deaebe381c67675aec98f1ebf02c8c26e696925567113bfe1c64bae4ac34f58f

data/.travis.yml

@@ -1,20 +1,24 @@
+bundler_args: "--jobs 4 --retry 3"
+cache: bundler
 language: ruby
+sudo: false
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
-  - 2.1.1
-  - 2.1.3
+  - 2.1.7
+  - 2.2.3
   - ruby-head
 
 env:
-  - "RAILS_VERSION=3.1.0"
-  - "RAILS_VERSION=3.2.0"
-  - "RAILS_VERSION=4.0.0"
-  - "RAILS_VERSION=4.1.0"
+  - "RAILS_VERSION=3.1.12"
+  - "RAILS_VERSION=3.2.22"
+  - "RAILS_VERSION=4.0.13"
+  - "RAILS_VERSION=4.1.14"
+  - "RAILS_VERSION=4.2.5"
   - "RAILS_VERSION=master"
 
 matrix:
   allow_failures:
     - env: "RAILS_VERSION=master"
     - rvm: ruby-head
+  fast_finish: true

data/lib/retina_rails/strategies/carrierwave.rb

@@ -65,7 +65,11 @@ module RetinaRails
             config = versions[name]
             options[:retina] = false
 
-            processors = config[:uploader].processors.dup
+            processors = if config.respond_to?(:processors)
+                           config.processors.dup
+                         else
+                           config[:uploader].processors.dup
+                         end
             dimensions_processor = nil
 
             ## Check if there's a resize processor to get the dimensions
@@ -86,7 +90,11 @@ module RetinaRails
               dimensions.insert(0, width)
 
               ## Reset the processors
-              versions[name][:uploader].processors = []
+              if config.respond_to?(:processors)
+                config.processors = []
+              else
+                config[:uploader].processors = []
+              end
 
               ## Override version with double height and width
               version name, options do

data/lib/retina_rails/version.rb

@@ -1,3 +1,3 @@
 module RetinaRails
-  VERSION = "2.0.3"
+  VERSION = "2.0.4"
 end

data/retina_rails.gemspec

@@ -19,20 +19,15 @@ Gem::Specification.new do |gem|
   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 'coveralls'
   gem.add_development_dependency 'carrierwave'
   gem.add_development_dependency 'paperclip'
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rspec-rails', '~> 3.4'
   gem.add_development_dependency 'rmagick'
   gem.add_development_dependency 'sqlite3'
-  gem.add_development_dependency 'coveralls'
 
-  if RUBY_VERSION > '1.9.2'
-    gem.add_dependency 'rails', '>= 3.2.0'
-  else
-    gem.add_dependency 'rails', '>= 3.2.0', '< 4.0.0'
-  end
+  gem.add_dependency 'rails', '>= 3.2.0'
 
   if File.exists?('UPGRADING')
     gem.post_install_message = File.read("UPGRADING")

data/spec/helpers_spec.rb

@@ -40,50 +40,58 @@ describe ActionView::Helpers::AssetTagHelper, :type => :helper 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"')
+        expect(image).to include('width="40"')
+        expect(image).to 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"')
+        expect(image).to include('class="foo"')
       end
 
     end
 
     context 'without dimensions present' do
 
-      before(:each) { Upload.any_instance.stub(:retina_dimensions).and_return(nil) }
+      before(:each) do
+        allow_any_instance_of(Upload).to receive(:retina_dimensions).and_return(nil)
+      end
 
       it 'should set correct width and height' do
         image = helper.retina_image_tag(Upload.new, :avatar, :small, :default => { :width => 25, :height => 40 })
 
-        image.should include('width="25"')
-        image.should include('height="40"')
+        expect(image).to include('width="25"')
+        expect(image).to include('height="40"')
 
         image = helper.retina_image_tag(Upload.new, :avatar, :small, :default => [25, 40])
 
-        image.should include('width="25"')
-        image.should include('height="40"')
+        expect(image).to include('width="25"')
+        expect(image).to 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')
+        expect(image).to_not include('width')
+        expect(image).to_not include('height')
       end
 
       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"')
+        expect(image).to 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')
+        expect(image).to_not include('default')
+      end
+
+      it 'should respect other options' do
+        image = helper.retina_image_tag(Upload.new, :avatar, :small, :default => { :width => 25, :height => 40 }, :alt => 'Some alt tag')
+
+        expect(image).to include('alt="Some alt tag"')
       end
 
     end
@@ -93,14 +101,14 @@ describe ActionView::Helpers::AssetTagHelper, :type => :helper do
   describe '#image_tag' do
 
     it 'should show a deprecation warning when used with retina option' do
-      ActiveSupport::Deprecation.should_receive(:warn)
+      expect(ActiveSupport::Deprecation).to receive(:warn)
         .with("`image_tag('image.png', :retina => true)` is deprecated use `retina_image_tag` instead")
 
       image_tag('image.png', :retina => true)
     end
 
     it 'should not show a deprecation warning when used without retina option' do
-      ActiveSupport::Deprecation.should_not_receive(:warn)
+      expect(ActiveSupport::Deprecation).to_not receive(:warn)
         .with("`image_tag('image.png', :retina => true)` is deprecated use `retina_image_tag` instead")
 
       image_tag('image.png')
@@ -108,4 +116,4 @@ describe ActionView::Helpers::AssetTagHelper, :type => :helper do
 
   end
 
-end
+end

data/spec/spec_helper.rb

@@ -17,6 +17,7 @@ require 'carrierwave'
 require 'paperclip'
 require "paperclip/railtie"
 Paperclip::Railtie.insert
+Paperclip.options[:log] = false unless ENV["LOG_PAPERCLIP"]
 
 ## Setup fixture database for activerecord
 

data/spec/strategies/carrierwave_spec.rb

@@ -19,7 +19,14 @@ describe RetinaRails::Strategies::CarrierWave do
   after(:each) do
     AnonymousUploader.enable_processing = false
     @uploader.remove!
-    AnonymousUploader.versions[:small][:uploader].processors = [] ## Reset processors
+
+    ## Reset processors
+    version = AnonymousUploader.versions[:small]
+    if version.respond_to?(:processors)
+      version.processors = []
+    else
+      version[:uploader].processors = []
+    end
   end
 
   ##
@@ -40,16 +47,16 @@ describe RetinaRails::Strategies::CarrierWave do
     end
 
     it 'should double the height and width of an image' do
-      @uploader.small.should have_dimensions(60, 80)
+      expect(@uploader.small).to have_dimensions(60, 80)
     end
 
     it 'should store original width and height attributes for version' do
-      @uploader.model.retina_dimensions[:avatar][:small].should == { :width => 30, :height => 40 }
+      expect(@uploader.model.retina_dimensions[:avatar][:small]).to eq({ :width => 30, :height => 40 })
     end
 
     it "should set quality to it's default 60%" do
       quality = Magick::Image.read(@uploader.small.current_path).first.quality
-      quality.should == 60
+      expect(quality).to eq(60)
     end
 
   end
@@ -71,11 +78,11 @@ describe RetinaRails::Strategies::CarrierWave do
     it "should override quality" do
       upload!
       quality = Magick::Image.read(@uploader.small.current_path).first.quality
-      quality.should == 80
+      expect(quality).to eq 80
     end
 
     it 'should receive quality processor once' do
-      AnonymousUploader.any_instance.should_receive(:retina_quality).once
+      expect_any_instance_of(AnonymousUploader).to receive(:retina_quality).once
 
       upload!
     end
@@ -105,11 +112,11 @@ describe RetinaRails::Strategies::CarrierWave do
     end
 
     it 'should double the height and width of an image' do
-      @uploader.small.should have_dimensions(60, 80)
+      expect(@uploader.small).to have_dimensions(60, 80)
     end
 
     it 'should store original width and height attributes for version' do
-      @uploader.model.retina_dimensions[:avatar][:small].should == { :width => 30, :height => 40 }
+      expect(@uploader.model.retina_dimensions[:avatar][:small]).to eq({ :width => 30, :height => 40 })
     end
 
   end
@@ -137,11 +144,11 @@ describe RetinaRails::Strategies::CarrierWave do
     end
 
     it 'should double the height and width of an image' do
-      @uploader.small.should have_dimensions(200, 200)
+      expect(@uploader.small).to have_dimensions(200, 200)
     end
 
     it 'should store original width and height attributes for version' do
-      @uploader.model.retina_dimensions[:avatar][:small].should == { :width => 100, :height => 100 }
+      expect(@uploader.model.retina_dimensions[:avatar][:small]).to eq({ :width => 100, :height => 100 })
     end
 
   end
@@ -162,8 +169,8 @@ describe RetinaRails::Strategies::CarrierWave do
     end
 
     it 'should not create a version' do
-      @uploader.version_exists?(:small_conditional).should be_false
-      @uploader.small_conditional.current_path.should_not be_present
+      expect(@uploader.version_exists?(:small_conditional)).to eq(false)
+      expect(@uploader.small_conditional.current_path).to_not be_present
     end
 
   end

data/spec/strategies/paperclip_spec.rb

@@ -38,16 +38,16 @@ describe RetinaRails::Strategies::Paperclip do
     end
 
     it 'should double the height and width of an image' do
-      Paperclip::Geometry.from_file(image_path).to_s.should == '60x80'
+      expect(Paperclip::Geometry.from_file(image_path).to_s).to eq('60x80')
     end
 
     it 'should store original width and height attributes for version' do
-      @upload.retina_dimensions[:avatar][:big].should == { :width => 30, :height => 40 }
+      expect(@upload.retina_dimensions[:avatar][:big]).to eq({ :width => 30, :height => 40 })
     end
 
     it "should set quality to it's default 60%" do
       quality = Magick::Image.read(image_path).first.quality
-      quality.should == 60
+      expect(quality).to eq(60)
     end
 
   end
@@ -75,16 +75,16 @@ describe RetinaRails::Strategies::Paperclip do
     end
 
     it 'should double the height and width of an image' do
-      Paperclip::Geometry.from_file(image_path).to_s.should == '60x80'
+      expect(Paperclip::Geometry.from_file(image_path).to_s).to eq('60x80')
     end
 
     it 'should store original width and height attributes for version' do
-      @upload.retina_dimensions[:avatar][:big].should == { :width => 30, :height => 40 }
+      expect(@upload.retina_dimensions[:avatar][:big]).to eq({ :width => 30, :height => 40 })
     end
 
     it "should set quality to it's default 60%" do
       quality = Magick::Image.read(image_path).first.quality
-      quality.should == 60
+      expect(quality).to eq(60)
     end
 
   end
@@ -103,16 +103,16 @@ describe RetinaRails::Strategies::Paperclip do
     end
 
     it 'should double the height and width of an image' do
-      Paperclip::Geometry.from_file(image_path).to_s.should == '1600x1600'
+      expect(Paperclip::Geometry.from_file(image_path).to_s).to eq('1600x1600')
     end
 
     it 'should store original width and height attributes for version' do
-      @upload.retina_dimensions[:avatar][:big].should == { :width => 800, :height => 800 }
+      expect(@upload.retina_dimensions[:avatar][:big]).to eq({ :width => 800, :height => 800 })
     end
 
     it "should set quality to it's default 60%" do
       quality = Magick::Image.read(image_path).first.quality
-      quality.should == 60
+      expect(quality).to eq(60)
     end
 
   end
@@ -133,7 +133,7 @@ describe RetinaRails::Strategies::Paperclip do
 
     it "should set quality" do
       quality = Magick::Image.read(image_path).first.quality
-      quality.should == 25
+      expect(quality).to eq(25)
     end
 
   end

data/spec/support/rails.rb

@@ -7,10 +7,12 @@ module RetinaRailsTest
     config.active_support.deprecation = :log
 
     if Rails::VERSION::STRING >= "4.0.0"
+      config.eager_load      = false
       config.secret_token    = 'existing secret token'
       config.secret_key_base = 'new secret key base'
     end
 
   end
 end
-RetinaRailsTest::Application.initialize!
+
+RetinaRailsTest::Application.initialize!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: retina_rails
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Johan van Zonneveld
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -26,7 +26,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -40,35 +40,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '0'
   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'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: carrierwave
+  name: paperclip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -82,7 +68,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: paperclip
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -96,21 +82,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rmagick
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rmagick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -124,7 +110,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="