fixes for image height and width

dosire · Jun 11, 2009 · 500705c · 500705c
1 parent cf86170
commit 500705c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/app/models/asset.rb b/app/models/asset.rb
@@ -117,8 +117,19 @@ def extension
 
   def dimensions(size='original')
     @dimensions ||= {}
+    # ext = self.extension
+
+    # image_file = self.asset.path
+
+    # if size != 'original'
+    #   if !self.asset.styles[size.to_sym][:format].nil?
+    #     ext = self.asset.styles[size.to_sym][:format]
+    #   end
+    #   image_file = self.asset.path(size).gsub(/\.+#{self.extension}/, ".#{ext}")
+    # end
+
     @dimensions[size] ||= image? && begin
-      image_file = self.path(size)
+      image_file = "#{RAILS_ROOT}/public#{self.thumbnail(size)}"
       image_size = ImageSize.new(open(image_file).read)
       [image_size.get_width, image_size.get_height]
     rescue

diff --git a/app/models/asset_tags.rb b/app/models/asset_tags.rb
@@ -106,11 +106,12 @@ class TagError < StandardError; end
       if asset.image?
         size = options['size'] ? options.delete('size') : 'icon'
         container = options.delete('container')
-        root = "#{RAILS_ROOT}/public#{asset.thumbnail(size)}"
-        img_height = 0
-        open(root, "rb") do |fh|
-          img_height = ImageSize.new(fh.read).get_height
-        end
+        # root = "#{RAILS_ROOT}/public#{asset.thumbnail(size)}"
+        # img_height = 0
+        # open(root, "rb") do |fh|
+        #   img_height = ImageSize.new(fh.read).get_height
+        # end
+        img_height = asset.height(size)
         (container.to_i - img_height.to_i)/2
       else
         raise TagError, "Asset is not an image"