active-fedora 1.0.4 → 1.0.5

data/History.txt

@@ -0,0 +1,26 @@
+1.0.5 2009-07-17
+
+Minor update.
+
+* Bug #387: Base.deserialize should mark all datastreams as not new
+* ToDo #389: Base.update_attributes and Base.update_indexed_attributes should accept :datastream limiter
+* Feature #388: Base.update_attributes and Base.update_indexed_attributes should support deleting fields
+
+1.0.4 2009-07-10
+
+!! Not Backwards Compatible with Fedora < 3.2.* !!
+
+* 1 major enhancement:
+  * ruby-fedora is now compatible with Fedora 3.2.1
+  
+Changelog:
+* ToDo #272: Datastream.new should accept a :prefix option for auto-incrementing DSIDs
+* ToDo #275: Update RubyFedora to work with Fedora 3.2 REST API
+* ToDo #308: ActiveFedora::FedoraObject.datatsreams should load label as well as pid and dsId
+* ToDo #318: Intelligent FileDatastream and FileAsset Management
+* Bug #312: Base.delete should delete the solr record as well as the Fedora Object
+* Feature #46: Improve OSX Fedora/Solr Disk Image
+* Feature #284: solr document id should by a config option instead of hard coded as "id"
+* Feature #307: ActiveFedora::Base should provide a label setter.
+* Feature #314: Relationship finder should provide a "response_format" option, default to format of "objects"
+* Feature #327: Option to turn off solr updates (assume that something else will update Solr for you)

data/README.rdoc

@@ -4,7 +4,7 @@
 * Further documentation is available at <http://projects.mediashelf.us/show/active-fedora>
 * Community Discussions & Mailing List are located at <http://groups.google.com/group/active-fedora>
 
-= afed-regem
+= active-fedora gem
 
 * FIX (url)
 
@@ -26,7 +26,7 @@ FIX (describe your package)
 
 == INSTALL:
 
-* FIX (sudo gem install, anything else)
+sudo gem install active-fedora
 
 == LICENSE:
 

data/lib/active_fedora.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 gem 'ruby-fedora'
 gem 'solr-ruby'
 module ActiveFedora #:nodoc:
-  VERSION='1.0.4'
+  VERSION='1.0.5'
 end
 
 SOLR_DOCUMENT_ID = "id" unless defined?(SOLR_DOCUMENT_ID)
@@ -22,3 +22,16 @@ require 'active_fedora/rels_ext_datastream.rb'
 require 'active_fedora/semantic_node.rb'
 require 'active_fedora/solr_service.rb'
 
+
+if ![].respond_to?(:count)
+  class Array
+    puts "active_fedora is Adding count method to Array"
+      def count(&action)
+        count = 0
+         self.each { |v| count = count + 1}
+  #      self.each { |v| count = count + 1 if action.call(v) }
+        return count
+      end
+  end
+end
+

data/lib/active_fedora/base.rb

@@ -40,7 +40,12 @@ module ActiveFedora
     def new_object?
       @new_object
     end
-
+    
+    def new_object=(bool)
+      @new_object = bool
+      inner_object.new_object = bool
+    end
+    
     # Constructor. If +attrs+  does  not comtain +:pid+, we assume we're making a new one,
     # and call off to the Fedora Rest API for the next available Fedora pid, and mark as new object.
     # 
@@ -51,7 +56,7 @@ module ActiveFedora
         attrs = attrs.merge!({:pid=>Fedora::Repository.instance.nextid})  
         @new_object=true
       else
-        @new_object=false;
+        @new_object=false
       end
       @inner_object = Fedora::FedoraObject.new(attrs)
       @datastreams = {}
@@ -186,7 +191,7 @@ module ActiveFedora
     # Example: if there are already datastreams with IDs DS1 and DS2, this method will return DS3.  If you specify FOO as the prefix, it will return FOO1.
     def generate_dsid(prefix="DS")
       keys = datastreams.keys
-      next_index = keys.select {|v| v =~ /(#{prefix}\d*$)/}.count + 1
+      next_index = keys.select {|v| v =~ /(#{prefix}\d*$)/}.length + 1
       new_dsid = prefix.to_s + next_index.to_s
       # while keys.include?(new_dsid)
       #         next_index += 1
@@ -289,6 +294,10 @@ module ActiveFedora
     def owner_id
       @inner_object.owner_id
     end
+    
+    def owner_id=(owner_id)
+      @inner_object.owner_id=(owner_id)
+    end
 
     #return the create_date of the inner object (unless it's a new object)
     def create_date
@@ -317,8 +326,10 @@ module ActiveFedora
 
     def self.deserialize(doc) #:nodoc:
       pid = doc.elements['/foxml:digitalObject'].attributes['PID']
+      
       proto = self.new(:pid=>pid)
       proto.datastreams.each do |name,ds|
+        ds.new_object = false
         doc.elements.each("//foxml:datastream[@ID='#{name}']") do |el|
           proto.datastreams[name]=ds.class.from_xml(ds, el)
         end
@@ -369,12 +380,33 @@ module ActiveFedora
 
     # An ActiveRecord-ism to udpate metadata values.
     #
-    # Passing a hash into this method will attempt to set the values into the 
-    # appropriate fields (for all datastreams, which means a.name and b.name 
-    # fields are _both_ overwritten)
-    def update_attributes(params={})
+    # Example Usage:
+    #
+    # m.update_attributes(:fubar=>'baz')
+    #
+    # This will attempt to set the values for any fields named fubar in any of 
+    # the object's datastreams. This means DS1.fubar_values and DS2.fubar_values 
+    # are _both_ overwritten.  
+    #
+    # If you want to specify which datastream(s) to update,
+    # use the :datastreams argument like so:
+    #  m.update_attributes({:fubar=>'baz'}, :datastreams=>"my_ds")
+    # or
+    #  m.update_attributes({:fubar=>'baz'}, :datastreams=>["my_ds", "my_other_ds"])
+    def update_attributes(params={}, opts={})
       params.each do |k,v|
-        datastreams.values.each do |d|
+        if v == :delete || v == "" || v == nil
+          v = []
+        end
+        if opts[:datastreams]
+          ds_array = []
+          opts[:datastreams].each do |dsname|
+            ds_array << datastreams[dsname]
+          end
+        else
+          ds_array = datastreams.values
+        end
+        ds_array.each do |d|
           if d.fields[k.to_sym]
             d.send("#{k}_values=", v)
           end
@@ -391,11 +423,25 @@ module ActiveFedora
     # An index of -1 will insert a new value. any existing value at the relevant index 
     # will be overwritten.
     #
-    # As in update_attributes, this overwrites _all_ available fields.
+    # As in update_attributes, this overwrites _all_ available fields by default.
     #
-    def update_indexed_attributes(params={})
+    # If you want to specify which datastream(s) to update,
+    # use the :datastreams argument like so:
+    #  m.update_attributes({"fubar"=>{"-1"=>"mork", "0"=>"york", "1"=>"mangle"}}, :datastreams=>"my_ds")
+    # or
+    #  m.update_attributes({"fubar"=>{"-1"=>"mork", "0"=>"york", "1"=>"mangle"}}, :datastreams=>["my_ds", "my_other_ds"])
+    #
+    def update_indexed_attributes(params={}, opts={})
+      if opts[:datastreams]
+        ds_array = []
+        opts[:datastreams].each do |dsname|
+          ds_array << datastreams[dsname]
+        end
+      else
+        ds_array = datastreams.values
+      end
       params.each do |key,value|
-        datastreams.each do |dsn, dstream|
+        ds_array.each do |dstream|
           if dstream.fields[key.to_sym]
             aname="#{key}_values"
             curval = dstream.send("#{aname}")
@@ -409,6 +455,7 @@ module ActiveFedora
               end
             end 
             cpv.each { |y,z| curval<<z}#just append everything left
+            curval.delete_if {|x| x == :delete || x == "" || x == nil}
             dstream.send("#{aname}=", curval) #write it back to the ds
           end
         end

data/lib/active_fedora/metadata_datastream.rb

@@ -81,6 +81,10 @@ module ActiveFedora
     #At some point, these modifiers will be ported up to work for any +ActiveFedora::MetadataDatastream+.
     #
     #There is quite a good example of this class in use in spec/examples/oral_history.rb
+    #
+    #!! Careful: If you declare two fields that correspond to the same xml node without any qualifiers to differentiate them, 
+    #you will end up replicating the values in the underlying datastream, resulting in mysterious dubling, quadrupling, etc. 
+    #whenever you edit the field's values.
     def field(name, tupe, opts={})
       @fields[name.to_s.to_sym]={:type=>tupe, :values=>[]}.merge(opts)
       eval <<-EOS

data/lib/active_fedora/solr_service.rb

@@ -35,7 +35,7 @@ module ActiveFedora
       query = ""
       pid_array.each_index do |i|
         query << "#{SOLR_DOCUMENT_ID}:#{escape_uri_for_query(pid_array[i])}"
-        query << " OR " if i != pid_array.count-1
+        query << " OR " if i != pid_array.length-1
       end
       query = "id:NEVER_USE_THIS_ID" if query.empty? || query == "id:"
       return query

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors: 
 - MediaShelf Inc.
@@ -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 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.3
+        version: 1.0.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: solr-ruby