ruby-fedora 0.1.0 → 0.1.1

data/Manifest.txt

@@ -6,7 +6,7 @@ Rakefile
 config/hoe.rb
 config/requirements.rb
 lib/ruby-fedora.rb
-lib/fedora/base_object.rb
+lib/fedora/base.rb
 lib/fedora/connection.rb
 lib/fedora/datastream.rb
 lib/fedora/fedora_object.rb

data/README.txt

@@ -1,19 +1,34 @@
-This should describe how this stuff can be built, tested and used...
-
 == Installation
 
-Required gems:
- - facets
- - activeresource
- 
+gem install ruby-fedora
+
+irb
+
+require 'ruby-fedora'
+repository = Fedora::Repository.new('http://localhost:8080/fedora')
+test_object = Fedora::FedoraObject.new(:label => 'test', :contentModel => 'Image', :state => 'A', :ownerID => 'fedoraAdmin')
+repository.save(test_object)
+
+objects = repository.find_objects('label~Image*')
+object = repository.fetch_conent('demo:1')
+
+
+Check out spec/repository_spec.rb for more examples.
+
+== Build Test/Specs
+
+To run ruby-fedora specs, install the following gems:
+
+ gem install facets mime-types rspec
+
+To run the active-fedora specs, install the following gems:
+
+ - ambition
  - syntax
  - ParseTree
- - ambition
+ 
+Then run "rake spec"
 
 == TODO
 
- - specify gem dependencies in hoe.rb
- - implement finders with Ambition
- - implement ActiveFedora::Base.establish_connection to read from repository.yml (or fedora.yml)
- - remove dependencies on activeresource gem
  - remove anything in test/* that are no longer relevant

data/config/hoe.rb

@@ -58,8 +58,7 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   
   # == Optional
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
-  p.extra_deps = [['activeresource'], ['facets']]
+  p.extra_deps = [['facets', '>=2.4.0'], ['xml-simple', '>=1.0.11'], ['mime-types', '>=1.15']]
   #p.spec_extras = {}    # A hash of extra values to set in the gemspec.  
 end
 

data/lib/fedora/base.rb

@@ -0,0 +1,31 @@
+require 'xmlsimple'
+
+class Hash
+  def to_query
+    self.collect { |key, value| "#{CGI.escape(key.to_s)}=#{CGI.escape(value.to_s)}" }.sort * '&'
+  end
+  
+  def self.from_xml(xml)
+    XmlSimple.xml_in(xml, 'ForceArray' => false)
+  end
+end
+
+class Fedora::BaseObject
+  attr_accessor :attributes, :blob, :uri, :url
+  attr_reader :errors, :uri
+  attr_writer :new_object
+  
+  # == Parameters
+  # attrs<Hash>:: object attributes
+  #-
+  def initialize(attrs = nil)
+    @new_object = true
+    @attributes = attrs || {}
+    @errors = []
+    @blob = attributes.delete(:blob)
+  end
+  
+  def new_object?
+    @new_object
+  end
+end

data/lib/fedora/connection.rb

@@ -1,6 +1,8 @@
 require "base64"
 require 'cgi'
 require "mime/types"
+require 'net/http'
+require 'net/https'
 
 # Add multipart/form-data support to net/http
 #
@@ -55,43 +57,183 @@ class Net::HTTP::Put
   include Fedora::Multipart
 end
 
-# Add multipart/form-data support to active_resource
-module ActiveResource
+module RubyFedora
+  # This class is based on ActiveResource::Connection so MIT license applies.
+  class ConnectionError < StandardError # :nodoc:
+    attr_reader :response
+
+    def initialize(response, message = nil)
+      @response = response
+      @message  = message
+    end
+
+    def to_s
+      "Failed with #{response.code} #{response.message if response.respond_to?(:message)}"
+    end
+  end
+
+  # 3xx Redirection
+  class Redirection < ConnectionError # :nodoc:
+    def to_s; response['Location'] ? "#{super} => #{response['Location']}" : super; end    
+  end 
+
+  # 4xx Client Error
+  class ClientError < ConnectionError; end # :nodoc:
+  
+  # 400 Bad Request
+  class BadRequest < ClientError; end # :nodoc
+  
+  # 401 Unauthorized
+  class UnauthorizedAccess < ClientError; end # :nodoc
+  
+  # 403 Forbidden
+  class ForbiddenAccess < ClientError; end # :nodoc
+  
+  # 404 Not Found
+  class ResourceNotFound < ClientError; end # :nodoc:
+  
+  # 409 Conflict
+  class ResourceConflict < ClientError; end # :nodoc:
+
+  # 5xx Server Error
+  class ServerError < ConnectionError; end # :nodoc:
+
+  # 405 Method Not Allowed
+  class MethodNotAllowed < ClientError # :nodoc:
+    def allowed_methods
+      @response['Allow'].split(',').map { |verb| verb.strip.downcase.to_sym }
+    end
+  end
+
+  # Class to handle connections to remote web services.
+  # This class is used by ActiveResource::Base to interface with REST
+  # services.
   class Connection
-    alias_method :post_without_multipart, :post
-    alias_method :put_without_multipart, :put
-    
+    attr_reader :site
+    attr_accessor :format
+
+    class << self
+      def requests
+        @@requests ||= []
+      end
+    end
+
+    # The +site+ parameter is required and will set the +site+
+    # attribute to the URI for the remote resource service.
+    def initialize(site, format = ActiveResource::Formats[:xml])
+      raise ArgumentError, 'Missing site URI' unless site
+      self.site = site
+      self.format = format
+    end
+
+    # Set URI for remote service.
+    def site=(site)
+      @site = site.is_a?(URI) ? site : URI.parse(site)
+    end
+
+    # Execute a GET request.
+    # Used to get (find) resources.
+    def get(path, headers = {})
+      format.decode(request(:get, path, build_request_headers(headers)).body)
+    end
+
+    # Execute a DELETE request (see HTTP protocol documentation if unfamiliar).
+    # Used to delete resources.
+    def delete(path, headers = {})
+      request(:delete, path, build_request_headers(headers))
+    end
+
+    # Execute a PUT request (see HTTP protocol documentation if unfamiliar).
+    # Used to update resources.
     def put(path, body = '', headers = {})
       if body.is_a?(File)
         multipart_request(Net::HTTP::Put.new(path, build_request_headers(headers)), body)      
       else
-        put_without_multipart(path, body, headers)
-      end
+        request(:put, path, body.to_s, build_request_headers(headers))
+      end      
     end
-    
+        
+    # Execute a POST request.
+    # Used to create new resources.
     def post(path, body = '', headers = {})
       if body.is_a?(File)
-        multipart_request(Net::HTTP::Post.new(path, build_request_headers(headers)), body)        
+        multipart_request(Net::HTTP::Post.new(path, build_request_headers(headers)), body)
       else
-        post_without_multipart(path, body, headers)
+        request(:post, path, body.to_s, build_request_headers(headers))
       end
     end
-    
-    def multipart_request(req, file)
-      logger.info "#{method.to_s.upcase} #{site.scheme}://#{site.host}:#{site.port}#{path}" if logger
-      result = nil
-      time = Benchmark.realtime do
+
+    def raw_get(path, headers = {})
+      request(:get, path, build_request_headers(headers))
+    end
+
+    private
+      def multipart_request(req, file)
+        result = nil
         http.start do |conn|
           req.set_multipart_data(:file => file)
           result = conn.request(req)
         end
+        handle_response(result)
       end
-      logger.info "--> #{result.code} #{result.message} (#{result.body ? result.body : 0}b %.2fs)" % time if logger
-      handle_response(result)
-    end
     
-    def raw_get(path, headers = {})
-      request(:get, path, build_request_headers(headers))
-    end
+      # Makes request to remote service.
+      def request(method, path, *arguments)
+        result = http.send(method, path, *arguments)
+        handle_response(result)
+      end
+
+      # Handles response and error codes from remote service.
+      def handle_response(response)
+        case response.code.to_i
+          when 301,302
+            raise(Redirection.new(response))
+          when 200...400
+            response
+          when 400
+            raise(BadRequest.new(response))
+          when 401
+            raise(UnauthorizedAccess.new(response))
+          when 403
+            raise(ForbiddenAccess.new(response))
+          when 404
+            raise(ResourceNotFound.new(response))
+          when 405
+            raise(MethodNotAllowed.new(response))
+          when 409
+            raise(ResourceConflict.new(response))
+          when 422
+            raise(ResourceInvalid.new(response))
+          when 401...500
+            raise(ClientError.new(response))
+          when 500...600
+            raise(ServerError.new(response))
+          else
+            raise(ConnectionError.new(response, "Unknown response code: #{response.code}"))
+        end
+      end
+
+      # Creates new Net::HTTP instance for communication with
+      # remote service and resources.
+      def http
+        http             = Net::HTTP.new(@site.host, @site.port)
+        http.use_ssl     = @site.is_a?(URI::HTTPS)
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE if http.use_ssl
+        http
+      end
+
+      def default_header
+        @default_header ||= { 'Content-Type' => format.mime_type }
+      end
+      
+      # Builds headers for request to remote service.
+      def build_request_headers(headers)
+        authorization_header.update(default_header).update(headers)
+      end
+      
+      # Sets authorization header; authentication information is pulled from credentials provided with site URI.
+      def authorization_header
+        (@site.user || @site.password ? { 'Authorization' => 'Basic ' + ["#{@site.user}:#{ @site.password}"].pack('m').delete("\r\n") } : {})
+      end
   end
-end
+end

data/lib/fedora/datastream.rb

@@ -1,4 +1,4 @@
-require 'fedora/base_object'
+require 'fedora/base'
 
 class Fedora::Datastream < Fedora::BaseObject
   def initialize(attrs = nil)

data/lib/fedora/fedora_object.rb

@@ -1,6 +1,6 @@
 require 'xmlsimple'
 require 'rexml/document'
-require 'fedora/base_object'
+require 'fedora/base'
 
 class Fedora::FedoraObject < Fedora::BaseObject
   attr_accessor :target_repository

data/lib/fedora/repository.rb

@@ -1,6 +1,6 @@
 require 'facets/hash/symbolize_keys'
 
-require 'active_resource'
+require 'fedora/base'
 require 'fedora/connection'
 require 'fedora/formats'
 require 'fedora/fedora_object'
@@ -73,7 +73,7 @@ module Fedora
       case object
         when Fedora::FedoraObject
           pid = (object.pid ? object : 'new')
-          response = connection.post("#{url_for(pid)}?" + object.attributes.to_query, object.xml_content)
+          response = connection.post("#{url_for(pid)}?" + object.attributes.to_query, object.blob)
           if response.code == '201'
             object.pid = extract_pid(response) 
             object.new_object = false
@@ -84,7 +84,7 @@ module Fedora
         when Fedora::Datastream
           raise ArgumentError, "Missing dsID attribute" if object.dsid.nil?
           response = connection.post("#{url_for(object)}?" + object.attributes.to_query, 
-            object.xml_content)
+            object.blob)
           if response.code == '201'
             object.new_object = false
             true
@@ -109,7 +109,7 @@ module Fedora
         response.code == '307'
       when Fedora::Datastream
         raise ArgumentError, "Missing dsID attribute" if object.dsid.nil?
-        response = connection.put("#{url_for(object)}?" + object.attributes.to_query, object.xml_content)
+        response = connection.put("#{url_for(object)}?" + object.attributes.to_query, object.blob)
         response.code == '201'
       else
         raise ArgumentError, "Unknown object type"
@@ -154,7 +154,7 @@ module Fedora
     def convert_xml(response)
       results = FedoraObjects.new
       return results unless response && response['resultList']
-      
+
       results.session_token = response['listSession']['token'] if response['listSession']
       objectFields = response['resultList']['objectFields']
       case objectFields
@@ -177,7 +177,7 @@ module Fedora
     # or not (defaults to +false+).
     def connection(refresh = false)
       if refresh || @connection.nil?
-        @connection = ActiveResource::Connection.new(@fedora_url, Fedora::XmlFormat)
+        @connection = RubyFedora::Connection.new(@fedora_url, Fedora::XmlFormat)
       end
       @connection
     end

data/lib/ruby-fedora.rb

@@ -6,7 +6,7 @@ module RubyFedora #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/test_helper.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'test/unit'
 
-require File.dirname(__FILE__) + '/../lib/RubyFedora'
+require File.dirname(__FILE__) + '/../lib/ruby-fedora'
 
 FEDORA_URL = 'http://localhost:8080/fedora' unless defined? FEDORA_URL

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-fedora
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -9,26 +9,35 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-01 00:00:00 -05:00
+date: 2008-04-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activeresource
+  name: facets
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.4.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: facets
+  name: xml-simple
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.11
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mime-types
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: "1.15"
     version: 
 description: Ruby API for Fedora
 email: 
@@ -52,7 +61,7 @@ files:
 - config/hoe.rb
 - config/requirements.rb
 - lib/ruby-fedora.rb
-- lib/fedora/base_object.rb
+- lib/fedora/base.rb
 - lib/fedora/connection.rb
 - lib/fedora/datastream.rb
 - lib/fedora/fedora_object.rb
@@ -106,8 +115,4 @@ signing_key:
 specification_version: 2
 summary: Ruby API for Fedora
 test_files: 
-- test/test_fedora.rb
 - test/test_helper.rb
-- test/test_httpclient.rb
-- test/test_restful_bits.rb
-- test/test_restful_fedora.rb

data/lib/fedora/base_object.rb

@@ -1,19 +0,0 @@
-class Fedora::BaseObject
-  attr_accessor :attributes, :xml_content, :uri, :url
-  attr_reader :errors, :uri
-  attr_writer :new_object
-  
-  # == Parameters
-  # attrs<Hash>:: object attributes
-  #-
-  def initialize(attrs = nil)
-    @new_object = true
-    @attributes = attrs || {}
-    @errors = []
-    @xml_content = attributes.delete(:xml_content)
-  end
-  
-  def new_object?
-    @new_object
-  end
-end

data/test/test_fedora.rb

@@ -1,55 +0,0 @@
-# 
-# test_fedora.rb
-# 
-# Created: Nov 3, 2007, 6:28:37 PM
-# 
-# Author: Matt Zumwalt <matt.zumwalt@yourmediashelf.com>
-# Copyright: Copyright (c) 2007 Matt Zumwalt <matt.zumwalt@yourmediashelf.com>
-# License: 
-# 
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class TestFedoraRepository < Test::Unit::TestCase
-   
-  def setup
-    @fedora = Fedora::Repository.new(FEDORA_URL, :user => 'fedoraAdmin', :password => 'fedoraAdmin')
-  end
-  
-  def teardown
-    # TODO cleanup
-  end
-  
-  def test_namespace_juggling
-    namespace_info = @fedora.namespace_info
-    new_pid = @fedora.next_pid
-    
-    assert_equal "#{namespace_info[:default_namespace]}#{namespace_info[:pid_delimiter]}100",  namespace_info[:sample_pid]
-    assert_true namespace_info[:retained_pids].include?("fedora-bdef")
-    assert_true namespace_info[:retained_pids].include?("fedora-bmech")
-  end
-
-  def test_objects
-    puts 'DEBUG 3'
-    test_object_1 = @fedora.objects.create(:namespace => "test")  # Create a new empty object with an auto-assigned pid
-    # Creating multiple objects simultaneously by submitting an array
-    objects_array = @fedora.objects.create([{:owner_id => "MISC_USER_ID", :namespace => "test"},{:pid => "test:OBJECT_FROM_ARRAY_CREATE_TEST"}])
-    
-    test_object_1.label = "DELETE_ME"
-    test_object_1.state = "I"
-    
-    # Not sure if "save should return PID or "true"
-    assert_equal(true, test_object_1.save)
-    assert_equal(test_object_1.state, "I")
-    
-    found_by_pid = @fedora.objects.find_by_pid(test_object_1.pid)
-    
-    assert_equal(found_by_pid.label, test_object_1.label)
-    assert_equal(objects_array[0].owner_id, @fedora.objects.find_by_pid(objects_array[0].pid).owner_id)
-    
-    test_object1.destroy
-    objects_array.each do |obj| 
-      obj.destroy
-    end
-    # test_object2.destroy  # leave this until the final cleanup...
-  end
-end

data/test/test_httpclient.rb

@@ -1,73 +0,0 @@
-# 
-#  @Creator Matt Zumwalt, MediaShelf LLC
-#  @Copyright Matt Zumwalt, 2007.  All Rights Reserved.
-# 
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-require 'uri'
-require 'httpclient'
-
-class TestFedoraHttpClient < Test::Unit::TestCase
-    
-    def setup
-      @test_pid = "mshlf:test_httpclient"
-      @user = "fedoraAdmin"
-      @password = "fedoraAdmin"
-    end
-
-    def url_for(pid, dsid = nil, params = {})
-      url = "#{FEDORA_URL}/objects/#{@test_pid}"
-      url += "/datastreams/#{dsid}" if dsid 
-      url += ("?" + params.collect { |key, value| "#{key}=#{value}" } * '&') unless params.empty?
-      url
-    end
-    
-    def test_post_empty
-      client = HTTPClient.new
-      
-      extheader = {'User-Agent' => 'RubyFedora'}      
-      extheader['content-type'] = "text/xml"
-      uri = url_for(@test_pid)
-      
-      client.set_basic_auth(uri, @user, @password)
-      create_response = client.post(uri, "", extheader)
-      
-      assert_equal 201, create_response.header.response_status_code
-      
-    end
-  
-    def test_post_xml
-      client = HTTPClient.new
-      sample_xml_1 = File.new(File.dirname(__FILE__) + '/fixtures/mods-mskcc-filledsample.xml')
-       
-      extheader = {'User-Agent' => 'RubyFedora'}      
-      extheader['content-type'] = "text/xml"
-      request_body = sample_xml_1
-      uri = url_for(@test_pid, "XML_DS")
-      client.set_basic_auth(uri, @user, @password)
-      create_response = client.post(uri, request_body, extheader)
-      delete_response = client.delete(uri)
-        
-      assert_equal 201, create_response.header.response_status_code
-      assert_equal 200, delete_response.header.response_status_code
-    end
-
-    def test_multipart_post
-      client = HTTPClient.new
-      sample_binary_file_1 = File.open(File.dirname(__FILE__) + "/fixtures/dino.jpg" )
-      
-      boundary = Array::new(8){ "%2.2d" % rand(42) }.join('__')
-      extheader = {'User-Agent' => 'RubyFedora'}
-      extheader['content-type'] = "multipart/form-data; boundary=___#{ boundary }___"
-      extheader['Content-Type'] = "image/jpeg"
-      
-      request_body = {'inputfile' => sample_binary_file_1}
-      uri = url_for(@test_pid, "BINARY_DS", { :dsLabel => "Foo+Bar" })
-      client.set_basic_auth(uri, @user, @password)
-      create_response = client.post(uri, request_body, extheader)
-      delete_response = client.delete(uri)
-        
-      assert_equal 201, create_response.header.response_status_code
-      assert_equal 200, delete_response.header.response_status_code
-    end
-end

data/test/test_restful_bits.rb

@@ -1,63 +0,0 @@
-# 
-#  @Creator Matt Zumwalt, MediaShelf LLC
-#  @Copyright Matt Zumwalt, 2007.  All Rights Reserved.
-#
-#++
-
-require File.dirname(__FILE__) + '/test_helper.rb' 
-
-class TestRestfulFedora < Test::Unit::TestCase
-  def setup
-    @fedora = RubyFedora::RestfulFedora.new(FEDORA_URL, :user=>'fedoraAdmin', :password=>'fedoraAdmin')
-    @search_term = "test"  # this should be a search term that will return at least one hit
-    @pid_delimiter = ":"    
-  end
-  
-  def test_simple_search
-    test_object_pid = "test:do_not_delete"
-    should_not_exist = "test:never_use_this_pid"
-    
-    find_by_pid_response = @fedora.simple_search(:conditions => {:pid => test_object_pid}) 
-    find_by_pid_convenience_response = @fedora.find_by_pid(test_object_pid)
-
-    #Should support conditions provided as an array and conditions provided as a hash.
-    namespace = "test"
-    find_by_namespace_response1 = @fedora.simple_search(:conditions => {:namespace => namespace})
-    #puts find_by_namespace_response1.body.content
-    # Decided not to support directly feeding in url query strings verbatim... 
-    # found_by_namespace2 = @fedora.simple_search(:conditions => ["pid~#{namespace}:*"])
-    find_with_conditions_response = @fedora.simple_search(:conditions => {:fType => "O"})
-    #puts find_with_conditions_response.body.content
-    
-#    found_all = @fedora.simple_search(:all)
-#    found_all_limited = @fedora.simple_search(:all, :limit => 10)
-#    
-#    found_by_created_range = @fedora.simple_search(:conditions => {:created_before => "2008-01-22", :created_after => "2008-01-20"})
-#    found_by_created_on = @fedora.simple_search(:conditions => {:date_created => "2008-01-21"})
-#    
-#    found_by_modified_range = @fedora.simple_search(:conditions => {:modified_before => "2008-01-22", :modified_after => "2008-01-20"})
-#    found_by_modified_on = @fedora.simple_search(:conditions => {:date_modified => "2008-01-21"})
-    
-    
-    ## TODO:  Decide if this is the right way to go.  Possibly return XMLSimple objects instead?
-    assert_equal Array, find_by_pid_response.class
-    assert_equal Array, find_by_pid_convenience_response.class
-    assert_equal Array, find_by_namespace_response1.class
-    assert_equal Array, find_with_conditions_response.class
-    assert_equal test_object_pid, find_by_pid_response.first[:pid]
-    assert_equal test_object_pid, find_by_pid_convenience_response.first[:pid]
-    
-    assert_throws RecordNotFound, @fedora.simple_search(:conditions => {:pid => should_not_exist})    
-  end
-  
-  def test_datetime_finders
-    created_after_response = @fedora.find_by_create_date(:after => "2008-01-01")
-    created_before_response = @fedora.find_by_create_date(:before => "2008-01-22")
-    
-    ## TODO:  Decide if this is the right way to go.  Possibly return XMLSimple objects instead?
-    assert_equal Array, created_after_response
-    assert_equal Array, created_before_response
-    assert_true created_after_response.first.has_key?(:pid)
-    assert_true created_before_response.last.has_key?(:pid)
-  end
-end

data/test/test_restful_fedora.rb

@@ -1,160 +0,0 @@
-# 
-#  @Creator Matt Zumwalt, MediaShelf LLC
-#  @Copyright Matt Zumwalt, 2007.  All Rights Reserved.
-#
-#++
-
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class TestRestfulFedora < Test::Unit::TestCase
-  
-  def setup
-    @fedora = Fedora::RestfulFedora.new(FEDORA_URL, :user=>'fedoraAdmin', :password=>'fedoraAdmin')
-    @search_term = "test"  # this should be a search term that will return at least one hit
-    @pid_delimiter = ":"
-    @test_object_pid = "test:do_not_delete"    
-  end
-  
-  def test_pid_generator
-    pid1 = @fedora.next_pid
-    pid2 = @fedora.next_pid
-    pid_from_old_api = @fedora.next_pid_old_api
-    
-    # Everything up to the pid_delimiter should be identical in pid1 & pid_from_old_api
-    assert_equal pid1[0..pid1.index(@pid_delimiter)], pid_from_old_api[0..pid1.index(@pid_delimiter)]
-    # After the pid_delimiter should be two integers, where the pid2 = pid1 + 1
-    assert_equal pid1[pid1.index(@pid_delimiter)+1..pid1.length].to_i, pid2[pid1.index(@pid_delimiter)+1..pid2.length].to_i-1
-    
-  end
-  
-  def test_datastream_resource
-    pid_of_test_object = @fedora.create_object(:pid=>"test:test_datastream_resource", :params=>{:label=>"DELETE ME"})
-    
-    sample_xml_1 = File.new(File.dirname(__FILE__) + '/fixtures/mods-mskcc-filledsample.xml')
-    sample_xml_2 = File.new(File.dirname(__FILE__) + '/fixtures/sample_mods_file_A.xml')
-    sample_binary_file_1 = File.open(File.dirname(__FILE__) + "/fixtures/dino.jpg" )
-    sample_binary_file_2 = File.open(File.dirname(__FILE__) + "/fixtures/minivan-in-minneapolis.jpg" )
-    
-    create_xml_result = @fedora.add_xml_datastream(:pid=>pid_of_test_object, :dsid=>"XML_DS", :xml_content=>sample_xml_1.read, :params=>{:ds_label=>"Sample XML"})
-    create_binary_result = @fedora.add_binary_datastream(:pid=>pid_of_test_object, :dsid=>"BINARY_DS", :file=>sample_binary_file_1, :content_type => "image/jpeg", :params=>{:ds_label=>"Sample Binary File"})
-    object_xml = REXML::Document.new(@fedora.call_resource(:method => "GET", :resource_path =>"/objects/#{pid_of_test_object}/objectXML").content)
-    create_redirect_result = @fedora.add_redirect_datastream(:pid=>pid_of_test_object, :dsid=>"REDIRECT", :content_type=>"image/jpeg", :params=>{:ds_label=>"Sample Redirect", :ds_location=>create_binary_result.header['Location'].to_s})
-    
-    assert_equal 201, create_xml_result.header.response_status_code
-    assert_equal 201, create_binary_result.header.response_status_code
-    #puts object_xml.elements["foxml:digitalObject/foxml:datastream[@ID='BINARY_DS']"].attributes
-    assert_equal "image/jpeg", object_xml.elements["foxml:digitalObject/foxml:datastream[@ID='BINARY_DS']/foxml:datastreamVersion"].attributes["MIMETYPE"]
-    assert_equal 201, create_redirect_result.header.response_status_code
-    # GETting the REDIRECT datastream should return a Location header that points to the BINARY datastream
-    assert_equal @fedora.get_datastream(pid_of_test_object, "REDIRECT").header['Location'], create_binary_result.header['Location']
-    
-    update_xml_result = @fedora.update_datastream(:pid=>pid_of_test_object, :dsid=>"XML_DS", :xml_content=>sample_xml_2.read, :params=>{:ds_label=>"Updated XML Datastream"})
-    update_binary_result = @fedora.update_datastream(:pid=>pid_of_test_object, :dsid=>"BINARY_DS", :file=>sample_binary_file_1, :content_type => "image/jpeg")
-    
-    assert_equal 201, update_xml_result.header.response_status_code
-    assert_equal 201, update_binary_result.header.response_status_code
-    
-    update_attributes_only_result = @fedora.update_datastream(:pid=>pid_of_test_object, :dsid=>"XML_DS", :params=>{:ds_label=>"Updated Datastream"})
-    
-    # TODO: Fix update_datastream to support updating attributes only.  (Requires fix in Fedora REST code)
-    #assert_equal 200, update_attributes_only_result.header.response_status_code
-    # Make sure that updating attributes didn't change the datastream content
-    #assert_equal sample_xml_2, @fedora.get_datastream(:pid=>pid_of_test_object, :dsid=>"XML_DS")
-    
-    delete_xml_result = @fedora.delete_datastream(:pid=>pid_of_test_object, :dsid=>"XML_DS")
-    delete_binary_result = @fedora.delete_datastream(:pid=>pid_of_test_object, :dsid=>"BINARY_DS")
-    
-    assert_equal 200, delete_xml_result.header.response_status_code
-    assert_equal 200, delete_binary_result.header.response_status_code  
-    
-    @fedora.delete_object(:pid=>pid_of_test_object)
-    
-  end
-  
-  def test_simple_search
-      should_not_exist = "test:never_use_this_pid"
-
-      find_by_pid_response = @fedora.simple_search(:conditions => {:pid => @test_object_pid}) 
-      find_by_pid_convenience_response = @fedora.find_by_pid(@test_object_pid)
-
-      #Should support conditions provided as an array and conditions provided as a hash.
-      namespace = "test"
-      find_by_namespace_response1 = @fedora.simple_search(:conditions => {:namespace => namespace})
-      #puts find_by_namespace_response1.body.content
-      # Decided not to support directly feeding in url query strings verbatim... 
-      # found_by_namespace2 = @fedora.simple_search(:conditions => ["pid~#{namespace}:*"])
-      find_with_conditions_response = @fedora.simple_search(:conditions => {:fType => "O"})
-      #puts find_with_conditions_response.body.content
-  #    found_all = @fedora.simple_search(:all)
-  #    found_all_limited = @fedora.simple_search(:all, :limit => 10)
-  #    
-  #    found_by_created_range = @fedora.simple_search(:conditions => {:created_before => "2008-01-22", :created_after => "2008-01-20"})
-  #    found_by_created_on = @fedora.simple_search(:conditions => {:date_created => "2008-01-21"})
-  #    
-  #    found_by_modified_range = @fedora.simple_search(:conditions => {:modified_before => "2008-01-22", :modified_after => "2008-01-20"})
-  #    found_by_modified_on = @fedora.simple_search(:conditions => {:date_modified => "2008-01-21"})
-
-      assert true
-
-    end
-
-
-
-    def test_datetime_finders
-
-      created_after = @fedora.find_by_create_date(:after => "2008-01-01")
-      created_before = @fedora.find_by_create_date(:before => "2008-01-22")
-
-      assert true
-    end
-  
-  def test_call_resource
-    
-    sample_xml_1 = File.new(File.dirname(__FILE__) + '/fixtures/mods-mskcc-filledsample.xml')
-    sample_binary_file_1 = File.open(File.dirname(__FILE__) + "/fixtures/dino.jpg" )
-    search_result = @fedora.call_resource(:method => "GET", :resource_path => "/objects", :request_body => "", :content_type => "text/xml", :auth => {}, :params => {:query =>"", :pid=>"true", :format=>"xml", :terms=>@search_term})
-    result_rexml = REXML::Document.new(search_result.content)
-    pid = result_rexml.elements["result/resultList/objectFields/pid"].text 
-    #pid = "changeme:1"
-    
-    assert_equal(result_rexml.root.name, "result")
-    assert_equal result_rexml.elements["result/resultList/objectFields"][1].name, "pid"
-    # test each of the endpoints that we want to be able to send requests to...
-    
-    # Other RETRIEVE Operaitons ..
-    assert_equal 200, @fedora.call_resource(:method => "GET", :resource_path =>"/objects/#{pid}", :params=>{:format=>"xml"}).header.response_status_code
-    assert_equal 200, @fedora.call_resource(:method => "GET", :resource_path =>"/objects/#{pid}/objectXML", :params=>{:format=>"xml"}).header.response_status_code
-    assert_equal 200, @fedora.call_resource(:method => "GET", :resource_path =>"/objects/#{pid}/versions", :params=>{:format=>"xml"}).header.response_status_code
-    assert_equal 200, @fedora.call_resource(:method => "GET", :resource_path =>"/objects/#{pid}/export", :params=>{}).header.response_status_code
-    assert_equal 200, @fedora.call_resource(:method => "GET", :resource_path =>"/objects/#{pid}/methods", :params=>{:format=>"xml"}).header.response_status_code
-    assert_equal 200, @fedora.call_resource(:method => "GET", :resource_path =>"/objects/#{pid}/datastreams", :params=>{:format=>"xml"}).header.response_status_code
-    assert_equal 200, @fedora.call_resource(:method => "GET", :resource_path =>"/objects/#{pid}/datastreams/DC", :params=>{:format=>"xml"}).header.response_status_code
-  
-    pid = "test:test_object_1"
-    # Create Object
-    object_create_response = @fedora.call_resource(:method => "POST", :resource_path =>"/objects/#{pid}", :request_body => "", :params => {"label"=>"TEST ME"})
-    
-    assert_equal "#{@@fedora_url}/#{@fedora.resource_base}/objects/test%3Atest_object_1", object_create_response.header['location'][0]
-    assert_equal 201, object_create_response.header.response_status_code
-    
-    # Create XML Datastream
-    xml_datastream_create_response = @fedora.call_resource(:method => "POST", :resource_path =>"/objects/#{pid}/datastreams/XML", :request_body => sample_xml_1.read, :params => {"dsLabel"=>"Sample XML File"})
-    # Create Binary Datastream  
-    # !! set mimetype by setting :content_type !!
-    binary_datastream_create_response = @fedora.call_resource(:method => "UPLOAD", :resource_path =>"/objects/#{pid}/datastreams/BINARY", :request_body => sample_binary_file_1, :content_type => "image/jpeg", :params => {"dsLabel"=>"Sample XML File"})
-    assert_equal 201, xml_datastream_create_response.header.response_status_code     
-    assert_equal 201, binary_datastream_create_response.header.response_status_code
-    
-    
-    object_xml = REXML::Document.new(@fedora.call_resource(:method => "GET", :resource_path =>"/objects/#{pid}/objectXML").content)
-    assert_equal "image/jpeg", object_xml.elements["foxml:digitalObject/foxml:datastream[@ID='BINARY']/foxml:datastreamVersion"].attributes["MIMETYPE"]
-    assert_equal "X", object_xml.elements["foxml:digitalObject/foxml:datastream[@ID='XML']"].attributes["CONTROL_GROUP"]
-    assert_equal "M", object_xml.elements["foxml:digitalObject/foxml:datastream[@ID='BINARY']"].attributes["CONTROL_GROUP"]
-    #puts object_xml.elements["foxml:digitalObject/foxml:datastream[@ID='BINARY']/foxml:datastreamVersion"].attributes["MIMETYPE"]
-    
-    # Delete Object
-    delete_response = @fedora.call_resource(:method => "DELETE", :resource_path =>"/objects/#{pid}")
-    
-    assert_equal 200, delete_response.header.response_status_code
-  end
-end