djatoka 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b10e171c15f72747a80d62a9b1d0d5bac5e2d2a8
-  data.tar.gz: 982a67a18a63f1650315f7e122428b76547226a9
+  metadata.gz: 54f7a843ae143b4d2f5aade72d9b56ee09c2c045
+  data.tar.gz: 5ee17e4138e0922c4bdfb4358382bc31e56ac70e
 SHA512:
-  metadata.gz: eb2062b25b58e8f7818d98d27c2027b9acd22ce4df6cc88fa5d3d1c48c2ed5f9b699b47a60b32b8673bf3207c3da30cdd228dd7e8e9b0de045e29c05c72a43e4
-  data.tar.gz: 3b0076b8aa40f912d5faea6d847f6cde656c2afbb44a13324c1b3c216f28ceeda79ae54487096d4253e95f9723384a7f9fb8e4bbdd48e65c53d038b335f76a67
+  metadata.gz: 4e625b0f1180dc75c17412359799130f6e79664f2e8ee2ac7d20dfe924695b4c109e7882402e69b13ee79b95834797a3eec119ad4fce5b5dbfa0b4df8a3c5673
+  data.tar.gz: a53814884c76dc41b74b74ed260ce9f6b1893c76a9edbe125da03b62813c37c7dd2ffd5a3c82f0b5a4314b9e8accdded89b4c1130607299fe7e165b55110f279

data/.gitignore

@@ -25,3 +25,5 @@ pkg
 .ruby-version
 
 .rbx
+
+Gemfile.lock

data/Rakefile

@@ -1,5 +1,10 @@
-require 'rubygems'
-require 'rake'
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+
+Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|

data/djatoka.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{djatoka}
-  s.version = "0.3.2"
+  s.version = "0.4.0"
   s.authors = ["Jason Ronallo", "Willy Mene"]
   s.email = %q{jronallo@gmail.com wmene@stanford.edu}
   s.homepage = %q{http://github.com/jronallo/djatoka}
@@ -23,7 +23,8 @@ Gem::Specification.new do |s|
   s.add_dependency "mime-types"
 
   s.add_dependency "trollop"
-
+  
+  s.add_development_dependency "test-unit"
   s.add_development_dependency "mocha"
   s.add_development_dependency "fakeweb"
   s.add_development_dependency "shoulda"

data/lib/djatoka/iiif_request.rb

@@ -106,17 +106,37 @@ module Djatoka
       end
 
       region = @resolver.region(@id)
-      metadata = @resolver.metadata(@id).perform
+      offsets = []
+      region_dimensions = []
 
-      if(@iiif_params[:region] =~ /^(\d+),(\d+),(\d+),(\d+)$/)
-        region.region("#{$2},#{$1},#{$4},#{$3}")
-      elsif(@iiif_params[:region] =~ /^pct:([\d\.]+),([\d\.]+),([\d\.]+),([\d\.]+)$/)
+      case @iiif_params[:region]
+      when 'full'
+        # noop
+      when 'square'
+        w = metadata.width.to_i
+        h = metadata.height.to_i
+        min, max = [w,h].minmax
+
+        offset = (max - min) / 2
+
+        region_dimensions = [min, min]
+
+        if h >= w
+          offsets = [0, offset]
+        else
+          offsets = [offset, 0]
+        end
+      when /^(\d+),(\d+),(\d+),(\d+)$/
+        offsets = [$1, $2]
+        region_dimensions = [$3, $4]
+      when /^pct:([\d\.]+),([\d\.]+),([\d\.]+),([\d\.]+)$/
         x = (($1.to_f / 100.0) * metadata.width.to_f).to_i
         y = (($2.to_f / 100.0) * metadata.height.to_f).to_i
         w = (($3.to_f / 100.0) * metadata.width.to_f).to_i
         h = (($4.to_f / 100.0) * metadata.height.to_f).to_i
-        region.region([y, x, h, w])
-      elsif(!(@iiif_params[:region] =~ /^full$/i))
+        offsets = [x, y]
+        region_dimensions = [w, h]
+      else
         raise IiifInvalidParam.new "region", @iiif_params[:region]
       end
 
@@ -127,22 +147,40 @@ module Djatoka
         s #noop
       when /^(\d+),$/
         region.scale( ["#{$1}", "0"] ) #w => w,0
+        region.level(djatoka_level((region_dimensions.first || metadata.width).to_i / $1.to_f))
       when /^,(\d+)$/
         region.scale( ["0", "#{$1}"] ) #h => 0,h
+        region.level(djatoka_level((region_dimensions.last || metadata.height).to_i / $1.to_f))
       when /^pct:(\d*\.?\d*)$/i
         dj_scale = $1.to_f / 100.0
-        region.scale(dj_scale.to_s)
+        level = djatoka_level(1 / dj_scale)
+        reduce = max_level - level.to_i
+        region.scale((dj_scale * 2**reduce).to_s)
+        region.level(level)
       when /^(\d+),(\d+)$/
         region.scale("#{$1},#{$2}")
+        region.level(djatoka_level((region_dimensions.first || metadata.width).to_i / $1.to_f))
       when /^!(\d+),(\d+)$/
-        ratio = [$1.to_f / metadata.width.to_f, $2.to_f / metadata.height.to_f].min
-        width = (ratio * metadata.width.to_f).to_i
-        height = (ratio * metadata.height.to_f).to_i
-        region.scale([width, height])
+        region_dimensions = [metadata.width.to_f, metadata.height.to_f] if region_dimensions.empty?
+        scale = [$1.to_f / region_dimensions.first.to_f, $2.to_f / region_dimensions.last.to_f].min
+
+        width = region_dimensions.first.to_f * scale
+        height = region_dimensions.last.to_f * scale
+
+        region.scale([width.ceil, height.ceil])
+        region.level(djatoka_level(region_dimensions.first.to_f / width))
       else
         raise IiifInvalidParam.new "size", s
       end
 
+      unless offsets.empty?
+        reduce = max_level - region.query.fetch(:level, max_level).to_i
+        w, h = region_dimensions.map { |d| d.to_i / (2**reduce) }
+
+        x, y = offsets
+        region.region("#{y},#{x},#{h},#{w}")
+      end
+
       unless(@iiif_params[:rotation].numeric?)
         raise IiifInvalidParam.new "rotation", @iiif_params[:rotation]
       end
@@ -170,6 +208,24 @@ module Djatoka
 
     end
 
+    def djatoka_level(ratio)
+      return max_level if ratio <= 1
+      level = max_level - Math.log2(ratio).to_i
+
+      if level < 1
+        1
+      else
+        level
+      end
+    end
+
+    def max_level
+      @max_level ||= metadata.levels.to_i
+    end
+
+    def metadata
+      @metadata ||= @resolver.metadata(@id).perform
+    end
   end
 
 end

data/test/test_iiif_request.rb

@@ -39,6 +39,11 @@ class TestDjatokaIiifRequest < Test::Unit::TestCase
           @req.size('full').rotation('0').quality('default').format('jpg')
         end
 
+        should 'set square requests' do
+          reg = @req.region('square').djatoka_region
+          assert_equal '0,874,3372,3372', reg.query.region
+        end
+
         should 'set x,y,w,h requests' do
           reg = @req.region('10,20,50,100').djatoka_region
           assert_equal '20,10,100,50', reg.query.region
@@ -56,6 +61,68 @@ class TestDjatokaIiifRequest < Test::Unit::TestCase
         end
       end
 
+      context 'translates region and size into DWT levels' do
+        context 'with a given region' do
+          setup do
+            @req.region('0,0,800,600').rotation('0').quality('default').format('jpg')
+          end
+
+          should 'set levels to the correct scale value' do
+            reg = @req.size('1600,').djatoka_region
+            assert_equal '6', reg.query.level
+
+            reg = @req.size('800,').djatoka_region
+            assert_equal '6', reg.query.level
+
+            reg = @req.size('400,').djatoka_region
+            assert_equal '5', reg.query.level
+
+            reg = @req.size('399,').djatoka_region
+            assert_equal '5', reg.query.level
+
+            reg = @req.size('200,').djatoka_region
+            assert_equal '4', reg.query.level
+          end
+        end
+
+        context 'with the full image' do
+          setup do
+            @req.region('full').rotation('0').quality('default').format('jpg')
+          end
+
+          should 'set levels to the correct scale value' do
+            reg = @req.size('5120,').djatoka_region
+            assert_equal '6', reg.query.level
+
+            reg = @req.size('399,').djatoka_region
+            assert_equal '3', reg.query.level
+          end
+        end
+
+        context 'with a pct size' do
+          setup do
+            @req.region('full').rotation('0').quality('default').format('jpg')
+          end
+
+          should 'set levels to the correct scale value' do
+            reg = @req.size('pct:100').djatoka_region
+            assert_equal '6', reg.query.level
+
+            reg = @req.size('pct:125').djatoka_region
+            assert_equal '6', reg.query.level
+
+            reg = @req.size('pct:50').djatoka_region
+            assert_equal '5', reg.query.level
+
+            reg = @req.size('pct:49').djatoka_region
+            assert_equal '5', reg.query.level
+
+            reg = @req.size('pct:23.52').djatoka_region
+            assert_equal '4', reg.query.level
+          end
+        end
+      end
+
       context 'translates size parameters' do
         setup do
           @req.region('10,20,50,100').rotation('0').quality('default').format('jpg')
@@ -69,17 +136,25 @@ class TestDjatokaIiifRequest < Test::Unit::TestCase
         should 'set ",h" requests to the correct scale value' do
           reg = @req.size(',900').djatoka_region
           assert_equal '0,900', reg.query.scale
+          assert_equal '6', reg.query.level
         end
 
         should 'set "pct:n" requests to the correct scale value' do
           reg = @req.size('pct:75').djatoka_region
           assert_equal '0.75', reg.query.scale
+          assert_equal '6', reg.query.level
 
           reg = @req.size('pct:125').djatoka_region
           assert_equal '1.25', reg.query.scale
+          assert_equal '6', reg.query.level
+
+          reg = @req.size('pct:20').djatoka_region
+          assert_equal '0.8', reg.query.scale
+          assert_equal '4', reg.query.level
 
           reg = @req.size('pct:6.25').djatoka_region
-          assert_equal '0.0625', reg.query.scale
+          assert_equal '1.0', reg.query.scale
+          assert_equal '2', reg.query.level
         end
 
         should 'set "w,h" requests to the correct scale value' do
@@ -89,10 +164,10 @@ class TestDjatokaIiifRequest < Test::Unit::TestCase
 
         should 'set "!w,h" requests to the correct scale value' do
           reg = @req.size('!1024,768').djatoka_region
-          assert_equal '1024,674', reg.query.scale
+          assert_equal '384,768', reg.query.scale
 
           reg = @req.size('!1024,500').djatoka_region
-          assert_equal '759,500', reg.query.scale
+          assert_equal '250,500', reg.query.scale
         end
 
         should 'raise an exception if the value cannot be parsed into a Float' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: djatoka
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Jason Ronallo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2015-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -81,6 +81,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  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'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -149,7 +163,6 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -213,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: djatoka
-rubygems_version: 2.4.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Djatoka image server helpers for Ruby and Rails.
@@ -233,4 +246,3 @@ test_files:
 - test/test_region.rb
 - test/test_resolver.rb
 - test/test_view_helpers.rb
-has_rdoc: 

data/Gemfile.lock

@@ -1,75 +0,0 @@
-PATH
-  remote: .
-  specs:
-    djatoka (0.2.4)
-      addressable
-      hashie
-      json
-      mime-types
-      trollop
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    addressable (2.3.6)
-    bourne (1.4.0)
-      mocha (~> 0.13.2)
-    coderay (1.0.9)
-    equivalent-xml (0.3.0)
-      nokogiri (>= 1.4.3)
-    fakeweb (1.3.0)
-    ffi (1.6.0-java)
-    hashie (2.1.1)
-    i18n (0.6.1)
-    json (1.7.7)
-    json (1.7.7-java)
-    metaclass (0.0.1)
-    method_source (0.8.1)
-    mime-types (2.2)
-    mocha (0.13.3)
-      metaclass (~> 0.0.1)
-    multi_json (1.7.2)
-    nokogiri (1.5.9)
-    nokogiri (1.5.9-java)
-    pry (0.9.12)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    pry (0.9.12-java)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-      spoon (~> 0.0)
-    rake (10.0.4)
-    rb-readline (0.4.2)
-    rdoc (4.0.1)
-      json (~> 1.4)
-    shoulda (3.4.0)
-      shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (~> 1.0, >= 1.4.1)
-    shoulda-context (1.0.2)
-    shoulda-matchers (1.5.4)
-      activesupport (>= 3.0.0)
-      bourne (~> 1.3)
-    slop (3.4.4)
-    spoon (0.0.3)
-      ffi
-    trollop (2.0)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  djatoka!
-  equivalent-xml
-  fakeweb
-  mocha
-  pry
-  rake
-  rb-readline
-  rdoc (>= 2.4.2)
-  shoulda