jekyll-imgflow 0.3.2 → 0.4.0

data/lib/jekyll-imgflow/tags/crop_tag.rb

@@ -9,25 +9,16 @@ module JekyllImgFlow
       def process(input_path, output_path, options = {})
         ensure_output_dir(output_path)
 
-        # Validate that crop information is provided
         ratio = options[:ratio] || options[:aspect_ratio]
         has_pixel_crop = options[:width] || options[:height]
 
-        unless ratio || has_pixel_crop
-          raise ArgumentError,
-                "Crop operation requires ratio or at least one dimension (width or height)"
-        end
+        validate_crop_request(ratio, has_pixel_crop)
 
         if ratio
-          # Handle aspect ratio cropping (e.g., "16:9", "4:3")
           validate_ratio(ratio)
           handle_aspect_ratio_crop(input_path, output_path, ratio, options)
         else
-          # Handle pixel-based cropping with flexible dimensions
-          validate_positive_integer(options[:width], "width") if options[:width]
-          validate_positive_integer(options[:height], "height") if options[:height]
-          validate_positive_integer(options[:x], "x") if options[:x]
-          validate_positive_integer(options[:y], "y") if options[:y]
+          validate_pixel_dimensions(options)
           handle_pixel_crop(input_path, output_path, options)
         end
 
@@ -36,16 +27,25 @@ module JekyllImgFlow
 
       private
 
+      def validate_crop_request(ratio, has_pixel_crop)
+        return if ratio || has_pixel_crop
+
+        raise ArgumentError,
+              "Crop operation requires ratio or at least one dimension (width or height)"
+      end
+
+      def validate_pixel_dimensions(options)
+        validate_positive_integer(options[:width], "width") if options[:width]
+        validate_positive_integer(options[:height], "height") if options[:height]
+        validate_positive_integer(options[:x], "x") if options[:x]
+        validate_positive_integer(options[:y], "y") if options[:y]
+      end
+
       # Handle aspect ratio cropping
       def handle_aspect_ratio_crop(input_path, _output_path, ratio, options)
         # Calculate optimal crop dimensions for the aspect ratio
         calculated_options = calculate_aspect_ratio_dimensions(input_path, ratio, options)
-
-        # Add keep parameter for smartcrop (JPT compatibility)
-        if options[:keep] && %w[attention entropy center
-                                centre].include?(options[:keep].to_s)
-          calculated_options[:keep] = options[:keep]
-        end
+        add_keep_option(calculated_options, options[:keep])
 
         # Pass ratio and calculated options to provider (uniform interface)
         @provider.crop(ratio, calculated_options)
@@ -53,57 +53,34 @@ module JekyllImgFlow
 
       # Handle flexible pixel-based cropping
       def handle_pixel_crop(input_path, _output_path, options)
-        # Get original image dimensions
         original_width, original_height = get_original_dimensions(input_path)
 
-        # Parse dimensions (support pixels and percentages)
         crop_width = parse_dimension(options[:width], original_width)
         crop_height = parse_dimension(options[:height], original_height)
 
-        # At least one dimension must be specified
         raise ArgumentError, "At least width or height must be specified for cropping" unless crop_width || crop_height
 
         # Calculate missing dimension if only one provided
-        if crop_width && !crop_height
-          crop_height = original_height  # Keep original height
-        elsif crop_height && !crop_width
-          crop_width = original_width    # Keep original width
-        end
+        crop_width ||= original_width # Keep original width
+        crop_height ||= original_height # Keep original height
 
         # Parse positions with smart defaults - always provide values
         crop_x = parse_position_with_default(options[:x], crop_width, original_width)
         crop_y = parse_position_with_default(options[:y], crop_height, original_height)
 
-        # Validate crop area is not bigger than original
         validate_crop_dimensions(crop_x, crop_y, crop_width, crop_height, original_width,
                                  original_height)
 
-        # Build crop options with keep parameter support
-        crop_options = {
-          x: crop_x,
-          y: crop_y,
-          width: crop_width,
-          height: crop_height
-        }
+        crop_options = { x: crop_x, y: crop_y, width: crop_width, height: crop_height }
+        add_keep_option(crop_options, options[:keep])
 
-        # Add keep parameter for smartcrop (JPT compatibility)
-        if options[:keep] && %w[attention entropy center
-                                centre].include?(options[:keep].to_s)
-          crop_options[:keep] = options[:keep]
-        end
-
-        # Execute crop with calculated dimensions
         @provider.crop(nil, crop_options)
       end
 
-      # Get original image dimensions using FastImage
-      def get_original_dimensions(input_path)
-        require "fastimage"
-        original_width, original_height = FastImage.size(input_path)
-
-        raise ArgumentError, "Unable to determine original image dimensions" unless original_width && original_height
+      def add_keep_option(crop_options, keep)
+        return unless keep && %w[attention entropy center centre].include?(keep.to_s)
 
-        [original_width, original_height]
+        crop_options[:keep] = keep
       end
 
       # Parse dimension (supports pixels and percentages)

data/lib/jekyll-imgflow/tags/opacity_tag.rb

@@ -13,31 +13,12 @@ module JekyllImgFlow
         opacity = options[:opacity]
         raise ArgumentError, "Opacity parameter is required" if opacity.nil?
 
-        validated_opacity = validate_opacity(opacity)
+        validated_opacity = validate_opacity(opacity, min: 0.01, max: 0.99)
 
         @provider.alpha_opacity = validated_opacity
         @provider.execute(input_path, output_path)
         output_path
       end
-
-      private
-
-      def validate_opacity(value)
-        # Check if value is numeric before converting
-        raise ArgumentError, "Invalid opacity: '#{value}'. Must be between 0.01 and 0.99." unless valid_numeric?(value)
-
-        opacity = value.to_f
-        raise ArgumentError, "Invalid opacity: '#{value}'. Must be between 0.01 and 0.99." unless opacity.between?(0.01, 0.99)
-
-        opacity
-      end
-
-      def valid_numeric?(value)
-        Float(value)
-        true
-      rescue ArgumentError, TypeError
-        false
-      end
     end
   end
 end

data/lib/jekyll-imgflow/tags/optimize_tag.rb

@@ -38,15 +38,6 @@ module JekyllImgFlow
 
         quality
       end
-
-      def validate_quality(value)
-        return @default_quality if value.nil?
-
-        quality = value.to_i
-        raise ArgumentError, "Invalid quality: '#{value}'. Must be between 1 and 100." unless quality.between?(1, 100)
-
-        quality
-      end
     end
   end
 end

data/lib/jekyll-imgflow/tags/quality_tag.rb

@@ -15,17 +15,6 @@ module JekyllImgFlow
         @provider.quality = quality
         @provider.execute(input_path, output_path)
       end
-
-      private
-
-      def validate_quality(value)
-        return @default_quality if value.nil?
-
-        quality = value.to_i
-        raise ArgumentError, "Invalid quality: '#{value}'. Must be between 1 and 100." unless quality.between?(1, 100)
-
-        quality
-      end
     end
   end
 end

data/lib/jekyll-imgflow/tags/resize_tag.rb

@@ -13,23 +13,13 @@ module JekyllImgFlow
         width = validate_positive_integer(options[:width], "width")
         height = validate_positive_integer(options[:height], "height")
 
-        # At least one dimension must be specified
         raise ArgumentError, "Either width or height must be specified for resize operation." if width.nil? && height.nil?
 
         # Get original dimensions
         original_width, original_height = get_image_dimensions(input_path)
 
         # Calculate missing dimension to maintain aspect ratio ONLY when one dimension is missing
-        if width.nil? && height
-          # Only height provided - calculate width to maintain aspect ratio
-          aspect_ratio = original_width.to_f / original_height
-          width = (height * aspect_ratio).round
-        elsif height.nil? && width
-          # Only width provided - calculate height to maintain aspect ratio
-          aspect_ratio = original_height.to_f / original_width
-          height = (width * aspect_ratio).round
-        end
-        # If both width and height are provided, use them as-is (allows aspect ratio changes)
+        width, height = calculate_missing_dimension(width, height, original_width, original_height)
 
         # Calculate scale factors for provider
         scale_x = width && original_width ? width.to_f / original_width : nil
@@ -54,6 +44,23 @@ module JekyllImgFlow
         result
       end
 
+      private
+
+      def calculate_missing_dimension(width, height, original_width, original_height)
+        if width.nil? && height
+          # Only height provided - calculate width to maintain aspect ratio
+          aspect_ratio = original_width.to_f / original_height
+          [(height * aspect_ratio).round, height]
+        elsif height.nil? && width
+          # Only width provided - calculate height to maintain aspect ratio
+          aspect_ratio = original_height.to_f / original_width
+          [width, (width * aspect_ratio).round]
+        else
+          # If both width and height are provided, use them as-is (allows aspect ratio changes)
+          [width, height]
+        end
+      end
+
       # validate_positive_integer inherited from BaseTag
     end
   end

data/lib/jekyll-imgflow/tags/watermark_tag.rb

@@ -36,23 +36,6 @@ module JekyllImgFlow
         else position.to_s
         end
       end
-
-      def validate_opacity(value)
-        # Check if value is numeric before converting
-        raise ArgumentError, "Invalid opacity: '#{value}'. Must be between 0.0 and 1.0." unless valid_numeric?(value)
-
-        opacity = value.to_f
-        raise ArgumentError, "Invalid opacity: '#{value}'. Must be between 0.0 and 1.0." unless opacity.between?(0.0, 1.0)
-
-        opacity
-      end
-
-      def valid_numeric?(value)
-        Float(value)
-        true
-      rescue ArgumentError, TypeError
-        false
-      end
     end
   end
 end

data/lib/jekyll-imgflow/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JekyllImgFlow
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-imgflow
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Svend Gundestrup