rubydora 1.6.5 → 1.7.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea2a3b27923102ca45aeac61f63e8ff703da0bcf
-  data.tar.gz: 86a57b2f001215a6198d3bb62ad55f04753edbf3
+  metadata.gz: 45b4d25db052316594178dbd272d7f2b44921a37
+  data.tar.gz: de34dc7083ffbd0fec40674678b02c02581de09d
 SHA512:
-  metadata.gz: 7c30a772eaaaefa0c0749b4692a8838b32b5ffcc19f96c2c221ee9b755e43097d36bd93ba930611005845605a1c33e57ed7fb99132ae0a898bcfc46eb0b5f0c5
-  data.tar.gz: 36b5c0476e15fa439cc3c41fd426497e1792491ce84cf1049096a459e99880ce24b496741f59416175c49899090999e2671bc06575aa832c3b5427605cbda161
+  metadata.gz: 3c6d46cfe5791cfaab430456e7b3f1d2ec464101977366f9eb420fb1c5714a27783cebfe8e1beddd1e0036d8b938c73f7e92beb5f01b9b1db422a4d7f5d14c64
+  data.tar.gz: 796237a546a1f1a5555805ad5aab80f9888607ceb35df79c2035d63ddaac0aaad08ea1dcadd83c5eec361b2c6efdf9111b1c9dc57141c0195c581fe42fe93960

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/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/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.5
+1.7.0.pre1

data/gemfiles/gemfile.rails4

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 gemspec :path=>"../"
 
-gem 'activemodel', '4.0.0.rc1'
+gem 'activemodel', '~> 4.0.0'
 
 group :development, :test do
   gem 'simplecov', :platform => :mri_19

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
@@ -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,61 +260,18 @@ 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
-    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 
-      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
+    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 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
+      versions = repository.versions_for_datastream(pid, dsid)
+      versions.map do |asOfDateTime, profile|
+        self.class.new(@digital_object, dsid, asOfDateTime: asOfDateTime, profile: profile)
       end
     end
 
@@ -412,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 = { }
 
@@ -100,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
@@ -110,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
@@ -129,53 +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 object_xml
-      repository.object_xml(pid: pid)
-    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
 
@@ -222,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?
@@ -241,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

data/lib/rubydora/fedora_url_helpers.rb

@@ -47,7 +47,7 @@ module Rubydora
     # @param [Hash] options to convert to URL parameters
     # @return [String] URI
     def dissemination_url pid, sdef = nil, method = nil, options = nil
-      raise "" unless pid
+      raise ArgumentError, "You must provide a pid" unless pid
       url_for(object_url(pid) + "/methods" +  (("/#{CGI::escape(sdef)}" if sdef) || '') +  (("/#{CGI::escape(method)}" if method) || ''), options)
     end
 
@@ -57,7 +57,7 @@ module Rubydora
     # @param [Hash] options to convert to URL parameters
     # @return [String] URI
     def datastream_url pid, dsid, options = nil
-      raise "" unless pid and dsid
+      raise ArgumentError, "You must provide a pid and a dsid" unless pid and dsid
       url_for(object_url(pid) + "/datastreams/#{CGI::escape(dsid)}", options)
     end
 
@@ -68,7 +68,7 @@ module Rubydora
     # @param [Hash] options to convert to URL parameters
     # @return [String] URI
     def datastreams_url pid, options = nil
-      raise "" unless pid
+      raise ArgumentError, "You must provide a pid" unless pid
       url_for(object_url(pid) + "/datastreams", options)
     end
 

data/lib/rubydora/profile_parser.rb

@@ -0,0 +1,59 @@
+module Rubydora
+  module ProfileParser
+    def self.parse_datastream_profile 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 
+      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.with_indifferent_access
+    end
+
+    def self.parse_object_profile profile_xml
+      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
+      h.with_indifferent_access
+    end
+
+    def self.parse_repository_profile profile_xml
+      profile_xml.gsub! '<fedoraRepository', '<fedoraRepository xmlns="http://www.fedora.info/definitions/1/0/access/"' unless profile_xml =~ /xmlns=/
+      doc = Nokogiri::XML(profile_xml)
+      xmlns = { 'access' => "http://www.fedora.info/definitions/1/0/access/"  }
+      h = doc.xpath('/access:fedoraRepository/*', xmlns).inject({}) do |sum, node|
+                   sum[node.name] ||= []
+                   case node.name
+                     when "repositoryPID"
+                       sum[node.name] << Hash[*node.xpath('access:*', xmlns).map { |x| [node.name, node.text]}.flatten]
+                     else
+                       sum[node.name] << node.text
+                   end
+                   sum
+                 end
+      h.with_indifferent_access
+    end
+  end
+end

data/lib/rubydora/repository.rb

@@ -1,10 +1,27 @@
 require 'active_support/core_ext/hash/indifferent_access'
+require 'active_support/core_ext/module/delegation' # This line only needed for rails 3
 
 module Rubydora
   # Fedora Repository object that provides API access
   class Repository
     include ResourceIndex
-    include RestApiClient
+
+    attr_writer :api
+    def api
+      @api ||= driver.new(config)
+    end
+
+    # Eventually driver can decide between Fc3Service and Fc4Service
+    def driver
+      Fc3Service
+    end
+
+    delegate :client, :transaction, :mint, :ingest, :find_objects, :purge_object,
+      :modify_object, :datastreams, :add_datastream, :modify_datastream,
+      :set_datastream_options, :datastream_dissemination, :purge_datastream,
+      :add_relationship, :purge_relationship, :repository_profile,
+      :object_profile, :datastream_profile, :versions_for_datastream,
+      :versions_for_object, :audit_trail, to: :api
 
     # repository configuration (see #initialize)
     attr_reader :config
@@ -28,14 +45,6 @@ module Rubydora
       DigitalObject.find_or_initialize(pid, self)
     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
-
     # High-level access to the Fedora find_objects API
     #
     # @params [String] query
@@ -76,35 +85,12 @@ module Rubydora
     # repository profile (from API-A-LITE data)
     # @return [Hash]
     def profile
-      @profile ||= begin
-        profile_xml = self.describe.strip
-        profile_xml.gsub! '<fedoraRepository', '<fedoraRepository xmlns="http://www.fedora.info/definitions/1/0/access/"' unless profile_xml =~ /xmlns=/
-        doc = Nokogiri::XML(profile_xml)
-        xmlns = { 'access' => "http://www.fedora.info/definitions/1/0/access/"  }
-        h = doc.xpath('/access:fedoraRepository/*', xmlns).inject({}) do |sum, node|
-                     sum[node.name] ||= []
-                     case node.name
-                       when "repositoryPID"
-                         sum[node.name] << Hash[*node.xpath('access:*', xmlns).map { |x| [node.name, node.text]}.flatten]
-                       else
-                         sum[node.name] << node.text
-                     end
-                     sum
-                   end
-        h.select { |key, value| value.length == 1 }.each do |key, value|
-          next if key == "objModels"
-          h[key] = value.first
-        end
-
-        h
-      rescue
-        nil
-      end
+      @profile ||= repository_profile
     end
 
     # @return [Float] repository version
     def version
-      @version ||= profile['repositoryVersion'].to_f rescue nil
+      @version ||= repository_profile['repositoryVersion'].to_f rescue nil
     end
 
     # Raise an error if unable to connect to the API endpoint

data/lib/rubydora/transactions.rb

@@ -40,22 +40,23 @@ module Rubydora
 
       before_modify_object do |options|
         if Rubydora::Transactions.use_transactions
-          obj = find(options[:pid])
-          append_to_transactions_log :modify_object, :pid => options[:pid], :state => obj.state, :ownerId => obj.ownerId, :logMessage => 'reverting'
+          xml = object(pid: options[:pid])
+          profile = ProfileParser.parse_object_profile(xml)
+          append_to_transactions_log :modify_object, :pid => options[:pid], :state => profile[:objState], :ownerId => profile[:objOwnerId], :logMessage => 'reverting'
         end
       end
 
       before_set_datastream_options do |options|
         if Rubydora::Transactions.use_transactions
-          obj = find(options[:pid])
-          ds = obj.datastreams[options[:dsid]]
+          xml = datastream(pid: options[:pid], dsid: options[:dsid])
+          profile = ProfileParser.parse_datastream_profile(xml)
 
           if options[:options][:versionable]
-            append_to_transactions_log :set_datastream_options, :pid => options[:pid], :dsid => options[:dsid], :versionable => ds.versionable
+            append_to_transactions_log :set_datastream_options, :pid => options[:pid], :dsid => options[:dsid], :versionable => profile[:dsVersionable]
           end
 
           if options[:options][:state]
-            append_to_transactions_log :set_datastream_options, :pid => options[:pid], :dsid => options[:dsid], :state => ds.state
+            append_to_transactions_log :set_datastream_options, :pid => options[:pid], :dsid => options[:dsid], :state => profile[:dsState]
           end
         end
       end

data/lib/rubydora.rb

@@ -15,6 +15,8 @@ module Rubydora
   autoload :ArrayWithCallback, "rubydora/array_with_callback"
   autoload :Transactions, "rubydora/transactions"
   autoload :AuditTrail, "rubydora/audit_trail"
+  autoload :ProfileParser, "rubydora/profile_parser"
+  autoload :Fc3Service, "rubydora/fc3_service"
 
   require 'csv'
   require 'time'

data/rubydora.gemspec

@@ -27,7 +27,6 @@ Gem::Specification.new do |s|
   s.add_dependency "deprecation"
 
   s.add_development_dependency("rake")
-  s.add_development_dependency("shoulda")
   s.add_development_dependency("bundler", ">= 1.0.14")
   s.add_development_dependency("rspec")
   s.add_development_dependency("yard")

data/spec/audit_trail_spec.rb

@@ -8,7 +8,7 @@ describe "#audit_trail" do
       @xml = f.read
     end
     @repo = Rubydora::Repository.new
-    @repo.stub(:object_xml).with(hash_including(:pid => 'foo:bar')).and_return(@xml)
+    @repo.api.stub(:object_xml).with(hash_including(:pid => 'foo:bar')).and_return(@xml)
     @test_object = Rubydora::DigitalObject.new('foo:bar', @repo)
   end
   it "should have the correct number of audit records" do

data/spec/lib/datastream_spec.rb

@@ -3,15 +3,15 @@ require 'stringio'
 
 describe Rubydora::Datastream do
   before do
-    @mock_repository = mock(Rubydora::Repository, :config=>{})
-    @mock_object = mock(Rubydora::DigitalObject)
-    @mock_object.stub(:repository => @mock_repository, :pid => 'pid', :new? => false)
+    @mock_repository = Rubydora::Fc3Service.new({})
+    @mock_object = double(Rubydora::DigitalObject)
+    @mock_object.stub(:repository => @mock_repository, :pid => 'pid', :new_record? => false)
   end
 
   describe "stream" do
     subject { Rubydora::Datastream.new @mock_object, 'dsid' }
     before do
-      stub_response = stub()
+      stub_response = double
       stub_response.stub(:read_body).and_yield("one1").and_yield('two2').and_yield('thre').and_yield('four')
       @mock_repository.should_receive(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_yield(stub_response) 
       prof = <<-XML
@@ -19,7 +19,7 @@ describe Rubydora::Datastream do
           <dsSize>16</dsSize>
         </datastreamProfile>
       XML
-      subject.profile = prof
+      subject.profile = Rubydora::ProfileParser.parse_datastream_profile(prof)
     end
     it "should send the whold thing" do
       e = subject.stream()
@@ -212,7 +212,7 @@ describe Rubydora::Datastream do
   describe "retrieve" do
     before(:each) do
       @datastream = Rubydora::Datastream.new @mock_object, 'dsid'
-      @mock_repository.should_receive(:datastream).any_number_of_times.and_return <<-XML
+      @mock_repository.stub(:datastream).and_return <<-XML
         <datastreamProfile>
           <dsLocation>some:uri</dsLocation>
           <dsLabel>label</dsLabel>
@@ -261,7 +261,7 @@ describe Rubydora::Datastream do
     describe "for a managed datastream" do
       before(:each) do
         @datastream = Rubydora::Datastream.new @mock_object, 'dsid'
-        @mock_repository.should_receive(:datastream).any_number_of_times.and_return <<-XML
+        @mock_repository.stub(:datastream).and_return <<-XML
           <datastreamProfile>
             <dsLocation>some:uri</dsLocation>
             <dsLabel>label</dsLabel>
@@ -307,7 +307,7 @@ describe Rubydora::Datastream do
 
     describe "for an inline datastream" do
       before(:each) do
-        @mock_repository.should_receive(:datastream).any_number_of_times.and_return <<-XML
+        @mock_repository.stub(:datastream).and_return <<-XML
           <datastreamProfile>
             <dsLocation>some:uri</dsLocation>
             <dsLabel>label</dsLabel>
@@ -335,7 +335,7 @@ describe Rubydora::Datastream do
       subject.stub(:new? => true)
     end
 
-    subject { Rubydora::Datastream.new mock(:pid => 'asdf', :new? => false), 'asdf' }
+    subject { Rubydora::Datastream.new double(:pid => 'asdf', :new? => false), 'asdf' }
     it "should have content if it is persisted" do
       subject.stub(:new? => false)
       subject.should have_content     
@@ -362,7 +362,7 @@ describe Rubydora::Datastream do
   describe "update" do
     before(:each) do
       @datastream = Rubydora::Datastream.new @mock_object, 'dsid'
-      @mock_repository.should_receive(:datastream).any_number_of_times.and_return <<-XML
+      @mock_repository.stub(:datastream).and_return <<-XML
         <datastreamProfile>
           <dsLocation>some:uri</dsLocation>
           <dsLabel>label</dsLabel>
@@ -411,7 +411,7 @@ describe Rubydora::Datastream do
     before(:each) do
       @datastream = Rubydora::Datastream.new @mock_object, 'dsid'
       @datastream.stub :content_changed? => false
-      @mock_repository.should_receive(:datastream).any_number_of_times.and_return <<-XML
+      @mock_repository.stub(:datastream).and_return <<-XML
         <datastreamProfile>
           <dsLocation>some:uri</dsLocation>
           <dsLabel>label</dsLabel>
@@ -443,7 +443,7 @@ describe Rubydora::Datastream do
       before(:each) do
         @datastream = Rubydora::Datastream.new @mock_object, 'dsid'
         @datastream.stub(:new? => false)
-        @mock_repository.should_receive(:datastream_versions).any_number_of_times.and_return <<-XML
+        @mock_repository.stub(:datastream_versions).and_return <<-XML
         <datastreamHistory>
           <datastreamProfile>
             <dsVersionID>dsid.1</dsVersionID>
@@ -504,7 +504,7 @@ describe Rubydora::Datastream do
     describe "when no versions are found" do
       before(:each) do
         @datastream = Rubydora::Datastream.new @mock_object, 'dsid'
-        @mock_repository.should_receive(:datastream_versions).any_number_of_times.and_return nil
+        @mock_repository.stub(:datastream_versions).and_return nil
       end
 
       it "should have an emptylist of previous versions" do
@@ -700,7 +700,7 @@ describe Rubydora::Datastream do
           <dsChecksumValid>true</dsChecksumValid>
         </datastreamProfile>
       XML
-      @datastream.profile = prof
+      @datastream.profile = Rubydora::ProfileParser.parse_datastream_profile(prof)
       @datastream.profile.should == {'dsChecksumValid' =>true}
     end
   end
@@ -709,7 +709,7 @@ describe Rubydora::Datastream do
     describe "with a digital_object that doesn't have a repository" do
       ### see UnsavedDigitalObject in ActiveFedora
       before(:each) do
-        @datastream = Rubydora::Datastream.new stub(:foo), 'dsid'
+        @datastream = Rubydora::Datastream.new double(:foo), 'dsid'
       end
       it "should be empty if the digital_object doesn't have a repository" do
         @datastream.profile.should == {}

data/spec/lib/digital_object_spec.rb

@@ -2,14 +2,8 @@ require 'spec_helper'
 
 describe Rubydora::DigitalObject do
   before do
-    @mock_repository = mock(Rubydora::Repository, :config=>{})
+    @mock_repository = Rubydora::Fc3Service.new({})
   end
-  describe "new" do
-    it "should load a DigitalObject instance" do
-      Rubydora::DigitalObject.new("pid").should be_a_kind_of(Rubydora::DigitalObject)
-    end
-  end
-
   describe "profile" do
     before(:each) do
       @object = Rubydora::DigitalObject.new 'pid', @mock_repository
@@ -46,28 +40,38 @@ describe Rubydora::DigitalObject do
     end
   end
 
-  describe "new" do
+  describe "initialize" do
     before(:each) do
       @mock_repository.stub(:object) { raise RestClient::ResourceNotFound }
-      @object = Rubydora::DigitalObject.new 'pid', @mock_repository
+    end
+    subject { Rubydora::DigitalObject.new 'pid', @mock_repository }
+
+    it "should load a DigitalObject instance" do
+      expect(subject).to be_a_kind_of(Rubydora::DigitalObject)
     end
 
     it "should be new" do
-      @object.new?.should == true
+      expect(subject).to be_new
+    end
+
+    it "should be new_record" do
+      expect(subject).to be_new_record
     end
 
     it "should call ingest on save" do
-      @object.stub(:datastreams) { {} }
-      @mock_repository.should_receive(:ingest).with(hash_including(:pid => 'pid')).and_return('pid')
-      @object.save
+      subject.stub(:datastreams) { {} }
+      expect(@mock_repository).to receive(:ingest).with(hash_including(:pid => 'pid')).and_return('pid')
+      subject.save
     end
 
-    it "should create a new Fedora object with a generated PID if no PID is provided" do 
-      object = Rubydora::DigitalObject.new nil, @mock_repository
-      @mock_repository.should_receive(:ingest).with(hash_including(:pid => nil)).and_return('pid')
-      @mock_repository.should_receive(:datastreams).with(hash_including(:pid => 'pid')).and_raise(RestClient::ResourceNotFound)
-      object.save
-      object.pid.should == 'pid'
+    describe "without a provided pid" do
+      subject { Rubydora::DigitalObject.new nil, @mock_repository }
+      it "should create a new Fedora object with a generated PID if no PID is provided" do 
+        @mock_repository.should_receive(:ingest).with(hash_including(:pid => nil)).and_return('pid')
+        @mock_repository.should_receive(:datastreams).with(hash_including(:pid => 'pid')).and_raise(RestClient::ResourceNotFound)
+        subject.save
+        subject.pid.should == 'pid'
+      end
     end
   end
 
@@ -92,7 +96,7 @@ describe Rubydora::DigitalObject do
         "<objectDatastreams><datastream dsid='a'></datastream>><datastream dsid='b'></datastream>><datastream dsid='c'></datastream></objectDatastreams>"
       end
       @object = Rubydora::DigitalObject.new 'pid', @mock_repository
-      @object.stub(:new? => false)
+      @object.stub(:new_record? => false)
     end
 
     describe "datastreams" do
@@ -172,17 +176,17 @@ describe Rubydora::DigitalObject do
 
     describe "saving an object's datastreams" do
       before do
-        @new_ds = mock(Rubydora::Datastream)
+        @new_ds = double(Rubydora::Datastream)
         @new_ds.stub(:new? => true, :changed? => true, :content_changed? => true, :content => 'XXX')
-        @new_empty_ds = mock(Rubydora::Datastream)
+        @new_empty_ds = double(Rubydora::Datastream)
         @new_empty_ds.stub(:new? => true, :changed? => false, :content_changed? => false, :content => nil)
-        @existing_ds = mock(Rubydora::Datastream)
+        @existing_ds = double(Rubydora::Datastream)
         @existing_ds.stub(:new? => false, :changed? => false, :content_changed? => false, :content => 'YYY')
-        @changed_attr_ds = mock(Rubydora::Datastream)
+        @changed_attr_ds = double(Rubydora::Datastream)
         @changed_attr_ds.stub(:new? => false, :changed? => true, :content_changed? => false, :content => 'YYY')
-        @changed_ds = mock(Rubydora::Datastream)
+        @changed_ds = double(Rubydora::Datastream)
         @changed_ds.stub(:new? => false, :changed? => true, :content_changed? => true, :content => 'ZZZ')
-        @changed_empty_ds = mock(Rubydora::Datastream)
+        @changed_empty_ds = double(Rubydora::Datastream)
         @changed_empty_ds.stub(:new? => false, :changed? => true, :content_changed? => true, :content => nil)
 
       end
@@ -262,7 +266,7 @@ describe Rubydora::DigitalObject do
     end
 
     it "should remove models from fedora" do
-      @object.should_receive(:profile).any_number_of_times.and_return({"objModels" => ['asdf']})
+      @object.stub(:profile).and_return({"objModels" => ['asdf']})
       @mock_repository.should_receive(:purge_relationship) do |params|
         params.should have_key(:subject)
         params[:predicate].should == 'info:fedora/fedora-system:def/model#hasModel'
@@ -272,7 +276,7 @@ describe Rubydora::DigitalObject do
     end
 
     it "should be able to handle complete model replacemenet" do
-      @object.should_receive(:profile).any_number_of_times.and_return({"objModels" => ['asdf']})
+      @object.stub(:profile).and_return({"objModels" => ['asdf']})
       @mock_repository.should_receive(:add_relationship).with(instance_of(Hash))
       @mock_repository.should_receive(:purge_relationship).with(instance_of(Hash))
       @object.models = '1234'
@@ -301,7 +305,7 @@ describe Rubydora::DigitalObject do
         params[:predicate].should == 'info:fedora/fedora-system:def/relations-external#hasPart'
         params[:object].should == 'asdf'
       end
-      @mock_object = mock(Rubydora::DigitalObject)
+      @mock_object = double(Rubydora::DigitalObject)
       @mock_object.should_receive(:fqpid).and_return('asdf')
       @mock_repository.should_receive(:find_by_sparql_relationship).with('info:fedora/pid', 'info:fedora/fedora-system:def/relations-external#hasPart').and_return([])
       @object.parts << @mock_object
@@ -313,7 +317,7 @@ describe Rubydora::DigitalObject do
         params[:predicate].should == 'info:fedora/fedora-system:def/relations-external#hasPart'
         params[:object].should == 'asdf'
       end
-      @mock_object = mock(Rubydora::DigitalObject)
+      @mock_object = double(Rubydora::DigitalObject)
       @mock_object.should_receive(:fqpid).and_return('asdf')
       @mock_repository.should_receive(:find_by_sparql_relationship).with('info:fedora/pid', 'info:fedora/fedora-system:def/relations-external#hasPart').and_return([@mock_object])
       @object.parts.delete(@mock_object)
@@ -479,12 +483,8 @@ describe Rubydora::DigitalObject do
     let(:method) { 'lastModifiedDate' }
   end
 
-  describe "#object_xml" do
-    it "should return the FOXML record" do
-      xml = File.read(File.join(File.dirname(__FILE__), '..', 'fixtures', 'audit_trail.foxml.xml'))
-      @mock_repository.stub(:object_xml).with(hash_including(:pid => 'foo:bar')).and_return(xml)
-      @object = Rubydora::DigitalObject.new 'foo:bar', @mock_repository
-      @object.object_xml.should == @object.repository.object_xml(pid: 'foo:bar')
-    end
+  describe "#createdDate" do
+    it_behaves_like "an object attribute"
+    let(:method) { 'createdDate' }
   end
 end

data/spec/lib/repository_spec.rb

@@ -4,7 +4,7 @@ describe Rubydora::Repository do
   include Rubydora::FedoraUrlHelpers
   
   before(:each) do
-    @repository = Rubydora::Repository.new
+    @repository = Rubydora::Repository.new 
   end
 
   describe "initialize" do
@@ -24,7 +24,7 @@ describe Rubydora::Repository do
 
   describe "find" do
     it "should load objects by pid" do
-      @mock_object = mock(Rubydora::DigitalObject)
+      @mock_object = double(Rubydora::DigitalObject)
       Rubydora::DigitalObject.should_receive(:find).with("pid", instance_of(Rubydora::Repository)).and_return @mock_object
 
       @repository.find('pid')
@@ -34,7 +34,7 @@ describe Rubydora::Repository do
   describe "mint" do
     before do
       xml = "<resp xmlns:fedora=\"http://www.fedora.info/definitions/1/0/management/\"><fedora:pid>test:123</fedora:pid></resp>"
-      @repository.should_receive(:next_pid).and_return xml 
+      @repository.api.should_receive(:next_pid).and_return xml 
     end
     it "should call nextPID" do
       @repository.mint.should == 'test:123'
@@ -53,13 +53,13 @@ describe Rubydora::Repository do
 
   describe "profile" do
     it "should map the fedora repository description to a hash" do
-      @mock_response = mock()
-      @mock_client = mock(RestClient::Resource)
+      @mock_response = double
+      @mock_client = double
+      @repository.api.should_receive(:client).and_return(@mock_client)
+      @mock_client.should_receive(:[]).with(describe_repository_url(:xml=> true)).and_return(@mock_response)
       @mock_response.should_receive(:get).and_return <<-XML
         <?xml version="1.0" encoding="UTF-8"?><fedoraRepository  xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fedora.info/definitions/1/0/access/ http://www.fedora.info/definitions/1/0/fedoraRepository.xsd"><repositoryName>Fedora Repository</repositoryName><repositoryBaseURL>http://localhost:8983/fedora</repositoryBaseURL><repositoryVersion>3.3</repositoryVersion><repositoryPID>    <PID-namespaceIdentifier>changeme</PID-namespaceIdentifier>    <PID-delimiter>:</PID-delimiter>    <PID-sample>changeme:100</PID-sample>    <retainPID>*</retainPID></repositoryPID><repositoryOAI-identifier>    <OAI-namespaceIdentifier>example.org</OAI-namespaceIdentifier>    <OAI-delimiter>:</OAI-delimiter>    <OAI-sample>oai:example.org:changeme:100</OAI-sample></repositoryOAI-identifier><sampleSearch-URL>http://localhost:8983/fedora/search</sampleSearch-URL><sampleAccess-URL>http://localhost:8983/fedora/get/demo:5</sampleAccess-URL><sampleOAI-URL>http://localhost:8983/fedora/oai?verb=Identify</sampleOAI-URL><adminEmail>bob@example.org</adminEmail><adminEmail>sally@example.org</adminEmail></fedoraRepository>
       XML
-      @mock_client.should_receive(:[]).with(describe_repository_url(:xml=> true)).and_return(@mock_response)
-      @repository.should_receive(:client).and_return(@mock_client)
       profile = @repository.profile
       profile['repositoryVersion'].should == '3.3'
     end

data/spec/lib/resource_index_spec.rb

@@ -18,8 +18,8 @@ describe Rubydora::ResourceIndex do
   end
 
   it "should send sparql queries with appropriate parameters" do
-    @mock_risearch = mock()
-    @mock_client = mock(RestClient::Resource)
+    @mock_risearch = double()
+    @mock_client = double(RestClient::Resource)
     @mock_risearch.should_receive(:post).with(hash_including(:dt => 'on', :format => 'CSV', :lang => 'sparql', :limit => nil, :query => 'placeholder SPARQL query', :type => 'tuples' ))
     @mock_client.should_receive(:[]).with('risearch').and_return(@mock_risearch)
     @mock_repository.should_receive(:client).and_return(@mock_client)

data/spec/lib/rest_api_client_spec.rb

@@ -224,7 +224,7 @@ describe Rubydora::RestApiClient do
         RestClient::Request.any_instance.should_receive(:transmit) #stub transmit so that Request.execute can close the file we pass
         file = StringIO.new('test', 'r') # StringIO is a good stand it for a real File (it has read, rewind and close)
         @mock_repository.add_datastream :pid => 'mypid', :dsid => 'aaa', :content=>file
-        lambda {file.read}.should_not raise_error IOError
+        lambda {file.read}.should_not raise_error
       end
     end
   end
@@ -243,7 +243,7 @@ describe Rubydora::RestApiClient do
         RestClient::Request.any_instance.should_receive(:transmit) #stub transmit so that Request.execute can close the file we pass
         file = StringIO.new('test', 'r') # StringIO is a good stand it for a real File (it has read, rewind and close)
         @mock_repository.modify_datastream :pid => 'mypid', :dsid => 'aaa', :content=>file
-        lambda {file.read}.should_not raise_error IOError
+        lambda {file.read}.should_not raise_error
       end
     end
   end

data/spec/lib/transactions_spec.rb

@@ -4,8 +4,9 @@ describe Rubydora::Transactions do
   
 
   subject { 
-    Rubydora::Repository.any_instance.stub(:version).and_return(100)
-    repository = Rubydora::Repository.new :url => 'http://example.org'
+    # Rubydora::Repository.any_instance.stub(:version).and_return(100)
+    # repository = Rubydora::Repository.new :url => 'http://example.org'
+    Rubydora::Fc3Service.new :url => 'http://example.org'
   }
 
   describe "#transaction_is_redundant?" do
@@ -69,9 +70,8 @@ describe Rubydora::Transactions do
     it "modify_object" do
       subject.client.stub_chain(:[], :put).and_return 'asdf'
 
-      mock_object = double('Rubydora::DigitalObject', :state => 'A', :ownerId => '567', :logMessage => 'dfghj')
-      subject.should_receive(:find).with('asdf').and_return mock_object
-      
+      profile_xml = "<objectProfile><objState>A</objState><objOwnerId>567</objOwnerId></objectProfile>"
+      subject.should_receive(:object).with(pid: 'asdf').and_return profile_xml 
 
       subject.transaction do |t|
         subject.modify_object :pid => 'asdf', :state => 'I', :ownerId => '123', :logMessage => 'changing asdf'
@@ -122,9 +122,8 @@ describe Rubydora::Transactions do
     it "set_datastream_options" do
       subject.client.stub_chain(:[], :put)
 
-      mock_object = double('Rubydora::DigitalObject')
-      mock_object.stub_chain(:datastreams, :[], :versionable).and_return(false)
-      subject.should_receive(:find).with('asdf').and_return mock_object
+      profile_xml = "<datastreamProfile><dsVersionable>false</dsVersionable></datastreamProfile>"
+      subject.should_receive(:datastream).with(pid: 'asdf', dsid: 'mydsid').and_return profile_xml
 
       subject.transaction do |t|
         subject.set_datastream_options :pid => 'asdf', :dsid => 'mydsid', :versionable => true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubydora
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.7.0.pre1
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv
@@ -150,20 +150,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -243,10 +229,13 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .gitmodules
+- .mailmap
 - .travis.yml
+- CONTRIBUTING.md
 - Gemfile
 - History.textile
 - LICENSE.txt
+- Notices.txt
 - README.rdoc
 - Rakefile
 - VERSION
@@ -258,8 +247,10 @@ files:
 - lib/rubydora/callbacks.rb
 - lib/rubydora/datastream.rb
 - lib/rubydora/digital_object.rb
+- lib/rubydora/fc3_service.rb
 - lib/rubydora/fedora_url_helpers.rb
 - lib/rubydora/models_mixin.rb
+- lib/rubydora/profile_parser.rb
 - lib/rubydora/relationships_mixin.rb
 - lib/rubydora/repository.rb
 - lib/rubydora/resource_index.rb
@@ -291,12 +282,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Fedora Commons REST API ruby library