active-fedora 3.1.0.rc1 → 3.1.0.rc2

data/config/predicate_mappings.yml

@@ -41,5 +41,5 @@
     :is_topic_of: isTopicOf
   info:fedora/fedora-system:def/model#:
     :has_model: hasModel
-#  http://www.openarchives.org/OAI/2.0/: 
-#    :oai_item_id: itemID
+  http://www.openarchives.org/OAI/2.0/: 
+    :oai_item_id: itemID

data/lib/active_fedora/base.rb

@@ -577,7 +577,7 @@ module ActiveFedora
           ##TODO, this is all done by rubydora -- remove
           ds.mimeType = blob.respond_to?(:content_type) ? blob.content_type : "application/octet-stream"
         end
-        if !ds.dsLabel.present?
+        if !ds.dsLabel.present? && blob.respond_to?(:path)
           ds.dsLabel = File.basename(blob.path)
 #          ds.dsLabel = blob.original_filename
         end

data/lib/active_fedora/nokogiri_datastream.rb

@@ -16,7 +16,6 @@ module ActiveFedora
     alias_method(:om_update_values, :update_values) unless method_defined?(:om_update_values)
     
     attr_accessor :internal_solr_doc
-    attr_reader :ng_xml
     
     # Create an instance of this class based on xml content
     # @param [String, File, Nokogiri::XML::Node] xml the xml content to build from
@@ -39,8 +38,14 @@ module ActiveFedora
     def self.xml_template
       Nokogiri::XML::Document.parse("<xml/>")
     end
+
+    def ng_xml 
+      ensure_xml_loaded
+      return @ng_xml
+    end
     
     def ng_xml=(new_xml)
+      self.xml_loaded=true
       case new_xml 
       when Nokogiri::XML::Document, Nokogiri::XML::Element, Nokogiri::XML::Node
         @ng_xml = new_xml

data/lib/active_fedora/rels_ext_datastream.rb

@@ -61,7 +61,7 @@ module ActiveFedora
     end
 
     def self.short_predicate(predicate)
-      if match = /^([^#]+#)(.+)$/.match(predicate.to_str)
+      if match = /^(#{ActiveFedora::Base.predicate_mappings.keys.join('|')})(.+)$/.match(predicate.to_str)
         namespace = match[1]
         predicate = match[2]
         pred = ActiveFedora::Base.predicate_mappings[namespace].invert[predicate]

data/lib/active_fedora/semantic_node.rb

@@ -253,8 +253,10 @@ module ActiveFedora
     
     module ClassMethods
       def vocabularies
-        @vocabularies ||= {"info:fedora/fedora-system:def/relations-external#" =>  RDF::Vocabulary.new("info:fedora/fedora-system:def/relations-external#"),
-        "info:fedora/fedora-system:def/model#" =>  RDF::Vocabulary.new("info:fedora/fedora-system:def/model#")}
+        return @vocabularies if @vocabularies
+        @vocabularies = {}
+        predicate_mappings.keys.each { |ns| @vocabularies[ns] = RDF::Vocabulary.new(ns)}
+        @vocabularies
       end
 
       # Allows for a relationship to be treated like any other attribute of a model class. You define

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "3.1.0.rc1"
+    VERSION = "3.1.0.rc2"
 end

data/spec/unit/base_named_datastream_spec.rb

@@ -240,6 +240,12 @@ describe ActiveFedora::Base do
       ds.dsLabel.should == "minivan.jpg"
       ds.mimeType.should == "image/jpeg"
     end
+    it 'should create a datastream object from a string' do
+      ds = @test_object.create_datastream("ActiveFedora::Datastream", 'NAME', {:blob=>"My file data"})
+      ds.class.should == ActiveFedora::Datastream
+      ds.dsLabel.should == ""
+      ds.mimeType.should == "application/octet-stream"
+    end
   end
   
   it 'should provide #is_named_datastream?' do

data/spec/unit/rels_ext_datastream_spec.rb

@@ -1,6 +1,11 @@
 require File.join( File.dirname(__FILE__), "../spec_helper" )
 
 describe ActiveFedora::RelsExtDatastream do
+  describe "short_predicate" do
+    it 'should parse' do
+      ActiveFedora::RelsExtDatastream.short_predicate('http://www.openarchives.org/OAI/2.0/itemID').should == :oai_item_id
+    end
+  end
   
   before(:all) do
     @pid = "test:sample_pid"
@@ -21,6 +26,7 @@ describe ActiveFedora::RelsExtDatastream do
     @test_ds.should respond_to(:save)
   end
   
+  
   describe '#serialize!' do
     
     it "should generate new rdf/xml as the datastream content if the object has been changed" do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 15424103
+  hash: 15424097
   prerelease: 6
   segments: 
   - 3
   - 1
   - 0
   - rc
-  - 1
-  version: 3.1.0.rc1
+  - 2
+  version: 3.1.0.rc2
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-27 00:00:00 -05:00
+date: 2011-10-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency