djatoka 0.0.5 → 0.0.6

data/README.rdoc

@@ -10,19 +10,22 @@ used by Djatoka.
 
   gem install djatoka
 
+If you wish to use the curb gem instead of Net::HTTP, install it:
+gem install curb
+
 == Example usage
   # Create a resolver object with a URL.
   resolver = Djatoka::Resolver.new('http://african.lanl.gov/adore-djatoka/resolver')
-  
+
   # A known good identifier
   identifier = 'info:lanl-repo/ds/5aa182c2-c092-4596-af6e-e95d2e263de3'
-  
+
   # Ping the server to see if that resource exists.
   resolver.ping(identifier)
    # => <Mash identifier="info:lanl-repo/ds/5aa182c2-c092-4596-af6e-e95d2e263de3" status="OK">
   resolver.ping('foobar')
    # => nil
-  
+
   # Create a Djatoka::Metadata object and perform the request to the server for metadata.
   metadata = resolver.metadata(identifier).perform
   metadata.levels
@@ -78,17 +81,24 @@ at the same site (domain and port) as your application. The scripts also expect
 the resolver to remain at /adore-djatoka/resolver so maintain that path if you
 proxy Djatoka or dig into the javascript to change the path.
 
+== Ruby versions
+
+Tested with the following Ruby versions:
+- 1.8.7-p249
+- 1.8.7-p302
+- 1.9.2-p0
+
 == Commandline
 
 There is also a little commandline utility for outputting the OpenURL.
 
-    $ djatoka_url --resolver http://african.lanl.gov/adore-djatoka/resolver --rft-id info:lanl-repo/ds/5aa182c2-c092-4596-af6e-e95d2e263de3 --scale 300 --square
+    $ djatoka_url --resolver http://african.lanl.gov/adore-djatoka/resolver --rftid info:lanl-repo/ds/5aa182c2-c092-4596-af6e-e95d2e263de3 --scale 300 --square
     {"region"=>"0,874,421,421", "scale"=>"300", "level"=>"3"}
     http://african.lanl.gov/adore-djatoka/resolver?svc.level=3&url_ver=Z39.88-2004&svc.region=0%2C874%2C421%2C421&svc.scale=300&rft_id=info%3Alanl-repo%2Fds%2F5aa182c2-c092-4596-af6e-e95d2e263de3&svc_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Ajpeg2000&svc_id=info%3Alanl-repo%2Fsvc%2FgetRegion
-    
-    $ djatoka_url --resolver http://african.lanl.gov/adore-djatoka/resolver --rft-id info:lanl-repo/ds/5aa182c2-c092-4596-af6e-e95d2e263de3 --smallbox --browser chromium-browser   
-    
-    $ djatoka_url --help 
+
+    $ djatoka_url --resolver http://african.lanl.gov/adore-djatoka/resolver --rftid info:lanl-repo/ds/5aa182c2-c092-4596-af6e-e95d2e263de3 --smallbox --browser chromium-browser
+
+    $ djatoka_url --help
 
 
 == TODO

data/Rakefile

@@ -11,9 +11,10 @@ begin
     gem.homepage = "http://github.com/jronallo/djatoka"
     gem.authors = ["Jason Ronallo"]
     gem.add_development_dependency "shoulda", ">= 0"
-    gem.add_development_dependency "ruby-debug", ">= 0"
+    #gem.add_development_dependency "ruby-debug", ">= 0"
+    gem.add_development_dependency "hanna", ">= 0"
     gem.add_dependency "addressable", "2.1.2"
-    #gem.add_dependency "curb", ">= 0"
+    gem.add_development_dependency "curb", ">= 0"
     gem.add_dependency "json", ">= 0"
     gem.add_dependency 'trollop', '>= 0'
     gem.add_dependency 'hashie', '>= 0'
@@ -49,8 +50,11 @@ task :test => :check_dependencies
 
 task :default => :test
 
-#require 'rake/rdoctask'
-require 'hanna/rdoctask'
+begin
+  require 'hanna/rdoctask'
+rescue LoadError
+  require 'rake/rdoctask'
+end
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/bin/djatoka_url

@@ -10,12 +10,12 @@ This script take a Djatoka resolver base URL and returns a full URI for a partic
 identifier.
 
 Usage:
-  djatoka_url [options] --resolver http://african.lanl.gov/adore-djatoka/resolver --rft_id info:lanl-repo/ds/5aa182c2-c092-4596-af6e-e95d2e263de3
+  djatoka_url [options] --resolver http://african.lanl.gov/adore-djatoka/resolver --rftid info:lanl-repo/ds/5aa182c2-c092-4596-af6e-e95d2e263de3
 
 where options are:
 EOS
   opt :resolver, "A Djatoka resolver base URL", :required => true, :type => String
-  opt :rft_id, "Resource identifier", :required => true, :type => String, :short => :i
+  opt :rftid, "Resource identifier", :required => true, :type => String, :short => :i
   opt :level, 'Level', :type => String
   opt :rotate, 'Rotate', :type => String
   opt :region, 'Region', :type => String
@@ -30,7 +30,7 @@ EOS
 end
 
 resolver = Djatoka::Resolver.new(opts[:resolver])
-region = resolver.region(opts[:rft_id])
+region = resolver.region(opts[:rftid])
 
 [:level, :rotate, :region, :scale, :format, :clayer].each do |param|
   region.send(param, opts[param]) if opts[param]
@@ -45,7 +45,7 @@ if opts[:square]
 end
 
 if opts[:metadata] or opts[:levels]
- metadata = resolver.metadata(opts[:rft_id])
+ metadata = resolver.metadata(opts[:rftid])
  metadata.perform
  if opts[:metadata]
    puts metadata.url

data/lib/djatoka.rb

@@ -50,7 +50,7 @@ rescue LoadError
 end
 
 require 'net/http'
-  require 'uri'
+require 'uri'
 
 require 'djatoka/net'
 require 'djatoka/resolver'

data/lib/djatoka/region.rb

@@ -124,7 +124,9 @@ class Djatoka::Region
   def map_params(params)
     params.each do |k,v|
       if k.to_s != 'resolver' and self.respond_to?(k) and
-        self.class.instance_methods(false).include?(k.to_s)
+        (self.class.instance_methods(false).include?(k.to_s) or
+        self.class.instance_methods(false).include?(k.to_sym)
+        )
         self.send(k,v)
       end
     end

data/test/helper.rb

@@ -5,7 +5,7 @@ require 'shoulda'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'djatoka'
-require 'ruby-debug'
+#require 'ruby-debug'
 
 class Test::Unit::TestCase
   def self.with_a_resolver(&block)
@@ -20,5 +20,14 @@ class Test::Unit::TestCase
     end
   end
 
+  def set_testing_curb
+    begin
+      require 'curb'
+      Djatoka.use_curb = true
+    rescue LoadError
+      Djatoka.use_curb = false
+    end
+  end
+
 end
 

data/test/test_djatoka.rb

@@ -4,6 +4,7 @@ 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

data/test/test_metadata.rb

@@ -56,7 +56,7 @@ class TestDjatokaMetadata < Test::Unit::TestCase
       should 'return a height for a good request' do
         Djatoka.use_curb=false
         assert_equal '3372', Djatoka::Metadata.new(@resolver, @identifier).perform.height
-        Djatoka.use_curb=true
+        set_testing_curb
       end
     end
 

data/test/test_region.rb

@@ -126,7 +126,7 @@ class TestDjatokaMetadata < Test::Unit::TestCase
           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',
+          params = {'level'=> 3, 'rotate'=> 180, 'region' => '0,0,500,500',
             'scale' => 75, 'format' => 'image/png'
           }
           region = Djatoka::Region.new(@resolver,@identifier,params)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: djatoka
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Jason Ronallo
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-30 00:00:00 -04:00
+date: 2010-08-22 00:00:00 -04:00
 default_executable: djatoka_url
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug
+  name: hanna
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -63,7 +63,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: curb
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -74,10 +74,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: trollop
+  name: json
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -91,7 +91,7 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: hashie
+  name: trollop
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -104,6 +104,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: hashie
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id007
 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: