alchemy_cms 2.5.2 → 2.5.2.1

data/app/controllers/alchemy/pictures_controller.rb

@@ -75,6 +75,11 @@ module Alchemy
 
     # Return the processed image dependent of size and cropping parameters
     def processed_image
+      if params[:upsample] == 'true'
+        resize_string = @size.to_s
+      else
+        resize_string = "#{@size}>"
+      end
       image_file = @picture.image_file
       if image_file.nil?
         raise MissingImageFileError, "Missing image file for #{@picture.inspect}"
@@ -82,7 +87,7 @@ module Alchemy
       if params[:crop_size].present? && params[:crop_from].present?
         crop_from = params[:crop_from].split('x')
         image_file = image_file.process(:thumb, "#{params[:crop_size]}+#{crop_from[0]}+#{crop_from[1]}")
-        image_file.process(:resize, @size + '>')
+        image_file.process(:resize, resize_string)
       elsif params[:crop] == 'crop' && @size.present?
         width, height = @size.split('x').collect(&:to_i)
         # prevent upscaling unless :upsample param is true
@@ -97,7 +102,7 @@ module Alchemy
         end
         image_file.process(:resize_and_crop, :width => width, :height => height, :gravity => 'c')
       elsif @size.present?
-        image_file.process(:resize, "#{@size}>")
+        image_file.process(:resize, resize_string)
       else
         image_file
       end

data/lib/alchemy/version.rb

@@ -1,6 +1,6 @@
 module Alchemy
 
-  VERSION = "2.5.2"
+  VERSION = "2.5.2.1"
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.5.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-12 00:00:00.000000000 Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1131,7 +1131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -107875823720288269
+      hash: 4224220803658243436
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: