active-fedora 5.5.0.rc2 → 5.5.0

data/History.txt

@@ -1,4 +1,4 @@
-5.5.0 (Unreleased)
+5.5.0
 Added support for complex rdf structures.
 Changed RdfDatastream to_solr so that it uses the dsid as the solr prefix, not the datastream class name
 

data/active-fedora.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.add_dependency('rsolr')
   s.add_dependency('om', '~> 1.8.0')
   s.add_dependency('nom-xml', '>=0.5.1')
-  s.add_dependency('solrizer', '~>2.1.0.rc1')
+  s.add_dependency('solrizer', '~>2.1.0')
   s.add_dependency("activeresource", '>= 3.0.0')
   s.add_dependency("activesupport", '>= 3.0.0')
   s.add_dependency("builder", '~> 3.0.0')

data/lib/active_fedora/rdf_datastream.rb

@@ -16,7 +16,7 @@ module ActiveFedora
       # Register a ruby block that evaluates to the subject of the graph
       # By default, the block returns the current object's pid
       # @yield [ds] 'ds' is the datastream instance
-      # This should override the method in rdf_object, which just creates a b-node by default
+      # This should override the method in RdfObject, which just creates a b-node by default
       def rdf_subject &block
         if block_given?
            return @subject_block = block

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "5.5.0.rc2"
+  VERSION = "5.5.0"
 end

data/spec/fixtures/damsObjectModel.xml

@@ -0,0 +1,38 @@
+<rdf:RDF
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:dams="http://library.ucsd.edu/ontology/dams#"
+    xmlns:mads="http://www.loc.gov/mads/rdf/v1#"
+    xmlns:damsid="http://library.ucsd.edu/ark:/20775/">
+  <dams:Object rdf:about="http://library.ucsd.edu/ark:/20775/">
+    <dams:title rdf:parseType="Resource">
+      <rdf:value>example title</rdf:value>
+      <dams:relatedTitle rdf:parseType="Resource">
+        <rdf:value xml:lang="fr">example translated relatedTitle</rdf:value>
+        <dams:type>translated</dams:type>
+      </dams:relatedTitle>
+    </dams:title>
+
+    <dams:date rdf:parseType="Resource">
+      <dams:beginDate>2012-11-27</dams:beginDate>
+      <dams:endDate>2012-11-30</dams:endDate>
+      <rdf:value>2012-11-29</rdf:value>
+    </dams:date>
+
+    <dams:language rdf:resource="http://library.ucsd.edu/ark:/20775/bb12345678"/>
+    <dams:typeOfResource>image</dams:typeOfResource>
+    <dams:otherResource>
+      <dams:RelatedResource>
+        <dams:type>online exhibit</dams:type>
+        <dams:description>foo</dams:description>
+        <dams:uri>http://library.ucsd.edu/test/foo/</dams:uri>
+      </dams:RelatedResource>
+    </dams:otherResource>
+    <dams:relationship>
+      <dams:Relationship>
+        <dams:role rdf:resource="http://library.ucsd.edu/ark:/20775/bd55639754"/>
+        <dams:name rdf:resource="http://library.ucsd.edu/ark:/20775/bb08080808"/>
+      </dams:Relationship>
+    </dams:relationship>
+    <dams:assembledCollection rdf:resource="http://library.ucsd.edu/ark:/20775/bb03030303"/>
+  </dams:Object>
+</rdf:RDF>

data/spec/unit/ntriples_datastream_spec.rb

@@ -94,6 +94,10 @@ describe ActiveFedora::NtriplesRDFDatastream do
       @subject.content = File.new('spec/fixtures/mixed_rdf_descMetadata.nt').read
     end
 
+    after do
+      Object.send(:remove_const, :MyDatastream)
+    end
+
     it "should have fields" do
       @subject.title.should == ["Title of datastream"]
     end
@@ -153,6 +157,9 @@ describe ActiveFedora::NtriplesRDFDatastream do
       @subject = MyDatastream.new(@inner_object, 'solr_rdf')
       @subject.content = File.new('spec/fixtures/solr_rdf_descMetadata.nt').read
     end
+    after(:all) do
+      Object.send(:remove_const, :MyDatastream)
+    end
     before(:each) do  
       @subject.stub(:pid => 'test:1')
     end

data/spec/unit/rdfxml_rdf_datastream_spec.rb

@@ -1,10 +1,9 @@
 require 'spec_helper'
 
 describe ActiveFedora::RdfxmlRDFDatastream do
-    describe "a new instance" do
+  describe "a new instance" do
     before(:each) do
       class MyRdfxmlDatastream < ActiveFedora::RdfxmlRDFDatastream
-        register_vocabularies RDF::DC
         map_predicates do |map|
           map.publisher(:in => RDF::DC)
         end
@@ -19,5 +18,110 @@ describe ActiveFedora::RdfxmlRDFDatastream do
       @subject.publisher = ["St. Martin's Press"]
       @subject.serialize.should =~ /<rdf:RDF/
     end
- end
+  end
+
+  describe "a complex data model" do
+    before do 
+      class DAMS < RDF::Vocabulary("http://library.ucsd.edu/ontology/dams#")
+        property :title
+        property :relatedTitle
+        property :type
+        property :date
+        property :beginDate
+        property :endDate
+        property :language
+        property :typeOfResource
+        property :otherResource
+        property :RelatedResource
+        property :description
+        property :uri
+        property :relationship
+        property :Relationship
+        property :role
+        property :name
+        property :assembledCollection
+        property :Object
+        property :value
+      end
+
+      module RDF
+        # This enables RDF to respond_to? :value
+        def self.value 
+          self[:value]
+        end
+      end
+
+      class MyDatastream < ActiveFedora::RdfxmlRDFDatastream
+        map_predicates do |map|
+          map.resource_type(:in => DAMS, :to => 'typeOfResource')
+          map.title(:in => DAMS, :class_name => 'Description')
+        end
+
+        rdf_subject { |ds| RDF::URI.new(ds.about) }
+
+        attr_reader :about
+
+        def initialize(digital_object=nil, dsid=nil, options={})
+          @about = options.delete(:about)
+          super
+        end
+
+        after_initialize :type_resource
+        def type_resource
+          graph.insert([RDF::URI.new(about), RDF.type, DAMS.Object])
+        end
+
+        def content=(content)
+          super
+          @about = graph.statements.first.subject
+        end
+        class Description
+          include ActiveFedora::RdfObject
+          map_predicates do |map|
+            rdf_type DAMS.Description
+            map.value(:in=> RDF) do |index|
+              index.as :searchable
+            end
+          end
+        end
+      end
+    end
+
+    after do
+      Object.send(:remove_const, :MyDatastream)
+      Object.send(:remove_const, :DAMS)
+    end
+
+    describe "a new instance" do
+      subject { MyDatastream.new(stub('inner object', :pid=>'test:1', :new? =>true), 'descMetadata', about:"http://library.ucsd.edu/ark:/20775/") }
+      it "should have a subject" do
+        subject.rdf_subject.to_s.should == "http://library.ucsd.edu/ark:/20775/"
+      end
+      
+    end
+
+    describe "an instance with content" do
+      subject do
+        subject = MyDatastream.new(stub('inner object', :pid=>'test:1', :new? =>true), 'descMetadata')
+        subject.content = File.new('spec/fixtures/damsObjectModel.xml').read
+        subject
+      end
+      it "should have a subject" do
+        subject.rdf_subject.to_s.should == "http://library.ucsd.edu/ark:/20775/"
+      end
+      it "should have controlGroup" do
+        subject.controlGroup.should == 'X'
+      end
+      it "should have mimeType" do
+        subject.mimeType.should == 'text/xml'
+      end
+      it "should have dsid" do
+        subject.dsid.should == 'descMetadata'
+      end
+      it "should have fields" do
+        subject.resource_type.should == ["image"]
+        subject.title.first.value.should == ["example title"]
+      end
+    end
+  end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 5.5.0.rc2
-  prerelease: 6
+  version: 5.5.0
+  prerelease: 
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-17 00:00:00.000000000 Z
+date: 2013-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -68,7 +68,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0.rc1
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -76,7 +76,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0.rc1
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: activeresource
   requirement: !ruby/object:Gem::Requirement
@@ -412,6 +412,7 @@ files:
 - solr/conf/solrconfig.xml
 - spec/config_helper.rb
 - spec/fixtures/changeme155.xml
+- spec/fixtures/damsObjectModel.xml
 - spec/fixtures/dino.jpg
 - spec/fixtures/dino_jpg_no_file_ext
 - spec/fixtures/dublin_core_rdf_descMetadata.nt
@@ -559,9 +560,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -3492358049671334193
 requirements: []
 rubyforge_project: rubyfedora
 rubygems_version: 1.8.24
@@ -571,6 +575,7 @@ summary: A convenience libary for manipulating documents in the Fedora Repositor
 test_files:
 - spec/config_helper.rb
 - spec/fixtures/changeme155.xml
+- spec/fixtures/damsObjectModel.xml
 - spec/fixtures/dino.jpg
 - spec/fixtures/dino_jpg_no_file_ext
 - spec/fixtures/dublin_core_rdf_descMetadata.nt