djatoka 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 740300c47eff6616ff1596b35ee242ef1df34e0d
-  data.tar.gz: babda837e272e04a71298a47f36c0a14b8c64b92
+  metadata.gz: 59e0ba03ce37604d72aa86517019131b632c8f0e
+  data.tar.gz: 52d429c2b801b25bb36b5b6e6af66349de3d785a
 SHA512:
-  metadata.gz: fe31d8abaa6ae8acf712640ebd165660248113e2f2e8f06d6cdd621db6292c3dbfdbc51a1587195463cdacad48b045eb27eae37d5a626b4f6b803e0d92f035a2
-  data.tar.gz: 9245d8e471aecd3b5efd3cf4005782899c17db9539061e24a5a6b7d707155a4467d3fd2b2741781b84c41393b2539449aa2c139c19e3ac7fe7cd354170a76d3f
+  metadata.gz: 0077434610f5f51e42ab590357cb321c86c666d78767c6da56b2d0e41b8bf27decf56df4afc6ef64da24c4e7066f483bf0883f49a64c56d08ad1f9b27defb6f1
+  data.tar.gz: feab7d2d08dc2a8870a3054b802d14345a934715268426c9cdfeb80749c6d9ec40e1db833f6c0b79b6352af12c9cba948b7dd8cb028d6ea5a3950ffa042f7d6a

data/djatoka.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{djatoka}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
   s.authors = ["Jason Ronallo", "Willy Mene"]
   s.email = %q{jronallo@gmail.com wmene@stanford.edu}
   s.homepage = %q{http://github.com/jronallo/djatoka}

data/lib/djatoka/iiif_request.rb

@@ -106,14 +106,22 @@ module Djatoka
       end
 
       region = @resolver.region(@id)
+      metadata = @resolver.metadata(@id).perform
 
       if(@iiif_params[:region] =~ /^(\d+),(\d+),(\d+),(\d+)$/)
         region.region("#{$2},#{$1},#{$4},#{$3}")
+      elsif(@iiif_params[:region] =~ /^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))
         raise IiifInvalidParam.new "region", @iiif_params[:region]
       end
 
       s = @iiif_params[:size]
+
       case s
       when /^full$/i
         s #noop
@@ -126,7 +134,11 @@ module Djatoka
         region.scale(dj_scale.to_s)
       when /^(\d+),(\d+)$/
         region.scale("#{$1},#{$2}")
-      # TODO Best Fit: when /^!(\d+),(\d+)$/
+      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])
       else
         raise IiifInvalidParam.new "size", s
       end

data/test/test_iiif_request.rb

@@ -12,9 +12,9 @@ class TestDjatokaIiifRequest < Test::Unit::TestCase
           @region = @req.region('full').size('full').rotation('0').quality('default').format('jpg').djatoka_region
         end
 
-	should 'set id properly' do
-	  assert_equal @identifier, @region.rft_id
-	end
+      	should 'set id properly' do
+      	  assert_equal @identifier, @region.rft_id
+      	end
 
         should 'set region to nil from full' do
           assert_nil @region.query.region
@@ -44,6 +44,11 @@ class TestDjatokaIiifRequest < Test::Unit::TestCase
           assert_equal '20,10,100,50', reg.query.region
         end
 
+        should 'set pct:x,y,w,h requests' do
+          reg = @req.region('pct:10.5,20,30.8,40').djatoka_region
+          assert_equal '674,537,1348,1576', reg.query.region
+        end
+
         should 'raise an exception if the region does not fit the x,y,w,h format, or is not "full"' do
           assert_raise Djatoka::IiifInvalidParam do
             @req.region('blah').djatoka_region
@@ -79,6 +84,14 @@ class TestDjatokaIiifRequest < Test::Unit::TestCase
           assert_equal '1024,768', reg.query.scale
         end
 
+        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
+
+          reg = @req.size('!1024,500').djatoka_region
+          assert_equal '759,500', reg.query.scale
+        end
+
         should 'raise an exception if the value cannot be parsed into a Float' do
           assert_raise Djatoka::IiifInvalidParam do
             @req.size('pct:0.75').djatoka_region

data/test/test_metadata.rb

@@ -43,7 +43,7 @@ class TestDjatokaMetadata < Test::Unit::TestCase
       end
 
       should 'return an OK status for a good request' do
-        metadata = @metadata.status
+        assert_equal 'OK', @metadata.status
       end
 
       should 'return a nil for a bad request' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: djatoka
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Jason Ronallo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-11 00:00:00.000000000 Z
+date: 2015-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -213,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: djatoka
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Djatoka image server helpers for Ruby and Rails.
@@ -233,4 +233,3 @@ test_files:
 - test/test_region.rb
 - test/test_resolver.rb
 - test/test_view_helpers.rb
-has_rdoc: