active-fedora 1.1.9 → 1.1.11

data/History.txt

@@ -1,3 +1,8 @@
+1.1.11
+
+* fix to update_index preventing double-metadata
+* now nokogiri datastreams initialize with default template.
+
 1.1.8
 
 solrizer fix to ensure that Nokogiri Datastreams are included in Base.to_solr

data/VERSION

@@ -1 +1 @@
-1.1.9
+1.1.11

data/active-fedora.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active-fedora}
-  s.version = "1.1.9"
+  s.version = "1.1.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Zumwalt", "McClain Looney"]

data/lib/active_fedora/base.rb

@@ -86,10 +86,6 @@ module ActiveFedora
       end
       @new_object = false
       self.update_index if @metadata_is_dirty == true && ENABLE_SOLR_UPDATES
-      if defined?( Solrizer::Solrizer ) 
-        solrizer = Solrizer::Solrizer.new
-        solrizer.solrize( self )
-      end
       @metadata_is_dirty == false
       return result
     end
@@ -420,7 +416,12 @@ module ActiveFedora
 
     # Updates Solr index with self.
     def update_index
-      SolrService.instance.conn.update(self.to_solr)
+      if defined?( Solrizer::Solrizer ) 
+        solrizer = Solrizer::Solrizer.new
+        solrizer.solrize( self )
+      else
+        SolrService.instance.conn.update(self.to_solr)
+      end
     end
 
     # An ActiveRecord-ism to udpate metadata values.

data/lib/active_fedora/nokogiri_datastream.rb

@@ -20,7 +20,9 @@ class ActiveFedora::NokogiriDatastream < ActiveFedora::Datastream
   # @tmpl ActiveFedora::MetadataDatastream
   # Careful! If you call this from a constructor, be sure to provide something 'ie. self' as the @tmpl. Otherwise, you will get an infinite loop!
   def self.from_xml(xml, tmpl=self.new) # :nodoc:
-    if xml.kind_of? Nokogiri::XML::Node
+    if xml.nil?
+      tmpl.ng_xml = self.xml_template
+    elsif xml.kind_of? Nokogiri::XML::Node || xml.kind_of?(Nokogiri::XML::Document)
       tmpl.ng_xml = xml
     else
       tmpl.ng_xml = Nokogiri::XML::Document.parse(xml)
@@ -29,6 +31,10 @@ class ActiveFedora::NokogiriDatastream < ActiveFedora::Datastream
     return tmpl
   end
   
+  def self.xml_template
+    Nokogiri::XML::Document.parse("<xml/>")
+  end
+  
   # class << self
   #   from_xml_original = self.instance_method(:from_xml)
   #   

data/spec/unit/nokogiri_datastream_spec.rb

@@ -29,6 +29,16 @@ describe ActiveFedora::NokogiriDatastream do
       test_ds1 = ActiveFedora::NokogiriDatastream.new(:blob=>"<xml><foo/></xml>")
       test_ds1.ng_xml.to_xml.should == "<?xml version=\"1.0\"?>\n<xml>\n  <foo/>\n</xml>\n"
     end
+    it "should initialize from #xml_template if no xml is provided" do
+      ActiveFedora::NokogiriDatastream.expects(:xml_template).returns("fake template")
+      ActiveFedora::NokogiriDatastream.new.ng_xml.should == "fake template"
+    end
+  end
+  
+  describe '#xml_template' do
+    it "should return an empty xml document" do
+      ActiveFedora::NokogiriDatastream.xml_template.to_xml.should == "<?xml version=\"1.0\"?>\n<xml/>\n"
+    end
   end
   
   describe ".update_indexed_attributes" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 5
   prerelease: false
   segments: 
   - 1
   - 1
-  - 9
-  version: 1.1.9
+  - 11
+  version: 1.1.11
 platform: ruby
 authors: 
 - Matt Zumwalt