command_wrap 0.5.2 → 0.6

data/lib/command_wrap/image.rb

@@ -10,7 +10,13 @@ module CommandWrap
         end
 
         def self.scale (source, target, width, height = nil)
-            height = width unless height
+            # if no height, we calculate it based on the width
+            unless height
+                dim = self.dimensions(source)
+                    puts dim.inspect
+                height = (1.0 * width * dim[:height] / dim[:width]).floor
+                puts height
+            end
 
             # Scale source
             simg = Magick::Image.read(source)[0]

data/tests/unit/image_test.rb

@@ -21,7 +21,7 @@ class ImageTest < Test::Unit::TestCase
 
         File.delete(target) if File.exists?(target)
 
-        CommandWrap::Image.scale(source, target, 100)
+        CommandWrap::Image.scale(source, target, 100, 100)
         assert File.exists?(target)
         assert_equal dim, CommandWrap::Image.dimensions(target)
     end
@@ -49,5 +49,18 @@ class ImageTest < Test::Unit::TestCase
         assert File.exists?(target)
         assert_equal dim, CommandWrap::Image.dimensions(target)
     end
+
+    def test_scale_no_width
+        dim = { :width => 75, :height => 100 }
+
+        source = File.dirname(__FILE__) + "/../helpers/img150x200.jpg"
+        target = File.dirname(__FILE__) + "/../../target4.png"
+
+        File.delete(target) if File.exists?(target)
+
+        CommandWrap::Image.scale(source, target, 75)
+        assert File.exists?(target)
+        assert_equal dim, CommandWrap::Image.dimensions(target)
+    end
     
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: command_wrap
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 5
-  - 2
-  version: 0.5.2
+  - 6
+  version: "0.6"
 platform: ruby
 authors: 
 - Stefaan Colman
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-19 00:00:00 +02:00
+date: 2011-08-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency