rubydora 0.0.5 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/rubydora/datastream.rb

@@ -50,7 +50,7 @@ module Rubydora
     # Does this datastream already exist?
     # @return [Boolean]
     def new?
-      profile.nil?
+      profile.empty?
     end
 
     # Retrieve the content of the datastream (and cache it)
@@ -81,9 +81,9 @@ module Rubydora
     def profile
       @profile ||= begin
         profile_xml = repository.datastream(:pid => pid, :dsid => dsid)
-        profile_xml.gsub! '<datastreamProfile', '<datastreamProfile xmlns="http://www.fedora.info/definitions/1/0/access/"' unless profile_xml =~ /xmlns=/
+        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('/access:datastreamProfile/*', {'access' => "http://www.fedora.info/definitions/1/0/access/"} ).inject({}) do |sum, node|
+        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
@@ -94,7 +94,7 @@ module Rubydora
 
         h
       rescue
-         nil
+        {}
       end
     end
 

data/lib/rubydora/digital_object.rb

@@ -45,8 +45,8 @@ module Rubydora
     # @param [Rubydora::Repository] context
     def self.create pid, options = {}, repository = nil
       repository ||= Rubydora.repository
-      repository.ingest(options.merge(:pid => pid))
-      DigitalObject.new pid, repository
+      assigned_pid = repository.ingest(options.merge(:pid => pid))
+      DigitalObject.new assigned_pid, repository
     end
 
     ##
@@ -59,7 +59,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 = {}
-      @pid = pid.gsub('info:fedora/', '')
+      self.pid = pid
       @repository = repository
 
       options.each do |key, value|
@@ -80,7 +80,7 @@ module Rubydora
     # Does this object already exist?
     # @return [Boolean]
     def new?
-      self.profile.nil?
+      self.profile.empty?
     end
 
     # Retrieve the object profile as a hash (and cache it)
@@ -107,7 +107,7 @@ module Rubydora
 
         h
       rescue  
-        nil
+        {}
       end
     end
 
@@ -126,7 +126,12 @@ module Rubydora
       end
     end
     alias_method :datastream, :datastreams
-    alias_method :[], :datastreams
+
+    # provide an hash-like way to access datastreams 
+    def fetch dsid
+      datastreams[dsid]
+    end
+    alias_method :[], :fetch
 
     # persist the object to Fedora, either as a new object 
     # by modifing the existing object
@@ -137,21 +142,22 @@ module Rubydora
     # @return [Rubydora::DigitalObject] a new copy of this object
     def save
       if self.new?
-        repository.ingest to_api_params.merge(:pid => pid)
+        self.pid = repository.ingest to_api_params.merge(:pid => pid)
       else                       
         p = to_api_params
         repository.modify_object p.merge(:pid => pid) unless p.empty?
       end
 
       self.datastreams.select { |dsid, ds| ds.dirty? }.reject {|dsid, ds| ds.new? }.each { |dsid, ds| ds.save }
-      DigitalObject.new(pid, repository)
+      reset
+      self
     end
 
     # Purge the object from Fedora
     # @return [Rubydora::DigitalObject] `self`
     def delete
       repository.purge_object(:pid => pid)
-      reset_profile_attributes
+      reset
       self
     end
 
@@ -162,6 +168,13 @@ module Rubydora
     end
 
     protected
+    # set the pid of the object
+    # @param [String] pid
+    # @return [String] the base pid
+    def pid= pid
+      @pid = pid.gsub('info:fedora/', '')
+    end
+
     # datastream parameters 
     # @return [Hash]
     def to_api_params
@@ -188,5 +201,17 @@ module Rubydora
       end
     end
 
+    # reset the datastreams cache
+    def reset_datastreams
+      @datastreams = nil
+    end
+
+    # reset local data so that it is requested from Fedora
+    def reset
+      reset_profile_attributes
+      reset_datastreams
+      self
+    end
+
   end
 end

data/lib/rubydora/ext/model_loader.rb

@@ -31,6 +31,9 @@ module Rubydora::Ext
         end
       end
 
+      # convert a model string to a Ruby class (see ActiveSupport::Inflector#constantize)
+      # @param [String] lower_case_and_underscored_word
+      # @return [Module]
       def self.string_to_constant lower_case_and_underscored_word
         camel_cased_word = lower_case_and_underscored_word.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
 

data/lib/rubydora/relationships_mixin.rb

@@ -82,16 +82,33 @@ module Rubydora
       diff[:-] ||= []
 
       diff[:+].each do |o| 
-        obj_uri = (( o.fqpid if o.respond_to? :fqpid ) || ( o.uri if o.respond_to? :uri ) || (o.to_s if o.respond_to? :to_s?) || o )
-        repository.add_relationship :subject => fqpid, :predicate => predicate, :object => obj_uri
+        add_relationship(predicate, o)
       end        
 
       diff[:-].each do |o| 
-        obj_uri = (( o.fqpid if o.respond_to? :fqpid ) || ( o.uri if o.respond_to? :uri ) || (o.to_s if o.respond_to? :to_s?) || o )
-        repository.purge_relationship :subject => fqpid, :predicate => predicate, :object => obj_uri
+        purge_relationship(predicate, o)
       end        
     end
 
+    # Add a relationship for this object
+    # @param [String] predicate
+    # @param [String, Rubydora::DigitalObject] object
+    # @return self
+    def add_relationship predicate, object
+      obj_uri = (( object.fqpid if object.respond_to? :fqpid ) || ( object.uri if object.respond_to? :uri ) || (object.to_s if object.respond_to? :to_s?) || object )
+      repository.add_relationship :subject => fqpid, :predicate => predicate, :object => obj_uri
+      self
+    end
+
+    # Purge a relationship from this object
+    # @param [String] predicate
+    # @param [String, Rubydora::DigitalObject] object
+    # @return self
+    def purge_relationship predicate, object
+      obj_uri = (( object.fqpid if object.respond_to? :fqpid ) || ( object.uri if object.respond_to? :uri ) || (object.to_s if object.respond_to? :to_s?) || object )
+      repository.purge_relationship :subject => fqpid, :predicate => predicate, :object => obj_uri
+    end
+
     # accessor to all retrieved relationships
     # @return [Hash]
     def relationships

data/lib/rubydora/repository.rb

@@ -21,6 +21,11 @@ module Rubydora
       DigitalObject.find(pid, self)
     end
 
+    # {include:DigitalObject.create}
+    def create pid, options = {}
+      DigitalObject.create(pid, options = {}, self)
+    end
+
     # repository profile (from API-A-LITE data)
     # @return [Hash]
     def profile

data/rubydora.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubydora}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Beer"]
-  s.date = %q{2011-04-21}
+  s.date = %q{2011-04-22}
   s.description = %q{Fedora Commons REST API ruby library : REQUIRES FCREPO 3.4+}
   s.email = %q{chris@cbeer.info}
   s.extra_rdoc_files = [

data/spec/digital_object_spec.rb

@@ -40,7 +40,7 @@ describe Rubydora::DigitalObject do
 
     it "should call ingest on save" do
       @object.should_receive(:datastreams).and_return({})
-      @mock_repository.should_receive(:ingest).with(hash_including(:pid => 'pid'))
+      @mock_repository.should_receive(:ingest).with(hash_including(:pid => 'pid')).and_return('pid')
       @object.save
     end
   end
@@ -48,10 +48,18 @@ describe Rubydora::DigitalObject do
   describe "create" do
     it "should call the Fedora REST API to create a new object" do
       @mock_repository = mock(Rubydora::Repository)
-      @mock_repository.should_receive(:ingest).with(instance_of(Hash)).and_return(nil)
+      @mock_repository.should_receive(:ingest).with(instance_of(Hash)).and_return("pid")
       obj = Rubydora::DigitalObject.create "pid", { :a => 1, :b => 2}, @mock_repository
       obj.should be_a_kind_of(Rubydora::DigitalObject)
     end
+
+    it "should return a new object with the Fedora response pid when no pid is provided" do
+      @mock_repository = mock(Rubydora::Repository)
+      @mock_repository.should_receive(:ingest).with(instance_of(Hash)).and_return("pid")
+      obj = Rubydora::DigitalObject.create "new", { :a => 1, :b => 2}, @mock_repository
+      obj.should be_a_kind_of(Rubydora::DigitalObject)
+      obj.pid.should == "pid"
+    end
   end
 
   describe "retreive" do
@@ -71,7 +79,7 @@ describe Rubydora::DigitalObject do
 
       it "should allow other datastreams to be added" do
         @mock_repository.should_receive(:datastreams).with(:pid => 'pid').and_return("<objectDatastreams><datastream dsid='a'></datastream>><datastream dsid='b'></datastream>><datastream dsid='c'></datastream></objectDatastreams>")
-        @mock_repository.should_receive(:datastream).with(:pid => 'pid', :dsid => 'z').and_raise("")
+        @mock_repository.should_receive(:datastream).with(:pid => 'pid', :dsid => 'z').and_raise(RestClient::ResourceNotFound)
 
         @object.datastreams.length.should == 3
 
@@ -81,6 +89,13 @@ describe Rubydora::DigitalObject do
 
         @object.datastreams.length.should == 4
       end
+
+      it "should let datastreams be accessed via hash notation" do
+        @mock_repository.should_receive(:datastreams).with(:pid => 'pid').and_return("<objectDatastreams><datastream dsid='a'></datastream>><datastream dsid='b'></datastream>><datastream dsid='c'></datastream></objectDatastreams>")
+
+        @object['a'].should be_a_kind_of(Rubydora::Datastream)
+        @object['a'].should == @object.datastreams['a']
+      end
       
     end
 
@@ -95,8 +110,10 @@ describe Rubydora::DigitalObject do
       @mock_repository = mock(Rubydora::Repository)
       @mock_repository.should_receive(:object).any_number_of_times.with({:pid => 'pid'}).and_return <<-XML
       <objectProfile>
+        <not>empty</not>
       </objectProfile>
       XML
+
       @object = Rubydora::DigitalObject.new 'pid', @mock_repository
     end
 
@@ -124,6 +141,14 @@ describe Rubydora::DigitalObject do
       @mock_repository.should_receive(:modify_object).with(hash_including(:pid => 'pid'))
       @object.save
     end
+
+    it "should reset the object state on save" do
+      @object.label = "asdf"
+      @object.should_receive(:datastreams).and_return({})
+      @mock_repository.should_receive(:modify_object).with(hash_including(:pid => 'pid'))
+      @object.profile.should_not be_nil
+      expect { @object.save }.to change { @object.instance_variable_get('@profile') }.to nil
+    end
   end
 
   describe "delete" do
@@ -138,7 +163,6 @@ describe Rubydora::DigitalObject do
     end
   end
 
-
   describe "models" do
     before(:each) do
       @mock_repository = mock(Rubydora::Repository)

data/spec/integration_test_spec.rb

@@ -15,7 +15,7 @@ describe "Integration testing against a live Fedora repository" do
   it "should create an object" do
     obj = @repository.find('test:1')
     obj.new?.should == true
-    obj = obj.save
+    obj.save
     obj.new?.should == false
   end
 
@@ -52,7 +52,7 @@ describe "Integration testing against a live Fedora repository" do
 
   it "should create a managed datastream" do
     obj = @repository.find('test:1')
-    obj = obj.save
+    obj.save
     ds = obj.datastreams["Test"]
 
     ds.content = open(__FILE__).read

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubydora
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Chris Beer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-21 00:00:00 -04:00
+date: 2011-04-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency