djatoka 0.0.7 → 0.0.8

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/bin/djatoka_url

@@ -22,11 +22,13 @@ EOS
   opt :scale, "Scale", :type => String
   opt :format, 'Format', :type => String
   opt :clayer, 'clayer', :type => String
-  opt :square, 'Squares the image by cropping'
   opt :smallbox, 'Creates a 75x75 image'
   opt :metadata, 'Output metadata'
   opt :levels,   'Output Levels'
   opt :browser, 'Set the browser to open JSON and images with', :type => String
+  opt :square, 'Squares the image by cropping both sides'
+  opt :topleftsquare, 'Squares the image by justifying to the top left'
+  opt :bottomrightsquare, 'Squares the image by jutifying to the bottom right'
 end
 
 resolver = Djatoka::Resolver.new(opts[:resolver])
@@ -44,6 +46,14 @@ if opts[:square]
   region.square
 end
 
+if opts[:topleftsquare]
+  region.top_left_square
+end
+
+if opts[:bottomrightsquare]
+  region.bottom_right_square
+end
+
 if opts[:metadata] or opts[:levels]
  metadata = resolver.metadata(opts[:rftid])
  metadata.perform

data/lib/djatoka/common.rb

@@ -30,7 +30,17 @@ module Djatoka::Common
 
   # public alias for #square_params. Returns self (a Djatoka::Region)
   def square
-    square_params
+    square_params(:center)
+    self
+  end
+
+  def top_left_square
+    square_params(:top_left)
+    self
+  end
+
+  def bottom_right_square
+    square_params(:bottom_right)
     self
   end
 
@@ -46,6 +56,10 @@ module Djatoka::Common
     square_uri.to_s
   end
 
+  # return a region as a square justified to the top-left of image.
+  # for a portrait image it will be justified to the top and for landscape it
+  # should be justified to the
+
   # So far we figure the best level to ask for based on any scale parameter and
   # try to compensate for any difference between the dwtLevels and djatoka levels
   # so that we get a decent image returned.
@@ -74,7 +88,7 @@ module Djatoka::Common
   # how djatoka determines levels. See the comments for the places where the code
   # tries to reconcile this difference in a way that seems to work in the cases
   # seen so far.
-  def square_params
+  def square_params(justify = :center)
     metadata = Djatoka::Metadata.new(resolver, rft_id).perform
     if metadata
       orig_height = metadata.height.to_i
@@ -85,16 +99,7 @@ module Djatoka::Common
         level(pick_best_level(metadata))
       end
       if query.level
-        # we try to compensate for when there is a difference between the
-        # dwtLevels and the djatoka levels. So far the only case seen is where
-        # the dwtLevels are greater than the djatoka levels.
-#        if metadata.dwt_levels.to_i > metadata.levels.to_i
-#          difference = metadata.dwt_levels.to_i - metadata.levels.to_i
-#          good_query_level = query.level.to_i + difference
-        # dwtLevels in the cases seen so far almost always match the djatoka levels.
-#        elsif metadata.dwt_levels.to_i == metadata.levels.to_i
-          good_query_level = query.level.to_i
-#        end
+        good_query_level = query.level.to_i
         height = metadata.all_levels[good_query_level].height
         width = metadata.all_levels[good_query_level].width
       else
@@ -105,18 +110,36 @@ module Djatoka::Common
       # height and width are relative to the level selected and one if not already
       # a square then the longest side is cropped.
       if height != width
-        if height > width
-          x = '0'
-          y = ((orig_height - orig_width)/2).to_s
-
-          h = width.to_s
-          w = width.to_s
-        elsif width > height
-          y = '0'
-          x = ((orig_width - orig_height)/2).to_s
-          h = height.to_s
-          w = height.to_s
-        end
+          # portrait
+          if height > width
+            h = width.to_s
+            w = width.to_s
+            if justify == :center
+              x = '0'
+              y = ((orig_height - orig_width)/2).to_s
+            elsif justify == :top_left
+              x = '0'
+              y = '0'
+            elsif justify == :bottom_right
+              x = '0'
+              y = (orig_height - orig_width).to_s
+            end
+
+          # landscape
+          elsif width > height
+            h = height.to_s
+            w = height.to_s
+            if justify == :center
+              y = '0'
+              x = ((orig_width - orig_height)/2).to_s
+            elsif justify == :top_left
+              x = '0'
+              y = '0'
+            elsif justify == :bottom_right
+              y = '0'
+              x = (orig_width - orig_height).to_s
+            end
+          end
         region([y,x,h,w])
       end
     end

data/test/test_common.rb

@@ -26,6 +26,12 @@ context 'A Djatoka Resolver' do
         assert_equal '0,874,3372,3372', @region.square.query.region
         assert_equal nil, @region.square.query.scale
       end
+      should 'create a query for a left justified version of the image' do
+        assert_equal '0,0,3372,3372', @region.top_left_square.query.region
+      end
+      should 'create a query for a right justified version of the image' do
+        assert_equal '0,1750,3372,3372', @region.bottom_right_square.query.region
+      end
       should 'return a uri for a square version of the image' do
         assert_equal '0,874,3372,3372', @region.square_uri.query_values['svc.region']
         assert_equal nil, @region.square_uri.query_values['svc.scale']
@@ -53,11 +59,17 @@ context 'A Djatoka Resolver' do
         setup do
           @region = Djatoka::Region.new(@resolver, 'info:lanl-repo/ds/b820f537-26a1-4af8-b86a-e7a4cac6187a')
         end
-        should 'crop appropriately into a square' do
+        should 'crop appropriately into a centered square' do
           assert_equal '513,0,4093,4093', @region.square.query.region
         end
+        should 'crop appropriately into a top justified square' do
+          assert_equal '0,0,4093,4093', @region.top_left_square.query.region
+        end
+        should 'crop appropriately into bottom justified square' do
+          assert_equal '1027,0,4093,4093', @region.bottom_right_square.query.region
+        end
       end
-      
+
       context 'an image where the dwt_levels do not match the djatoka levels' do
         setup do
           @region2 = Djatoka::Region.new(@resolver, 'ua023_015-006-bx0003-014-075')
@@ -67,7 +79,9 @@ context 'A Djatoka Resolver' do
           assert @region2.url
         end
       end
-      
+
+
+
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: djatoka
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Jason Ronallo
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-28 00:00:00 -04:00
+date: 2010-11-02 00:00:00 -04:00
 default_executable: djatoka_url
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -167,13 +167,13 @@ files:
 - lib/djatoka/region.rb
 - lib/djatoka/resolver.rb
 - lib/djatoka/view_helpers.rb
+- test/test_common.rb
+- test/test_region.rb
+- test/helper.rb
 - test/test_metadata.rb
-- test/test_djatoka.rb
 - test/test_resolver.rb
 - test/test_view_helpers.rb
-- test/test_region.rb
-- test/helper.rb
-- test/test_common.rb
+- test/test_djatoka.rb
 has_rdoc: true
 homepage: http://github.com/jronallo/djatoka
 licenses: []
@@ -209,10 +209,10 @@ signing_key:
 specification_version: 3
 summary: Djatoka image server helpers for Ruby and Rails.
 test_files: 
+- test/test_common.rb
+- test/test_region.rb
+- test/helper.rb
 - test/test_metadata.rb
-- test/test_djatoka.rb
 - test/test_resolver.rb
 - test/test_view_helpers.rb
-- test/test_region.rb
-- test/helper.rb
-- test/test_common.rb
+- test/test_djatoka.rb