active-fedora 6.4.0.rc3 → 6.4.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a1eb1e1a3c105cc030731793feb32cf8dc89302
-  data.tar.gz: 02b3147a121d84e90c304a09b9426fc6adaa5dd4
+  metadata.gz: e6a491ed123f54d269d0768d80a8cb526c1d4b0b
+  data.tar.gz: 1ba1f6930603d6095d178d9762e6c4f465788fce
 SHA512:
-  metadata.gz: 9f6d00fa9c985eef3e8628ff58d876b77fb877e1a455a03e0b1bfc7c12154d263c88d829e2846d26878b66951ba2853c1d750bfc85bd9c634ae059265f9e7a33
-  data.tar.gz: 0068afc60cf344bb57729888180c7037acbb283afa87d6dd155168c924b12ab738cd3f8123746744c5922f3530e9cb7feceb3a70106477af07fd7f73860ddcb9
+  metadata.gz: e93d7508557149bdf107c7bb44b32751e4508506fd562d19d4cff9f74a148e771dc6cbc018e05fa8e603139d7f065046c324fe03ad9c5c7bde924e1b648daf68
+  data.tar.gz: 89d830d304a2ff251d8c4a0f3f2d37b3f370342a99c9432b05861028bb0e1c30420fba0c93184769d053be695a53cd6fa1fad4f5edfc86925de15b271d665fe4

data/lib/active_fedora/delegating.rb

@@ -4,7 +4,7 @@ module ActiveFedora
 
     # Calling inspect may trigger a bunch of loads, but it's mainly for debugging, so no worries.
     def inspect
-      values = self.class.delegate_registry.map {|r| "#{r}:#{send(r).inspect}"}
+      values = self.class.delegates.keys.map {|r| "#{r}:#{send(r).inspect}"}
       "#<#{self.class} pid:\"#{pretty_pid}\", #{values.join(', ')}>"
     end
 
@@ -32,7 +32,7 @@ module ActiveFedora
 
     module ClassMethods
       def delegates
-        @local_delegates ||= {}
+        @local_delegates ||= {}.with_indifferent_access
         return @local_delegates unless superclass.respond_to?(:delegates) and value = superclass.delegates
         @local_delegates = value.dup if @local_delegates.empty?
         @local_delegates
@@ -75,10 +75,6 @@ module ActiveFedora
         end
       end
 
-      def delegate_registry
-        self.delegates.keys
-      end
-
       # Allows you to delegate multiple terminologies to the same datastream, instead
       # having to call the method each time for each term.  The target datastream is the
       # first argument, followed by an array of the terms that will point to that

data/lib/active_fedora/qualified_dublin_core_datastream.rb

@@ -24,8 +24,60 @@ module ActiveFedora
     
     #A frozen array of Dublincore Terms.
     DCTERMS = [
-      :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
+               :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,
+               :isVersionOf,
+               :issued,
+               :language,
+               :license,
+               :mediator,
+               :medium,
+               :modified,
+               :provenance,
+               :publisher,
+               :references,
+               :relation,
+               :replaces,
+               :requires,
+               :rights,
+               :rightsHolder,
+               :source,
+               :spatial,
+               :subject,
+               :tableOfContents,
+               :temporal,
+               :title,
+               :valid
+              ] # removed :type, :format
     DCTERMS.freeze
 
     #Constructor. this class will call self.field for each DCTERM. In short, all DCTERMS fields will already exist

data/lib/active_fedora/querying.rb

@@ -131,7 +131,7 @@ module ActiveFedora
     def condition_to_clauses(key, value)
       unless value.nil?
         # if the key is a property name, turn it into a solr field
-        if self.delegate_registry.include?(key.to_sym)
+        if self.delegates.key?(key)
           # TODO Check to see if `key' is a possible solr field for this class, if it isn't try :searchable instead
           key = ActiveFedora::SolrService.solr_name(key, :stored_searchable, type: :string)
         end

data/lib/active_fedora/rdf_list.rb

@@ -1,6 +1,10 @@
 module ActiveFedora
   module RdfList
+    extend ActiveSupport::Concern
+    include ActiveFedora::RdfNode
+    
     attr_reader :graph, :subject
+    
     def initialize(graph, subject)
       @graph = graph
       @subject = subject
@@ -8,6 +12,31 @@ module ActiveFedora
       graph.insert([subject, RDF.first, RDF.nil]) unless first
       graph.insert([subject, RDF.rest, RDF.nil])
     end
+    
+    # Override assign_nested_attributes
+    def assign_nested_attributes_for_collection_association(association_name, attributes_collection)
+      options = self.nested_attributes_options[association_name]
+    
+      # TODO
+      #check_record_limit!(options[:limit], attributes_collection)
+    
+      if attributes_collection.is_a?(Hash) || attributes_collection.is_a?(String)
+        attributes_collection = [attributes_collection]
+      end
+    
+      association = self.send(association_name)
+      
+      original_length_of_list = self.size
+      attributes_collection.each_with_index do |attributes, index|
+        if attributes.instance_of? Hash
+          attributes = attributes.with_indifferent_access
+          minted_node = association.mint_node(attributes.except(*UNASSIGNABLE_KEYS))
+        else
+          minted_node = association.mint_node(attributes)            
+        end
+        self[original_length_of_list+index] = minted_node
+      end
+    end
 
     def rdf_subject
       subject

data/lib/active_fedora/rdf_node/term_proxy.rb

@@ -18,18 +18,22 @@ module ActiveFedora
 
 
       def build(attributes=nil)
-        new_subject = RDF::Node.new
-        parent.graph.insert([subject, predicate, new_subject])
-        parent.target_class(predicate).new(parent.graph, new_subject).tap do |node|
-          node.attributes = attributes if attributes
-        end
+        node = mint_node(attributes)
+        parent.graph.insert([subject, predicate, node.rdf_subject])
         reset!
-        target.find { |n| n.rdf_subject == new_subject}
+        target.find { |n| n.rdf_subject == node.rdf_subject}
       end
 
       def reset!
         @target = nil
       end
+      
+      def mint_node(attributes=nil)
+        new_subject = RDF::Node.new
+        return parent.target_class(predicate).new(parent.graph, new_subject).tap do |node|
+          node.attributes = attributes if attributes
+        end
+      end
 
       def <<(*values)
         values.each { |value| parent.append(subject, predicate, value) }
@@ -85,6 +89,9 @@ module ActiveFedora
       # Two classes may be valid for the same predicate (e.g. hasMember)
       # If no RDF.type assertion is found, fall back to using target_class
       def class_from_rdf_type(subject)
+        unless subject.kind_of?(RDF::Node)
+          raise ArgumentError, "Expected the value of #{predicate} to be an RDF object but it is a #{subject.class} #{subject.inspect}"
+        end
         q = RDF::Query.new do
           pattern [subject, RDF.type, :value]
         end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "6.4.0.rc3"
+  VERSION = "6.4.0.rc4"
 end

data/spec/integration/complex_rdf_datastream_spec.rb

@@ -27,7 +27,12 @@ describe "Nested Rdf Objects" do
       ds = SpecDatastream.new(mock_obj)
     end
 
-
+    it "should not choke on invalid data" do
+      # set a string in the graph where model expects a node
+      ds.parts = ["foo"]
+      expect {ds.parts.inspect}.to raise_error(ArgumentError, "Expected the value of http://purl.org/dc/terms/hasPart to be an RDF object but it is a String \"foo\"")
+    end
+    
     it "should be able to nest a complex object" do
       comp = SpecDatastream::Component.new(ds.graph)
       comp.label = ["Alternator"]

data/spec/unit/base_delegate_spec.rb

@@ -93,9 +93,16 @@ describe ActiveFedora::Base do
       @n.duck.should == ["Quack", "Peep"]
     end
 
-    it "should accept the array getters and setters" do
-      @n[:duck]= ["Cluck", "Gobble"]
-      @n[:duck].should == ["Cluck", "Gobble"]
+    describe "array getters and setters" do
+      it "should accept symbol keys" do
+        @n[:duck]= ["Cluck", "Gobble"]
+        @n[:duck].should == ["Cluck", "Gobble"]
+      end
+
+      it "should accept string keys" do
+        @n['duck']= ["Cluck", "Gobble"]
+        @n['duck'].should == ["Cluck", "Gobble"]
+      end
     end
 
   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 == 62
+    ActiveFedora::QualifiedDublinCoreDatastream::DCTERMS.size.should == 53
   end
 
   it "should have unmodifiable constants" do

data/spec/unit/rdf_list_nested_attributes_spec.rb

@@ -0,0 +1,110 @@
+require 'spec_helper'
+
+describe ActiveFedora::RdfList do
+  before :each do
+    class MADS < RDF::Vocabulary("http://www.loc.gov/mads/rdf/v1#")
+      property :MADSScheme
+      property :isMemberOfMADSScheme
+      property :authoritativeLabel
+      property :elementList
+      property :elementValue
+      property :Topic
+      property :TopicElement
+      property :TemporalElement
+      property :hasExactExternalAuthority
+    end
+
+    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
+    class ElementList
+      include ActiveFedora::RdfList
+      
+      map_predicates do |map|
+        map.topicElement(:in=> MADS, :to =>"TopicElement", :class_name => "TopicElement")
+        map.temporalElement(:in=> MADS, :to =>"TemporalElement", :class_name => "TemporalElement")
+      end
+      accepts_nested_attributes_for :topicElement, :temporalElement
+    end
+
+    class Topic
+      include ActiveFedora::RdfObject
+      rdf_type MADS.Topic
+      rdf_subject { |ds| RDF::URI.new(Rails.configuration.id_namespace + ds.pid)}
+      map_predicates do |map|
+        map.name(:in => MADS, :to => 'authoritativeLabel')
+        map.elementList(:in => MADS, :class_name=>'ElementList')
+        map.externalAuthority(:in => MADS, :to => 'hasExactExternalAuthority')
+      end
+      accepts_nested_attributes_for :elementList
+    end
+  end
+  after(:each) do
+    Object.send(:remove_const, :Topic)
+    Object.send(:remove_const, :ElementList)
+    Object.send(:remove_const, :TopicElement)
+    Object.send(:remove_const, :TemporalElement)
+    Object.send(:remove_const, :MADS)
+  end
+  
+  describe "nested_attributes" do
+    it "should insert new nodes into RdfLists (rather than calling .build)" do
+      params = {
+        topic: {
+          name: "Baseball",
+          externalAuthority: "http://id.loc.gov/authorities/subjects/sh85012026",
+          elementList_attributes: [
+            topicElement_attributes: [{ elementValue: "Baseball" }, elementValue: "Football"],
+          ]
+        }
+      }
+
+      topic = Topic.new(RDF::Graph.new)
+      topic.attributes = params[:topic]
+      # puts topic.graph.dump(:ntriples)
+      topic.elementList.first.size.should == 2
+      topic.elementList.first[0].should be_kind_of(TopicElement)
+      topic.elementList.first[0].elementValue.should == ["Baseball"]
+      topic.elementList.first[1].should be_kind_of(TopicElement)
+      topic.elementList.first[1].elementValue.should == ["Football"]
+    end
+    it "should insert new nodes of varying types into RdfLists (rather than calling .build)" do
+      # It's Not clear what the syntax should be when an RDF list contains multiple types of sub-nodes.  
+      # This is a guess, which currently works.
+      params = {
+        topic: {
+          name: "Baseball",
+          externalAuthority: "http://id.loc.gov/authorities/subjects/sh85012026",
+          elementList_attributes: [
+            topicElement_attributes: [{ elementValue: "Baseball" }, elementValue: "Football"],
+            temporalElement_attributes: [{elementValue: "1960"}, {elementValue:"Twentieth Century"}],
+          ]
+        }
+      }
+
+      topic = Topic.new(RDF::Graph.new)
+      topic.attributes = params[:topic]
+      # puts topic.graph.dump(:ntriples)
+      topic.elementList.first.size.should == 4
+      topic.elementList.first[0].should be_kind_of(TopicElement)
+      topic.elementList.first[0].elementValue.should == ["Baseball"]
+      topic.elementList.first[1].should be_kind_of(TopicElement)
+      topic.elementList.first[1].elementValue.should == ["Football"]
+      topic.elementList.first[2].should be_kind_of(TemporalElement)
+      topic.elementList.first[2].elementValue.should == ["1960"]
+      topic.elementList.first[3].should be_kind_of(TemporalElement)
+      topic.elementList.first[3].elementValue.should == ["Twentieth Century"]
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 6.4.0.rc3
+  version: 6.4.0.rc4
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -512,6 +512,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_nested_attributes_spec.rb
 - spec/unit/rdf_list_spec.rb
 - spec/unit/rdf_xml_writer_spec.rb
 - spec/unit/rdfxml_rdf_datastream_spec.rb
@@ -677,6 +678,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_nested_attributes_spec.rb
 - spec/unit/rdf_list_spec.rb
 - spec/unit/rdf_xml_writer_spec.rb
 - spec/unit/rdfxml_rdf_datastream_spec.rb