jemmyw-image_science 1.3.2.1.Jemmyw → 1.3.3.0.Jemmyw

data/Gemfile

@@ -3,3 +3,4 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in number_with_error.gemspec
 gemspec
 gem "rake"
+gem "minitest"

data/History.txt

@@ -1,3 +1,15 @@
+=== 1.3.3.0.Jemmyw
+
+* 1 enhancement:
+
+  * bytes method takes type string for image conversion.
+
+=== 1.3.2.1.Jemmyw
+
+* 1 enhancement:
+
+  * Added bytes method to get the image data as a ruby string.
+
 === 1.2.1 / 2009-08-14
 
 * 2 minor enhancements:

data/Rakefile

@@ -6,11 +6,19 @@ task :build => [:compile, :chmod]
 task :compile do
   `ruby ext/image_science/extconf.rb`
   `make`
-  `mv extension.so lib/image_science/extension.so`
-  `mv extension.bundle lib/image_science/extension.bundle`
+
+  if File.exists?("extension.so")
+    `mv extension.so lib/image_science/extension.so`
+  elsif File.exists?("extension.bundle")
+    `mv extension.bundle lib/image_science/extension.bundle`
+  else
+    raise "No extension file build"
+  end
 end
 
 task :chmod do
-  File.chmod(0775, 'lib/image_science/extension.so')
+  Dir["lib/image_science/extension.{so,bundle}"].each do |file|
+    File.chmod(0775, file)
+  end
 end
 

data/ext/image_science/image_science.c

@@ -195,13 +195,22 @@ static VALUE save(VALUE self, VALUE _output) {
   rb_raise(rb_eTypeError, "Unknown file format");
 }
 
-static VALUE bytes(VALUE self) {
+static VALUE bytes(int argc, VALUE *argv, VALUE self) {
 	FIMEMORY *hmem = NULL;
 	FIBITMAP *bitmap;
 	VALUE byte_string;
+	VALUE type_string;
 	int flags;
+	FREE_IMAGE_FORMAT fif;
 
-	FREE_IMAGE_FORMAT fif = FIX2INT(rb_iv_get(self, "@file_type"));
+	rb_scan_args(argc, argv, "01", &type_string);
+
+	if (NIL_P(type_string)) {
+		fif = FIX2INT(rb_iv_get(self, "@file_type"));
+	} else {
+		char * type = StringValuePtr(type_string);
+		fif = FreeImage_GetFIFFromFilename(type);
+	}
 
 	if ((fif != FIF_UNKNOWN) && FreeImage_FIFSupportsWriting(fif)) {
 		GET_BITMAP(bitmap);
@@ -243,7 +252,7 @@ extern "C" {
     rb_define_method(c, "height", (VALUE(*)(ANYARGS))height, 0);
     rb_define_method(c, "resize", (VALUE(*)(ANYARGS))resize, 2);
     rb_define_method(c, "save", (VALUE(*)(ANYARGS))save, 1);
-		rb_define_method(c, "bytes", (VALUE(*)(ANYARGS))bytes, 0);
+		rb_define_method(c, "bytes", (VALUE(*)(ANYARGS))bytes, -1);
     rb_define_method(c, "width", (VALUE(*)(ANYARGS))width, 0);
     rb_define_method(c, "with_crop", (VALUE(*)(ANYARGS))with_crop, 4);
     rb_define_singleton_method(c, "with_image", (VALUE(*)(ANYARGS))with_image, 1);

data/image_science.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.authors = ['Ryan Davis', 'Craig Buchek']
   s.email = ['craig.buchek@asolutions.com']
-  s.homepage = "http://github.com/jemmyw/#{s.name}"
+  s.homepage = "http://github.com/jemmyw/image_science"
   s.summary = %q{Replacement for RMagick; uses FreeImage instead of ImageMagick}
   s.description = %q{ImageScience is a clean and happy Ruby library that generates
 thumbnails -- and kicks the living crap out of RMagick. Oh, and it

data/lib/image_science/version.rb

@@ -1,3 +1,3 @@
 class ImageScience
-  VERSION = '1.3.2.1.Jemmyw'
+  VERSION = '1.3.3.0.Jemmyw'
 end

data/test/test_image_science.rb

@@ -48,7 +48,7 @@ class TestImageScience < MiniTest::Unit::TestCase
   end
 
   def test_class_with_image_missing_with_img_extension
-    assert_raises RuntimeError do
+    assert_raises TypeError do
       assert_nil ImageScience.with_image("nope#{@path}") do |img|
         flunk
       end
@@ -96,6 +96,21 @@ class TestImageScience < MiniTest::Unit::TestCase
     end
   end
 
+  def test_bytes_with_type
+    data = File.new(@path).binmode.read
+    @tmppath = "test/pix-tmp.jpg"
+
+    ImageScience.with_image_from_memory data do |img|
+      File.open(@tmppath, "wb"){|f| f.write img.bytes("jpeg")}
+      assert_equal 1256, File.size(@tmppath)
+      
+      ImageScience.with_image(@tmppath) do |img2|
+        assert_equal(img2.width, img.width)
+        assert_equal(img2.height, img.height)
+      end
+    end
+  end
+
   def test_resize
     ImageScience.with_image @path do |img|
       img.resize(25, 25) do |thumb|

metadata

@@ -1,38 +1,44 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: jemmyw-image_science
-version: !ruby/object:Gem::Version
-  version: 1.3.2.1.Jemmyw
+version: !ruby/object:Gem::Version 
+  hash: 1832185373
   prerelease: 8
+  segments: 
+  - 1
+  - 3
+  - 3
+  - 0
+  - Jemmyw
+  version: 1.3.3.0.Jemmyw
 platform: ruby
-authors:
+authors: 
 - Ryan Davis
 - Craig Buchek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-13 00:00:00.000000000 Z
+
+date: 2012-08-23 00:00:00 Z
 dependencies: []
-description: ! 'ImageScience is a clean and happy Ruby library that generates
 
+description: |
+  ImageScience is a clean and happy Ruby library that generates
   thumbnails -- and kicks the living crap out of RMagick. Oh, and it
-
-  doesn''t leak memory like a sieve. :)
-
-
+  doesn't leak memory like a sieve. :)
+  
   This fork does not require RubyInline.
-
-
+  
   For more information (on the original variant), see http://seattlerb.rubyforge.org/ImageScience.html
 
-'
-email:
+email: 
 - craig.buchek@asolutions.com
-executables:
+executables: 
 - image_science_thumb
-extensions:
+extensions: 
 - ext/image_science/extconf.rb
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - History.txt
@@ -49,30 +55,41 @@ files:
 - lib/image_science/version.rb
 - test/pix.png
 - test/test_image_science.rb
-homepage: http://github.com/jemmyw/jemmyw-image_science
+homepage: http://github.com/jemmyw/image_science
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
+
 rubyforge_project: image_science
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Replacement for RMagick; uses FreeImage instead of ImageMagick
-test_files:
+test_files: 
 - test/pix.png
 - test/test_image_science.rb