imgry 0.1.7 → 0.1.8

data/lib/imgry/geometry.rb

@@ -10,10 +10,15 @@ module Imgry
       ask_height ||= 0
       aspect_ratio = orig_width.to_f / orig_height.to_f
 
-      scale = Proc.new do
-        if ask_width == 0 || ask_width < ask_height
+      scale = Proc.new do |ask_is_maximum = true|
+        ask_aspect_ratio = ask_width.to_f / ask_height.to_f
+        # Fill requested height if result should cover narrower aspect or should be contained within wider aspect
+        fill_height = (ask_is_maximum && ask_aspect_ratio > aspect_ratio) || (!ask_is_maximum && ask_aspect_ratio < aspect_ratio)
+        if ask_width == 0 || (ask_height != 0 && fill_height)
+          # Fill height, calculate width
           new_width, new_height = scale_by_height(ask_height, aspect_ratio)
         else
+          # Fill width, calculate height
           new_width, new_height = scale_by_width(ask_width, aspect_ratio)
         end
       end
@@ -21,6 +26,8 @@ module Imgry
       case op
       when '!'
         new_width, new_height = ask_width.to_i, ask_height.to_i
+      when '^'
+        scale.call(false)
       when '>'
         scale.call if orig_width > ask_width || orig_height > ask_height
       when '<'
@@ -60,6 +67,6 @@ module Imgry
       end
       [width, height, x, y, flag]
     end
-    
+
   end
 end

data/lib/imgry/version.rb

@@ -1,3 +1,3 @@
 module Imgry
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

data/spec/imgry/geometry_spec.rb

@@ -17,6 +17,22 @@ describe Imgry::Geometry do
     size.should == [400, 300]
   end
 
+  it 'fits given maximum dimensions with aspect ratio maintained when image aspect > 1' do
+    size = Imgry::Geometry.scale(1024, 768, "300x600")
+    size.should == [300, 225]
+
+    size = Imgry::Geometry.scale(1024, 768, "600x300")
+    size.should == [400, 300]
+  end
+
+  it 'fits given maximum dimensions with aspect ratio maintained when image aspect < 1' do
+    size = Imgry::Geometry.scale(768, 1024, "300x600")
+    size.should == [300, 400]
+
+    size = Imgry::Geometry.scale(768, 1024, "600x300")
+    size.should == [225, 300]
+  end
+
   it 'shrinks to a size when dimensions are larger then corresponding width/height' do
     size = Imgry::Geometry.scale(1024, 768, "600x600>")
     size.should == [600, 450]
@@ -30,6 +46,22 @@ describe Imgry::Geometry do
     size.should == [1024, 768]
 
     size = Imgry::Geometry.scale(300, 400, "600x600<")
+    size.should == [450, 600]
+  end
+
+  it 'covers minimum specified dimensions with aspect ratio maintained when image aspect > 1' do
+    size = Imgry::Geometry.scale(1024, 768, "100x600^")
+    size.should == [800, 600]
+
+    size = Imgry::Geometry.scale(1024, 768, "600x100^")
+    size.should == [600, 450]
+  end
+
+  it 'covers minimum specified dimensions with aspect ratio maintained when image aspect < 1' do
+    size = Imgry::Geometry.scale(768, 1024, "100x600^")
+    size.should == [450, 600]
+
+    size = Imgry::Geometry.scale(768, 1024, "600x100^")
     size.should == [600, 800]
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imgry
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-16 00:00:00.000000000 Z
+date: 2013-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Fast image resizing/cropping designed for JRuby with MRI support
@@ -99,3 +99,4 @@ test_files:
 - spec/support/mexico-cmyk.jpg
 - spec/support/transparent_background.png
 - spec/support/transparent_background_saved.png
+has_rdoc: