lizard 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e61377b87baa780930681ab9a2a270f3c5446ca4
-  data.tar.gz: 98770224e4aeb9f75ec7fc11aafe4f3f1694f184
+SHA256:
+  metadata.gz: 63f00a1bac30a62ffd03c7cc7a0660150769272cc316a12685ef59ccd3c3c0be
+  data.tar.gz: 8ad60b2e0f4c93fb5c102cffabeec6b3ea3b76b1d3fcb0f8fd628ec6d19be590
 SHA512:
-  metadata.gz: c694fd18380abcbfdf58ded15f14c6991b041a8f6eb910fedf62a118498580c117c660a5cfd2ba3710d09daf25d96d982ead0110074eed9d5d4d905f968d21ae
-  data.tar.gz: 2998c50c993a9eceefb752da2840b77a84935082b56fa0c58b93cfb6dab89d99f18f857cdf602e35c75bf0a251d90829b9fb40b9231615dea0f21262271777b9
+  metadata.gz: 6a8e9d888e276ba5a5f4dda4c0f3da9f645cb412058a02b8d0036ffd00ff64d602a2e99cce0b72eff6d93054b18a749a88cf11233634e214445037a3af01c08d
+  data.tar.gz: 49fd5024b86b62fc7e145b750b81246cc19eedee09e49fd6f3c4c25024923050ebc4be81b1bbeacb3a2f5462af21062097063212440121496728b351c253e297

data/lib/lizard.rb

@@ -1,16 +1,20 @@
 require 'open3'
 
 module Lizard
-
   def self.root
     File.expand_path('../../', __FILE__)
   end
 
   def self.run_command(command, input = nil)
-    stdin, stdout, stderr, wait_thr = Open3.popen3(command)
+    command = [command] unless command.is_a?(Array)
+    stdin, stdout, stderr, wait_thr = Open3.popen3(*command)
+    stdin.binmode
+    stdout.binmode
+    stderr.binmode
     stdin.write(input) if input
     stdin.close
     [stdout.read, stderr.read, wait_thr.value.to_i]
   end
-
 end
+
+require 'lizard/image'

data/lib/lizard/error.rb

@@ -9,4 +9,13 @@ module Lizard
   class ResizeFailed < Error
   end
 
+  class CropFailed < Error
+  end
+
+  class InvalidResizeMode < Error
+  end
+
+  class InvalidFileType < Error
+  end
+
 end

data/lib/lizard/image.rb

@@ -1,11 +1,13 @@
-require 'tempfile'
-require 'lizard/color_profiles'
-require 'lizard/error'
-require 'lizard/histogram'
+require "tempfile"
+require "lizard/color_profiles"
+require "lizard/error"
+require "lizard/histogram"
 
 module Lizard
   class Image
 
+    TYPES = ['jpeg', 'png', 'gif']
+
     def self.is_image?(data)
       image = Image.new(data)
       true
@@ -18,6 +20,10 @@ module Lizard
       @properties = identify
     end
 
+    def inspect
+      "#<Lizard::Image type=#{type}, size=#{width}x#{height}, bytes=#{@data.bytesize}>"
+    end
+
     def data
       @data
     end
@@ -44,19 +50,41 @@ module Lizard
 
     def color_model
       case color_space
-      when/CMYK/i then 'CMYK'
-      when /RGB/i then 'RBG'
+      when/CMYK/i then "CMYK"
+      when /RGB/i then "RBG"
       else nil
       end
     end
 
-    def resize(width, height)
-      size = "#{width}x#{height}\\>"
-      profile = "-profile " + Lizard::COLOR_PROFILES['RGB']
-      if self.color_model == 'CMYK'
-        profile = "-profile " + COLOR_PROFILES[self.color_model].to_s + " " + profile
+    def resize(width, height, mode = :resize_down_only, type = "jpeg")
+      case mode
+      when :default
+        operator = ""
+      when :resize_down_only
+        operator = ">"
+      when :fill
+        operator = "^"
+      when :ignore_aspect
+        operator = "!"
+      else
+        raise InvalidResizeMode, "#{mode} is not a valid"
       end
-      stdout, stderr, exit_code = Lizard.run_command("convert - -flatten #{profile} -resize #{size} -", @data)
+
+      unless TYPES.include?(type)
+        raise InvalidFileType, "#{type} is not valid. Choose from #{TYPES.join(', ')}"
+      end
+
+      command = [
+        'convert', '-', '-profile', Lizard::COLOR_PROFILES["RGB"], '-flatten',
+        '-resize', "#{width.to_i}x#{height.to_i}#{operator}",
+        "#{type}:-"
+      ]
+      if self.color_model == "CMYK"
+        command.insert(4, '-profile')
+        command.insert(5, COLOR_PROFILES[self.color_model].to_s)
+      end
+
+      stdout, stderr, exit_code = Lizard.run_command(command, @data)
       if exit_code == 0
         Image.new(stdout)
       else
@@ -64,6 +92,20 @@ module Lizard
       end
     end
 
+    def crop(width, height, type = "jpeg")
+      unless TYPES.include?(type)
+        raise InvalidFileType, "#{type} is not valid. Choose from #{TYPES.join(', ')}"
+      end
+
+      command = ['convert', '-', '-gravity', 'center', '-extent', "#{width.to_i}x#{height.to_i}", "#{type}:-"]
+      stdout, stderr, exit_code = Lizard.run_command(command, @data)
+      if exit_code == 0
+        Image.new(stdout)
+      else
+        raise CropFailed, "Image could not be cropped (#{stderr})"
+      end
+    end
+
     def histogram
       @histogram ||= Histogram.new(@data)
     end
@@ -74,7 +116,7 @@ module Lizard
       stdout, stderr, exit_code = Lizard.run_command(%Q{identify -format "Lizard||%m||%[resolution.x]x%[resolution.y]||%wx%h||%r" -}, @data)
       if exit_code == 0 && stdout =~ /\ALizard\|\|/
         _, type, resolution, size, color_space = stdout.split("||")
-        width, height = size.split('x')
+        width, height = size.split("x")
         {:type => type, :resolution => resolution, :width => width, :height => height, :size => size, :color_space => color_space}
       else
         raise NotAnImage, stderr

data/lib/lizard/version.rb

@@ -1,3 +1,3 @@
 module Lizard
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lizard
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-10 00:00:00.000000000 Z
+date: 2018-03-05 00:00:00.000000000 Z
 dependencies: []
 description: Very simple ImageMagick interface for Ruby
 email:
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Very simple ImageMagick interface for Ruby