Fix GeometryParser regex for usage of '@>' flag

According to the ImageMagick documentation the '@' flag is a special case that
can be used in conjunction with '>' to prevent IM from scaling an image up.
The '<' flag is ignored when using '@'.

http://www.imagemagick.org/Usage/resize/#pixel

This fixes the issue I reported in #1851

lib/paperclip/geometry_parser_factory.rb

 module Paperclip
 module Paperclip
   class GeometryParser
   class GeometryParser
-    FORMAT = /\b(\d*)x?(\d*)\b(?:,(\d?))?([\>\<\#\@\%^!])?/i
+    FORMAT = /\b(\d*)x?(\d*)\b(?:,(\d?))?(\@\>|\>\@|[\>\<\#\@\%^!])?/i
     def initialize(string)
     def initialize(string)
       @string = string
       @string = string
     end
     end

spec/paperclip/geometry_spec.rb

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