morandi 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 699363674b014c312fbf514929f5d9a68bc7710c
-  data.tar.gz: a3a8dc47dfb8e4b2a3c09904d44bd0ab32240043
+  metadata.gz: 60d7fd200d3a6c22ff2bc5b3defd81619c9f553d
+  data.tar.gz: 63ddd6689c0a505ced3f8059b3e4a0c0bdd2fc51
 SHA512:
-  metadata.gz: 522a4bda18dfe5f5c5326f56385c2bf45bc0e14f5b2dd2946234be72e1d322d5b835e8cd3487e69d824d674bdd31daf508d67389f35fbdb0d8842e25ece61b39
-  data.tar.gz: 06b08143b66b203c290e2b2493db345ac3d34ef82d95d663d5496fae9bcd965cef9b54dffb50ad9647ed349cc09f52dc5f474734ead26cad6da6f5feb56b3361
+  metadata.gz: 4500480f00a35c6ad07a167960236d23958967ab304662b1436cfa1d3fdf4922506fdb1270cdf297f15f0e4511c82609116cd90ce8e284dbb661ba526bfe8138
+  data.tar.gz: a2b83980c5b944d9d2783aecc87a820a0ba9dcb1aa3fc284430dd87cc8045a4cd735f25c065fdb7952d6a1725ab78cf165a5a3ca004b11bf6f87a36275631ba9

data/lib/morandi.rb

@@ -24,20 +24,27 @@ module Morandi
   rescue
     false
   end
+  def self.default_icc_path(path)
+    "#{path}.icc.jpg"
+  end
 
-  def initialize(file, scale_to, options)
+  def initialize(file, user_options, local_options={})
     @file = file
-    #@size = size
-    @scale_to = scale_to
-    @options = options || {}
 
-    @width, @height = options['output.width'], options['output.height']
+    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 = "#{@file}.icc.jpg"
+      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
@@ -101,7 +108,7 @@ module Morandi
     #STDERR.puts "FILTER: #{options.inspect}"
     if options['brighten'].to_i.nonzero?
       brighten = [ [ 5 * options['brighten'], -100 ].max, 100 ].min
-      STDERR.puts([:brighten, brighten].inspect)
+      #STDERR.puts([:brighten, brighten].inspect)
       @pb = PixbufUtils.brightness(@pb, brighten)
     end
     if options['gamma'] && (options['gamma'] != 1.0)
@@ -171,6 +178,10 @@ module Morandi
       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)
     }
@@ -243,8 +254,8 @@ module Morandi
 end
 
   module_function
-  def process(file_in, settings, out_file)
-    pro = ImageProcessor.new(file_in, settings['output.max'], settings)
+  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

data/lib/morandi/image-ops.rb

@@ -1,3 +1,6 @@
+require 'pango'
+require 'colorscore'
+
 module Morandi
 class ImageOp
   class << self

data/lib/morandi/version.rb

@@ -1,3 +1,3 @@
 module Morandi
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/morandi.gemspec

@@ -22,6 +22,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "cairo"
   spec.add_dependency "pixbufutils"
   spec.add_dependency "redeye"
+  spec.add_dependency "pango"
+  spec.add_dependency "colorscore"
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"

data/spec/morandi_spec.rb

@@ -28,6 +28,39 @@ RSpec.describe Morandi, "#process_to_file" do
       expect(h).to eq(300)
     end
 
+    it "should use user supplied path.icc" do
+      src = 'sample/sample.jpg'
+      icc = '/tmp/this-is-secure-thing.jpg'
+      default_icc = Morandi::ImageProcessor.default_icc_path(src)
+      out = 'sample/out_icc.jpg'
+      File.unlink(default_icc) rescue nil
+      Morandi.process(src, { }, out, { 'path.icc' => icc })
+      expect(File).to exist(icc)
+      expect(File).not_to exist(default_icc)
+    end
+
+    it "should ignore user supplied path.icc" do
+      src = 'sample/sample.jpg'
+      icc = '/tmp/this-is-insecure-thing.jpg'
+      default_icc = Morandi::ImageProcessor.default_icc_path(src)
+      File.unlink(icc) rescue 0
+      File.unlink(default_icc) rescue 0
+      out = 'sample/out_icc.jpg'
+      Morandi.process(src, { 'path.icc' => icc, 'output.max' => 200 }, out)
+      expect(File).not_to exist(icc)
+      expect(File).to exist(default_icc)
+    end
+
+    it "should do cropping of images with a string" do
+      Morandi.process("sample/sample.jpg", {
+        'crop' => "10,10,300,300"
+      }, out="sample/out_crop.jpg")
+      expect(File.exist?(out))
+      _,w,h = Gdk::Pixbuf.get_file_info(out)
+      expect(w).to eq(300)
+      expect(h).to eq(300)
+    end
+
     it "should reduce the size of images" do
       Morandi.process("sample/sample.jpg", {
         'output.max' => 200

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morandi
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - |+
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-17 00:00:00.000000000 Z
+date: 2015-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gdk_pixbuf2
@@ -69,6 +69,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pango
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorscore
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement