ruby-fedora 1.0.4 → 1.0.5

data/History.txt

@@ -1,3 +1,7 @@
+== 1.0.5 2009-17-10
+
+* Minor fixes to handling of object properties
+
 == 1.0.4 2009-07-10
 
 !! Not Backwards Compatible with Fedora < 3.2.* !!

data/lib/fedora/fedora_object.rb

@@ -25,33 +25,48 @@ class Fedora::FedoraObject < Fedora::BaseObject
   ####
   #  Attribute Accessors
   ####
-
-  # TODO: Create appropriate attribute accessors for these values.  
-  # Where applicable, make sure that attributes are written to and read from self.attributes
-  # [pid, label, create_date, modified_date, fedora_object_type, contentModel, state, ownerID, behavior_def, behavior_mech,]
-  # API-M Search Value Equivalents: [pid, label, cDate, mDate, fType, cModel, state, ownerId, bDef, bMech,]
-  # TODO: Mix In DC attribute finders/accessors
-  # TODO: Make sure that fedora_object_type and contentModel are juggled properly. 
-  def retrieve_attr_from_fedora
-    self.attributes.merge!(profile)
-    object_rexml = REXML::Document.new(object_xml)
-    self.attributes.merge!({
-         :state => object_rexml.root.elements["objectProperties/property[@NAME='info:fedora/fedora-system:def/model#state']"].attributes["value"],
-         :create_date => object_rexml.root.elements["objectProperties/property[@NAME='info:fedora/fedora-system:def/model#createdDate']"].attributes["value"],
-         :modified_date => object_rexml.root.elements["objectProperties/property[@NAME='info:fedora/fedora-system:def/model#lastModifiedDate']"].attributes["value"],
-         :label => object_rexml.root.elements["objectProperties/property[@NAME='info:fedora/fedora-system:def/model#label']"].attributes["value"]
-    })
   
+  
+  def load_attributes_from_fedora
+    #self.attributes.merge!(profile)
+    attributes.merge!(properties_from_fedora)
+  end
+  
+  # Reads all object properties from the object's FOXML into a hash.  Provides slightly more info than .profile, including the object state.
+  def properties_from_fedora
+    object_rexml = REXML::Document.new(object_xml)
+    properties = {
+         :pid => object_rexml.root.attributes["PID"],
+         :state => object_rexml.root.elements["//foxml:property[@NAME='info:fedora/fedora-system:def/model#state']"].attributes["VALUE"],
+         :create_date => object_rexml.root.elements["//foxml:property[@NAME='info:fedora/fedora-system:def/model#createdDate']"].attributes["VALUE"],
+         :modified_date => object_rexml.root.elements["//foxml:property[@NAME='info:fedora/fedora-system:def/view#lastModifiedDate']"].attributes["VALUE"],
+         :owner_id => object_rexml.root.elements['//foxml:property[@NAME="info:fedora/fedora-system:def/model#ownerId"]'].attributes['VALUE']
+    }
+    label_element = object_rexml.root.elements["//foxml:property[@NAME='info:fedora/fedora-system:def/model#label']"]
+    if label_element
+     properties.merge!({:label => label_element.attributes["VALUE"]})
+    end
+    return properties
   end
 
   def create_date
-    profile[:create_date]
-    #self.attributes[:cDate]
+    if attributes[:create_date] 
+      return attributes[:create_date]
+    elsif !new_object?
+        properties_from_fedora[:create_date]
+    else 
+      return nil
+    end
   end
 
   def modified_date
-    profile[:create_date]
-    #self.attributes[:mDate]
+    if attributes[:modified_date] 
+      return attributes[:modified_date]
+    elsif !new_object?
+        properties_from_fedora[:modified_date]
+    else 
+      return nil
+    end
   end
 
 
@@ -64,7 +79,13 @@ class Fedora::FedoraObject < Fedora::BaseObject
   end
 
   def state
-    self.attributes[:state]
+    if attributes[:state] 
+      return attributes[:state]
+    elsif !new_object?
+        properties_from_fedora[:state]
+    else 
+      return nil
+    end
   end
 
   def state=(new_state)
@@ -76,7 +97,13 @@ class Fedora::FedoraObject < Fedora::BaseObject
   end
 
   def label
-    self.attributes[:label]
+    if attributes[:label] 
+      return attributes[:label]
+    elsif !new_object?
+        properties_from_fedora[:label]
+    else 
+      return nil
+    end
   end
 
   def label=(new_label)
@@ -85,7 +112,13 @@ class Fedora::FedoraObject < Fedora::BaseObject
 
   #  Get the object and read its @ownerId from the profile
   def owner_id
-    self.attributes[:ownerID]
+    if attributes[:owner_id] 
+      return attributes[:owner_id]
+    elsif !new_object?
+        properties_from_fedora[:owner_id]
+    else 
+      return nil
+    end
   end
 
   def owner_id=(new_owner_id)

data/lib/ruby-fedora.rb

@@ -3,7 +3,7 @@ gem 'xml-simple'
 $LOAD_PATH.unshift File.dirname(__FILE__) unless
 $LOAD_PATH.include?(File.dirname(__FILE__)) || $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__)))
 module Fedora #:nodoc:
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end
 #extended to remove facets dep
 class Hash 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-fedora
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors: 
 - MediaShelf
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-10 00:00:00 -05:00
+date: 2009-07-20 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency