ruby-epeg 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  data.tar.gz: 4a4adfdee32d2e98f4e0295ef9996e6a0f832783
-  metadata.gz: 82a4dc0962796b79cb6dada7dab7f574943f5b0a
-SHA512: 
-  data.tar.gz: 2ac71eb95371a8325a679fdb7f703a46828ea236993295c917044d1f77584d0288846fe8e82609cc198b2b0cce4ffe6880f2546168fa572e5581936d7bce3912
-  metadata.gz: 143ec94beb4ddd840fb1bd23d692db4e24dcdd3455a42053ff5cf04cfab0c7a0f89432a3d1f1cda803d4325130832fc43c149d7c11381b9fd8bdb43b89d2539b
+---
+SHA1:
+  metadata.gz: 54cb66dfeb952a5db8b4b33c81f7287adf226e30
+  data.tar.gz: 4ff7b023ff043d833d4c2de2364d5102ef4da2fa
+SHA512:
+  metadata.gz: 9101a5de68dc589f6b5cced9f842e45a3e06d8b8800704c60113da15b204de53836fcd9f2dd3fef3aa48a7e6ccb7308742f68957a08ca3ae5e87891f3cdcde13
+  data.tar.gz: 0fc99ecec595dff2dbc5be253794856827ae3cc5fcbbb9b0fa774860ac0e61ecbe16523717bd218091fa3c36f0d6948b8b12f3c988ce5779938a94f9789bb815

data/README.md

@@ -23,8 +23,9 @@ Or install it yourself as:
 ```ruby
 require "epeg"
 
-# Set the global default jpeg quality
-Epeg::Image.quality = 90 # default is 85
+# Get and set the global default jpeg quality
+Epeg::Image.default_quality # => 85
+Epeg::Image.default_quality = 90
 
 # Create an image object from the file some-image.jpg
 image = Epeg::Image.open("./some-image.jpg")

data/Rakefile

@@ -9,3 +9,7 @@ task :test    => :spec
 
 require "rake/extensiontask"
 Rake::ExtensionTask.new("epeg")
+
+task :valgrind => [:compile] do
+  system("valgrind --leak-check=yes ruby #{ROOT}/spec/runner.rb")
+end

data/ext/epeg/epeg_image.c

@@ -7,10 +7,10 @@ void Init_epeg()
 
   rb_cv_set(cEpegImage, "@@quality", INT2NUM(85));
 
-  rb_define_singleton_method(cEpegImage, "from_blob", rb_epeg_image_from_blob,           1);
-  rb_define_singleton_method(cEpegImage, "open",      rb_epeg_image_open,                1);
-  rb_define_singleton_method(cEpegImage, "quality=",  rb_epeg_image_set_default_quality, 1);
-  rb_define_singleton_method(cEpegImage, "quality",   rb_epeg_image_get_default_quality, 0);
+  rb_define_singleton_method(cEpegImage, "from_blob",        rb_epeg_image_from_blob,           1);
+  rb_define_singleton_method(cEpegImage, "open",             rb_epeg_image_open,                1);
+  rb_define_singleton_method(cEpegImage, "default_quality=", rb_epeg_image_set_default_quality, 1);
+  rb_define_singleton_method(cEpegImage, "default_quality",  rb_epeg_image_get_default_quality, 0);
 
   rb_define_method(cEpegImage, "initialize", rb_epeg_image_initialize,  0);
 
@@ -69,12 +69,11 @@ static VALUE rb_epeg_image_from_blob(VALUE klass, VALUE blob)
 
 /*
  * call-seq:
- *  quality=(q)
+ *  default_quality=(q)
  *
  * Sets the default quality (+q+ >= 0 and +q+ <= 100)
- * See Epeg::Image#quality=
  *
- *     Epeg::Image.quality = 10
+ *     Epeg::Image.default_quality = 10
  */
 static VALUE rb_epeg_image_set_default_quality(VALUE klass, VALUE q)
 {
@@ -88,12 +87,11 @@ static VALUE rb_epeg_image_set_default_quality(VALUE klass, VALUE q)
 
 /*
  * call-seq:
- *  quality
+ *  default_quality
  *
  * Returns the current default quality for all images.
- * See Epeg::Image#quality
  *
- *     Epeg::Image.quality #=> 85
+ *     Epeg::Image.default_quality #=> 85
  */
 static VALUE rb_epeg_image_get_default_quality(VALUE klass)
 {
@@ -102,7 +100,7 @@ static VALUE rb_epeg_image_get_default_quality(VALUE klass)
 
 /*
  * call-seq:
- *  intialize(file_path)
+ *  intialize()
  *
  * See Epeg::Image.open
  */
@@ -115,14 +113,13 @@ 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;
+  int w, h;
   epeg_size_get(image, &w, &h);
 
-  rb_iv_set(self, "@width",     UINT2NUM(w));
-  rb_iv_set(self, "@height",    UINT2NUM(h));
+  rb_iv_set(self, "@width",     INT2NUM(w));
+  rb_iv_set(self, "@height",    INT2NUM(h));
 
   rb_iv_set(self, "epeg_file_closed", Qfalse);
   rb_iv_set(self, "epeg_trimmed",     Qfalse);
@@ -235,7 +232,7 @@ static VALUE rb_epeg_image_resize_to_fill(VALUE self, VALUE w, VALUE h)
 
 /*
  * call-seq:
- *  cropp(w, h, (x, y))
+ *  cropp(w, h, [x, y])
  *
  * Crops image to +w+ x +h+. If +x+ and +y+ are not specified the image is
  * cropped with the center gravity.
@@ -246,28 +243,46 @@ static VALUE rb_epeg_image_crop(int argc, VALUE *argv, VALUE self)
     rb_raise(rb_eArgError, "wrong number of arguments (%d for 2 or 4)", argc);
   }
 
-  unsigned int w, h, x, y, i;
+  Check_Type(argv[0], T_FIXNUM);
+  Check_Type(argv[1], T_FIXNUM);
 
-  if(argc == 2) {
-    for(i = 0; i < 2; i++) { Check_Type(argv[i], T_FIXNUM); }
+  unsigned int w = NUM2UINT(argv[0]);
+  unsigned int h = NUM2UINT(argv[1]);
+
+  unsigned int iw = NUM2UINT(rb_iv_get(self, "@width"));
+  unsigned int ih = NUM2UINT(rb_iv_get(self, "@height"));
+
+  unsigned int x, y;
 
-    w = NUM2UINT(argv[0]);
-    h = NUM2UINT(argv[1]);
+  if(w > iw){ w = iw; }
+  if(h > ih){ h = ih; }
 
-    x = (unsigned int)(   ceil(  (double)NUM2UINT( rb_iv_get(self, "@width")  )/2 ) - (double)w/2   );
-    y = (unsigned int)(   ceil(  (double)NUM2UINT( rb_iv_get(self, "@height") )/2 ) - (double)w/2   );
+  // crop with gravity = center
+  if(argc == 2) {
+    x = (int)(  ceil( ((double)iw - (double)w)/2 )  );
+    y = (int)(  ceil( ((double)ih - (double)h)/2 )  );
   }
 
+  // crop with origin at (x,y)
   if (argc == 4) {
-    for(i = 0; i < 4; i++) { Check_Type(argv[i], T_FIXNUM); }
-
-    w = NUM2UINT(argv[0]);
-    h = NUM2UINT(argv[1]);
+    Check_Type(argv[2], T_FIXNUM);
+    Check_Type(argv[3], T_FIXNUM);
 
-    x = NUM2UINT(argv[2]);
-    y = NUM2UINT(argv[3]);
+    x = NUM2INT(argv[2]);
+    y = NUM2INT(argv[3]);
   }
 
+  if (x >= iw) { x = iw - 1; }
+  if (y >= ih) { y = ih - 1; }
+
+  if (w + x >= iw) { w = iw - x; }
+  if (h + y >= ih) { h = ih - y; }
+
+  // FIXME: epeg doesn't seem to be able to set bounds to (0,0,iw,ih)
+  //        and encode/write the image to memory or file
+  if (w == iw) { w--; }
+  if (h == ih) { h--; }
+
   Epeg_Image *image;
   Data_Get_Struct(self, Epeg_Image, image);
 
@@ -289,7 +304,7 @@ static void rb_epeg_image_encode_or_trim(VALUE obj, Epeg_Image *image) {
     status = epeg_encode(image);
   }
 
-  if(status != 0) { rb_raise(rb_eRuntimeError, "Error: can't encode"); }
+  if(status != 0) {  rb_raise(rb_eRuntimeError, "Error: can't encode"); }
 }
 
 /*
@@ -314,7 +329,6 @@ static VALUE rb_epeg_image_write(VALUE self, VALUE file_path)
   epeg_file_output_set(image, StringValueCStr(file_path));
   rb_epeg_image_encode_or_trim(self, image);
 
-  rb_iv_set(self, "epeg_file_closed", Qtrue);
   rb_epeg_image_close(self);
 
   return Qnil;
@@ -337,7 +351,7 @@ static VALUE rb_epeg_image_to_blob(VALUE self)
   Epeg_Image *image;
   Data_Get_Struct(self, Epeg_Image, image);
 
-  unsigned char *data;
+  char *data;
   int size;
 
   epeg_memory_output_set(image, &data, &size);
@@ -346,7 +360,6 @@ static VALUE rb_epeg_image_to_blob(VALUE self)
   VALUE blob = rb_str_new(data, size);
   free(data);
 
-  rb_iv_set(self, "epeg_file_closed", Qtrue);
   rb_epeg_image_close(self);
 
   return blob;

data/lib/epeg/version.rb

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

data/spec/epeg_image_spec.rb

@@ -12,7 +12,7 @@ describe Epeg::Image do
 
   context "when loading a valid jpeg file" do
     around(:each) do |example|
-      Epeg::Image.quality = 75
+      Epeg::Image.default_quality = 75
       @image = Epeg::Image.open(TEST_JPEG)
       @output_image = Tempfile.new(%w{out .jpg})
 
@@ -92,6 +92,25 @@ describe Epeg::Image do
       expect(@cropped_image.to_blob).not_to eq(@another_cropped_image.to_blob)
     end
 
+    it "should not crop beyond image size" do
+      @image.crop(2000, 1000, 2000, 1000)
+      @image.write(@output_image.path)
+
+      @another_image = Epeg::Image.open(TEST_JPEG)
+      @another_image.crop(2000, 10000)
+      @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(1)
+      expect(@cropped_image.height).to eq(1)
+
+      expect(@another_cropped_image.width ).to eq(614)
+      expect(@another_cropped_image.height).to eq(767)
+    end
+
     it "should not write image after closing" do
       @image.close
 

data/spec/runner.rb

@@ -0,0 +1,3 @@
+require "rspec"
+
+RSpec::Core::Runner.run(["./epeg_image_spec.rb"])

metadata

@@ -1,66 +1,79 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby-epeg
-version: !ruby/object:Gem::Version 
-  version: 0.1.1
+version: !ruby/object:Gem::Version
+  version: 0.1.2
 platform: ruby
-authors: 
+authors:
 - Nelson Darkwah Oppong
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-10-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-10-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake-compiler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.9"
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.7"
+      - !ruby/object:Gem::Version
+        version: '1.7'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "10.0"
+      - !ruby/object:Gem::Version
+        version: '10.0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: 
-email: 
+email:
 - ndo@felixnelson.de
 executables: []
-
-extensions: 
+extensions:
 - ext/epeg/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -79,35 +92,36 @@ files:
 - ruby-epeg.gemspec
 - spec/epeg_image_spec.rb
 - spec/fixtures/einstein.jpg
+- spec/runner.rb
 - spec/spec_helper.rb
 homepage: http://github.com/nelsond/ruby-epeg
-licenses: 
+licenses:
 - MIT
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - &id005 
-    - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id005
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: Ruby extension for the epeg library which provides facilities for scaling JPEG images very quickly.
-test_files: 
+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/einstein.jpg
+- spec/runner.rb
 - spec/spec_helper.rb
 has_rdoc: