fastimage_resize 1.2.1 → 1.2.2

data/README.textile

@@ -29,7 +29,7 @@ h4. Gem
 
 <pre>
 <code>
-  sudo gem install sdsykes-fastimage_resize -s http://gems.github.com
+  sudo gem install fastimage_resize
 </pre>
 </code>
 
@@ -41,7 +41,7 @@ Install the gem as above, and configure it in your environment.rb file as below:
 ...
 Rails::Initializer.run do |config|
   ...
-  config.gem "sdsykes-fastimage_resize", :lib=>"fastimage_resize"
+  config.gem "fastimage_resize", :lib=>"fastimage_resize"
   ...
 end
 ...
@@ -72,7 +72,7 @@ h2. Requirements
 
 <pre>
 <code>
-  sudo gem install sdsykes-fastimage -s http://gems.github.com
+  sudo gem install fastimage
 </pre>
 </code>
 

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
+:patch: 2
 :major: 1
 :minor: 2
-:patch: 1
 :build: 

data/lib/fastimage_resize.rb

@@ -55,7 +55,7 @@ class FastImage
   end
 
   def self.resize_local(file_in, file_out, w, h, jpeg_quality)
-    fi = new(file_in, :raise_on_failure=>true, :type_only=>true)
+    fi = new(file_in, :raise_on_failure=>true)
     type_index = SUPPORTED_FORMATS.index(fi.type)
     raise FormatNotSupported unless type_index
     fi.resize_image(file_in, file_out, w, h, type_index, jpeg_quality)
@@ -68,14 +68,13 @@ class FastImage
     builder.add_link_flags "-lgd"
     
     builder.c <<-"END"
-      void resize_image(char *filename_in, char *filename_out, int w, int h, int image_type, int jpeg_quality) {
+      VALUE resize_image(char *filename_in, char *filename_out, int w, int h, int image_type, int jpeg_quality) {
         gdImagePtr im_in, im_out;
         FILE *in, *out;
-        int trans, trans_r, trans_g, trans_b;
-        int x, y, f = 0;
+        int trans = 0, x = 0, y = 0, f = 0;
 
         in = fopen(filename_in, "rb");
-        if (!in) return;
+        if (!in) return Qnil;
 
         im_out = gdImageCreateTrueColor(w, h);  /* must be truecolor */
         switch(image_type) {
@@ -103,6 +102,7 @@ class FastImage
                     if (!f) trans = -1;  /* no transparent pixel found */
                   }
                   break;
+          default: return Qnil;
         }
         
         fclose(in);
@@ -131,6 +131,7 @@ class FastImage
         }
         gdImageDestroy(im_in);
         gdImageDestroy(im_out);
+        return Qnil;
       }
     END
   end

data/test/test.rb

@@ -1 +1,68 @@
-# todo
+require 'rubygems'
+
+require 'test/unit'
+
+PathHere = File.dirname(__FILE__)
+
+require File.join(PathHere, "..", "lib", 'fastimage_resize')
+
+require 'fakeweb'
+
+FixturePath = File.join(PathHere, "fixtures")
+
+GoodFixtures = {
+  "test.gif"=>[:gif, [17, 32]],
+  "test.jpg"=>[:jpeg, [882, 470]],
+  "test.png"=>[:png, [30, 20]]
+  }
+
+BadFixtures = [
+  "test.bmp",
+  "faulty.jpg",
+  "test.ico"
+]
+
+TestUrl = "http://example.nowhere/"
+
+GoodFixtures.each do |fn, info|
+  FakeWeb.register_uri(:get, "#{TestUrl}#{fn}", :body => File.join(FixturePath, fn))
+end
+BadFixtures.each do |fn|
+  FakeWeb.register_uri(:get, "#{TestUrl}#{fn}", :body => File.join(FixturePath, fn))
+end
+
+class FastImageResizeTest < Test::Unit::TestCase
+  def test_resize_image_types
+    GoodFixtures.each do |fn, info|
+      outfile = File.join(PathHere, "fixtures", "resized_" + fn)
+      FastImage.resize(TestUrl + fn, outfile, info[1][0] / 3, info[1][1] / 2)
+      assert_equal [info[1][0] / 3, info[1][1] / 2], FastImage.size(outfile)
+      File.unlink outfile
+    end
+  end
+
+  def test_should_raise_for_bmp_files
+    fn = BadFixtures[0]
+    outfile = File.join(PathHere, "fixtures", "resized_" + fn)
+    assert_raises(FastImage::FormatNotSupported) do
+      FastImage.resize(TestUrl + fn, outfile, 20, 20)
+    end
+  end
+  
+  def test_should_raise_for_faulty_files
+    fn = BadFixtures[1]
+    outfile = File.join(PathHere, "fixtures", "resized_" + fn)
+    assert_raises(FastImage::SizeNotFound) do
+      FastImage.resize(TestUrl + fn, outfile, 20, 20)
+    end
+  end
+  
+  def test_should_raise_for_ico_files
+    fn = BadFixtures[2]
+    outfile = File.join(PathHere, "fixtures", "resized_" + fn)
+    assert_raises(FastImage::UnknownImageType) do
+      FastImage.resize(TestUrl + fn, outfile, 20, 20)
+    end
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fastimage_resize
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors: 
 - Stephen Sykes
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-22 00:00:00 +02:00
+date: 2010-02-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,6 +47,12 @@ files:
 - Rakefile
 - VERSION.yml
 - lib/fastimage_resize.rb
+- test/fixtures/faulty.jpg
+- test/fixtures/test.bmp
+- test/fixtures/test.gif
+- test/fixtures/test.ico
+- test/fixtures/test.jpg
+- test/fixtures/test.png
 - test/test.rb
 has_rdoc: true
 homepage: http://github.com/sdsykes/fastimage_resize