Merge pull request thoughtbot#1949 from alassek/geometry-string-fix

Fix GeometryParser for '@>' special case
erkki · Aug 3, 2015 · 47b540d · 47b540d
2 parents c819d5d + b0e515e
commit 47b540d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/paperclip/geometry_parser_factory.rb b/lib/paperclip/geometry_parser_factory.rb
@@ -1,6 +1,6 @@
 module Paperclip
   class GeometryParser
-    FORMAT = /\b(\d*)x?(\d*)\b(?:,(\d?))?([\>\<\#\@\%^!])?/i
+    FORMAT = /\b(\d*)x?(\d*)\b(?:,(\d?))?(\@\>|\>\@|[\>\<\#\@\%^!])?/i
     def initialize(string)
       @string = string
     end

diff --git a/spec/paperclip/geometry_spec.rb b/spec/paperclip/geometry_spec.rb
@@ -82,7 +82,7 @@
       assert_equal 456, @upper.height
     end
 
-    ['>', '<', '#', '@', '%', '^', '!', nil].each do |mod|
+    ['>', '<', '#', '@', '@>', '>@', '%', '^', '!', nil].each do |mod|
       it "ensures the modifier #{description} is preserved" do
         assert @geo = Paperclip::Geometry.parse("123x456#{mod}")
         assert_equal mod, @geo.modifier