has_image 0.1.2 → 0.1.3

data/CHANGELOG

@@ -1,3 +1,8 @@
+2008-07-29 Norman Clarke <norman@randomba.org>
+
+  * Reverted thumbnail sorting feature - it's fast but makes terrible quality
+    thumbnails. It's just not worth it.
+
 2008-07-28 Norman Clarke <norman@randomba.org>
 
   * Added sorted thumbnail processing. This improves thumbnail generation

data/lib/has_image/processor.rb

@@ -9,13 +9,6 @@ module HasImage
     
     class << self
       
-      # Given a geometry string, return the maxium possible output dimensions.
-      # For example:
-      #   area("50x50>") == 2500 
-      def area(dimensions)
-        dimensions.split("x")[0].to_i * dimensions.split("x")[1].to_i 
-      end
-
       # "The form of an {extended geometry
       # string}[http://www.imagemagick.org/script/command-line-options.php?#resize] is
       # <width>x<height>{+-}<xoffset>{+-}<yoffset>{%}{!}{<}{>}"
@@ -45,7 +38,9 @@ module HasImage
     # format if necessary. The size should be a valid ImageMagick {geometry
     # string}[http://www.imagemagick.org/script/command-line-options.php#resize].
     def resize(file, size)
-      raise InvalidGeometryError.new unless Processor.geometry_string_valid?(size)
+      unless Processor.geometry_string_valid?(size)
+        raise InvalidGeometryError.new('"%s" is not a valid ImageMagick geometry string' % size)
+      end
       silence_stderr do
         path = file.respond_to?(:path) ? file.path : file
         file.close if file.respond_to?(:close) && !file.closed?

data/lib/has_image/storage.rb

@@ -105,26 +105,6 @@ module HasImage
       options[:convert_to].to_s.downcase.gsub("jpeg", "jpg")
     end
     
-    # Returns the options[:thumbnails] hash, coverted to an array and sorted
-    # by thumbnail area, highest to lowest. For example:
-    #
-    #   options[:thumbnails] == {:a => "20x20", :b => "2x2", :c => "100x100"}
-    #   sorted_thumbnails == [[:c, "100x100"], [:a, "20x20"], [:b, "2x2"]]
-    #
-    # This is done to speed up processing images with several thumbnails. Rather
-    # than create the thumbnail starting from the highest quality version each
-    # time, the next biggest thumbnail is used as the base image for its
-    # immediately smaller variant. For example, given an image with 3 thumbnails
-    # HasImage will use the 800x800 as the basis of the 500x500, and then the
-    # 500x500 as the basis of the 200x200, etc. My benchmarks showed that this
-    # will speed up processing by up to around 25% for a 4.5 meg JPEG with 5
-    # thumbnails.
-    def sorted_thumbnails
-      options[:thumbnails].to_a.sort do |b,a| 
-        Processor.area(a[1]) <=> Processor.area(b[1])
-      end
-    end
-
     private
     
     # File name, plus thumbnail suffix, plus extension. For example:
@@ -161,10 +141,9 @@ module HasImage
     def install_thumbnails(id, name)
       FileUtils.mkdir_p path_for(id)
       path = File.join(path_for(id), file_name_for(name))
-      sorted_thumbnails.each do |t|
-        thumb = processor.resize(path, t[1])
-        path = File.join(path_for(id), file_name_for(name, t[0]))
-        thumb.write(path)
+      options[:thumbnails].each do |thumb_name, size|
+        thumb = processor.resize(path, size)
+        thumb.write(File.join(path_for(id), file_name_for(name, thumb_name)))
         thumb.tempfile.close!
       end
     end

data/test/processor_test.rb

@@ -13,10 +13,6 @@ class StorageTest < Test::Unit::TestCase
     return @temp_file
   end
   
-  def test_area
-    assert_equal 2500, HasImage::Processor.area("50x50>")
-  end
-  
   def test_detect_valid_image
     assert HasImage::Processor.valid?(File.dirname(__FILE__) + "/../test_rails/fixtures/image.jpg")
   end

data/test/storage_test.rb

@@ -16,13 +16,6 @@ class StorageTest < Test::Unit::TestCase
     )
   end
   
-  def test_sorted_thumbnails
-    thumbs = {:a => "20x20", :b => "2x2", :c => "100x100"}
-    sorted = [[:c, "100x100"], [:a, "20x20"], [:b, "2x2"]]
-    @storage = HasImage::Storage.new(default_options.merge(:thumbnails => thumbs))
-    assert_equal sorted, @storage.send(:sorted_thumbnails) 
-  end
-  
   def test_partitioned_path
     assert_equal(["0001", "2345"], HasImage::Storage.partitioned_path("12345"))
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: has_image
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Norman Clarke
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-28 00:00:00 -03:00
+date: 2008-07-29 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency