bteitelb-paperclip 2.3.1.9 → 2.3.1.10

data/lib/paperclip/attachment.rb

@@ -438,9 +438,6 @@ module Paperclip
 
     def dimensions style = default_style
       return [nil,nil] unless image?
-      if @styles[style]
-        return @styles[style][:geometry].match(/(\d*)x(\d*)/)[1,2].map {|s| s.to_i}
-      end
       return @dimensions[style] unless @dimensions[style].nil?
       w, h = instance_read(:width), instance_read(:height)
       if w.nil? or h.nil?
@@ -450,12 +447,10 @@ module Paperclip
         instance_write(:height, h)
         instance.save unless instance.readonly?
       end
-      if @styles[style].nil? or @styles[style][:geometry].nil?
-        return [nil, nil]
-      else
-        @dimensions[style] = Geometry.parse(@styles[style][:geometry]).new_dimensions_for(w, h)      
-        return @dimensions[style]
-      end
+      return [w, h] if style == :original
+      return [nil, nil] if @styles[style].nil? or @styles[style][:geometry].nil?
+      @dimensions[style] = Geometry.parse(@styles[style][:geometry]).new_dimensions_for(w, h)
+      return @dimensions[style]
     end
 
     def queue_existing_for_delete #:nodoc:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bteitelb-paperclip
 version: !ruby/object:Gem::Version 
-  version: 2.3.1.9
+  version: 2.3.1.10
 platform: ruby
 authors: 
 - Jon Yurek