artwork 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc971fdfa3ebbcae98bc4a62e9c83c9cbb7d1a40
-  data.tar.gz: 87e9c6714e3b40a73c1c9d648ec6dc20b7c957d3
+  metadata.gz: 706406a5c99a2c2c08fbf910749cc250725a88b7
+  data.tar.gz: 3b555e730a0aaad2708b0c75f1d78780fcacf3ea
 SHA512:
-  metadata.gz: 3a760a29d15260f3606569b748d1718e2527d91453a6e045d0514683b8d919a98a358d07b49c7779af66b589a81ec026de905f5efe10ad96fe34ae759ed5b0f3
-  data.tar.gz: 3f5850ba63d80d743293cde5f1b488d793f056a331eac8be013a6ca0f909a4c121fe8ec8870c919779c18caff27549f86f439d24de821c884a55f26b57d0dcb6
+  metadata.gz: 8cc3e0a95a39eb4c175d4572603a7371d63d3e6ae7fce2a547683d88a4d7718d477a0335e618e01e37ac6567b3088d7250d90ef47964dd13ba9b46ff09864c80
+  data.tar.gz: 7070f597ab0d885c94e9249ad56e3867b2b97df0fb4c444b33f978684f9bc9ded1eb34acc53996a8dcac1554b61faf554f84cf224e0092ab26da0e91f0aff98b

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## v0.7.2
+
+- Use `Artwork.current_resolution` instead of `Artwork.actual_resolution` in
+  `artwork_thumb_for` when evaluating the alternative sizes. This is to allow
+  page and fragment caching where `Artwork.current_resolution` is in the cache
+  key.
+
 ## v0.7.1
 
 - Hotfix for the new alternative sizes when additional non-numeric option keys

data/lib/artwork/model.rb

@@ -65,7 +65,7 @@ module Artwork
       new_size_definition = alternative_sizes \
         .select { |key, value| key.is_a? Numeric } \
         .sort_by { |max_resolution, size| max_resolution } \
-        .find { |max_resolution, size| Artwork.actual_resolution <= max_resolution }
+        .find { |max_resolution, size| Artwork.current_resolution <= max_resolution }
 
       new_size_definition.last if new_size_definition
     end

data/lib/artwork/version.rb

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

data/spec/artwork/model_spec.rb

@@ -207,42 +207,36 @@ module Artwork
       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
-          Artwork.actual_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
-          Artwork.actual_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
-          Artwork.actual_resolution  = 799
 
           expect_thumb ['320x', {1280 => '50x@100', 800 => '100x@100'}], :'1280x'
         end
 
         it 'compares resolutions with <=' do
           Artwork.current_resolution = 800
-          Artwork.actual_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
-          Artwork.actual_resolution  = 1200
 
           expect_thumb ['320x', {1280 => '50x@100', 800 => '100x@100'}], :'640x'
         end
 
         it 'ignores non-numeric keys' do
           Artwork.current_resolution = 1200
-          Artwork.actual_resolution  = 1200
 
           expect_thumb ['320x', {1280 => '50x@100', 800 => '100x@100', :foo => 'bar'}], :'640x'
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: artwork
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Dimitar Dimitrov