tootsie 0.9.25 → 0.9.26

data/README.md

@@ -108,7 +108,7 @@ Image jobs have the `type` key set to `image`. The key `params` must be set to a
   * `height`: Optional desired height of output image.
   * `scale`: One of the following values:
     * `down` (default): The input image is scaled to fit within the dimensions `width` x `height`. If only `width` or only `height` is specified, then the other component will be computed from the aspect ratio of the input image.
-    * `up`: As `within`, but allow scaling to dimensions that are larger than the input image.
+    * `up`: As `fit`, but allow scaling to dimensions that are larger than the input image.
     * `fit`: Similar to `down`, but the dimensions are chosen so the output width and height are always met or exceeded. In other words, if you pass in an image that is 100x50, specifying output dimensions as 100x100, then the output image will be 150x100.
     * `none`: Don't scale at all.
   * `crop`: If true, crop the image to the output dimensions.

data/lib/tootsie/input.rb

@@ -28,7 +28,9 @@ module Tootsie
           s3_service = Tootsie::Application.get.s3_service
           begin
             File.open(@temp_file.path, 'wb') do |f|
-              f << s3_service.buckets.find(bucket_name).objects.find(path).content
+              object = s3_service.buckets.find(bucket_name).objects.find(path)
+              object.send(:get_object) unless object.content  # Work around issue with s3 gem
+              f << object.content
             end
           rescue ::S3::Error::NoSuchBucket, ::S3::Error::NoSuchKey
             raise InputNotFound, @url

data/lib/tootsie/processors/image_processor.rb

@@ -116,7 +116,7 @@ module Tootsie
                 # Animations may contain more than one fram, if so discard the
                 # extra frames when outputting in a non-animation format
                 if original_format == 'gif' and version_options[:format] != 'gif'
-                  flags << ' -flatten -scene 1'
+                  convert_command << ' -flatten -scene 1'
                 end
 
                 if scale != :none

data/lib/tootsie/version.rb

@@ -1,3 +1,3 @@
 module Tootsie
-  VERSION = '0.9.25'
+  VERSION = '0.9.26'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tootsie
 version: !ruby/object:Gem::Version
-  version: 0.9.25
+  version: 0.9.26
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-16 00:00:00.000000000 Z
+date: 2012-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -326,7 +326,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4405205189496115955
+      hash: 1492124048621492077
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -335,7 +335,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4405205189496115955
+      hash: 1492124048621492077
 requirements: []
 rubyforge_project: tootsie
 rubygems_version: 1.8.24