apache_image_resizer 0.0.3 → 0.0.4

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to apache_image_resizer version 0.0.3
+This documentation refers to apache_image_resizer version 0.0.4
 
 
 == DESCRIPTION

data/lib/apache/image_resizer/util.rb

@@ -149,12 +149,11 @@ module Apache
         match, directives, max = Regexp.last_match, {}, @max_dim
 
         if o = match[3]
-          h, *xy = match.values_at(4, 5, 6)
+          wh = [o.to_f, match[4].to_f]
+          xy = match.values_at(5, 6)
 
-          if (args = [o.to_f, h.to_f]).all? { |i| i <= max }
-            directives[:offset] = xy.map! { |i|
-              i.tr!('pm', '+-').to_f
-            }.concat(args)
+          if wh.all? { |i| 0 < i && i <= max }
+            directives[:offset] = xy.map! { |i| i.tr!('pm', '+-').to_f }.concat(wh)
           else
             return
           end
@@ -163,13 +162,13 @@ module Apache
         if w = match[1]
           h = match[2]
 
-          args = [w.to_f]
-          args << h.to_f if h
+          wh = [w.to_f]
+          wh << h.to_f if h
 
           max *= 2 if o
 
-          if args.all? { |i| i <= max }
-            directives[:resize] = args
+          if wh.all? { |i| 0 < i && i <= max }
+            directives[:resize] = wh
           else
             return
           end

data/lib/apache/image_resizer/version.rb

@@ -6,7 +6,7 @@ module Apache
 
       MAJOR = 0
       MINOR = 0
-      TINY  = 3
+      TINY  = 4
 
       class << self
 

data/spec/apache/image_resizer_spec.rb

@@ -44,6 +44,22 @@ describe Apache::ImageResizer do
       @uri %= 'r10000'
     end
 
+    it_should :decline, 'Zero width', 'Invalid Directives' do
+      @uri %= 'r0x100'
+    end
+
+    it_should :decline, 'Zero height', 'Invalid Directives' do
+      @uri %= 'r100x0'
+    end
+
+    it_should :decline, 'Zero width offset', 'Invalid Directives' do
+      @uri %= 'o0x100p0p0'
+    end
+
+    it_should :decline, 'Zero height offset', 'Invalid Directives' do
+      @uri %= 'o100x0p0p0'
+    end
+
     it_should :decline, 'Read Error: Magick::ImageMagickError' do
       mock_uri(path = '/source-path')
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: apache_image_resizer
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Jens Wille
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-07 00:00:00 Z
+date: 2011-11-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rmagick
@@ -102,7 +102,7 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - --title
-- apache_image_resizer Application documentation (v0.0.3)
+- apache_image_resizer Application documentation (v0.0.4)
 - --line-numbers
 - --main
 - README