rszr 0.5.3 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7322db19722cd5afc93e887fabe4031fa3a3064949956dc3bac562299918f10
-  data.tar.gz: 8c03c8922f29d3f7989f427018e7baeb6f09c4c9f561fef1b6a92a80f4042ec8
+  metadata.gz: bfbe455a6a95a6fc5161b65c03450e66e3e7165794556abd90cfef22da5a1f32
+  data.tar.gz: 1ced66bb5a143f23d55dd1496fc79cf29d58b529138405741f93ba6379e62ba5
 SHA512:
-  metadata.gz: 82b7c3ea10061666bacd712c39319ef36f19b2aecce3fa89556c591c0ef6f2cedf10b0fb1ed4ee6ac8613cfb40904b7e42306cd08d247d2653ca3135450244ba
-  data.tar.gz: 52cac4fe43b0feb24e6fb837fdbed69bb4c91e53807ef5d5821c5ab1793d41a698632e1b342e8b14fed0219db080d05179d37eeb6fcef91e8052b66205c2ab07
+  metadata.gz: 007c4d61f001ec86a6be7db860a68edf61f1eac63dfbf1b55afc24e51aa4033248b9224a3706b53c2887555812c0eeaac1d7e62ef66c40e0dd0544c8d67642a3
+  data.tar.gz: ef41050b95a085ba6d1fd87c26596e3387a9eb6b248e1d0f741c079dcabaa381912e9c07f28916ff8739df29c903513c0cf78e22384396f5a16384428f6b8014

data/README.md

@@ -12,16 +12,17 @@ In your Gemfile:
 gem 'rszr'
 ```
 
-### Imlib2
+### Imlib2 and libexif
 
-Rszr requires the Imlib2 library to do the heavy lifting.
+Rszr requires the `Imlib2` library to do the heavy lifting.
+`libexif` is required for EXIF auto orientation.
 
 #### OS X
 
 Using homebrew:
 
 ```bash
-brew install imlib2
+brew install imlib2 libexif
 ```
 
 #### Linux
@@ -29,11 +30,11 @@ brew install imlib2
 Using your favourite package manager:
 
 ```bash
-yum install imlib2 imlib2-devel
+yum install imlib2 imlib2-devel libexif libexif-devel
 ```
 
 ```bash
-apt-get install libimlib2 libimlib2-dev
+apt-get install libimlib2 libimlib2-dev libexif libexif-dev
 ```
 
 ## Usage
@@ -99,6 +100,16 @@ image.dimensions => [400, 300]
 image.format => "jpeg"
 ```
 
+### Image auto orientation
+
+```ruby
+# load and autorotate
+image = Rszr::Image.load('image.jpg', autorotate: true)
+
+# auto-rotate by default, for Rails apps put this into an initializer
+Rszr.autorotate = true
+```
+
 ## Rails / ActiveStorage interface
 
 Rszr provides a drop-in interface to the `image_resizing` gem.

data/ext/rszr/errors.c

@@ -44,7 +44,7 @@ static void rszr_raise_error_with_message(VALUE rb_error_class, Imlib_Load_Error
 {
   int error_index = (int) error - 1;
   if (error_index < 1 || error_index > RSZR_MAX_ERROR_INDEX)
-    error_index = 13;
+    error_index = RSZR_MAX_ERROR_INDEX;
   VALUE rb_error = rb_exc_new2(rb_error_class, sRszrErrorMessages[error_index]);
   rb_exc_raise(rb_error);
 }

data/ext/rszr/extconf.rb

@@ -15,4 +15,11 @@ unless find_library('Imlib2', 'imlib_set_cache_size')
   abort 'Imlib2 is missing'
 end
 
+unless find_library('exif', 'exif_data_new_from_file')
+  abort 'libexif is missing'
+end
+
+have_library('exif')
+have_header('libexif/exif-data.h')
+
 create_makefile 'rszr/rszr'

data/ext/rszr/image.c

@@ -28,6 +28,42 @@ static void rszr_image_deallocate(rszr_image_handle * handle)
 }
 
 
+static void rszr_image_autorotate(Imlib_Image image, char * path)
+{
+  ExifData * exifData;
+  ExifByteOrder byteOrder;
+  ExifEntry * exifEntry;
+  int orientation = 0;
+  int turns = 0;
+  
+  exifData = exif_data_new_from_file(path);
+  
+  if (exifData) {
+    byteOrder = exif_data_get_byte_order(exifData);
+    exifEntry = exif_data_get_entry(exifData, EXIF_TAG_ORIENTATION);
+    if (exifEntry) {
+      orientation = exif_get_short(exifEntry->data, byteOrder);
+    }
+  }
+
+  if (orientation < 2 || orientation > 8) return;
+  
+  imlib_context_set_image(image);
+  
+  if (orientation == 2 || orientation == 4 || orientation == 5 || orientation == 7) {
+    imlib_image_flip_horizontal();
+  }
+  
+  if (orientation == 5 || orientation == 6) {
+    imlib_image_orientate(1);
+  } else if (orientation == 3 || orientation == 4) {
+    imlib_image_orientate(2);
+  } else if (orientation == 7 || orientation == 8) {
+    imlib_image_orientate(3);
+  }
+}
+
+
 static VALUE rszr_image_s_allocate(VALUE klass)
 {
   rszr_image_handle * handle = calloc(1, sizeof(rszr_image_handle));
@@ -50,7 +86,7 @@ static VALUE rszr_image_initialize(VALUE self, VALUE rb_width, VALUE rb_height)
 }
 
 
-static VALUE rszr_image_s__load(VALUE klass, VALUE rb_path)
+static VALUE rszr_image_s__load(VALUE klass, VALUE rb_path, VALUE autorotate)
 {
   rszr_image_handle * handle;
   Imlib_Image image;
@@ -68,6 +104,8 @@ static VALUE rszr_image_s__load(VALUE klass, VALUE rb_path)
     return Qnil;
   }
   
+  if (RTEST(autorotate)) rszr_image_autorotate(image, path);
+  
   oImage = rszr_image_s_allocate(cImage);
   Data_Get_Struct(oImage, rszr_image_handle, handle);
   handle->image = image;
@@ -246,7 +284,24 @@ static VALUE rszr_image__rotate(VALUE self, VALUE bang, VALUE rb_angle)
   }
 }
 
-/*
+
+static VALUE rszr_image_filter_bang(VALUE self, VALUE rb_filter_expr)
+{
+  rszr_image_handle * handle;
+  Imlib_Image image;
+  char * filter_expr;
+  
+  filter_expr = StringValueCStr(rb_filter_expr);
+  
+  Data_Get_Struct(self, rszr_image_handle, handle);
+  
+  imlib_context_set_image(handle->image);
+  imlib_apply_filter(filter_expr);
+  
+  return self;
+}
+
+
 static VALUE rszr_image__brighten_bang(VALUE self, VALUE rb_brightness)
 {
   rszr_image_handle * handle;
@@ -254,12 +309,14 @@ static VALUE rszr_image__brighten_bang(VALUE self, VALUE rb_brightness)
   
   brightness = NUM2DBL(rb_brightness);
   
+  Data_Get_Struct(self, rszr_image_handle, handle);
+  
   imlib_context_set_image(handle->image);
-  imlib_modify_color_modifier_brightness(brightness);
+  imlib_apply_filter("brightness(10);");
   
   return self;
 }
-*/
+
 
 static VALUE rszr_image__sharpen_bang(VALUE self, VALUE rb_radius)
 {
@@ -419,7 +476,7 @@ void Init_rszr_image()
   rb_define_alloc_func(cImage, rszr_image_s_allocate);
 
   // Class methods
-  rb_define_private_method(rb_singleton_class(cImage), "_load", rszr_image_s__load, 1);
+  rb_define_private_method(rb_singleton_class(cImage), "_load", rszr_image_s__load, 2);
 
   // Instance methods
   rb_define_method(cImage, "initialize",  rszr_image_initialize, 2);
@@ -427,6 +484,8 @@ void Init_rszr_image()
   rb_define_method(cImage, "height",      rszr_image_height, 0);
   rb_define_method(cImage, "format",      rszr_image_format_get, 0);
   rb_define_method(cImage, "dup",         rszr_image_dup, 0);
+  rb_define_method(cImage, "filter!",     rszr_image_filter_bang, 1);
+  
   // rb_define_method(cImage, "quality",     rszr_image_get_quality, 0);
   // rb_define_method(cImage, "quality=",    rszr_image_set_quality, 1);
   
@@ -437,7 +496,7 @@ void Init_rszr_image()
   rb_define_private_method(cImage, "_turn!",   rszr_image__turn_bang, 1);
   rb_define_private_method(cImage, "_rotate",  rszr_image__rotate, 2);
   rb_define_private_method(cImage, "_sharpen!",   rszr_image__sharpen_bang, 1);
-  /* rb_define_private_method(cImage, "_brighten!",  rszr_image__brighten_bang, 1); */
+  rb_define_private_method(cImage, "_brighten!",  rszr_image__brighten_bang, 1);
   
   rb_define_private_method(cImage, "_save",       rszr_image__save, 3);
 }

data/ext/rszr/rszr.h

@@ -3,6 +3,7 @@
 
 #include "ruby.h"
 #include <Imlib2.h>
+#include <libexif/exif-data.h>
 
 extern VALUE mRszr;
 void Init_rszr();

data/lib/rszr.rb

@@ -4,3 +4,17 @@ require 'pathname'
 require 'rszr/rszr'
 require 'rszr/version'
 require 'rszr/image'
+
+module Rszr
+  class << self
+    @@autorotate = nil
+    
+    def autorotate
+      @@autorotate
+    end
+  
+    def autorotate=(value)
+      @@autorotate = !!value
+    end
+  end
+end

data/lib/rszr/batch_transformation.rb

@@ -0,0 +1,24 @@
+module Rszr
+  class BatchTransformation
+    attr_reader :transformations, :image
+    
+    def initialize(path, **opts)
+      puts "INITIALIZED BATCH for #{path}"
+      @image = path.is_a?(Image) ? path : Image.load(path, **opts)
+      @transformations = []
+    end
+    
+    Image::Transformations.instance_methods.grep(/\w\z/) do |method|
+      define_method method do |*args|
+        transformations << [method, args]
+        self
+      end
+    end
+    
+    def call
+      transformations.each { |method, args| image.public_send("#{method}!", *args) }
+      image
+    end
+  
+  end
+end

data/lib/rszr/image.rb

@@ -1,12 +1,12 @@
 module Rszr
   class Image
-
+    
     class << self
       
-      def load(path, **opts)
+      def load(path, autorotate: Rszr.autorotate, **opts)
         path = path.to_s
         raise FileNotFound unless File.exist?(path)
-        _load(path)
+        _load(path, autorotate)
       end
       alias :open :load
       
@@ -43,7 +43,7 @@ module Rszr
       def crop!(x, y, width, height)
         _crop(true, x, y, width, height)
       end
-    
+      
       def turn(orientation)
         dup.turn!(orientation)
       end
@@ -79,11 +79,36 @@ module Rszr
         _sharpen!(-radius)
       end
       
-      # TODO
-      #def brighten!(brightness)
-      #  raise ArgumentError, 'illegal brightness' if brightness > 1 || brightness < -1
-      #  _brighten!(brightness)
-      #end
+      def filter(filter_expr)
+        dup.filter!(filter_expr)
+      end
+      
+      def brighten!(value, r: nil, g: nil, b: nil, a: nil)
+        raise ArgumentError, 'illegal brightness' if value > 1 || value < -1
+        filter!("colormod(brightness=#{value.to_f});")
+      end
+      
+      def brighten(*args)
+        dup.brighten!(*args)
+      end
+      
+      def contrast!(value, r: nil, g: nil, b: nil, a: nil)
+        raise ArgumentError, 'illegal contrast (must be > 0)' if value < 0
+        filter!("colormod(contrast=#{value.to_f});")
+      end
+      
+      def contrast(*args)
+        dup.contrast!(*args)
+      end
+      
+      def gamma!(value, r: nil, g: nil, b: nil, a: nil)
+        #raise ArgumentError, 'illegal gamma (must be > 0)' if value < 0
+        filter!("colormod(gamma=#{value.to_f});")
+      end
+      
+      def gamma(*args)
+        dup.gamma!(*args)
+      end
     end
     
     include Transformations
@@ -91,7 +116,6 @@ module Rszr
     def save(path, format: nil, quality: nil)
       format ||= format_from_filename(path) || self.format || 'jpg'
       raise ArgumentError, "invalid quality #{quality.inspect}" if quality && !(0..100).cover?(quality)
-      ensure_path_is_writable(path)
       _save(path.to_s, format.to_s, quality)
     end
 
@@ -112,7 +136,7 @@ module Rszr
       x, y, = 0, 0
       if args.size == 1
         scale = args.first
-        raise ArgumentError, "scale #{scale.inspect} out of range" unless scale > 0 && scale < 1
+        raise ArgumentError, "scale factor #{scale.inspect} out of range" unless scale > 0 && scale < 1
         new_width = original_width.to_f * scale
         new_height = original_height.to_f * scale
       elsif args.size == 2
@@ -147,18 +171,9 @@ module Rszr
       end
       [x, y, original_width, original_height, new_width.round, new_height.round]
     end
-    
+
     def format_from_filename(path)
-      File.extname(path)[1..-1]
-    end
-    
-    def ensure_path_is_writable(path)
-      path = Pathname.new(path)
-      path.dirname.realpath.writable?
-    rescue Errno::ENOENT => e
-      raise SaveError, 'Non-existant path component'
-    rescue SystemCallError => e
-      raise SaveError, e.message
+      File.extname(path)[1..-1].to_s.downcase
     end
 
     def assert_valid_keys(hsh, *valid_keys)

data/lib/rszr/image_processing.rb

@@ -47,7 +47,7 @@ module ImageProcessing
         end
 
       end
-
+      
       # Resizes the image to not be larger than the specified dimensions.
       def resize_to_limit(width, height, **options)
         width, height = default_dimensions(width, height)

data/lib/rszr/version.rb

@@ -1,3 +1,3 @@
 module Rszr
-  VERSION = '0.5.3'
+  VERSION = '0.7.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rszr
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.7.1
 platform: ruby
 authors:
 - Matthias Grosser
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-13 00:00:00.000000000 Z
+date: 2021-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -197,6 +197,7 @@ files:
 - ext/rszr/rszr.c
 - ext/rszr/rszr.h
 - lib/rszr.rb
+- lib/rszr/batch_transformation.rb
 - lib/rszr/image.rb
 - lib/rszr/image_processing.rb
 - lib/rszr/version.rb
@@ -204,7 +205,7 @@ homepage: https://github.com/mtgrosser/rszr
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -220,9 +221,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- Imlib2
+- imlib2
+- libexif
 rubygems_version: 3.1.4
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Fast image resizer
 test_files: []