active-fedora 3.1.1 → 3.1.2

data/CONSOLE_GETTING_STARTED.textile

@@ -141,7 +141,15 @@ Use the relationships method to list the object's relationships:
 
 <pre>
 newthing.relationships
-=> {:self=>{}}
+=> #<RDF::Graph:0x83a53088(<>)> 
+
+newthing.relationships.statements.map(&:inspect)
+=> ["#<RDF::Statement:0x8371a858(<info:fedora/changeme:30> <info:fedora/fedora-system:def/model#hasModel> <info:fedora/hydra-cModel:DisplaySet> .)>",
+    "#<RDF::Statement:0x8371a6f0(<info:fedora/changeme:30> <info:fedora/fedora-system:def/model#hasModel> <info:fedora/hydra-cModel:CommonMetadata> .)>",
+    "#<RDF::Statement:0x8371a3e4(<info:fedora/changeme:30> <info:fedora/fedora-system:def/relations-external#isMemberOf> <info:fedora/changeme:parentSet> .)>"]
+
+newthing.relationships(:is_member_of)
+ => ["info:fedora/changeme:parentSet"] 
 </pre>
 
 The SpecialThing class definition contains these lines:
@@ -174,8 +182,17 @@ Now we'll create another Fedora object (using the default ActiveFedora object mo
 newobj = ActiveFedora::Base.new
 newobj.add_relationship(:has_derivation, newthing)
 => true
+
 newobj.relationships
-=> {:self=>{:has_derivation=>["info:fedora/changeme:30"]}}
+=> #<RDF::Graph:0x83a53088(<>)> 
+
+newobj.relationships.statements.map(&:inspect)
+=> ["#<RDF::Statement:0x8371a3e4(<info:fedora/changeme:30> <info:fedora/fedora-system:def/relations-external#hasDerivation> <info:fedora/changeme:30> .)>"]
+
+newobj.relationships(:has_derivation)
+ => ["info:fedora/changeme:30"] 
+
+
 newobj.save
 => ...
 newobj.pid
@@ -256,10 +273,6 @@ newthing.pid
 copy_as_base = ActiveFedora::Base.load_instance("changeme:30")
 copy_as_base.pid
 => "changeme:30"
-newthing.relationships
-=> {:self=>{:has_model=>["info:fedora/afmodel:SpecialThing"]}} 
-copy_as_base.relationships
-=> {:self=>{:has_model=>["info:fedora/afmodel:SpecialThing"]}} 
 newthing.datastreams.keys
 => ["DS1", "descMetadata", "Foo1", "minivan", "RELS-EXT", "rightsMetadata", "DC", "extraMetadataForFun"] 
 copy_as_base.datastreams.keys

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active-fedora (3.1.1)
+    active-fedora (3.1.2)
       activeresource (~> 3.0.0)
       activesupport (~> 3.0.0)
       equivalent-xml

data/History.txt

@@ -1,3 +1,20 @@
+3.1.2
+correctly handling non-default pid_namespace (Benjamin Armintor)
+info uri support; rdf:type predicate compatibility with Fedora(Benjamin Armintor)
+more flexibility for initializing Rubydora (Michael B. Klein)
+NokogiriDatastream and RELS-EXT datastream set mimeType (Justin Coyne)
+
+
+3.1.1
+adds support for better handling of literal values in the RELS-EXT datastream.
+adds support for setting the controlGroup via a parameter to has_metadata.
+ability to pass a predicate as a parameter to AF::Base#relationships to get a list of the matching targets. This reads a bit better than ids_for_outbound().
+refactoring to support overriding certain sections (ContentModel) by consumers of active-fedora.
+
+3.1.0
+Based on rubydora for fedora interface
+RDF-xml for the relationships
+
 3.0.4
 
 HYDRA-663 -- Passing an empty string to a id setter should clear the belongs to association

data/NOKOGIRI_DATASTREAMS.textile

@@ -106,4 +106,188 @@ After calling add_datastream, then everything will be ready to save to Fedora.
 
 <pre>
 st.datastreams["descMetadata"].save
-</pre>
+</pre>
+
+h2. (Rails3) Using ActiveModel methods and delegate to treat xml nodes like regular ActiveModel attributes
+
+h3. Handling most xml fields with delegate method
+
+Say you want to treat a mods title like a regular ActiveModel attribute so that you can use all of the Rails helpers and methods like form_for.
+
+The Datastream definition:
+
+<pre>
+  # app/models/mods_generic_content.rb
+  class ModsGenericContent < ObjectMods
+
+    set_terminology do |t|
+      t.root(:path=>"mods", :xmlns=>"http://www.loc.gov/mods/v3", :schema=>"http://www.loc.gov/standards/mods/v3/mods-3-2.xsd")
+
+      t.title_info(:path=>"titleInfo") {
+        t.main_title(:path=>"title", :label=>"title", :index_as=>[:facetable])
+      }
+      
+      # Proxy Terms (delegate can only reference root terms, so you have to create a root term "title" that proxies to the correct spot in the Terminology)
+      t.title(:proxy=>[:title_info, :main_title]) 
+    end
+  end
+</pre>
+
+The Model: 
+
+
+<pre>
+  # app/models/generic_content.rb
+  class GenericContent < ActiveFedora::Base
+
+    include Hydra::ModelMethods
+    has_metadata :name => "descMetadata", :label=>"MODS metadata", :type => ModsGenericContent
+    
+    delegate :title, :to=>:descMetadata
+  end
+</pre>
+
+Example form:
+
+
+<pre>
+  # app/views/generic_contents.html.erb
+  <%= form_for @generic_content do |f| %>
+    <dl>
+      <dt class="title">
+        <%= f.label "Title:" %>
+      </dt>
+      <dd class="title">
+        <%= f.text_field :title %>
+      </dd>
+    </dl>
+    <%= f.submit "Save Changes" %>
+  <% end %>
+</pre>
+
+The Controller that processes updates:
+
+<pre>
+  # app/controllers/generic_contents_controller.rb
+  class GenericContentsController < ApplicationController 
+  
+    # This renders the edit form
+    def edit
+      @generic_content = GenericContent.find(params[:id])
+    end
+
+    # This updates the object based on the info submitted by your form, which puts the Hash of new values into params["generic_content"]
+    def update
+      @generic_content = GenericContent.find(params[:id])
+      @generic_content.update_attributes(params[:generic_content])
+      if @generic_content.save
+        flash[:notice] = "Saved changes to #{@generic_content.title}"
+      else
+        flash[:error] = "Failed to save your changes!"
+      end
+      redirect_to edit_generic_content_path(@generic_content)
+    end
+  end
+</pre>
+
+h3. Handling complex xml structures in attributes= method
+
+This approach complements the usage of the delegate method to handle most xml nodes in your datasreams.
+
+With this approach, you can still create relatively normal Rails forms while updating complex xml structures (ie. MODS name entries) internally without creating a separate controller & model for those structures.
+
+Example: You want to create/edit xml like this in a descMetadata datastream that uses the GenericContentXml datatstream definition.
+
+<pre>
+  <subject>
+    <topic>Subject 1</topic>
+    <catgegory>topic</category>
+  </subject>
+  <subject>
+    <topic>Subject 2</topic>
+    <catgegory>geographic</category>
+  </subject>
+</pre>
+
+You have a form that submits parameters like this:
+
+<pre>
+  {
+    "generic_content" => {
+      "subjects" =>[
+        {
+            "topic" => "Subject 1",
+            "category" => "topic"
+          },{
+            "topic" => "Subject 2",
+            "category" => "geographic"      
+        }
+        ]
+  }}
+</pre>
+
+Here's the test:
+
+<pre>
+  # spec/models/generic_content_spec.rb
+  describe "attributes=" do
+    before do
+      @node = GenericContent.new
+      @sample_post_params = {
+        "generic_content" => {
+          "subjects" =>[
+            {
+                "topic" => "Subject 1",
+                "category" => "topic"
+              },{
+                "topic" => "Subject 2",
+                "category" => "geographic"      
+            }
+            ]
+      }}
+
+    end
+    it "with subjects" do
+      @node.attributes = @sample_post_params["generic_content"]
+      @node.descMetadata.subject.length.should == 2
+      @node.descMetadata.subject(0).topic.should == ["Subject 1"]
+      @node.descMetadata.subject(0).category.should == ["topic"]
+      @node.descMetadata.subject(1).topic.should == ["Subject 2"]
+      @node.descMetadata.subject(1).category.should == ["geographic"]
+    end
+  end
+</pre>
+
+In the OM terminology of the Datasream definition:
+
+<pre>
+  # app/models/generic_content_xml.rb
+  ...
+  t.subject(:path=>"subject", :attributes=>{:authority=>"UoH"}) {
+   t.topic(:index_as=>[:facetable])
+   t.category
+  }
+  ...
+</pre>
+
+The Model:
+
+<pre>
+  # app/models/generic_content.rb
+  class GenericContent < ActiveFedora::Base
+
+    include Hydra::ModelMethods
+    has_metadata :name => "descMetadata", :label=>"generic metadata", :type => GenericContentXml
+
+    def attributes=(properties)
+      if (properties["subjects"])
+        self.descMetadata.subject.nodeset.remove  # wipe out existing values
+        properties["subjects"].each_with_index do |subject_hash, index|
+          self.descMetadata.subject(index).topic = subject_hash["topic"]
+          self.descMetadata.subject(index).category = subject_hash["category"]
+        end
+        properties.delete("subjects")
+      end
+      super
+  end
+</pre>

data/lib/active_fedora/model.rb

@@ -8,11 +8,36 @@ module ActiveFedora
   # much in the way ActiveRecord does.  
   module Model 
     extend ActiveFedora::FedoraObject
-
+    DEFAULT_NS = 'afmodel'
 
     def self.included(klass) # :nodoc:
       klass.extend(ClassMethods)
     end
+    
+    # Takes a Fedora URI for a cModel, and returns a 
+    # corresponding Model if available
+    # This method should reverse ClassMethods#to_class_uri
+    def self.from_class_uri(uri)
+      if match_data = /info:fedora\/([a-zA-z0-9\-_]+):(.+)$/.match(uri)
+        pid_ns = match_data[1]
+        model_value = match_data[2]
+        model_value.gsub!('_', '::')
+      else
+        raise "model URI incorrectly formatted: #{uri}"
+      end
+      if model_value.include?("::")
+        result = eval(model_value)
+      else
+        result = Kernel.const_get(model_value)
+      end
+      unless result.nil?
+        model_ns = (result.respond_to? :pid_namespace) ? result.pid_namespace : DEFAULT_NS
+        if model_ns != pid_ns
+          logger.warn "Model class namespace (#{model_ns}) and uri namespace (#{pid_ns}) do not match!"
+        end
+      end
+      result
+    end
 
     def add_metadata
     end
@@ -52,7 +77,15 @@ module ActiveFedora
       def load_instance(pid)
         RubydoraConnection.instance.find_model(pid, self)
       end
-
+      
+      # Returns a suitable uri object for :has_model
+      # Should reverse Model#from_class_uri
+      def to_class_uri
+        ns = (self.respond_to? :pid_namespace) ? self.pid_namespace : Model::DEFAULT_NS
+        pid = self.name.gsub(/::/,'_')
+        "info:fedora/#{ns}:#{pid}"
+      end
+      
       # Takes :all or a pid as arguments
       # Returns an Array of objects of the Class that +find+ is being 
       # called on
@@ -62,7 +95,7 @@ module ActiveFedora
         if args == :all
           return_multiple = true
           # escaped_class_name = self.name.gsub(/(:)/, '\\:')
-          escaped_class_uri = "info:fedora/afmodel:#{self.name}".gsub(/(:)/, '\\:')
+          escaped_class_uri = SolrService.escape_uri_for_query(self.to_class_uri)
           # q = "#{ActiveFedora::SolrService.solr_name(:active_fedora_model, :symbol)}:#{escaped_class_name}"
           q = "#{ActiveFedora::SolrService.solr_name(:has_model, :symbol)}:#{escaped_class_uri}"
         elsif args.class == String

data/lib/active_fedora/nokogiri_datastream.rb

@@ -16,6 +16,12 @@ module ActiveFedora
     alias_method(:om_update_values, :update_values) unless method_defined?(:om_update_values)
     
     attr_accessor :internal_solr_doc
+
+    before_create :add_mime_type
+
+    def add_mime_type
+      self.mimeType= 'text/xml'
+    end
     
     # Create an instance of this class based on xml content
     # @param [String, File, Nokogiri::XML::Node] xml the xml content to build from

data/lib/active_fedora/rdf_xml_writer.rb

@@ -0,0 +1,69 @@
+require 'uri'
+require 'rdf/rdfxml'
+require 'rdf'
+
+module ActiveFedora
+# This class ensures that the RELS-EXT datastream is always serialized
+# with an rdf:Description container for the properties
+# the default behavior for RDF:RDFXML::Writer is to change that element if
+# an rdf:type assertion is present; this is incompatible with Fedora
+  class RDFXMLWriter < RDF::RDFXML::Writer
+    def subject(subject, parent_node)
+      node = nil
+      
+      raise RDF::WriterError, "Illegal use of subject #{subject.inspect}, not supported in RDF/XML" unless subject.resource?
+      
+      if !is_done?(subject)
+        subject_done(subject)
+        properties = @graph.properties(subject)
+        add_debug {"subject: #{subject.inspect}, props: #{properties.inspect}"}
+
+        @graph.query(:subject => subject).each do |st|
+          raise RDF::WriterError, "Illegal use of predicate #{st.predicate.inspect}, not supported in RDF/XML" unless st.predicate.uri?
+        end
+
+        prop_list = order_properties(properties)
+        add_debug {"=> property order: #{prop_list.to_sentence}"}
+
+        qname = "rdf:Description"
+        prefixes[:rdf] = RDF.to_uri
+
+        node = Nokogiri::XML::Element.new(qname, parent_node.document)
+        
+        if subject.is_a?(RDF::Node)
+          # Only need nodeID if it's referenced elsewhere
+          if ref_count(subject) > (@depth == 0 ? 0 : 1)
+            node["rdf:nodeID"] = subject.id
+          else
+            node.add_child(Nokogiri::XML::Comment.new(node.document, "Serialization for #{subject}")) if RDF::RDFXML::debug?
+          end
+        else
+          node["rdf:about"] = relativize(subject)
+        end
+
+        prop_list.each do |prop|
+          prop_ref = RDF::URI.intern(prop)
+          
+          properties[prop].each do |object|
+            raise RDF::WriterError, "Illegal use of object #{object.inspect}, not supported in RDF/XML" unless object.resource? || object.literal?
+
+            @depth += 1
+            predicate(prop_ref, object, node, properties[prop].length == 1)
+            @depth -= 1
+          end
+        end
+      elsif @force_RDF_about.include?(subject)
+        add_debug {"subject: #{subject.inspect}, force about"}
+        node = Nokogiri::XML::Element.new("rdf:Description", parent_node.document)
+        if subject.is_a?(RDF::Node)
+          node["rdf:nodeID"] = subject.id
+        else
+          node["rdf:about"] = relativize(subject)
+        end
+      end
+      @force_RDF_about.delete(subject)
+
+      parent_node.add_child(node) if node
+    end
+  end
+end

data/lib/active_fedora/rels_ext_datastream.rb

@@ -3,13 +3,20 @@ require 'solrizer/field_name_mapper'
 require 'uri'
 require 'rdf/rdfxml'
 require 'rdf'
+require 'active_fedora/rdf_xml_writer'
 
 module ActiveFedora
   class RelsExtDatastream < Datastream
     
     include Solrizer::FieldNameMapper
     attr_accessor :model
-    
+
+    before_create :add_mime_type
+
+    def add_mime_type
+      self.mimeType= 'application/rdf+xml'
+    end
+
     def serialize!
       self.content = to_rels_ext() if model.relationships_are_dirty
       model.relationships_are_dirty = false
@@ -46,7 +53,7 @@ module ActiveFedora
     # @param [Hash] relationships (optional) @default self.relationships
     # Note: This method is implemented on SemanticNode instead of RelsExtDatastream because SemanticNode contains the relationships array
     def to_rels_ext()
-      xml = RDF::RDFXML::Writer.buffer do |writer|
+      xml = ActiveFedora::RDFXMLWriter.buffer do |writer|
         model.relationships.each_statement do |statement|
           writer << statement
         end

data/lib/active_fedora/rubydora_connection.rb

@@ -9,6 +9,7 @@ module ActiveFedora
     attr_accessor :options
 
     def self.connect(params={})
+      params = params.dup
       if params.kind_of? String
         u = URI.parse params
         params = {}
@@ -17,14 +18,17 @@ module ActiveFedora
         params[:url] = "#{u.scheme}://#{u.host}:#{u.port}#{u.path}"
       end
       instance = self.instance
+      force = params.delete(:force)
       instance.options = params
-      instance.connect
+      instance.connect force
       instance
     end
 
-    def connect()
-      return unless @connection.nil?
-      @connection = Rubydora.connect :url => options[:url], :user => options[:user], :password => options[:password]
+    def connect(force=false)
+      return unless @connection.nil? or force
+      allowable_options = [:url, :user, :password, :timeout, :open_timeout, :ssl_client_cert, :ssl_client_key]
+      client_options = options.reject { |k,v| not allowable_options.include?(k) }
+      @connection = Rubydora.connect client_options
     end
 
     def nextid(attrs={})

data/lib/active_fedora/semantic_node.rb

@@ -32,21 +32,31 @@ module ActiveFedora
     # @param uri a string represending the subject
     # @param predicate a predicate symbol
     # @param target an object to store
-    def build_statement(uri, predicate, target, literal=nil)
+    def build_statement(uri, predicate, target, literal=false)
       raise "Not allowed anymore" if uri == :self
       target = target.internal_uri if target.respond_to? :internal_uri
       subject =  RDF::URI.new(uri)  #TODO cache
-      if literal.nil?
+      unless literal or target.is_a? RDF::Resource
         begin
-          literal = URI.parse(target).scheme.nil?
+          target_uri = (target.is_a? URI) ? target : URI.parse(target)
+          if target_uri.scheme.nil?
+            raise ArgumentError, "Invalid target \"#{target}\". Must have namespace."
+          end
+          if target_uri.to_s =~ /\A[\w\-]+:[\w\-]+\Z/
+            raise ArgumentError, "Invalid target \"#{target}\". Target should be a complete URI, and not a pid."
+          end
         rescue URI::InvalidURIError
-          literal = false
+          raise ArgumentError, "Invalid target \"#{target}\". Target must be specified as a literal, or be a valid URI."
         end
       end
-      raise ArgumentError, "Invalid target \"#{target}\". Must have namespace." unless literal || /^info/.match(target)
-      object = literal ? RDF::Literal.new(target) : RDF::URI.new(target)
-
-       RDF::Statement.new(subject, find_graph_predicate(predicate), object)
+      if literal
+        object = RDF::Literal.new(target)
+      elsif target.is_a? RDF::Resource
+        object = target
+      else
+        object = RDF::URI.new(target)
+      end
+      RDF::Statement.new(subject, find_graph_predicate(predicate), object)
     
     end
                   

data/lib/active_fedora/solr_service.rb

@@ -44,18 +44,7 @@ module ActiveFedora
   
     def self.class_from_solr_document(hit)
         model_value = hit[solr_name("has_model", :symbol)].first
-        if match_data = /info:fedora\/afmodel:(.+)$/.match(model_value)
-          model_value = match_data[1]
-          model_value.gsub!('_', '::')
-        else
-          raise "has_model assertion incorrectly formatted: #{model_value}"
-        end
-
-        if model_value.include?("::")
-          eval(model_value)
-        else
-          Kernel.const_get(model_value)
-        end
+        Model.from_class_uri(model_value)
     end
     
     # Construct a solr query for a list of pids

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "3.1.1"
+    VERSION = "3.1.2"
 end

data/lib/tasks/active_fedora_dev.rake

@@ -69,12 +69,6 @@ namespace :active_fedora do
     t.rcov_opts << ['--exclude', 'spec']
   end
 
-  desc "Refresh test fixtres"
-  task :refresh_fixtures do
-    Rake::Task["active_fedora:clean_jetty"].invoke
-    Rake::Task["active_fedora:load_fixtures"].invoke
-  end
-
   task :clean_jetty do
     Dir.chdir("./jetty")
     system("git clean -f -d")
@@ -83,12 +77,6 @@ namespace :active_fedora do
   end
 
   task :load_fixtures => :environment do
-    # require 'solrizer'
-    # require 'solrizer-fedora'
-    # require 'spec/samples/models/hydrangea_article'
-    # ENV["FEDORA_HOME"] ||= File.expand_path(File.join(File.dirname(__FILE__),'..','..','jetty','fedora','default'))
-    # retval = `$FEDORA_HOME/client/bin/fedora-ingest-demos.sh localhost 8983 fedoraAdmin fedoraAdmin http`
-    # puts "loaded demo objects #{retval}"
     ActiveFedora.init unless Thread.current[:repo]
     
     ENV["pid"] = "hydrangea:fixture_mods_article1"

data/spec/integration/model_spec.rb

@@ -17,6 +17,9 @@ describe ActiveFedora::Model do
       
       class Basic < ActiveFedora::Base
         include ActiveFedora::Model
+        def self.pid_namespace
+          "foo"
+        end
       end
       
     end
@@ -34,9 +37,10 @@ describe ActiveFedora::Model do
   
   describe '#find' do
     it "should return an array of instances of the calling Class" do
-      pending
       result = ModelIntegrationSpec::Basic.find(:all)
       result.should be_instance_of(Array)
+      # this test is meaningless if the array length is zero
+      result.length.should > 0
       result.each do |obj|
         obj.class.should == ModelIntegrationSpec::Basic
       end

data/spec/integration/nokogiri_datastream_spec.rb

@@ -21,12 +21,14 @@ describe ActiveFedora::NokogiriDatastream do
       end
     end
 
-    @pid = "hydrangea:fixture_mods_article1"
-    @test_solr_object = HydrangeaArticle2.load_instance_from_solr(@pid)
-    @test_object = HydrangeaArticle2.load_instance(@pid)
   end
 
   describe '.term_values' do
+    before do
+      @pid = "hydrangea:fixture_mods_article1"
+      @test_solr_object = HydrangeaArticle2.load_instance_from_solr(@pid)
+      @test_object = HydrangeaArticle2.load_instance(@pid)
+    end
 
     it "should return the same values whether getting from solr or Fedora" do
       @test_solr_object.datastreams["descMetadata"].term_values(:name,:role,:text).should == ["Creator","Contributor","Funder","Host"]

data/spec/integration/solr_service_spec.rb

@@ -6,6 +6,9 @@ describe ActiveFedora::SolrService do
   describe "#reify_solr_results" do
     before(:all) do
       class FooObject < ActiveFedora::Base
+        def self.pid_namespace
+          "foo"
+        end
         has_metadata :name => "properties", :type => ActiveFedora::MetadataDatastream do |m|
           m.field "holding_id", :string
         end

data/spec/unit/model_spec.rb

@@ -103,7 +103,8 @@ describe ActiveFedora::Model do
       mock_solr = mock("SolrConnection")
       mock_result = mock("MockResult")
       mock_result.expects(:hits).returns([{"id" => "changeme:30"}, {"id" => "changeme:22"}])
-      mock_solr.expects(:query).with('has_model_s:info\\:fedora/afmodel\\:SpecModel\:\:Basic', :rows=>1001).returns(mock_result)
+      #mock_solr.expects(:query).with('has_model_s:info\\:fedora/afmodel\\:SpecModel\:\:Basic', :rows=>1001).returns(mock_result)
+      mock_solr.expects(:query).with('has_model_s:info\\:fedora/afmodel\\:SpecModel_Basic', :rows=>1001).returns(mock_result)
       ActiveFedora::SolrService.expects(:instance).returns(mock("SolrService", :conn => mock_solr))
       ActiveFedora::RubydoraConnection.instance.expects(:find_model).with("changeme:30", SpecModel::Basic).returns("Fake Object1")
       ActiveFedora::RubydoraConnection.instance.expects(:find_model).with("changeme:22", SpecModel::Basic).returns("Fake Object2")

data/spec/unit/nokogiri_datastream_spec.rb

@@ -25,7 +25,7 @@ describe ActiveFedora::NokogiriDatastream do
   
   after(:each) do
   end
-  
+
   it "should include the Solrizer::XML::TerminologyBasedSolrizer for .to_solr support" do
     ActiveFedora::NokogiriDatastream.included_modules.should include(Solrizer::XML::TerminologyBasedSolrizer)
   end
@@ -171,10 +171,12 @@ describe ActiveFedora::NokogiriDatastream do
     end
     it "should persist the product of .to_xml in fedora" do
       @test_ds.expects(:new?).returns(true).twice
-      @mock_repo.expects(:add_datastream).with(:pid => nil, :dsid => 'descMetadata', :checksumType => 'DISABLED', :versionable => true, :content => 'fake xml', :controlGroup => 'M', :dsState => 'A')
+      @mock_repo.expects(:datastream).with(:pid => nil, :dsid => 'descMetadata')
+      @mock_repo.expects(:add_datastream).with(:pid => nil, :dsid => 'descMetadata', :checksumType => 'DISABLED', :versionable => true, :content => 'fake xml', :controlGroup => 'M', :dsState => 'A', :mimeType=>'text/xml')
       @test_ds.expects(:to_xml).returns("fake xml")
       @test_ds.serialize!
       @test_ds.save
+      @test_ds.mimeType.should == 'text/xml'
     end
   end
   

data/spec/unit/rdf_xml_writer.rb

@@ -0,0 +1,63 @@
+require File.join( File.dirname(__FILE__), "../spec_helper" )
+require File.join( File.dirname(__FILE__), "../../lib/active_fedora/rdf_xml_writer" )
+
+describe ActiveFedora::RDFXMLWriter do
+  before(:all) do
+    @rdf_xml = <<-EOS
+      <rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
+        <rdf:Description rdf:about='info:fedora/test:sample_pid'>
+          <isMemberOf rdf:resource='info:fedora/demo:10' xmlns='info:fedora/fedora-system:def/relations-external#'/>
+          <isPartOf rdf:resource='info:fedora/demo:11' xmlns='info:fedora/fedora-system:def/relations-external#'/>
+          <hasPart rdf:resource='info:fedora/demo:12' xmlns='info:fedora/fedora-system:def/relations-external#'/>
+          <hasModel rdf:resource='info:fedora/afmodel:OtherModel' xmlns='info:fedora/fedora-system:def/model#'/>
+          <hasModel rdf:resource='info:fedora/afmodel:SampleModel' xmlns='info:fedora/fedora-system:def/model#'/>
+        </rdf:Description>
+      </rdf:RDF>
+    EOS
+
+    @rdf_xml_with_type = <<-EOS
+      <rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
+        <rdf:Description rdf:about='info:fedora/test:sample_pid'>
+        <isMemberOf rdf:resource='demo:10' xmlns='info:fedora/fedora-system:def/relations-external#'/>
+        <type rdf:resource='http://purl.org/dc/dcmitype/Collection' xmlns='http://www.w3.org/1999/02/22-rdf-syntax-ns#' />
+        </rdf:Description>
+      </rdf:RDF>
+    EOS
+
+  end
+  it "should serialize graphs using the rdf:Description element despite the presence of rdf:type statements" do
+    graph = RDF::Graph.new
+    subject = RDF::URI.new "info:fedora/test:sample_pid"
+    graph.insert RDF::Statement.new(subject, ActiveFedora::Base.new.find_graph_predicate(:is_member_of),  RDF::URI.new('demo:10'))
+    graph.insert RDF::Statement.new(subject, RDF::URI('http://www.w3.org/1999/02/22-rdf-syntax-ns#type'),  RDF::URI.new('http://purl.org/dc/dcmitype/Collection'))
+    content = RDF::RDFXML::Writer.buffer do |writer|
+      graph.each_statement do |statement|
+        writer << statement
+      end
+    end
+    EquivalentXml.equivalent?(content, @rdf_xml_with_type).should be_true
+  end
+  
+  it 'should serialize graphs without rdf:type equivalently to RDF::RDFXML::Writer' do
+    graph = RDF::Graph.new
+    subject = RDF::URI.new "info:fedora/test:sample_pid"
+    graph.insert RDF::Statement.new(subject, ActiveFedora::Base.new.find_graph_predicate(:is_member_of),  RDF::URI.new('info:fedora/demo:10'))
+    graph.insert RDF::Statement.new(subject, ActiveFedora::Base.new.find_graph_predicate(:is_part_of),  RDF::URI.new('info:fedora/demo:11'))
+    graph.insert RDF::Statement.new(subject, ActiveFedora::Base.new.find_graph_predicate(:has_part),  RDF::URI.new('info:fedora/demo:12'))
+    graph.insert RDF::Statement.new(subject, ActiveFedora::Base.new.find_graph_predicate(:has_model),  RDF::URI.new("info:fedora/afmodel:OtherModel"))
+    graph.insert RDF::Statement.new(subject, ActiveFedora::Base.new.find_graph_predicate(:has_model),  RDF::URI.new("info:fedora/afmodel:SampleModel"))
+
+    local_content = ActiveFedora::RDFXMLWriter.buffer do |writer|
+      graph.each_statement do |statement|
+        writer << statement
+      end
+    end
+    generic_content = RDF::RDFXML::Writer.buffer do |writer|
+      graph.each_statement do |statement|
+        writer << statement
+      end
+    end
+    EquivalentXml.equivalent?(local_content, @rdf_xml).should be_true
+    EquivalentXml.equivalent?(local_content, generic_content).should be_true
+  end
+end

data/spec/unit/rels_ext_datastream_spec.rb

@@ -21,9 +21,17 @@ describe ActiveFedora::RelsExtDatastream do
       mock_inner.stubs(:pid).returns(@pid)
       @test_ds = ActiveFedora::RelsExtDatastream.new(mock_inner, "RELS-EXT")
   end
-  
-  it 'should respond to #save' do
-    @test_ds.should respond_to(:save)
+
+  describe "#save" do
+    before do
+      @mock_repo.expects(:add_datastream).with(:pid => 'test:sample_pid', :dsid => 'RELS-EXT', :checksumType => 'DISABLED', :versionable => true, :content => 'fake xml', :controlGroup => 'M', :dsState => 'A', :mimeType=>'application/rdf+xml')
+      @mock_repo.expects(:datastream).with(:pid => 'test:sample_pid', :dsid => 'RELS-EXT')
+      @test_ds.content = 'fake xml'
+    end
+    it 'should set the mime type' do
+      @test_ds.save
+      @test_ds.mimeType.should == 'application/rdf+xml'
+    end
   end
   
   

data/spec/unit/rubydora_connection_spec.rb

@@ -16,6 +16,35 @@ describe ActiveFedora::RubydoraConnection do
     end
   end
 
+  describe 'connect' do
+    before do
+      @instance = ActiveFedora::RubydoraConnection.instance
+      @reconfig = { :force => true, :url => @instance.connection.client.url }.merge(@instance.connection.client.options)
+    end
+    
+    after do
+      ActiveFedora::RubydoraConnection.connect @reconfig
+    end
+    
+    it "shouldn't reconnect by default" do
+      client_id = @instance.connection.client.object_id
+      ActiveFedora::RubydoraConnection.connect :timeout => 3600
+      @instance.connection.client.object_id.should == client_id
+    end
+    
+    it "should reconnect with force" do
+      client_id = @instance.connection.client.object_id
+      ActiveFedora::RubydoraConnection.connect :force => true
+      @instance.connection.client.object_id.should_not == client_id
+    end
+    
+    it "should pass through valid options" do
+      ActiveFedora::RubydoraConnection.connect :timeout => 3600, :fake_option => :missing, :force => true
+      @instance.connection.client.options[:timeout].should == 3600
+      @instance.connection.client.options.has_key?(:fake_option).should be_false
+    end
+  end
+
   describe 'find_model' do
     
   end

data/spec/unit/semantic_node_spec.rb

@@ -26,6 +26,14 @@ describe ActiveFedora::SemanticNode do
       stm = @node.build_statement('info:fedora/spec:9', :is_part_of, 'info:fedora/spec:7')
       stm.object.to_s.should == "info:fedora/spec:7"
     end
+    it "should also be happy with non-info URIs" do
+      stm = @node.build_statement('info:fedora/spec:9', :is_annotation_of, 'http://www.w3.org/standards/techs/rdf')
+      stm.object.to_s.should == "http://www.w3.org/standards/techs/rdf"
+    end
+    it "should also be happy with targets that are URI::Generics" do
+      stm = @node.build_statement('info:fedora/spec:9', :is_annotation_of, URI.parse('http://www.w3.org/standards/techs/rdf'))
+      stm.object.to_s.should == "http://www.w3.org/standards/techs/rdf"
+    end
   end
   
   describe "with a bunch of objects" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: 
   segments: 
   - 3
   - 1
-  - 1
-  version: 3.1.1
+  - 2
+  version: 3.1.2
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-08 00:00:00 -06:00
+date: 2011-11-18 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -589,6 +589,7 @@ files:
 - lib/active_fedora/property.rb
 - lib/active_fedora/qualified_dublin_core_datastream.rb
 - lib/active_fedora/railtie.rb
+- lib/active_fedora/rdf_xml_writer.rb
 - lib/active_fedora/reflection.rb
 - lib/active_fedora/relationship.rb
 - lib/active_fedora/relationships_helper.rb
@@ -707,6 +708,7 @@ files:
 - spec/unit/nokogiri_datastream_spec.rb
 - spec/unit/property_spec.rb
 - spec/unit/qualified_dublin_core_datastream_spec.rb
+- spec/unit/rdf_xml_writer.rb
 - spec/unit/relationship_spec.rb
 - spec/unit/relationships_helper_spec.rb
 - spec/unit/rels_ext_datastream_spec.rb
@@ -843,6 +845,7 @@ test_files:
 - spec/unit/nokogiri_datastream_spec.rb
 - spec/unit/property_spec.rb
 - spec/unit/qualified_dublin_core_datastream_spec.rb
+- spec/unit/rdf_xml_writer.rb
 - spec/unit/relationship_spec.rb
 - spec/unit/relationships_helper_spec.rb
 - spec/unit/rels_ext_datastream_spec.rb