rubydora 1.6.3 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3446c99b699e41f3fb8e24b636313a510c7b77cc
-  data.tar.gz: a0b85f13192eeb58e95423ce84eb5956285f1879
+  metadata.gz: be337fe4d014e05130587d975c1388050ab192e6
+  data.tar.gz: 6eca752e25d923e8832c0b24cb2e724a90b932fc
 SHA512:
-  metadata.gz: 7b280b7c624ba9037034ee314a2a03e6e91bc36c8690a89dd3a74b43e58a7239afe52a05657f7ee41aa54f8cf9decc1426e9e8335f285baffa0a83046fce8937
-  data.tar.gz: 4b96fe24d6ec7878662bad578a9a4171d27af9e8bf245fe03a1f5b1b6dfe1b25d7156d8a9f695fe2575ed562671e7bb22c84a22eae6c63cc4b4c02b6a4cbe2de
+  metadata.gz: 48229e6eeee8bb507b7914aee56244ba2bf179c75bcb7f61b9c1711860c27cd9cf27ac0f7bff6ced99221c021868f05dd54278a15da897801964abe26857ee0f
+  data.tar.gz: 87b6f2cc39e89dd69c39c15f6b5003ae5c99dee2cc04159ab06ff839117289bba4ce70a42c7692c9214624f8a9a27d6d1c9381d9d5009cf0ae9e941a932214b5

data/.mailmap

@@ -0,0 +1,8 @@
+Mark Bussey <mark@curationexperts.com> mark-dce <mark@curationexperts.com>
+Andrew Myers <andrew_myers@wgbh.org> afred <afredmyers@gmail.com>
+Chris Beer <chris@cbeer.info> <chris@cbeer.info>
+Chris Beer <chris@cbeer.info> <cabeer@stanford.edu>
+Chris Beer <chris@cbeer.info> <chris_beer@wgbh.org>
+Justin Coyne <justin@curationexperts.com> <justin.coyne@yourmediashelf.com>
+Justin Coyne <justin@curationexperts.com> <digger250@gmail.com>
+David Chandek-Stark <dchandekstark@gmail.com>

data/.travis.yml

@@ -1,7 +1,11 @@
 language: ruby
 rvm:
-  - "1.9.3"
-  - "2.0.0"
+  - 1.9.3
+  - 2.0.0
+
+gemfile:
+  - gemfiles/gemfile.rails3
+  - gemfiles/gemfile.rails4
 
 notifications:
   irc: "irc.freenode.org#projecthydra"

data/CONTRIBUTING.md

@@ -0,0 +1,113 @@
+# How to Contribute
+
+We want your help to make Project Hydra great.
+There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.
+
+## Hydra Project Intellectual Property Licensing and Ownership
+
+All code contributors must have an Individual Contributor License Agreement (iCLA) on file with the Hydra Project Steering Group.
+If the contributor works for an institution, the institution must have a Corporate Contributor License Agreement (cCLA) on file.
+
+https://wiki.duraspace.org/display/hydra/Hydra+Project+Intellectual+Property+Licensing+and+Ownership
+
+You should also add yourself to the `CONTRIBUTORS.md` file in the root of the project.
+
+## Contribution Tasks
+
+* Reporting Issues
+* Making Changes
+* Submitting Changes
+* Merging Changes
+
+### Reporting Issues
+
+* Make sure you have a [GitHub account](https://github.com/signup/free)
+* Submit a [Github issue](./issues) by:
+  * Clearly describing the issue
+    * Provide a descriptive summary
+    * Explain the expected behavior
+    * Explain the actual behavior
+    * Provide steps to reproduce the actual behavior
+
+### Making Changes
+
+* Fork the repository on GitHub
+* Create a topic branch from where you want to base your work.
+  * This is usually the master branch.
+  * To quickly create a topic branch based on master; `git branch fix/master/my_contribution master`
+  * Then checkout the new branch with `git checkout fix/master/my_contribution`.
+  * Please avoid working directly on the `master` branch.
+  * You may find the [hub suite of commands](https://github.com/defunkt/hub) helpful
+* Make commits of logical units.
+  * Your commit should include a high level description of your work in HISTORY.textile 
+* Check for unnecessary whitespace with `git diff --check` before committing.
+* Make sure your commit messages are [well formed](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
+* If you created an issue, you can close it by including "Closes #issue" in your commit message. See [Github's blog post for more details](https://github.com/blog/1386-closing-issues-via-commit-messages)
+
+```
+    Present tense short summary (50 characters or less)
+
+    More detailed description, if necessary. It should be wrapped to 72
+    characters. Try to be as descriptive as you can, even if you think that
+    the commit content is obvious, it may not be obvious to others. You
+    should add such description also if it's already present in bug tracker,
+    it should not be necessary to visit a webpage to check the history.
+
+    Include Closes #<issue-number> when relavent.
+
+    Description can have multiple paragraphs and you can use code examples
+    inside, just indent it with 4 spaces:
+
+        class PostsController
+          def index
+            respond_with Post.limit(10)
+          end
+        end
+
+    You can also add bullet points:
+
+    - you can use dashes or asterisks
+
+    - also, try to indent next line of a point for readability, if it's too
+      long to fit in 72 characters
+```
+
+* Make sure you have added the necessary tests for your changes.
+* Run _all_ the tests to assure nothing else was accidentally broken.
+* When you are ready to submit a pull request
+
+### Submitting Changes
+
+[Detailed Walkthrough of One Pull Request per Commit](http://ndlib.github.io/practices/one-commit-per-pull-request/)
+
+* Read the article ["Using Pull Requests"](https://help.github.com/articles/using-pull-requests) on GitHub.
+* Make sure your branch is up to date with its parent branch (i.e. master)
+  * `git checkout master`
+  * `git pull --rebase`
+  * `git checkout <your-branch>`
+  * `git rebase master`
+  * It is likely a good idea to run your tests again.
+* Squash the commits for your branch into one commit
+  * `git rebase --interactive HEAD~<number-of-commits>` ([See Github help](https://help.github.com/articles/interactive-rebase))
+  * To determine the number of commits on your branch: `git log master..<your-branch> --oneline | wc -l`
+  * Squashing your branch's changes into one commit is "good form" and helps the person merging your request to see everything that is going on.
+* Push your changes to a topic branch in your fork of the repository.
+* Submit a pull request from your fork to the project.
+
+### Merging Changes
+
+* It is considered "poor from" to merge your own request.
+* Please take the time to review the changes and get a sense of what is being changed. Things to consider:
+  * Does the commit message explain what is going on?
+  * Does the code changes have tests? _Not all changes need new tests, some changes are refactorings_
+  * Does the commit contain more than it should? Are two separate concerns being addressed in one commit?
+  * Did the Travis tests complete successfully?
+* If you are uncertain, bring other contributors into the conversation by creating a comment that includes their @username.
+* If you like the pull request, but want others to chime in, create a +1 comment and tag a user.
+
+# Additional Resources
+
+* [General GitHub documentation](http://help.github.com/)
+* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
+* [Pro Git](http://git-scm.com/book) is both a free and excellent book about Git.
+* [A Git Config for Contributing](http://ndlib.github.io/practices/my-typical-per-project-git-config/)

data/Gemfile

@@ -2,10 +2,6 @@ source "http://rubygems.org"
 
 gemspec
 
-gem 'activemodel', ">= 3.1.1"
-gem 'backports'
-
-gem 'rcov', :platform => :mri_18
 gem 'simplecov', :platform => :mri_19
 gem 'simplecov-rcov', :platform => :mri_19
 gem 'jruby-openssl', :platform => :jruby

data/LICENSE.txt

@@ -1,20 +1,19 @@
-Copyright (c) 2010 Chris Beer
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+##########################################################################
+# rubydora
+#
+# Copyright © 2011 Chris Beer, WGBH
+# Copyright © 2012 Chris Beer, WGBH, MediaShelf
+# Copyright © 2013 Data Curation Experts, Stanford University
+# Additional copyright may be held by others, as reflected in the commit history.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.

data/Notices.txt

@@ -0,0 +1,20 @@
+Copyright (c) 2010 Chris Beer
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -1,5 +1,6 @@
 = rubydora
 {<img src="https://travis-ci.org/projecthydra/rubydora.png?branch=master" alt="Build Status" />}[https://travis-ci.org/projecthydra/rubydora]
+{<img src="https://badge.fury.io/rb/rubydora.png" alt="Gem Version" />}[http://badge.fury.io/rb/rubydora]
 
 Rubydora is a low-level Fedora Commons REST API consumer, providing direct access to REST API methods, as well as a primitive ruby abstraction.
 

data/Rakefile

@@ -49,7 +49,7 @@ task :ci => 'jetty:clean' do
     :jetty_port => ENV['TEST_JETTY_PORT'] || 8983,
     :solr_home => File.expand_path(File.dirname(__FILE__) + '/jetty/solr'),
     :fedora_home => File.expand_path(File.dirname(__FILE__) + '/jetty/fedora/default'),
-    :startup_wait => 60,
+    :startup_wait => 90,
     :java_opts => ['-Xmx256m', '-XX:MaxPermSize=128m']
   }
 

data/VERSION

@@ -1 +1 @@
-1.6.3
+1.7.0

data/gemfiles/gemfile.rails3

@@ -0,0 +1,11 @@
+source "http://rubygems.org"
+
+gemspec :path=>"../"
+
+gem 'activemodel', '~> 3.2.13'
+
+group :development, :test do
+  gem 'rcov', :platform => :mri_18
+  gem 'simplecov', :platform => :mri_19
+  gem 'simplecov-rcov', :platform => :mri_19
+end

data/gemfiles/gemfile.rails4

@@ -0,0 +1,10 @@
+source "http://rubygems.org"
+
+gemspec :path=>"../"
+
+gem 'activemodel', '~> 4.0.0'
+
+group :development, :test do
+  gem 'simplecov', :platform => :mri_19
+  gem 'simplecov-rcov', :platform => :mri_19
+end

data/lib/rubydora/audit_trail.rb

@@ -1,9 +1,9 @@
 module Rubydora::AuditTrail
 
-  def audit_trail
-    @audit_trail ||= FedoraAuditTrail.new(self)
+  def audit_trail(pid)
+    FedoraAuditTrail.new(object_xml(pid: pid))
   end
-    
+
   private
     
   AT_NS = {'audit' => 'info:fedora/fedora-system:def/audit#'}
@@ -11,8 +11,8 @@ module Rubydora::AuditTrail
   AT_XPATH = '/foxml:digitalObject/foxml:datastream[@ID = "AUDIT"]/descendant::audit:auditTrail'
     
   class FedoraAuditTrail
-    def initialize(object)
-      @ng_xml = Nokogiri::XML(object.repository.object_xml(:pid => object.pid)).xpath(AT_XPATH, FOXML_NS.merge(AT_NS))  
+    def initialize(object_xml)
+      @ng_xml = Nokogiri::XML(object_xml).xpath(AT_XPATH, FOXML_NS.merge(AT_NS))  
     end
     def records
       if !@records

data/lib/rubydora/datastream.rb

@@ -75,7 +75,7 @@ module Rubydora
         return @asOfDateTime
       end
 
-      return self.class.new(@digital_object, @dsid, @options.merge(:asOfDateTime => asOfDateTime))
+      return self.class.new(@digital_object, dsid, @options.merge(:asOfDateTime => asOfDateTime))
     end
 
     def self.default_attributes
@@ -100,7 +100,7 @@ module Rubydora
     # @param [String] Datastream ID
     # @param [Hash] default attribute values (used esp. for creating new datastreams)
     def initialize digital_object, dsid, options = {}, default_instance_attributes = {}
-      _run_initialize_callbacks do
+      run_callbacks :initialize do
         @digital_object = digital_object
         @dsid = dsid
         @options = options
@@ -119,7 +119,7 @@ module Rubydora
     # Does this datastream already exist?
     # @return [Boolean]
     def new?
-      digital_object.nil? || digital_object.new? || profile_xml.blank?
+      digital_object.nil? || digital_object.new_record? || profile.empty?
     end
 
     # This method is overridden in ActiveFedora, so we didn't
@@ -260,62 +260,25 @@ module Rubydora
       
       return @profile = {} unless digital_object.respond_to? :repository
       
-      @profile = begin
-        xml = profile_xml(opts)
-
-        (self.profile_xml_to_hash(xml) unless xml.blank?) || {}
-      end
+      @profile = repository.datastream_profile(pid, dsid, opts[:validateChecksum], asOfDateTime)
     end
 
-    def profile_xml opts = {}
-      @profile_xml = nil unless opts.empty?
-      
-      @profile_xml ||= begin
-
-        options = { :pid => pid, :dsid => dsid }
-        options.merge!(opts)
-        options[:asOfDateTime] = asOfDateTime if asOfDateTime
-        options[:validateChecksum] = true if repository.config[:validateChecksum]
-        repository.datastream(options)
-      rescue RestClient::Unauthorized => e
-        raise e
-      rescue RestClient::ResourceNotFound
-        # the datastream is new
-        ''
-      end
+    def profile= profile_hash
+      raise ArgumentError, "Must pass a profile, you passed #{profile_hash.class}" unless profile_hash.kind_of? Hash
+      @profile = profile_hash
     end
 
-    def profile= profile_xml
-      @profile = self.profile_xml_to_hash(profile_xml)
-    end
-
-    def profile_xml_to_hash profile_xml
-      profile_xml.gsub! '<datastreamProfile', '<datastreamProfile xmlns="http://www.fedora.info/definitions/1/0/management/"' unless profile_xml =~ /xmlns=/
-      doc = Nokogiri::XML(profile_xml)
-      h = doc.xpath('/management:datastreamProfile/*', {'management' => "http://www.fedora.info/definitions/1/0/management/"} ).inject({}) do |sum, node|
-                   sum[node.name] ||= []
-                   sum[node.name] << node.text
-                   sum
-                 end.reject { |key, values| values.empty? }
-      h.select { |key, values| values.length == 1 }.each do |key, values|
-        h[key] = values.reject { |x| x.empty? }.first 
+    def versions
+      versions = repository.versions_for_datastream(pid, dsid)
+      versions.map do |asOfDateTime, profile|
+        self.class.new(@digital_object, dsid, asOfDateTime: asOfDateTime, profile: profile)
       end
-
-      h['dsSize'] &&= h['dsSize'].to_i rescue h['dsSize']
-      h['dsCreateDate'] &&= Time.parse(h['dsCreateDate']) rescue h['dsCreateDate']
-      h['dsChecksumValid'] &&= h['dsChecksumValid'] == 'true' 
-      h['dsVersionable'] &&= h['dsVersionable'] == 'true' 
-      h
     end
 
-    def versions
-      versions_xml = repository.datastream_versions(:pid => pid, :dsid => dsid)
-      return [] if versions_xml.nil?
-      versions_xml.gsub! '<datastreamProfile', '<datastreamProfile xmlns="http://www.fedora.info/definitions/1/0/management/"' unless versions_xml =~ /xmlns=/
-      doc = Nokogiri::XML(versions_xml)
-      doc.xpath('//management:datastreamProfile', {'management' => "http://www.fedora.info/definitions/1/0/management/"} ).map do |ds|
-        self.class.new @digital_object, @dsid, :profile => ds.to_s, :asOfDateTime => ds.xpath('management:dsCreateDate', 'management' => "http://www.fedora.info/definitions/1/0/management/").text
-      end
+    def current_version?
+      return true if new?
+      vers = versions
+      return vers.empty? || dsVersionID == vers.first.dsVersionID
     end
 
     # Add datastream to Fedora
@@ -406,7 +369,6 @@ module Rubydora
     # @return [Hash]
     def reset_profile_attributes
       @profile = nil
-      @profile_xml = nil
       @datastream_content = nil
       @content = nil
       @changed_attributes = {}

data/lib/rubydora/digital_object.rb

@@ -14,14 +14,13 @@ module Rubydora
     include ActiveModel::Dirty
     include Rubydora::ModelsMixin
     include Rubydora::RelationshipsMixin
-    include Rubydora::AuditTrail
 
     extend Deprecation
 
     attr_reader :pid
     
     # mapping object parameters to profile elements
-    OBJ_ATTRIBUTES = {:state => :objState, :ownerId => :objOwnerId, :label => :objLabel, :logMessage => nil, :lastModifiedDate => :objLastModDate }
+    OBJ_ATTRIBUTES = {:state => :objState, :ownerId => :objOwnerId, :label => :objLabel, :logMessage => nil, :lastModifiedDate => :objLastModDate, :createdDate => :objCreateDate }
 
     OBJ_DEFAULT_ATTRIBUTES = { }
 
@@ -40,6 +39,12 @@ module Rubydora
       RUBY
     end
 
+    def state= val
+      raise ArgumentError, "Allowed values for state are 'I', 'A' and 'D'. You provided '#{val}'" unless ['I', 'A', 'D'].include?(val)
+      state_will_change! unless val == state
+      @state = val
+    end
+
     # Find an existing Fedora object
     #
     # @param [String] pid
@@ -83,7 +88,7 @@ module Rubydora
     # @param [Rubydora::Repository] repository context
     # @param [Hash] options default attribute values (used esp. for creating new datastreams
     def initialize pid, repository = nil, options = {}
-      _run_initialize_callbacks do
+      run_callbacks :initialize do
         self.pid = pid
         @repository = repository
         @options = options
@@ -94,6 +99,11 @@ module Rubydora
       end
     end
 
+    def audit_trail
+      @audit_trail ||= repository.audit_trail(self.pid)
+    end
+
+
     ##
     # Return a full uri pid (for use in relations, etc
     def uri
@@ -104,9 +114,10 @@ module Rubydora
 
     # Does this object already exist?
     # @return [Boolean]
-    def new?
-      self.profile_xml.blank?
+    def new_record?
+      self.profile.empty?
     end
+    alias :new? :new_record?
 
     def asOfDateTime asOfDateTime = nil
       if asOfDateTime == nil
@@ -123,49 +134,15 @@ module Rubydora
     # Retrieve the object profile as a hash (and cache it)
     # @return [Hash] see Fedora #getObject documentation for keys
     def profile
-      return {} if profile_xml.nil?
-
       @profile ||= begin
-        profile_xml.gsub! '<objectProfile', '<objectProfile xmlns="http://www.fedora.info/definitions/1/0/access/"' unless profile_xml =~ /xmlns=/
-        doc = Nokogiri::XML(profile_xml)
-        h = doc.xpath('/access:objectProfile/*', {'access' => "http://www.fedora.info/definitions/1/0/access/"} ).inject({}) do |sum, node|
-                     sum[node.name] ||= []
-                     sum[node.name] << node.text
-
-                     if node.name == "objModels"
-                       sum[node.name] = node.xpath('access:model', {'access' => "http://www.fedora.info/definitions/1/0/access/"}).map { |x| x.text }
-                     end
-
-                     sum
-                   end.reject { |key, values| values.empty? }
-
-        h.select { |key, values| values.length == 1 }.each do |key, values|
-          next if key == "objModels"
-          h[key] = values.reject { |x| x.empty? }.first
-        end
         @new = false
-
-        h
-      
+        repository.object_profile(pid, asOfDateTime)
       end.freeze
     end
 
-    def profile_xml
-      @profile_xml ||= begin
-        options = { :pid => pid }
-        options[:asOfDateTime] = asOfDateTime if asOfDateTime
-        repository.object(options)
-      rescue RestClient::ResourceNotFound => e
-        ''
-      end
-    end
-
     def versions
-      versions_xml = repository.object_versions(:pid => pid)
-      versions_xml.gsub! '<fedoraObjectHistory', '<fedoraObjectHistory xmlns="http://www.fedora.info/definitions/1/0/access/"' unless versions_xml =~ /xmlns=/
-      doc = Nokogiri::XML(versions_xml)
-      doc.xpath('//access:objectChangeDate', {'access' => 'http://www.fedora.info/definitions/1/0/access/' } ).map do |changeDate|
-        self.class.new pid, repository, :asOfDateTime => changeDate.text 
+      repository.versions_for_object(pid).map do |changeDate|
+        self.class.new pid, repository, :asOfDateTime => changeDate 
       end
     end
 
@@ -212,7 +189,6 @@ module Rubydora
         if self.new?
           self.pid = repository.ingest to_api_params.merge(:pid => pid)
           @profile = nil #will cause a reload with updated data
-          @profile_xml = nil
         else                       
           p = to_api_params
           repository.modify_object p.merge(:pid => pid) unless p.empty?
@@ -231,7 +207,6 @@ module Rubydora
       run_callbacks :destroy do
         @datastreams = nil
         @profile = nil
-        @profile_xml = nil
         @pid = nil
         nil
       end

data/lib/rubydora/fc3_service.rb

@@ -0,0 +1,89 @@
+module Rubydora
+  # This class abstracts away all of the API details including XML parsing
+  # This allows the driver (Fc3Service) to be swapped out without having to modify
+  # the ORM layer (e.g. Datastream, DigitalObject, Repository)
+  class Fc3Service
+    include RestApiClient
+    include Rubydora::AuditTrail
+
+    attr_reader :config
+    def initialize(config)
+      @config = config
+    end
+
+    # Reserve a new pid for the object
+    # @params [Hash] options
+    # @option options [String] :namespace the namespece for the pid
+    def mint(options={})
+      d = Nokogiri::XML(next_pid(options))
+      d.xpath('//fedora:pid', 'fedora' => 'http://www.fedora.info/definitions/1/0/management/').text
+    end
+
+
+    # repository profile (from API-A-LITE data)
+    # @return [Hash]
+    def repository_profile
+      begin
+        profile_xml = self.describe.strip
+        h = ProfileParser.parse_repository_profile(profile_xml)
+        h.select { |key, value| value.length == 1 }.each do |key, value|
+          next if key == "objModels"
+          h[key] = value.first
+        end
+
+        h
+      rescue
+        nil
+      end
+    end
+
+    def object_profile(pid, asOfDateTime = nil)
+      options = {pid: pid}
+      options[:asOfDateTime] = asOfDateTime if asOfDateTime
+      begin 
+        xml = object(options)
+        ProfileParser.parse_object_profile(xml)
+      rescue RestClient::ResourceNotFound
+        {}
+      end
+    end
+
+    def datastream_profile(pid, dsid, validateChecksum, asOfDateTime = nil)
+      xml = begin
+        options = { pid: pid, dsid: dsid}
+        options[:validateChecksum] = validateChecksum if validateChecksum
+        options[:asOfDateTime] = asOfDateTime if asOfDateTime
+        options[:validateChecksum] = true if config[:validateChecksum]
+        datastream(options)
+      rescue RestClient::Unauthorized => e
+        raise e
+      rescue RestClient::ResourceNotFound
+        # the datastream is new
+        ''
+      end
+
+      ProfileParser.parse_datastream_profile(xml)
+    end
+
+    def versions_for_datastream(pid, dsid)
+      versions_xml = datastream_versions(:pid => pid, :dsid => dsid)
+      return {} if versions_xml.nil?
+      versions_xml.gsub! '<datastreamProfile', '<datastreamProfile xmlns="http://www.fedora.info/definitions/1/0/management/"' unless versions_xml =~ /xmlns=/
+      doc = Nokogiri::XML(versions_xml)
+      versions = {}
+      doc.xpath('//management:datastreamProfile', {'management' => "http://www.fedora.info/definitions/1/0/management/"} ).each do |ds|
+        key = ds.xpath('management:dsCreateDate', 'management' => "http://www.fedora.info/definitions/1/0/management/").text
+        versions[key] = ProfileParser.parse_datastream_profile(ds.to_s)
+      end
+      versions
+    end
+
+    def versions_for_object(pid)
+      versions_xml = object_versions(:pid => pid)
+      versions_xml.gsub! '<fedoraObjectHistory', '<fedoraObjectHistory xmlns="http://www.fedora.info/definitions/1/0/access/"' unless versions_xml =~ /xmlns=/
+      doc = Nokogiri::XML(versions_xml)
+      doc.xpath('//access:objectChangeDate', {'access' => 'http://www.fedora.info/definitions/1/0/access/' } ).map(&:text)
+    end
+
+  end
+end