djatoka 0.0.10 → 0.0.11

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

data/bin/djatoka_url

@@ -3,6 +3,7 @@ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'djatoka'
 require 'trollop'
 require 'pp'
+require 'open-uri'
 
 opts = Trollop::options do
   banner <<-EOS
@@ -30,6 +31,7 @@ EOS
   opt :topleftsquare, 'Squares the image by justifying to the top left'
   opt :bottomrightsquare, 'Squares the image by jutifying to the bottom right'
   opt :file, 'process a whole file of rtfids', :type => String
+  opt :download, 'download the image to the current working directory'
 end
 
 if (!opts[:rftid] and !opts[:file]) or (opts[:rftid] and opts[:file])
@@ -43,6 +45,7 @@ elsif opts[:file]
   rftids = File.read(opts[:file]).split("\n")
 end
 
+
 resolver = Djatoka::Resolver.new(opts[:resolver])
 
 rftids.each do |rftid|
@@ -89,5 +92,13 @@ rftids.each do |rftid|
   puts region.url unless opts[:file]
 
   `#{opts[:browser]} "#{region.url}"` if opts[:browser]
+  
+  if opts[:download]
+    puts 'downloading...'
+    image = open(region.url).read
+    File.open(rftid + '.jpg', 'w') do |fh|
+      fh.puts image
+    end
+  end
 end
 

data/lib/djatoka/common.rb

@@ -64,7 +64,7 @@ module Djatoka::Common
   # try to compensate for any difference between the dwtLevels and djatoka levels
   # so that we get a decent image returned.
   def pick_best_level(metadata)
-    best_level = '10'
+    best_level = metadata.max_level
     metadata_levels = metadata.all_levels
     metadata_levels.keys.sort.reverse.each do |k|
        if metadata_levels[k].height.to_i > query.scale.to_i and

data/lib/djatoka/metadata.rb

@@ -56,21 +56,25 @@ class Djatoka::Metadata
   def all_levels
     perform if !response # if we haven't already performed the metadata query do it now
     levels_hash = Hashie::Mash.new
-    levels_i = levels.to_i
+    levels_i = levels.to_i 
     (0..levels_i).each do |level_num|
       level_height = height.to_i
       level_width = width.to_i
 
       times_to_halve = levels_i - level_num
       times_to_halve.times do
-        level_height = level_height / 2
-        level_width = level_width / 2
+        level_height = (level_height / 2.0).round
+        level_width = (level_width / 2.0).round
       end
 
       levels_hash[level_num] = {:height => level_height, :width => level_width}
     end
     levels_hash
   end
+    
+  def max_level
+    all_levels.keys.sort.last  
+  end
 
 end
 

data/test/test_common.rb

@@ -8,18 +8,18 @@ context 'A Djatoka Resolver' do
         @region = Djatoka::Region.new(@resolver, @identifier)
       end
       should 'create a query for a 75x75 version of the image' do
-        assert_equal '0,874,105,105', @region.smallbox.query.region
+        assert_equal '0,874,106,106', @region.smallbox.query.region
         assert_equal '75', @region.smallbox.query.scale
       end
 
       should 'return a String for a smallbox URL' do
         assert @region.smallbox_url.is_a? String
         assert @region.smallbox_url.include? 'http://african.lanl.gov'
-        assert @region.smallbox_url.include? 'svc.region=0%2C874%2C105%2C105'
+        assert @region.smallbox_url.include? 'svc.region=0%2C874%2C106%2C106'
       end
 
       should 'return a uri for a small square version of the image' do
-        assert_equal '0,874,105,105', @region.smallbox.uri.query_values['svc.region']
+        assert_equal '0,874,106,106', @region.smallbox.uri.query_values['svc.region']
       end
 
       should 'create a query for a square version of the image' do

data/test/test_metadata.rb

@@ -66,21 +66,28 @@ class TestDjatokaMetadata < Test::Unit::TestCase
         @metadata = @metadata_obj.perform
         @levels = @metadata.all_levels
       end
+      should 'create the number of metadata levels as djatoka provides' do
+        assert_equal 7, @levels.length
+      end
       should 'return height and width for all levels' do
-        levels = { "0"=>{"height"=>52, "width"=>80},
-                   "1"=>{"height"=>105, "width"=>160},
-                   "2"=>{"height"=>210, "width"=>320},
-                   "3"=>{"height"=>421, "width"=>640},
+        expected_levels = { "0"=>{"height"=>53, "width"=>80},
+                   "1"=>{"height"=>106, "width"=>160},
+                   "2"=>{"height"=>211, "width"=>320},
+                   "3"=>{"height"=>422, "width"=>640},
                    "4"=>{"height"=>843, "width"=>1280},
                    "5"=>{"height"=>1686, "width"=>2560},
-                   "6"=>{"height"=>3372, "width"=>5120},}
-        assert_equal levels, @levels
+                   "6"=>{"height"=>3372, "width"=>5120}}
+        assert_equal expected_levels, @levels
+      end
+      should 'know which is the max level' do
+        assert_equal "6", @metadata.max_level
       end
+      
       should 'return appropriate height and width for all levels when levels and dwt_levels do not match' do
-        levels = {"0"=>{"height"=>57, "width"=>37},
-                  "1"=>{"height"=>114, "width"=>74},
-                  "2"=>{"height"=>228, "width"=>148},
-                  "3"=>{"height"=>457, "width"=>296},
+        levels = {"0"=>{"height"=>58, "width"=>37},
+                  "1"=>{"height"=>115, "width"=>74},
+                  "2"=>{"height"=>229, "width"=>148},
+                  "3"=>{"height"=>458, "width"=>296},
                   "4"=>{"height"=>915, "width"=>592}}
         metadata = @resolver.metadata('ua023_015-006-bx0003-014-075').perform
         returned_levels = metadata.all_levels
@@ -88,7 +95,6 @@ class TestDjatokaMetadata < Test::Unit::TestCase
 
       end
       
-      
     end # levels
 
   end #with_a_resolver

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: djatoka
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - Jason Ronallo
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-15 00:00:00 -05:00
+date: 2010-12-21 00:00:00 -05:00
 default_executable: djatoka_url
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -167,20 +167,20 @@ files:
 - lib/djatoka/region.rb
 - lib/djatoka/resolver.rb
 - lib/djatoka/view_helpers.rb
-- test/test_metadata.rb
+- test/helper.rb
+- test/test_common.rb
 - test/test_djatoka.rb
+- test/test_metadata.rb
+- test/test_region.rb
 - test/test_resolver.rb
 - test/test_view_helpers.rb
-- test/test_region.rb
-- test/helper.rb
-- test/test_common.rb
 has_rdoc: true
 homepage: http://github.com/jronallo/djatoka
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -209,10 +209,10 @@ signing_key:
 specification_version: 3
 summary: Djatoka image server helpers for Ruby and Rails.
 test_files: 
-- test/test_metadata.rb
+- test/helper.rb
+- test/test_common.rb
 - test/test_djatoka.rb
+- test/test_metadata.rb
+- test/test_region.rb
 - test/test_resolver.rb
 - test/test_view_helpers.rb
-- test/test_region.rb
-- test/helper.rb
-- test/test_common.rb