tinyimg 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 167b894e73f7dad09bfff8a20d4374d2dcd822f2
-  data.tar.gz: f92b7f089edb704b6d60cc0c3d58420b444b9d10
+  metadata.gz: 974d95b03df2d7a90c238049b4083912464b8616
+  data.tar.gz: ee647517f46360743859de3c5aca8b02be3ee59c
 SHA512:
-  metadata.gz: 56d0aa8dd6ca5fab4572ee9bf04416c8d6a90b0a0c5046f23f45fd9d03008aa71acabec8f5c10a5d702e3c0190a42b758e22438189ecb934d5c8d938a1f852f1
-  data.tar.gz: 5533db6f10236e0eff9a4edb42758a354779ccf5339b22184a24c853a02d37f512bd0d03a4af5f0d41ffa095a0e7930c3bc1f89b2b66fa0c5e6b0f0e3804a9c8
+  metadata.gz: fe80301f446341e671ec3d116f912fea97744817c1ddf4d9923b7c95e50c32d5df3b1e9dde81da975e318b1de49042ee516f37adce89b15eb7a89b518c9bf31e
+  data.tar.gz: 4fffdcd8475a7f547ec3fdd1d9856ce078cbbda8920f2ac357237e6f750ca9c6488e52056c7727eb2a5c1cc33c6b628d50806ffe5083334ad2606c9a13220e26

data/ext/tinyimg/tinyimg.c

@@ -1,6 +1,11 @@
 #include <ruby.h>
 #include <gd.h>
 
+VALUE get_error_class(VALUE self)
+{
+  return rb_const_get_at(rb_class_of(self), rb_intern("Error"));
+}
+
 gdImagePtr get_image_data(VALUE self)
 {
   gdImagePtr image;
@@ -52,11 +57,11 @@ VALUE load_from_string(VALUE self, VALUE input, VALUE type)
     image = gdImageCreateFromJpegPtr(RSTRING_LEN(input), RSTRING_PTR(input));
   }
   else {
-    rb_raise(rb_eArgError, "type must be a supported image type");
+    rb_raise(get_error_class(self), "type must be a supported image type");
   }
 
   if (!image) {
-    rb_raise(rb_eRuntimeError, "Error loading image data");
+    rb_raise(get_error_class(self), "Error loading image data");
   }
 
   set_image_data(self, image);
@@ -76,7 +81,7 @@ VALUE load_from_file(VALUE self, VALUE filename)
 
   image = gdImageCreateFromFile(StringValueCStr(filename));
   if (!image) {
-    rb_raise(rb_eRuntimeError, "Error loading image data");
+    rb_raise(get_error_class(self), "Error loading image data");
   }
 
   set_image_data(self, image);
@@ -124,7 +129,7 @@ VALUE save_to_file(VALUE self, VALUE filename)
   result = gdImageFile(image, StringValueCStr(filename));
 
   if (result == GD_FALSE) {
-    rb_raise(rb_eRuntimeError, "Unknown error occurred while trying to save the file; check it is using a known filename");
+    rb_raise(get_error_class(self), "Unknown error occurred while trying to save the file; check it is using a known filename");
   }
 
   return self;
@@ -149,14 +154,14 @@ VALUE to_jpeg(int argc, VALUE *argv, VALUE self)
   }
 
   if (quality < -1 || quality > 100) {
-    rb_raise(rb_eArgError, "Quality must be between 0 and 100, or -1 for default");
+    rb_raise(get_error_class(self), "Quality must be between 0 and 100, or -1 for default");
   }
 
   image = get_image_data(self);
 
   image_data = (char *) gdImageJpegPtr(image, &size, quality);
   if (!image_data) {
-    rb_raise(rb_eRuntimeError, "Unknown error occurred while trying to build a JPEG");
+    rb_raise(get_error_class(self), "Unknown error occurred while trying to build a JPEG");
   }
 
   VALUE output = rb_str_new(image_data, size);
@@ -184,7 +189,7 @@ VALUE to_png(int argc, VALUE *argv, VALUE self)
     compression = FIX2INT(compression_value);
 
     if (compression < 0 || compression > 9) {
-      rb_raise(rb_eArgError, "Compression must be between 0 and 9");
+      rb_raise(get_error_class(self), "Compression must be between 0 and 9");
     }
 
 #ifdef HAVE_GDIMAGEPNGPTREX
@@ -195,7 +200,7 @@ VALUE to_png(int argc, VALUE *argv, VALUE self)
   }
 
   if (!image_data) {
-    rb_raise(rb_eRuntimeError, "Unknown error occurred while trying to build a PNG");
+    rb_raise(get_error_class(self), "Unknown error occurred while trying to build a PNG");
   }
 
   VALUE output = rb_str_new(image_data, size);
@@ -215,7 +220,7 @@ VALUE resize_exact_bang(VALUE self, VALUE width_value, VALUE height_value)
   height = FIX2INT(height_value);
 
   if (width <= 0 || height <= 0) {
-    rb_raise(rb_eArgError, "width and height must both be positive integers");
+    rb_raise(get_error_class(self), "width and height must both be positive integers");
   }
 
   image_in = get_image_data(self);
@@ -251,21 +256,21 @@ VALUE internal_crop_bang(VALUE self, VALUE x_value, VALUE y_value, VALUE width_v
   height = FIX2INT(height_value);
 
   if (x < 0 || y < 0) {
-    rb_raise(rb_eArgError, "x, y must both be zero or positive integers");
+    rb_raise(get_error_class(self), "x, y must both be zero or positive integers");
   }
 
   if (width <= 0 || height <= 0) {
-    rb_raise(rb_eArgError, "width and height must both be positive integers");
+    rb_raise(get_error_class(self), "width and height must both be positive integers");
   }
 
   image_in = get_image_data(self);
 
   if (x + width > gdImageSX(image_in)) {
-    rb_raise(rb_eArgError, "x + width is greater than the original image's width");
+    rb_raise(get_error_class(self), "x + width is greater than the original image's width");
   }
 
   if (y + height > gdImageSY(image_in)) {
-    rb_raise(rb_eArgError, "y + height is greater than the original image's height");
+    rb_raise(get_error_class(self), "y + height is greater than the original image's height");
   }
 
   image_out = gdImageCreateTrueColor(width, height);
@@ -284,6 +289,7 @@ void Init_tinyimg()
 {
   VALUE cTinyimg = rb_define_class("Tinyimg", rb_cObject);
   rb_define_class_under(cTinyimg, "Image", rb_cObject);
+  rb_define_class_under(cTinyimg, "Error", rb_const_get(rb_cObject, rb_intern("StandardError")));
 
   rb_define_method(cTinyimg, "resize_exact!", resize_exact_bang, 2);
   rb_define_method(cTinyimg, "to_jpeg", to_jpeg, -1);

data/lib/tinyimg.rb

@@ -33,7 +33,7 @@ class Tinyimg
       width, height = convert_hash_to_exact_dimensions(args.first)
       resize_exact!(width, height)
     else
-      raise ArgumentError, "#resize and #resize! accept either (width, height) or a hash with :width and/or :height keys"
+      raise Error, "#resize and #resize! accept either (width, height) or a hash with :width and/or :height keys"
     end
   end
 
@@ -138,7 +138,7 @@ class Tinyimg
     elsif data[0, 8].unpack("C*") == [137, 80, 78, 71, 13, 10, 26, 10]
       :png
     else
-      raise ArgumentError, "Only JPEG and PNG files are supported"
+      raise Error, "Only JPEG and PNG files are supported"
     end
   end
 
@@ -147,17 +147,17 @@ class Tinyimg
     when 'jpeg', 'jpg' then :jpeg
     when 'png'         then :png
     else
-      raise ArgumentError, "Cannot determine image type based on the filename"
+      raise Error, "Cannot determine image type based on the filename"
     end
   end
 
   def convert_hash_to_exact_dimensions(opts)
     if opts.empty? || !(opts.keys - [:width, :height]).empty?
-      raise ArgumentError, "expected either :width or :height or both keys"
+      raise Error, "expected either :width or :height or both keys"
     end
 
     if opts.values.any? { |v| !v.is_a?(Fixnum) }
-      raise ArgumentError, ":width and :height values must be integers"
+      raise Error, ":width and :height values must be integers"
     end
 
     new_width, new_height = opts[:width], opts[:height]

data/spec/tinyimg_spec.rb

@@ -94,19 +94,19 @@ RSpec.describe Tinyimg do
     end
 
     it "raises if other keys are provided" do
-      expect { sample.resize!(something: 123) }.to raise_error(ArgumentError)
+      expect { sample.resize!(something: 123) }.to raise_error(Tinyimg::Error)
     end
 
     it "raises if non-integer values are provided" do
-      expect { sample.resize!(width: "123") }.to raise_error(ArgumentError)
+      expect { sample.resize!(width: "123") }.to raise_error(Tinyimg::Error)
     end
 
     it "raises if no keys are provided" do
-      expect { sample.resize! }.to raise_error(ArgumentError)
+      expect { sample.resize! }.to raise_error(Tinyimg::Error)
     end
 
     it "raises if only one argument is provided" do
-      expect { sample.resize!(123) }.to raise_error(ArgumentError)
+      expect { sample.resize!(123) }.to raise_error(Tinyimg::Error)
     end
   end
 
@@ -153,9 +153,9 @@ RSpec.describe Tinyimg do
     end
 
     it "raises if the requested area is not inside the original image" do
-      expect { sample.crop!(x: 10, y: 20, width: 195, height: 40) }.to raise_error(ArgumentError)
-      expect { sample.crop!(x: 10, y: 20, width: 95, height: 140) }.to raise_error(ArgumentError)
-      expect { sample.crop!(width: 95, height: 160) }.to raise_error(ArgumentError)
+      expect { sample.crop!(x: 10, y: 20, width: 195, height: 40) }.to raise_error(Tinyimg::Error)
+      expect { sample.crop!(x: 10, y: 20, width: 95, height: 140) }.to raise_error(Tinyimg::Error)
+      expect { sample.crop!(width: 95, height: 160) }.to raise_error(Tinyimg::Error)
     end
   end
 

data/tinyimg.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name = 'tinyimg'
-  gem.version = '0.1.1'
+  gem.version = '0.1.2'
   gem.summary = "Tiny and fast JPEG/PNG cropping and resizing"
   gem.description = "Convert between JPEG/PNG, crop and resize images, either all in memory or via disk.  Only requires libgd to function."
   gem.has_rdoc = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tinyimg
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Roger Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec