morandi 0.9.3 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b446e58f8982945add37c6917e14057b30215d0
-  data.tar.gz: 856a29d43ed9b0a20e2749ecc05d35909b0fbdac
+  metadata.gz: 9709ee0d1808ab9b751fa10623c35081f774bb24
+  data.tar.gz: b10b4fadc2db8deb3e922b104f72245d6df1202a
 SHA512:
-  metadata.gz: 7263157b0d52a46fc73e8d096401ee216a93c370c47d0e2a1bbaf8dd463c00df664a05bfc3872b09596142148fa4414bcb8b6747c3e7f86229db120b607d15c5
-  data.tar.gz: 3af5276793f707bc7f4aa2e594eb1a810ad1bfc8fe8aa89aa96fe68a22e317a584fc9ffab5d492141b18e3b81185062c1a50bb516cda1a571089915d530f6b39
+  metadata.gz: f2b0bc4172387a86d735142205c98e3747f018f8a7ddf40e0a3277782669ab017ba3d7b5b8204d83edfbeeef92589771820960a527ae10005a839bfda7314916
+  data.tar.gz: a1b0dff226051a77efa68291f2e6d207505fff81878ab41180f35eca8e7df66fcd9631f3e05683751b943d0a26efbae9c4e0162b79e839cfe53f7c096478d85a

data/lib/morandi.rb

@@ -5,260 +5,17 @@ require 'gdk_pixbuf2'
 require 'pixbufutils'
 require 'redeye'
 
+require 'morandi/image_processor'
 require 'morandi/utils'
 require 'morandi/image-ops'
 require 'morandi/redeye'
 
 module Morandi
-  # Your code goes here...
-  class ImageProcessor
-  attr_reader :options, :pb
-  attr_accessor :config
-
-  def valid_jpeg?(filename)
-    return false unless File.exist?(filename)
-    return false unless File.size(filename) > 0
-
-    type, _, _ = Gdk::Pixbuf.get_file_info(filename)
-
-    type.name == 'jpeg'
-  rescue
-    false
-  end
-  def self.default_icc_path(path)
-    "#{path}.icc.jpg"
-  end
-
-  def initialize(file, user_options, local_options={})
-    @file = file
-
-    user_options.keys.grep(/^path/).each { |k| user_options.delete(k) }
-
-    # Give priority to user_options
-    @options = (local_options || {}).merge(user_options || {})
-    @local_options = local_options
-
-    @scale_to = @options['output.max']
-    @width, @height = @options['output.width'], @options['output.height']
-
-    load_file = @file
-    type, width, height = Gdk::Pixbuf.get_file_info(load_file)
-
-    if type.name.eql?('jpeg')
-      icc_file = local_options['path.icc'] || ImageProcessor.default_icc_path(@file)
-      if valid_jpeg?(icc_file) || system("jpgicc", "-q97", @file, icc_file)
-        load_file = icc_file
-      end
-    end
-
-    if @scale_to
-      @pb = Gdk::Pixbuf.new(load_file, @scale_to, @scale_to)
-      @src_max = [width, height].max
-      @actual_max = [@pb.width, @pb.height].max
-    else
-      @pb = Gdk::Pixbuf.new(load_file)
-      @src_max = [@pb.width, @pb.height].max
-      @actual_max = [@pb.width, @pb.height].max
-    end
-
-    @scale = @actual_max / @src_max.to_f
-  end
-
-  def process!
-    # Apply Red-Eye corrections
-    apply_redeye!
-
-    # Apply contrast, brightness etc
-    apply_colour_manipulations!
-
-    # apply rotation
-    apply_rotate!
-
-    # apply crop
-    apply_crop!
-
-    # apply filter
-    apply_filters!
-
-    # add border
-    apply_decorations!
-
-    if @options['output.limit'] && @width && @height
-      @pb = @pb.scale_max([@width, @height].max)
-    end
-
-    @pb
-  end
-
-  SHARPEN = [
-    -1, -1, -1, -1, -1,
-    -1,  2,  2,  2, -1,
-    -1,  2,  8,  2, -1,
-    -1,  2,  2,  2, -1,
-    -1, -1, -1, -1, -1,
-  ]
-  BLUR = [
-    0, 1, 1, 1, 0,
-    1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1,
-    0, 1, 1, 1, 0,
-  ]
-
-  def apply_colour_manipulations!
-    #STDERR.puts "FILTER: #{options.inspect}"
-    if options['brighten'].to_i.nonzero?
-      brighten = [ [ 5 * options['brighten'], -100 ].max, 100 ].min
-      #STDERR.puts([:brighten, brighten].inspect)
-      @pb = PixbufUtils.brightness(@pb, brighten)
-    end
-    if options['gamma'] && (options['gamma'] != 1.0)
-      @pb = PixbufUtils.gamma(@pb, options['gamma'])
-    end
-    if options['contrast'].to_i.nonzero?
-      @pb = PixbufUtils.contrast(@pb, [ [ 5 * options['contrast'], -100 ].max, 100 ].min)
-    end
-    if options['sharpen'].to_i.nonzero?
-      if options['sharpen'] > 0
-        [options['sharpen'], 5].min.times do
-          @pb = PixbufUtils.filter(@pb, SHARPEN, SHARPEN.inject(0, &:+))
-        end
-      elsif options['sharpen'] < 0
-        [ (options['sharpen']*-1), 5].min.times do
-          @pb = PixbufUtils.filter(@pb, BLUR, BLUR.inject(0, &:+))
-        end
-      end
-    end
-  end
-
-  def apply_redeye!
-    for eye in options['redeye'] || []
-      @pb = Morandi::RedEye.tap_on(@pb, eye[0] * @scale, eye[1] * @scale)
-    end
-  end
-
-  def angle
-    a = options['angle'].to_i
-    if a
-      (360-a)%360
-    else
-      nil
-    end
-  end
-
-  # modifies @pb with any applied rotation
-  def apply_rotate!
-    a = angle()
-
-    unless (a%360).zero?
-      @pb = @pb.rotate(a)
-    end
-
-    unless options['straighten'].to_f.zero?
-      @pb = Morandi::Straighten.new(options['straighten'].to_f).call(nil, @pb)
-    end
-
-    @image_width = @pb.width
-    @image_height = @pb.height
-  end
-
-  DEFAULT_CONFIG = {
-    'border-size-mm' => 5
-  }
-  def config_for(key)
-    return options[key] if options && options.has_key?(key)
-    return @config[key] if @config && @config.has_key?(key)
-    DEFAULT_CONFIG[key]
-  end
-
-  #
-  def apply_crop!
-    crop = options['crop']
-
-    if crop.nil? && config_for('image.auto-crop').eql?(false)
-      return
-    end
-
-    if crop.is_a?(String) && crop =~ /^\d+,\d+,\d+,\d+/
-      crop = crop.split(/,/).map(&:to_i)
-    end
-
-    crop = nil unless crop.is_a?(Array) && crop.size.eql?(4) && crop.all? { |i|
-      i.kind_of?(Numeric)
-    }
-
-    # can't crop, won't crop
-    return if @width.nil? && @height.nil? && crop.nil?
-
-    if crop && @scale != 1.0
-      crop = crop.map { |s| (s.to_f * @scale).floor  }
-    end
-
-    crop ||= Morandi::Utils.autocrop_coords(@pb.width, @pb.height, @width, @height)
-
-    @pb = Morandi::Utils.apply_crop(@pb, crop[0], crop[1], crop[2], crop[3])
-  end
-
-
-  def apply_filters!
-    filter = options['fx']
-
-    case filter
-    when 'greyscale'
-      op = Morandi::Colourify.new_from_hash('op' => filter)
-    when 'sepia', 'bluetone'
-      op = Morandi::Colourify.new_from_hash('op' => filter, 'alpha' => (0.85 * 255).to_i)
-    else
-      return
-    end
-    @pb = op.call(nil, @pb)
-  end
-
-  def apply_decorations!
-    style, colour = options['border-style'], options['background-style']
-
-    return if style.nil? or style.eql?('none')
-    return if colour.eql?('none')
-    colour ||= 'black'
-
-    crop = options['crop']
-    crop = crop.map { |s| (s.to_f * @scale).floor  } if crop && @scale != 1.0
-
-    op = Morandi::ImageBorder.new_from_hash(data={
-      'style' => style,
-      'colour' => colour || '#000000',
-      'crop' => crop,
-      'size' => [@image_width, @image_height],
-      'print_size' => [@width, @height],
-      'shrink'  => true,
-      'border_size' => @scale * config_for('border-size-mm').to_i * 300 / 25.4 # 5mm at 300dpi
-    })
-
-    @pb = op.call(nil, @pb)
-  end
-
-  def write_to_png(fn, orientation=:any)
-    pb = @pb
-
-    case orientation
-    when :landscape
-      pb = @pb.rotate(90) if @pb.width < @pb.height
-    when :portrait
-      pb = @pb.rotate(90) if @pb.width > @pb.height
-    end
-    pb.save(fn, 'png')
-  end
-
-  def write_to_jpeg(fn, quality = 97)
-    @pb.save(fn, 'jpeg', :quality => quality)
-  end
-end
-
   module_function
   def process(file_in, options, out_file, local_options = {})
     pro = ImageProcessor.new(file_in, options, local_options)
     pro.process!
     pro.write_to_jpeg(out_file)
   end
-
 end
+

data/lib/morandi/image_processor.rb

@@ -0,0 +1,242 @@
+require 'morandi/profiled_pixbuf'
+
+class Morandi::ImageProcessor
+  attr_reader :options, :pb
+  attr_accessor :config
+
+  def self.default_icc_path(path)
+    "#{path}.icc.jpg"
+  end
+
+  def initialize(file, user_options, local_options={})
+    @file = file
+
+    user_options.keys.grep(/^path/).each { |k| user_options.delete(k) }
+
+    # Give priority to user_options
+    @options = (local_options || {}).merge(user_options || {})
+    @local_options = local_options
+
+    @scale_to = @options['output.max']
+    @width, @height = @options['output.width'], @options['output.height']
+
+    if @file.is_a?(String)
+      get_pixbuf
+    elsif @file.is_a?(Gdk::Pixbuf) or @file.is_a?(Morandi::ProfiledPixbuf)
+      @pb = @file
+    end
+  end
+
+  def process!
+    # Apply Red-Eye corrections
+    apply_redeye!
+
+    # Apply contrast, brightness etc
+    apply_colour_manipulations!
+
+    # apply rotation
+    apply_rotate!
+
+    # apply crop
+    apply_crop!
+
+    # apply filter
+    apply_filters!
+
+    # add border
+    apply_decorations!
+
+    if @options['output.limit'] && @width && @height
+      @pb = @pb.scale_max([@width, @height].max)
+    end
+
+    @pb
+  end
+
+  def result
+    @pb
+  end
+
+  def write_to_png(fn, orientation=:any)
+    pb = @pb
+
+    case orientation
+    when :landscape
+      pb = @pb.rotate(90) if @pb.width < @pb.height
+    when :portrait
+      pb = @pb.rotate(90) if @pb.width > @pb.height
+    end
+    pb.save(fn, 'png')
+  end
+
+  def write_to_jpeg(fn, quality = 97)
+    @pb.save(fn, 'jpeg', :quality => quality)
+  end
+
+protected
+  def get_pixbuf
+    _, width, height = Gdk::Pixbuf.get_file_info(@file)
+
+    if @scale_to
+      @pb = Morandi::ProfiledPixbuf.new(@file, @scale_to, @scale_to, @local_options)
+      @src_max = [width, height].max
+      @actual_max = [@pb.width, @pb.height].max
+    else
+      @pb = Morandi::ProfiledPixbuf.new(@file, @local_options)
+      @src_max = [@pb.width, @pb.height].max
+      @actual_max = [@pb.width, @pb.height].max
+    end
+
+    @scale = @actual_max / @src_max.to_f
+  end
+
+  SHARPEN = [
+    -1, -1, -1, -1, -1,
+    -1,  2,  2,  2, -1,
+    -1,  2,  8,  2, -1,
+    -1,  2,  2,  2, -1,
+    -1, -1, -1, -1, -1,
+  ]
+  BLUR = [
+    0, 1, 1, 1, 0,
+    1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1,
+    0, 1, 1, 1, 0,
+  ]
+
+  def apply_colour_manipulations!
+    if options['brighten'].to_i.nonzero?
+      brighten = [ [ 5 * options['brighten'], -100 ].max, 100 ].min
+      @pb = PixbufUtils.brightness(@pb, brighten)
+    end
+
+    if options['gamma'] && (options['gamma'] != 1.0)
+      @pb = PixbufUtils.gamma(@pb, options['gamma'])
+    end
+
+    if options['contrast'].to_i.nonzero?
+      @pb = PixbufUtils.contrast(@pb, [ [ 5 * options['contrast'], -100 ].max, 100 ].min)
+    end
+
+    if options['sharpen'].to_i.nonzero?
+      if options['sharpen'] > 0
+        [options['sharpen'], 5].min.times do
+          @pb = PixbufUtils.filter(@pb, SHARPEN, SHARPEN.inject(0, &:+))
+        end
+      elsif options['sharpen'] < 0
+        [ (options['sharpen']*-1), 5].min.times do
+          @pb = PixbufUtils.filter(@pb, BLUR, BLUR.inject(0, &:+))
+        end
+      end
+    end
+  end
+
+  def apply_redeye!
+    for eye in options['redeye'] || []
+      @pb = Morandi::RedEye.tap_on(@pb, eye[0] * @scale, eye[1] * @scale)
+    end
+  end
+
+  def angle
+    a = options['angle'].to_i
+    if a
+      (360-a)%360
+    else
+      nil
+    end
+  end
+
+  # modifies @pb with any applied rotation
+  def apply_rotate!
+    a = angle()
+
+    unless (a%360).zero?
+      @pb = @pb.rotate(a)
+    end
+
+    unless options['straighten'].to_f.zero?
+      @pb = Morandi::Straighten.new(options['straighten'].to_f).call(nil, @pb)
+    end
+
+    @image_width = @pb.width
+    @image_height = @pb.height
+  end
+
+  DEFAULT_CONFIG = {
+    'border-size-mm' => 5
+  }
+  def config_for(key)
+    return options[key] if options && options.has_key?(key)
+    return @config[key] if @config && @config.has_key?(key)
+    DEFAULT_CONFIG[key]
+  end
+
+  #
+  def apply_crop!
+    crop = options['crop']
+
+    if crop.nil? && config_for('image.auto-crop').eql?(false)
+      return
+    end
+
+    if crop.is_a?(String) && crop =~ /^\d+,\d+,\d+,\d+/
+      crop = crop.split(/,/).map(&:to_i)
+    end
+
+    crop = nil unless crop.is_a?(Array) && crop.size.eql?(4) && crop.all? { |i|
+      i.kind_of?(Numeric)
+    }
+
+    # can't crop, won't crop
+    return if @width.nil? && @height.nil? && crop.nil?
+
+    if crop && @scale != 1.0
+      crop = crop.map { |s| (s.to_f * @scale).floor  }
+    end
+
+    crop ||= Morandi::Utils.autocrop_coords(@pb.width, @pb.height, @width, @height)
+
+    @pb = Morandi::Utils.apply_crop(@pb, crop[0], crop[1], crop[2], crop[3])
+  end
+
+
+  def apply_filters!
+    filter = options['fx']
+
+    case filter
+    when 'greyscale'
+      op = Morandi::Colourify.new_from_hash('op' => filter)
+    when 'sepia', 'bluetone'
+      op = Morandi::Colourify.new_from_hash('op' => filter, 'alpha' => (0.85 * 255).to_i)
+    else
+      return
+    end
+    @pb = op.call(nil, @pb)
+  end
+
+  def apply_decorations!
+    style, colour = options['border-style'], options['background-style']
+
+    return if style.nil? or style.eql?('none')
+    return if colour.eql?('none')
+    colour ||= 'black'
+
+    crop = options['crop']
+    crop = crop.map { |s| (s.to_f * @scale).floor  } if crop && @scale != 1.0
+
+    op = Morandi::ImageBorder.new_from_hash(data={
+      'style' => style,
+      'colour' => colour || '#000000',
+      'crop' => crop,
+      'size' => [@image_width, @image_height],
+      'print_size' => [@width, @height],
+      'shrink'  => true,
+      'border_size' => @scale * config_for('border-size-mm').to_i * 300 / 25.4 # 5mm at 300dpi
+    })
+
+    @pb = op.call(nil, @pb)
+  end
+
+end
+

data/lib/morandi/profiled_pixbuf.rb

@@ -0,0 +1,46 @@
+require 'gdk_pixbuf2'
+
+class Morandi::ProfiledPixbuf < Gdk::Pixbuf
+  def valid_jpeg?(filename)
+    return false unless File.exist?(filename)
+    return false unless File.size(filename) > 0
+
+    type, _, _ = Gdk::Pixbuf.get_file_info(filename)
+
+    type && type.name.eql?('jpeg')
+  rescue
+    false
+  end
+
+  def self.default_icc_path(path)
+    "#{path}.icc.jpg"
+  end
+
+  def initialize(*args)
+    @local_options = args.last.is_a?(Hash) && args.pop || {}
+
+    if args[0].is_a?(String)
+      @file = args[0]
+
+      if suitable_for_jpegicc?
+        icc_file = icc_cache_path
+
+        args[0] = icc_file if valid_jpeg?(icc_file) || system("jpgicc", "-q97", @file, icc_file)
+      end
+    end
+
+    super(*args)
+  end
+
+
+  protected
+  def suitable_for_jpegicc?
+    type, _, _ = Gdk::Pixbuf.get_file_info(@file)
+
+    type && type.name.eql?('jpeg')
+  end
+
+  def icc_cache_path
+    @local_options['path.icc'] || Morandi::ProfiledPixbuf.default_icc_path(@file)
+  end
+end

data/lib/morandi/version.rb

@@ -1,3 +1,3 @@
 module Morandi
-  VERSION = "0.9.3"
+  VERSION = "0.10.0"
 end

data/spec/morandi_spec.rb

@@ -18,6 +18,13 @@ RSpec.describe Morandi, "#process_to_file" do
       expect(original[2]).to eq(w)
     end
 
+    it "should accept pixbufs as an argument" do
+      pixbuf = Gdk::Pixbuf.new("sample/sample.jpg")
+      pro = Morandi::ImageProcessor.new(pixbuf, {}, {})
+      pro.process!
+      expect(pixbuf.width).to eq(pro.result.width)
+    end
+
     it "should do cropping of images" do
       Morandi.process("sample/sample.jpg", {
         'crop' => [10,10,300,300]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morandi
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.10.0
 platform: ruby
 authors:
 - |+
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-18 00:00:00.000000000 Z
+date: 2015-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk2
@@ -168,6 +168,8 @@ files:
 - Rakefile
 - lib/morandi.rb
 - lib/morandi/image-ops.rb
+- lib/morandi/image_processor.rb
+- lib/morandi/profiled_pixbuf.rb
 - lib/morandi/redeye.rb
 - lib/morandi/utils.rb
 - lib/morandi/version.rb