active-fedora 9.0.0.rc2 → 9.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b513eb65cfa8b875c600f6a910d657649ed4cd35
-  data.tar.gz: 4f2801943c3f9911677db0cd78125c7a273c8e2c
+  metadata.gz: a49c5a80114d75ddec80fc7ef09aa0e41f45331e
+  data.tar.gz: 3c7fd10c052aa997fd6d021140aeece4e9da5515
 SHA512:
-  metadata.gz: ac80fd4fb087ff7ddfe32f9d376c5b95afca669905e767dfd1becc5b9320ab6e56c79ce25ac8e6cd2db0b8617fa39fd3d8b1c9f1be0bbc3d32823a23a8f3c06e
-  data.tar.gz: 20d33791726971553587ac70ca49ab623647dd45857dd71a93bc6819502241c86b4f65536053b96ae9e8b2cc954da25114bb17071e0a016f452f6f05b5826bba
+  metadata.gz: 8a4843d2350b989d0785ec900fb722196339a989cf279ea619f7b470cae56d1210e922259d74d3146d60a72ba4e5df390164d0f9716cc43d6fa11b0b93db6cf5
+  data.tar.gz: 0bc39376a1dc54ea35bbf081b40106d88541c1e0282585f27fa5f8aaeb8d9960e090cf8d426d4bf2cb5b8864c10a8730a4b753fe762fa0bab8d7fff8a7e2fdfd

data/active-fedora.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'om', '~> 3.1'
   s.add_dependency 'nom-xml', '>= 0.5.1'
   s.add_dependency "activesupport", '>= 4.1.0'
-  s.add_dependency "active-triples", '~> 0.5.0'
+  s.add_dependency "active-triples", '~> 0.6.0'
   s.add_dependency "rdf-rdfxml", '~> 1.1.0'
   s.add_dependency "linkeddata"
   s.add_dependency "deprecation"
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rdoc"
   s.add_development_dependency "yard"
   s.add_development_dependency "rake"
-  s.add_development_dependency "jettywrapper", ">=1.4.0"
+  s.add_development_dependency "jettywrapper", ">= 2.0.0"
   s.add_development_dependency "rspec", "~> 3.0"
   s.add_development_dependency "equivalent-xml"
   s.add_development_dependency "simplecov", '~> 0.7.1'
@@ -43,4 +43,3 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
 end
-

data/lib/active_fedora/attributes.rb

@@ -171,16 +171,23 @@ module ActiveFedora
       end
 
       def property name, properties={}, &block
+        warn_duplicate_predicates name, properties
         properties = { multiple: true }.merge(properties)
         find_or_create_defined_attribute(name, nil, properties)
         raise ArgumentError, "#{name} is a keyword and not an acceptable property name." if protected_property_name? name
         reflection = ActiveFedora::Attributes::PropertyBuilder.build(self, name, properties, &block)
-        # reflection = ActiveTriple::PropertyBuilder.build(self, name, properties, &block)
         ActiveTriples::Reflection.add_reflection self, name, reflection
       end
 
       private
 
+      def warn_duplicate_predicates new_name, new_properties
+        new_predicate = new_properties[:predicate]
+        self.properties.select{|k, existing| existing.predicate == new_predicate}.each do |key, value| 
+          ActiveFedora::Base.logger.warn "Same predicate (#{new_predicate}) used for properties #{key} and #{new_name}"
+        end
+      end
+
       def find_or_create_defined_attribute(field, dsid, args)
         delegated_attributes[field] ||= DelegatedAttribute.new(field, dsid, datastream_class_for_name(dsid), args)
       end

data/lib/active_fedora/attributes/property_builder.rb

@@ -1,14 +1,14 @@
 module ActiveFedora::Attributes
   class PropertyBuilder < ActiveTriples::PropertyBuilder #:nodoc:
 
-    def self.define_accessors(model, reflection)
-      mixin = model.generated_property_methods
-      name = reflection.term
+    def self.define_accessors(model, reflection, options={})
       if reflection.multiple?
-        define_readers(mixin, name)
-        define_writers(mixin, name)
+        super
       else
+        mixin = model.generated_property_methods
+        name = reflection.term
         define_singular_readers(mixin, name)
+        define_singular_id_reader(mixin, name) unless options[:cast] == false
         define_singular_writers(mixin, name)
       end
     end
@@ -34,6 +34,14 @@ module ActiveFedora::Attributes
       CODE
     end
 
+    def self.define_singular_id_reader(mixin, name)
+      mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def #{name}_id(*args)
+          get_values(:#{name}, :cast => false)
+        end
+      CODE
+    end
+
     def self.define_singular_writers(mixin, name)
       mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
         def #{name}=(value)

data/lib/active_fedora/fedora.rb

@@ -26,6 +26,9 @@ module ActiveFedora
         ActiveFedora::Base.logger.info "Attempted to init base path `#{root_resource_path}`, but it already exists" if ActiveFedora::Base.logger
         return false
     rescue Ldp::NotFound
+      if !host.downcase.end_with?("/rest")
+        ActiveFedora::Base.logger.warn "Fedora URL (#{host}) does not end with /rest. This could be a problem. Check your fedora.yml config"
+      end
       connection.put(root_resource_path, BLANK).success?
     end
 

data/lib/active_fedora/file.rb

@@ -118,7 +118,7 @@ module ActiveFedora
     end
 
     def digest
-      response = metadata.ldp_source.graph.query(:predicate => ::RDF::URI.new("http://fedora.info/definitions/v4/repository#digest"))
+      response = metadata.ldp_source.graph.query(predicate: ActiveFedora::RDF::Fcrepo4.digest)
       response.map(&:object)
     end
 

data/lib/active_fedora/fixity_service.rb

@@ -18,7 +18,7 @@ module ActiveFedora
     end
 
     def status
-      fixity_graph.query(predicate: status_url).map(&:object).first.to_s
+      fixity_graph.query(predicate: ActiveFedora::RDF::Fcrepo4.status).map(&:object).first.to_s
     end
 
     private
@@ -32,10 +32,7 @@ module ActiveFedora
       ::RDF::Graph.new << ::RDF::Reader.for(:ttl).new(response.body)
     end
 
-    def status_url
-      ::RDF::URI("http://fedora.info/definitions/v4/repository#status")
-    end
-
+    # See https://jira.duraspace.org/browse/FCREPO-1247
     def encoded_url uri
       if uri.match("fcr:versions")
         uri.gsub(/fcr:versions/,"fcr%3aversions")

data/lib/active_fedora/indexing.rb

@@ -56,9 +56,11 @@ module ActiveFedora
       end
 
       def reindex_everything
-        descendent_uris(ActiveFedora::Base.id_to_uri('')).each do |uri|
+        descendants = descendant_uris(ActiveFedora::Base.id_to_uri(''))
+        descendants.shift # Discard the root uri
+        descendants.each do |uri|
           logger.debug "Re-index everything ... #{uri}"
-          ActiveFedora::Base.find(LdpResource.new(ActiveFedora.fedora.connection, uri)).update_index
+          ActiveFedora::Base.find(ActiveFedora::Base.uri_to_id(uri)).update_index
         end
       end
 
@@ -77,17 +79,17 @@ module ActiveFedora
         SolrInstanceLoader.new(self, id, solr_doc).object
       end
 
-      def descendent_uris(uri)
+      def descendant_uris(uri)
         resource = Ldp::Resource::RdfSource.new(ActiveFedora.fedora.connection, uri)
         # GET could be slow if it's a big resource, we're using HEAD to avoid this problem,
         # but this causes more requests to Fedora.
         return [] unless Ldp::Response.rdf_source?(resource.head)
-        immediate_descendent_uris = resource.graph.query(predicate: ::RDF::LDP.contains).map { |descendent| descendent.object.to_s }
-        all_descendents_uris = [uri]
-        immediate_descendent_uris.each do |descendent_uri|
-          all_descendents_uris += descendent_uris(descendent_uri)
+        immediate_descendant_uris = resource.graph.query(predicate: ::RDF::LDP.contains).map { |descendant| descendant.object.to_s }
+        all_descendants_uris = [uri]
+        immediate_descendant_uris.each do |descendant_uri|
+          all_descendants_uris += descendant_uris(descendant_uri)
         end
-        all_descendents_uris
+        all_descendants_uris
       end
 
     end

data/lib/active_fedora/nested_attributes.rb

@@ -83,6 +83,18 @@ module ActiveFedora
                 assign_nested_attributes_for_#{type}_association(:#{association_name}, attributes)
               end
             eoruby
+          elsif reflection = reflect_on_property(association_name)
+            resource_class.accepts_nested_attributes_for(association_name, options)
+
+            # Delegate the setter to the resource.
+            class_eval <<-eoruby, __FILE__, __LINE__ + 1
+              remove_possible_method(:#{association_name}_attributes=)
+
+              def #{association_name}_attributes=(attributes)
+                attribute_will_change!(:#{association_name})
+                resource.#{association_name}_attributes=(attributes)
+              end
+            eoruby
           else
             raise ArgumentError, "No association found for name `#{association_name}'. Has it been defined yet?"
           end

data/lib/active_fedora/rdf/fcrepo4.rb

@@ -2,8 +2,10 @@ require 'rdf'
 module ActiveFedora::RDF
   class Fcrepo4 < RDF::StrictVocabulary("http://fedora.info/definitions/v4/repository#")
     property :created
+    property :digest
     property :hasVersion
     property :hasVersionLabel
     property :lastModified
+    property :status
   end
 end

data/lib/active_fedora/version.rb

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

data/lib/tasks/active_fedora_dev.rake

@@ -1,7 +1,6 @@
 APP_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../")
 
 require 'jettywrapper'
-Jettywrapper.hydra_jetty_version = "v8.1.1"
 
 namespace :active_fedora do
   # Use yard to build docs
@@ -40,7 +39,6 @@ namespace :active_fedora do
     end
   end
 
-
   desc "CI build"
   task :ci do
     ENV['environment'] = "test"

data/spec/integration/datastream_rdf_nested_attributes_spec.rb

@@ -0,0 +1,185 @@
+require 'spec_helper'
+
+describe "Nesting attribute behavior of RDFDatastream" do
+  describe ".attributes=" do
+
+    context "complex properties in a datastream" do
+      before do
+        class DummyMADS < RDF::Vocabulary("http://www.loc.gov/mads/rdf/v1#")
+  # TODO this test is order dependent. It expects to use the object created in the previous test
+          # 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
+          property :topic, predicate: DummyMADS.Topic, class_name: "Topic"
+          property :personalName, predicate: DummyMADS.PersonalName, class_name: "PersonalName"
+          property :title, predicate: ::RDF::DC.title
+
+
+          accepts_nested_attributes_for :topic, :personalName
+
+          class Topic < ActiveTriples::Resource
+            property :elementList, predicate: DummyMADS.elementList, class_name: "ComplexRDFDatastream::ElementList"
+            accepts_nested_attributes_for :elementList
+          end
+          class PersonalName < ActiveTriples::Resource
+            property :elementList, predicate: DummyMADS.elementList, class_name: "ComplexRDFDatastream::ElementList"
+            property :extraProperty, predicate: DummyMADS.elementValue, class_name: "ComplexRDFDatastream::Topic"
+            accepts_nested_attributes_for :elementList, :extraProperty
+          end
+          class ElementList < ActiveTriples::List
+            configure type: DummyMADS.elementList
+            property :topicElement, predicate: DummyMADS.TopicElement, class_name: "ComplexRDFDatastream::MadsTopicElement"
+            property :temporalElement, predicate: DummyMADS.TemporalElement
+            property :fullNameElement, predicate: DummyMADS.FullNameElement
+            property :dateNameElement, predicate: DummyMADS.DateNameElement
+            property :nameElement, predicate: DummyMADS.NameElement
+            property :elementValue, predicate: DummyMADS.elementValue
+            accepts_nested_attributes_for :topicElement
+          end
+          class MadsTopicElement < ActiveTriples::Resource
+            configure :type => DummyMADS.TopicElement
+            property :elementValue, predicate: DummyMADS.elementValue
+          end
+        end
+      end
+      after do
+        Object.send(:remove_const, :ComplexRDFDatastream)
+        Object.send(:remove_const, :DummyMADS)
+      end
+      subject { ComplexRDFDatastream.new }
+      let(:params) do
+        { myResource:
+          {
+            topic_attributes: {
+              '0' =>
+              {
+                elementList_attributes: [{
+                  topicElement_attributes: [{
+                    id: 'http://library.ucsd.edu/ark:/20775/bb3333333x',
+                    elementValue:"Cosmology"
+                     }]
+                  }]
+              },
+              '1' =>
+              {
+                elementList_attributes: [{
+                  topicElement_attributes: {'0' => {elementValue:"Quantum Behavior"}}
+                }]
+              }
+            },
+            personalName_attributes: [
+              {
+                id: 'http://library.ucsd.edu/ark:20775/jefferson',
+                elementList_attributes: [{
+                  fullNameElement: "Jefferson, Thomas",
+                  dateNameElement: "1743-1826"
+                }]
+              }
+              #, "Hemings, Sally"
+            ],
+          }
+        }
+      end
+
+      describe "on lists" do
+        subject { ComplexRDFDatastream::PersonalName.new(RDF::Graph.new) }
+        it "should accept a hash" do
+          subject.elementList_attributes =  [{ topicElement_attributes: {'0' => { elementValue:"Quantum Behavior" }, '1' => { elementValue:"Wave Function" }}}]
+          expect(subject.elementList.first[0].elementValue).to eq ["Quantum Behavior"]
+          expect(subject.elementList.first[1].elementValue).to eq ["Wave Function"]
+
+        end
+        it "should accept an array" do
+          subject.elementList_attributes =  [{ topicElement_attributes: [{ elementValue:"Quantum Behavior" }, { elementValue:"Wave Function" }]}]
+          expect(subject.elementList.first[0].elementValue).to eq ["Quantum Behavior"]
+          expect(subject.elementList.first[1].elementValue).to eq ["Wave Function"]
+        end
+      end
+
+      context "from nested objects" do
+        before do
+          # Replace the graph's contents with the Hash
+          subject.attributes = params[:myResource]
+        end
+
+        it 'should have attributes' do
+          expect(subject.topic[0].elementList.first[0].elementValue).to eq ["Cosmology"]
+          expect(subject.topic[1].elementList.first[0].elementValue).to eq ["Quantum Behavior"]
+          expect(subject.personalName.first.elementList.first.fullNameElement).to eq ["Jefferson, Thomas"]
+          expect(subject.personalName.first.elementList.first.dateNameElement).to eq ["1743-1826"]
+        end
+
+        it 'should build nodes with ids' do
+          expect(subject.topic[0].elementList.first[0].rdf_subject).to eq 'http://library.ucsd.edu/ark:/20775/bb3333333x'
+          expect(subject.personalName.first.rdf_subject).to eq  'http://library.ucsd.edu/ark:20775/jefferson'
+        end
+
+        it 'should fail when writing to a non-predicate' do
+          attributes = { topic_attributes: { '0' => { elementList_attributes: [{ topicElement_attributes: [{ fake_predicate:"Cosmology" }] }]}}}
+          expect{ subject.attributes = attributes }.to raise_error ArgumentError
+        end
+
+        it 'should fail when writing to a non-predicate with a setter method' do
+          attributes = { topic_attributes: { '0' => { elementList_attributes: [{ topicElement_attributes: [{ name:"Cosmology" }] }]}}}
+          expect{ subject.attributes = attributes }.to raise_error ArgumentError
+        end
+      end
+    end
+
+    describe "with an existing object" do
+      before(:each) do
+        class SpecDatastream < ActiveFedora::NtriplesRDFDatastream
+          property :parts, predicate: ::RDF::DC.hasPart, :class_name=>'Component'
+          accepts_nested_attributes_for :parts, allow_destroy: true
+
+          class Component < ActiveTriples::Resource
+            property :label, predicate: ::RDF::DC.title
+          end
+        end
+
+      end
+
+      after(:each) do
+        Object.send(:remove_const, :SpecDatastream)
+      end
+      subject { SpecDatastream.new }
+      before do
+        subject.attributes = { parts_attributes: [
+                                  {label: 'Alternator'},
+                                  {label: 'Distributor'},
+                                  {label: 'Transmission'},
+                                  {label: 'Fuel Filter'}]}
+      end
+      let (:replace_object_id) { subject.parts[1].rdf_subject.to_s }
+      let (:remove_object_id) { subject.parts[3].rdf_subject.to_s }
+
+      it "should update nested objects" do
+        subject.parts_attributes= [{id: replace_object_id, label: "Universal Joint"}, {label:"Oil Pump"}, {id: remove_object_id, _destroy: '1', label: "bar1 uno"}]
+
+        expect(subject.parts.map{|p| p.label.first}).to eq ['Alternator', 'Universal Joint', 'Transmission', 'Oil Pump']
+
+      end
+      it "create a new object when the id is provided" do
+       subject.parts_attributes= [{id: 'http://example.com/part#1', label: "Universal Joint"}]
+       expect(subject.parts.last.rdf_subject).to eq RDF::URI('http://example.com/part#1')
+      end
+    end
+  end
+end

data/spec/integration/indexing_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 @@last_id = 0
 
 describe ActiveFedora::Base do
-  describe "descendent_uris" do
+  describe "descendant_uris" do
 
     before :each do
       ids.each do |id|
@@ -14,21 +14,21 @@ describe ActiveFedora::Base do
       ActiveFedora::Base.id_to_uri(ids.first)
     end
 
-    context 'when there there are no descendents' do
+    context 'when there there are no descendants' do
 
       let(:ids) { ['foo'] }
 
       it 'returns an array containing only the URI passed to it' do
-        expect(ActiveFedora::Base.descendent_uris(root_uri(ids))).to eq ids.map {|id| ActiveFedora::Base.id_to_uri(id) }
+        expect(ActiveFedora::Base.descendant_uris(root_uri(ids))).to eq ids.map {|id| ActiveFedora::Base.id_to_uri(id) }
       end
     end
 
-    context 'when there are > 1 descendents' do
+    context 'when there are > 1 descendants' do
 
       let(:ids) { ['foo', 'foo/bar', 'foo/bar/chu'] }
 
-      it 'returns an array containing the URI passed to it, as well as all descendent URIs' do
-        expect(ActiveFedora::Base.descendent_uris(root_uri(ids))).to eq ids.map {|id| ActiveFedora::Base.id_to_uri(id) }
+      it 'returns an array containing the URI passed to it, as well as all descendant URIs' do
+        expect(ActiveFedora::Base.descendant_uris(root_uri(ids))).to eq ids.map {|id| ActiveFedora::Base.id_to_uri(id) }
       end
     end
 
@@ -42,7 +42,20 @@ describe ActiveFedora::Base do
       end
 
       it "should not put the datastream in the decendants list" do
-        expect(ActiveFedora::Base.descendent_uris(root_uri(ids))).not_to include datastream.uri
+        expect(ActiveFedora::Base.descendant_uris(root_uri(ids))).not_to include datastream.uri
+      end
+    end
+
+    describe "reindex_everything" do
+      let(:ids) { ['foo', 'bar'] }
+      let(:solr) { ActiveFedora::SolrService.instance.conn }
+      before do
+        solr.delete_by_query('*:*', params: {'softCommit' => true})
+      end
+      it "should call update_index on every object represented in the sitemap" do
+        expect {
+          ActiveFedora::Base.reindex_everything
+        }.to change { ActiveFedora::SolrService.query('id:foo').size }.from(0).to(1)
       end
     end
   end

data/spec/integration/rdf_nested_attributes_spec.rb

@@ -1,185 +1,55 @@
 require 'spec_helper'
 
-describe "Nesting attribute behavior of RDFDatastream" do
-  describe ".attributes=" do
-
-    describe "complex properties" do
-      before do
-        class DummyMADS < RDF::Vocabulary("http://www.loc.gov/mads/rdf/v1#")
-  # TODO this test is order dependent. It expects to use the object created in the previous test
-          # 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
-          property :topic, predicate: DummyMADS.Topic, class_name: "Topic"
-          property :personalName, predicate: DummyMADS.PersonalName, class_name: "PersonalName"
-          property :title, predicate: ::RDF::DC.title
-
-
-          accepts_nested_attributes_for :topic, :personalName
-
-          class Topic < ActiveTriples::Resource
-            property :elementList, predicate: DummyMADS.elementList, class_name: "ComplexRDFDatastream::ElementList"
-            accepts_nested_attributes_for :elementList
-          end
-          class PersonalName < ActiveTriples::Resource
-            property :elementList, predicate: DummyMADS.elementList, class_name: "ComplexRDFDatastream::ElementList"
-            property :extraProperty, predicate: DummyMADS.elementValue, class_name: "ComplexRDFDatastream::Topic"
-            accepts_nested_attributes_for :elementList, :extraProperty
-          end
-          class ElementList < ActiveTriples::List
-            configure type: DummyMADS.elementList
-            property :topicElement, predicate: DummyMADS.TopicElement, class_name: "ComplexRDFDatastream::MadsTopicElement"
-            property :temporalElement, predicate: DummyMADS.TemporalElement
-            property :fullNameElement, predicate: DummyMADS.FullNameElement
-            property :dateNameElement, predicate: DummyMADS.DateNameElement
-            property :nameElement, predicate: DummyMADS.NameElement
-            property :elementValue, predicate: DummyMADS.elementValue
-            accepts_nested_attributes_for :topicElement
-          end
-          class MadsTopicElement < ActiveTriples::Resource
-            configure :type => DummyMADS.TopicElement
-            property :elementValue, predicate: DummyMADS.elementValue
-          end
-        end
-      end
-      after do
-        Object.send(:remove_const, :ComplexRDFDatastream)
-        Object.send(:remove_const, :DummyMADS)
-      end
-      subject { ComplexRDFDatastream.new }
-      let(:params) do
-        { myResource:
-          {
-            topic_attributes: {
-              '0' =>
-              {
-                elementList_attributes: [{
-                  topicElement_attributes: [{
-                    id: 'http://library.ucsd.edu/ark:/20775/bb3333333x',
-                    elementValue:"Cosmology"
-                     }]
-                  }]
-              },
-              '1' =>
-              {
-                elementList_attributes: [{
-                  topicElement_attributes: {'0' => {elementValue:"Quantum Behavior"}}
-                }]
-              }
-            },
-            personalName_attributes: [
-              {
-                id: 'http://library.ucsd.edu/ark:20775/jefferson',
-                elementList_attributes: [{                         
-                  fullNameElement: "Jefferson, Thomas",
-                  dateNameElement: "1743-1826"
-                }]
-              }
-              #, "Hemings, Sally"
-            ],
-          }
-        }
-      end
+describe "Nesting attribute behavior of RDF resources" do
+  before do
+    class DummyMADS < RDF::Vocabulary("http://www.loc.gov/mads/rdf/v1#")
+      property :Topic
+    end
 
-      describe "on lists" do
-        subject { ComplexRDFDatastream::PersonalName.new(RDF::Graph.new) }
-        it "should accept a hash" do
-          subject.elementList_attributes =  [{ topicElement_attributes: {'0' => { elementValue:"Quantum Behavior" }, '1' => { elementValue:"Wave Function" }}}]
-          expect(subject.elementList.first[0].elementValue).to eq ["Quantum Behavior"]
-          expect(subject.elementList.first[1].elementValue).to eq ["Wave Function"]
+    class ComplexResource < ActiveFedora::Base
+      property :topic, predicate: DummyMADS.Topic, class_name: "Topic"
 
-        end
-        it "should accept an array" do
-          subject.elementList_attributes =  [{ topicElement_attributes: [{ elementValue:"Quantum Behavior" }, { elementValue:"Wave Function" }]}]
-          expect(subject.elementList.first[0].elementValue).to eq ["Quantum Behavior"]
-          expect(subject.elementList.first[1].elementValue).to eq ["Wave Function"]
-        end
+      class Topic < ActiveTriples::Resource
+        property :subject, predicate: ::RDF::DC.subject
       end
+    end
+  end
 
-      context "from nested objects" do
-        before do
-          # Replace the graph's contents with the Hash
-          subject.attributes = params[:myResource]
-        end
-
-        it 'should have attributes' do
-          expect(subject.topic[0].elementList.first[0].elementValue).to eq ["Cosmology"]
-          expect(subject.topic[1].elementList.first[0].elementValue).to eq ["Quantum Behavior"]
-          expect(subject.personalName.first.elementList.first.fullNameElement).to eq ["Jefferson, Thomas"]
-          expect(subject.personalName.first.elementList.first.dateNameElement).to eq ["1743-1826"]
-        end
-        
-        it 'should build nodes with ids' do
-          expect(subject.topic[0].elementList.first[0].rdf_subject).to eq 'http://library.ucsd.edu/ark:/20775/bb3333333x'
-          expect(subject.personalName.first.rdf_subject).to eq  'http://library.ucsd.edu/ark:20775/jefferson'
-        end
-        
-        it 'should fail when writing to a non-predicate' do
-          attributes = { topic_attributes: { '0' => { elementList_attributes: [{ topicElement_attributes: [{ fake_predicate:"Cosmology" }] }]}}}
-          expect{ subject.attributes = attributes }.to raise_error ArgumentError
-        end
+  after do
+    Object.send(:remove_const, :ComplexResource)
+    Object.send(:remove_const, :DummyMADS)
+  end
 
-        it 'should fail when writing to a non-predicate with a setter method' do
-          attributes = { topic_attributes: { '0' => { elementList_attributes: [{ topicElement_attributes: [{ name:"Cosmology" }] }]}}}
-          expect{ subject.attributes = attributes }.to raise_error ArgumentError
-        end
-      end
-    end
+  subject { ComplexResource.new }
 
-    describe "with an existing object" do
-      before(:each) do
-        class SpecDatastream < ActiveFedora::NtriplesRDFDatastream
-          property :parts, predicate: ::RDF::DC.hasPart, :class_name=>'Component'
-          accepts_nested_attributes_for :parts, allow_destroy: true
+  let(:params) { [{ subject: 'Foo' }, { subject: 'Bar' }] }
 
-          class Component < ActiveTriples::Resource
-            property :label, predicate: ::RDF::DC.title
-          end
-        end
+  before do
+    ComplexResource.accepts_nested_attributes_for *args
+    subject.topic_attributes = params
+  end
 
-      end
+  context "when no options are set" do
+    let(:args) { [:topic] }
 
-      after(:each) do
-        Object.send(:remove_const, :SpecDatastream)
-      end
-      subject { SpecDatastream.new }
-      before do
-        subject.attributes = { parts_attributes: [
-                                  {label: 'Alternator'},
-                                  {label: 'Distributor'},
-                                  {label: 'Transmission'},
-                                  {label: 'Fuel Filter'}]}
-      end
-      let (:replace_object_id) { subject.parts[1].rdf_subject.to_s }
-      let (:remove_object_id) { subject.parts[3].rdf_subject.to_s }
+    it "should set the attributes" do
+      expect(subject.topic.size).to eq 2
+      expect(subject.topic.map(&:subject)).to eq [['Foo'], ['Bar']]
+    end
 
-      it "should update nested objects" do
-        subject.parts_attributes= [{id: replace_object_id, label: "Universal Joint"}, {label:"Oil Pump"}, {id: remove_object_id, _destroy: '1', label: "bar1 uno"}]
+    it "should mark the attributes as changed" do
+      expect(subject.changed_attributes).to eq('topic' => [])
+    end
+  end
 
-        expect(subject.parts.map{|p| p.label.first}).to eq ['Alternator', 'Universal Joint', 'Transmission', 'Oil Pump']
+  context "when reject_if is set" do
+    let(:args) { [:topic, reject_if: reject_proc] }
+    let(:reject_proc) { lambda { |attributes| attributes[:subject] == 'Bar' } }
+    let(:params) { [{ subject: 'Foo' }, { subject: 'Bar' }] }
 
-      end
-      it "create a new object when the id is provided" do
-       subject.parts_attributes= [{id: 'http://example.com/part#1', label: "Universal Joint"}]
-       expect(subject.parts.last.rdf_subject).to eq RDF::URI('http://example.com/part#1')
-      end
+    it "should not add terms for which the proc is true" do
+      expect(subject.topic.map(&:subject)).to eq [['Foo']]
     end
   end
+
 end

data/spec/unit/active_fedora_spec.rb

@@ -15,6 +15,24 @@ describe ActiveFedora do
     restore_spec_configuration
   end
 
+  describe "validate Fedora URL" do 
+
+    let(:good_url) { ActiveFedora.fedora_config.credentials[:url] }
+    let(:bad_url) { good_url.gsub('/rest', '/') }
+
+    it "should connect OK" do 
+      expect(ActiveFedora::Base.logger).to_not receive(:warn)
+      ActiveFedora::Fedora.new(url: good_url, base_path: '/test')
+    end
+
+    it "should not connect and warn" do 
+      expect(ActiveFedora::Base.logger).to receive(:warn)
+      expect {
+        ActiveFedora::Fedora.new(url: bad_url, base_path: '/test')
+      }.to raise_error Ldp::HttpError 
+    end
+  end
+
   describe "initialization methods" do
     describe "environment" do
       it "should use config_options[:environment] if set" do

data/spec/unit/base_spec.rb

@@ -10,18 +10,8 @@ describe ActiveFedora::Base do
     end
   end
 
-  describe "reindex_everything" do
-    it "should call update_index on every object represented in the sitemap" do
-      allow(ActiveFedora::Base).to receive(:descendent_uris) { ['http://localhost/test/XXX', 'http://localhost/test/YYY', 'http://localhost/test/ZZZ'] }
-      mock_update = double(:mock_obj)
-      expect(mock_update).to receive(:update_index).exactly(3).times
-      expect(ActiveFedora::Base).to receive(:find).with(instance_of ActiveFedora::LdpResource ).and_return(mock_update).exactly(3).times
-      ActiveFedora::Base.reindex_everything
-    end
-  end
-
   describe "With a test class" do
-    before :each do
+    before do
       class FooHistory < ActiveFedora::Base
         has_metadata 'someData', type: ActiveFedora::SimpleDatastream, autocreate: true do |m|
           m.field "fubar", :string
@@ -46,7 +36,7 @@ describe ActiveFedora::Base do
       end
     end
 
-    after :each do
+    after do
       Object.send(:remove_const, :FooHistory)
       Object.send(:remove_const, :FooAdaptation)
       Object.send(:remove_const, :FooInherited)

data/spec/unit/property_predicate_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe 'Properties with the same predicate' do
+
+  let(:warningMsg) {"Same predicate (http://purl.org/dc/terms/title) used for properties title1 and title2"}
+
+  it "should warn" do
+
+    # Note that the expect test must be before the class is parsed. 
+    expect(ActiveFedora::Base.logger).to receive(:warn).with(warningMsg)
+
+    module TestModel1
+      class Book < ActiveFedora::Base
+        property :title1, predicate: ::RDF::DC.title 
+        property :title2, predicate: ::RDF::DC.title 
+      end
+    end      
+
+  end
+ 
+end
+
+
+describe 'Properties with different predicate' do
+
+  it "should not warn" do
+
+    # Note that the expect test must be before the class is parsed. 
+    expect(ActiveFedora::Base.logger).to_not receive(:warn)
+
+    module TestModel2
+      class Book < ActiveFedora::Base
+        property :title1, predicate: ::RDF::DC.title
+        property :title2, predicate: ::RDF::DC.creator
+      end
+    end
+
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 9.0.0.rc2
+  version: 9.0.0.rc3
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -74,14 +74,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
   requirement: !ruby/object:Gem::Requirement
@@ -200,14 +200,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -438,6 +438,7 @@ files:
 - spec/integration/bug_spec.rb
 - spec/integration/collection_association_spec.rb
 - spec/integration/complex_rdf_datastream_spec.rb
+- spec/integration/datastream_rdf_nested_attributes_spec.rb
 - spec/integration/delete_all_spec.rb
 - spec/integration/eradicate_spec.rb
 - spec/integration/fedora_solr_sync_spec.rb
@@ -513,6 +514,7 @@ files:
 - spec/unit/om_datastream_spec.rb
 - spec/unit/persistence_spec.rb
 - spec/unit/predicates_spec.rb
+- spec/unit/property_predicate_spec.rb
 - spec/unit/property_spec.rb
 - spec/unit/qualified_dublin_core_datastream_spec.rb
 - spec/unit/query_result_builder_spec.rb