active-fedora 1.2.9 → 2.0.0

data/Gemfile

@@ -6,9 +6,10 @@ gem 'mime-types', '>= 1.16'
 gem 'multipart-post'
 gem 'nokogiri'
 gem 'om', '>= 1.0'
-gem 'solrizer', '>=0.3.0'
+gem 'solrizer', '>=1.0.0', '<2.0.0'
 gem 'activeresource', '<3.0.0'
 gem 'mediashelf-loggable'
+gem "equivalent-xml"
 
 group :development, :test do
   gem "jeweler"

data/Gemfile.lock

@@ -1,11 +1,13 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activeresource (2.3.10)
-      activesupport (= 2.3.10)
-    activesupport (2.3.10)
+    activeresource (2.3.11)
+      activesupport (= 2.3.11)
+    activesupport (2.3.11)
     columnize (0.3.2)
-    facets (2.9.0)
+    equivalent-xml (0.1.6)
+      nokogiri
+    facets (2.9.1)
     git (1.2.5)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
@@ -14,8 +16,7 @@ GEM
     linecache (0.43)
     mediashelf-loggable (0.4.0)
     mime-types (1.16)
-    mocha (0.9.10)
-      rake
+    mocha (0.9.12)
     multipart-post (1.1.0)
     nokogiri (1.4.4)
     om (1.0.2)
@@ -31,12 +32,15 @@ GEM
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
     solr-ruby (0.0.8)
-    solrizer (0.3.2)
+    solrizer (1.0.0)
       mediashelf-loggable
+      mediashelf-loggable
+      nokogiri
       nokogiri
       nokogiri
       om
-      solr-ruby
+      om (>= 1.0.0)
+      xml-simple
     xml-simple (1.0.14)
 
 PLATFORMS
@@ -44,6 +48,7 @@ PLATFORMS
 
 DEPENDENCIES
   activeresource (< 3.0.0)
+  equivalent-xml
   jeweler
   mediashelf-loggable
   mime-types (>= 1.16)
@@ -54,5 +59,5 @@ DEPENDENCIES
   rspec (< 2.0.0)
   ruby-debug
   solr-ruby (>= 0.0.6)
-  solrizer (>= 0.3.0)
+  solrizer (>= 1.0.0, < 2.0.0)
   xml-simple (>= 1.0.12)

data/History.txt

@@ -1,3 +1,10 @@
+2.0.0
+
+Upgraded to use solrizer 1.0.0, which uses RSolr instead of the outdated ruby-solr:
+
+  All solrize and extract methods now accept and return a _Hash_ rather than a Solr::Document
+  As part of this switch, *all field names are stored as Strings, not Symbols*. If you previously accessed something as solr_doc[:title_t], now you need to access it as solr_doc["title_t"]
+
 1.2.9
 Minor: Fixed Gemfile to require activeresource <3.0.0 NOT >3.0.0
 

data/USING_OM_DATASTREAMS.textile

@@ -0,0 +1,60 @@
+h1. Using OM-based NokogiriDatastreams
+
+h2. Setup
+
+This tutorial assumes that you've run script/console from the root of Hydrangea and have imported Hydrangea's fixtures.
+
+The HydrangeaArticle model definition is located at https://github.com/projecthydra/hydrangea/blob/master/vendor/plugins/hydrangea_articles/app/models/hydrangea_article.rb
+
+Look in the "Hydra::ModsArticle":https://github.com/projecthydra/hydrangea/blob/master/vendor/plugins/hydra_repository/lib/hydra/mods_article.rb and "Hydra::RightsMetadata":https://github.com/projecthydra/hydrangea/blob/master/vendor/plugins/hydra_repository/lib/hydra/rights_metadata.rb" datastream definitions to see the OM Terminologies they define.
+
+h2. The Tour
+
+First, create some objects to play around with.
+
+<pre>
+ha = HydrangeaArticle.new
+fixture_article = HydrangeaArticle.load_instance("hydrangea:fixture_mods_article1")
+<pre>
+
+<pre>
+ha.datastreams.keys
+fixture_article.datastreams.keys
+</pre>
+
+Each datastream is associated with a class that is aware of its content.  These classes are specified in the model.  
+
+<pre>
+ha.datastreams["rightsMetadata"].class
+ha.datastreams["descMetadata"].class
+<pre>
+  
+You can retrieve the xml from the object as xml (string) using to_xml, or you can access it as a Nokogiri::XML::Document using .ng_xml
+
+<pre>
+ha.datastreams["rightsMetadata"].to_xml
+ha.datastreams["rightsMetadata"].ng_xml.class
+</pre>
+
+FYI, an OM terminology is attached to the datastream's class.  OM's convenience methods use the terminology to look up nodes and values for you.
+
+<pre>
+ha.datastreams["rightsMetadata"].class.terminology
+</pre>
+
+The ModsArticle Terminology lets you retrieve values from the descMetadata datastream's MODS content.
+
+<pre>
+fixture_mods_ds = fixture_article.datastreams["descMetadata"]
+fixture_mods_ds.term_values(:person, :first_name)
+fixture_mods_ds.term_values(:person, :last_name)
+</pre>
+
+You can use OM's find_by_terms method to retrieve xml nodes from the datastream.  It returns Nokogiri::XML::Node objects.
+
+<pre>
+fixture_mods_ds.find_by_terms(:person)
+fixture_mods_ds.find_by_terms(:person).length
+fixture_mods_ds.find_by_terms(:person).each {|n| puts n.to_xml}
+</pre>
+  

data/VERSION

@@ -1 +1 @@
-1.2.9
+2.0.0

data/active-fedora.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active-fedora}
-  s.version = "1.2.9"
+  s.version = "2.0.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-01-31}
+  s.date = %q{2011-03-03}
   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 = [
@@ -178,6 +178,7 @@ Gem::Specification.new do |s|
     "PostInstall.txt",
     "README.textile",
     "Rakefile",
+    "USING_OM_DATASTREAMS.textile",
     "VERSION",
     "active-fedora.gemspec",
     "config/fedora.yml",
@@ -351,9 +352,10 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<multipart-post>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
       s.add_runtime_dependency(%q<om>, [">= 1.0"])
-      s.add_runtime_dependency(%q<solrizer>, [">= 0.3.0"])
+      s.add_runtime_dependency(%q<solrizer>, [">= 1.0.0", "< 2.0.0"])
       s.add_runtime_dependency(%q<activeresource>, ["< 3.0.0"])
       s.add_runtime_dependency(%q<mediashelf-loggable>, [">= 0"])
+      s.add_runtime_dependency(%q<equivalent-xml>, [">= 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"])
@@ -376,9 +378,10 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<multipart-post>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<om>, [">= 1.0"])
-      s.add_dependency(%q<solrizer>, [">= 0.3.0"])
+      s.add_dependency(%q<solrizer>, [">= 1.0.0", "< 2.0.0"])
       s.add_dependency(%q<activeresource>, ["< 3.0.0"])
       s.add_dependency(%q<mediashelf-loggable>, [">= 0"])
+      s.add_dependency(%q<equivalent-xml>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rspec>, ["< 2.0.0"])
       s.add_dependency(%q<mocha>, [">= 0.9.8"])
@@ -402,9 +405,10 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<multipart-post>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<om>, [">= 1.0"])
-    s.add_dependency(%q<solrizer>, [">= 0.3.0"])
+    s.add_dependency(%q<solrizer>, [">= 1.0.0", "< 2.0.0"])
     s.add_dependency(%q<activeresource>, ["< 3.0.0"])
     s.add_dependency(%q<mediashelf-loggable>, [">= 0"])
+    s.add_dependency(%q<equivalent-xml>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rspec>, ["< 2.0.0"])
     s.add_dependency(%q<mocha>, [">= 0.9.8"])

data/lib/active_fedora/base.rb

@@ -847,13 +847,13 @@ module ActiveFedora
       return xml.to_s
     end
 
-    # Return a Solr::Document version of this object.
-    # @solr_doc (optional) Solr::Document to insert the fields into
+    # Return a Hash representation of this object where keys in the hash are appropriate Solr field names.
+    # @solr_doc (optional) Hash to insert the fields into
     # @opts (optional) Hash
     # If opts[:model_only] == true, the base object metadata and the RELS-EXT datastream will be omitted.  This is mainly to support shelver, which calls .to_solr for each model an object subscribes to. 
-    def to_solr(solr_doc = Solr::Document.new, opts={})
+    def to_solr(solr_doc = Hash.new, opts={})
       unless opts[:model_only]
-        solr_doc << {SOLR_DOCUMENT_ID.to_sym => pid, ActiveFedora::SolrService.solr_name(:system_create, :date) => self.create_date, ActiveFedora::SolrService.solr_name(:system_modified, :date) => self.modified_date, ActiveFedora::SolrService.solr_name(:active_fedora_model, :symbol) => self.class.inspect}
+        solr_doc.merge!(SOLR_DOCUMENT_ID.to_sym => pid, ActiveFedora::SolrService.solr_name(:system_create, :date) => self.create_date, ActiveFedora::SolrService.solr_name(:system_modified, :date) => self.modified_date, ActiveFedora::SolrService.solr_name(:active_fedora_model, :symbol) => self.class.inspect)
       end
       datastreams.each_value do |ds|
         # solr_doc = ds.to_solr(solr_doc) if ds.class.included_modules.include?(ActiveFedora::MetadataDatastreamHelper) ||( ds.kind_of?(ActiveFedora::RelsExtDatastream) || ( ds.kind_of?(ActiveFedora::QualifiedDublinCoreDatastream) && !opts[:model_only] )
@@ -866,6 +866,7 @@ module ActiveFedora
       end
       return solr_doc
     end
+
     
     # ** EXPERIMENTAL **
     #

data/lib/active_fedora/datastream.rb

@@ -99,7 +99,7 @@ module ActiveFedora
         
         if datastream_xml.length > 3
           datastream_xml.elements.each do |el|
-            puts el.inspect
+            logger.debug el.inspect
           end
         end
         

data/lib/active_fedora/metadata_datastream.rb

@@ -4,7 +4,7 @@ module ActiveFedora
     
     include ActiveFedora::MetadataDatastreamHelper
 
-    # .to_solr and .to_xml (among other things) are provided by ActiveFedora::MetadataDatastream
+    # .to_solr and .to_xml (among other things) are provided by ActiveFedora::MetadataDatastreamHelper
     self.xml_model = ActiveFedora::MetadataDatastream    
 
     def update_attributes(params={},opts={})

data/lib/active_fedora/metadata_datastream_helper.rb

@@ -37,12 +37,12 @@ module ActiveFedora::MetadataDatastreamHelper
     self.blob = self.to_xml
   end
 
-  def to_solr(solr_doc = Solr::Document.new) # :nodoc:
+  def to_solr(solr_doc = Hash.new) # :nodoc:
     fields.each do |field_key, field_info|
       if field_info.has_key?(:values) && !field_info[:values].nil?
         field_symbol = ActiveFedora::SolrService.solr_name(field_key, field_info[:type])
-        field_info[:values].each do |val|             
-          solr_doc << Solr::Field.new(field_symbol => val)
+        field_info[:values].each do |val|    
+          ::Solrizer::Extractor.insert_solr_field_value(solr_doc, field_symbol, val )         
         end
       end
     end
@@ -88,7 +88,6 @@ module ActiveFedora::MetadataDatastreamHelper
         element_attrs = field_info[:element_attrs].nil? ? {} : field_info[:element_attrs]
         field_info[:values].each do |val|
           builder_arg = "xml.#{field}(val, element_attrs)"
-          puts builder_arg.inspect
           eval(builder_arg)
         end
       end

data/lib/active_fedora/model.rb

@@ -188,7 +188,7 @@ module ActiveFedora
           query_opts[:sort] = sort_array
         end
 
-        puts "Querying solr for #{self.name} objects with query: '#{query}'"
+        logger.debug "Querying solr for #{self.name} objects with query: '#{query}'"
     	results = ActiveFedora::SolrService.instance.conn.query(query,query_opts)
     	#objects = []
         #  results.hits.each do |hit|

data/lib/active_fedora/nokogiri_datastream.rb

@@ -97,46 +97,7 @@ class ActiveFedora::NokogiriDatastream < ActiveFedora::Datastream
     #just initialize internal_solr_doc since any value retrieval will be done via lazy loading on this doc on-demand
     @internal_solr_doc = solr_doc
   end
-  
-  def solrize_accessor(accessor_name, accessor_info, opts={})
-    solr_doc = opts.fetch(:solr_doc, Solr::Document.new)
-    parents = opts.fetch(:parents, [])
-    
-    accessor_pointer = parents+[accessor_name]
-  
-    if accessor_info.nil?
-      accessor_info = self.class.accessor_info(accessor_pointer)
-      if accessor_info.nil?
-        raise "No accessor is defined for #{accessor_info.select}"
-      end
-    end
-  
-    # prep children hash
-    child_accessors = accessor_info.fetch(:children, {})
-    xpath = self.class.accessor_xpath(*accessor_pointer)
-    nodeset = lookup(xpath)
-    
-    nodeset.each do |node|
-      # create solr fields
-      solrize_node(node, accessor_pointer, solr_doc)
-      child_accessors.each_pair do |child_accessor_name, child_accessor_info|
-        solrize_accessor(child_accessor_name, child_accessor_info, opts={:solr_doc=>solr_doc, :parents=>parents+[{accessor_name=>nodeset.index(node)}] })
-      end
-    end
-  end
-  
-  def solrize_node(node, accessor_pointer, solr_doc = Solr::Document.new)
-    generic_field_name_base = self.class.accessor_generic_name(*accessor_pointer)
-    generic_field_name = ActiveFedora::SolrService.solr_name(generic_field_name_base, :text)
-    
-    solr_doc << Solr::Field.new(generic_field_name => node.text)
-    
-    if accessor_pointer.length > 1
-      hierarchical_field_name_base = self.class.accessor_hierarchical_name(*accessor_pointer)
-      hierarchical_field_name = ActiveFedora::SolrService.solr_name(hierarchical_field_name_base, :text)
-      solr_doc << Solr::Field.new(hierarchical_field_name => node.text)
-    end
-  end
+
 
   # ** Experimental **
   # This method is called by +get_values+ if this datastream has been initialized by calling from_solr method via
@@ -283,7 +244,7 @@ class ActiveFedora::NokogiriDatastream < ActiveFedora::Datastream
   #@return [Boolean] true if either the key for name exists in solr or if its string value exists
   #@param [String] name Name of key to look for
   #@param [Solr::Document] solr_doc Solr doc to query
-  def has_solr_name?(name, solr_doc=Solr::Document.new)
+  def has_solr_name?(name, solr_doc=Hash.new)
     !solr_doc[name].nil? || !solr_doc[name.to_s].nil?
   end
 

data/lib/active_fedora/rels_ext_datastream.rb

@@ -41,12 +41,12 @@ module ActiveFedora
       tmpl
     end
     
-    def to_solr(solr_doc = Solr::Document.new)
+    def to_solr(solr_doc = Hash.new)
       self.relationships.each_pair do |subject, predicates|
         if subject == :self || subject == "info:fedora/#{self.pid}"
           predicates.each_pair do |predicate, values|
             values.each do |val|
-              solr_doc << Solr::Field.new(solr_name(predicate, :symbol) => val)
+              ::Solrizer::Extractor.insert_solr_field_value(solr_doc, solr_name(predicate, :symbol), val )
             end
           end
         end

data/spec/integration/full_featured_model_spec.rb

@@ -181,7 +181,7 @@ describe ActiveFedora::Base do
     
     @solr_result = OralHistory.find_by_solr(@test_history.pid).hits[0]
     @properties_sample_values.each_pair do |field, value|
-      (@solr_result["#{field.to_s}_t"] || @solr_result["#{field.to_s}_dt"]).should == [value] 
+      (@solr_result["#{field.to_s}_t"] || @solr_result["#{field.to_s}_dt"]).should == [::Solrizer::Extractor.format_node_value(value)] 
     end
     
     @dublin_core_sample_values.each_pair do |field, value|

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ gem 'mocha'
 require 'ruby-debug'
 require 'mocha'
 require 'ruby-fedora'
+require "equivalent-xml"
 begin
   require 'spec'
 rescue LoadError

data/spec/unit/base_spec.rb

@@ -28,7 +28,7 @@ describe ActiveFedora::Base do
   end
 
   before(:each) do
-    Fedora::Repository.instance.stubs(:nextid).returns(increment_pid)
+    Fedora::Repository.instance.stubs(:nextid).returns(increment_pid.to_s)
     @test_object = ActiveFedora::Base.new
     @test_object.new_object = true
   end
@@ -321,14 +321,14 @@ describe ActiveFedora::Base do
       @test_object.expects(:create_date).returns("cDate")
       @test_object.expects(:modified_date).returns("mDate")
       solr_doc = @test_object.to_solr
-      solr_doc[:system_create_dt].should eql("cDate")
-      solr_doc[:system_modified_dt].should eql("mDate")
+      solr_doc["system_create_dt"].should eql("cDate")
+      solr_doc["system_modified_dt"].should eql("mDate")
       solr_doc[:id].should eql("#{@test_object.pid}")
     end
 
     it "should add self.class as the :active_fedora_model" do
       solr_doc = @test_object.to_solr
-      solr_doc[:active_fedora_model_s].should eql(@test_object.class.inspect)
+      solr_doc["active_fedora_model_s"].should eql(@test_object.class.inspect)
     end
 
     it "should call .to_xml on all MetadataDatastreams and return the resulting document" do
@@ -340,7 +340,7 @@ describe ActiveFedora::Base do
       @test_object.to_xml
     end
   end
-
+  
   describe ".to_solr" do
     
     # before(:all) do
@@ -361,24 +361,24 @@ describe ActiveFedora::Base do
       @test_object.expects(:create_date).returns("cDate")
       @test_object.expects(:modified_date).returns("mDate")
       solr_doc = @test_object.to_solr
-      solr_doc[:system_create_dt].should eql("cDate")
-      solr_doc[:system_modified_dt].should eql("mDate")
+      solr_doc["system_create_dt"].should eql("cDate")
+      solr_doc["system_modified_dt"].should eql("mDate")
       solr_doc[:id].should eql("#{@test_object.pid}")
     end
 
     it "should omit base metadata and RELS-EXT if :model_only==true" do
       @test_object.add_relationship(:has_part, "foo")
       # @test_object.expects(:modified_date).returns("mDate")
-      solr_doc = @test_object.to_solr(Solr::Document.new, :model_only => true)
-      solr_doc[:system_create_dt].should be_nil
-      solr_doc[:system_modified_dt].should be_nil
-      solr_doc[:id].should be_nil
-      solr_doc[:has_part_s].should be_nil
+      solr_doc = @test_object.to_solr(Hash.new, :model_only => true)
+      solr_doc["system_create_dt"].should be_nil
+      solr_doc["system_modified_dt"].should be_nil
+      solr_doc["id"].should be_nil
+      solr_doc["has_part_s"].should be_nil
     end
     
     it "should add self.class as the :active_fedora_model" do
       solr_doc = @test_object.to_solr
-      solr_doc[:active_fedora_model_s].should eql(@test_object.class.inspect)
+      solr_doc["active_fedora_model_s"].should eql(@test_object.class.inspect)
     end
 
     it "should use mappings.yml to decide names of solr fields" do      
@@ -387,20 +387,20 @@ describe ActiveFedora::Base do
       @test_object.stubs(:create_date).returns(cdate)
       @test_object.stubs(:modified_date).returns(mdate)
       solr_doc = @test_object.to_solr
-      solr_doc[:system_create_dt].should eql(cdate)
-      solr_doc[:system_modified_dt].should eql(mdate)
+      solr_doc["system_create_dt"].should eql(cdate)
+      solr_doc["system_modified_dt"].should eql(mdate)
       solr_doc[:id].should eql("#{@test_object.pid}")
-      solr_doc[:active_fedora_model_s].should eql(@test_object.class.inspect)
+      solr_doc["active_fedora_model_s"].should eql(@test_object.class.inspect)
       
       ActiveFedora::SolrService.load_mappings(File.join(File.dirname(__FILE__), "..", "..", "config", "solr_mappings_af_0.1.yml"))
       solr_doc = @test_object.to_solr
       [:system_create_dt, :system_modified_dt, :active_fedora_model_s].each do |fn|
         solr_doc[fn].should == nil
       end
-      solr_doc[:system_create_date].should eql(cdate)
-      solr_doc[:system_modified_date].should eql(mdate)
+      solr_doc["system_create_date"].should eql(cdate)
+      solr_doc["system_modified_date"].should eql(mdate)
       solr_doc[:id].should eql("#{@test_object.pid}")
-      solr_doc[:active_fedora_model_field].should eql(@test_object.class.inspect)
+      solr_doc["active_fedora_model_field"].should eql(@test_object.class.inspect)
     end
     
     it "should call .to_solr on all MetadataDatastreams and NokogiriDatastreams, passing the resulting document to solr" do

data/spec/unit/metadata_datastream_spec.rb

@@ -322,11 +322,11 @@ describe ActiveFedora::MetadataDatastream do
     
     it "should provide .to_solr and return a SolrDocument" do
       @test_ds.should respond_to(:to_solr)
-      @test_ds.to_solr.should be_kind_of(Solr::Document)
+      @test_ds.to_solr.should be_kind_of(Hash)
     end
     
     it "should optionally allow you to provide the Solr::Document to add fields to and return that document when done" do
-      doc = Solr::Document.new
+      doc = Hash.new
       @test_ds.to_solr(doc).should equal(doc)
     end
     
@@ -334,12 +334,12 @@ describe ActiveFedora::MetadataDatastream do
       @test_ds.expects(:fields).returns(@sample_fields)
       solr_doc =  @test_ds.to_solr
       
-      solr_doc[:publisher_t].should == "publisher1"
-      solr_doc[:coverage_t].should == "coverage1"
-      solr_doc[:creation_date_dt].should == "fake-date"
-      solr_doc[:mydate_dt].should == "fake-date"
+      solr_doc["publisher_t"].should == ["publisher1"]
+      solr_doc["coverage_t"].sort.should == ["coverage1", "coverage2"]
+      solr_doc["creation_date_dt"].should == ["fake-date"]
+      solr_doc["mydate_dt"].should == ["fake-date"]
       
-      solr_doc[:empty_field_t].should be_nil
+      solr_doc["empty_field_t"].should be_nil
     end
     
     it "should allow multiple values for a single field"
@@ -349,14 +349,14 @@ describe ActiveFedora::MetadataDatastream do
       
       #should have these
             
-      @test_ds.to_solr[:publisher_t].should_not be_nil
-      @test_ds.to_solr[:coverage_t].should_not be_nil
-      @test_ds.to_solr[:creation_date_dt].should_not be_nil
+      @test_ds.to_solr["publisher_t"].should_not be_nil
+      @test_ds.to_solr["coverage_t"].should_not be_nil
+      @test_ds.to_solr["creation_date_dt"].should_not be_nil
       
       #should NOT have these
-      @test_ds.to_solr[:narrator].should be_nil
-      @test_ds.to_solr[:title].should be_nil
-      @test_ds.to_solr[:empty_field].should be_nil
+      @test_ds.to_solr["narrator"].should be_nil
+      @test_ds.to_solr["title"].should be_nil
+      @test_ds.to_solr["empty_field"].should be_nil
       
     end
     
@@ -367,31 +367,30 @@ describe ActiveFedora::MetadataDatastream do
       
       #should have these
             
-      solr_doc[:publisher_field].should == "publisher1"
-      solr_doc[:coverage_field].should == "coverage1"
-      solr_doc[:creation_date_date].should == "fake-date"
-      solr_doc[:mydate_date].should == "fake-date"
+      solr_doc["publisher_field"].should == ["publisher1"]
+      solr_doc["coverage_field"].sort.should == ["coverage1", "coverage2"]
+      solr_doc["creation_date_date"].should == ["fake-date"]
+      solr_doc["mydate_date"].should == ["fake-date"]
       
-      solr_doc[:publisher_t].should be_nil
-      solr_doc[:coverage_t].should be_nil
-      solr_doc[:creation_date_dt].should be_nil
+      solr_doc["publisher_t"].should be_nil
+      solr_doc["coverage_t"].should be_nil
+      solr_doc["creation_date_dt"].should be_nil
       
       # Reload default mappings
       ActiveFedora::SolrService.load_mappings
     end
     
     it 'should append _dt to dates' do
+      ActiveFedora::SolrService.load_mappings
       @test_ds.expects(:fields).returns(@sample_fields).at_least_once
       
-      #should have these
-      
-      @test_ds.to_solr[:creation_date_dt].should_not be_nil
-      @test_ds.to_solr[:mydate_dt].should_not be_nil
+      @test_ds.to_solr["creation_date_dt"].should_not be_nil
+      @test_ds.to_solr["mydate_dt"].should_not be_nil
       
       #should NOT have these
       
-      @test_ds.to_solr[:mydate].should be_nil
-      @test_ds.to_solr[:creation_date_date].should be_nil
+      @test_ds.to_solr["mydate"].should be_nil
+      @test_ds.to_solr["creation_date_date"].should be_nil
     end
     
   end

data/spec/unit/rels_ext_datastream_spec.rb

@@ -80,17 +80,17 @@ describe ActiveFedora::RelsExtDatastream do
     
     it "should provide .to_solr and return a SolrDocument" do
       @test_ds.should respond_to(:to_solr)
-      @test_ds.to_solr.should be_kind_of(Solr::Document)
+      @test_ds.to_solr.should be_kind_of(Hash)
     end
     
-    it "should serialize the relationships into a Solr::Document" do
+    it "should serialize the relationships into a Hash" do
       @test_ds.add_relationship(@test_relationship1)
       @test_ds.add_relationship(@test_relationship2)
       @test_ds.add_relationship(@test_relationship3)
       solr_doc = @test_ds.to_solr
-      solr_doc[:is_member_of_s].should == "info:fedora/demo:10"
-      solr_doc[:is_part_of_s].should == "info:fedora/demo:11"
-      solr_doc[:has_part_s].should == "info:fedora/demo:12"
+      solr_doc["is_member_of_s"].should == ["info:fedora/demo:10"]
+      solr_doc["is_part_of_s"].should == ["info:fedora/demo:11"]
+      solr_doc["has_part_s"].should == ["info:fedora/demo:12"]
     end
   end
   

data/spec/unit/semantic_node_spec.rb

@@ -503,8 +503,9 @@ describe ActiveFedora::SemanticNode do
       @node.add_relationship(@test_cmodel_relationship1)
       @node.add_relationship(@test_cmodel_relationship2)
       @node.internal_uri = @uri
-      returned_xml = XmlSimple.xml_in(@node.to_rels_ext(@pid))
-      returned_xml.should == XmlSimple.xml_in(@sample_rels_ext_xml)
+      # returned_xml = XmlSimple.xml_in(@node.to_rels_ext(@pid))
+      # returned_xml.should == XmlSimple.xml_in(@sample_rels_ext_xml)
+      EquivalentXml.equivalent?(@node.to_rels_ext(@pid), @sample_rels_ext_xml).should be_true
     end
     
     it "should treat :self and self.pid as equivalent subjects"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 15
   prerelease: false
   segments: 
-  - 1
   - 2
-  - 9
-  version: 1.2.9
+  - 0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-31 00:00:00 -06:00
+date: 2011-03-03 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -118,12 +118,20 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 23
         segments: 
+        - 1
         - 0
-        - 3
         - 0
-        version: 0.3.0
+        version: 1.0.0
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
   requirement: *id007
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -156,9 +164,9 @@ dependencies:
         version: "0"
   requirement: *id009
 - !ruby/object:Gem::Dependency 
-  type: :development
+  type: :runtime
   prerelease: false
-  name: jeweler
+  name: equivalent-xml
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -172,8 +180,22 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-  name: rspec
+  name: jeweler
   version_requirements: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id011
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: rspec
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - <
@@ -184,12 +206,12 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
-  requirement: *id011
+  requirement: *id012
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: mocha
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -200,12 +222,12 @@ dependencies:
         - 9
         - 8
         version: 0.9.8
-  requirement: *id012
+  requirement: *id013
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: ruby-debug
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -214,12 +236,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id013
+  requirement: *id014
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: solr-ruby
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -230,12 +252,12 @@ dependencies:
         - 0
         - 6
         version: 0.0.6
-  requirement: *id014
+  requirement: *id015
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: xml-simple
-  version_requirements: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -246,12 +268,12 @@ dependencies:
         - 0
         - 12
         version: 1.0.12
-  requirement: *id015
+  requirement: *id016
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: mime-types
-  version_requirements: &id016 !ruby/object:Gem::Requirement 
+  version_requirements: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -261,12 +283,12 @@ dependencies:
         - 1
         - 16
         version: "1.16"
-  requirement: *id016
+  requirement: *id017
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: multipart-post
-  version_requirements: &id017 !ruby/object:Gem::Requirement 
+  version_requirements: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -275,12 +297,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id017
+  requirement: *id018
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: nokogiri
-  version_requirements: &id018 !ruby/object:Gem::Requirement 
+  version_requirements: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -289,12 +311,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id018
+  requirement: *id019
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: om
-  version_requirements: &id019 !ruby/object:Gem::Requirement 
+  version_requirements: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -304,12 +326,12 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  requirement: *id019
+  requirement: *id020
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: solrizer
-  version_requirements: &id020 !ruby/object:Gem::Requirement 
+  version_requirements: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -320,12 +342,12 @@ dependencies:
         - 3
         - 0
         version: 0.3.0
-  requirement: *id020
+  requirement: *id021
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: activeresource
-  version_requirements: &id021 !ruby/object:Gem::Requirement 
+  version_requirements: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - <
@@ -336,12 +358,12 @@ dependencies:
         - 0
         - 0
         version: 3.0.0
-  requirement: *id021
+  requirement: *id022
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: rspec
-  version_requirements: &id022 !ruby/object:Gem::Requirement 
+  version_requirements: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -352,12 +374,12 @@ dependencies:
         - 2
         - 9
         version: 1.2.9
-  requirement: *id022
+  requirement: *id023
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: mocha
-  version_requirements: &id023 !ruby/object:Gem::Requirement 
+  version_requirements: &id024 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -368,12 +390,12 @@ dependencies:
         - 9
         - 8
         version: 0.9.8
-  requirement: *id023
+  requirement: *id024
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: ruby-debug
-  version_requirements: &id024 !ruby/object:Gem::Requirement 
+  version_requirements: &id025 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -382,7 +404,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id024
+  requirement: *id025
 description: ActiveFedora provides for creating and managing objects in the Fedora Repository Architecture.
 email: matt.zumwalt@yourmediashelf.com
 executables: []
@@ -554,6 +576,7 @@ files:
 - PostInstall.txt
 - README.textile
 - Rakefile
+- USING_OM_DATASTREAMS.textile
 - VERSION
 - active-fedora.gemspec
 - config/fedora.yml