djatoka 0.0.9 → 0.0.10

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

data/bin/djatoka_url

@@ -15,7 +15,7 @@ Usage:
 where options are:
 EOS
   opt :resolver, "A Djatoka resolver base URL", :required => true, :type => String
-  opt :rftid, "Resource identifier", :required => true, :type => String, :short => :i
+  opt :rftid, "Resource identifier", :type => String, :short => :i
   opt :level, 'Level', :type => String
   opt :rotate, 'Rotate', :type => String
   opt :region, 'Region', :type => String
@@ -29,47 +29,65 @@ EOS
   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'
+  opt :file, 'process a whole file of rtfids', :type => String
 end
 
-resolver = Djatoka::Resolver.new(opts[:resolver])
-region = resolver.region(opts[:rftid])
-
-[:level, :rotate, :region, :scale, :format, :clayer].each do |param|
-  region.send(param, opts[param]) if opts[param]
+if (!opts[:rftid] and !opts[:file]) or (opts[:rftid] and opts[:file])
+  Trollop::die :rftid, "You must specify either --rftid or --file"
 end
 
-if opts[:smallbox]
-  region.smallbox
+if opts[:rftid]
+  rftids = [opts[:rftid]]
+elsif opts[:file]
+  Trollop::die :file, "File must exist" if !File.exists?(opts[:file])
+  rftids = File.read(opts[:file]).split("\n")
 end
 
-if opts[:square]
-  region.square
-end
+resolver = Djatoka::Resolver.new(opts[:resolver])
 
-if opts[:topleftsquare]
-  region.top_left_square
-end
+rftids.each do |rftid|
+  region = resolver.region(rftid)
 
-if opts[:bottomrightsquare]
-  region.bottom_right_square
-end
+  [:level, :rotate, :region, :scale, :format, :clayer].each do |param|
+    region.send(param, opts[param]) if opts[param]
+  end
 
-if opts[:metadata] or opts[:levels]
- metadata = resolver.metadata(opts[:rftid])
- metadata.perform
- if opts[:metadata]
-   puts metadata.url
-   `#{opts[:browser]} "#{metadata.url}"` if opts[:browser]
-   pp metadata.response
- end
- if opts[:levels]
-   pp metadata.all_levels
- end
-end
+  if opts[:smallbox]
+    region.smallbox
+  end
+
+  if opts[:square]
+    region.square
+  end
+
+  if opts[:topleftsquare]
+    region.top_left_square
+  end
 
-pp region.query
+  if opts[:bottomrightsquare]
+    region.bottom_right_square
+  end
 
-puts region.url
+  if opts[:metadata] or opts[:levels]
+   metadata = resolver.metadata(rftid)
+   metadata.perform
+   if opts[:metadata]
+     puts metadata.url unless opts[:file]
+     `#{opts[:browser]} "#{metadata.url}"` if opts[:browser]
+     pp metadata.response #unless opts[:file] 
+     if metadata.response.nil? or metadata.response.empty?
+       pp rftid + ": empty" 
+     end
+   end
+   if opts[:levels]
+     pp metadata.all_levels unless opts[:file]
+   end
+  end
 
-`#{opts[:browser]} "#{region.url}"` if opts[:browser]
+  pp region.query unless opts[:file]
+
+  puts region.url unless opts[:file]
+
+  `#{opts[:browser]} "#{region.url}"` if opts[:browser]
+end
 

data/lib/djatoka/common.rb

@@ -90,7 +90,11 @@ module Djatoka::Common
   # seen so far.
   def square_params(justify = :center)
     metadata = Djatoka::Metadata.new(resolver, rft_id).perform
-    if metadata
+    # since nil.to_i #=> 0 
+    # check that height and width are present otherwise our calculations will 
+    # fail and raise an error. We want to avoid that and would rather show a 
+    # broken image than raise--at least for now. 
+    if metadata.height and metadata.width 
       orig_height = metadata.height.to_i
       orig_width = metadata.width.to_i
       if query.scale and query.scale.split.length == 1

data/test/helper.rb

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

@@ -79,6 +79,16 @@ context 'A Djatoka Resolver' do
           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
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: djatoka
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 0
-  - 9
-  version: 0.0.9
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - Jason Ronallo
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-02 00:00:00 -04:00
+date: 2010-11-15 00:00:00 -05:00
 default_executable: djatoka_url
 dependencies: 
 - !ruby/object:Gem::Dependency