active-fedora 9.0.8 → 9.1.0.rc1

data/lib/active_fedora/persistence.rb

@@ -23,8 +23,8 @@ module ActiveFedora
     # @param [Hash] options
     # @option options [Boolean] :update_index (true) set false to skip indexing
     # @return [Boolean] true if save was successful, otherwise false
-    def save(*args)
-      create_or_update(*args)
+    def save(*options)
+      create_or_update(*options)
     end
 
     def save!(*args)
@@ -72,9 +72,9 @@ module ActiveFedora
     # Delete the object from Fedora and Solr. Run any before/after/around callbacks for destroy
     # @param [Hash] opts
     # @option opts [Boolean] :eradicate if passed in, eradicate the tombstone from Fedora
-    def destroy(*args)
+    def destroy(*opts)
       raise ReadOnlyRecord if readonly?
-      delete(*args)
+      delete(*opts)
     end
 
     def eradicate

data/lib/active_fedora/rdf/datastream_indexing.rb

@@ -26,6 +26,10 @@ module ActiveFedora::RDF
       def indexer
         ActiveFedora::RDF::IndexingService
       end
+
+      def index_config
+        @index_config ||= ActiveFedora::Indexing::Map.new
+      end
     end
 
     protected

data/lib/active_fedora/rdf/fcrepo4.rb

@@ -7,5 +7,6 @@ module ActiveFedora::RDF
     property :hasVersionLabel
     property :lastModified
     property :status
+    property :ServerManaged
   end
 end

data/lib/active_fedora/rdf/indexing_service.rb

@@ -4,7 +4,6 @@ module ActiveFedora::RDF
     attr_reader :object
 
     # @param obj [#resource, #rdf_subject] the object to build an solr document for. Its class must respond to 'properties'
-    # @param prefix_method [Lambda] This method gets the original name of the field and the options passed in. It should return the name of the field in the solr document
     def initialize(obj)
       @object = obj
     end
@@ -22,9 +21,8 @@ module ActiveFedora::RDF
 
       def add_assertions(prefix_method, solr_doc = {})
         fields.each do |field_key, field_info|
-          values = resource.get_values(field_key)
           solr_field_key = solr_document_field_name(field_key, prefix_method)
-          Array(values).each do |val|
+          Array(field_info[:values]).each do |val|
             append_to_solr_doc(solr_doc, solr_field_key, field_info, val)
           end
         end
@@ -70,22 +68,31 @@ module ActiveFedora::RDF
         object.class.properties
       end
 
+      def index_config
+        object.class.index_config
+      end
+
       # returns a Hash, e.g.: {field => { values: [], type: :something, behaviors: [] }, ...}
       def fields
         field_map = {}.with_indifferent_access
 
-        properties.each do |name, config|
-          type = config[:type]
-          behaviors = config[:behaviors]
+        index_config.each do |name, index_field_config|
+          type = index_field_config.data_type
+          behaviors = index_field_config.behaviors
           next unless type and behaviors
-          next if config[:class_name] && config[:class_name] < ActiveFedora::Base
-          resource.query(subject: object.rdf_subject, predicate: config[:predicate]).each_statement do |statement|
-            field_map[name] ||= { values: [], type: type, behaviors: behaviors}
-            field_map[name][:values] << statement.object.to_s
-          end
+          next if kind_of_af_base?(name)
+          field_map[name] = { values: find_values(name), type: type, behaviors: behaviors}
         end
         field_map
       end
 
+      def kind_of_af_base?(name)
+        config = properties[name.to_s]
+        config && config[:class_name] && config[:class_name] < ActiveFedora::Base
+      end
+
+      def find_values(name)
+        object.send(name) || []
+      end
   end
 end

data/lib/active_fedora/rdf/ldp.rb

@@ -3,4 +3,7 @@ class ActiveFedora::RDF::Ldp < RDF::StrictVocabulary("http://www.w3.org/ns/ldp#"
   # Property definitions
   property :contains
   property :member
+  property :PreferContainment
+  property :PreferEmptyContainer
+  property :PreferMembership
 end

data/lib/active_fedora/rdf/rdf_datastream.rb

@@ -16,6 +16,17 @@ module ActiveFedora
         @subject_block ||= lambda { |ds| parent_uri(ds) }
       end
 
+      def property(name, *args, &block)
+        super
+        add_attribute_indexing_config(name, &block) if block_given?
+      end
+
+      def add_attribute_indexing_config(name, &block)
+        Deprecation.warn(RDFDatastream, "Adding indexing to datastreams is deprecated")
+        # TODO the hash can be initalized to return on of these
+        index_config[name] ||= ActiveFedora::Indexing::Map::IndexObject.new &block
+      end
+
       # Trim the last segment off the URI to get the parents uri
       def parent_uri(ds)
         m = /^(.*)\/[^\/]*$/.match(ds.uri)
@@ -27,7 +38,7 @@ module ActiveFedora
       end
 
       ##
-      # @param [Class] an object to set as the resource class, Must be a descendant of 
+      # @param [Class] klass an object to set as the resource class, Must be a descendant of
       # ActiveTriples::Resource and include ActiveFedora::RDF::Persistence.
       #
       # @return [Class] the object resource class

data/lib/active_fedora/solr_query_builder.rb

@@ -21,7 +21,7 @@ module ActiveFedora
     end
 
     # Create a query with a clause for each key, value
-    # @param [Hash, Array<Array<String>>] args key is the predicate, value is the target_uri
+    # @param [Hash, Array<Array<String>>] field_pairs key is the predicate, value is the target_uri
     # @param [String] join_with ('AND') the value we're joining the clauses with
     # @example
     #   construct_query_for_rel [[:has_model, "info:fedora/afmodel:ComplexCollection"], [:has_model, "info:fedora/afmodel:ActiveFedora_Base"]], 'OR'

data/lib/active_fedora/solr_service.rb

@@ -89,7 +89,7 @@ module ActiveFedora
       end
 
       # Create a query with a clause for each key, value
-      # @param [Hash, Array<Array<String>>] args key is the predicate, value is the target_uri
+      # @param [Hash, Array<Array<String>>] field_pairs key is the predicate, value is the target_uri
       # @param [String] join_with ('AND') the value we're joining the clauses with
       # @example
       #   construct_query_for_rel [[:has_model, "info:fedora/afmodel:ComplexCollection"], [:has_model, "info:fedora/afmodel:ActiveFedora_Base"]], 'OR'

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "9.0.8"
+  VERSION = "9.1.0.rc1"
 end

data/spec/integration/attributes_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 
+
 describe "delegating attributes" do
   before :all do
     class PropertiesDatastream < ActiveFedora::OmDatastream
@@ -13,12 +14,18 @@ describe "delegating attributes" do
       has_metadata 'foo', type: ActiveFedora::SimpleDatastream do |m|
         m.field "title", :string
       end
-      has_attributes :title, datastream: 'foo', multiple: false
+      Deprecation.silence(ActiveFedora::Attributes) do
+        has_attributes :title, datastream: 'foo', multiple: false
+      end
     end
     class RdfObject < ActiveFedora::Base
       contains 'foo', class_name: 'PropertiesDatastream'
-      has_attributes :depositor, datastream: :foo, multiple: false
-      has_attributes :wrangler, datastream: :foo, multiple: true
+      Deprecation.silence(ActiveFedora::Attributes) do
+        has_attributes :depositor, datastream: :foo, multiple: false do |index|
+          index.as :stored_searchable
+        end
+        has_attributes :wrangler, datastream: :foo, multiple: true
+      end
       property :resource_type, predicate: ::RDF::DC.type do |index|
         index.as :stored_searchable, :facetable
       end
@@ -31,6 +38,45 @@ describe "delegating attributes" do
     Object.send(:remove_const, :PropertiesDatastream)
   end
 
+  describe "#index_config" do
+    context "on a class with properties" do
+      subject { RdfObject.index_config }
+      it "should have configuration " do
+        expect(subject[:resource_type].behaviors).to eq [:stored_searchable, :facetable]
+        expect(subject[:depositor].behaviors).to eq [:stored_searchable]
+      end
+    end
+
+    context "when a class inherits properties" do
+      before do
+        class InheritedObject < RdfObject
+        end
+      end
+
+      after do
+        Object.send(:remove_const, :InheritedObject)
+      end
+
+      subject { InheritedObject.index_config }
+
+      it "should have configuration " do
+        expect(subject[:resource_type].behaviors).to eq [:stored_searchable, :facetable]
+        expect(subject[:depositor].behaviors).to eq [:stored_searchable]
+      end
+
+      context "when the inherited config is modifed" do
+        before do
+          InheritedObject.index_config[:resource_type].behaviors.delete(:stored_searchable)
+        end
+        subject { RdfObject.index_config }
+
+        it "the parent config is unchanged" do
+          expect(subject[:resource_type].behaviors).to eq [:stored_searchable, :facetable]
+        end
+      end
+    end
+  end
+
   context "with a simple datastream" do
     describe "save" do
       subject do

data/spec/integration/clean_connection_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+RSpec.describe ActiveFedora::CleanConnection do
+  subject { ActiveFedora.fedora.clean_connection }
+  describe "#get" do
+    context "when given an existing resource uri" do
+      let(:uri) { asset.rdf_subject }
+      let(:asset) do
+        ActiveFedora::Base.create do |a|
+          a.resource << [a.rdf_subject, RDF::DC.title, "test"]
+        end
+      end
+      let(:result) { subject.get(uri) }
+      it "should return a clean graph" do
+        graph = result.graph
+        expect(graph.statements.to_a.length).to eq 1
+        expect(graph.statements.to_a.first).to eq [asset.rdf_subject, RDF::DC.title, "test"]
+      end
+    end
+  end
+end

data/spec/integration/field_to_solr_name_spec.rb

@@ -5,16 +5,20 @@ describe "An object with RDF backed attributes" do
   before do
     class TestOne < ActiveFedora::Base
       class MyMetadata < ActiveFedora::NtriplesRDFDatastream
-        property :title, predicate: ::RDF::DC.title do |index|
-          index.as :stored_searchable
-        end
-        property :date_uploaded, predicate: ::RDF::DC.dateSubmitted do |index|
-          index.type :date
-          index.as :stored_searchable, :sortable
+        Deprecation.silence(ActiveFedora::RDFDatastream) do
+          property :title, predicate: ::RDF::DC.title do |index|
+            index.as :stored_searchable
+          end
+          property :date_uploaded, predicate: ::RDF::DC.dateSubmitted do |index|
+            index.type :date
+            index.as :stored_searchable, :sortable
+          end
         end
       end
       has_metadata 'descMetadata', type: MyMetadata
-      has_attributes :title, :date_uploaded, datastream: 'descMetadata'
+      Deprecation.silence(ActiveFedora::Attributes) do
+        has_attributes :title, :date_uploaded, datastream: 'descMetadata'
+      end
     end
   end
 

data/spec/integration/has_and_belongs_to_many_associations_spec.rb

@@ -355,7 +355,9 @@ describe ActiveFedora::Base do
         has_metadata "foo", type: ActiveFedora::SimpleDatastream do |m|
           m.field "title", :string
         end
-        has_attributes :title, datastream: 'foo'
+        Deprecation.silence(ActiveFedora::Attributes) do
+          has_attributes :title, datastream: 'foo'
+        end
       end
 
       class Component < ActiveFedora::Base
@@ -363,32 +365,34 @@ describe ActiveFedora::Base do
         has_metadata "foo", type: ActiveFedora::SimpleDatastream do |m|
           m.field "description", :string
         end
-        has_attributes :description, datastream: 'foo'
+        Deprecation.silence(ActiveFedora::Attributes) do
+          has_attributes :description, datastream: 'foo'
+        end
       end
+    end
 
-      after do
-        Object.send(:remove_const, :Item)
-        Object.send(:remove_const, :Component)
-      end
+    after do
+      Object.send(:remove_const, :Item)
+      Object.send(:remove_const, :Component)
+    end
 
-      describe "From the has_and_belongs_to_many side" do
-        describe "dependent records" do
-          let(:component) { Component.create(items: [Item.new(title: 'my title')]) }
+    describe "From the has_and_belongs_to_many side" do
+      describe "dependent records" do
+        let(:component) { Component.create(items: [Item.new(title: 'my title')]) }
 
-          it "should be saved" do
-            component.reload
-            expect(component.items.first.title).to eq 'my title'
-          end
+        it "should be saved" do
+          component.reload
+          expect(component.items.first.title).to eq 'my title'
         end
+      end
 
-        describe "shifting" do
-          let(:component) { Component.new }
-          let(:item) { Item.create }
+      describe "shifting" do
+        let(:component) { Component.new }
+        let(:item) { Item.create }
 
-          it "should set item_ids" do
-            component.items << item
-            expect(component.item_ids).to eq [item.id]
-          end
+        it "should set item_ids" do
+          component.items << item
+          expect(component.item_ids).to eq [item.id]
         end
       end
 
@@ -408,14 +412,14 @@ describe ActiveFedora::Base do
           end
         end
       end
+    end
 
-      describe "From the has_many side" do
-        let(:item) { Item.create(components: [Component.new(description: 'my description')]) }
+    describe "From the has_many side" do
+      let(:item) { Item.create(components: [Component.new(description: 'my description')]) }
 
-        it "should save dependent records" do
-          item.reload
-          expect(item.components.first.description).to eq 'my description'
-        end
+      it "should save dependent records" do
+        item.reload
+        expect(item.components.first.description).to eq 'my description'
       end
     end
   end

data/spec/integration/has_many_associations_spec.rb

@@ -276,14 +276,18 @@ describe "Autosave" do
         has_metadata "foo", type: ActiveFedora::SimpleDatastream do |m|
           m.field "title", :string
         end
-        has_attributes :title, datastream: 'foo'
+        Deprecation.silence(ActiveFedora::Attributes) do
+          has_attributes :title, datastream: 'foo'
+        end
       end
       class Component < ActiveFedora::Base
         belongs_to :item, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf
         has_metadata "foo", type: ActiveFedora::SimpleDatastream do |m|
           m.field "description", :string
         end
-        has_attributes :description, datastream: 'foo'
+        Deprecation.silence(ActiveFedora::Attributes) do
+          has_attributes :description, datastream: 'foo'
+        end
       end
     end
 

data/spec/integration/json_serialization_spec.rb

@@ -12,8 +12,10 @@ describe "Objects should be serialized to JSON" do
           m.field "foo", :text
           m.field "bar", :text
         end
-        has_attributes :foo, datastream: 'descMetadata', multiple: true
-        has_attributes :bar, datastream: 'descMetadata', multiple: false
+        Deprecation.silence(ActiveFedora::Attributes) do
+          has_attributes :foo, datastream: 'descMetadata', multiple: true
+          has_attributes :bar, datastream: 'descMetadata', multiple: false
+        end
         property :title, predicate: ::RDF::DC.title
       end
     end
@@ -43,8 +45,10 @@ describe "Objects should be serialized to JSON" do
       end
 
       class DummyResource < ActiveFedora::RDFDatastream
-        property :license, predicate: ::RDF::DC[:license], class_name: DummySubnode do |index|
-          index.as :searchable, :displayable
+        Deprecation.silence(ActiveFedora::RDFDatastream) do
+          property :license, predicate: ::RDF::DC[:license], class_name: DummySubnode do |index|
+            index.as :searchable, :displayable
+          end
         end
         def serialization_format
           :ntriples
@@ -53,7 +57,9 @@ describe "Objects should be serialized to JSON" do
 
       class DummyAsset < ActiveFedora::Base
         has_metadata  'descMetadata', type: DummyResource
-        has_attributes :relation, datastream: 'descMetadata', at: [:license, :relation], multiple: false
+        Deprecation.silence(ActiveFedora::Attributes) do
+          has_attributes :relation, datastream: 'descMetadata', at: [:license, :relation], multiple: false
+        end
       end
     end
 

data/spec/integration/nested_attribute_spec.rb

@@ -8,7 +8,9 @@ describe "NestedAttribute behavior" do
         m.field "uno", :string
         m.field "dos", :string
       end
-      has_attributes :uno, :dos, datastream: 'someData', multiple: false
+      Deprecation.silence(ActiveFedora::Attributes) do
+        has_attributes :uno, :dos, datastream: 'someData', multiple: false
+      end
     end
 
     # base Car class, used in test for association updates and :allow_destroy flag

data/spec/integration/ntriples_datastream_spec.rb

@@ -7,27 +7,31 @@ describe ActiveFedora::NtriplesRDFDatastream do
       property :size
     end
 
-    class MyDatastream < ActiveFedora::NtriplesRDFDatastream
-      property :title, predicate: ::RDF::DC.title do |index|
-        index.as :stored_searchable, :facetable
-      end
-      property :date_uploaded, predicate: ::RDF::DC.dateSubmitted do |index|
-        index.type :date
-        index.as :stored_searchable, :sortable
-      end
-      property :filesize, predicate: FileVocabulary.size do |index|
-        index.type :integer
-        index.as :stored_sortable
+    Deprecation.silence(ActiveFedora::RDFDatastream) do
+      class MyDatastream < ActiveFedora::NtriplesRDFDatastream
+        property :title, predicate: ::RDF::DC.title do |index|
+          index.as :stored_searchable, :facetable
+        end
+        property :date_uploaded, predicate: ::RDF::DC.dateSubmitted do |index|
+          index.type :date
+          index.as :stored_searchable, :sortable
+        end
+        property :filesize, predicate: FileVocabulary.size do |index|
+          index.type :integer
+          index.as :stored_sortable
+        end
+        property :part, predicate: ::RDF::DC.hasPart
+        property :based_near, predicate: ::RDF::FOAF.based_near
+        property :related_url, predicate: ::RDF::RDFS.seeAlso
       end
-      property :part, predicate: ::RDF::DC.hasPart
-      property :based_near, predicate: ::RDF::FOAF.based_near
-      property :related_url, predicate: ::RDF::RDFS.seeAlso
     end
 
     class RdfTest < ActiveFedora::Base
       has_metadata 'rdf', type: MyDatastream
-      has_attributes :based_near, :related_url, :part, :date_uploaded, datastream: 'rdf', multiple: true
-      has_attributes :title, :filesize, datastream: 'rdf', multiple: false
+      Deprecation.silence(ActiveFedora::Attributes) do
+        has_attributes :based_near, :related_url, :part, :date_uploaded, datastream: 'rdf', multiple: true
+        has_attributes :title, :filesize, datastream: 'rdf', multiple: false
+      end
     end
     @subject = RdfTest.new
   end
@@ -216,7 +220,9 @@ describe ActiveFedora::NtriplesRDFDatastream do
       end
       class Foobar < ActiveFedora::Base 
         has_metadata 'rdf', type: TitleDatastream
-        has_attributes :title, datastream: 'rdf', multiple: true
+        Deprecation.silence(ActiveFedora::Attributes) do
+          has_attributes :title, datastream: 'rdf', multiple: true
+        end
       end
       @subject = Foobar.new
       @subject.title = ["title1", "title2", "title3"]