imogen 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 09da39417c3f3659074517ded3cd333389d73294
-  data.tar.gz: cf43db1635b701bf618aff5ea605b091aca53f01
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YjdlYmVmMjIwZmFhMzNmYTdmMjNiOTFiYjM2ZjNmZTllMjYyZTRmMw==
+  data.tar.gz: !binary |-
+    YjU0NmU3NDdkZTE3YWI0NTdlMDUyMzhhYjk0OTI0ODI1YjIyYzAyYg==
 SHA512:
-  metadata.gz: b792def58819afc01ba45716a2585ab967bbf622954167a1a46b39f1e899ad91b2ee1dfd257601db0fe5ffe1b5fe0b69014f6df5d9e8af099ed89600bdf1f9b4
-  data.tar.gz: 9a7e6156211bf6fc74829bc0ab1f9fe040cce95a335d621eef3d39e39730aa90d4d4bc8897cdc37c86bf9bfc36df82c199c6ac22c06f38cdf5f7815086aace34
+  metadata.gz: !binary |-
+    MWQ1ODU2NTE3OWRlN2MwZTNlOWYzYjQ0NmI0ZDhmNTBjZmMzMDdmZWYwNmMy
+    NDAwNzU4Y2RhMTE0MjBlYWIxMzg3ZGQxZWU0Yjc2MjU3ZjBhYzY5NjE2NGY4
+    YTAxNjAzZTBkZGNlZTYwYzZiM2Y0NzFlOWIxNTliOTYzZmEzN2Y=
+  data.tar.gz: !binary |-
+    ZWE1ZjZiOGNjYzE3OWJlZjA5YWRlMWRlMDQzOWE2NTAxMzVmYjAzYmQ3M2Nm
+    NjVlZjY2NmY2YmE3NWU3MzE2NmQ2ZjhkNjYwMzY2ODA3MWQ3MzRkNTY5Mjg4
+    MDJjZDIxMzcyZjVmZTgwNDZiMTJiZjJhOTMzYjQ1MmU5YmRiNzY=

data/lib/imogen/dzi.rb

@@ -0,0 +1,52 @@
+require 'imogen/zoomable'
+require 'imogen/iiif'
+module Imogen
+  module Dzi
+    def self.convert(img,dest_dir,format=:jpeg,opts={})
+      override = opts[:override]
+      
+    end
+    def self.iiif_paths(img,tile_size=128,format=:jpeg)
+      width, height = img.width, img.height
+      max_levels = Imogen::Zoomable.max_levels_for(width, height)
+      results = {}
+      max_levels.downto(0) do |level|
+        c_ratio = 2**(max_levels-level)
+
+        tile_side = tile_size*c_ratio
+        x, col = 0, 0
+        while x < width
+          y, row = 0, 0
+          while y < height
+            results["#{level}/#{col_count}_#{row_count}"] = iiif_path_for_dzi(level,max_levels,col,row,tile_size,format)
+            y += tile_side
+            row += 1
+          end
+          x += tile_side
+          col += 1
+        end
+
+      end
+    end
+    def self.iiif_opts_for_dzi(level,max_levels,col,row,tile_size=128,format=:jpeg)
+      level = level.to_i
+      max_levels = max_levels.to_i
+      c_ratio = 2**(max_levels-level)
+
+      tile_side = tile_size*c_ratio
+      x = col * c_ratio
+      y = row * c_ratio
+      {
+        region: "#{x},#{y},#{tile_side},#{tile_side}",
+        size: "!#{tile_size},#{tile_size}",
+        format: format,
+        rotation: 0,
+        quality: :native
+      }
+    end
+    def self.iiif_path_for_dzi(level,max_levels,col,row,tile_size=512,format=:jpeg)
+      opts = iiif_opts_for_dzi(level, max_levels,col,row,tile_size,format)
+      "#{opts[:region]}/#{opts[:size]}/#{opts[:rotation]}/#{opts[:quality]}.#{Imogen::Iiif::FORMATS[format]}"
+    end
+  end
+end

data/lib/imogen/iiif/region.rb

@@ -20,7 +20,7 @@ class Region < Transform
       ]
     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]
+      if p[2] == 0 or p[3] == 0
         raise BadRequest.new("Invalid region: #{region}")
       end
       e = [

data/lib/imogen/iiif/size.rb

@@ -2,7 +2,7 @@ module Imogen
 module Iiif
 class Size < Transform
 	def get(scale=nil)
-    if scale.nil? or scale.eql? "0"
+    if scale.nil? or scale.eql? "full"
       return nil
     end
     if md = /^(\d+)?,(\d+)?$/.match(scale)

data/lib/imogen/iiif/tiles.rb

@@ -0,0 +1,38 @@
+require 'imogen/zoomable'
+module Imogen
+  module Iiif
+    module Tiles
+      def self.scale_factor_for(*dims)
+        Imogen::Zoomable.levels_for(*dims)**2
+      end
+      def self.for(img,dest_dir,format=:jpeg,tile_size=128,override=false)
+        width, height = img.width, img.height
+        max_level = Imogen::Zoomable.levels_for(width,height,tile_size)
+        max_level.downto(0) do |level|
+          scale = 0.5**level
+          level_width = (img.width*scale).ceil 
+          level_width = (img.height*scale).ceil 
+          region_size = (tile_size / scale).ceil
+          region_width = (scale * img.width).ceil
+          region_height = (scale * img.height).ceil
+          x, col = 0, 0
+          while x < width
+            y, row = 0, 0
+            while y < height
+              region = "#{x},#{y},#{[width-x,region_size].min},#{[height-y,region_size].min}"
+              size = "full"
+              dest_path = File.join(dest_dir,region,size,'0',"native.#{Imogen::Iiif::FORMATS[format]}")
+              unless File.exists? dest_path or override
+                yield(img,dest_path,format,Imogen::Iiif.path_to_opts(dest_path,dest_dir))
+              end
+              y += region_size
+              row += 1
+            end
+            x += region_size
+            col += 1
+          end
+        end
+      end
+    end
+  end
+end

data/lib/imogen/iiif.rb

@@ -23,7 +23,7 @@ module Imogen
     module Quality
       VALUES = [:native, :color, :grey, :bitonal]
       def self.get(quality=:native)
-        q = quality.to_sym
+        q = (quality || :native).to_sym
         raise BadRequest.new("bad quality #{quality}") unless VALUES.include? q
         return (q == :native or q == :color) ? nil : q
       end
@@ -41,15 +41,20 @@ module Imogen
     autoload :Region, 'imogen/iiif/region'
     autoload :Size, 'imogen/iiif/size'
     autoload :Rotation, 'imogen/iiif/rotation'
+    autoload :Tiles, 'imogen/iiif/tiles'
 
-    FORMATS = [:jpeg, :png]
-    def self.convert(img, dest_path, format=:jpeg, opts={})
+    FORMATS = {jpeg: 'jpg', jpg: 'jpg', png: 'png'}
+    EXTENSIONS = {'jpg' => :jpeg, 'png' => :png}
+    def self.convert(img, dest_path, format=nil, opts={})
+      format ||= opts.fetch(:format,:jpeg)
+      format = format.to_sym
       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)
+              format = :jpeg if format == :jpg
               if (img.color_type == :rgb)
                 quality.convert_to_24bits {|result| dst.save(result, format)}
               else
@@ -60,5 +65,21 @@ module Imogen
         end
       end
     end
+    def self.path_to_opts(path,parent_dir)
+      if parent_dir and path.start_with? parent_dir
+        path = path.sub(parent_dir,'')
+      end
+      path = path[1..-1] if path =~ /^\//
+      parts = path.split('/')
+      quality = parts[-1].split('.')[0].to_sym
+      format = EXTENSIONS[parts[-1].split('.')[1]]
+      {
+        region: parts[0],
+        size: parts[1],
+        rotation: parts[2],
+        quality: quality,
+        format: format
+      }
+    end
   end
 end

data/lib/imogen/zoomable.rb

@@ -1,10 +1,15 @@
 module Imogen
 	module Zoomable
+    # levels for hypothetical 1x1 tiles
+    def self.max_levels_for(*dims)
+      return Math.log2(dims[0..1].max).ceil
+    end
+    # levels for width,height, tile_size=128
     def self.levels_for(*dims)
       max = dims[0..1].max || 0
-      return 0 if max < 192
-      max_tiles = (max.to_f / 96)
-      Math.log2(max_tiles).floor
+      return 0 if max == 0
+      tile_size = dims[2] || 128
+      return Math.log2(dims[0..1].max.to_f / tile_size).ceil
     end
     def self.convert(img, dest_path)
       dst = FreeImage::File.new(dest_path)

data/lib/imogen.rb

@@ -85,9 +85,7 @@ module Imogen
     result
   end
 
-  def self.image(src_path)
-
-    flags = 0
+  def self.image(src_path, flags=0)
 
     fif = format_from(src_path)
     if ((fif != :unknown) and FreeImage.FreeImage_FIFSupportsReading(fif))
@@ -97,9 +95,7 @@ module Imogen
     end
     return nil
   end
-  def self.with_image(src_path, &block)
-
-    flags = 0
+  def self.with_image(src_path, flags = 0, &block)
 
     fif = format_from(src_path)
     if ((fif != :unknown) and FreeImage.FreeImage_FIFSupportsReading(fif))

data/spec/unit/imogen_iiif_region_spec.rb

@@ -17,7 +17,8 @@ describe Imogen::Iiif::Region, type: :unit 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
+        expect{subject.get("101,15,0,15")}.to raise_error Imogen::Iiif::BadRequest
+        expect{subject.get("101,15,10,0")}.to raise_error Imogen::Iiif::BadRequest
       end
       describe "that exceeds the bounds" do
         it "should calculate an overlapping region" do

data/spec/unit/imogen_iiif_rotate_spec.rb

@@ -13,17 +13,19 @@ describe Imogen::Iiif::Rotation, type: :unit do
         expect(subject.get("0")).to be_nil
         expect(subject.get(nil)).to be_nil
       end
+      # IIIF rotation is opposite FreeImage
       it "should calculate for positive values" do
-        expect(subject.get("90")).to eql(90)
+        expect(subject.get("90")).to eql(270)
         expect(subject.get("180")).to eql(180)
-        expect(subject.get("270")).to eql(270)
-        expect(subject.get("450")).to eql(90)
+        expect(subject.get("270")).to eql(90)
+        expect(subject.get("450")).to eql(270)
       end
+      # IIIF rotation is opposite FreeImage
       it "should calculate for negative values" do
-        expect(subject.get("-90")).to eql(270)
+        expect(subject.get("-90")).to eql(90)
         expect(subject.get("-180")).to eql(180)
-        expect(subject.get("-270")).to eql(90)
-        expect(subject.get("-450")).to eql(270)
+        expect(subject.get("-270")).to eql(270)
+        expect(subject.get("-450")).to eql(90)
       end
     end
     it "should reject arbitrary integer and float values" do

data/spec/unit/imogen_iiif_tiles_spec.rb

@@ -0,0 +1,78 @@
+require 'imogen/iiif'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+describe Imogen::Iiif::Tiles, type: :unit do
+  before(:all) do
+    @test_image = ImageStub.new(175,131)
+  end
+  let(:fullSize) { ["/0,0,175,131/full/0/native.jpg"]}
+  let(:tile128) {
+    [
+      "/0,0,128,128/full/0/native.jpg",
+      "/128,0,47,128/full/0/native.jpg",
+      "/0,128,128,3/full/0/native.jpg",
+      "/128,128,47,3/full/0/native.jpg"
+    ]
+  }
+  let(:tile64) {
+    [
+      "/0,0,64,64/full/0/native.jpg",
+      "/64,0,64,64/full/0/native.jpg",
+      "/128,0,47,64/full/0/native.jpg",
+      "/0,64,64,64/full/0/native.jpg",
+      "/64,64,64,64/full/0/native.jpg",
+      "/128,64,47,64/full/0/native.jpg",
+      "/0,128,64,3/full/0/native.jpg",
+      "/64,128,64,3/full/0/native.jpg",
+      "/128,128,47,3/full/0/native.jpg",
+    ]
+  }
+  describe '#scale_factor_for' do
+    it 'should calculate for different tile sizes' do
+      width, height = @test_image.width, @test_image.height
+      (0..8).each do |exp|
+        tile_size = 2**exp
+        expected = (8 - exp)**2
+        expect(subject.scale_factor_for(width, height, tile_size)).to eql(expected)
+      end
+    end
+  end
+  describe '#for' do
+    it 'should produce a single tile when contained' do
+      expected = fullSize
+      actual = []
+      subject.for(@test_image,'',:jpeg,256) do |img,dest_path,format,opts|
+        actual << dest_path
+      end
+      expect(actual).to eql(expected)
+    end
+    it 'should produce a tileset when half' do
+      expected = fullSize + tile128
+      expected.uniq!
+      actual = []
+      subject.for(@test_image,'',:jpeg,128) do |img,dest_path,format,opts|
+        actual << dest_path
+      end
+      actual.uniq!
+      expect(actual.sort).to eql(expected.sort)
+    end
+    it 'should produce a single tileset' do
+      expected = fullSize + tile128 + tile64
+      expected.uniq!
+      actual = []
+      subject.for(@test_image,'',:jpeg,64) do |img,dest_path,format,opts|
+        actual << dest_path
+      end
+      actual.uniq!
+      expect(actual.sort).to eql(expected.sort)
+    end
+    it 'should produce png when requested' do
+      expected = fullSize.collect {|x| x.sub(/jpg$/,'png')}
+      expected.uniq!
+      actual = []
+      subject.for(@test_image,'',:png,256) do |img,dest_path,format,opts|
+        actual << dest_path
+      end
+      expect(actual).to eql(expected)
+    end
+  end
+end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: imogen
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Ben Armintor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-19 00:00:00.000000000 Z
+date: 2014-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-opencv
   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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -48,15 +48,18 @@ files:
 - lib/imogen/auto_crop.rb
 - lib/imogen/auto_crop/box.rb
 - lib/imogen/auto_crop/edges.rb
+- lib/imogen/dzi.rb
 - lib/imogen/iiif.rb
 - lib/imogen/iiif/region.rb
 - lib/imogen/iiif/rotation.rb
 - lib/imogen/iiif/size.rb
+- lib/imogen/iiif/tiles.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
+- spec/unit/imogen_iiif_tiles_spec.rb
 homepage: https://github.com/cul/imogen
 licenses: []
 metadata: {}
@@ -66,12 +69,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []