djatoka 0.2.0 → 0.2.1

data/djatoka.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{djatoka}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
   s.authors = ["Jason Ronallo"]
   s.email = %q{jronallo@gmail.com}
   s.homepage = %q{http://github.com/jronallo/djatoka}

data/lib/djatoka.rb

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

data/lib/djatoka/net.rb

@@ -11,7 +11,15 @@ module Djatoka::Net
       c.perform
     else
       uri = URI.parse(url)
-      response = Net::HTTP.get_response(uri)
+      if uri.scheme == 'https'
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        request = Net::HTTP::Get.new(uri.request_uri)
+        response = http.request(request)
+      else
+        response = Net::HTTP.get_response(uri)
+      end
       case response
       when Net::HTTPSuccess
         data = JSON.parse(response.body)

data/test/fixtures/https_metadata_request.json

@@ -0,0 +1,16 @@
+HTTP/1.1 200 OK
+Date: Mon, 08 Apr 2013 19:00:52 GMT
+Server: Apache-Coyote/1.1
+Content-Type: application/json
+Content-Length: 169
+Set-Cookie: JSESSIONID=6E14483BD6783720ED2AEE04519A1AF7; Path=/adore-djatoka/; HttpOnly
+
+{
+"identifier": "0004817",
+"imagefile": "/storage/00048/0004817.jp2",
+"width": "7575",
+"height": "10669",
+"dwtLevels": "7",
+"levels": "7",
+"compositingLayerCount": "1"
+}

data/test/helper.rb

@@ -52,4 +52,7 @@ FakeWeb.register_uri(:get, "http://african.lanl.gov/adore-djatoka/resolver?rft_i
   :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'))
+  :response => File.read('test/fixtures/ping-5aa182c2-c092-4596-af6e-e95d2e263de3.json'))
+
+FakeWeb.register_uri(:get, "https://scrc.lib.ncsu.edu/adore-djatoka/resolver?rft_id=0004817&svc_id=info%3Alanl-repo%2Fsvc%2FgetMetadata&url_ver=Z39.88-2004",
+  :response => File.read('test/fixtures/https_metadata_request.json'))

data/test/test_metadata.rb

@@ -60,6 +60,16 @@ class TestDjatokaMetadata < Test::Unit::TestCase
       end
     end
 
+    context 'using net::https' do 
+      should 'get metadata when using an https URI' do 
+        Djatoka.use_curb=false
+        resolver = Djatoka::Resolver.new('https://scrc.lib.ncsu.edu/adore-djatoka/resolver')
+        metadata_obj = resolver.metadata('0004817')
+        metadata = metadata_obj.perform
+        assert_equal('10669', metadata.height)
+      end 
+    end
+
     context 'determining all the levels for a particular metadata response' do
       setup do
         @metadata_obj = @resolver.metadata(@identifier)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: djatoka
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -166,6 +166,7 @@ files:
 - test/fixtures/5aa182c2-c092-4596-af6e-e95d2e263de3.json
 - test/fixtures/b820f537-26a1-4af8-b86a-e7a4cac6187a.json
 - test/fixtures/empty-metadata.json
+- test/fixtures/https_metadata_request.json
 - test/fixtures/ping-5aa182c2-c092-4596-af6e-e95d2e263de3.json
 - test/fixtures/ping-asdf.json
 - test/fixtures/ua023_015-006-bx0003-014-075-metadata.json