retina_rails 1.0.3 → 1.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 31ec07293af143bd14885c2afe55b7e2f4835827
+  data.tar.gz: a52f634b29d6f2779ad7efe0c8707c6123538a20
+SHA512:
+  metadata.gz: 3de52f4874673f6c29f14290fb0b716e2a2ad605790119b437428c9beb6267fa1ea5ce7dc7d57dae9b3ede7ae550eace649f624904a6b20be3abb0013d761ecb
+  data.tar.gz: a3774c7bb7158d80c1a3cefaa0c3ccf601c9932c618d98f6cb645c16a069d0d6e5cea48e088ce3d8567ce5b84573bafc7c55b60c43823742dff769b8453efee5

data/.gitignore

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

data/lib/retina_rails/strategies/carrierwave.rb

@@ -24,13 +24,14 @@ module RetinaRails
           def version(name, options={}, &block)
             super
 
-            retina_version name unless options[:retina] == false
+            retina_version(name, { :if => options[:if] }) 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)
+          def retina_version(name, options={})
             config = versions[name]
+            options[:retina] = false
 
             processors = config[:uploader].processors.dup
             dimensions_processor = nil
@@ -43,18 +44,18 @@ module RetinaRails
             ## Define a retina version if processor is present
             if dimensions_processor
 
-              options = dimensions_processor[1].dup
+              processor_options = dimensions_processor[1].dup
 
-              width  = options[0] * 2
-              height = options[1] * 2
+              width  = processor_options[0] * 2
+              height = processor_options[1] * 2
 
-              2.times { options.delete_at(0) }
+              2.times { processor_options.delete_at(0) }
 
-              options.insert(0, height)
-              options.insert(0, width)
+              processor_options.insert(0, height)
+              processor_options.insert(0, width)
 
-              version "#{name}_retina", :retina => false do
-                process dimensions_processor[0] => options
+              version "#{name}_retina", options do
+                process dimensions_processor[0] => processor_options
 
                 quality_processor = nil
 

data/lib/retina_rails/version.rb

@@ -1,3 +1,3 @@
 module RetinaRails
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/retina_rails.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |gem|
   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 'paperclip', '< 4.0'
   gem.add_development_dependency 'rmagick'
   gem.add_development_dependency 'sqlite3'
   gem.add_development_dependency 'coveralls'

data/spec/spec_helper.rb

@@ -41,4 +41,4 @@ RetinaRails::Strategies.include_strategies
 
 RSpec.configure do |config|
   config.fixture_path = "#{File.dirname(__FILE__)}/fixtures"
-end
+end

data/spec/strategies/carrierwave_spec.rb

@@ -38,6 +38,10 @@ class AnonymousUploader < CarrierWave::Uploader::Base
     process :resize_to_fill_with_gravity => [200, 200, 'North', :jpg, 40]
   end
 
+  version :small_with_failing_conditional, :if => ->(img, opts) { false } do
+    process :resize_to_fill => [30, 30]
+  end
+
   def desaturate
     manipulate! do |img|
       img = img.quantize 256, Magick::GRAYColorspace
@@ -149,6 +153,13 @@ describe RetinaRails::Strategies::CarrierWave do
 
   end
 
+  context 'with failing conditional version' do
+
+    it { @uploader.version_exists?(:small_with_failing_conditional).should == false }
+    it { @uploader.small_with_failing_conditional.current_path.should_not be_present }
+
+  end
+
   context 'file with multiple dots' do
 
     before do

data/spec/strategies/paperclip_spec.rb

@@ -2,6 +2,8 @@ require 'spec_helper'
 
 ROOT = File.dirname(__FILE__)
 
+Paperclip::Attachment.default_options[:use_timestamp] = false
+
 class PaperclipUpload < ActiveRecord::Base
 
   retina!

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: retina_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.3
-  prerelease: 
+  version: 1.0.4
 platform: ruby
 authors:
 - Johan van Zonneveld
@@ -10,60 +9,53 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   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: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -71,7 +63,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -79,89 +70,78 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
   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: paperclip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rmagick
   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: sqlite3
   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: 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
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
     - - <
@@ -170,9 +150,8 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
     - - <
@@ -221,27 +200,26 @@ files:
 homepage: https://github.com/jhnvz/retina_rails.git
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Makes your life easier optimizing for retina displays
 test_files:
 - spec/deprecation/carrierwave_spec.rb