rubydora 0.3.1 → 0.4.0pre1

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0pre1

data/lib/rubydora/datastream.rb

@@ -15,11 +15,11 @@ module Rubydora
     attr_reader :digital_object, :dsid
 
     # mapping datastream attributes (and api parameters) to datastream profile names
-    DS_ATTRIBUTES = {:controlGroup => :dsControlGroup, :dsLocation => :dsLocation, :altIDs => nil, :dsLabel => :dsLabel, :versionable => :dsVersionable, :dsState => :dsState, :formatURI => :dsFormatURI, :checksumType => :dsChecksumType, :checksum => :dsChecksum, :mimeType => :dsMIME, :logMessage => nil, :ignoreContent => nil, :lastModifiedDate => nil, :content => nil}
+    DS_ATTRIBUTES = {:controlGroup => :dsControlGroup, :dsLocation => :dsLocation, :altIDs => nil, :dsLabel => :dsLabel, :versionable => :dsVersionable, :dsState => :dsState, :formatURI => :dsFormatURI, :checksumType => :dsChecksumType, :checksum => :dsChecksum, :mimeType => :dsMIME, :logMessage => nil, :ignoreContent => nil, :lastModifiedDate => nil, :content => nil, :asOfDateTime => nil}
     DS_DEFAULT_ATTRIBUTES = { :controlGroup => 'M', :dsState => 'A', :checksumType => 'DISABLED', :versionable => true }
 
     define_attribute_methods DS_ATTRIBUTES.keys
-    
+ 
     # accessors for datastream attributes 
     DS_ATTRIBUTES.each do |attribute, profile_name|
       class_eval %Q{
@@ -34,6 +34,37 @@ module Rubydora
       }
     end
 
+    DS_READONLY_ATTRIBUTES = [ :dsCreateDate , :dsSize, :dsVersionID ]
+    DS_READONLY_ATTRIBUTES.each do |attribute|
+      class_eval %Q{
+      def #{attribute.to_s}
+        @#{attribute} || profile['#{attribute.to_s}'] || DS_DEFAULT_ATTRIBUTES[:#{attribute}]
+      end
+      }
+    end
+
+
+    # Create humanized accessors for the DS attribute  (dsState -> state, dsCreateDate -> createDate)
+    (DS_ATTRIBUTES.keys + DS_READONLY_ATTRIBUTES).select { |k| k.to_s =~ /^ds/ }.each do |attribute|
+      simple_attribute = attribute.to_s.sub(/^ds/, '')
+      simple_attribute = simple_attribute[0].chr.downcase + simple_attribute[1..-1]
+
+      alias_method simple_attribute, attribute
+
+      if self.respond_to? "#{attribute}="
+        alias_method "#{simple_attribute}=", "#{attribute}="
+      end
+    end
+
+
+    def asOfDateTime asOfDateTime = nil
+      if asOfDateTime == nil
+        return @asOfDateTime
+      end
+
+      return self.class.new(@digital_object, @dsid, @options.merge(:asOfDateTime => asOfDateTime))
+    end
+
     ##
     # Initialize a Rubydora::Datastream object, which may or
     # may not already exist in the datastore.
@@ -47,6 +78,7 @@ module Rubydora
       _run_initialize_callbacks do
       @digital_object = digital_object
       @dsid = dsid
+      @options = options
       options.each do |key, value|
         self.send(:"#{key}=", value)
       end
@@ -68,7 +100,10 @@ module Rubydora
     # @return [String]
     def content
       begin
-        @content ||= repository.datastream_dissemination :pid => pid, :dsid => dsid
+        options = { :pid => pid, :dsid => dsid }
+        options[:asOfDateTime] = asOfDateTime if asOfDateTime
+
+        @content ||= repository.datastream_dissemination options
       rescue RestClient::ResourceNotFound
       end
 
@@ -80,7 +115,9 @@ module Rubydora
     # Get the URL for the datastream content
     # @return [String]
     def url
-      repository.datastream_url(pid, dsid) + "/content"
+      options = { }
+      options[:asOfDateTime] = asOfDateTime if asOfDateTime
+      repository.datastream_url(pid, dsid, options) + "/content"
     end
 
     # Set the content of the datastream
@@ -94,34 +131,56 @@ module Rubydora
     # Content_will_change! would be dynamically created by ActiveModel::Dirty, but it would eagerly load the content.
     # We don't want to do that.
     def content_will_change!
+      raise "Can't change values on older versions" if @asOfDateTime
       changed_attributes[:content] = nil
     end
 
     # Retrieve the datastream profile as a hash (and cache it)
     # @return [Hash] see Fedora #getDatastream documentation for keys
-    def profile
+    def profile profile_xml = nil
       @profile ||= begin
-        profile_xml = repository.datastream(:pid => pid, :dsid => dsid)
-        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
-        h.select { |key, value| value.length == 1 }.each do |key, value|
-          h[key] = value.first
-        end
-
-        h
+        options = { :pid => pid, :dsid => dsid }
+        options[:asOfDateTime] = asOfDateTime if asOfDateTime
+        profile_xml ||= repository.datastream(options)
+        self.profile_xml_to_hash(profile_xml)
+
       rescue
         {}
       end
     end
+    alias_method :profile=, :profile
+
+    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
+      h.select { |key, value| value.length == 1 }.each do |key, value|
+        h[key] = value.first
+      end
+
+      h['dsSize'] &&= h['dsSize'].to_i rescue h['dsSize']
+      h['dsCreateDate'] &&= Time.parse(h['dsCreateDate']) rescue h['dsCreateDate']
+
+      h
+    end
+
+    def versions
+      versions_xml = repository.datastream_versions(:pid => pid, :dsid => dsid)
+      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
+    end
 
     # Add datastream to Fedora
     # @return [Rubydora::Datastream]
     def create
+      check_if_read_only
       run_callbacks :create do
         repository.add_datastream to_api_params.merge({ :pid => pid, :dsid => dsid })
         reset_profile_attributes
@@ -132,6 +191,7 @@ module Rubydora
     # Modify or save the datastream
     # @return [Rubydora::Datastream]
     def save
+      check_if_read_only
       run_callbacks :save do
         return create if new?
         repository.modify_datastream to_api_params.merge({ :pid => pid, :dsid => dsid })
@@ -143,6 +203,7 @@ module Rubydora
     # Purge the datastream from Fedora
     # @return [Rubydora::Datastream] `self`
     def delete
+      check_if_read_only
       run_callbacks :destroy do
         repository.purge_datastream(:pid => pid, :dsid => dsid) unless self.new?
         digital_object.datastreams.delete(dsid)
@@ -184,5 +245,19 @@ module Rubydora
     def repository
       digital_object.repository
     end
+
+    def asOfDateTime= val
+      @asOfDateTime = val
+    end
+
+    def check_if_read_only
+      raise "Can't change values on older versions" if @asOfDateTime
+    end
+
+    private
+    def attribute_will_change! *args
+      check_if_read_only
+      super
+    end
   end
 end

data/lib/rubydora/digital_object.rb

@@ -43,8 +43,8 @@ module Rubydora
     # TODO: raise an error if the object does not yet exist
     # @param [String] pid
     # @param [Rubydora::Repository] context
-    def self.find pid, repository = nil
-      self.new pid, repository
+    def self.find pid, repository = nil, options = {}
+      self.new pid, repository, options
     end
 
     # create a new fedora object (see also DigitalObject#save)
@@ -72,6 +72,7 @@ module Rubydora
         self.pid = pid
         @repository = repository
         @new = true
+        @options = options
 
         options.each do |key, value|
           self.send(:"#{key}=", value)
@@ -94,11 +95,25 @@ module Rubydora
       @new
     end
 
+    def asOfDateTime asOfDateTime = nil
+      if asOfDateTime == nil
+        return @asOfDateTime
+      end
+
+      return self.class.new(pid, @repository, @options.merge(:asOfDateTime => asOfDateTime))
+    end
+
+    def asOfDateTime= val
+      @asOfDateTime = val
+    end
+
     # Retrieve the object profile as a hash (and cache it)
     # @return [Hash] see Fedora #getObject documentation for keys
     def profile
       @profile ||= begin
-        profile_xml = repository.object(:pid => pid)
+        options = { :pid => pid }
+        options[:asOfDateTime] = asOfDateTime if asOfDateTime
+        profile_xml = repository.object(options)
         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|
@@ -123,6 +138,16 @@ module Rubydora
       end.freeze
     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 
+      end
+    end
+
+
     # List of datastreams
     # @return [Array<Rubydora::Datastream>] 
     def datastreams
@@ -130,7 +155,9 @@ module Rubydora
         h = Hash.new { |h,k| h[k] = datastream_object_for(k) }                
 
         begin
-          datastreams_xml = repository.datastreams(:pid => pid)
+          options = { :pid => pid }
+          options[:asOfDateTime] = asOfDateTime if asOfDateTime
+          datastreams_xml = repository.datastreams(options)
           datastreams_xml.gsub! '<objectDatastreams', '<objectDatastreams xmlns="http://www.fedora.info/definitions/1/0/access/"' unless datastreams_xml =~ /xmlns=/
           doc = Nokogiri::XML(datastreams_xml)
           doc.xpath('//access:datastream', {'access' => "http://www.fedora.info/definitions/1/0/access/"}).each do |ds| 
@@ -158,6 +185,7 @@ module Rubydora
     # 
     # @return [Rubydora::DigitalObject] a new copy of this object
     def save
+      check_if_read_only
       run_callbacks :save do
         if self.new?
           self.pid = repository.ingest to_api_params.merge(:pid => pid)
@@ -175,6 +203,7 @@ module Rubydora
     # Purge the object from Fedora
     # @return [Rubydora::DigitalObject] `self`
     def delete
+      check_if_read_only
       my_pid = pid
       run_callbacks :destroy do
         @datastreams = nil
@@ -219,8 +248,24 @@ module Rubydora
     # instantiate a datastream object for a dsid
     # @param [String] dsid
     # @return [Datastream]
-    def datastream_object_for dsid
-      Datastream.new self, dsid
+    def datastream_object_for dsid, options = {}
+      options[:asOfDateTime] ||= asOfDateTime if asOfDateTime
+      Datastream.new self, dsid, options
+    end
+
+    def check_if_read_only
+      raise "Can't change values on older versions" if @asOfDateTime
+    end
+
+    def check_if_read_only
+      raise "Can't change values on older versions" if @asOfDateTime
+    end
+
+    private
+    def attribute_will_change! *args
+      check_if_read_only
+      super
     end
+
   end
 end

data/lib/rubydora/rest_api_client.rb

@@ -198,13 +198,15 @@ module Rubydora
       raise ArgumentError, "Must supply dsid" unless dsid
       options[:format] ||= 'xml'
       begin
-        return client[url_for(datastream_url(pid, dsid) + "/versions", options)].get
+        return client[url_for(datastream_url(pid, dsid) + "/history", options)].get
       rescue => e
         logger.error e.response
         raise "Error getting versions for datastream #{dsid} for object #{pid}. See logger for details"
       end
     end
 
+    alias_method :datastream_history, :datastream_versions
+
     # {include:RestApiClient::API_DOCUMENTATION}
     # @param [Hash] options
     # @option options [String] :pid

data/lib/rubydora.rb

@@ -17,6 +17,8 @@ module Rubydora
 
 
   require 'csv'
+  require 'time'
+
   if CSV.const_defined? :Reader
     require 'fastercsv'
   end

data/spec/lib/datastream_spec.rb

@@ -7,6 +7,7 @@ describe Rubydora::Datastream do
     @mock_object.stub(:repository => @mock_repository, :pid => 'pid')
   end
 
+
   describe "create" do
     before(:each) do
       @mock_repository.stub(:datastream) { raise("") }
@@ -118,6 +119,218 @@ describe Rubydora::Datastream do
 
   end
 
+  describe "should check if an object is read-only" do
+    before(:each) do
+      @datastream = Rubydora::Datastream.new @mock_object, 'dsid'
+      @mock_repository.should_receive(:datastream).any_number_of_times.and_return <<-XML
+        <datastreamProfile>
+          <dsLocation>some:uri</dsLocation>
+          <dsLabel>label</dsLabel>
+        </datastreamProfile>
+      XML
+    end
+
+    it "before updating attributes" do
+      @datastream.should_receive(:check_if_read_only)
+      @datastream.dsLabel = 'New Label'
+    end
+
+    it "before saving an object" do
+      @mock_repository.should_receive(:modify_datastream)
+      @datastream.should_receive(:check_if_read_only)
+      @datastream.save
+    end
+
+    it "before deleting an object" do
+      @mock_repository.should_receive(:purge_datastream)
+      @mock_object.should_receive(:datastreams).and_return([])
+      @datastream.should_receive(:check_if_read_only)
+      @datastream.delete
+    end
+  end
+
+  describe "versions" do
+    before(:each) do
+      @datastream = Rubydora::Datastream.new @mock_object, 'dsid'
+      @mock_repository.should_receive(:datastream_versions).any_number_of_times.and_return <<-XML
+      <datastreamHistory>
+        <datastreamProfile>
+          <dsVersionID>dsid.1</dsVersionID>
+          <dsCreateDate>2010-01-02T00:00:00.012Z</dsCreateDate>
+        </datastreamProfile>
+        <datastreamProfile>
+          <dsVersionID>dsid.0</dsVersionID>
+          <dsCreateDate>2008-08-05T01:30:05.012Z</dsCreateDate>
+        </datastreamProfile>
+      </datastreamHistory>
+      XML
+    end
+
+    it "should have a list of previous versions" do
+      @datastream.versions.should have(2).items
+    end
+
+    it "should access versions as read-only copies" do
+      expect { @datastream.versions.first.label = "asdf" }.to raise_error
+    end
+
+    it "should lookup content of datastream using the asOfDateTime parameter" do
+      @mock_repository.should_receive(:datastream_dissemination).with(hash_including(:asOfDateTime => '2008-08-05T01:30:05.012Z'))
+      @datastream.versions.last.content
+    end
+    
+  end
+
+  describe "datastream attributes" do
+    before do
+      @mock_repository.stub(:datastream => <<-XML
+        <datastreamProfile>
+        <anyProfileValue />
+        </datastreamProfile>
+      XML
+    )
+    end
+
+  shared_examples "a datastream attribute" do
+    subject { Rubydora::Datastream.new @mock_object, 'dsid' }
+
+    describe "getter" do
+      it "should return the value" do
+        subject.instance_variable_set("@#{method}", 'asdf')
+        subject.send(method).should == 'asdf'
+      end
+
+      it "should look in the object profile" do
+        subject.should_receive(:profile) { { Rubydora::Datastream::DS_ATTRIBUTES[method.to_sym].to_s => 'qwerty' } }
+        subject.send(method).should == 'qwerty'
+      end
+
+      it "should fall-back to the set of default attributes" do
+        Rubydora::Datastream::DS_DEFAULT_ATTRIBUTES.should_receive(:[]).with(method.to_sym) { 'zxcv'} 
+        subject.send(method).should == 'zxcv'
+      end
+    end
+
+    describe "setter" do
+      before do
+        subject.stub(:datastreams => [])
+      end
+      it "should mark the object as changed after setting" do
+        subject.send("#{method}=", 'new_value')
+        subject.should be_changed
+      end
+
+      it "should appear in the save request" do 
+        @mock_repository.should_receive(:modify_datastream).with(hash_including(method.to_sym => 'new_value'))
+        subject.send("#{method}=", 'new_value')
+        subject.save
+      end
+    end
+  end
+
+  shared_examples "a read-only datastream attribute" do
+    subject { Rubydora::Datastream.new @mock_object, 'dsid' }
+
+    describe "getter" do
+      it "should return the value" do
+        subject.instance_variable_set("@#{method}", 'asdf')
+        subject.send(method).should == 'asdf'
+      end
+
+      it "should look in the object profile" do
+        subject.should_receive(:profile) { { method => 'qwerty' } }
+        subject.send(method).should == 'qwerty'
+      end
+
+      it "should fall-back to the set of default attributes" do
+        Rubydora::Datastream::DS_DEFAULT_ATTRIBUTES.should_receive(:[]).with(method.to_sym) { 'zxcv'} 
+        subject.send(method).should == 'zxcv'
+      end
+    end
+
+  end
+
+  describe "#controlGroup" do
+    it_behaves_like "a datastream attribute"
+    let(:method) { 'controlGroup' }
+  end
+
+  describe "#dsLocation" do
+    it_behaves_like "a datastream attribute"
+    let(:method) { 'dsLocation' }
+  end
+
+  describe "#altIDs" do
+    it_behaves_like "a datastream attribute"
+    let(:method) { 'altIDs' }
+  end
+
+  describe "#dsLabel" do
+    it_behaves_like "a datastream attribute"
+    let(:method) { 'dsLabel' }
+  end
+
+  describe "#versionable" do
+    it_behaves_like "a datastream attribute"
+    let(:method) { 'versionable' }
+  end
+
+  describe "#dsState" do
+    it_behaves_like "a datastream attribute"
+    let(:method) { 'dsState' }
+  end
+
+  describe "#formatURI" do
+    it_behaves_like "a datastream attribute"
+    let(:method) { 'formatURI' }
+  end
+
+  describe "#checksumType" do
+    it_behaves_like "a datastream attribute"
+    let(:method) { 'checksumType' }
+  end
+
+  describe "#checksum" do
+    it_behaves_like "a datastream attribute"
+    let(:method) { 'checksum' }
+  end
+
+  describe "#mimeType" do
+    it_behaves_like "a datastream attribute"
+    let(:method) { 'mimeType' }
+  end
+
+  describe "#logMessage" do
+    it_behaves_like "a datastream attribute"
+    let(:method) { 'logMessage' }
+  end
+
+  describe "#ignoreContent" do
+    it_behaves_like "a datastream attribute"
+    let(:method) { 'ignoreContent' }
+  end
+
+  describe "#lastModifiedDate" do
+    it_behaves_like "a datastream attribute"
+    let(:method) { 'lastModifiedDate' }
+  end
+
+  describe "#dsCreateDate" do
+    it_behaves_like "a read-only datastream attribute"
+    let(:method) { 'dsCreateDate' }
+  end
+
+  describe "#dsSize" do
+    it_behaves_like "a read-only datastream attribute"
+    let(:method) { 'dsSize' }
+  end
+
+  describe "#dsVersionID" do
+    it_behaves_like "a read-only datastream attribute"
+    let(:method) { 'dsVersionID' }
+  end
+end
+
   describe "to_api_params" do
 
     describe "with existing properties" do

data/spec/lib/digital_object_spec.rb

@@ -292,6 +292,41 @@ describe Rubydora::DigitalObject do
     end
   end
 
+  describe "versions" do
+    before(:each) do
+      @mock_repository.stub(:object) { <<-XML
+      <objectProfile>
+      </objectProfile>
+      XML
+      }
+
+      @mock_repository.stub(:object_versions) { <<-XML
+      <fedoraObjectHistory>
+        <objectChangeDate>2011-09-26T20:41:02.450Z</objectChangeDate>
+        <objectChangeDate>2011-10-11T21:17:48.124Z</objectChangeDate>
+      </fedoraObjectHistory>
+      XML
+      }
+      @object = Rubydora::DigitalObject.new 'pid', @mock_repository
+    end
+
+    it "should have a list of previous versions" do
+      @object.versions.should have(2).items
+      @object.versions.first.asOfDateTime.should == '2011-09-26T20:41:02.450Z'
+    end
+
+    it "should access versions as read-only copies" do
+      expect { @object.versions.first.label = "asdf" }.to raise_error
+    end
+
+    it "should lookup content of datastream using the asOfDateTime parameter" do
+      @mock_repository.should_receive(:datastreams).with(hash_including(:asOfDateTime => '2011-09-26T20:41:02.450Z')).and_return('')
+      Rubydora::Datastream.should_receive(:new).with(anything, 'my_ds', hash_including(:asOfDateTime => '2011-09-26T20:41:02.450Z'))
+      ds = @object.versions.first['my_ds']
+    end
+    
+  end
+
   describe "to_api_params" do
     before(:each) do
       @object = Rubydora::DigitalObject.new 'pid', @mock_repository
@@ -300,4 +335,66 @@ describe Rubydora::DigitalObject do
       @object.send(:to_api_params).should == {}
     end
   end
+
+  shared_examples "an object attribute" do
+    subject { Rubydora::DigitalObject.new 'pid', @mock_repository }
+
+    describe "getter" do
+      it "should return the value" do
+        subject.instance_variable_set("@#{method}", 'asdf')
+        subject.send(method).should == 'asdf'
+      end
+
+      it "should look in the object profile" do
+        subject.should_receive(:profile) { { Rubydora::DigitalObject::OBJ_ATTRIBUTES[method.to_sym].to_s => 'qwerty' } }
+        subject.send(method).should == 'qwerty'
+      end
+
+      it "should fall-back to the set of default attributes" do
+        Rubydora::DigitalObject::OBJ_DEFAULT_ATTRIBUTES.should_receive(:[]).with(method.to_sym) { 'zxcv'} 
+        subject.send(method).should == 'zxcv'
+      end
+    end
+
+    describe "setter" do
+      before do
+        subject.stub(:datastreams => [])
+      end
+      it "should mark the object as changed after setting" do
+        subject.send("#{method}=", 'new_value')
+        subject.should be_changed
+      end
+
+      it "should appear in the save request" do 
+        @mock_repository.should_receive(:ingest).with(hash_including(method.to_sym => 'new_value'))
+        subject.send("#{method}=", 'new_value')
+        subject.save
+      end
+    end
+  end
+
+  describe "#state" do
+    it_behaves_like "an object attribute"
+    let(:method) { 'state' }
+  end
+
+  describe "#ownerId" do
+    it_behaves_like "an object attribute"
+    let(:method) { 'ownerId' }
+  end
+
+  describe "#label" do
+    it_behaves_like "an object attribute"
+    let(:method) { 'label' }
+  end
+
+  describe "#logMessage" do
+    it_behaves_like "an object attribute"
+    let(:method) { 'logMessage' }
+  end
+
+  describe "#lastModifiedDate" do
+    it_behaves_like "an object attribute"
+    let(:method) { 'lastModifiedDate' }
+  end
 end

data/spec/lib/integration_test_spec.rb

@@ -93,6 +93,18 @@ describe "Integration testing against a live Fedora repository", :integration =>
     obj.datastreams["Test"].content.should match( "Integration testing against a live Fedora repository")
   end
 
+  it "should have profile attributes" do
+    obj = @repository.find('test:1')
+    ds = obj.datastreams["Test"]
+
+    ds.versionID.should == "Test.0"
+
+    (Time.now - ds.createDate).should be < 60*60 # 1 hour
+    ds.state.should == "A"
+    ds.controlGroup.should == "M"
+    ds.size.should be > 100
+  end
+
   it "should delete datastreams" do
     obj = @repository.find('test:1')
     ds = obj.datastreams["Test"].delete
@@ -125,6 +137,70 @@ describe "Integration testing against a live Fedora repository", :integration =>
     obj.datastreams["my_ds"].mimeType.should == "application/x-text"
   end
 
+
+  describe "object versions" do
+    it "should have versions" do
+      obj = @repository.find('test:1')
+      obj.versions.should_not be_empty
+    end
+
+    it "should have read-only versions" do
+      obj = @repository.find('test:1')
+      expect { obj.versions.first.label = "asdf" }.to raise_error
+    end
+
+    ## This isn't how Fedora object profiles actually work??
+    #it "should access profile data using asOfDateTime" do
+    #  obj = @repository.find('test:3')
+    #  obj.label = "asdf"
+    #  obj.save
+    #
+    #  obj = @repository.find('test:3')
+    #  obj.label = "qwerty"
+    #  obj.save
+    #
+    #  obj = @repository.find('test:3')
+    #  obj.versions.map { |x| x.label }.should include('adsf', 'qwerty')
+    #end
+
+    it "should access datastreams list using asOfDateTime (and pass the asOfDateTime through to the datastreams)" do
+      obj = @repository.find('test:1')
+      oldest = obj.versions.first.datastreams.keys
+      newest = obj.versions.last.datastreams.keys
+      (newest - oldest).should_not be_empty
+
+      obj.versions.first.datastreams.values.first.asOfDateTime.should == obj.versions.first.asOfDateTime
+    end
+  end
+
+  describe "datastream versions" do
+
+    it "should have versions" do
+      obj = @repository.find('test:1')
+      versions = obj.datastreams["my_ds"].versions
+      versions.should_not be_empty
+      versions.map { |x| x.versionID }.should include('my_ds.1', 'my_ds.0')
+    end
+
+    it "should have read-only versions" do
+      obj = @repository.find('test:1')
+      ds = obj.datastreams["my_ds"].asOfDateTime(Time.now)
+      expect { ds.dsLabel = 'asdf' }.to raise_error
+      expect { ds.content = 'asdf' }.to raise_error
+    end
+
+    it "should access the content of older datastreams" do
+      obj = @repository.find('test:1')
+
+      ds = obj.datastreams["my_ds"]
+      ds.content = "YYY"
+      ds.save
+
+      versions = obj.datastreams["my_ds"].versions
+      versions.map { |x| x.content }.should include("XXX", "YYY") 
+    end
+  end
+
   context "mime types" do
     before(:each) do
       obj = @repository.find('test:1')

data/spec/lib/rest_api_client_spec.rb

@@ -163,9 +163,13 @@ describe Rubydora::RestApiClient do
   end
 
   it "datastream_versions" do
-     RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/datastreams/aaa/versions?format=xml"))
+     RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/datastreams/aaa/history?format=xml"))
     @mock_repository.datastream_versions :pid => 'mypid', :dsid => 'aaa'
+  end
 
+  it "datastream_history" do
+     RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/datastreams/aaa/history?format=xml"))
+    @mock_repository.datastream_history :pid => 'mypid', :dsid => 'aaa'
   end
 
   it "relationships" do

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: rubydora
 version: !ruby/object:Gem::Version
-  version: 0.3.1
-  prerelease: 
+  version: 0.4.0pre1
+  prerelease: 5
 platform: ruby
 authors:
 - Chris Beer
@@ -13,7 +13,7 @@ date: 2011-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &70303469325600 !ruby/object:Gem::Requirement
+  requirement: &70158854103660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70303469325600
+  version_requirements: *70158854103660
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70303469325100 !ruby/object:Gem::Requirement
+  requirement: &70158854103200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70303469325100
+  version_requirements: *70158854103200
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70303469324580 !ruby/object:Gem::Requirement
+  requirement: &70158854102700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70303469324580
+  version_requirements: *70158854102700
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70303469324120 !ruby/object:Gem::Requirement
+  requirement: &70158854102180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70303469324120
+  version_requirements: *70158854102180
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70303469323660 !ruby/object:Gem::Requirement
+  requirement: &70158854101740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70303469323660
+  version_requirements: *70158854101740
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70303469323200 !ruby/object:Gem::Requirement
+  requirement: &70158854101320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70303469323200
+  version_requirements: *70158854101320
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &70303469322720 !ruby/object:Gem::Requirement
+  requirement: &70158854117240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70303469322720
+  version_requirements: *70158854117240
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70303469322280 !ruby/object:Gem::Requirement
+  requirement: &70158854116180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70303469322280
+  version_requirements: *70158854116180
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70303469321840 !ruby/object:Gem::Requirement
+  requirement: &70158854115100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70303469321840
+  version_requirements: *70158854115100
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70303469334820 !ruby/object:Gem::Requirement
+  requirement: &70158854112280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: 1.0.14
   type: :development
   prerelease: false
-  version_requirements: *70303469334820
+  version_requirements: *70158854112280
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70303469334120 !ruby/object:Gem::Requirement
+  requirement: &70158854111780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70303469334120
+  version_requirements: *70158854111780
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70303469333480 !ruby/object:Gem::Requirement
+  requirement: &70158854111220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70303469333480
+  version_requirements: *70158854111220
 - !ruby/object:Gem::Dependency
   name: jettywrapper
-  requirement: &70303469333060 !ruby/object:Gem::Requirement
+  requirement: &70158854110800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70303469333060
+  version_requirements: *70158854110800
 description: ! 'Fedora Commons REST API ruby library : REQUIRES FCREPO 3.4+'
 email:
 - chris@cbeer.info
@@ -211,16 +211,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4478861482245070325
+      hash: 142486579625571647
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 4478861482245070325
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10