active-fedora 1.1.4 → 1.1.5

data/README.textile

@@ -19,6 +19,25 @@ h2. Getting Started
 
 The "ActiveFedora Console Tour":http://projects.mediashelf.us/wiki/active-fedora/Getting_Started gives you a brief tour through ActiveFedora's features on the command line.
 
+h2. Testing
+
+In order to run the RSpec tests, you need to have a copy of hydra-jetty running.  To do this, download a working copy of hydra-jetty, cd into its root and run 
+<pre>java -jar start.jar</pre>
+
+Then open a new terminal and import fedora's demo objects.
+
+<pre>
+export FEDORA_HOME=/path/to/hydra/jetty/fedora/default
+$FEDORA_HOME/client/bin/fedora-ingest-demos.sh localhost 8983 fedoraAdmin fedoraAdmin http
+<pre>
+  
+Now you're ready to run 
+
+<pre>
+cd /wherever/active_fedora/is
+rake spec
+</pre>
+
 h2. LICENSE:
 
 Copyright (c) 2009-2010 Matt Zumwalt

data/Rakefile

@@ -20,6 +20,7 @@ begin
     gem.add_dependency('xml-simple', '>= 1.0.12')
     gem.add_dependency('mime-types', '>= 1.16')
     gem.add_dependency('multipart-post')
+    gem.add_dependency('nokogiri')
 
     gem.add_development_dependency "rspec", ">= 1.2.9"
     gem.add_development_dependency "mocha", ">= 1.2.9"

data/VERSION

@@ -1 +1 @@
-1.1.4
+1.1.5

data/active-fedora.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active-fedora}
-  s.version = "1.1.4"
+  s.version = "1.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Zumwalt", "McClain Looney"]
-  s.date = %q{2010-05-15}
+  s.date = %q{2010-05-16}
   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 = [
@@ -208,6 +208,9 @@ Gem::Specification.new do |s|
      "lib/fedora/formats.rb",
      "lib/fedora/generic_search.rb",
      "lib/fedora/repository.rb",
+     "lib/hydra.rb",
+     "lib/hydra_libs/mods_datastream.rb",
+     "lib/hydra_libs/opinionated_mods_document.rb",
      "lib/ruby-fedora.rb",
      "lib/util/class_level_inheritable_attributes.rb",
      "script/console",
@@ -259,6 +262,8 @@ Gem::Specification.new do |s|
      "spec/unit/inheritance_spec.rb",
      "spec/unit/metadata_datastream_spec.rb",
      "spec/unit/model_spec.rb",
+     "spec/unit/mods_datastream_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",
@@ -314,6 +319,8 @@ Gem::Specification.new do |s|
      "spec/unit/inheritance_spec.rb",
      "spec/unit/metadata_datastream_spec.rb",
      "spec/unit/model_spec.rb",
+     "spec/unit/mods_datastream_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",
@@ -335,6 +342,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<xml-simple>, [">= 1.0.12"])
       s.add_runtime_dependency(%q<mime-types>, [">= 1.16"])
       s.add_runtime_dependency(%q<multipart-post>, [">= 0"])
+      s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<mocha>, [">= 1.2.9"])
       s.add_development_dependency(%q<ruby-debug>, [">= 0"])
@@ -343,6 +351,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<xml-simple>, [">= 1.0.12"])
       s.add_dependency(%q<mime-types>, [">= 1.16"])
       s.add_dependency(%q<multipart-post>, [">= 0"])
+      s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<mocha>, [">= 1.2.9"])
       s.add_dependency(%q<ruby-debug>, [">= 0"])
@@ -352,6 +361,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<xml-simple>, [">= 1.0.12"])
     s.add_dependency(%q<mime-types>, [">= 1.16"])
     s.add_dependency(%q<multipart-post>, [">= 0"])
+    s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<mocha>, [">= 1.2.9"])
     s.add_dependency(%q<ruby-debug>, [">= 0"])

data/lib/active_fedora/base.rb

@@ -86,6 +86,10 @@ 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

data/lib/hydra.rb

@@ -0,0 +1,2 @@
+# module Hydra;end
+require "hydra_libs/mods_datastream"

data/lib/hydra_libs/mods_datastream.rb

@@ -0,0 +1,6 @@
+#this class represents a MetadataDatastream, a special case of ActiveFedora::Datastream
+require "hydra_libs/opinionated_mods_document"
+
+class ModsDatastream < ActiveFedora::NokogiriDatastream
+  self.xml_model = OpinionatedModsDocument
+end

data/lib/hydra_libs/opinionated_mods_document.rb

@@ -0,0 +1,2 @@
+class OpinionatedModsDocument
+end

data/spec/unit/mods_datastream_spec.rb

@@ -0,0 +1,289 @@
+require File.join( File.dirname(__FILE__), "../spec_helper" )
+
+require 'active_fedora'
+require 'hydra'
+
+describe ModsDatastream do
+  
+  before(:all) do
+    @sample_fields = {:publisher => {:values => ["publisher1"], :type => :string}, 
+                      :coverage => {:values => ["coverage1", "coverage2"], :type => :text}, 
+                      :creation_date => {:values => "fake-date", :type => :date},
+                      :mydate => {:values => "fake-date", :type => :date},
+                      :empty_field => {:values => {}}
+                      } 
+    @sample_xml = XmlSimple.xml_in("<fields><coverage>coverage1</coverage><coverage>coverage2</coverage><creation_date>fake-date</creation_date><mydate>fake-date</mydate><publisher>publisher1</publisher></fields>")
+    
+  end
+  
+  before(:each) do
+    @test_ds = ModsDatastream.new
+  end
+  
+  after(:each) do
+  end
+  
+  describe '#new' do
+    it 'should provide #new' do
+      ModsDatastream.should respond_to(:new)
+      @test_ds.ng_xml.should be_instance_of(OpinionatedModsDocument)
+    end
+  end
+  
+
+  it 'should provide .fields' do
+    @test_ds.should respond_to(:fields)
+  end
+  
+  describe '.save' do
+    it "should provide .save" do
+      @test_ds.should respond_to(:save)
+    end
+    it "should persist the product of .to_xml in fedora" do
+      Fedora::Repository.instance.expects(:save)
+      @test_ds.expects(:to_xml).returns("fake xml")
+      @test_ds.expects(:blob=).with("fake xml")
+      @test_ds.save
+    end
+  end
+  
+  describe '.to_xml' do
+    it "should provide .to_xml" do
+      @test_ds.should respond_to(:to_xml)
+    end
+    it 'should output the fields hash as XML' do
+      @test_ds.expects(:fields).returns(@sample_fields)
+      #sample_rexml = REXML::Document.new(sample_xml)
+      #returned_rexml = REXML::Document.new(@test_ds.to_dc_xml)
+      #returned_rexml.to_s.should == sample_rexml.to_s
+      returned_xml = XmlSimple.xml_in(@test_ds.to_xml)
+      returned_xml.should == @sample_xml
+    end
+    
+    it 'should accept an optional REXML Document as an argument and insert its fields into that' do
+      @test_ds.expects(:fields).returns(@sample_fields)
+      rexml = REXML::Document.new("<test_rexml/>")
+      rexml.root.elements.expects(:add).times(5)
+      result = @test_ds.to_xml(rexml)
+    end
+    it 'should accept an optional REXML Document as an argument and insert its fields into that' do
+      @test_ds.expects(:fields).returns(@sample_fields)
+      rexml = REXML::Document.new("<test_rexml/>")
+      result = @test_ds.to_xml(rexml)
+      XmlSimple.xml_in(rexml.to_s).should == @sample_xml
+      XmlSimple.xml_in(result).should == @sample_xml
+    end
+    
+    it 'should add to root of REXML::Documents, but add directly to the elements if a REXML::Element is passed in' do
+      @test_ds.expects(:fields).returns(@sample_fields).times(2)
+      doc = REXML::Document.new("<test_document/>")
+      el = REXML::Element.new("<test_element/>")
+      doc.root.elements.expects(:add).times(5)
+      el.expects(:add).times(5)
+      @test_ds.to_xml(doc)
+      @test_ds.to_xml(el)
+    end
+    
+  end
+  
+  describe '.set_blob_for_save' do
+    it "should provide .set_blob_for_save" do
+      @test_ds.should respond_to(:set_blob_for_save)
+    end
+    
+    it "should set the blob to to_xml" do
+      @test_ds.expects(:blob=).with(@test_ds.to_xml)
+      @test_ds.set_blob_for_save
+    end
+  end
+  
+  describe '#field' do
+    
+    before(:each) do
+      class SpecDatastream < ActiveFedora::MetadataDatastream
+        def initialize
+        super
+        field :publisher, :string
+        field :coverage, :text
+        field :creation_date, :date
+        field :mydate, :date
+        field :mycomplicated_field, :string, :multiple=>false, :encoding=>'LCSH', :element_attrs=>{:foo=>:bar, :baz=>:bat}
+        end
+      end
+    end
+    
+    after(:each) do
+      Object.send(:remove_const, :SpecDatastream)
+    end
+    
+    it 'should add corresponding field to the @fields hash and set the field :type ' do
+      sds = SpecDatastream.new
+      sds.fields.should_not have_key(:bio)
+      sds.field :bio, :text
+      sds.fields.should have_key(:bio)
+      sds.fields[:bio].should have_key(:type)
+      sds.fields[:bio][:type].should == :text
+      sds.fields[:mycomplicated_field][:element_attrs].should == {:foo=>:bar, :baz=>:bat}
+    end
+    
+    # it "should insert custom element attrs into the xml stream" do
+    #   sds = SpecDatastream.new
+    #   sds.mycomplicated_field_values='foo'
+    #   sds.fields[:mycomplicated_field][:element_attrs].should == {:foo=>:bar, :baz=>:bat}
+    #   sds.to_xml.should == '<fields><mycomplicated_field baz=\'bat\' foo=\'bar\'>foo</mycomplicated_field></fields>'
+    # end
+    
+    it "should add getters and setters and appenders with field name" do
+      local_test_ds = SpecDatastream.new
+      local_test_ds.should respond_to(:publisher_values)
+      local_test_ds.should respond_to(:publisher_append)
+      local_test_ds.should respond_to(:publisher_values=)
+      local_test_ds.publisher_values.class.should == Array
+      local_test_ds.should respond_to(:coverage_values)
+      local_test_ds.should respond_to(:coverage_values=)
+      local_test_ds.should respond_to(:coverage_append)
+      local_test_ds.should respond_to(:creation_date_values)
+      local_test_ds.should respond_to(:creation_date_append)
+      local_test_ds.should respond_to(:creation_date_values=)
+      local_test_ds.should respond_to(:mydate_values)
+      local_test_ds.should respond_to(:mydate_append)
+      local_test_ds.should respond_to(:mydate_values=)
+    end
+    
+    it "should track field values at instance level, not at class level" do
+      local_test_ds1 = SpecDatastream.new
+      local_test_ds2 = SpecDatastream.new
+      local_test_ds1.publisher_values = ["publisher1", "publisher2"]
+      local_test_ds2.publisher_values = ["publisherA", "publisherB"]
+      
+      local_test_ds2.publisher_values.should == ["publisherA", "publisherB"]      
+      local_test_ds1.publisher_values.should == ["publisher1", "publisher2"]
+    end
+    
+    it "should allow you to add field values using <<" do
+      local_test_ds1 = SpecDatastream.new
+      local_test_ds1.publisher_values << "publisher1"
+      local_test_ds1.publisher_values.should == ["publisher1"] 
+    end
+    
+    it "should create setter that always turns non-arrays into arrays" do
+      local_test_ds = SpecDatastream.new
+      local_test_ds.publisher_values = "Foo"
+      local_test_ds.publisher_values.should == ["Foo"]
+    end
+    
+    it "should create setter that sets datastream.dirty? to true" do
+      local_test_ds = SpecDatastream.new
+      local_test_ds.should_not be_dirty
+      local_test_ds.publisher_values = "Foo"
+      local_test_ds.should be_dirty
+      
+      # Note: If you use << to append values, the datastream will not be marked as dirty!
+      #local_test_ds.dirty = false
+      
+      #local_test_ds.should_not be_dirty
+      #local_test_ds.publisher_values << "Foo"
+      #local_test_ds.should be_dirty      
+    end
+    
+    it "should add any extra opts to the field hash" do
+      local_test_ds = SpecDatastream.new
+      local_test_ds.field "myfield", :string, :foo => "foo", :bar => "bar"      
+      local_test_ds.fields[:myfield].should have_key(:foo)
+      local_test_ds.fields[:myfield][:foo].should == "foo"
+      local_test_ds.fields[:myfield].should have_key(:bar)
+      local_test_ds.fields[:myfield][:bar].should == "bar"      
+    end
+    
+  end
+  
+  describe ".to_solr" do
+    
+    after(:all) do
+      # Revert to default mappings after running tests
+      ActiveFedora::SolrService.load_mappings
+    end
+    
+    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)
+    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
+      @test_ds.to_solr(doc).should equal(doc)
+    end
+    
+    it "should iterate through @fields hash" 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[:empty_field_t].should be_nil
+    end
+    
+    it "should allow multiple values for a single field"
+    
+    it 'should append create keys in format field_name + _ + field_type' do
+      @test_ds.stubs(:fields).returns(@sample_fields)
+      
+      #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
+      
+      #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
+      
+    end
+    
+    it "should use Solr mappings to generate field names" do
+      ActiveFedora::SolrService.load_mappings(File.join(File.dirname(__FILE__), "..", "..", "config", "solr_mappings_af_0.1.yml"))
+      @test_ds.stubs(:fields).returns(@sample_fields)
+      solr_doc =  @test_ds.to_solr
+      
+      #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_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
+      @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
+      
+      #should NOT have these
+      
+      @test_ds.to_solr[:mydate].should be_nil
+      @test_ds.to_solr[:creation_date_date].should be_nil
+    end
+    
+  end
+  
+  describe '.fields' do
+    it "should return a Hash" do
+      @test_ds.fields.should be_instance_of(Hash)
+    end
+  end
+  
+end

data/spec/unit/nokogiri_datastream_spec.rb

@@ -0,0 +1,299 @@
+require File.join( File.dirname(__FILE__), "../spec_helper" )
+
+
+describe ActiveFedora::NokogiriDatastream do
+  
+  before(:all) do
+    @sample_fields = {:publisher => {:values => ["publisher1"], :type => :string}, 
+                      :coverage => {:values => ["coverage1", "coverage2"], :type => :text}, 
+                      :creation_date => {:values => "fake-date", :type => :date},
+                      :mydate => {:values => "fake-date", :type => :date},
+                      :empty_field => {:values => {}}
+                      } 
+    @sample_xml = XmlSimple.xml_in("<fields><coverage>coverage1</coverage><coverage>coverage2</coverage><creation_date>fake-date</creation_date><mydate>fake-date</mydate><publisher>publisher1</publisher></fields>")
+    
+  end
+  
+  before(:each) do
+    @test_ds = ActiveFedora::NokogiriDatastream.new
+  end
+  
+  after(:each) do
+  end
+  
+  describe '#new' do
+    it 'should provide #new' do
+      ActiveFedora::NokogiriDatastream.should respond_to(:new)
+      @test_ds.ng_xml.should be_instance_of(Nokogiri::XML::Document)
+    end
+  end
+  
+
+  it 'should provide .fields' do
+    @test_ds.should respond_to(:fields)
+  end
+  
+  describe '.save' do
+    it "should provide .save" do
+      @test_ds.should respond_to(:save)
+    end
+    it "should persist the product of .to_xml in fedora" do
+      Fedora::Repository.instance.expects(:save)
+      @test_ds.expects(:to_xml).returns("fake xml")
+      @test_ds.expects(:blob=).with("fake xml")
+      @test_ds.save
+    end
+  end
+  
+  describe '.to_xml' do
+    it "should provide .to_xml" do
+      @test_ds.should respond_to(:to_xml)
+    end
+    it 'should output the fields hash as XML' do
+      @test_ds.expects(:fields).returns(@sample_fields)
+      returned_xml = XmlSimple.xml_in(@test_ds.to_xml)
+      returned_xml.should == @sample_xml
+    end
+    
+    it 'should accept an optional REXML Document as an argument and insert its fields into that' do
+      @test_ds.expects(:fields).returns(@sample_fields)
+      rexml = REXML::Document.new("<test_rexml/>")
+      rexml.root.elements.expects(:add).times(5)
+      result = @test_ds.to_xml(rexml)
+    end
+    it 'should accept an optional REXML Document as an argument and insert its fields into that' do
+      @test_ds.expects(:fields).returns(@sample_fields)
+      rexml = REXML::Document.new("<test_rexml/>")
+      result = @test_ds.to_xml(rexml)
+      XmlSimple.xml_in(rexml.to_s).should == @sample_xml
+      XmlSimple.xml_in(result).should == @sample_xml
+    end
+    
+    it 'should add to root of REXML::Documents, but add directly to the elements if a REXML::Element is passed in' do
+      @test_ds.expects(:fields).returns(@sample_fields).times(2)
+      doc = REXML::Document.new("<test_document/>")
+      el = REXML::Element.new("<test_element/>")
+      doc.root.elements.expects(:add).times(5)
+      el.expects(:add).times(5)
+      @test_ds.to_xml(doc)
+      @test_ds.to_xml(el)
+    end
+    
+  end
+  
+  describe '.set_blob_for_save' do
+    it "should provide .set_blob_for_save" do
+      @test_ds.should respond_to(:set_blob_for_save)
+    end
+    
+    it "should set the blob to to_xml" do
+      @test_ds.expects(:blob=).with(@test_ds.to_xml)
+      @test_ds.set_blob_for_save
+    end
+  end
+  
+  describe '#field' do
+    
+    before(:each) do
+      class SpecDatastream < ActiveFedora::MetadataDatastream
+        def initialize
+        super
+        field :publisher, :string
+        field :coverage, :text
+        field :creation_date, :date
+        field :mydate, :date
+        field :mycomplicated_field, :string, :multiple=>false, :encoding=>'LCSH', :element_attrs=>{:foo=>:bar, :baz=>:bat}
+        end
+      end
+    end
+    
+    after(:each) do
+      Object.send(:remove_const, :SpecDatastream)
+    end
+    
+    
+    describe ".values" do
+      it "should call ng_xml.values_for(field_name) OR call corresponding lookup method and build an array of values by calling .value on each node in the set"
+    end
+
+    describe ".values<<" do
+      it "should call corresponding builder method"
+    end
+  
+    describe ".values=" do
+      it "should wipe out any existing nodes, use the corresponding builder, and insert new node(s) as the replacement"
+    end
+    
+    it 'should add corresponding field to the @fields hash and set the field :type ' do
+      sds = SpecDatastream.new
+      sds.fields.should_not have_key(:bio)
+      sds.field :bio, :text
+      sds.fields.should have_key(:bio)
+      sds.fields[:bio].should have_key(:type)
+      sds.fields[:bio][:type].should == :text
+      sds.fields[:mycomplicated_field][:element_attrs].should == {:foo=>:bar, :baz=>:bat}
+    end
+    
+    # it "should insert custom element attrs into the xml stream" do
+    #   sds = SpecDatastream.new
+    #   sds.mycomplicated_field_values='foo'
+    #   sds.fields[:mycomplicated_field][:element_attrs].should == {:foo=>:bar, :baz=>:bat}
+    #   sds.to_xml.should == '<fields><mycomplicated_field baz=\'bat\' foo=\'bar\'>foo</mycomplicated_field></fields>'
+    # end
+    
+    it "should add getters and setters and appenders with field name" do
+      local_test_ds = SpecDatastream.new
+      local_test_ds.should respond_to(:publisher_values)
+      local_test_ds.should respond_to(:publisher_append)
+      local_test_ds.should respond_to(:publisher_values=)
+      local_test_ds.publisher_values.class.should == Array
+      local_test_ds.should respond_to(:coverage_values)
+      local_test_ds.should respond_to(:coverage_values=)
+      local_test_ds.should respond_to(:coverage_append)
+      local_test_ds.should respond_to(:creation_date_values)
+      local_test_ds.should respond_to(:creation_date_append)
+      local_test_ds.should respond_to(:creation_date_values=)
+      local_test_ds.should respond_to(:mydate_values)
+      local_test_ds.should respond_to(:mydate_append)
+      local_test_ds.should respond_to(:mydate_values=)
+    end
+    
+    it "should track field values at instance level, not at class level" do
+      local_test_ds1 = SpecDatastream.new
+      local_test_ds2 = SpecDatastream.new
+      local_test_ds1.publisher_values = ["publisher1", "publisher2"]
+      local_test_ds2.publisher_values = ["publisherA", "publisherB"]
+      
+      local_test_ds2.publisher_values.should == ["publisherA", "publisherB"]      
+      local_test_ds1.publisher_values.should == ["publisher1", "publisher2"]
+    end
+    
+    it "should allow you to add field values using <<" do
+      local_test_ds1 = SpecDatastream.new
+      local_test_ds1.publisher_values << "publisher1"
+      local_test_ds1.publisher_values.should == ["publisher1"] 
+    end
+    
+    it "should create setter that always turns non-arrays into arrays" do
+      local_test_ds = SpecDatastream.new
+      local_test_ds.publisher_values = "Foo"
+      local_test_ds.publisher_values.should == ["Foo"]
+    end
+    
+    it "should create setter that sets datastream.dirty? to true" do
+      local_test_ds = SpecDatastream.new
+      local_test_ds.should_not be_dirty
+      local_test_ds.publisher_values = "Foo"
+      local_test_ds.should be_dirty
+      
+      # Note: If you use << to append values, the datastream will not be marked as dirty!
+      #local_test_ds.dirty = false
+      
+      #local_test_ds.should_not be_dirty
+      #local_test_ds.publisher_values << "Foo"
+      #local_test_ds.should be_dirty      
+    end
+    
+    it "should add any extra opts to the field hash" do
+      local_test_ds = SpecDatastream.new
+      local_test_ds.field "myfield", :string, :foo => "foo", :bar => "bar"      
+      local_test_ds.fields[:myfield].should have_key(:foo)
+      local_test_ds.fields[:myfield][:foo].should == "foo"
+      local_test_ds.fields[:myfield].should have_key(:bar)
+      local_test_ds.fields[:myfield][:bar].should == "bar"      
+    end
+    
+  end
+  
+  describe ".to_solr" do
+    
+    after(:all) do
+      # Revert to default mappings after running tests
+      ActiveFedora::SolrService.load_mappings
+    end
+    
+    it "should iterate through the class fields, calling .values on each and appending the values to the solr doc"
+    
+    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)
+    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
+      @test_ds.to_solr(doc).should equal(doc)
+    end
+    
+    it "should iterate through @fields hash" 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[:empty_field_t].should be_nil
+    end
+    
+    it "should allow multiple values for a single field"
+    
+    it 'should append create keys in format field_name + _ + field_type' do
+      @test_ds.stubs(:fields).returns(@sample_fields)
+      
+      #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
+      
+      #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
+      
+    end
+    
+    it "should use Solr mappings to generate field names" do
+      ActiveFedora::SolrService.load_mappings(File.join(File.dirname(__FILE__), "..", "..", "config", "solr_mappings_af_0.1.yml"))
+      @test_ds.stubs(:fields).returns(@sample_fields)
+      solr_doc =  @test_ds.to_solr
+      
+      #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_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
+      @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
+      
+      #should NOT have these
+      
+      @test_ds.to_solr[:mydate].should be_nil
+      @test_ds.to_solr[:creation_date_date].should be_nil
+    end
+    
+  end
+  
+  describe '.fields' do
+    it "should return a Hash" do
+      @test_ds.fields.should be_instance_of(Hash)
+    end
+  end
+  
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 4
-  version: 1.1.4
+  - 5
+  version: 1.1.5
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-15 00:00:00 -05:00
+date: 2010-05-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,9 +72,21 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: nokogiri
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -84,11 +96,11 @@ dependencies:
         - 9
         version: 1.2.9
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -98,11 +110,11 @@ dependencies:
         - 9
         version: 1.2.9
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: ruby-debug
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -110,7 +122,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 description: ActiveFedora provides for creating and managing objects in the Fedora Repository Architecture.
 email: matt.zumwalt@yourmediashelf.com
 executables: []
@@ -312,6 +324,9 @@ files:
 - lib/fedora/formats.rb
 - lib/fedora/generic_search.rb
 - lib/fedora/repository.rb
+- lib/hydra.rb
+- lib/hydra_libs/mods_datastream.rb
+- lib/hydra_libs/opinionated_mods_document.rb
 - lib/ruby-fedora.rb
 - lib/util/class_level_inheritable_attributes.rb
 - script/console
@@ -363,6 +378,8 @@ files:
 - spec/unit/inheritance_spec.rb
 - spec/unit/metadata_datastream_spec.rb
 - spec/unit/model_spec.rb
+- spec/unit/mods_datastream_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
@@ -441,6 +458,8 @@ test_files:
 - spec/unit/inheritance_spec.rb
 - spec/unit/metadata_datastream_spec.rb
 - spec/unit/model_spec.rb
+- spec/unit/mods_datastream_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