active-fedora 4.0.0.rc16 → 4.0.0.rc17

data/spec/unit/inheritance_spec.rb

@@ -1,10 +1,5 @@
 require 'spec_helper'
 
-require 'active_fedora'
-require 'active_fedora/base'
-require 'active_fedora/metadata_datastream'
-require 'active_fedora/qualified_dublin_core_datastream'
-
 describe ActiveFedora::Base do
   before(:each) do
     #Fedora::Repository.instance.stubs(:nextid).returns("_nextid_")
@@ -12,9 +7,10 @@ describe ActiveFedora::Base do
       has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"foostream" do|m|
         m.field "foostream", :string
       end
-      has_metadata :type=>ActiveFedora::QualifiedDublinCoreDatastream, :name=>"dcstream" do|m|
-        m.field "fz", :string
-      end
+      has_metadata :type=>ActiveFedora::QualifiedDublinCoreDatastream, :name=>"dcstream" 
+      # do|m|
+      #   m.field "fz", :string
+      # end
     end
     class Bar  < ActiveFedora::Base
       has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"barstream" do |m|

data/spec/unit/qualified_dublin_core_datastream_spec.rb

@@ -1,52 +1,47 @@
 require 'spec_helper'
 
 describe ActiveFedora::QualifiedDublinCoreDatastream do
+  DC_ELEMENTS = [:contributor, :coverage, :creator, :date, :description, :identifier, :language, :publisher, :relation, :rights, :source]
 
   before(:all) do
     # Load Sample OralHistory Model
     require File.join( File.dirname(__FILE__), "..", "samples","oral_history_sample_model" )
-    @dc_elements = [:contributor, :coverage, :creator, :date, :description, :format, :identifier, :language, :publisher, :relation, :rights, :source]
     @dc_terms = []
   end
   
   before(:each) do
-    stub_get("_nextid_", ['RELS-EXT', 'sensitive_passages', 'significant_passages', 'dublin_core', 'properties'])
-    Rubydora::Repository.any_instance.stubs(:client).returns(@mock_client)
-    ActiveFedora::Base.stubs(:assign_pid).returns("_nextid_")
-    @test_ds = ActiveFedora::QualifiedDublinCoreDatastream.new(nil, nil)
-    @test_ds.stubs(:content).returns('')
+    @sample_xml =  "<dc xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:dcterms='http://purl.org/dc/terms/'>
+          <dcterms:type xsi:type='DCMITYPE'>sound</dcterms:type>
+          <dcterms:medium>medium</dcterms:medium>
+          <dcterms:rights>rights</dcterms:rights>
+          <dcterms:language>English</dcterms:language>
+          <dcterms:temporal>tmp</dcterms:temporal>
+          <dcterms:subject>kw1</dcterms:subject>
+          <dcterms:subject>kw2</dcterms:subject>
+          <dcterms:creator>creator</dcterms:creator>
+          <dcterms:creator>creator</dcterms:creator>
+          <dcterms:contributor>contributor</dcterms:contributor>
+          <dcterms:coverage>coverage</dcterms:coverage>
+          <dcterms:identifier>identifier</dcterms:identifier>
+          <dcterms:relation>relation</dcterms:relation>
+          <dcterms:source>source</dcterms:source>
+          <dcterms:title>title</dcterms:title>
+          <dcterms:extent>extent</dcterms:extent>
+          <dcterms:format>audio/x-wav</dcterms:format>
+          <dcterms:subject xsi:type='LCSH'>sh1</dcterms:subject>
+          <dcterms:subject xsi:type='LCSH'>sh2</dcterms:subject>
+          <dcterms:spatial>sp1</dcterms:spatial>
+          <dcterms:spatial>sp2</dcterms:spatial>
+          <dcterms:publisher>jwa</dcterms:publisher>
+          <dcterms:alternative>alt</dcterms:alternative>
+          <dcterms:description>desc</dcterms:description>
+          <dcterms:date>datestr</dcterms:date>
+        </dc>"
+     @test_ds = ActiveFedora::QualifiedDublinCoreDatastream.from_xml(@sample_xml )
 
   end
   it "from_xml should parse everything correctly" do
-    #originally just tested that lcsh encoding and stuff worked, but the other stuff is worth testing
-    tmpl = OralHistorySampleModel.new.datastreams['dublin_core']
-
-    tmpl.expects(:subject_append).with('sh1')
-    tmpl.expects(:subject_append).with('sh2')
-    tmpl.expects(:subject_append).with('kw2')
-    tmpl.expects(:subject_append).with('kw1')
-    tmpl.expects(:spatial_append).with('sp1')
-    tmpl.expects(:spatial_append).with('sp2')
-    tmpl.expects(:language_append).with('English')
-    tmpl.expects(:alternative_append).with('alt')
-    tmpl.expects(:title_append).with('title')
-    tmpl.expects(:temporal_append).with('tmp')
-    tmpl.expects(:extent_append).with('extent')
-    tmpl.expects(:medium_append).with('medium')
-    tmpl.expects(:format_append).with('audio/x-wav')
-    tmpl.expects(:subject_heading_append).with('sh1')
-    tmpl.expects(:subject_heading_append).with('sh2')
-    tmpl.expects(:creator_append).with('creator')
-    tmpl.expects(:type_append).with('sound')
-    tmpl.expects(:rights_append).with('rights')
-    tmpl.expects(:publisher_append).with('jwa')
-    tmpl.expects(:description_append).with('desc')
-
-    sample_xml = fixture('oh_qdc.xml')
-    sample_ds_xml = Nokogiri::XML::Document.parse(sample_xml).xpath('//foxml:datastream/foxml:datastreamVersion/foxml:xmlContent/dc').first
-    
-    z = ActiveFedora::QualifiedDublinCoreDatastream.from_xml(sample_ds_xml.to_s, tmpl)
-    z.should === tmpl
+    @test_ds.ng_xml.should be_equivalent_to @sample_xml
   end
 
   it "should create the right number of fields" do
@@ -58,31 +53,13 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
 
   end
 
-  it "should have identity in and out" do
-    sample = fixture('oh_qdc.xml')
-    tmpl = OralHistorySampleModel.new.datastreams['dublin_core']
-    x1 = Nokogiri::XML::Document.parse(sample).xpath('/wrapper/foxml:datastream/foxml:datastreamVersion/foxml:xmlContent/dc').first.to_xml
-    z = ActiveFedora::QualifiedDublinCoreDatastream.from_xml(x1, tmpl)
-    y = ActiveFedora::QualifiedDublinCoreDatastream.from_xml(z.to_dc_xml, tmpl)
-    y.to_dc_xml.should == z.to_dc_xml
-  end
-
-  it "should handle arbitrary attribs" do
-    tmpl = OralHistorySampleModel.new.datastreams['dublin_core']
-    tmpl.field :mycomplicated, :string, :xml_node=>'alt', :element_attrs=>{:foo=>'bar'}
-    tmpl.mycomplicated_values='fubar'
-    Nokogiri::XML(tmpl.to_dc_xml).should be_equivalent_to('<dc xmlns:xsi=\'http://www.w3.org/2001/XMLSchema-instance\' xmlns:dcterms=\'http://purl.org/dc/terms/\'><dcterms:alt foo=\'bar\'>fubar</dcterms:alt></dc>')
-  end
-
-
-
   it "should parse dcterms and dcelements from xml" do
     doc = Nokogiri::XML::Document.parse(File.open( File.dirname(__FILE__)+'/../fixtures/changeme155.xml') )
     stream = doc.xpath('//foxml:datastream[@ID=\'dublin_core\']/foxml:datastreamVersion/foxml:xmlContent/dc')
     ds = ActiveFedora::QualifiedDublinCoreDatastream.new(nil, nil)
     n = ActiveFedora::QualifiedDublinCoreDatastream.from_xml(stream.to_xml, ds)
-    n.spatial_values.should == ["Boston [7013445]", "Dorchester [7013575]", "Roxbury [7015002]"] 
-    n.title_values.should ==  ["Oral history with Frances Addelson, 1997 November 14"]
+    n.spatial.should == ["Boston [7013445]", "Dorchester [7013575]", "Roxbury [7015002]"] 
+    n.title.should ==  ["Oral history with Frances Addelson, 1997 November 14"]
     n.dirty?.should == false
 
   end
@@ -102,79 +79,46 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
       ActiveFedora::QualifiedDublinCoreDatastream.should respond_to(:new)
     end
     
-    it 'should initialize an object with fields for all DC elements' do
-      @dc_elements.each do |el|
-        @test_ds.fields.should_not be_nil
-        @test_ds.fields.should have_key("#{el.to_s}".to_sym)
-      end
-    end
     
-    it 'should respond to getters and setters for all DC elements' do
-      @dc_elements.each do |el|
-        @test_ds.should respond_to("#{el.to_s}_values")
-        @test_ds.should respond_to("#{el.to_s}_values=") 
-        eval("@test_ds.#{el.to_s}_values").class.should == Array  
-        eval("@test_ds.#{el.to_s}_values = ['test_value']").should == ['test_value']
+    describe "model methods" do 
+
+      DC_ELEMENTS.each do |el|
+        it "should respond to getters and setters for #{el} element" do
+          pending if el == :type
+          value = "Hey #{el}"
+          @test_ds.send("#{el.to_s}=", value) 
+          @test_ds.send(el).first.should == value  #Looking at first because creator has 2 nodes
+        end
       end
     end
     
   end
   
-  describe 'serialize!' do
-    it "should call .content= with to_dc_xml" do
-      result = @test_ds.to_dc_xml
-      @test_ds.ensure_xml_loaded
-      @test_ds.expects(:content=).with(result)
-      @test_ds.expects(:dirty?).returns(true)
-      @test_ds.serialize!
-    end
-  end
-  
-  describe '.to_dc_xml' do
+  describe '.to_xml' do
     
-    it 'should respond to .to_dc_xml' do
-      @test_ds.should respond_to(:to_dc_xml)
-    end
-
-
-    #
-    # I think the fields should just be tracked as a Nokogiri::XML::Document internally.  Too much BS otherwise.
-    #
-
-
     it 'should output the fields hash as Qualified Dublin Core XML' do
+      #@test_ds.expects(:new?).returns(true).twice
       sample_xml = "<dc xmlns:dcterms='http://purl.org/dc/terms/' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><dcterms:title>title1</dcterms:title><dcterms:publisher>publisher1</dcterms:publisher><dcterms:creator>creator1</dcterms:creator><dcterms:creator>creator2</dcterms:creator></dc>"
-      #@test_ds.expects(:fields).returns({:publisher => ["publisher1"], :creator => ["creator1", "creator2"], :title => ["title1"]})
-      @test_ds.publisher_values = ["publisher1"]
-      @test_ds.creator_values = ["creator1", "creator2"]
-      @test_ds.title_values = ["title1"]
-
-      dc_xml = XmlSimple.xml_in(@test_ds.to_dc_xml)
-      dc_xml.should == XmlSimple.xml_in(sample_xml)
+      @test_ds = ActiveFedora::QualifiedDublinCoreDatastream.new(nil, 'qdc' )
+
+      @test_ds.field :publisher
+      @test_ds.field :creator
+      @test_ds.field :title
+      
+      @test_ds.publisher= ["publisher1"]
+      @test_ds.creator= ["creator1", "creator2"]
+      @test_ds.title= ["title1"]
+
+      @test_ds.to_xml.should be_equivalent_to('
+        <dc xmlns:dcterms="http://purl.org/dc/terms/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+                 <dcterms:publisher>publisher1</dcterms:publisher>
+                 <dcterms:creator>creator1</dcterms:creator>
+                 <dcterms:creator>creator2</dcterms:creator>
+                 <dcterms:title>title1</dcterms:title>
+              </dc>')
     end
 
-    it 'should not include :type information' do
-      @test_ds.publisher_values = ["publisher1"]
-      dc_xml = XmlSimple.xml_in(@test_ds.to_dc_xml)
-      @test_ds.fields[:publisher].should have_key(:type)
-      dc_xml["publisher"].should_not include("type")
-    end
-
-    it "should use specified :xml_node if it is available in the field Hash" do
-      @test_ds.stubs(:fields).returns({:myfieldname => {:values => ["sample spatial coverage"], :xml_node => "nodename" }})
-      Nokogiri::XML::Document.parse(@test_ds.to_dc_xml).xpath('./dc/dcterms:nodename').text.should ==  'sample spatial coverage'
-    end
 
-    it "should use specified :xml_node if it was specified when .field was called" do
-      sample_xml = "<dc xmlns:dcterms='http://purl.org/dc/terms/' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><dcterms:nodename>sample spatial coverage</dcterms:nodename></dc>"
-      @test_ds.field :myfieldname, :string, :xml_node => "nodename"
-      @test_ds.myfieldname_values = "sample spatial coverage"
-      dc_xml = XmlSimple.xml_in(@test_ds.to_dc_xml)
-      dc_xml.should == XmlSimple.xml_in(sample_xml)
-    end
-
-    it "should only apply encoding info and other qualifiers to the nodes that explicitly declare it" do
-    end
   end
 
 

data/spec/unit/solr_digital_object_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe ActiveFedora::SolrDigitalObject do
   describe "repository" do
-    subject { ActiveFedora::SolrDigitalObject.new({}) }
+    subject { ActiveFedora::SolrDigitalObject.new({},{'datastreams'=>{}}) }
     describe "when not finished" do
       it "should not respond_to? :repository" do
         subject.should_not respond_to :repository
@@ -28,7 +28,7 @@ describe ActiveFedora::SolrDigitalObject do
       after do
         Object.send(:remove_const, :WithoutMetadataDs)
       end
-      subject { ActiveFedora::SolrDigitalObject.new({'properties_dsProfile_dsMIME_s' =>'text/xml'}, WithoutMetadataDs) }
+      subject { ActiveFedora::SolrDigitalObject.new({}, {'datastreams'=>{'properties'=>{'dsMIME'=>'text/xml'}}},WithoutMetadataDs) }
       it "should create an xml datastream" do
         subject.datastreams['properties'].should be_kind_of ActiveFedora::NokogiriDatastream
       end

data/spec/unit/solr_service_spec.rb

@@ -1,6 +1,5 @@
 require 'spec_helper'
 
-
 describe ActiveFedora::SolrService do
   before do
     Thread.current[:solr_service]=nil

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 15424181
+  hash: 15424183
   prerelease: 6
   segments: 
   - 4
   - 0
   - 0
   - rc
-  - 16
-  version: 4.0.0.rc16
+  - 17
+  version: 4.0.0.rc17
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-26 00:00:00 Z
+date: 2012-03-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -103,14 +103,14 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15424087
+        hash: 15424083
         segments: 
         - 1
         - 6
         - 0
         - rc
-        - 1
-        version: 1.6.0.rc1
+        - 3
+        version: 1.6.0.rc3
   version_requirements: *id006
   name: om
   type: :runtime
@@ -299,13 +299,14 @@ dependencies:
   requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 43
         segments: 
         - 2
+        - 9
         - 0
-        version: "2.0"
+        version: 2.9.0
   version_requirements: *id019
   name: rspec
   type: :development
@@ -371,7 +372,6 @@ files:
 - lib/active_fedora/associations/belongs_to_association.rb
 - lib/active_fedora/associations/has_and_belongs_to_many_association.rb
 - lib/active_fedora/associations/has_many_association.rb
-- lib/active_fedora/attribute_methods.rb
 - lib/active_fedora/base.rb
 - lib/active_fedora/callbacks.rb
 - lib/active_fedora/config.rb
@@ -432,7 +432,6 @@ files:
 - spec/fixtures/minivan.jpg
 - spec/fixtures/mixed_rdf_descMetadata.nt
 - spec/fixtures/mods_articles/hydrangea_article1.xml
-- spec/fixtures/oh_qdc.xml
 - spec/fixtures/rails_root/config/fake_fedora.yml
 - spec/fixtures/rails_root/config/fedora.yml
 - spec/fixtures/rails_root/config/predicate_mappings.yml
@@ -593,7 +592,6 @@ test_files:
 - spec/fixtures/minivan.jpg
 - spec/fixtures/mixed_rdf_descMetadata.nt
 - spec/fixtures/mods_articles/hydrangea_article1.xml
-- spec/fixtures/oh_qdc.xml
 - spec/fixtures/rails_root/config/fake_fedora.yml
 - spec/fixtures/rails_root/config/fedora.yml
 - spec/fixtures/rails_root/config/predicate_mappings.yml

data/lib/active_fedora/attribute_methods.rb

@@ -1,9 +0,0 @@
-#attribute_methods/write.rb
-module ActiveFedora
-  module AttributeMethods
-    extend ActiveSupport::Concern
-
-    module ClassMethods
-    end
-  end
-end

data/spec/fixtures/oh_qdc.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wrapper xmlns:foxml="info:fedora/fedora-system:def/foxml#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
-
-  <foxml:datastream ID='dublin_core' STATE='A' CONTROL_GROUP='X' VERSIONABLE='true'>
-    <foxml:datastreamVersion SIZE='1726' ID='dublin_core.0' MIMETYPE='text/xml' LABEL='' CREATED='2009-01-15T17:55:49.277Z'>
-      <foxml:xmlContent>
-        <dc xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:dcterms='http://purl.org/dc/terms/'>
-          <dcterms:type xsi:type='DCMITYPE'>sound</dcterms:type>
-          <dcterms:medium>medium</dcterms:medium>
-          <dcterms:rights>rights</dcterms:rights>
-          <dcterms:language>English</dcterms:language>
-          <dcterms:temporal>tmp</dcterms:temporal>
-          <dcterms:subject>kw1</dcterms:subject>
-          <dcterms:subject>kw2</dcterms:subject>
-          <dcterms:creator>creator</dcterms:creator>
-          <dcterms:title>title</dcterms:title>
-          <dcterms:extent>extent</dcterms:extent>
-          <dcterms:format>audio/x-wav</dcterms:format>
-          <dcterms:subject xsi:type='LCSH'>sh1</dcterms:subject>
-          <dcterms:subject xsi:type='LCSH'>sh2</dcterms:subject>
-          <dcterms:spatial>sp1</dcterms:spatial>
-          <dcterms:spatial>sp2</dcterms:spatial>
-          <dcterms:publisher>jwa</dcterms:publisher>
-          <dcterms:alternative>alt</dcterms:alternative>
-          <dcterms:description>desc</dcterms:description>
-          <dcterms:date>datestr</dcterms:date>
-        </dc>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-</wrapper>