djatoka 0.0.6 → 0.0.7

data/Rakefile

@@ -13,6 +13,7 @@ begin
     gem.add_development_dependency "shoulda", ">= 0"
     #gem.add_development_dependency "ruby-debug", ">= 0"
     gem.add_development_dependency "hanna", ">= 0"
+    gem.add_development_dependency "fakeweb", ">= 0"
     gem.add_dependency "addressable", "2.1.2"
     gem.add_development_dependency "curb", ">= 0"
     gem.add_dependency "json", ">= 0"

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/djatoka/common.rb

@@ -60,11 +60,11 @@ module Djatoka::Common
     end
     # Here we try to compensate for when the dwtLevels does not match the
     # djatoka levels.
-    if metadata.dwt_levels.to_i > metadata.levels.to_i
-      best_level.to_i - 2
-    elsif metadata.dwt_levels.to_i == metadata.levels.to_i
+#    if metadata.dwt_levels.to_i > metadata.levels.to_i
+#      best_level.to_i - 2
+#    elsif metadata.dwt_levels.to_i == metadata.levels.to_i
       best_level.to_i
-    end
+#    end
   end
 
   private
@@ -88,13 +88,13 @@ module Djatoka::Common
         # 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
+#        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
+#        elsif metadata.dwt_levels.to_i == metadata.levels.to_i
           good_query_level = query.level.to_i
-        end
+#        end
         height = metadata.all_levels[good_query_level].height
         width = metadata.all_levels[good_query_level].width
       else

data/lib/djatoka/metadata.rb

@@ -56,12 +56,12 @@ 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
-    dwt_levels_i = dwt_levels.to_i
-    (0..dwt_levels_i).each do |level_num|
+    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 = dwt_levels_i - level_num
+      times_to_halve = levels_i - level_num
       times_to_halve.times do
         level_height = level_height / 2
         level_width = level_width / 2

data/test/helper.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'test/unit'
 require 'shoulda'
+require 'fakeweb'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
@@ -21,13 +22,20 @@ class Test::Unit::TestCase
   end
 
   def set_testing_curb
-    begin
-      require 'curb'
-      Djatoka.use_curb = true
-    rescue LoadError
-      Djatoka.use_curb = false
-    end
+    Djatoka.use_curb = false
+#    begin
+#      require 'curb'
+#      Djatoka.use_curb = true
+#    rescue LoadError
+#      Djatoka.use_curb = false
+#    end
   end
 
 end
 
+
+#curl -is -H 'Accept: application/json'  -d "url_ver=Z39.88-2004&rft_id=ua023_015-006-bx0003-014-075&svc_id=info%3Alanl-repo%2Fsvc%2FgetMetadata" http://scrc.lib.ncsu.edu/adore-djatoka/resolver > test/fixtures/ua023_015-006-bx0003-014-075-metadata.json
+
+FakeWeb.register_uri(:get, "http://african.lanl.gov/adore-djatoka/resolver?rft_id=ua023_015-006-bx0003-014-075&svc_id=info%3Alanl-repo%2Fsvc%2FgetMetadata&url_ver=Z39.88-2004",
+  :response => File.read('test/fixtures/ua023_015-006-bx0003-014-075-metadata.json'))
+

data/test/test_common.rb

@@ -57,6 +57,17 @@ context 'A Djatoka Resolver' do
           assert_equal '513,0,4093,4093', @region.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')
+        end
+        should 'be able to scale properly' do
+          @region2.scale('300').square
+          assert @region2.url
+        end
+      end
+      
     end
 
   end

data/test/test_metadata.rb

@@ -76,6 +76,19 @@ class TestDjatokaMetadata < Test::Unit::TestCase
                    "6"=>{"height"=>3372, "width"=>5120},}
         assert_equal levels, @levels
       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},
+                  "4"=>{"height"=>915, "width"=>592}}
+        metadata = @resolver.metadata('ua023_015-006-bx0003-014-075').perform
+        returned_levels = metadata.all_levels
+        assert_equal levels, returned_levels
+
+      end
+      
+      
     end # levels
 
   end #with_a_resolver

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: djatoka
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Jason Ronallo
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-22 00:00:00 -04:00
+date: 2010-10-28 00:00:00 -04:00
 default_executable: djatoka_url
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,9 +47,23 @@ dependencies:
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: addressable
+  name: fakeweb
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: addressable
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -61,11 +75,11 @@ dependencies:
         - 2
         version: 2.1.2
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: curb
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -75,11 +89,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -89,11 +103,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: trollop
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -103,11 +117,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: hashie
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -117,7 +131,7 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id008
 description: The djatoka library provides some simple methods for creation of the OpenURLs needed to communicate with the Djatoka image server.
 email: jronallo@gmail.com
 executables: 
@@ -153,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_djatoka.rb
+- test/test_region.rb
+- test/helper.rb
+- test/test_common.rb
 has_rdoc: true
 homepage: http://github.com/jronallo/djatoka
 licenses: []
@@ -195,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_djatoka.rb
+- test/test_region.rb
+- test/helper.rb
+- test/test_common.rb