ruby-epeg 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  data.tar.gz: a74556fb134df892052b76328aea0e4f96d54c40
-  metadata.gz: 0c96cb9a81aa3fbb2f2ad4cfb9c00e0e80ce84ea
+  data.tar.gz: 4a4adfdee32d2e98f4e0295ef9996e6a0f832783
+  metadata.gz: 82a4dc0962796b79cb6dada7dab7f574943f5b0a
 SHA512: 
-  data.tar.gz: 33908fd54a508260a450943c79e033f268122ddd9e19155a7535594b08bec957c0b1f24771bb62ef81df12822f76789716697d57ffb21899872b8b67a843a531
-  metadata.gz: 43dd7ceaad8db8ae820edbcf6a1b2e0465e934f87906e2ce0b223afbe329fe4981b8c4befe2141ea7ec32ac0537aaec001137119b3de3759604a11a17db7b512
+  data.tar.gz: 2ac71eb95371a8325a679fdb7f703a46828ea236993295c917044d1f77584d0288846fe8e82609cc198b2b0cce4ffe6880f2546168fa572e5581936d7bce3912
+  metadata.gz: 143ec94beb4ddd840fb1bd23d692db4e24dcdd3455a42053ff5cf04cfab0c7a0f89432a3d1f1cda803d4325130832fc43c149d7c11381b9fd8bdb43b89d2539b

data/README.md

@@ -7,7 +7,7 @@ Ruby extension for the epeg library which provides facilities for scaling JPEG i
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'ruby-epeg'
+gem 'ruby-epeg', :require => 'epeg'
 ```
 
 And then execute:
@@ -34,9 +34,7 @@ image = Epeg::Image.open("./some-image.jpg")
 # => some-image.jpeg is 1000x500
 
 # Resize the image to 50x50, set the quality to 50 and save it
-image.resize(50,50)
-image.quality = 50
-image.write("./some-other-image.jpg")
+image.resize(50,50).quality(50).write("./some-other-image.jpg")
 
 # The image is now closed and you can't do any further operations
 image.closed? # => true

data/ext/epeg/epeg_image.c

@@ -14,20 +14,19 @@ void Init_epeg()
 
   rb_define_method(cEpegImage, "initialize", rb_epeg_image_initialize,  0);
 
-  rb_define_method(cEpegImage, "resize",         rb_epeg_image_resize,         2);
-  rb_define_method(cEpegImage, "resize_to_fit",  rb_epeg_image_resize_to_fit,  2);
-  rb_define_method(cEpegImage, "resize_to_fill", rb_epeg_image_resize_to_fill, 2);
-  rb_define_method(cEpegImage, "crop",           rb_epeg_image_crop,          -1);
-  rb_define_method(cEpegImage, "write",          rb_epeg_image_write,          1);
-  rb_define_method(cEpegImage, "to_blob",        rb_epeg_image_to_blob,        0);
-  rb_define_method(cEpegImage, "close",          rb_epeg_image_close,          0);
-  rb_define_method(cEpegImage, "closed?",        rb_epeg_image_is_closed,      0);
-  rb_define_method(cEpegImage, "quality=",       rb_epeg_image_set_quality,    1);
+  rb_define_method(cEpegImage, "resize",         rb_epeg_image_resize,              2);
+  rb_define_method(cEpegImage, "resize_to_fit",  rb_epeg_image_resize_to_fit,       2);
+  rb_define_method(cEpegImage, "resize_to_fill", rb_epeg_image_resize_to_fill,      2);
+  rb_define_method(cEpegImage, "crop",           rb_epeg_image_crop,               -1);
+  rb_define_method(cEpegImage, "write",          rb_epeg_image_write,               1);
+  rb_define_method(cEpegImage, "to_blob",        rb_epeg_image_to_blob,             0);
+  rb_define_method(cEpegImage, "close",          rb_epeg_image_close,               0);
+  rb_define_method(cEpegImage, "closed?",        rb_epeg_image_is_closed,           0);
+  rb_define_method(cEpegImage, "quality",        rb_epeg_image_get_or_set_quality, -1);
+  rb_define_method(cEpegImage, "quality=",       rb_epeg_image_set_quality,         1);
 
   rb_define_attr(cEpegImage, "width",   1, 0);
   rb_define_attr(cEpegImage, "height",  1, 0);
-  rb_define_attr(cEpegImage, "quality", 1, 0);
-  rb_define_attr(cEpegImage, "file_path",   1, 0);
 }
 
 /*
@@ -116,6 +115,9 @@ static VALUE rb_epeg_image_initialize(VALUE self)
   epeg_quality_set(image, NUM2UINT(q));
   rb_iv_set(self, "@quality", q);
 
+  char *comment;
+  epeg_comment_set(image, (char *)NULL);
+
   unsigned int w, h;
   epeg_size_get(image, &w, &h);
 
@@ -168,7 +170,7 @@ static VALUE rb_epeg_image_resize_to_fit(VALUE self, VALUE w, VALUE h)
   const double image_height  = (double)NUM2INT(rb_iv_get(self, "@height"));
 
   const double fit_width     = (double)NUM2INT(w);
-  const double fit_height    = (double)NUM2INT(w);
+  const double fit_height    = (double)NUM2INT(h);
 
   const double width_ratio   = image_width/fit_width;
   const double height_ratio  = image_height/fit_height;
@@ -181,9 +183,9 @@ static VALUE rb_epeg_image_resize_to_fit(VALUE self, VALUE w, VALUE h)
   } else {
     if(width_ratio > height_ratio) {
       width  = fit_width;
-      height = (fit_height/width_ratio);
+      height = fit_width*(image_height/image_width);
     } else {
-      width  = (fit_height/height_ratio);
+      width  = fit_height*(image_width/image_height);
       height = fit_height;
     }
   }
@@ -208,7 +210,7 @@ static VALUE rb_epeg_image_resize_to_fill(VALUE self, VALUE w, VALUE h)
   const double image_height  = (double)NUM2INT(rb_iv_get(self, "@height"));
 
   const double fit_width     = (double)NUM2INT(w);
-  const double fit_height    = (double)NUM2INT(w);
+  const double fit_height    = (double)NUM2INT(h);
 
   const double width_ratio   = image_width/fit_width;
   const double height_ratio  = image_height/fit_height;
@@ -220,11 +222,11 @@ static VALUE rb_epeg_image_resize_to_fill(VALUE self, VALUE w, VALUE h)
     height = fit_width;
   } else {
     if(width_ratio > height_ratio) {
-      width  = fit_width*(width_ratio/height_ratio);
+      width  = fit_height*(image_width/image_height);
       height = fit_height;
     } else {
       width  = fit_width;
-      height = fit_height*(height_ratio/width_ratio);
+      height = fit_width*(image_height/image_width);
     }
   }
 
@@ -350,12 +352,34 @@ static VALUE rb_epeg_image_to_blob(VALUE self)
   return blob;
 }
 
+/*
+ * call-seq:
+ *  quality((q))
+ *
+ * Returns the image quality or sets it if +q+ is given.
+ * See Epeg::Image#quality=
+ */
+static VALUE rb_epeg_image_get_or_set_quality(int argc, VALUE *argv, VALUE self)
+{
+  if(argc > 1) {
+    rb_raise(rb_eArgError, "wrong number of arguments (%d for 0 or 1)", argc);
+  }
+
+  if(argc == 0) { return rb_iv_get(self, "@quality"); }
+
+  if(argc == 1) {
+    rb_epeg_image_set_quality(self, argv[0]);
+    return self;
+  }
+
+}
+
 /*
  * call-seq:
  *  quality=(q)
  *
  * Sets the quality of the image to +q+ (+q+ >= 0 and +q+ <= 100).
- * See Epeg::Image.quality=
+ * See Epeg::Image#quality
  */
 static VALUE rb_epeg_image_set_quality(VALUE self, VALUE q)
 {

data/ext/epeg/epeg_image.h

@@ -14,6 +14,7 @@ static VALUE rb_epeg_image_resize(VALUE, VALUE, VALUE);
 static VALUE rb_epeg_image_resize_to_fit(VALUE, VALUE, VALUE);
 static VALUE rb_epeg_image_resize_to_fill(VALUE, VALUE, VALUE);
 static VALUE rb_epeg_image_crop(int, VALUE *, VALUE);
+static VALUE rb_epeg_image_get_or_set_quality(int, VALUE *, VALUE);
 static VALUE rb_epeg_image_set_quality(VALUE, VALUE);
 
 static VALUE rb_epeg_image_write(VALUE, VALUE);

data/lib/epeg/version.rb

@@ -1,3 +1,3 @@
 module Epeg
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/{epeg.gemspec → ruby-epeg.gemspec}

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.extensions    = ["ext/epeg/extconf.rb"]
 
-  spec.add_dependency "rake-compiler", "~> 0.9"
+  spec.add_development_dependency "rake-compiler", "~> 0.9"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

data/spec/epeg_image_spec.rb

@@ -22,8 +22,8 @@ describe Epeg::Image do
     end
 
     it "should have well-defined width and height" do
-      expect(@image.width ).to eq(20)
-      expect(@image.height).to eq(10)
+      expect(@image.width ).to eq(615)
+      expect(@image.height).to eq(768)
     end
 
     it "should create new image from blob" do
@@ -37,57 +37,57 @@ describe Epeg::Image do
       File.open(@output_image.path, "wb"){ |f| f.write(blob) }
       @image_from_blob = Epeg::Image.open(@output_image.path)
 
-      expect(@image_from_blob.width ).to eq(20)
-      expect(@image_from_blob.height).to eq(10)
+      expect(@image_from_blob.width ).to be_kind_of(Fixnum)
+      expect(@image_from_blob.height).to be_kind_of(Fixnum)
     end
 
     it "should resize an image" do
-      @image.resize(2, 2)
+      @image.resize(200, 200)
       @image.write(@output_image.path)
 
       @resized_image = Epeg::Image.open(@output_image.path)
 
-      expect(@resized_image.width ).to eq(2)
-      expect(@resized_image.height).to eq(2)
+      expect(@resized_image.width ).to eq(200)
+      expect(@resized_image.height).to eq(200)
     end
 
     it "should resize an image to fit specific dimensions" do
-      @image.resize_to_fit(8,4)
+      @image.resize_to_fit(300,200)
       @image.write(@output_image.path)
 
       @resized_image = Epeg::Image.open(@output_image.path)
 
-      expect(@resized_image.width ).to eq(8)
-      expect(@resized_image.height).to eq(4)
+      expect(@resized_image.width ).to eq(161)
+      expect(@resized_image.height).to eq(200)
     end
 
     it "should resize an image to fill specific dimensions" do
-      @image.resize_to_fill(8,8)
+      @image.resize_to_fill(300,200)
       @image.write(@output_image.path)
 
       @resized_image = Epeg::Image.open(@output_image.path)
 
-      expect(@resized_image.width ).to eq(16)
-      expect(@resized_image.height).to eq(8)
+      expect(@resized_image.width ).to eq(300)
+      expect(@resized_image.height).to eq(375)
     end
 
     it "should crop an image" do
-      @image.crop(8, 8, 0, 0)
+      @image.crop(100, 100, 0, 0)
       @image.write(@output_image.path)
 
       @another_image = Epeg::Image.open(TEST_JPEG)
-      @another_image.crop(8, 8)
+      @another_image.crop(100, 100)
       @another_output_image = Tempfile.new(%w{out2 .jpg})
       @another_image.write(@another_output_image.path)
 
       @cropped_image = Epeg::Image.open(@output_image.path)
       @another_cropped_image = Epeg::Image.open(@another_output_image.path)
 
-      expect(@cropped_image.width ).to eq(8)
-      expect(@cropped_image.height).to eq(8)
+      expect(@cropped_image.width ).to eq(100)
+      expect(@cropped_image.height).to eq(100)
 
-      expect(@another_cropped_image.width ).to eq(8)
-      expect(@another_cropped_image.height).to eq(8)
+      expect(@another_cropped_image.width ).to eq(100)
+      expect(@another_cropped_image.height).to eq(100)
 
       expect(@cropped_image.to_blob).not_to eq(@another_cropped_image.to_blob)
     end
@@ -104,6 +104,13 @@ describe Epeg::Image do
       expect(@image.quality).to eq(75)
     end
 
+    it "should set quality using chainable method" do
+      image = @image.quality(50)
+
+      expect(@image.quality).to eq(50)
+      expect(image).to be_kind_of(Epeg::Image)
+    end
+
     it "should set valid quality" do
       @image.quality = 100
       @image.write(@output_image.path)

data/spec/spec_helper.rb

@@ -3,4 +3,4 @@ $LOAD_PATH.unshift( File.expand_path("../lib", ROOT) )
 
 require "epeg"
 
-TEST_JPEG = File.join(ROOT, "fixtures", "test.jpg")
+TEST_JPEG = File.join(ROOT, "fixtures", "einstein.jpg")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-epeg
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Nelson Darkwah Oppong
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-10-13 00:00:00 Z
+date: 2014-10-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake-compiler
@@ -19,7 +19,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version 
         version: "0.9"
-  type: :runtime
+  type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -67,7 +67,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- epeg.gemspec
 - ext/epeg/EPEG_LICENSE
 - ext/epeg/Epeg.h
 - ext/epeg/epeg_image.c
@@ -77,8 +76,9 @@ files:
 - ext/epeg/extconf.rb
 - lib/epeg/epeg.rb
 - lib/epeg/version.rb
+- ruby-epeg.gemspec
 - spec/epeg_image_spec.rb
-- spec/fixtures/test.jpg
+- spec/fixtures/einstein.jpg
 - spec/spec_helper.rb
 homepage: http://github.com/nelsond/ruby-epeg
 licenses: 
@@ -108,6 +108,6 @@ specification_version: 4
 summary: Ruby extension for the epeg library which provides facilities for scaling JPEG images very quickly.
 test_files: 
 - spec/epeg_image_spec.rb
-- spec/fixtures/test.jpg
+- spec/fixtures/einstein.jpg
 - spec/spec_helper.rb
 has_rdoc: