active-fedora 2.1.0 → 2.2.0

data/Rakefile

@@ -24,6 +24,7 @@ begin
     gem.add_dependency("activeresource")
     gem.add_dependency("mediashelf-loggable")
     gem.add_dependency("equivalent-xml")
+    gem.add_dependency("facets")
     
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-2.1.0
+2.2.0

data/active-fedora.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active-fedora}
-  s.version = "2.1.0"
+  s.version = "2.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Zumwalt", "McClain Looney"]
-  s.date = %q{2011-04-08}
+  s.date = %q{2011-05-02}
   s.description = %q{ActiveFedora provides for creating and managing objects in the Fedora Repository Architecture.}
   s.email = %q{matt.zumwalt@yourmediashelf.com}
   s.extra_rdoc_files = [
@@ -182,6 +182,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "active-fedora.gemspec",
     "config/fedora.yml",
+    "config/predicate_mappings.yml",
     "config/solr_mappings.yml",
     "config/solr_mappings_af_0.1.yml",
     "config/solr_mappings_bl_2.4.yml",
@@ -288,58 +289,6 @@ Gem::Specification.new do |s|
   s.rubyforge_project = %q{rubyfedora}
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{A convenience libary for manipulating MODS (Metadata Object Description Schema) documents.}
-  s.test_files = [
-    "spec/integration/base_file_management_spec.rb",
-    "spec/integration/base_find_by_fields_spec.rb",
-    "spec/integration/base_loader_spec.rb",
-    "spec/integration/base_spec.rb",
-    "spec/integration/bug_spec.rb",
-    "spec/integration/datastream_spec.rb",
-    "spec/integration/datastreams_crud_spec.rb",
-    "spec/integration/fedora_object_spec.rb",
-    "spec/integration/full_featured_model_spec.rb",
-    "spec/integration/metadata_datastream_helper_spec.rb",
-    "spec/integration/model_spec.rb",
-    "spec/integration/mods_article_integration_spec.rb",
-    "spec/integration/nokogiri_datastream_spec.rb",
-    "spec/integration/rels_ext_datastream_spec.rb",
-    "spec/integration/repository_spec.rb",
-    "spec/integration/rf_fedora_object_spec.rb",
-    "spec/integration/semantic_node_spec.rb",
-    "spec/integration/solr_service_spec.rb",
-    "spec/samples/models/audio_record.rb",
-    "spec/samples/models/image.rb",
-    "spec/samples/models/oral_history.rb",
-    "spec/samples/models/seminar.rb",
-    "spec/samples/models/seminar_audio_file.rb",
-    "spec/samples/oral_history_sample_model.rb",
-    "spec/spec_helper.rb",
-    "spec/unit/active_fedora_spec.rb",
-    "spec/unit/base_cma_spec.rb",
-    "spec/unit/base_datastream_management_spec.rb",
-    "spec/unit/base_extra_spec.rb",
-    "spec/unit/base_file_management_spec.rb",
-    "spec/unit/base_named_datastream_spec.rb",
-    "spec/unit/base_spec.rb",
-    "spec/unit/connection_spec.rb",
-    "spec/unit/content_model_spec.rb",
-    "spec/unit/datastream_concurrency_spec.rb",
-    "spec/unit/datastream_spec.rb",
-    "spec/unit/fedora_object_spec.rb",
-    "spec/unit/inheritance_spec.rb",
-    "spec/unit/metadata_datastream_spec.rb",
-    "spec/unit/model_spec.rb",
-    "spec/unit/nokogiri_datastream_spec.rb",
-    "spec/unit/property_spec.rb",
-    "spec/unit/qualified_dublin_core_datastream_spec.rb",
-    "spec/unit/relationship_spec.rb",
-    "spec/unit/rels_ext_datastream_spec.rb",
-    "spec/unit/repository_spec.rb",
-    "spec/unit/rf_datastream_spec.rb",
-    "spec/unit/semantic_node_spec.rb",
-    "spec/unit/solr_config_options_spec.rb",
-    "spec/unit/solr_service_spec.rb"
-  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
@@ -383,6 +332,26 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, ["< 2.0.0"])
       s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
       s.add_development_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["< 2.0.0"])
+      s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
+      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["< 2.0.0"])
+      s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
+      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["< 2.0.0"])
+      s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
+      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["< 2.0.0"])
+      s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
+      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["< 2.0.0"])
+      s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
+      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
       s.add_runtime_dependency(%q<solr-ruby>, [">= 0.0.6"])
       s.add_runtime_dependency(%q<xml-simple>, [">= 1.0.12"])
       s.add_runtime_dependency(%q<mime-types>, [">= 1.16"])
@@ -393,6 +362,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activeresource>, [">= 0"])
       s.add_runtime_dependency(%q<mediashelf-loggable>, [">= 0"])
       s.add_runtime_dependency(%q<equivalent-xml>, [">= 0"])
+      s.add_runtime_dependency(%q<facets>, [">= 0"])
     else
       s.add_dependency(%q<active-fedora>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
@@ -431,6 +401,26 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, ["< 2.0.0"])
       s.add_dependency(%q<mocha>, [">= 0.9.8"])
       s.add_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["< 2.0.0"])
+      s.add_dependency(%q<mocha>, [">= 0.9.8"])
+      s.add_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["< 2.0.0"])
+      s.add_dependency(%q<mocha>, [">= 0.9.8"])
+      s.add_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["< 2.0.0"])
+      s.add_dependency(%q<mocha>, [">= 0.9.8"])
+      s.add_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["< 2.0.0"])
+      s.add_dependency(%q<mocha>, [">= 0.9.8"])
+      s.add_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["< 2.0.0"])
+      s.add_dependency(%q<mocha>, [">= 0.9.8"])
+      s.add_dependency(%q<ruby-debug>, [">= 0"])
       s.add_dependency(%q<solr-ruby>, [">= 0.0.6"])
       s.add_dependency(%q<xml-simple>, [">= 1.0.12"])
       s.add_dependency(%q<mime-types>, [">= 1.16"])
@@ -441,6 +431,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<activeresource>, [">= 0"])
       s.add_dependency(%q<mediashelf-loggable>, [">= 0"])
       s.add_dependency(%q<equivalent-xml>, [">= 0"])
+      s.add_dependency(%q<facets>, [">= 0"])
     end
   else
     s.add_dependency(%q<active-fedora>, [">= 0"])
@@ -480,6 +471,26 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, ["< 2.0.0"])
     s.add_dependency(%q<mocha>, [">= 0.9.8"])
     s.add_dependency(%q<ruby-debug>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["< 2.0.0"])
+    s.add_dependency(%q<mocha>, [">= 0.9.8"])
+    s.add_dependency(%q<ruby-debug>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["< 2.0.0"])
+    s.add_dependency(%q<mocha>, [">= 0.9.8"])
+    s.add_dependency(%q<ruby-debug>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["< 2.0.0"])
+    s.add_dependency(%q<mocha>, [">= 0.9.8"])
+    s.add_dependency(%q<ruby-debug>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["< 2.0.0"])
+    s.add_dependency(%q<mocha>, [">= 0.9.8"])
+    s.add_dependency(%q<ruby-debug>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["< 2.0.0"])
+    s.add_dependency(%q<mocha>, [">= 0.9.8"])
+    s.add_dependency(%q<ruby-debug>, [">= 0"])
     s.add_dependency(%q<solr-ruby>, [">= 0.0.6"])
     s.add_dependency(%q<xml-simple>, [">= 1.0.12"])
     s.add_dependency(%q<mime-types>, [">= 1.16"])
@@ -490,6 +501,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activeresource>, [">= 0"])
     s.add_dependency(%q<mediashelf-loggable>, [">= 0"])
     s.add_dependency(%q<equivalent-xml>, [">= 0"])
+    s.add_dependency(%q<facets>, [">= 0"])
   end
 end
 

data/config/predicate_mappings.yml

@@ -0,0 +1,47 @@
+# The default namespace maps to the default namespace for generating rels_ext from solr
+:default_namespace: info:fedora/fedora-system:def/relations-external#
+
+# namespace mappings--- 
+# you can add specific mappings for your institution by providing the following:
+#   namespace_uri:
+#     :relationship_symbol: relationship_identifier
+# 
+# For example, if you have the following element in your rels_ext:
+#  
+#  <oai:itemID>oai:example.edu:changeme:500</oai:itemID>
+# 
+# With the last two lines of this file uncommented, the relationships hash of your object will include:
+#   :oai_item_id => ["info:fedora/oai:example.edu:changeme:500"]
+#
+# With the last two lines of this file commented out, the relationships hash of your object will include:
+#   "oai_itemID" => ["info:fedora/oai:example.edu:changeme:500"]
+#   
+:predicate_mapping:
+  info:fedora/fedora-system:def/relations-external#: 
+    :is_derivation_of: isDerivationOf
+    :is_metadata_for: isMetadataFor
+    :is_member_of_collection: isMemberOfCollection
+    :has_derivation: hasDerivation
+    :is_annotation_of: isAnnotationOf
+    :is_constituent_of: isConstituentOf
+    :is_dependent_of: isDependentOf
+    :has_collection_member: hasCollectionMember
+    :has_annotation: hasAnnotation
+    :has_constituent: hasConstituent
+    :has_dependent: hasDependent
+    :is_part_of: isPartOf
+    :has_equivalent: hasEquivalent
+    :is_subset_of: isSubsetOf
+    :is_description_of: isDescriptionOf
+    :is_member_of: isMemberOf
+    :has_model: hasModel
+    :conforms_to: conformsTo
+    :has_metadata: hasMetadata
+    :has_subset: hasSubset
+    :has_description: hasDescription
+    :has_part: hasPart
+    :has_member: hasMember
+  info:fedora/fedora-system:def/model#:
+    :has_model: hasModel
+#  http://www.openarchives.org/OAI/2.0/: 
+#    :oai_item_id: itemID

data/lib/active_fedora.rb

@@ -28,13 +28,17 @@ ENABLE_SOLR_UPDATES = true unless defined?(ENABLE_SOLR_UPDATES)
 module ActiveFedora #:nodoc:
   
   class << self
-    attr_accessor :solr_config, :fedora_config
+    attr_accessor :solr_config, :fedora_config, :predicate_config_path
   end
   
   # The configuration hash that gets used by RSolr.connect
   @solr_config ||= {}
   @fedora_config ||= {}
-  
+
+  # Initializes ActiveFedora's connection to Fedora and Solr based on the info in fedora.yml
+  # If RAILS_ENV is set, it will use that environment.  Defaults to "development".
+  # @param [String] config_path (optional) the path to fedora.yml
+  #   If config_path is not provided and RAILS_ROOT is set, it will look in RAILS_ENV/config/fedora.yml.  Otherwise, it will look in your config/fedora.yml.  Failing that, it will use localhost urls.
   def self.init( config_path=nil )
     
     config_env = defined?(RAILS_ENV) ? RAILS_ENV : "development"
@@ -43,10 +47,14 @@ module ActiveFedora #:nodoc:
       if defined?(RAILS_ROOT)
         config_path = "#{RAILS_ROOT}/config/fedora.yml"
       else
-        config_path = File.join(File.dirname(__FILE__), "..", "config", "fedora.yml")
-        logger.info "Using the default fedora.yml that comes with active-fedora.  If you want to override this, pass the path to fedora.yml as an argument to ActiveFedora.init or set RAILS_ROOT and put fedora.yml into \#{RAILS_ROOT}/config."
+        config_path = File.join("config","fedora.yml")
+        unless File.exist?(config_path)
+          config_path = File.join(File.dirname(__FILE__), "..", "config", "fedora.yml")
+          logger.info "Using the default fedora.yml that comes with active-fedora.  If you want to override this, pass the path to fedora.yml as an argument to ActiveFedora.init or set RAILS_ROOT and put fedora.yml into \#{RAILS_ROOT}/config."
+        end
       end
     end
+
     
     logger.info("FEDORA: loading ActiveFedora config from #{File.expand_path(config_path)}")
     
@@ -67,6 +75,18 @@ module ActiveFedora #:nodoc:
     Fedora::Repository.register(ActiveFedora.fedora_config[:url])
     logger.info("FEDORA: initialized Fedora as: #{Fedora::Repository.instance.inspect}")    
     
+    # Retrieve the valid path for the predicate mappings config file
+    pred_config_paths = [File.dirname(config_path),File.join(File.dirname(__FILE__),"..","config")]
+    pred_config_paths.each do |path|
+      testfile = File.join(path,"predicate_mappings.yml")
+      if File.exist?(testfile)
+        @predicate_config_path = testfile
+        break
+      end
+    end
+    raise "Could not find predicate_mappings.yml in these locations: #{pred_config_paths.join("; ")}." unless @predicate_config_path
+
+
   end
   
   def self.solr
@@ -80,6 +100,10 @@ module ActiveFedora #:nodoc:
   def self.logger      
     @logger ||= defined?(RAILS_DEFAULT_LOGGER) ? RAILS_DEFAULT_LOGGER : Logger.new(STDOUT)
   end
+
+  def self.predicate_config
+    @predicate_config_path
+  end
 end
 
 

data/lib/active_fedora/base.rb

@@ -225,6 +225,12 @@ module ActiveFedora
       keys = datastreams.keys
       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
+        new_dsid = prefix.to_s + next_index.to_s
+      end
+      new_dsid
+
       # while keys.include?(new_dsid)
       #         next_index += 1
       #         new_dsid = prefix.to_s + rand(range).to_s

data/lib/active_fedora/content_model.rb

@@ -1,3 +1,4 @@
+require 'facets/string/titlecase'
 module ActiveFedora
   class ContentModel < Base
     CMODEL_NAMESPACE = "afmodel"

data/lib/active_fedora/rels_ext_datastream.rb

@@ -34,7 +34,11 @@ module ActiveFedora
     def self.from_xml(tmpl, node) 
       # node.xpath("./foxml:datastreamVersion[last()]/foxml:xmlContent/rdf:RDF/rdf:Description/*").each do |f|
       node.xpath("./foxml:datastreamVersion[last()]/foxml:xmlContent/rdf:RDF/rdf:Description/*", {"rdf"=>"http://www.w3.org/1999/02/22-rdf-syntax-ns#", "foxml"=>"info:fedora/fedora-system:def/foxml#"}).each do |f|
-          r = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>ActiveFedora::SemanticNode::PREDICATE_MAPPINGS.invert[f.name], :object=>f["resource"])
+          ns_mapping = self.predicate_mappings[f.namespace.href]
+          predicate = ns_mapping ?  ns_mapping.invert[f.name] : nil
+          predicate = "#{f.namespace.prefix}_#{f.name}" if predicate.nil?
+          object = f["resource"] ? f["resource"] : f.inner_text
+          r = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>predicate, :object=>object)
           tmpl.add_relationship(r)
       end
       tmpl.send(:dirty=, false)
@@ -65,7 +69,7 @@ module ActiveFedora
     #  Solr must be synchronized with RELS-EXT data in Fedora.
     def from_solr(solr_doc)
       #cycle through all possible predicates
-      PREDICATE_MAPPINGS.keys.each do |predicate|
+      self.class.predicate_mappings[self.class.default_predicate_namespace].keys.each do |predicate|
         predicate_symbol = ActiveFedora::SolrService.solr_name(predicate, :symbol)
         value = (solr_doc[predicate_symbol].nil? ? solr_doc[predicate_symbol.to_s]: solr_doc[predicate_symbol]) 
         unless value.nil? 

data/lib/active_fedora/semantic_node.rb

@@ -5,34 +5,11 @@ module ActiveFedora
     
     attr_accessor :internal_uri, :named_relationship_desc, :relationships_are_dirty, :load_from_solr
     
-    PREDICATE_MAPPINGS = Hash[:is_member_of => "isMemberOf",
-                          :has_member => "hasMember",
-                          :is_part_of => "isPartOf",
-                          :has_part => "hasPart",
-                          :is_member_of_collection => "isMemberOfCollection",
-                          :has_collection_member => "hasCollectionMember",
-                          :is_constituent_of => "isConstituentOf",
-                          :has_constituent => "hasConstituent",
-                          :is_subset_of => "isSubsetOf",
-                          :has_subset => "hasSubset",
-                          :is_derivation_of => "isDerivationOf",
-                          :has_derivation => "hasDerivation",
-                          :is_dependent_of => "isDependentOf",
-                          :has_dependent => "hasDependent",
-                          :is_description_of => "isDescriptionOf",
-                          :has_description => "hasDescription",
-                          :is_metadata_for => "isMetadataFor",
-                          :has_metadata => "hasMetadata",
-                          :is_annotation_of => "isAnnotationOf",
-                          :has_annotation => "hasAnnotation",
-                          :has_equivalent => "hasEquivalent",
-                          :conforms_to => "conformsTo",
-                          :has_model => "hasModel"]
-    PREDICATE_MAPPINGS.freeze
-    
+
     def self.included(klass)
       klass.extend(ClassMethods)
     end
+
     def assert_kind_of(n, o,t)
       raise "Assertion failure: #{n}: #{o} is not of type #{t}" unless o.kind_of?(t)
     end
@@ -473,7 +450,7 @@ module ActiveFedora
       # this object's RELS-EXT datastream
       #
       # Word of caution - The same predicate may not be used twice for two inbound or two outbound relationships.  However, it may be used twice if one is inbound
-      # and one is outbound as shown in the example above.  A full list of possible predicates are defined by PREDICATE_MAPPINGS
+      # and one is outbound as shown in the example above.  A full list of possible predicates are defined by predicate_mappings
       #
       # For the oral_history relationship in the example above the following helper methods are created:
       #  oral_history: returns array of OralHistory objects that have this AudioRecord with predicate :has_part 
@@ -759,19 +736,32 @@ module ActiveFedora
         xml.to_s
       end
     
-      # If predicate is a symbol, looks up the predicate in the PREDICATE_MAPPINGS
+      # If predicate is a symbol, looks up the predicate in the predicate_mappings
       # If predicate is not a Symbol, returns the predicate untouched
-      # @throws UnregisteredPredicateError if the predicate is a symbol but is not found in the PREDICATE_MAPPINGS
-      def predicate_lookup(predicate)
+      # @throws UnregisteredPredicateError if the predicate is a symbol but is not found in the predicate_mappings
+      def predicate_lookup(predicate,namespace="info:fedora/fedora-system:def/relations-external#")
         if predicate.class == Symbol 
-          if PREDICATE_MAPPINGS.has_key?(predicate)
-            return PREDICATE_MAPPINGS[predicate]
+          if predicate_mappings[namespace].has_key?(predicate)
+            return predicate_mappings[namespace][predicate]
           else
             throw UnregisteredPredicateError
           end
         end
         return predicate
       end
+
+      def predicate_config
+        @@predicate_config ||= YAML::load(File.open(ActiveFedora.predicate_config)) if File.exist?(ActiveFedora.predicate_config)
+      end
+
+      def predicate_mappings
+        predicate_config[:predicate_mapping]
+      end
+
+      def default_predicate_namespace
+        predicate_config[:default_namespace]
+      end
+      
     end
   end
 end

data/spec/integration/rels_ext_datastream_spec.rb

@@ -82,7 +82,8 @@ describe ActiveFedora::RelsExtDatastream do
   end
   
   it "should load relationships from fedora into parent object" do
-    ActiveFedora::SemanticNode::PREDICATE_MAPPINGS.each_key do |p| 
+    class SpecNode; include ActiveFedora::SemanticNode; end
+    SpecNode.predicate_mappings[SpecNode.default_predicate_namespace].each_key do |p| 
       @test_object.add_relationship(p, "demo:#{rand(100)}")
     end
     @test_object.save
@@ -90,7 +91,7 @@ describe ActiveFedora::RelsExtDatastream do
     @test_object.relationships[:self].should have_key(:is_member_of)
     ActiveFedora::Base.load_instance(@test_object.pid).relationships.should == @test_object.relationships
   end
-  
+
   describe '#from_solr' do
     
     it "should respond_to from_solr" do