@@ -243,7 +243,7 @@ module HasImage end def image_size - [width, height] * 'x' + self[:image_size] || [width, height].join('x') end # Deletes the image from the storage. @@ -300,7 +300,7 @@ module HasImage send("#{has_image_options[:column]}=", storage.install_images(self)) self[:width] = storage.measure(absolute_path, :width) if self.class.column_names.include?('width') self[:height] = storage.measure(absolute_path, :height) if self.class.column_names.include?('height') - self[:dimensions] = [storage.measure(absolute_path, :width), storage.measure(absolute_path, :height)].join('x') if self.class.column_names.include?('dimensions') + self[:image_size] = [storage.measure(absolute_path, :width), storage.measure(absolute_path, :height)].join('x') if self.class.column_names.include?('image_size') save! end @@ -325,4 +325,4 @@ end if defined?(Rails) and defined?(ActiveRecord) and defined?(ActionController) HasImage.enable -end \ No newline at end of file +end lib/has_image.rb @@ -1,9 +1,9 @@ module HasImage - + # Some helpers to make working with HasImage models in views a little # easier. module ViewHelpers - + # Wraps the image_tag helper from Rails. Instead of passing the path to # an image, you can pass any object that uses HasImage. The options can # include the name of one of your thumbnails, for example: @@ -31,9 +31,9 @@ module HasImage options[:size] = size if size =~ /\A[\d]*x[\d]*\Z/ end end - image_tag(object.public_path(thumb), options) + image_tag(object.public_path(thumb), options) end - + end -end \ No newline at end of file +end lib/has_image/view_helpers.rb @@ -27,9 +27,9 @@ class ComplexPicTest < Test::Unit::TestCase assert_equal 1990, @pic[:height] end - def test_should_save_dimensions_to_db_on_create + def test_should_save_image_size_to_db_on_create @pic = ComplexPic.create!(:image_data => fixture_file_upload("/image.jpg", "image/jpeg")) - assert_equal '1916x1990', @pic[:dimensions] + assert_equal '1916x1990', @pic[:image_size] end def test_should_use_value_from_db_in_height_reader test_rails/complex_pic_test.rb @@ -150,4 +150,4 @@ class PicTest < Test::Unit::TestCase assert_equal 1990, pic.height end -end \ No newline at end of file +end test_rails/pic_test.rb @@ -9,7 +9,7 @@ ActiveRecord::Schema.define(:version => 1) do create_table 'complex_pics', :force => true do |t| t.string :filename t.integer :width, :height - t.string :dimensions + t.string :image_size t.timestamps end test_rails/schema.rb 8fef51a505629280a60d1867b8de674bbe4f75d6 Adrian Mugnolo adrian@mugnolo.com http://github.com/norman/has_image/commit/56899674dc40372d7280124c934186ef6352475e 56899674dc40372d7280124c934186ef6352475e 2008-12-18T10:56:26-08:00 2008-12-18T10:56:26-08:00 Renamed dimensions magic column to image_size. 197043efdb09ad8727fce3ca5be83c970fbdf09b Adrian Mugnolo adrian@mugnolo.com