active-fedora 6.3.0 → 6.4.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcded8e76a404beaf4995b0a8d4ff0f9747e5170
-  data.tar.gz: 449b9bb2fd96f88fc07e6fe6ab3aecc9015cfe5b
+  metadata.gz: a57c2dc577a4f6595cba76b441203b6d6663d083
+  data.tar.gz: d8192c0c8615c94caf0ebe10820866981eb870e9
 SHA512:
-  metadata.gz: fc219dd3f66394ef8da3b7fca9aeef738f6de5bf91e51d8d8f51b0df35ea52e3f360d7c61477266399bf77bf7a06b9dd9ee196c1758363a5924e41d47756f1cf
-  data.tar.gz: fa2a07fc6796b488e542ab397333a47aff1ac6db3018b5355c654821407ae3f1a7b45493ec05be8cae67d0cb871d25a0e13bf4210b7764734b5965016734fbc1
+  metadata.gz: b6e1153143dc1a2140c155fbffdfa17e721a05c187cdc54f97099a17dd4ff7db3c738eb2de016128b9f3aec119282bf91804f3d2baaa8a3ae95dcc4d54fd4a0b
+  data.tar.gz: 4492eb4d126ee07a15c43e9403722fa5dca9d26d111d8aa6fe680c78d7602bf48cacbf1fa93b4cb66fc551fbce1a61d59c89dbab0632ef365626b24fb4bf1ecf

data/.travis.yml

@@ -10,3 +10,5 @@ gemfile:
 notifications:
   irc: "irc.freenode.org#projecthydra"
 
+before_install:
+  - gem install bundler

data/History.txt

@@ -1,3 +1,17 @@
+6.4.0 (unreleased)
+Bump dependency to om 3.0.0 [Justin Coyne]
+
+Updating "active_fedora:model" rails generator [Jeremy Friesen]
+
+Deprecated AF::Base#update_indexed_attributes [Justin Coyne]
+
+Delegate all the array methods for RdfNode::TermProxy [Justin Coyne]
+
+Updating travis config as per Travis instruction [Jeremy Friesen]
+
+Added accepts_nested_attributes_for on RDFNodes [Justin Coyne]
+
+
 6.3.0 (2013-06-14)
 
 Added method: ActiveFedora::Base#required? [Justin Coyne]

data/active-fedora.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version     = '>= 1.9.3'
 
   s.add_dependency('rsolr')
-  s.add_dependency('om', '~> 2.1.0')
+  s.add_dependency('om', '~> 3.0.0')
   s.add_dependency('nom-xml', '>=0.5.1')
   s.add_dependency("activesupport", '>= 3.0.0')
   s.add_dependency("mediashelf-loggable")

data/lib/active_fedora.rb

@@ -6,6 +6,7 @@ require 'active_fedora/rubydora_connection'
 require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/object'
 require 'active_support/core_ext/hash/indifferent_access'
+require "active_support/core_ext/hash/except"
 require 'rdf'
 
 SOLR_DOCUMENT_ID = Solrizer.default_field_mapper.id_field unless defined?(SOLR_DOCUMENT_ID)
@@ -48,6 +49,7 @@ module ActiveFedora #:nodoc:
     autoload :Persistence
     autoload :QualifiedDublinCoreDatastream
     autoload :Querying
+    autoload :Rdf
     autoload :RDFDatastream
     autoload :RdfList
     autoload :RdfNode

data/lib/active_fedora/attributes.rb

@@ -37,6 +37,7 @@ module ActiveFedora
     #  m.update_attributes({"fubar"=>{"-1"=>"mork", "0"=>"york", "1"=>"mangle"}}, :datastreams=>["my_ds", "my_other_ds"])
     #
     def update_indexed_attributes(params={}, opts={})
+      Deprecation.warn(Attributes, 'update_indexed_attributes is deprecated and will be removed in ActiveFedora 7.0.0. Consider using dsid.update_indexed_attributes() instead.', caller)
       if ds = opts[:datastreams]
         ds_array = []
         ds = [ds] unless ds.respond_to? :each
@@ -64,7 +65,7 @@ module ActiveFedora
     #   }
     #   article.update_datastream_attributes( ds_values_hash )
     def update_datastream_attributes(params={}, opts={})
-      Deprecation.warn(Attributes, 'update_datastream_attributes is deprecated. Consider using delegate_to instead.', caller)
+      Deprecation.warn(Attributes, 'update_datastream_attributes is deprecated and will be removed in ActiveFedora 7.0.0. Consider using delegate_to instead.', caller)
       result = params.dup
       params.each_pair do |dsid, ds_params| 
         if datastreams.include?(dsid)
@@ -77,7 +78,7 @@ module ActiveFedora
     end
     
     def get_values_from_datastream(dsid,field_key,default=[])
-      Deprecation.warn(Attributes, 'get_values_from_datastream is deprecated. Consider using Datastream#get_values instead.', caller)
+      Deprecation.warn(Attributes, 'get_values_from_datastream is deprecated and will be removed in ActiveFedora 7.0.0. Consider using Datastream#get_values instead.', caller)
       if datastreams.include?(dsid)
         return datastreams[dsid].get_values(field_key,default)
       else

data/lib/active_fedora/rdf.rb

@@ -0,0 +1,6 @@
+module ActiveFedora
+  module Rdf
+    extend ActiveSupport::Autoload
+    autoload :NestedAttributes
+  end
+end

data/lib/active_fedora/rdf/nested_attributes.rb

@@ -0,0 +1,73 @@
+module ActiveFedora
+  module Rdf
+    module NestedAttributes
+      extend ActiveSupport::Concern
+
+      included do
+        class_attribute :nested_attributes_options, :instance_writer => false
+        self.nested_attributes_options = {}
+      end
+
+      private
+
+      UNASSIGNABLE_KEYS = %w( id _destroy )
+
+      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)
+
+        attributes_collection.each do |attributes|
+          if attributes.instance_of? Hash
+            attributes = attributes.with_indifferent_access
+            association.build(attributes.except(*UNASSIGNABLE_KEYS))
+          else
+            association.build(attributes)            
+          end
+        end
+      end
+
+      module ClassMethods
+        def accepts_nested_attributes_for *relationships
+          relationships.each do |association_name|
+            nested_attributes_options[association_name] = {}
+            generate_association_writer(association_name)
+          end
+        end
+
+        private
+
+        # Generates a writer method for this association. Serves as a point for
+        # accessing the objects in the association. For example, this method
+        # could generate the following:
+        #
+        #   def pirate_attributes=(attributes)
+        #     assign_nested_attributes_for_collection_association(:pirate, attributes)
+        #   end
+        #
+        # This redirects the attempts to write objects in an association through
+        # the helper methods defined below. Makes it seem like the nested
+        # associations are just regular associations.
+        def generate_association_writer(association_name)
+            class_eval <<-eoruby, __FILE__, __LINE__ + 1
+              if method_defined?(:#{association_name}_attributes=)
+                remove_method(:#{association_name}_attributes=)
+              end
+              def #{association_name}_attributes=(attributes)
+                unless attributes.nil?
+                  assign_nested_attributes_for_collection_association(:#{association_name}, attributes)
+                end
+              end
+            eoruby
+        end
+      end
+    end
+  end
+end

data/lib/active_fedora/rdf_node.rb

@@ -2,6 +2,7 @@ module ActiveFedora
   module RdfNode
     extend ActiveSupport::Concern
     extend ActiveSupport::Autoload
+    include ActiveFedora::Rdf::NestedAttributes
 
     autoload :TermProxy
 
@@ -10,7 +11,17 @@ module ActiveFedora
       @@rdf_registry ||= {}
     end
 
-
+    # Comparison Operator
+    # Checks that 
+    #   * RDF subject id (URI) is same
+    #   * Class is the same
+    #   * Both objects reference the same RDF graph in memory
+    def ==(other_object)
+      self.class == other_object.class &&
+      self.rdf_subject.id == other_object.rdf_subject.id &&
+      self.graph.object_id == other_object.graph.object_id
+    end
+    
     ##
     # Get the subject for this rdf object
     def rdf_subject
@@ -62,6 +73,19 @@ module ActiveFedora
 
       TermProxy.new(self, subject, predicate, options)
     end
+
+    # @option [Hash] values the values to assign to this rdf node.
+    def attributes=(values)
+      raise ArgumentError, "values must be a Hash, you provided #{values.class}" unless values.kind_of? Hash
+      self.class.config.keys.each do |key|
+        if values.has_key?(key)
+          set_value(rdf_subject, key, values[key])
+        end
+      end
+      nested_attributes_options.keys.each do |key|
+        send("#{key}_attributes=".to_sym, values["#{key}_attributes".to_sym])
+      end
+    end
  
     def delete_predicate(subject, predicate, values = nil)
       predicate = find_predicate(predicate) unless predicate.kind_of? RDF::URI
@@ -164,6 +188,7 @@ module ActiveFedora
       end
       matching 
     end
+    
     class Builder
       def initialize(parent)
         @parent = parent

data/lib/active_fedora/rdf_node/term_proxy.rb

@@ -4,9 +4,7 @@ module ActiveFedora
 
       attr_reader :graph, :subject, :predicate, :options
 
-      delegate :class, :to_s, :==, :kind_of?, :each, :each_with_index, :map,
-               :empty?, :as_json, :is_a?, :to_ary, :to_a, :inspect, :first,
-               :last, :include?, :count, :size, :join, :[], :to => :values
+      delegate *(Array.public_instance_methods - [:__send__, :__id__, :class, :object_id] + [:as_json]), :to => :values
 
       # @param graph RDF::Graph
       # @param subject RDF::URI
@@ -18,10 +16,12 @@ module ActiveFedora
         @options = options
       end
 
-      def build
+      def build(attributes=nil)
         new_subject = RDF::Node.new
         graph.graph.insert([subject, predicate, new_subject])
-        graph.target_class(predicate).new(graph.graph, new_subject)
+        graph.target_class(predicate).new(graph.graph, new_subject).tap do |node|
+          node.attributes = attributes if attributes
+        end
       end
 
       def <<(*values)
@@ -49,7 +49,7 @@ module ActiveFedora
           # If the user provided options[:class_name], we should query to make sure this 
           # potential solution is of the right RDF.type
           if options[:class_name]
-            klass =  class_from_rdf_type(v, predicate)
+            klass =  class_from_rdf_type(v)
             values << v if klass == ActiveFedora.class_from_string(options[:class_name], graph.class)
           else
             values << v
@@ -57,7 +57,7 @@ module ActiveFedora
         end
 
         if options[:class_name]
-          values = values.map{ |found_subject| class_from_rdf_type(found_subject, predicate).new(graph.graph, found_subject)}
+          values = values.map{ |found_subject| class_from_rdf_type(found_subject).new(graph.graph, found_subject)}
         end
         
         values
@@ -65,10 +65,14 @@ module ActiveFedora
       
       private 
 
+      def target_class
+        graph.target_class(predicate)
+      end
+
       # Look for a RDF.type assertion on this node to see if an RDF class is specified.
       # 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, predicate)
+      def class_from_rdf_type(subject)
         q = RDF::Query.new do
           pattern [subject, RDF.type, :value]
         end
@@ -79,7 +83,7 @@ module ActiveFedora
         end
         
         klass = ActiveFedora::RdfNode.rdf_registry[type_uri.first]
-        klass ||= graph.target_class(predicate)
+        klass ||= target_class
         klass
       end
 

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "6.3.0"
+  VERSION = "6.4.0.rc1"
 end

data/lib/generators/active_fedora/model/model_generator.rb

@@ -6,6 +6,8 @@ module ActiveFedora
     check_class_collision
 
     class_option :directory, :type => :string, :default => 'models', :desc => "Which directory to generate? (i.e. app/DIRECTORY)"
+    class_option :has_file_datastream, :type => :string, :default => nil, :desc => "Name a file datastream to create"
+    class_option :descMetadata, :type => :string, :default => nil, :desc => "Add a descMetadata metadata datastream"
 
     def install
       template('model.rb.erb',File.join('app', directory, "#{file_name}.rb"))

data/lib/generators/active_fedora/model/templates/model.rb.erb

@@ -2,5 +2,30 @@
 #  `rails generate active_fedora::model <%= class_name %>`
 require 'active_fedora/base'
 class <%= class_name %> < ActiveFedora::Base
+  <% if options['descMetadata'] %>
+  has_metadata name: "descMetadata", type: <% options['descMetadata'] %>
+  <% else %>
+  # Uncomment the following lines to add a #descMetadata method that is a
+  #   datastream. You will need to specify the :type:, which may involve
+  #   creating a new Datastream object.
+  #
+  # has_metadata name: "descMetadata", type: <%= class_name %>MetadataDatastream
+  <%- end -%>
+  <% if options['has_file_datastream'] %>
+  has_file_datastream "<%= options['has_file_datastream'] %>"
+  <% else %>
+  # Uncomment the following lines to add an #attachment method that is a
+  #   file_datastream:
+  #
+  # has_file_datastream "attachment"
+  <% end %>
+  # "If you need to add additional attributes to the SOLR document, define the
+  # #to_solr method and make sure to use super"
+  #
+  # def to_solr(solr_document={}, options={})
+  #   super(solr_document, options)
+  #   solr_document["my_attribute_s"] = my_attribute
+  #   return solr_document
+  # end
 
 end

data/lib/generators/active_fedora/model/templates/model_spec.rb.erb

@@ -13,8 +13,6 @@ describe <%= class_name %> do
       subject.reload
     }.to_not raise_error(ActiveFedora::ObjectNotFoundError)
 
-    assert_rels_ext_has_model(subject, JournalEntry)
-
     subject.destroy
   end
 

data/spec/integration/mods_article_integration_spec.rb

@@ -4,15 +4,15 @@ describe ActiveFedora::Base do
   describe ".update_indexed_attributes" do
     before(:each) do
       @test_article = ModsArticle.find("test:fixture_mods_article1")
-      @test_article.update_indexed_attributes({[{:person=>0}, :first_name] => "GIVEN NAMES"}, :datastreams=>"descMetadata")
+      @test_article.descMetadata.update_indexed_attributes({[{:person=>0}, :first_name] => "GIVEN NAMES"})
     end
     after(:each) do
-      @test_article.update_indexed_attributes({[{:person=>0}, :first_name] => "GIVEN NAMES"}, :datastreams=>"descMetadata")
+      @test_article.descMetadata.update_indexed_attributes({[{:person=>0}, :first_name] => "GIVEN NAMES"})
     end
     it "should update the xml in the specified datatsream and save those changes to Fedora" do
       @test_article.get_values_from_datastream("descMetadata", [{:person=>0}, :first_name]).should == ["GIVEN NAMES"]
-      test_args = {:params=>{[{:person=>0}, :first_name]=>{"0"=>"Replacement FirstName"}}, :opts=>{:datastreams=>"descMetadata"}}
-      @test_article.update_indexed_attributes(test_args[:params], test_args[:opts])
+      test_args = {[{:person=>0}, :first_name]=>{"0"=>"Replacement FirstName"}}
+      @test_article.descMetadata.update_indexed_attributes(test_args)
       @test_article.get_values_from_datastream("descMetadata", [{:person=>0}, :first_name]).should == ["Replacement FirstName"]
       @test_article.save
       retrieved_article = ModsArticle.find("test:fixture_mods_article1")

data/spec/integration/rdf_nested_attributes_spec.rb

@@ -0,0 +1,118 @@
+require 'spec_helper'
+
+describe ActiveFedora::RDFDatastream do
+    before do 
+      class DummyMADS < RDF::Vocabulary("http://www.loc.gov/mads/rdf/v1#")
+        # componentList and Types of components
+        property :componentList
+        property :Topic
+        property :Temporal
+        property :PersonalName
+        property :CorporateName
+        property :ComplexSubject
+        
+        
+        # elementList and elementList values
+        property :elementList
+        property :elementValue
+        property :TopicElement
+        property :TemporalElement
+        property :NameElement
+        property :FullNameElement
+        property :DateNameElement
+      end
+
+      class ComplexRDFDatastream < ActiveFedora::NtriplesRDFDatastream
+        map_predicates do |map|
+          map.topic(in: DummyMADS, to: "Topic", class_name:"Topic")
+          map.personalName(in: DummyMADS, to: "PersonalName", class_name:"PersonalName")
+          map.title(in: RDF::DC)
+        end
+
+        accepts_nested_attributes_for :topic, :personalName
+
+        class Topic
+          include ActiveFedora::RdfObject
+          map_predicates do |map|
+            map.elementList(in: DummyMADS, class_name:"ComplexRDFDatastream::ElementList")
+          end
+          accepts_nested_attributes_for :elementList
+        end
+        class PersonalName
+          include ActiveFedora::RdfObject
+          map_predicates do |map|
+            map.elementList(in: DummyMADS, to: "elementList", class_name:"ComplexRDFDatastream::ElementList")
+            map.extraProperty(in: DummyMADS, to: "elementValue", class_name:"ComplexRDFDatastream::Topic")
+          end
+          accepts_nested_attributes_for :elementList, :extraProperty
+        end
+        class ElementList
+          include ActiveFedora::RdfObject
+          rdf_type DummyMADS.elementList
+          map_predicates do |map|
+            map.topicElement(in: DummyMADS, to: "TopicElement")
+            map.temporalElement(in: DummyMADS, to: "TemporalElement")
+            map.fullNameElement(in: DummyMADS, to: "FullNameElement")
+            map.dateNameElement(in: DummyMADS, to: "DateNameElement")
+            map.nameElement(in: DummyMADS, to: "NameElement")
+            map.elementValue(in: DummyMADS)
+          end
+        end
+      end
+    end
+    after do
+      Object.send(:remove_const, :ComplexRDFDatastream)
+      Object.send(:remove_const, :DummyMADS)
+    end
+    subject { ComplexRDFDatastream.new(stub('inner object', :pid=>'foo', :new? =>true), 'descMetadata') }
+    
+    describe ".attributes=" do
+      describe "complex properties" do
+        let(:params) do 
+          { myResource: 
+            {
+              topic_attributes: [
+                {
+                  elementList_attributes: {
+                    topicElement:"Cosmology"
+                    }
+                },
+                {
+                  elementList_attributes: {
+                    topicElement:"Quantum Behavior"
+                  }
+                }
+              ],
+              personalName_attributes: [
+                { 
+                  elementList_attributes: {
+                    fullNameElement: "Jefferson, Thomas",
+                    dateNameElement: "1743-1826"                  
+                  }
+                } 
+                #, "Hemings, Sally"
+              ],
+            }
+          }
+        end
+        it "should support mass-assignment" do
+            # Replace the graph's contents with the Hash
+            subject.attributes = params[:myResource]
+
+            # Here's how this would happen if we didn't have attributes=
+            # personal_name = subject.personalName.build 
+            # elem_list = personal_name.elementList.build
+            # elem_list.fullNameElement = "Jefferson, Thomas"
+            # elem_list.dateNameElement = "1743-1826"
+            # topic = subject.topic.build
+            # elem_list = topic.elementList.build
+            # elem_list.fullNameElement = 'Cosmology'
+
+            subject.topic.first.elementList.first.topicElement.should == ["Cosmology"]
+            subject.topic[1].elementList.first.topicElement.should == ["Quantum Behavior"]
+            subject.personalName.first.elementList.first.fullNameElement.should == ["Jefferson, Thomas"]
+            subject.personalName.first.elementList.first.dateNameElement.should == ["1743-1826"]
+        end
+      end    
+    end
+end

data/spec/integration/solr_service_spec.rb

@@ -24,7 +24,7 @@ describe ActiveFedora::SolrService do
                     "creator"=>{0=>"Linguist, A."},
                     "geography"=>{0=>"Italy"},
                     "title"=>{0=>"Italian and Spanish: A Comparison of Common Phrases"}}
-      @foo_object.update_indexed_attributes(attributes)
+      @foo_object.descMetadata.update_indexed_attributes(attributes)
       @test_object.save
       @foo_object.save
       @profiles = {

data/spec/unit/base_spec.rb

@@ -532,6 +532,9 @@ pending "This is broken, and deprecated.  I don't want to fix it - jcoyne"
     end
     
     describe "update_indexed_attributes" do
+      before do
+        Deprecation.should_receive(:warn).at_least(1).times
+      end
       it "should call .update_indexed_attributes on all metadata datastreams & nokogiri datastreams" do
         m = FooHistory.new
         att= {"fubar"=>{"-1"=>"mork", "0"=>"york", "1"=>"mangle"}}
@@ -549,14 +552,14 @@ pending "This is broken, and deprecated.  I don't want to fix it - jcoyne"
         m.update_indexed_attributes(att, :datastreams=>"withText")
         m.should_not be_nil
         m.datastreams['someData'].fubar.should == []
-        m.datastreams["withText"].fubar.should == ['york', 'mangle']
+        m.datastreams["withText"].fubar.should == ['mork', 'york', 'mangle']
         m.datastreams['withText2'].fubar.should == []
         
         att= {"fubar"=>{"-1"=>"tork", "0"=>"work", "1"=>"bork"}}
         m.update_indexed_attributes(att, :datastreams=>["someData", "withText2"])
         m.should_not be_nil
-        m.datastreams['someData'].fubar.should == ['work', 'bork']
-        m.datastreams['withText2'].fubar.should == ['work', 'bork']
+        m.datastreams['someData'].fubar.should == ['tork', 'work', 'bork']
+        m.datastreams['withText2'].fubar.should == ['tork', 'work', 'bork']
       end
     end
 

data/spec/unit/om_datastream_spec.rb

@@ -76,18 +76,14 @@ describe ActiveFedora::OmDatastream do
     end
     
     it "should apply submitted hash to corresponding datastream field values" do
-      pending if ENV['HUDSON_BUILD'] == 'true'  # This test fails en suite in hudson
       result = @mods_ds.update_indexed_attributes( {[{":person"=>"0"}, "role"]=>{"0"=>"role1", "1"=>"role2", "2"=>"role3"} })
-      result.should == {"person_0_role"=>{"0"=>"role1", "1"=>"role2", "2"=>"role3"}}
-      # xpath = ds.class.accessor_xpath(*field_key)
-      # result = ds.property_values(xpath)
-      
+      result.should == {"person_0_role"=>["role1", "role2", "role3"]}
       @mods_ds.property_values('//oxns:name[@type="personal"][1]/oxns:role').should == ["role1","role2","role3"]
     end
     it "should support single-value arguments (as opposed to a hash of values with array indexes as keys)" do
       # In other words, { "fubar"=>"dork" } should have the same effect as { "fubar"=>{"0"=>"dork"} }
       result = @mods_ds.update_indexed_attributes( { [{":person"=>"0"}, "role"]=>"the role" } )
-      result.should == {"person_0_role"=>{"0"=>"the role"}}
+      result.should == {"person_0_role"=>["the role"]}
       @mods_ds.term_values('//oxns:name[@type="personal"][1]/oxns:role').first.should == "the role"
     end
     it "should do nothing if field key is a string (must be an array or symbol).  Will not accept xpath queries!" do
@@ -105,40 +101,27 @@ describe ActiveFedora::OmDatastream do
     ### Examples copied over form metadata_datastream_spec
     
     it "should work for text fields" do 
-      pending if ENV['HUDSON_BUILD'] == 'true'  # This test fails en suite in hudson
       att= {[{"person"=>"0"},"description"]=>{"-1"=>"mork", "1"=>"york"}}
       result = @mods_ds.update_indexed_attributes(att)
-      result.should == {"person_0_description"=>{"0"=>"mork","1"=>"york"}}
+      result.should == {"person_0_description"=>["mork","york"]}
       @mods_ds.get_values([{:person=>0},:description]).should == ['mork', 'york']
       att= {[{"person"=>"0"},"description"]=>{"-1"=>"dork"}}
       result2 = @mods_ds.update_indexed_attributes(att)
-      result2.should == {"person_0_description"=>{"2"=>"dork"}}
-      @mods_ds.get_values([{:person=>0},:description]).should == ['mork', 'york', 'dork']
+      result2.should == {"person_0_description"=>["dork"]}
+      @mods_ds.get_values([{:person=>0},:description]).should == ['dork']
     end
     
-    it "should return the new index of any added values" do
-      @mods_ds.get_values([{:title_info=>0},:main_title]).should == ["ARTICLE TITLE", "TITLE OF HOST JOURNAL"]
-      result = @mods_ds.update_indexed_attributes [{"title_info"=>"0"},"main_title"]=>{"-1"=>"mork"}
-      result.should == {"title_info_0_main_title"=>{"2"=>"mork"}}
-    end
-
     it "should allow deleting of values and should delete values so that to_xml does not return emtpy nodes" do
-      pending if ENV['HUDSON_BUILD'] == 'true'  # This test fails en suite in hudson
       att= {[{"person"=>"0"},"description"]=>{"0"=>"york", "1"=>"mangle","2"=>"mork"}}
       @mods_ds.update_indexed_attributes(att)
       @mods_ds.get_values([{"person"=>"0"},"description"]).should == ['york', 'mangle', 'mork']
       
-      @mods_ds.update_indexed_attributes({[{"person"=>"0"},"description"]=>{"1"=>""}})
+      @mods_ds.update_indexed_attributes({[{"person"=>"0"},{"description" => '1'} ]=> nil})
       @mods_ds.get_values([{"person"=>"0"},"description"]).should == ['york', 'mork']
       
-      @mods_ds.update_indexed_attributes({[{"person"=>"0"},"description"]=>{"0"=>:delete}})
+      @mods_ds.update_indexed_attributes({[{"person"=>"0"},{"description" => '0'}]=>:delete})
       @mods_ds.get_values([{"person"=>"0"},"description"]).should == ['mork']
     end
-    # it "should delete values so that to_xml does not return emtpy nodes" do
-    #   @test_ds.fubar_values = ["val1", nil, "val2"]
-    #   @test_ds.update_indexed_attributes({{[{"person"=>"0"},"description"]=>{"1"=>""}})
-    #   @test_ds.fubar_values.should == ["val1", "val2"]
-    # end
     
     it "should set changed to true" do
       @mods_ds.get_values([{:title_info=>0},:main_title]).should == ["ARTICLE TITLE", "TITLE OF HOST JOURNAL"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 6.3.0
+  version: 6.4.0.rc1
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: nom-xml
   requirement: !ruby/object:Gem::Requirement
@@ -340,6 +340,8 @@ files:
 - lib/active_fedora/qualified_dublin_core_datastream.rb
 - lib/active_fedora/querying.rb
 - lib/active_fedora/railtie.rb
+- lib/active_fedora/rdf.rb
+- lib/active_fedora/rdf/nested_attributes.rb
 - lib/active_fedora/rdf_datastream.rb
 - lib/active_fedora/rdf_list.rb
 - lib/active_fedora/rdf_node.rb
@@ -427,6 +429,7 @@ files:
 - spec/integration/ntriples_datastream_spec.rb
 - spec/integration/om_datastream_spec.rb
 - spec/integration/persistence_spec.rb
+- spec/integration/rdf_nested_attributes_spec.rb
 - spec/integration/rels_ext_datastream_spec.rb
 - spec/integration/scoped_query_spec.rb
 - spec/integration/solr_instance_loader_spec.rb
@@ -542,9 +545,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3
@@ -591,6 +594,7 @@ test_files:
 - spec/integration/ntriples_datastream_spec.rb
 - spec/integration/om_datastream_spec.rb
 - spec/integration/persistence_spec.rb
+- spec/integration/rdf_nested_attributes_spec.rb
 - spec/integration/rels_ext_datastream_spec.rb
 - spec/integration/scoped_query_spec.rb
 - spec/integration/solr_instance_loader_spec.rb