imogen 0.0.7 → 0.0.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTNlYjI5NTE1YzU0ZDIzNTQ2ODBkZGFlMGZiODhkYzQyZjg5ZDlmMg==
+    MTE0MzdjYjBkMjM2YTRlMTBlYjg1NzI2YzIyOTgxOGU5YjIxZmNlOA==
   data.tar.gz: !binary |-
-    NDU2ZmNiZDc3YTkwZDQ5NTQ2ZDE4Zjc1MTQ0MjdlMTg3NmQyODYwZA==
+    MzkzOGYxMzcyM2EzNjI2ZWJhYmJlZTA4NjAxZjgyN2MzNWNkMjVkNQ==
 SHA512:
   metadata.gz: !binary |-
-    NmYwOGVhMDlhMzdkZGE0NjZkOWQzOGZjNThkZDI1ZTFjZTg5MTU0NGIwNzY4
-    ZmRhMjgzMTQ2MjgyMTY0OTQxMGE3OTdmYjllYzRiOTk0ZDkwNmI0MTQzOWNk
-    MWQ5YmNmZDAyZWUxMjc1OTAxNzY4NGY5OTgwYmM3MDA2ODk0NzI=
+    Y2VjZjBmZGMwMTZiNjQ2MWZkYjA2MjYyZTQ2NTUyNzUyNGNhNThhNmZiMDU3
+    MjNhMGZlMTQ0MWI4MmVkYTE3NTYyNzNmMmNkYWNjYmFiMWVmZDZiNzZkOGNk
+    NzZmMDFiNjM5NjJkMDIyOThlYzcxOGEyOTJlODkyZGJhYTE2MmI=
   data.tar.gz: !binary |-
-    YmZhYTJlNDE2ZTQxNWY3YTNjMTY0NTJiNmM5ZGJlZDIyNWI0ZDU2NmQ1YzQ1
-    YjBlMTAyMDQ5ZTRhZTg1YjBmNDUzOTQ3MzRkMDY3MGM0MzcyMTc2MmFhNWNi
-    MjgwYWU4ZTM0MjVkNjZhMTkzMTY2ZDRjMGNkNzhhNTkyMWE3MmE=
+    MjRmZWJkNGI0YmQwNTY4MzM4YjVjODI4ZmNiMjlkNDk1OTE2YWNlMGM0MjM1
+    Nzk3NTZiOTlkZDU0MDJjYjJhZDJiYjM3ZDljMDJhMmY4NDZiOTkxYjgyODM0
+    OTIyZDkyZDA1M2QyZTY5M2IzZjQ0MmM2NWE5OGNlYzU3NmIxMjM=

data/lib/imogen/iiif/region.rb

@@ -0,0 +1,53 @@
+#!ruby
+
+module Imogen
+module Iiif
+class Region < Transform
+  # returns leftX, topY, rightX, bottomY
+  def get(region=nil)
+    if region.nil? || region == 'full'
+      return nil
+    elsif md = /^pct:(\d+(\.\d+)?),(\d+(\.\d+)?),(\d+(\.\d+)?),(\d+(\.\d+)?)$/.match(region)
+      p = [Float(md[1]),Float(md[3]),Float(md[5]),Float(md[7])]
+      if p[0] == p[2] or p[1] == p[3]
+        raise BadRequest.new("Invalid region: #{region}")
+      end
+      e = [
+        max(0,(@width * p[0] / 100).round),
+        max(0,(@height * p[1] / 100).round),
+        min(@width,(@width * (p[0] + p[2]) / 100).round),
+        min(@height,(@height * (p[1] + p[3]) / 100).round)
+      ]
+    elsif md = /^(\d+),(\d+),(\d+),(\d+)$/.match(region)
+      p = [Integer(md[1]),Integer(md[2]),Integer(md[3]),Integer(md[4])]
+      if p[0] == p[2] or p[1] == p[3]
+        raise BadRequest.new("Invalid region: #{region}")
+      end
+      e = [
+        max(0,p[0]),
+        max(0,p[1]),
+        min(@width,(p[0] + p[2])),
+        min(@height,(p[1] + p[3]))
+      ]
+    else
+      raise BadRequest.new("Invalid region: #{region}")
+    end
+    if e[0] > e[2] or e[1] > e[3]
+      raise BadRequest.new("Invalid region: #{region}")
+    end
+    if (e[2] - e[0]) * (e[3] - e[1]) < 100
+      raise BadRequest.new("Region too small: #{region}")
+    end
+    return e
+  end
+  def self.convert(img, region)
+    edges = Region.new(img).get(region)
+    if edges
+      img.copy(*edges) {|crop| yield crop}
+    else
+      yield img
+    end
+  end
+end
+end
+end

data/lib/imogen/iiif/rotation.rb

@@ -0,0 +1,25 @@
+module Imogen
+module Iiif
+class Rotation < Transform
+  RIGHT_ANGLES = [0,90,180,270]
+  def get(rotate)
+    if rotate.nil? or rotate.eql? '0'
+      return nil
+    end
+    raise BadRequest.new("bad rotate #{rotate}") unless rotate =~ /^-?\d+$/
+    r = rotate.to_i % 360
+    r = r + 360 if r < 0
+    raise BadRequest.new("bad rotate #{rotate}") unless RIGHT_ANGLES.include? r
+    return r > 0 ? r : nil
+  end
+  def self.convert(img, rotate)
+    rotation = Rotation.new(img).get(rotate)
+    if rotation
+      img.rotate(rotation) {|crop| yield crop}
+    else
+      yield img
+    end
+  end
+end
+end
+end

data/lib/imogen/iiif/size.rb

@@ -0,0 +1,36 @@
+module Imogen
+module Iiif
+class Size < Transform
+	def get(scale=nil)
+    if scale.nil? or scale.eql? "0"
+      return nil
+    end
+    if md = /^(\d+)?,(\d+)?$/.match(scale)
+      w = md[1] ? min(Integer(md[1]), @width) : nil
+      h = md[2] ? min(Integer(md[2]), @height) : nil
+      raise BadRequest.new("bad scale #{scale}") unless w or h
+      w ||= (@width * (h.to_f / @height)).round
+      h ||= (@height * (w.to_f / @width)).round
+      e = [w,h]
+    elsif md = /^pct:(\d+(\.\d+)?)/.match(scale)
+      p = Float(md[1])
+      p = min(100,p).to_f
+      raise BadRequest.new("bad size #{scale}") if p <= 0
+      e = [(@width * p / 100).round, (@height * p / 100).round]
+    else
+      raise BadRequest.new("bad size #{scale}")
+    end
+    raise BadRequest.new("bad size #{scale}") if e[0] <= 0 or e[1] <= 0
+    return e
+  end
+  def self.convert(img, size)
+    dims = Size.new(img).get(size)
+    if dims
+      img.rescale(*dims) {|crop| yield crop}
+    else
+      yield img
+    end
+  end
+end
+end
+end

data/lib/imogen/iiif.rb

@@ -0,0 +1,64 @@
+module Imogen
+  module Iiif
+    class BadRequest < Exception; end
+    class Transform
+      def initialize(src)
+        @width = 0
+        @height = 0
+        if src.respond_to? :width and src.respond_to? :height
+          img = src
+          @width = src.width
+          @height = src.height
+        else
+          raise "#{src.class.name} does not report width and height" 
+        end
+      end
+      def max(x,y)
+        (x > y) ? x : y
+      end
+      def min(x,y)
+        (x < y) ? x : y
+      end
+    end
+    module Quality
+      VALUES = [:native, :color, :grey, :bitonal]
+      def self.get(quality=:native)
+        q = quality.to_sym
+        raise BadRequest.new("bad quality #{quality}") unless VALUES.include? q
+        return (q == :native or q == :color) ? nil : q
+      end
+      def self.convert(img, quality)
+        q = get(quality)
+        if q == :grey
+          img.convert_to_greyscale {|c| yield c}
+        elsif q == :bitonal
+          img.threshold(128) {|c| yield c}
+        else
+          yield img
+        end
+      end
+    end
+    autoload :Region, 'imogen/iiif/region'
+    autoload :Size, 'imogen/iiif/size'
+    autoload :Rotation, 'imogen/iiif/rotation'
+
+    FORMATS = [:jpeg, :png]
+    def self.convert(img, dest_path, format=:jpeg, opts={})
+      raise BadRequest.new("bad format #{format}") unless FORMATS.include? format
+      Region.convert(img, opts[:region]) do |region|
+        Size.convert(region, opts[:size]) do |size|
+          Rotation.convert(size, opts[:rotation]) do |rotation|
+            Quality.convert(rotation, opts[:quality]) do |quality|
+              dst = FreeImage::File.new(dest_path)
+              if (img.color_type == :rgb)
+                quality.convert_to_24bits {|result| dst.save(result, format)}
+              else
+                quality.convert_to_8bits {|result| dst.save(result, format)}
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/imogen.rb

@@ -22,8 +22,13 @@ module Imogen
       end
     end
   end
+  module Cropped
+    def self.convert(img, dest_path, edges, scale=nil, format=:jpeg)
+    end
+  end
   require 'imogen/auto_crop'
   require 'imogen/zoomable'
+  require 'imogen/iiif'
 
   def self.search_paths
     @search_paths ||= begin

data/spec/spec_helper.rb

@@ -0,0 +1,7 @@
+class ImageStub
+  attr_reader :width, :height
+  def initialize(width,height)
+    @width = width
+    @height = height
+  end
+end

data/spec/unit/imogen_iiif_region_spec.rb

@@ -0,0 +1,53 @@
+require 'imogen/iiif'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+describe Imogen::Iiif::Region, type: :unit do
+  before(:all) do
+    @test_image = ImageStub.new(175,131)
+  end
+  subject {Imogen::Iiif::Region.new(@test_image)}
+  describe "#get" do
+    describe "with default or full region" do
+      it "should return nil" do
+        expect(subject.get(nil)).to be_nil
+        expect(subject.get("full")).to be_nil
+      end
+    end
+    describe "with an absolute region" do
+      it "should calculate a contained region" do
+        expect(subject.get("80,15,60,75")).to eql([80,15,140,90])
+      end
+      it "should reject zero-dimension boxes" do
+        expect{subject.get("101,15,10,15")}.to raise_error Imogen::Iiif::BadRequest
+      end
+      describe "that exceeds the bounds" do
+        it "should calculate an overlapping region" do
+          expect(subject.get("80,15,100,175")).to eql([80,15,175,131])
+        end
+        it "should reject a disjoint region" do
+          expect{subject.get("176,15,1,75")}.to raise_error Imogen::Iiif::BadRequest
+        end
+      end
+    end
+    describe "with a percentage region" do
+      it "should calculate a contained region" do
+        expect(subject.get("pct:80,15,10,75")).to eql([140,20,158,118])
+      end
+      it "should reject zero-dimension boxes" do
+        expect{subject.get("pct:10.2,15,10.21,15")}.to raise_error Imogen::Iiif::BadRequest
+      end
+      describe "that exceeds the bounds" do
+        it "should calculate an overlapping region" do
+          expect(subject.get("pct:80,15,100,175")).to eql([140,20,175,131])
+        end
+        it "should reject a disjoint region" do
+          expect{subject.get("pct:101,15,100,15")}.to raise_error Imogen::Iiif::BadRequest
+        end
+      end
+    end
+    it "should reject non-conforming regions" do
+      expect{subject.get("px:1,2,3,4")}.to raise_error Imogen::Iiif::BadRequest
+      expect{subject.get("-1,2,3,4")}.to raise_error Imogen::Iiif::BadRequest
+      expect{subject.get("pct:-1,2,3,4")}.to raise_error Imogen::Iiif::BadRequest
+    end 
+  end
+end

data/spec/unit/imogen_iiif_rotate_spec.rb

@@ -0,0 +1,37 @@
+require 'imogen/iiif'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+describe Imogen::Iiif::Rotation, type: :unit do
+  before(:all) do
+    @test_image = ImageStub.new(175,131)
+  end
+  subject {Imogen::Iiif::Rotation.new(@test_image)}
+  describe "#get" do
+    describe "with values mod 360 in 90 degree rotations" do
+      it "should nil for 0 or nil" do
+        expect(subject.get("360")).to be_nil
+        expect(subject.get("-360")).to be_nil
+        expect(subject.get("0")).to be_nil
+        expect(subject.get(nil)).to be_nil
+      end
+      it "should calculate for positive values" do
+        expect(subject.get("90")).to eql(90)
+        expect(subject.get("180")).to eql(180)
+        expect(subject.get("270")).to eql(270)
+        expect(subject.get("450")).to eql(90)
+      end
+      it "should calculate for negative values" do
+        expect(subject.get("-90")).to eql(270)
+        expect(subject.get("-180")).to eql(180)
+        expect(subject.get("-270")).to eql(90)
+        expect(subject.get("-450")).to eql(270)
+      end
+    end
+    it "should reject arbitrary integer and float values" do
+        expect{subject.get("2")}.to raise_error Imogen::Iiif::BadRequest
+        expect{subject.get("90.0")}.to raise_error Imogen::Iiif::BadRequest
+    end
+    it "should reject bad values" do
+        expect{subject.get("-2,")}.to raise_error Imogen::Iiif::BadRequest
+    end
+  end
+end

data/spec/unit/imogen_iiif_size_spec.rb

@@ -0,0 +1,61 @@
+require 'imogen/iiif'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+describe Imogen::Iiif::Size, type: :unit do
+  before(:all) do
+    @test_image = ImageStub.new(175,131)
+  end
+  subject {Imogen::Iiif::Size.new(@test_image)}
+  describe "#get" do
+    describe "with scaling width" do
+      it "should calculate for a good value" do
+        expect(subject.get("105,")).to eql([105, 79])
+      end
+      it "should not upscale" do
+        expect(subject.get("350,")).to eql([175, 131])
+      end
+      it "should reject bad values" do
+        expect{subject.get("0,")}.to raise_error Imogen::Iiif::BadRequest
+        expect{subject.get("-2,")}.to raise_error Imogen::Iiif::BadRequest
+      end
+    end
+    describe "with scaling height" do
+      it "should calculate for a good value" do
+        # partial pixels get rounded up
+        expect(subject.get(",79")).to eql([106,79])
+      end
+      it "should not upscale" do
+        expect(subject.get(",262")).to eql([175, 131])
+      end
+      it "should reject bad values" do
+        expect{subject.get(",0")}.to raise_error Imogen::Iiif::BadRequest
+        expect{subject.get(",-2")}.to raise_error Imogen::Iiif::BadRequest
+      end
+    end
+    describe "with scaling width and height" do
+      it "should calculate for a good value" do
+        expect(subject.get("105,79")).to eql([105, 79])
+      end
+      it "should not upscale" do
+        expect(subject.get("350,262")).to eql([175, 131])
+      end
+      it "should reject bad values" do
+        expect{subject.get("350,0")}.to raise_error Imogen::Iiif::BadRequest
+        expect{subject.get("350,-2")}.to raise_error Imogen::Iiif::BadRequest
+        expect{subject.get("0,262")}.to raise_error Imogen::Iiif::BadRequest
+        expect{subject.get("0,262")}.to raise_error Imogen::Iiif::BadRequest
+      end
+    end
+    describe "with a percentage scale" do
+      it "should calculate for a good value" do
+        expect(subject.get("pct:60.0")).to eql([105, 79])
+      end
+      it "should not upscale" do
+        expect(subject.get("pct:105")).to eql([175, 131])
+      end
+      it "should reject bad values" do
+        expect{subject.get("pct:-20")}.to raise_error Imogen::Iiif::BadRequest
+        expect{subject.get("pct:0")}.to raise_error Imogen::Iiif::BadRequest
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imogen
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Ben Armintor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-16 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-opencv
@@ -48,7 +48,15 @@ files:
 - lib/imogen/auto_crop.rb
 - lib/imogen/auto_crop/box.rb
 - lib/imogen/auto_crop/edges.rb
+- lib/imogen/iiif.rb
+- lib/imogen/iiif/region.rb
+- lib/imogen/iiif/rotation.rb
+- lib/imogen/iiif/size.rb
 - lib/imogen/zoomable.rb
+- spec/spec_helper.rb
+- spec/unit/imogen_iiif_region_spec.rb
+- spec/unit/imogen_iiif_rotate_spec.rb
+- spec/unit/imogen_iiif_size_spec.rb
 homepage: https://github.com/cul/imogen
 licenses: []
 metadata: {}