djatoka 0.1.0 → 0.2.0

data/.document

@@ -0,0 +1,5 @@
+README.rdoc
+lib/**/*.rb
+bin/*
+features/**/*.feature
+LICENSE

data/.gitignore

@@ -0,0 +1,25 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+
+## PROJECT::SPECIFIC
+.redcar
+.rvmrc
+
+.rbx

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - "1.9.3"
+  - "2.0.0"
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx-19mode
+# uncomment this line if your project needs to run something other than `rake`:
+script: rake test
+

data/Gemfile

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gemspec
+
+gem 'rdoc', ">= 2.4.2"
+gem 'rake'
+gem 'pry'
+gem 'rb-readline'

data/Gemfile.lock

@@ -0,0 +1,68 @@
+PATH
+  remote: .
+  specs:
+    djatoka (0.2.0)
+      addressable
+      hashie
+      json
+      trollop
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
+      multi_json (~> 1.0)
+    addressable (2.3.3)
+    bourne (1.4.0)
+      mocha (~> 0.13.2)
+    coderay (1.0.9)
+    fakeweb (1.3.0)
+    ffi (1.6.0-java)
+    hashie (2.0.3)
+    i18n (0.6.1)
+    json (1.7.7)
+    json (1.7.7-java)
+    metaclass (0.0.1)
+    method_source (0.8.1)
+    mocha (0.13.3)
+      metaclass (~> 0.0.1)
+    multi_json (1.7.2)
+    pry (0.9.12)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    pry (0.9.12-java)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+      spoon (~> 0.0)
+    rake (10.0.4)
+    rb-readline (0.4.2)
+    rdoc (4.0.1)
+      json (~> 1.4)
+    shoulda (3.4.0)
+      shoulda-context (~> 1.0, >= 1.0.1)
+      shoulda-matchers (~> 1.0, >= 1.4.1)
+    shoulda-context (1.0.2)
+    shoulda-matchers (1.5.4)
+      activesupport (>= 3.0.0)
+      bourne (~> 1.3)
+    slop (3.4.4)
+    spoon (0.0.3)
+      ffi
+    trollop (2.0)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  djatoka!
+  fakeweb
+  mocha
+  pry
+  rake
+  rb-readline
+  rdoc (>= 2.4.2)
+  shoulda

data/README.rdoc

@@ -4,6 +4,8 @@ Simple library for use with the {Djatoka JPEG2000 image server}[http://sourcefor
 It helps ease creation of the {OpenURLs}[http://sourceforge.net/apps/mediawiki/djatoka/index.php?title=Djatoka_OpenURL_Services#djatoka_OpenURL_Service_Types]
 used by Djatoka.
 
+{<img src="https://travis-ci.org/jronallo/djatoka.png" />}[https://travis-ci.org/jronallo/djatoka]
+
 == Installation
 
 {Install the Djatoka image server}[http://sourceforge.net/apps/mediawiki/djatoka/index.php?title=Installation]

data/Rakefile

@@ -1,32 +1,6 @@
 require 'rubygems'
 require 'rake'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "djatoka"
-    gem.summary = %Q{Djatoka image server helpers for Ruby and Rails.}
-    gem.description = %Q{The djatoka library provides some simple methods for creation of the OpenURLs needed to communicate with the Djatoka image server.}
-    gem.email = "jronallo@gmail.com"
-    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 "hanna", ">= 0"
-    gem.add_development_dependency "fakeweb", ">= 0"
-    gem.add_dependency "addressable"
-    gem.add_development_dependency "curb", ">= 0"
-    gem.add_dependency "json", ">= 0"
-    gem.add_dependency 'trollop', '>= 0'
-    gem.add_dependency 'hashie', '>= 0'
-    gem.files = FileList["[A-Z]*", "{bin,generators,lib}/**/*"]
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
@@ -47,16 +21,11 @@ rescue LoadError
   end
 end
 
-task :test => :check_dependencies
-
 task :default => :test
 
-begin
-  require 'hanna/rdoctask'
-rescue LoadError
-  require 'rake/rdoctask'
-end
-Rake::RDocTask.new do |rdoc|
+require 'rdoc/task'
+
+RDoc::Task.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'

data/djatoka.gemspec

@@ -0,0 +1,30 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{djatoka}
+  s.version = "0.2.0"
+  s.authors = ["Jason Ronallo"]
+  s.email = %q{jronallo@gmail.com}
+  s.homepage = %q{http://github.com/jronallo/djatoka}
+  s.summary = %q{Djatoka image server helpers for Ruby and Rails.}
+  s.description = %q{The djatoka library provides some simple methods for creation of the OpenURLs needed to communicate with the Djatoka image server.}
+  s.rubyforge_project = "djatoka"
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+  
+  s.add_dependency "addressable"
+  s.add_dependency "hashie"
+  s.add_dependency "json"
+  
+  s.add_dependency "trollop"
+
+  s.add_development_dependency "mocha"
+  s.add_development_dependency "fakeweb"
+  s.add_development_dependency "shoulda"
+end
+

data/fixtures/vcr_cassettes/djatoka_common.yml

@@ -0,0 +1,50 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://african.lanl.gov/adore-djatoka/resolver?rft_id=ua023_015-006-bx0003-014-075&svc_id=info:lanl-repo/svc/getMetadata&url_ver=Z39.88-2004
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+      User-Agent:
+      - Ruby
+      Host:
+      - african.lanl.gov
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Date:
+      - Sat, 30 Mar 2013 00:39:45 GMT
+      Server:
+      - Apache
+      Set-Cookie:
+      - JSESSIONID=51591DC81C68ACA60BFE0D714C98FE93; Path=/adore-djatoka
+      Content-Length:
+      - '952'
+      Connection:
+      - close
+      Content-Type:
+      - text/html;charset=utf-8
+    body:
+      encoding: UTF-8
+      string: '<html><head><title>Apache Tomcat/6.0.18 - Error report</title><style><!--H1
+        {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:22px;}
+        H2 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:16px;}
+        H3 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:14px;}
+        BODY {font-family:Tahoma,Arial,sans-serif;color:black;background-color:white;}
+        B {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;}
+        P {font-family:Tahoma,Arial,sans-serif;background:white;color:black;font-size:12px;}A
+        {color : black;}A.name {color : black;}HR {color : #525D76;}--></style> </head><body><h1>HTTP
+        Status 404 - </h1><HR size="1" noshade="noshade"><p><b>type</b> Status report</p><p><b>message</b>
+        <u></u></p><p><b>description</b> <u>The requested resource () is not available.</u></p><HR
+        size="1" noshade="noshade"><h3>Apache Tomcat/6.0.18</h3></body></html>'
+    http_version: 
+  recorded_at: Sat, 30 Mar 2013 00:39:45 GMT
+recorded_with: VCR 2.4.0

data/init.rb

@@ -0,0 +1,2 @@
+require 'djatoka'
+

data/lib/djatoka.rb

@@ -58,7 +58,6 @@ require 'djatoka/metadata'
 require 'djatoka/common'
 require 'djatoka/region'
 
-require 'rubygems'
 require 'addressable/uri'
 require 'addressable/template'
 require 'json'

data/lib/djatoka/resolver.rb

@@ -3,12 +3,13 @@
 # and Djatoka::Metadata objects.
 class Djatoka::Resolver
   include Djatoka::Net
-  attr_accessor :base_url, :host, :path, :port
+  attr_accessor :base_url, :scheme, :host, :path, :port
 
   def initialize(base_url='http://african.lanl.gov/adore-djatoka/resolver')
     #if base_url.to_s =~ /(^$)|(^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?\/.*)?$)/ix
       uri = Addressable::URI.parse(base_url)
       @base_url = uri.to_s
+      @scheme = uri.scheme
       @host = uri.host
       @path = uri.path
       @port = uri.port
@@ -63,7 +64,7 @@ class Djatoka::Resolver
   end
 
   def base_uri_params
-    params = {:host => host, :path => path, :scheme => 'http'}
+    params = {:host => host, :path => path, :scheme => scheme}
     params[:port] = port if port
     params
   end
@@ -76,7 +77,7 @@ class Djatoka::Resolver
   private
 
   def ping_url_template
-    Addressable::Template.new("#{base_url}?url_ver=Z39.88-2004&svc_id=info:lanl-repo/svc/ping&rft_id={rft_id}")
+    Addressable::Template.new("#{base_url}?url_ver=Z39.88-2004&svc_id=info%3Alanl-repo%2Fsvc%2Fping&rft_id={rft_id}")
   end
 
 end

data/test/fixtures/5aa182c2-c092-4596-af6e-e95d2e263de3.json

@@ -0,0 +1,16 @@
+HTTP/1.1 200 OK
+Date: Sat, 30 Mar 2013 01:08:53 GMT
+Server: Apache
+Set-Cookie: JSESSIONID=F35F3F94F2C099D755C1A769EA502607; Path=/adore-djatoka
+Connection: close
+Content-Type: application/json
+
+{
+"identifier": "info:lanl-repo/ds/5aa182c2-c092-4596-af6e-e95d2e263de3",
+"imagefile": "/lanl/data/loc/cc5fc4f7-e50a-455f-b3ce-a6a8b54824e6/WEJLNXSBWO7LPLC7Z6DITFX7A45XR3GS.jp2",
+"width": "5120",
+"height": "3372",
+"dwtLevels": "6",
+"levels": "6",
+"compositingLayerCount": "1"
+}

data/test/fixtures/b820f537-26a1-4af8-b86a-e7a4cac6187a.json

@@ -0,0 +1,16 @@
+HTTP/1.1 200 OK
+Date: Sat, 30 Mar 2013 00:56:24 GMT
+Server: Apache
+Set-Cookie: JSESSIONID=086B6175C0316D0303537438B30FDD0F; Path=/adore-djatoka
+Connection: close
+Content-Type: application/json
+
+{
+"identifier": "info:lanl-repo/ds/b820f537-26a1-4af8-b86a-e7a4cac6187a",
+"imagefile": "/lanl/data/loc/cc5fc4f7-e50a-455f-b3ce-a6a8b54824e6/VQCPNSNDKZKKNBTISHN6MJ6WGSQFNZKP.jp2",
+"width": "4093",
+"height": "5120",
+"dwtLevels": "6",
+"levels": "6",
+"compositingLayerCount": "1"
+}

data/test/fixtures/empty-metadata.json

@@ -0,0 +1,8 @@
+HTTP/1.1 404 Not Found
+Date: Mon, 15 Nov 2010 14:47:20 GMT
+Server: Apache-Coyote/1.1
+Content-Type: text/html;charset=utf-8
+Content-Length: 950
+Set-Cookie: JSESSIONID=0104D2734B09430B6085AC81E28F3B20; Path=/adore-djatoka; HttpOnly
+
+<html><head><title>Apache Tomcat/7.0.0 - Error report</title><style><!--H1 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:22px;} H2 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:16px;} H3 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:14px;} BODY {font-family:Tahoma,Arial,sans-serif;color:black;background-color:white;} B {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;} P {font-family:Tahoma,Arial,sans-serif;background:white;color:black;font-size:12px;}A {color : black;}A.name {color : black;}HR {color : #525D76;}--></style> </head><body><h1>HTTP Status 404 - </h1><HR size="1" noshade="noshade"><p><b>type</b> Status report</p><p><b>message</b> <u></u></p><p><b>description</b> <u>The requested resource () is not available.</u></p><HR size="1" noshade="noshade"><h3>Apache Tomcat/7.0.0</h3></body></html>

data/test/fixtures/ping-5aa182c2-c092-4596-af6e-e95d2e263de3.json

@@ -0,0 +1,11 @@
+HTTP/1.1 200 OK
+Date: Sat, 30 Mar 2013 01:16:37 GMT
+Server: Apache
+Set-Cookie: JSESSIONID=41D9E6B865CE04849F262F9FD8AE0FDF; Path=/adore-djatoka
+Connection: close
+Content-Type: application/json
+
+{
+"identifier": "info:lanl-repo/ds/5aa182c2-c092-4596-af6e-e95d2e263de3",
+"status": "OK"
+}

data/test/fixtures/ping-asdf.json

@@ -0,0 +1,9 @@
+HTTP/1.1 404 Not Found
+Date: Sat, 30 Mar 2013 01:25:08 GMT
+Server: Apache
+Set-Cookie: JSESSIONID=EADCA5FFAC35D0940853DA3132554440; Path=/adore-djatoka
+Content-Length: 952
+Connection: close
+Content-Type: text/html;charset=utf-8
+
+<html><head><title>Apache Tomcat/6.0.18 - Error report</title><style><!--H1 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:22px;} H2 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:16px;} H3 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:14px;} BODY {font-family:Tahoma,Arial,sans-serif;color:black;background-color:white;} B {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;} P {font-family:Tahoma,Arial,sans-serif;background:white;color:black;font-size:12px;}A {color : black;}A.name {color : black;}HR {color : #525D76;}--></style> </head><body><h1>HTTP Status 404 - </h1><HR size="1" noshade="noshade"><p><b>type</b> Status report</p><p><b>message</b> <u></u></p><p><b>description</b> <u>The requested resource () is not available.</u></p><HR size="1" noshade="noshade"><h3>Apache Tomcat/6.0.18</h3></body></html>

data/test/fixtures/ua023_015-006-bx0003-014-075-metadata.json

@@ -0,0 +1,16 @@
+HTTP/1.1 200 OK
+Date: Thu, 28 Oct 2010 12:28:14 GMT
+Server: Apache-Coyote/1.1
+Content-Type: application/json
+Content-Length: 210
+Set-Cookie: JSESSIONID=609FDF8E99BF39EE3803A501CFEF1C9B; Path=/adore-djatoka; HttpOnly
+
+{
+"identifier": "ua023_015-006-bx0003-014-075",
+"imagefile": "/storage/ua023_0/ua023_015-006-bx0003-014-075.jp2",
+"width": "592",
+"height": "915",
+"dwtLevels": "7",
+"levels": "4",
+"compositingLayerCount": "1"
+}

data/test/helper.rb

@@ -0,0 +1,55 @@
+require 'rubygems'
+require 'test/unit'
+require 'shoulda'
+require 'fakeweb'
+require 'pry'
+
+$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'))
+FakeWeb.register_uri(:get, "http://african.lanl.gov/adore-djatoka/resolver?url_ver=Z39.88-2004&svc_id=info%3Alanl-repo%2Fsvc%2Fping&rft_id=asdf",
+  :response => File.read('test/fixtures/ping-asdf.json'))
+
+FakeWeb.register_uri(:get, "http://african.lanl.gov/adore-djatoka/resolver?rft_id=info%3Alanl-repo%2Fds%2Fb820f537-26a1-4af8-b86a-e7a4cac6187a&svc_id=info%3Alanl-repo%2Fsvc%2FgetMetadata&url_ver=Z39.88-2004",
+  :response => File.read('test/fixtures/b820f537-26a1-4af8-b86a-e7a4cac6187a.json'))
+
+FakeWeb.register_uri(:get, "http://african.lanl.gov/adore-djatoka/resolver?rft_id=info%3Alanl-repo%2Fds%2F5aa182c2-c092-4596-af6e-e95d2e263de3&svc_id=info%3Alanl-repo%2Fsvc%2FgetMetadata&url_ver=Z39.88-2004",
+  :response => File.read('test/fixtures/5aa182c2-c092-4596-af6e-e95d2e263de3.json'))
+
+FakeWeb.register_uri(:get, "http://african.lanl.gov/adore-djatoka/resolver?url_ver=Z39.88-2004&svc_id=info%3Alanl-repo%2Fsvc%2Fping&rft_id=info%3Alanl-repo%2Fds%2F5aa182c2-c092-4596-af6e-e95d2e263de3",
+  :response => File.read('test/fixtures/ping-5aa182c2-c092-4596-af6e-e95d2e263de3.json'))