djatoka 0.0.11 → 0.0.12

data/Rakefile

@@ -14,7 +14,7 @@ begin
     #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_dependency "addressable"
     gem.add_development_dependency "curb", ">= 0"
     gem.add_dependency "json", ">= 0"
     gem.add_dependency 'trollop', '>= 0'

data/VERSION

@@ -1 +1 @@
-0.0.11
+0.0.12

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: djatoka
 version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 12
+  version: 0.0.12
 platform: ruby
 authors: 
 - Jason Ronallo
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-21 00:00:00 -05:00
+date: 2011-08-02 00:00:00 -04:00
 default_executable: djatoka_url
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,14 +66,12 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
-        - 2
-        - 1
-        - 2
-        version: 2.1.2
+        - 0
+        version: "0"
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -167,13 +165,6 @@ files:
 - lib/djatoka/region.rb
 - lib/djatoka/resolver.rb
 - lib/djatoka/view_helpers.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
 has_rdoc: true
 homepage: http://github.com/jronallo/djatoka
 licenses: []
@@ -204,15 +195,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Djatoka image server helpers for Ruby and Rails.
-test_files: 
-- 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_files: []
+

data/test/helper.rb

@@ -1,43 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-require 'fakeweb'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'djatoka'
-#require 'ruby-debug'
-
-class Test::Unit::TestCase
-  def self.with_a_resolver(&block)
-    context 'resolver setup' do
-      setup do
-        @resolver = Djatoka::Resolver.new('http://african.lanl.gov/adore-djatoka/resolver')
-        @identifier = 'info:lanl-repo/ds/5aa182c2-c092-4596-af6e-e95d2e263de3'
-        @url_encoded_identifier = 'info%3Alanl-repo%2Fds%2F5aa182c2-c092-4596-af6e-e95d2e263de3'
-      end
-
-      merge_block(&block) if block_given?
-    end
-  end
-
-  def set_testing_curb
-    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'))
-  
-FakeWeb.register_uri(:get, "http://african.lanl.gov/adore-djatoka/resolver?rft_id=asdf&svc_id=info%3Alanl-repo%2Fsvc%2FgetMetadata&url_ver=Z39.88-2004",
-  :response => File.read('test/fixtures/empty-metadata.json'))

data/test/test_common.rb

@@ -1,97 +0,0 @@
-require 'helper'
-
-class TestDjatokaCommon < Test::Unit::TestCase
-
-context 'A Djatoka Resolver' do
-    with_a_resolver do
-      setup do
-        @region = Djatoka::Region.new(@resolver, @identifier)
-      end
-      should 'create a query for a 75x75 version of the image' do
-        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%2C106%2C106'
-      end
-
-      should 'return a uri for a small square version of the image' do
-        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
-        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,1748,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']
-      end
-      should 'return a url for a square version of the image' do
-        assert @region.square_url.is_a? String
-        assert @region.square_url.include? 'http://african.lanl.gov'
-        assert @region.square_url.include? 'svc.region=0%2C874%2C3372%2C3372'
-      end
-      should 'create a query for a square version of the image at a good level' do
-        @region.scale('555')
-        assert_equal '0,874,843,843', @region.square.query.region
-        assert_equal '555', @region.square.query.scale
-        assert_equal '4', @region.square.query.level
-      end
-
-      should 'pick the best level' do
-        metadata = Djatoka::Metadata.new(@resolver, @identifier).perform
-        @region.scale('200')
-        best_level = @region.pick_best_level(metadata)
-        assert_equal 2, best_level
-      end
-
-      context 'an image which is higher than it is wider' do
-        setup do
-          @region = Djatoka::Region.new(@resolver, 'info:lanl-repo/ds/b820f537-26a1-4af8-b86a-e7a4cac6187a')
-        end
-        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')
-        end
-        should 'be able to scale properly' do
-          @region2.scale('300').square
-          assert @region2.url
-        end
-      end
-      
-      context 'an request for a non-existent image' do
-        setup do
-          @no_region = Djatoka::Region.new(@resolver, 'asdf')
-        end
-        should 'not raise when no metadata and trying to create a square at scale' do
-          @no_region.scale(300).square
-          assert @no_region.url
-        end
-      end
-
-    end
-
-  end
-end
-

data/test/test_djatoka.rb

@@ -1,29 +0,0 @@
-require 'helper'
-
-class TestDjatoka < Test::Unit::TestCase
-  should 'allow Djatoka.use_curb to be set' do
-    Djatoka.use_curb=true
-    assert Djatoka.use_curb?
-    set_testing_curb
-  end
-
-  with_a_resolver do
-    should 'be able to set Djatoka.resolver to a Djatoka::Resolver' do
-      Djatoka.resolver = @resolver
-      assert Djatoka.resolver.is_a? Djatoka::Resolver
-    end
-
-    should 'be able to set Djatoka.resolver to a URL and get a Djatoka::Resolver' do
-      Djatoka.resolver = 'http://african.lanl.gov/adore-djatoka/resolver'
-      assert Djatoka.resolver.is_a? Djatoka::Resolver
-      assert_equal 'http://african.lanl.gov/adore-djatoka/resolver', Djatoka.resolver.url
-    end
-
-    should_eventually 'not be able to set a Djatoka.resolver to a bad string' do
-      Djatoka.resolver = 'asdf'
-      assert Djatoka.resolver.nil?
-    end
-  end
-
-end
-

data/test/test_metadata.rb

@@ -1,103 +0,0 @@
-require 'helper'
-
-class TestDjatokaMetadata < Test::Unit::TestCase
-  with_a_resolver do
-    context 'a metadata object' do
-      setup do
-        @metadata_obj = @resolver.metadata(@identifier)
-        @metadata = @metadata_obj.perform
-      end
-
-      should 'create a metadata object' do
-        assert @metadata.is_a? Djatoka::Metadata
-      end
-
-      should "create a metadata URL for an identifier" do
-        assert @metadata.url.include? 'http://african.lanl.gov/adore-djatoka/resolver?'
-        assert @metadata.url.include? 'url_ver=Z39.88-2004'
-        assert @metadata.url.include? '&svc_id=info%3Alanl-repo%2Fsvc%2FgetMetadata'
-        assert @metadata.url.include? '&rft_id=info%3Alanl-repo%2Fds%2F5aa182c2-c092-4596-af6e-e95d2e263de3'
-      end
-
-      should 'create a metadata uri for an identifier' do
-        uri = @metadata.uri
-        assert_equal 'african.lanl.gov', uri.host
-      end
-
-      should "return imagefile metadata for an identifier" do
-        assert_equal '/lanl/data/loc/cc5fc4f7-e50a-455f-b3ce-a6a8b54824e6/WEJLNXSBWO7LPLC7Z6DITFX7A45XR3GS.jp2',
-          @metadata.imagefile
-      end
-
-      should 'return an identifier for a good request' do
-        assert_equal @identifier,
-          @metadata.identifier
-      end
-
-      should 'return a height for a good request' do
-        assert_equal '3372', @metadata.height
-      end
-
-      should 'return a width for a good request' do
-        assert_equal '5120', @metadata.width
-      end
-
-      should 'return an OK status for a good request' do
-        metadata = @metadata.status
-      end
-
-      should 'return a nil for a bad request' do
-        metadata = @resolver.metadata('asdf')
-        assert_equal nil, metadata.status
-      end
-    end #context metadata response
-
-    context 'using net::http' do
-      should 'return a height for a good request' do
-        Djatoka.use_curb=false
-        assert_equal '3372', Djatoka::Metadata.new(@resolver, @identifier).perform.height
-        set_testing_curb
-      end
-    end
-
-    context 'determining all the levels for a particular metadata response' do
-      setup do
-        @metadata_obj = @resolver.metadata(@identifier)
-        @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
-        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 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"=>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
-        assert_equal levels, returned_levels
-
-      end
-      
-    end # levels
-
-  end #with_a_resolver
-
-end
-

data/test/test_region.rb

@@ -1,151 +0,0 @@
-require 'helper'
-
-class TestDjatokaMetadata < Test::Unit::TestCase
-  with_a_resolver do
-    context 'creates image URLs for a region' do
-      setup do
-        @region = Djatoka::Region.new(@resolver, @identifier)
-      end
-
-      should 'create good region parameters' do
-        good_params = {'rft_id'=>"info:lanl-repo/ds/5aa182c2-c092-4596-af6e-e95d2e263de3",
-                        "svc_val_fmt"=>"info:ofi/fmt:kev:mtx:jpeg2000",
-                        "svc_id"=>"info:lanl-repo/svc/getRegion",
-                        'url_ver'=>"Z39.88-2004"}
-        assert_equal good_params, @region.region_params
-      end
-
-      context 'create a new region if given a string as a resolver' do
-        should 'create a resolver object' do
-          region = Djatoka::Region.new('http://african.lanl.gov/adore-djatoka/resolver', @identifier)
-          assert region.resolver.is_a? Djatoka::Resolver
-          assert_equal 'http://african.lanl.gov/adore-djatoka/resolver', region.resolver.to_s
-          assert_equal 'african.lanl.gov', region.resolver.host
-        end
-      end
-
-      context 'create a default region uri' do
-        setup do
-          @region_uri = @region.uri
-          @query_values = @region.uri.query_values
-        end
-        should 'create a default region uri' do
-          assert_equal @identifier, @query_values['rft_id']
-          assert_equal nil, @query_values['svc.scale']
-        end
-        should 'output a region url' do
-          assert @region.url.is_a? String
-          assert @region.url.include? 'http://african.lanl.gov'
-        end
-      end
-
-      context 'add query parameters' do
-        should 'accept a scale as a String' do
-          scale_region = @region.scale('96')
-          assert_equal '96', scale_region.query.scale
-        end
-        should 'accept a scale as a single Integer' do
-          assert_equal '96', @region.scale(96).query.scale
-        end
-        should 'accept a scale as a Float' do
-          assert_equal '0.5', @region.scale(0.5).query.scale
-        end
-        should 'accept a scale as an Array of 2' do
-          assert_equal '1024,768', @region.scale([1024,768]).query.scale
-          assert_equal '10,60', @region.scale(['10', '60']).query.scale
-        end
-
-        should 'accept a level as a String' do
-          level_region = @region.level('2')
-          assert_equal '2', level_region.query.level
-        end
-        should 'accept a level as an Integer' do
-          assert_equal '3', @region.level(3).query.level
-        end
-
-        should 'accept a rotate as a String' do
-          assert_equal '180', @region.rotate('180').query.rotate
-        end
-        should 'accept a rotate as an Integer' do
-          assert_equal '180', @region.rotate(180).query.rotate
-        end
-
-        should 'accept a region as a String' do
-          assert_equal '0,0,256,256', @region.region('0,0,256,256').query.region
-        end
-        should 'accept a region as an Array of Strings' do
-          assert_equal '0,0,256,256', @region.region(['0','0','256','256']).query.region
-        end
-        should 'accept a region as an Array of Integers and/or Floats' do
-          assert_equal '0.1,0.1,5,5', @region.region([0.1, 0.1, 5, 5]).query.region
-        end
-
-        should 'accept a format as a String' do
-          assert_equal 'image/png', @region.format('image/png').query.format
-        end
-        should 'accept a clayer as a String' do
-          assert_equal '0', @region.clayer('0').query.clayer
-        end
-      end
-
-      context 'add empty or null query parameters' do
-        should 'have no value in the uri' do
-          assert_equal nil, @region.level(nil).uri.query_values['svc.level']
-        end
-      end
-
-      context 'create a query uri with svc values' do
-        should 'have a svc.scale paramter' do
-          assert_equal '96', @region.scale('96').uri.query_values['svc.scale']
-        end
-        context 'and method chaining' do
-          setup do
-            @region2 = @region.dup.scale('96').level('3')
-            @region2_query_values = @region2.uri.query_values
-          end
-          should 'have svc.scale and svc.level parameters after method chaining' do
-            assert_equal '96', @region2_query_values['svc.scale']
-            assert_equal '3', @region2_query_values['svc.level']
-          end
-          should 'have default values after method chaining svc values' do
-            assert_equal 'info:lanl-repo/svc/getRegion', @region2_query_values['svc_id']
-          end
-        end
-      end #context create a query uri with svc values
-
-      context 'create a new region and pass in query parameters' do
-        should 'accept param keys as symbols' do
-          params = {:level=> 3, :rotate=>180, :region => '0,0,500,500',
-            :scale => 75, :format => 'image/png'
-          }
-          region = Djatoka::Region.new(@resolver,@identifier,params)
-          assert_equal '3', region.query.level
-          assert_equal '180', region.query.rotate
-          assert_equal '0,0,500,500', region.query.region
-          assert_equal '75', region.query.scale
-          assert_equal 'image/png', region.query.format
-        end
-        should 'accept param keys as strings' do
-          params = {'level'=> 3, 'rotate'=> 180, 'region' => '0,0,500,500',
-            'scale' => 75, 'format' => 'image/png'
-          }
-          region = Djatoka::Region.new(@resolver,@identifier,params)
-          assert_equal '3', region.query.level
-          assert_equal '180', region.query.rotate
-          assert_equal '0,0,500,500', region.query.region
-          assert_equal '75', region.query.scale
-          assert_equal 'image/png', region.query.format
-        end
-        should 'not choke on params it responds to but are not instance methods' do
-          region = Djatoka::Region.new(@resolver,@identifier,{:class => 'djatoka_image'})
-          assert region.is_a? Djatoka::Region
-          assert_equal nil, region.uri.query_values['svc.class']
-        end
-      end
-
-    end #context
-
-  end #with_a_resolver
-
-end
-

data/test/test_resolver.rb

@@ -1,88 +0,0 @@
-require 'helper'
-
-class TestDjatokaResolver < Test::Unit::TestCase
-  with_a_resolver do
-    context 'A Djatoka Resolver' do
-
-      should 'hold a good host from a base_url' do
-        assert_equal 'african.lanl.gov', @resolver.host
-      end
-
-      should 'hold a good path from a base_url' do
-        assert_equal '/adore-djatoka/resolver', @resolver.path
-      end
-
-      should 'create a ping url' do
-        assert_equal 'http://african.lanl.gov/adore-djatoka/resolver?url_ver=Z39.88-2004&svc_id=info:lanl-repo/svc/ping&rft_id=info%3Alanl-repo%2Fds%2F5aa182c2-c092-4596-af6e-e95d2e263de3',
-          @resolver.ping_url(@identifier)
-      end
-
-      context 'a ping request' do
-        setup do
-          @ping_response = @resolver.ping(@identifier)
-        end
-
-        should 'return an OK status for a good request' do
-          assert_equal 'OK', @ping_response['status']
-        end
-
-        should 'return the identifier for a good request' do
-          assert_equal @identifier, @ping_response['identifier']
-        end
-
-        should 'return a nil for a bad request' do
-          ping_response = @resolver.ping('asdf')
-          assert_equal nil, ping_response
-        end
-      end
-
-      context 'a ping request using net::http' do
-        setup do
-          Djatoka.use_curb=false
-        end
-        should 'return an OK status for a good request' do
-          assert_equal 'OK', @resolver.ping(@identifier).status
-          Djatoka.use_curb=true
-        end
-        should 'return a nil for a bad request' do
-          ping_response = @resolver.ping('asdf')
-          assert_equal nil, ping_response
-          Djatoka.use_curb=true
-        end
-      end
-
-      should 'create a region from a resolver' do
-        assert @resolver.region(@identifier).is_a? Djatoka::Region
-      end
-      should 'create a region uri from a resolver' do
-        assert @resolver.region_uri(@identifier).is_a? Addressable::URI
-      end
-
-    end #context a Djatoka::Resolver
-
-    context 'a resolver with a port number' do
-      setup do
-        @resolver_port = Djatoka::Resolver.new('http://example.com:8080/adore-djatoka/resolver')
-      end
-      should 'hold good uri data' do
-        assert_equal 'example.com', @resolver_port.host
-        assert_equal 8080, @resolver_port.port
-        assert_equal '/adore-djatoka/resolver', @resolver_port.path
-      end
-      should 'create a good metadata uri' do
-        metadata_url = Djatoka::Metadata.new(@resolver_port, 'asdf').uri
-        assert_equal 8080, metadata_url.port
-      end
-      should 'create a metadata url' do
-        metadata_url = @resolver_port.metadata_url(@identifier)
-        assert metadata_url.is_a? String
-        assert metadata_url.include?('getMetadata')
-      end
-      should 'create a good url' do
-        assert_equal 'http://example.com:8080/adore-djatoka/resolver', @resolver_port.url
-      end
-    end #context: resolver with a port number
-
-  end #with_a_resolver
-end
-

data/test/test_view_helpers.rb

@@ -1,15 +0,0 @@
-require 'helper'
-
-class TestDjatokaViewHelpers < Test::Unit::TestCase
-  with_a_resolver do
-    context 'Rails view helpers' do
-      should 'be true' do
-        assert true
-      end
-      should_eventually 'Test the Rails view helpers' do
-        assert_equal '', djatoka_image_tag(@identifier)
-      end
-    end
-  end
-end
-