artwork 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 706406a5c99a2c2c08fbf910749cc250725a88b7
-  data.tar.gz: 3b555e730a0aaad2708b0c75f1d78780fcacf3ea
+  metadata.gz: 8ebd31f20d2755cc9c814519721157b8381e4d31
+  data.tar.gz: e302263d9af85029c512d50c0100557ff8c0a100
 SHA512:
-  metadata.gz: 8cc3e0a95a39eb4c175d4572603a7371d63d3e6ae7fce2a547683d88a4d7718d477a0335e618e01e37ac6567b3088d7250d90ef47964dd13ba9b46ff09864c80
-  data.tar.gz: 7070f597ab0d885c94e9249ad56e3867b2b97df0fb4c444b33f978684f9bc9ded1eb34acc53996a8dcac1554b61faf554f84cf224e0092ab26da0e91f0aff98b
+  metadata.gz: 4223d517c83f899f61485a2e1ad5b0b52a970fc97736765d92d20beb9faef8e2377246459b98e01fffe3475896e3c4956a6fd4ae66ff3ca89e2a19c87fd1b24a
+  data.tar.gz: f897de740bc861b0b8559e89641e3cc086a6b7d4de2793609c162c2d28c7c3ea6ed79676a8e7656f47eb3aa7f9aae314571f39aaf82c378a59ae4d76d1c5cd23

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v0.7.3
+
+- Paperclip is no longer a dependency
+- Change a little the `auto_height` option of `artwork_tag`
+
 ## v0.7.2
 
 - Use `Artwork.current_resolution` instead of `Artwork.actual_resolution` in

data/README.md

@@ -4,8 +4,7 @@ The Artwork gem provides simple server-side responsive images support for Rails
 which is similar in concept to the `<picture>` tag spec but requires no
 JavaScript, doesn't make extra requests and works in all browsers.
 
-Currently it supports only Paperclip attachments, but that can be changed
-failry easily.
+You could use it either with Paperclip attachments or implement a couple of methods yourself in plain Ruby.
 
 The gem should be thread-safe and should work with Rails 2.3 or newer.
 
@@ -50,9 +49,10 @@ you have a _2x versions of your thumbs, the helper will choose the _2x one.
 
 - Ruby 1.8.7 or newer
 - Rails 2.3 or newer
-- Paperclip 2.3 or newer
 - A JavaScript runtime
 
+If you're using Paperclip, it should be 2.3 or newer.
+
 ## Installation
 
 Add these lines to your application's Gemfile:
@@ -109,7 +109,7 @@ Set the following variables in an app initializer:
 - `Artwork.supported_resolutions_list`
 - `Artwork.base_resolution`
 
-Name your Paperclip attachment styles using the following convention:
+Name your attachment styles using the following convention:
 
     :'320x'
     :'320x_2x'
@@ -125,6 +125,69 @@ Name your Paperclip attachment styles using the following convention:
 The artwork methods will recognize and work with these styles. All other naming
 conventions will be ignored and will bypass the artwork auto-sizing logic.
 
+### Plain Ruby Model
+
+A plain Ruby model will look like this:
+[example in the specs](spec/examples/model_without_paperclip_spec.rb)
+
+```ruby
+class User
+  include Artwork::Model
+
+  def attachment_styles_for(attachment_name)
+    if attachment_name.to_sym == :avatar
+      [
+        :'320x',
+        :'320x_2x',
+        :'320x_some_label',
+        :'320x_some_label_2x',
+        :'320x500',
+        :'320x500_2x',
+        :'320x500_crop',
+        :'320x500_crop_2x',
+        :'320x500_black_and_white_crop',
+        :'320x500_black_and_white_crop_2x',
+      ]
+    end
+  end
+
+  def avatar
+    Avatar.new
+  end
+end
+
+class Avatar
+  def url(style, options)
+    "/avatars/avatar-#{style}.jpg"
+  end
+end
+```
+
+### ActiveRecord Model with Paperclip
+
+An ActiveRecord Model with Paperclip will look like this:
+[example in the specs](spec/examples/model_with_paperclip_spec.rb)
+
+```ruby
+class UserWithPaperclip < ActiveRecord::Base
+  include Artwork::Model
+
+  has_attached_file :avatar,
+    path: '/tmp/avatars/:basename-:style.:extension',
+    url: '/avatars/:basename-:style.:extension',
+    styles: {
+      :'320x'               => '320x>',
+      :'320x_2x'            => '640x>',
+      :'320x_some_label'    => '320x>',
+      :'320x_some_label_2x' => '640x>',
+      :'320x500'            => '320x500>',
+      :'320x500_2x'         => '640x1000>',
+      :'320x500_crop'       => '320x500#',
+      :'320x500_crop_2x'    => '640x1000#',
+    }
+end
+```
+
 ## Usage Example
 
 Configure the gem by putting the following code in `config/initializers/artwork.rb`:

data/artwork.gemspec

@@ -21,8 +21,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3'
+  spec.add_development_dependency 'paperclip', '>= 2.3'
+  spec.add_development_dependency 'sqlite3'
 
   spec.add_dependency 'rails', '>= 2.3'
-  spec.add_dependency 'paperclip', '>= 2.3'
   spec.add_dependency 'uglifier'
 end

data/lib/artwork/version.rb

@@ -1,3 +1,3 @@
 module Artwork
-  VERSION = '0.7.2'
+  VERSION = '0.7.3'
 end

data/lib/artwork/view.rb

@@ -15,10 +15,18 @@ module Artwork
       image_url = record.artwork_url attachment_name, size, options
 
       if options[:auto_height]
-        image = record.send(attachment_name)
+        if options[:auto_height].respond_to?(:first)
+          image_width  = options[:auto_height].first
+          image_height = options[:auto_height].last
+        else
+          image = record.send(attachment_name)
+
+          image_width  = image.width
+          image_height = image.height
+        end
 
-        if image.height.present? and image.width.present?
-          padding = ((image.height.to_f / image.width) * 100).round(4)
+        if image_width.present? and image_height.present?
+          padding = ((image_height.to_f / image_width) * 100).round(4)
 
           img_holder_options[:style] = "padding-bottom:#{padding}%;"
         end

data/spec/examples/model_with_paperclip_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+require 'active_record'
+require 'paperclip'
+
+ActiveRecord::Base.raise_in_transactional_callbacks = true
+
+ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
+ActiveRecord::Schema.define do
+  self.verbose = false
+
+  create_table :user_with_paperclips, :force => true do |t|
+    t.string :avatar_file_name
+    t.string :avatar_content_type
+    t.integer :avatar_file_size
+    t.datetime :avatar_updated_at
+  end
+end
+
+describe 'Model with paperclip', :type => :model do
+  class UserWithPaperclip < ActiveRecord::Base
+    include Paperclip::Glue
+    include Artwork::Model
+
+    has_attached_file :avatar,
+      :path => ':basename-:style.:extension',
+      :url => '/:basename-:style.:extension',
+      :styles => ModelSpec::IMAGE_STYLES
+  end
+
+  it_behaves_like 'an artwork model' do
+    let(:model) { UserWithPaperclip }
+    let(:instance) do
+      UserWithPaperclip.find_or_create_by(
+        avatar_file_name: 'avatar.jpg',
+        avatar_content_type: 'image/jpeg',
+        avatar_file_size: 3000,
+        avatar_updated_at: 1.day.ago
+      )
+    end
+    let(:attachment_name) { :avatar }
+  end
+end

data/spec/examples/model_without_paperclip_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe 'Model without paperclip' do
+  class UserWithoutPaperclip
+    include Artwork::Model
+
+    def attachment_styles_for(attachment_name)
+      if attachment_name.to_sym == :avatar
+        ModelSpec::IMAGE_STYLES.keys
+      end
+    end
+
+    def avatar
+      Avatar.new
+    end
+  end
+
+  class Avatar
+    def url(style, options)
+      "/avatar-#{style}.jpg"
+    end
+  end
+
+  it_behaves_like 'an artwork model' do
+    let(:model) { UserWithoutPaperclip }
+    let(:instance) { UserWithoutPaperclip.new }
+    let(:attachment_name) { :avatar }
+  end
+
+  # if you want to use artwork_tag like this:
+  # <%= artwork_tag record, :avatar, '320x', auto_height: true %>
+  # you will have to provide Avatar#width and Avatar#height which will be used to generate
+  # the padding-bottom % of the .img-holder
+  #
+  # n.b. you could use the artwork_tag also like this:
+  # <%= artwork_tag record, :avatar, '320x', auto_height: [image_width, image_height] %>
+end

data/spec/shared/model.rb

@@ -0,0 +1,263 @@
+module ModelSpec
+  IMAGE_STYLES = {
+    :'320x'               => '320x>',
+    :'320x_2x'            => '640x>',
+    :'640x_2x'            => '1280x>',
+    :'640x'               => '640x>',
+    :'1280x'              => '1280x>',
+    :'1280x_2x'           => '2560x>',
+    :'2000x'              => '2000x>',
+    :'1500x_2x'           => '3000x>',
+    :'320x_some_label'    => '320x>',
+    :'320x_some_label_2x' => '640x>',
+    :'320x500'            => '320x500>',
+    :'320x500_2x'         => '640x1000>',
+    :'320x500_crop'       => '320x500#',
+    :'320x500_crop_2x'    => '640x1000#',
+    :'400x500'            => '400x500>',
+    :'400x500_2x'         => '800x1000>',
+    :'320x_'              => '320x>',
+    :unsupported          => '100x100>'
+  }
+end
+
+#
+# To use this example you have to provide
+# let (:model) { ... }
+# let (:instance) { ... }
+# let (:attachment_name) { ... }
+#
+# also the attachment class should have an url method that receives (style, options)
+# and should return "/#{attachment_name}-#{style}.jpg"
+#
+RSpec.shared_examples 'an artwork model' do
+  describe '#attachment_styles_for' do
+    it 'returns the list of available thumbnails' do
+      expect(instance.attachment_styles_for(attachment_name)).to match_array [
+        :'320x',
+        :'320x_2x',
+        :'640x_2x',
+        :'640x',
+        :'1280x',
+        :'1280x_2x',
+        :'2000x',
+        :'1500x_2x',
+        :'320x_some_label',
+        :'320x_some_label_2x',
+        :'320x500',
+        :'320x500_2x',
+        :'320x500_crop',
+        :'320x500_crop_2x',
+        :'400x500',
+        :'400x500_2x',
+        :'320x_',
+        :unsupported,
+      ]
+    end
+  end
+
+  describe '#artwork_url' do
+    describe 'behaviour' do
+      it 'returns the computed url of an attachment by delegating to artwork_thumb_for' do
+        expect(instance).to receive(:artwork_thumb_for).with(:photo, :size, 'options').and_return(:computed_size)
+
+        attachment = double
+        expect(attachment).to receive(:url).with(:computed_size, 'options').and_return 'some/url'
+        expect(instance).to receive(:photo).and_return(attachment)
+
+        expect(instance.artwork_url(:photo, :size, 'options')).to eq 'some/url'
+      end
+
+      it 'works with two arguments and a hash options' do
+        expect(instance).to receive(:artwork_thumb_for).with(:photo, :size, :some => 'options').and_return(:computed_size)
+
+        attachment = double
+        expect(attachment).to receive(:url).with(:computed_size, :some => 'options').and_return 'some/url'
+        expect(instance).to receive(:photo).and_return(attachment)
+
+        expect(instance.artwork_url(:photo, :size, :some => 'options')).to eq 'some/url'
+      end
+
+      it 'works with two arguments only without any options hash' do
+        expect(instance).to receive(:artwork_thumb_for).with(:photo, :size, {}).and_return(:computed_size)
+
+        attachment = double
+        expect(attachment).to receive(:url).with(:computed_size, {}).and_return 'some/url'
+        expect(instance).to receive(:photo).and_return(attachment)
+
+        expect(instance.artwork_url(:photo, :size)).to eq 'some/url'
+      end
+    end
+
+    describe 'with real attachment' do
+      before :each do
+        Artwork.base_resolution    = 1000
+        Artwork.current_resolution = 1000
+        Artwork.actual_resolution  = 1000
+        Artwork.load_2x_images     = false
+      end
+
+      it 'will build an url' do
+        expect(instance.artwork_url(attachment_name, '320x')).to start_with '/avatar-320x.jpg'
+        expect(instance.artwork_url(attachment_name, '320x', {1000 => '1x@2'})).to start_with '/avatar-640x.jpg'
+
+        Artwork.load_2x_images = true
+        expect(instance.artwork_url(attachment_name, '320x')).to start_with '/avatar-320x_2x.jpg'
+      end
+    end
+  end
+
+  describe '#artwork_thumb_for' do
+    before :each do
+      Artwork.base_resolution    = 1000
+      Artwork.current_resolution = 1000
+      Artwork.actual_resolution  = 1000
+      Artwork.load_2x_images     = false
+    end
+
+    def expect_thumb(size, expected)
+      expect(instance.artwork_thumb_for(attachment_name, *Array(size))).to eq expected
+    end
+
+    it 'picks the exact requested size if it exists' do
+      expect_thumb '2000x', :'2000x'
+    end
+
+    it 'accepts sizes passed as both a symbol or a string' do
+      expect_thumb '2000x', :'2000x'
+      expect_thumb :'2000x', :'2000x'
+    end
+
+    it 'scales the required size according to current_resolution' do
+      Artwork.base_resolution = 1000
+      Artwork.current_resolution = 2000
+
+      expect_thumb '1000x', :'2000x'
+      expect_thumb '640x',  :'1280x'
+    end
+
+    it 'ignores the retina thumbs when looking for a given size' do
+      expect_thumb '1500x', :'2000x'
+    end
+
+    it 'uses the _2x thumb for retina screens' do
+      Artwork.load_2x_images = true
+      expect_thumb '640x', :'640x_2x'
+      expect_thumb '640x', :'640x_2x'
+    end
+
+    it 'uses the non-retina thumb for retina screens if no _2x thumb is available' do
+      Artwork.load_2x_images = true
+      expect_thumb '2000x', :'2000x'
+    end
+
+    it 'passes through unsupported thumb names' do
+      expect_thumb 'unsupported', :unsupported
+
+      Artwork.load_2x_images     = true
+      Artwork.base_resolution = 1000
+      Artwork.current_resolution = 5000
+
+      expect_thumb 'unsupported', :unsupported
+    end
+
+    it 'picks the nearest non-retina size to our desizred size' do
+      expect_thumb '390x', :'400x500'
+      expect_thumb '420x', :'640x'
+    end
+
+    it 'picks the largest available size if requesting a too large thumb' do
+      expect_thumb '5000x', :'2000x'
+    end
+
+    it 'picks the smallest available size if requesting a too small thumb' do
+      expect_thumb '100x', :'320x'
+    end
+
+    it 'distinguishes thumbs by the supplied text label' do
+      expect_thumb '320x', :'320x'
+      expect_thumb '320x_some_label', :'320x_some_label'
+      expect_thumb '200x_some_label', :'320x_some_label'
+    end
+
+    it 'allows changing the base resolution per request' do
+      Artwork.current_resolution = 2000
+
+      expect_thumb '320x@320', :'2000x'
+      expect_thumb '320x@640', :'1280x'
+
+      Artwork.current_resolution = 320
+      expect_thumb '320x@320', :'320x'
+      expect_thumb '320x_some_label@320', :'320x_some_label'
+      expect_thumb '200x_some_label@320', :'320x_some_label'
+    end
+
+    it 'considers the aspect ratio of the desired thumb' do
+      expect_thumb '320x499', :'320x500'
+      expect_thumb '319x498', :'320x500'
+      Artwork.load_2x_images = true
+      expect_thumb '319x498', :'320x500_2x'
+      expect_thumb '319x498_crop', :'320x500_crop_2x'
+      Artwork.load_2x_images = false
+      expect_thumb '319x498_crop', :'320x500_crop'
+    end
+
+    it 'returns the largest thumb with the requested label if no other suitable sizes are found' do
+      expect_thumb '20000x_crop', :'320x500_crop'
+      Artwork.load_2x_images = true
+      expect_thumb '20000x_crop', :'320x500_crop_2x'
+    end
+
+    it 'returns the largest thumb with the requested aspect ratio if no other suitable sizes are found' do
+      expect_thumb '8000x10000', :'400x500'
+      Artwork.load_2x_images = true
+      expect_thumb '8000x10000', :'400x500_2x'
+    end
+
+    it 'returns nil if no thumbnail matches the requested aspect ratio' do
+      expect_thumb '319x200', nil
+    end
+
+    it 'returns nil if no thumbnail matches the requested label' do
+      expect_thumb '319x_nonexistant_label', nil
+    end
+
+    context 'with an alternative sizes definition' do
+      it 'ignores alternative sizes if current resolution is above all the max resolutions given' do
+        Artwork.current_resolution = 1000
+
+        expect_thumb ['320x', {700 => '100x@100'}], :'320x'
+      end
+
+      it 'picks the first alternative size if current resolution is smaller than all max resolutions' do
+        Artwork.current_resolution = 799
+
+        expect_thumb ['320x', {1280 => '500x', 800 => '1000x'}], :'1280x'
+      end
+
+      it 'picks the first alternative size if current resolution is smaller than all max resolutions and supports custom base resolutions' do
+        Artwork.current_resolution = 799
+
+        expect_thumb ['320x', {1280 => '50x@100', 800 => '100x@100'}], :'1280x'
+      end
+
+      it 'compares resolutions with <=' do
+        Artwork.current_resolution = 800
+
+        expect_thumb ['320x', {1280 => '50x@100', 800 => '100x@100'}], :'1280x'
+      end
+
+      it 'picks the largest alternative size if current resolution is smaller only than the max resolution given' do
+        Artwork.current_resolution = 1200
+
+        expect_thumb ['320x', {1280 => '50x@100', 800 => '100x@100'}], :'640x'
+      end
+
+      it 'ignores non-numeric keys' do
+        Artwork.current_resolution = 1200
+
+        expect_thumb ['320x', {1280 => '50x@100', 800 => '100x@100', :foo => 'bar'}], :'640x'
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,2 +1,3 @@
 require 'rspec'
 require 'artwork'
+require 'shared/model'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artwork
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Dimitar Dimitrov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-17 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,13 +53,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: paperclip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.3'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -67,7 +67,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: paperclip
+  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: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -121,10 +135,12 @@ files:
 - lib/assets/javascripts/artwork.js
 - spec/artwork/configuration_spec.rb
 - spec/artwork/controller_spec.rb
-- spec/artwork/model_spec.rb
 - spec/artwork/thumbnail_spec.rb
 - spec/artwork/view_spec.rb
 - spec/artwork_spec.rb
+- spec/examples/model_with_paperclip_spec.rb
+- spec/examples/model_without_paperclip_spec.rb
+- spec/shared/model.rb
 - spec/spec_helper.rb
 homepage: https://github.com/mitio/artwork
 licenses:
@@ -146,15 +162,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Automated user resolution based image size choosing for Rails.
 test_files:
 - spec/artwork/configuration_spec.rb
 - spec/artwork/controller_spec.rb
-- spec/artwork/model_spec.rb
 - spec/artwork/thumbnail_spec.rb
 - spec/artwork/view_spec.rb
 - spec/artwork_spec.rb
+- spec/examples/model_with_paperclip_spec.rb
+- spec/examples/model_without_paperclip_spec.rb
+- spec/shared/model.rb
 - spec/spec_helper.rb

data/spec/artwork/model_spec.rb

@@ -1,246 +0,0 @@
-require 'spec_helper'
-
-module Artwork
-  describe Model do
-    let(:model) { Class.new { include Artwork::Model } }
-    let(:instance) { model.new }
-
-    before :each do
-      allow(model).to receive(:attachment_definitions).and_return({
-        :image => {
-          :styles => {
-            :'320x'               => '320x>',
-            :'320x_2x'            => '640x>',
-            :'640x_2x'            => '1280x>',
-            :'640x'               => '640x>',
-            :'1280x'              => '1280x>',
-            :'1280x_2x'           => '2560x>',
-            :'2000x'              => '2000x>',
-            :'1500x_2x'           => '3000x>',
-            :'320x_some_label'    => '320x>',
-            :'320x_some_label_2x' => '640x>',
-            :'320x500'            => '320x500>',
-            :'320x500_2x'         => '640x1000>',
-            :'320x500_crop'       => '320x500#',
-            :'320x500_crop_2x'    => '640x1000#',
-            :'400x500'            => '400x500>',
-            :'400x500_2x'         => '800x1000>',
-            :'320x_'              => '320x>',
-            :unsupported          => '100x100>'
-          },
-        },
-      })
-    end
-
-    describe '#attachment_styles_for' do
-      it 'returns the list of available thumbnails' do
-        expect(instance.attachment_styles_for(:image)).to match_array [
-          :'320x',
-          :'320x_2x',
-          :'640x_2x',
-          :'640x',
-          :'1280x',
-          :'1280x_2x',
-          :'2000x',
-          :'1500x_2x',
-          :'320x_some_label',
-          :'320x_some_label_2x',
-          :'320x500',
-          :'320x500_2x',
-          :'320x500_crop',
-          :'320x500_crop_2x',
-          :'400x500',
-          :'400x500_2x',
-          :'320x_',
-          :unsupported,
-        ]
-      end
-    end
-
-    describe '#artwork_url' do
-      it 'returns the computed url of an attachment by delegating to artwork_thumb_for' do
-        expect(instance).to receive(:artwork_thumb_for).with(:photo, :size, 'options').and_return(:computed_size)
-
-        attachment = double
-        expect(attachment).to receive(:url).with(:computed_size, 'options').and_return 'some/url'
-        expect(instance).to receive(:photo).and_return(attachment)
-
-        expect(instance.artwork_url(:photo, :size, 'options')).to eq 'some/url'
-      end
-
-      it 'works with two arguments and a hash options' do
-        expect(instance).to receive(:artwork_thumb_for).with(:photo, :size, :some => 'options').and_return(:computed_size)
-
-        attachment = double
-        expect(attachment).to receive(:url).with(:computed_size, :some => 'options').and_return 'some/url'
-        expect(instance).to receive(:photo).and_return(attachment)
-
-        expect(instance.artwork_url(:photo, :size, :some => 'options')).to eq 'some/url'
-      end
-
-      it 'works with two arguments only without any options hash' do
-        expect(instance).to receive(:artwork_thumb_for).with(:photo, :size, {}).and_return(:computed_size)
-
-        attachment = double
-        expect(attachment).to receive(:url).with(:computed_size, {}).and_return 'some/url'
-        expect(instance).to receive(:photo).and_return(attachment)
-
-        expect(instance.artwork_url(:photo, :size)).to eq 'some/url'
-      end
-    end
-
-    describe '#artwork_thumb_for' do
-      before :each do
-        Artwork.base_resolution    = 1000
-        Artwork.current_resolution = 1000
-        Artwork.actual_resolution  = 1000
-        Artwork.load_2x_images     = false
-      end
-
-      def expect_thumb(size, expected)
-        expect(instance.artwork_thumb_for(:image, *Array(size))).to eq expected
-      end
-
-      it 'picks the exact requested size if it exists' do
-        expect_thumb '2000x', :'2000x'
-      end
-
-      it 'accepts sizes passed as both a symbol or a string' do
-        expect_thumb '2000x', :'2000x'
-        expect_thumb :'2000x', :'2000x'
-      end
-
-      it 'scales the required size according to current_resolution' do
-        Artwork.base_resolution = 1000
-        Artwork.current_resolution = 2000
-
-        expect_thumb '1000x', :'2000x'
-        expect_thumb '640x',  :'1280x'
-      end
-
-      it 'ignores the retina thumbs when looking for a given size' do
-        expect_thumb '1500x', :'2000x'
-      end
-
-      it 'uses the _2x thumb for retina screens' do
-        Artwork.load_2x_images = true
-        expect_thumb '640x', :'640x_2x'
-        expect_thumb '640x', :'640x_2x'
-      end
-
-      it 'uses the non-retina thumb for retina screens if no _2x thumb is available' do
-        Artwork.load_2x_images = true
-        expect_thumb '2000x', :'2000x'
-      end
-
-      it 'passes through unsupported thumb names' do
-        expect_thumb 'unsupported', :unsupported
-
-        Artwork.load_2x_images     = true
-        Artwork.base_resolution = 1000
-        Artwork.current_resolution = 5000
-
-        expect_thumb 'unsupported', :unsupported
-      end
-
-      it 'picks the nearest non-retina size to our desizred size' do
-        expect_thumb '390x', :'400x500'
-        expect_thumb '420x', :'640x'
-      end
-
-      it 'picks the largest available size if requesting a too large thumb' do
-        expect_thumb '5000x', :'2000x'
-      end
-
-      it 'picks the smallest available size if requesting a too small thumb' do
-        expect_thumb '100x', :'320x'
-      end
-
-      it 'distinguishes thumbs by the supplied text label' do
-        expect_thumb '320x', :'320x'
-        expect_thumb '320x_some_label', :'320x_some_label'
-        expect_thumb '200x_some_label', :'320x_some_label'
-      end
-
-      it 'allows changing the base resolution per request' do
-        Artwork.current_resolution = 2000
-
-        expect_thumb '320x@320', :'2000x'
-        expect_thumb '320x@640', :'1280x'
-
-        Artwork.current_resolution = 320
-        expect_thumb '320x@320', :'320x'
-        expect_thumb '320x_some_label@320', :'320x_some_label'
-        expect_thumb '200x_some_label@320', :'320x_some_label'
-      end
-
-      it 'considers the aspect ratio of the desired thumb' do
-        expect_thumb '320x499', :'320x500'
-        expect_thumb '319x498', :'320x500'
-        Artwork.load_2x_images = true
-        expect_thumb '319x498', :'320x500_2x'
-        expect_thumb '319x498_crop', :'320x500_crop_2x'
-        Artwork.load_2x_images = false
-        expect_thumb '319x498_crop', :'320x500_crop'
-      end
-
-      it 'returns the largest thumb with the requested label if no other suitable sizes are found' do
-        expect_thumb '20000x_crop', :'320x500_crop'
-        Artwork.load_2x_images = true
-        expect_thumb '20000x_crop', :'320x500_crop_2x'
-      end
-
-      it 'returns the largest thumb with the requested aspect ratio if no other suitable sizes are found' do
-        expect_thumb '8000x10000', :'400x500'
-        Artwork.load_2x_images = true
-        expect_thumb '8000x10000', :'400x500_2x'
-      end
-
-      it 'returns nil if no thumbnail matches the requested aspect ratio' do
-        expect_thumb '319x200', nil
-      end
-
-      it 'returns nil if no thumbnail matches the requested label' do
-        expect_thumb '319x_nonexistant_label', nil
-      end
-
-      context 'with an alternative sizes definition' do
-        it 'ignores alternative sizes if current resolution is above all the max resolutions given' do
-          Artwork.current_resolution = 1000
-
-          expect_thumb ['320x', {700 => '100x@100'}], :'320x'
-        end
-
-        it 'picks the first alternative size if current resolution is smaller than all max resolutions' do
-          Artwork.current_resolution = 799
-
-          expect_thumb ['320x', {1280 => '500x', 800 => '1000x'}], :'1280x'
-        end
-
-        it 'picks the first alternative size if current resolution is smaller than all max resolutions and supports custom base resolutions' do
-          Artwork.current_resolution = 799
-
-          expect_thumb ['320x', {1280 => '50x@100', 800 => '100x@100'}], :'1280x'
-        end
-
-        it 'compares resolutions with <=' do
-          Artwork.current_resolution = 800
-
-          expect_thumb ['320x', {1280 => '50x@100', 800 => '100x@100'}], :'1280x'
-        end
-
-        it 'picks the largest alternative size if current resolution is smaller only than the max resolution given' do
-          Artwork.current_resolution = 1200
-
-          expect_thumb ['320x', {1280 => '50x@100', 800 => '100x@100'}], :'640x'
-        end
-
-        it 'ignores non-numeric keys' do
-          Artwork.current_resolution = 1200
-
-          expect_thumb ['320x', {1280 => '50x@100', 800 => '100x@100', :foo => 'bar'}], :'640x'
-        end
-      end
-    end
-  end
-end