infopark_fiona7 1.5.5.4.0 → 1.5.5.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e1b268827386ff36463ab06a15afdee261a1273
-  data.tar.gz: edfd0fb11950038b68c440457f7d7a20a5c2afce
+  metadata.gz: 680cc8e643912cbbf98dc96eb8efd1d66cec19a3
+  data.tar.gz: d56bd4c52dad56d36e435679a40a5826198ebb75
 SHA512:
-  metadata.gz: cf9a981a212c5a2527986e4f6d298d000b243fc883ecc017208fc9e378df22e89de7784aa97c56e65942fbd09cf8d1390bb0601ee90678e7fe7d44dde7d5903c
-  data.tar.gz: bf3d33be89c1d3afafc7b28a5992ff29e5c5a7ff637640615ab522697a8415458082095a11fd35c6a507fd572b347bd923402d39604005f0ce7fba40c4850e68
+  metadata.gz: 219685c11a611e89cdd60c49643b57050b06c8d3aedaa5903b4766fa0b555440d8ecf4fec0ce58b62c1d206859d6541e6a2d47db646f556100f18e3a21ff22e7
+  data.tar.gz: a9a75d826d516430bd09e4dae365bc8221c77cdd48141797ac53b61fad6a707af19fecfc17981489ceaf2865d60a23ab4b0d7c5d2674dac7cf2c83ff20447f50

data/lib/fiona7/scrivito_patches/binary.rb

@@ -150,7 +150,7 @@ module Fiona7
             (!self.height.present? || (1..4096).include?(self.height.to_i)) &&
             ((0..100).include?(self.quality.to_i)) &&
             (!self.fit.present? || (
-               (self.fit == 'clip' || self.fit == 'crop') &&
+               (self.fit == 'clip' || self.fit == 'crop' || self.fit == 'resize') &&
                (self.width.to_i + self.height.to_i < 4096) &&
                (self.fit == 'clip' || (self.width.present? && self.height.present?))
             ))
@@ -171,16 +171,18 @@ module Fiona7
 
           image = MiniMagick::Image.open(original_filepath)
 
-          if self.fit.blank?
+          fit = self.fit_with_default
+
+          if fit.blank?
             image.combine_options do |b|
               b.quality self.quality.to_i
             end 
-          elsif self.fit == 'clip'
+          elsif fit == 'clip' || fit == 'resize'
             image.combine_options do |b|
               b.resize "#{self.width}x#{self.height}>"
               b.quality self.quality.to_i
             end 
-          elsif self.fit == 'crop'
+          elsif fit == 'crop'
             image.combine_options do |b|
               b.resize "#{self.width}x#{self.height}^"
               b.gravity self.gravity
@@ -236,6 +238,10 @@ module Fiona7
         def fit
           self.transformation_with_fallback[:fit]
         end
+
+        def fit_with_default
+          self.fit || ((width.present? || height.present?) && 'resize') || nil
+        end
       end
 
       delegate :valid?, :present?,
@@ -352,7 +358,7 @@ module Fiona7
           def transformation_from_params
             if self.request.query_string
               ParamEncoder.new.decode(
-                ::CGI.parse(self.request.query_string)["t"] 
+                ::CGI.parse(self.request.query_string)["t"].try(:first)
               )
             end
           end

data/lib/fiona7/version.rb

@@ -1,3 +1,3 @@
 module Fiona7
-  VERSION = "1.5.5.4.0"
+  VERSION = "1.5.5.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_fiona7
 version: !ruby/object:Gem::Version
-  version: 1.5.5.4.0
+  version: 1.5.5.4.1
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-16 00:00:00.000000000 Z
+date: 2017-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails