active-fedora 4.0.0.rc17 → 4.0.0.rc18

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active-fedora (4.0.0.rc17)
+    active-fedora (4.0.0.rc18)
       activeresource (>= 3.0.0)
       activesupport (>= 3.0.0)
       equivalent-xml

data/History.txt

@@ -1,4 +1,4 @@
-4.0.0.rc16
+4.0.0.rc18
 Removed deprecations
   * allowing :fedora level in fedora.yml
   * automatic includes of Relationships and FileMethods is removed
@@ -24,6 +24,7 @@ Lazily load solr config
 HYDRA-766 Model#classname_from_uri singularizes terms, but it shouldn't change them.
 HYDRA-767 Remove Model::DEFAULT_NS
 Upgrade Om to 1.6.0
+QualifiedDublinCore now extends immediately from NokogiriDatastream
 
 3.3.2
 HYDRA-745 No need to require :url be present on external datastreams

data/lib/active_fedora/qualified_dublin_core_datastream.rb

@@ -12,27 +12,9 @@ module ActiveFedora
     attr_accessor :fields # TODO this can be removed when Model.find_by_fields_by_solr has been removed.
     
     
-    set_terminology do |t|
-      t.root(:path=>"dc", :xmlns=>"http://purl.org/dc/terms/")
-        t.contributor(:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms")
-        t.coverage(:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms")
-        t.creator(:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms")
-        t.date(:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms")
-        t.description(:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms")
-        t.format(:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms")
-        t.identifier(:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms")
-        t.language(:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms")
-        t.publisher(:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms")
-        t.relation(:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms")
-        t.rights(:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms")
-        t.source(:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms")
-        t.spatial(:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms")
-        t.type_(:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms")
-        t.medium(:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms")
-        t.rights(:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms")
-        t.subject(:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms")
-        t.title(:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms")
-    end
+     set_terminology do |t|
+       t.root(:path=>"dc", :xmlns=>"http://purl.org/dc/terms/")
+     end
 
     define_template :creator do |xml,name|
       xml.creator() do
@@ -42,15 +24,23 @@ module ActiveFedora
     
     #A frozen array of Dublincore Terms.
     DCTERMS = [
-      :contributor, :coverage, :creator,  :description, :format, :identifier, :language, :publisher, :relation,  :source, :title, :abstract, :accessRights, :accrualMethod, :accrualPeriodicity, :accrualPolicy, :alternative, :audience, :available, :bibliographicCitation, :conformsTo, :contributor, :coverage, :created, :creator, :date, :dateAccepted, :dateCopyrighted, :dateSubmitted, :description, :educationLevel, :extent, :format, :hasFormat, :hasPart, :hasVersion, :identifier, :instructionalMethod, :isFormatOf, :isPartOf, :isReferencedBy, :isReplacedBy, :isRequiredBy, :issued, :isVersionOf, :language, :license, :mediator, :medium, :modified, :provenance, :publisher, :references, :relation, :replaces, :requires, :rights, :rightsHolder, :source, :spatial, :subject, :tableOfContents, :temporal, :type, :valid
-    ]
+      :contributor, :coverage, :creator,  :description, :identifier, :language, :publisher, :relation,  :source, :title, :abstract, :accessRights, :accrualMethod, :accrualPeriodicity, :accrualPolicy, :alternative, :audience, :available, :bibliographicCitation, :conformsTo, :contributor, :coverage, :created, :creator, :date, :dateAccepted, :dateCopyrighted, :dateSubmitted, :description, :educationLevel, :extent, :hasFormat, :hasPart, :hasVersion, :identifier, :instructionalMethod, :isFormatOf, :isPartOf, :isReferencedBy, :isReplacedBy, :isRequiredBy, :issued, :isVersionOf, :language, :license, :mediator, :medium, :modified, :provenance, :publisher, :references, :relation, :replaces, :requires, :rights, :rightsHolder, :source, :spatial, :subject, :tableOfContents, :temporal,  :valid
+    ] # removed :type, :format
     DCTERMS.freeze
 
+    #Constructor. this class will call self.field for each DCTERM. In short, all DCTERMS fields will already exist
+    #when this method returns. Each term is marked as a multivalue string.
+    def initialize(digital_object, dsid )
+      super(digital_object, dsid)
+      DCTERMS.each do |el|
+        field el, :string, :multiple=>true
+      end
+    end
+
     # This method generates the various accessor and mutator methods on self for the datastream metadata attributes.
-    # each field will have the 3 magic methods:
-    #   name_values=(arg) 
-    #   name_values 
-    #   name_append(arg)
+    # each field will have the 2 magic methods:
+    #   name=(arg) 
+    #   name 
     #
     #
     # Calling any of the generated methods marks self as dirty.

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "4.0.0.rc17"
+    VERSION = "4.0.0.rc18"
 end

data/spec/integration/full_featured_model_spec.rb

@@ -141,6 +141,7 @@ describe ActiveFedora::Base do
     end
     
     @dublin_core_sample_values.each_pair do |field, value|
+      next if [:format, :type].include?(field)  #format and type are methods declared on Object
       dublin_core_ds.send("#{field.to_s}=", [value])
     end
     

data/spec/unit/qualified_dublin_core_datastream_spec.rb

@@ -45,7 +45,7 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
   end
 
   it "should create the right number of fields" do
-    ActiveFedora::QualifiedDublinCoreDatastream::DCTERMS.size.should == 65
+    ActiveFedora::QualifiedDublinCoreDatastream::DCTERMS.size.should == 62
   end
 
   it "should have unmodifiable constants" do
@@ -91,11 +91,9 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
         end
       end
     end
-    
   end
   
   describe '.to_xml' do
-    
     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>"
@@ -117,7 +115,15 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
                  <dcterms:title>title1</dcterms:title>
               </dc>')
     end
+  end
 
+  describe "#to_solr" do
+    it "should have title" do
+      @test_ds = ActiveFedora::QualifiedDublinCoreDatastream.new(nil, 'qdc' )
+      @test_ds.title = "War and Peace"
+      solr = @test_ds.to_solr
+      solr["title_t"].should == ["War and Peace"]
+    end
 
   end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 15424183
+  hash: 15424177
   prerelease: 6
   segments: 
   - 4
   - 0
   - 0
   - rc
-  - 17
-  version: 4.0.0.rc17
+  - 18
+  version: 4.0.0.rc18
 platform: ruby
 authors: 
 - Matt Zumwalt