active-fedora 6.0.0.pre4 → 6.0.0.pre5

data/History.txt

@@ -1,3 +1,7 @@
+6.0.0
+New solr schema with descriptive field suffixes
+Added support for RDF lists
+
 5.5.1
 #34 Allow passing RDF::URI to rdf_type
 

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', '~>3.0.0.pre2')
+  s.add_dependency('solrizer', '~>3.0.0.pre4')
   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.rb

@@ -50,6 +50,7 @@ module ActiveFedora #:nodoc:
     autoload :QualifiedDublinCoreDatastream
     autoload :Querying
     autoload :RDFDatastream
+    autoload :RdfList
     autoload :RdfNode
     autoload :RdfObject
     autoload :RdfxmlRDFDatastream

data/lib/active_fedora/base.rb

@@ -304,7 +304,10 @@ module ActiveFedora
         c_time = Time.parse(c_time) unless c_time.is_a?(Time)
         m_time = modified_date
         m_time = Time.parse(m_time) unless m_time.is_a?(Time)
-        solr_doc.merge!(SOLR_DOCUMENT_ID.to_sym => pid, ActiveFedora::SolrService.solr_name(:system_create, type: :date) => c_time.utc.xmlschema, ActiveFedora::SolrService.solr_name(:system_modified, type: :date) => m_time.utc.xmlschema, ActiveFedora::SolrService.solr_name(:active_fedora_model, :symbol) => self.class.inspect)
+        Solrizer.set_field(solr_doc, 'system_create', c_time)
+        Solrizer.set_field(solr_doc, 'system_modified', m_time)
+        Solrizer.set_field(solr_doc, 'active_fedora_model', self.class.inspect, :symbol)
+        solr_doc.merge!(SOLR_DOCUMENT_ID.to_sym => pid)
         solrize_profile(solr_doc)
       end
       datastreams.each_value do |ds|

data/lib/active_fedora/rdf_list.rb

@@ -0,0 +1,40 @@
+module ActiveFedora
+  module RdfList
+    attr_reader :graph, :subject
+    def initialize(graph, subject)
+      @graph = graph
+      @subject = subject
+    end
+    def first
+      self[0] 
+    end
+
+    def [](idx)
+      idx == 0 ?  head.value : tail[idx-1]
+    end
+
+    def size
+      tail ?  tail.size + 1 : 0
+    end
+
+    def value
+      v = graph.query([subject, RDF.first, nil]).first
+      return v.object if v.object.uri?
+      if v.object.resource?
+        type = graph.query([v.object, RDF.type, nil]).first
+        return ActiveFedora::RdfNode.rdf_registry[type.object].new(graph, v.object)
+      end
+      v
+    end
+
+    def head
+      @head ||= self.class.new(graph, subject)
+    end
+
+    def tail
+      rest = graph.query([subject, RDF.rest, nil]).first
+      return unless rest
+      self.class.new(graph, rest.object)
+    end
+  end
+end

data/lib/active_fedora/rdf_node.rb

@@ -5,6 +5,12 @@ module ActiveFedora
 
     autoload :TermProxy
 
+    # Mapping from URI to ruby class
+    def self.rdf_registry
+      @@rdf_registry ||= {}
+    end
+
+
     ##
     # Get the subject for this rdf object
     def rdf_subject
@@ -191,6 +197,7 @@ module ActiveFedora
           uri = uri_or_string.kind_of?(RDF::URI) ? uri_or_string : RDF::URI.new(uri_or_string) 
           self.config[:type] = {predicate: RDF.type}
           @rdf_type = uri
+          ActiveFedora::RdfNode.rdf_registry[uri] = self
         end
         @rdf_type
       end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "6.0.0.pre4"
+  VERSION = "6.0.0.pre5"
 end

data/spec/unit/base_spec.rb

@@ -392,8 +392,8 @@ describe ActiveFedora::Base do
         @test_object.should_receive(:create_date).and_return("2012-03-04T03:12:02Z")
         @test_object.should_receive(:modified_date).and_return("2012-03-07T03:12:02Z")
         solr_doc = @test_object.to_solr
-        solr_doc[ActiveFedora::SolrService.solr_name("system_create", type: :date)].should eql("2012-03-04T03:12:02Z")
-        solr_doc[ActiveFedora::SolrService.solr_name("system_modified", type: :date)].should eql("2012-03-07T03:12:02Z")
+        solr_doc[ActiveFedora::SolrService.solr_name("system_create", type: :date)].should eql(["2012-03-04T03:12:02Z"])
+        solr_doc[ActiveFedora::SolrService.solr_name("system_modified", type: :date)].should eql(["2012-03-07T03:12:02Z"])
         solr_doc[:id].should eql("#{@test_object.pid}")
       end
 
@@ -411,7 +411,7 @@ describe ActiveFedora::Base do
         stub_get_content(@this_pid, ['RELS-EXT', 'someData', 'withText2', 'withText'])
         @test_history = FooHistory.new()
         solr_doc = @test_history.to_solr
-        solr_doc[ActiveFedora::SolrService.solr_name("active_fedora_model", :symbol)].should eql("FooHistory")
+        solr_doc[ActiveFedora::SolrService.solr_name("active_fedora_model", :symbol)].should eql(["FooHistory"])
       end
 
       it "should call .to_solr on all SimpleDatastreams and OmDatastreams, passing the resulting document to solr" do

data/spec/unit/rdf_list_spec.rb

@@ -0,0 +1,107 @@
+require 'spec_helper'
+
+describe ActiveFedora::RdfList do
+  before :each do
+    class MADS < RDF::Vocabulary("http://www.loc.gov/mads/rdf/v1#")
+      property :complexSubject
+      property :authoritativeLabel
+      property :elementList
+      property :elementValue
+      property :TopicElement
+      property :TemporalElement
+    end
+    class DemoList < ActiveFedora::RdfxmlRDFDatastream
+      map_predicates do |map|
+        map.elementList(:in => MADS, :to => 'elementList', :class_name=>'List')
+      end 
+      class List 
+        include ActiveFedora::RdfList
+        class TopicElement
+          include ActiveFedora::RdfObject
+          rdf_type MADS.TopicElement
+          map_predicates do |map|   
+            map.elementValue(:in=> MADS)
+          end
+        end
+        class TemporalElement
+          include ActiveFedora::RdfObject
+          rdf_type MADS.TemporalElement
+          map_predicates do |map|   
+            map.elementValue(:in=> MADS)
+          end
+        end
+      end
+    end
+  end
+  after(:each) do
+    Object.send(:remove_const, :DemoList)
+    Object.send(:remove_const, :MADS)
+  end
+
+  subject do
+    subject = DemoList.new(stub('inner object', :pid=>'foo', :new? =>true), 'descMetadata')
+    subject.content =<<END
+<rdf:RDF
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:mads="http://www.loc.gov/mads/rdf/v1#">
+    
+      <mads:ComplexSubject rdf:about="info:fedora/foo">
+        <mads:elementList rdf:parseType="Collection">
+          <rdf:Description rdf:about="http://library.ucsd.edu/ark:/20775/bbXXXXXXX6"/>
+          <mads:TopicElement>
+            <mads:elementValue>Relations with Mexican Americans</mads:elementValue>
+          </mads:TopicElement>
+          <rdf:Description rdf:about="http://library.ucsd.edu/ark:/20775/bbXXXXXXX4"/>
+          <mads:TemporalElement>
+            <mads:elementValue>20th century</mads:elementValue>
+          </mads:TemporalElement>
+        </mads:elementList>
+      </mads:ComplexSubject>
+    </rdf:RDF>
+END
+
+    subject
+  end
+ it "should have a subject" do
+    subject.rdf_subject.to_s.should == "info:fedora/foo"
+  end
+  it "should have fields" do
+    list = subject.elementList.first
+    list.first.should == "http://library.ucsd.edu/ark:/20775/bbXXXXXXX6"
+    list[1].should be_kind_of DemoList::List::TopicElement
+    list[1].elementValue.should == ["Relations with Mexican Americans"]
+    list[2].should == "http://library.ucsd.edu/ark:/20775/bbXXXXXXX4"
+    list[3].should be_kind_of DemoList::List::TemporalElement
+    list[3].elementValue.should == ["20th century"]
+  end
+
+  it "should have size" do
+    list = subject.elementList.first
+    list.size.should == 4
+  end
+
+  it "should update fields" do
+    list = subject.elementList.first
+    list[3].elementValue = ["1900s"]
+    expected_xml =<<END
+<rdf:RDF
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:mads="http://www.loc.gov/mads/rdf/v1#">
+    
+      <mads:ComplexSubject rdf:about="info:fedora/foo">
+        <mads:elementList rdf:parseType="Collection">
+          <rdf:Description rdf:about="http://library.ucsd.edu/ark:/20775/bbXXXXXXX6"/>
+          <mads:TopicElement>
+            <mads:elementValue>Relations with Mexican Americans</mads:elementValue>
+          </mads:TopicElement>
+          <rdf:Description rdf:about="http://library.ucsd.edu/ark:/20775/bbXXXXXXX4"/>
+          <mads:TemporalElement>
+            <mads:elementValue>1900s</mads:elementValue>
+          </mads:TemporalElement>
+        </mads:elementList>
+      </mads:ComplexSubject>
+    </rdf:RDF>
+
+END
+    subject.content.should be_equivalent_to expected_xml
+  end
+end
+

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre4
+  version: 6.0.0.pre5
+  prerelease: 6
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,11 +11,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-25 00:00:00.000000000 Z
+date: 2013-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,6 +24,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -29,6 +32,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: om
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -36,6 +40,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -43,6 +48,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nom-xml
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -50,6 +56,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -57,20 +64,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: solrizer
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0.pre2
+        version: 3.0.0.pre4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0.pre2
+        version: 3.0.0.pre4
 - !ruby/object:Gem::Dependency
   name: activeresource
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,6 +88,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -85,6 +96,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -92,6 +104,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -99,6 +112,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -106,6 +120,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -113,6 +128,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mediashelf-loggable
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -120,6 +136,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -127,6 +144,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubydora
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,6 +152,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -141,6 +160,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -148,6 +168,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -155,6 +176,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -162,6 +184,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -169,6 +192,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -176,6 +200,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -183,6 +208,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -190,6 +216,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -197,6 +224,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -204,6 +232,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -211,6 +240,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -218,6 +248,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -225,6 +256,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -232,6 +264,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -239,6 +272,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -246,6 +280,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -253,6 +288,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -260,6 +296,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -328,6 +365,7 @@ files:
 - lib/active_fedora/querying.rb
 - lib/active_fedora/railtie.rb
 - lib/active_fedora/rdf_datastream.rb
+- lib/active_fedora/rdf_list.rb
 - lib/active_fedora/rdf_node.rb
 - lib/active_fedora/rdf_node/term_proxy.rb
 - lib/active_fedora/rdf_object.rb
@@ -485,6 +523,7 @@ files:
 - spec/unit/qualified_dublin_core_datastream_spec.rb
 - spec/unit/query_spec.rb
 - spec/unit/rdf_datastream_spec.rb
+- spec/unit/rdf_list_spec.rb
 - spec/unit/rdf_xml_writer_spec.rb
 - spec/unit/rdfxml_rdf_datastream_spec.rb
 - spec/unit/relationship_graph_spec.rb
@@ -501,26 +540,27 @@ files:
 - spec/unit/validations_spec.rb
 homepage: https://github.com/projecthydra/active_fedora
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: rubyfedora
-rubygems_version: 2.0.0.preview2
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A convenience libary for manipulating documents in the Fedora Repository.
 test_files:
 - spec/config_helper.rb
@@ -639,6 +679,7 @@ test_files:
 - spec/unit/qualified_dublin_core_datastream_spec.rb
 - spec/unit/query_spec.rb
 - spec/unit/rdf_datastream_spec.rb
+- spec/unit/rdf_list_spec.rb
 - spec/unit/rdf_xml_writer_spec.rb
 - spec/unit/rdfxml_rdf_datastream_spec.rb
 - spec/unit/relationship_graph_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: 8cb55cd74e7233153b8d46400779006d6073b0ca
-  data.tar.gz: 06e3e355f9e205c19d2b553c09fdd5eab57ac25e
-!binary "U0hBNTEy":
-  metadata.gz: aa2264732f71d40fea161856ed01103939097e6509fa467d43bef22d91269566d2705253326730341b5e811b8ddac51198ebce1795687d5e8272b89506615666
-  data.tar.gz: 462460b1a8e0b046d433ca73935bb58e91583591e3a64bace737dc9a1529ce74f00a14b6280990e145acd0ea340c33e00324e7f95c06b9d1dcb404648ce7fe80