active-fedora 9.0.0.beta8 → 9.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c24dde2e32be3f35bb1d77501279572cb2695ca4
-  data.tar.gz: 87e6796cd6ae6aac4bf464e11b2a2739f3a803fa
+  metadata.gz: 13402b752c7ef731670f4731f9243fa5d3b905fd
+  data.tar.gz: 2161503f9a2d5723f6e6756aa97a9452f23db43f
 SHA512:
-  metadata.gz: 43b3dbe69386c97045ea8652f286c872bd3874d9c95b11b28f99203e357a7445f0287d27daefcb5c74fca1a6fab6d8f9af33389300033ff5f45218e582af8fda
-  data.tar.gz: b6f025e13de2def11b8361663ae55510989a25e38e8fe3cf9ccc7e99ed89a87f4fef380fead464a6a13ed0ad8146a2c5b55ffab1b490aeabd223425d696371d3
+  metadata.gz: 84f20910ae4117da5f25c62779a7a39c795a49dee6012ec721135b338b50f414bf2733b90724cd6f64bf47202053aa7e7214e4d6bf3c04119f25f491d3e11e14
+  data.tar.gz: 52f71224d7d36e98844e62b3f1e66d76e59e8c2b66d80329f8376540ece57dc5495cf5b6aabdc366fa2594d0fe6efc9e48f8090efee14e8d20f5f4e4b40f7b5b

data/.travis.yml

@@ -2,12 +2,16 @@ language: ruby
 cache: bundler
 sudo: false
 rvm:
-  - 2.1
+  - 2.2
 
 gemfile:
   - gemfiles/rails4.1.gemfile
-  - gemfiles/rails4.2.beta.gemfile
+  - gemfiles/rails4.2.gemfile
 
+matrix:
+  include:
+    - rvm: 2.1
+      gemfile: gemfiles/rails4.2.gemfile
 
 notifications:
   irc: "irc.freenode.org#projecthydra"

data/lib/active_fedora/core.rb

@@ -36,7 +36,7 @@ module ActiveFedora
     def initialize(attributes_or_resource_or_url = nil, &block)
       init_internals
       attributes = initialize_resource_and_attributes(attributes_or_resource_or_url)
-      raise IllegalOperation, "Attempting to recreate existing ldp_source" unless ldp_source.new?
+      raise IllegalOperation, "Attempting to recreate existing ldp_source: `#{ldp_source.subject}'" unless ldp_source.new?
       assert_content_model
       load_attached_files
       self.attributes = attributes if attributes

data/lib/active_fedora/fedora_attributes.rb

@@ -3,7 +3,6 @@ module ActiveFedora
     extend ActiveSupport::Concern
 
     included do
-      include RDF::Indexing
       include ActiveTriples::Properties
       include ActiveTriples::Reflection
       delegate :rdf_subject, :get_values, to: :resource

data/lib/active_fedora/indexing.rb

@@ -56,7 +56,7 @@ module ActiveFedora
       end
 
       def reindex_everything
-        get_descendent_uris(ActiveFedora::Base.id_to_uri('')).each do |uri|
+        descendent_uris(ActiveFedora::Base.id_to_uri('')).each do |uri|
           logger.debug "Re-index everything ... #{uri}"
           ActiveFedora::Base.find(LdpResource.new(ActiveFedora.fedora.connection, uri)).update_index
         end
@@ -77,12 +77,15 @@ module ActiveFedora
         SolrInstanceLoader.new(self, id, solr_doc).object
       end
 
-      def get_descendent_uris(uri)
+      def descendent_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 += get_descendent_uris(descendent_uri)
+          all_descendents_uris += descendent_uris(descendent_uri)
         end
         all_descendents_uris
       end

data/lib/active_fedora/indexing_service.rb

@@ -24,7 +24,13 @@ module ActiveFedora
       ProfileIndexingService
     end
 
+    def rdf_service
+      RDF::IndexingService
+    end
 
+    # Creates a solr document hash for the {#object}
+    # @yield [Hash] yields the solr document
+    # @return [Hash] the solr document
     def generate_solr_document
       solr_doc = {}
       Solrizer.set_field(solr_doc, 'system_create', c_time, :stored_sortable)
@@ -37,6 +43,8 @@ module ActiveFedora
         solr_doc.merge! file.to_solr(solr_doc, name: name.to_s)
       end
       solr_doc = solrize_relationships(solr_doc)
+      solr_doc = solrize_rdf_assertions(solr_doc)
+      yield(solr_doc) if block_given?
       solr_doc
     end
 
@@ -65,5 +73,11 @@ module ActiveFedora
       end
       solr_doc
     end
+
+    # Serialize the resource's RDF relationships to solr
+    # @param [Hash] solr_doc @deafult an empty Hash
+    def solrize_rdf_assertions(solr_doc = Hash.new)
+      solr_doc.merge rdf_service.new(object).generate_solr_document
+    end
   end
 end

data/lib/active_fedora/rdf.rb

@@ -5,7 +5,7 @@ module ActiveFedora
     autoload :Fcrepo
     autoload :Fcrepo4
     autoload :Ldp
-    autoload :Indexing
+    autoload :IndexingService
     autoload :Identifiable
     autoload :Persistence
     autoload :RelsExt

data/lib/active_fedora/rdf/datastream_indexing.rb

@@ -1,11 +1,55 @@
 module ActiveFedora::RDF
   module DatastreamIndexing
     extend ActiveSupport::Concern
-    include Indexing
 
-    def apply_prefix(name, file_path)
-      prefix(file_path) + name.to_s
+    def to_solr(solr_doc={}, opts={}) # :nodoc:
+      super.tap do |solr_doc|
+        solrize_rdf_assertions(opts[:name], solr_doc)
+      end
     end
+
+    # Gives the primary solr name for a column. If there is more than one indexer on the field definition, it gives the first
+    def primary_solr_name(field, file_path)
+      config = self.class.config_for_term_or_uri(field)
+      return nil unless config # punt on index names for deep nodes!
+      if behaviors = config.behaviors
+        behaviors.each do |behavior|
+          result = ActiveFedora::SolrQueryBuilder.solr_name(apply_prefix(field, file_path), behavior, type: config.type)
+          return result if Solrizer::DefaultDescriptors.send(behavior).evaluate_suffix(:text).stored?
+        end
+        raise RuntimeError "no stored fields were found"
+      end
+    end
+
+
+    module ClassMethods
+      def indexer
+        ActiveFedora::RDF::IndexingService
+      end
+    end
+
+    protected
+
+      def indexing_service
+        @indexing_service ||= self.class.indexer.new(self)
+      end
+
+      # Serialize the datastream's RDF relationships to solr
+      # @param [String] file_path used to prefix the keys in the solr document
+      # @param [Hash] solr_doc @default an empty Hash
+      def solrize_rdf_assertions(file_path, solr_doc = {})
+        solr_doc.merge! indexing_service.generate_solr_document(prefix_method(file_path))
+      end
+
+      # Returns a function that takes field name and returns a solr document key
+      def prefix_method(file_path)
+        lambda { |field_name| apply_prefix(field_name, file_path) }
+      end
+
+      def apply_prefix(name, file_path)
+        prefix(file_path) + name.to_s
+      end
+
   end
 end
 

data/lib/active_fedora/rdf/indexing_service.rb

@@ -0,0 +1,91 @@
+module ActiveFedora::RDF
+  class IndexingService
+    include Solrizer::Common
+    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
+
+    # Creates a solr document hash for the rdf assertions of the {#object}
+    # @yield [Hash] yields the solr document
+    # @return [Hash] the solr document
+    def generate_solr_document(prefix_method = nil)
+      solr_doc = add_assertions(prefix_method)
+      yield(solr_doc) if block_given?
+      solr_doc
+    end
+
+    protected
+
+      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|
+            append_to_solr_doc(solr_doc, solr_field_key, field_info, val)
+          end
+        end
+        solr_doc
+      end
+
+      # Override this in order to allow one field to be expanded into more than one:
+      #   example:
+      #     def append_to_solr_doc(solr_doc, field_key, field_info, val)
+      #       Solrizer.set_field(solr_doc, 'lcsh_subject_uri', val.to_uri, :symbol)
+      #       Solrizer.set_field(solr_doc, 'lcsh_subject_label', val.to_label, :searchable)
+      #     end
+      def append_to_solr_doc(solr_doc, solr_field_key, field_info, val)
+        self.class.create_and_insert_terms(solr_field_key,
+                                           solr_document_field_value(val),
+                                           field_info[:behaviors], solr_doc)
+      end
+
+      def solr_document_field_name(field_key, prefix_method)
+        if prefix_method
+          prefix_method.call(field_key)
+        else
+          field_key.to_s
+        end
+      end
+
+      def solr_document_field_value(val)
+        case val
+          when ::RDF::URI
+            val.to_s
+          when ActiveTriples::Resource
+            val.solrize
+          else
+            val
+        end
+      end
+
+      def resource
+        object.resource
+      end
+
+      def properties
+        object.class.properties
+      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]
+          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
+        end
+        field_map
+      end
+
+  end
+end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "9.0.0.beta8"
+  VERSION = "9.0.0.rc1"
 end

data/lib/generators/active_fedora/config/config_generator.rb

@@ -3,6 +3,7 @@ require 'rails/generators'
 module ActiveFedora
   class ConfigGenerator < Rails::Generators::Base
     def generate_configs
+      generate('active_fedora:config:fedora')
       generate('active_fedora:config:solr')
     end
   end

data/lib/generators/active_fedora/config/fedora/fedora_generator.rb

@@ -0,0 +1,11 @@
+require 'rails/generators'
+
+module ActiveFedora
+  class Config::FedoraGenerator < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+
+    def generate
+      copy_file('fedora.yml', 'config/fedora.yml')
+    end
+  end
+end

data/lib/generators/active_fedora/config/fedora/templates/fedora.yml

@@ -0,0 +1,15 @@
+development:
+  user: fedoraAdmin
+  password: fedoraAdmin
+  url: http://127.0.0.1:8983/fedora/rest
+  base_path: /dev
+test:
+  user: fedoraAdmin
+  password: fedoraAdmin
+  url: http://localhost:8983/fedora/rest
+  base_path: /test
+production:
+  user: fedoraAdmin
+  password: fedoraAdmin
+  url: http://127.0.0.1:8983/fedora/rest
+  base_path: /prod

data/lib/generators/active_fedora/config/solr/templates/solr.yml

@@ -1,10 +1,7 @@
-# This is a sample config file that does not have multiple solr instances. You will also need to be sure to
-# edit the fedora.yml file to match the solr URL for active-fedora. 
+# This is a sample config file that points to a solr server for each environment
 development:
   url: http://localhost:8983/solr/development
-test: &TEST
+test:
   url: <%= "http://127.0.0.1:#{ENV['TEST_JETTY_PORT'] || 8983}/solr/test" %>
-cucumber:
-  <<: *TEST
 production:
-  url: http://your.production.server:8080/bl_solr/core0 
+  url: http://your.production.server:8080/bl_solr/core0

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

@@ -5,16 +5,18 @@ module ActiveFedora
     source_root ::File.expand_path('../templates', __FILE__)
     check_class_collision
 
-    class_option :directory, :type => :string, :default => 'models', :desc => "Which directory to generate? (i.e. app/DIRECTORY)"
-    class_option :datastream_directory, :type => :string, :default => 'models/datastreams', :desc => "Which datastream directory to generate? (i.e. models/datastreams)"
-    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"
+    class_option :directory, type: :string, default: 'models', desc: "Which directory to generate? (i.e. app/DIRECTORY)"
+    class_option :datastream_directory, type: :string, default: 'models/datastreams', desc: "Which datastream directory to generate? (i.e. models/datastreams)"
+    class_option :contains, type: :string, default: nil, desc: "Name a file to attach"
+    class_option :datastream, type: :string, default: nil, desc: "Name a metadata datastream to create"
 
     def install
       template('model.rb.erb', ::File.join('app', directory, "#{file_name}.rb"))
-      template('datastream.rb.erb', ::File.join('app', datastream_directory, "#{file_name}_metadata.rb"))
       template('model_spec.rb.erb', ::File.join('spec', directory, "#{file_name}_spec.rb"))
-      template('datastream_spec.rb.erb', ::File.join('spec', datastream_directory, "#{file_name}_metadata_spec.rb"))
+      if options[:datastream]
+        template('datastream.rb.erb', ::File.join('app', datastream_directory, "#{file_name}_metadata.rb"))
+        template('datastream_spec.rb.erb', ::File.join('spec', datastream_directory, "#{file_name}_metadata_spec.rb"))
+      end
     end
 
     protected

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

@@ -1,5 +1,5 @@
 # Generated via
-#  `rails generate active_fedora::model <%= class_name %>`
+#  `rails generate active_fedora:model <%= class_name %>`
 class <%= class_name %>Metadata < ActiveFedora::OmDatastream
 
   # Define a terminology for parsing this XML document

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

@@ -1,6 +1,6 @@
 # Generated via
-#  `rails generate active_fedora::model <%= class_name %>`
-require 'spec_helper'
+#  `rails generate active_fedora:model <%= class_name %>`
+require 'rails_helper'
 
 describe <%= class_name %>Metadata do
   it 'should have a title' do

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

@@ -1,28 +1,46 @@
 # Generated via
-#  `rails generate active_fedora::model <%= class_name %>`
+#  `rails generate active_fedora:model <%= class_name %>`
 class <%= class_name %> < ActiveFedora::Base
-  <% if options['descMetadata'] %>
-  has_metadata "descMetadata", type: <%= options['descMetadata'] %>
+  <% if options['datastream'] %>
+  contains :descMetadata, class_name: "<%= options['datastream'] %>"
   <% else %>
-  # Creating a #descMetadata method that returns the datastream. 
+  # Define some properties to store:
   #
-  has_metadata "descMetadata", type: <%= class_name %>Metadata
+  property :title, predicate: ::RDF::DC.title do |index|
+    index.as :stored_searchable, :facetable
+  end
+  property :creator, predicate: ::RDF::DC.creator do |index|
+    index.as :stored_searchable, :facetable
+  end
+  property :contributor, predicate: ::RDF::DC.contributor do |index|
+    index.as :stored_searchable, :facetable
+  end
+  property :description, predicate: ::RDF::DC.description do |index|
+    index.as :stored_searchable
+  end
   <%- end -%>
-  <% if options['has_file_datastream'] %>
-  has_file_datastream "<%= options['has_file_datastream'] %>"
+  <% if options['contains'] %>
+  contains :<%= options['contains'] %>"
   <% else %>
-  # Uncomment the following lines to add an #attachment method that is a
-  #   file_datastream:
+  # Uncomment the following lines to add an #attachment method that is a file
   #
-  # has_file_datastream "attachment"
+  # contains "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
+  # If you need to add additional attributes to the SOLR document, extend the default indexer:
+  #
+  # def indexer
+  #   MyApp::IndexingService
+  # end
+  #
+  # This can go into app/services/my_app/indexing_service.rb
+  # module MyApp
+  #   class IndexingService < ActiveFedora::IndexingService
+  #     def generate_solr_document
+  #       super.tap do |solr_doc|
+  #         solr_doc["my_attribute_s"] = object.my_attribute
+  #       end
+  #     end
+  #   end
   # end
-
 end

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

@@ -1,6 +1,6 @@
 # Generated via
-#  `rails generate active_fedora::model <%= class_name %>`
-require 'spec_helper'
+#  `rails generate active_fedora:model <%= class_name %>`
+require 'rails_helper'
 require 'active_fedora/test_support'
 
 describe <%= class_name %> do
@@ -16,8 +16,23 @@ describe <%= class_name %> do
     end
   end
 
+  <% if options['datastream'] %>
   it 'should have a descMetadata datastream' do
     expect(subject.descMetadata).to be_kind_of <%= options['descMetadata'] ? options['descMetadata'] : "#{class_name}Metadata" %>
   end
+  <% else %>
+  it 'should have a title' do
+    subject.title = ['War and Peace']
+    expect(subject.title).to eq ['War and Peace']
+  end
+
+  describe "#to_solr" do
+    subject { <%= class_name %>.new(title: ['War and Peace']).to_solr }
+
+    it 'should have a title' do
+      expect(subject['title_tesim']).to eq ['War and Peace']
+    end
+  end
+  <% end %>
 
 end

data/spec/integration/base_spec.rb

@@ -46,7 +46,7 @@ describe "A base object with metadata" do
     end
     describe "when trying to create it again" do
       it "should raise an error" do
-        expect { MockAFBaseRelationship.create(id: @release.id) }.to raise_error(ActiveFedora::IllegalOperation)
+        expect { MockAFBaseRelationship.create(id: @release.id) }.to raise_error(ActiveFedora::IllegalOperation, "Attempting to recreate existing ldp_source: `#{@release.uri}'")
         @release.reload
         expect(@release.foo.person).to include('test foo content')
       end

data/spec/integration/indexing_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+@@last_id = 0
+
+describe ActiveFedora::Base do
+  describe "descendent_uris" do
+
+    before :each do
+      ids.each do |id|
+        ActiveFedora::Base.create id: id
+      end
+    end
+
+    def root_uri(ids=[])
+      ActiveFedora::Base.id_to_uri(ids.first)
+    end
+
+    context 'when there there are no descendents' 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) }
+      end
+    end
+
+    context 'when there are > 1 descendents' 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) }
+      end
+    end
+
+    context 'when some of the decendants are not RDFSources' do
+      let(:ids) { ['foo', 'foo/bar'] }
+      let(:datastream) { ActiveFedora::Datastream.new(ActiveFedora::Base.id_to_uri('foo/bar/bax')) }
+
+      before do
+        datastream.content = "Hello!!!"
+        datastream.save
+      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
+      end
+    end
+  end
+end

data/spec/unit/active_fedora_spec.rb

@@ -4,10 +4,11 @@ require 'config_helper'
 # For testing Module-level methods like ActiveFedora.init
 
 describe ActiveFedora do
-  
-  before(:each) do
+
+  before do
     restore_spec_configuration
   end
+
   after :all do
     unstub_rails
     # Restore to default fedora configs
@@ -51,10 +52,10 @@ describe ActiveFedora do
       end
     end
   end
-  
+
   describe ".init" do
-    
-    after(:each) do
+
+    after do
       # Restore to default fedora configs
       ActiveFedora.init(:environment => "test", :fedora_config_path => File.join(File.dirname(__FILE__), "..", "..", "config", "fedora.yml"))
     end
@@ -94,7 +95,7 @@ describe ActiveFedora do
         describe "with no explicit config path" do
           it "should look for the file in the path defined at Rails.root" do
             allow(ActiveFedora::SolrService).to receive(:load_mappings) #necessary or else it will load the solrizer config and it breaks other tests in the suite.
-            
+
             stub_rails(:root=>File.join(File.dirname(__FILE__),"../fixtures/rails_root"))
             ActiveFedora.init()
             expect(ActiveFedora.config.credentials[:url]).to eq "http://testhost.com:8983/fedora"
@@ -103,7 +104,7 @@ describe ActiveFedora do
       end
     end
   end
-  
+
   describe "#class_from_string" do
     before do
       module ParentClass
@@ -115,8 +116,8 @@ describe ActiveFedora do
     end
     it "should return class constants based on strings" do
       expect(ActiveFedora.class_from_string("Om")).to eq Om
-      expect(ActiveFedora.class_from_string("ActiveFedora::RDF::Indexing")).to eq ActiveFedora::RDF::Indexing
-      expect(ActiveFedora.class_from_string("Indexing", ActiveFedora::RDF)).to eq ActiveFedora::RDF::Indexing
+      expect(ActiveFedora.class_from_string("ActiveFedora::RDF::IndexingService")).to eq ActiveFedora::RDF::IndexingService
+      expect(ActiveFedora.class_from_string("IndexingService", ActiveFedora::RDF)).to eq ActiveFedora::RDF::IndexingService
     end
 
     it "should find sibling classes" do

data/spec/unit/base_spec.rb

@@ -12,7 +12,7 @@ describe ActiveFedora::Base do
 
   describe "reindex_everything" do
     it "should call update_index on every object represented in the sitemap" do
-      allow(ActiveFedora::Base).to receive(:get_descendent_uris) { ['http://localhost/test/XXX', 'http://localhost/test/YYY', 'http://localhost/test/ZZZ'] }
+      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
@@ -20,37 +20,6 @@ describe ActiveFedora::Base do
     end
   end
 
-  describe "get_descendent_uris" do
-
-    before :each do
-      ids.each do |id|
-        ActiveFedora::Base.create id: id
-      end
-    end
-
-    def root_uri(ids=[])
-      ActiveFedora::Base.id_to_uri(ids.first)
-    end
-
-    context 'when there there are no descendents' do
-
-      let(:ids) { ['foo'] }
-
-      it 'returns an array containing only the URI passed to it' do
-        expect(ActiveFedora::Base.get_descendent_uris(root_uri(ids))).to eq ids.map {|id| ActiveFedora::Base.id_to_uri(id) }
-      end
-    end
-
-    context 'when there are > 1 descendents' 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.get_descendent_uris(root_uri(ids))).to eq ids.map {|id| ActiveFedora::Base.id_to_uri(id) }
-      end
-    end
-  end
-
   describe "With a test class" do
     before :each do
       class FooHistory < ActiveFedora::Base

data/spec/unit/forbidden_attributes_protection_spec.rb

@@ -44,7 +44,7 @@ describe "Mass assignment protection" do
 
   context "permitted attributes" do
     let(:params) { ProtectedParams.new(first_name: 'Guille', gender: 'm').permit! }
-    it "cannot be used for mass assignment" do
+    it "can be used for mass assignment" do
       expect { Person.new(params) }.not_to raise_error
     end
   end

data/spec/unit/indexing_service_spec.rb

@@ -4,20 +4,46 @@ describe ActiveFedora::IndexingService do
   let(:indexer) { described_class.new(object) }
   let(:object) { ActiveFedora::Base.new }
 
-  subject { indexer.send(:solrize_relationships) }
-
   describe "#solrize_relationships" do
-    let(:person_reflection) { double('person', foreign_key: 'person_id', kind_of?: true, solr_key: 'http://fedora.info/definitions/v4/rels-ext#isMemberOf_ssim') }
-    let(:location_reflection) { double('location', foreign_key: 'location_id', kind_of?: true, solr_key: 'http://fedora.info/definitions/v4/rels-ext#isPartOf_ssim') }
+    subject { indexer.send(:solrize_relationships) }
+    let(:person_reflection) { double('person', foreign_key: 'person_id', kind_of?: true, solr_key: member_of) }
+    let(:location_reflection) { double('location', foreign_key: 'location_id', kind_of?: true, solr_key: part_of) }
     let(:reflections) { { 'person' => person_reflection, 'location' => location_reflection } }
 
-    it "should serialize the relationships into a Hash" do
+    let(:member_of) { ActiveFedora::SolrQueryBuilder.solr_name("http://fedora.info/definitions/v4/rels-ext#isMemberOf", :symbol) }
+    let(:part_of) { ActiveFedora::SolrQueryBuilder.solr_name("http://fedora.info/definitions/v4/rels-ext#isPartOf", :symbol) }
+
+    before do
       expect(object).to receive(:[]).with('person_id').and_return('info:fedora/demo:10')
       expect(object).to receive(:[]).with('location_id').and_return('info:fedora/demo:11')
       expect(object.class).to receive(:reflections).and_return(reflections)
-      expect(subject[ActiveFedora::SolrQueryBuilder.solr_name("http://fedora.info/definitions/v4/rels-ext#isMemberOf", :symbol)]).to eq "info:fedora/demo:10"
-      expect(subject[ActiveFedora::SolrQueryBuilder.solr_name("http://fedora.info/definitions/v4/rels-ext#isPartOf", :symbol)]).to eq "info:fedora/demo:11"
+    end
+
+    it "should serialize the relationships into a Hash" do
+      expect(subject[member_of]).to eq "info:fedora/demo:10"
+      expect(subject[part_of]).to eq "info:fedora/demo:11"
     end
   end
 
+  describe "#generate_solr_document" do
+    context "when no block is passed" do
+      subject { indexer.generate_solr_document }
+      it "should produce a document" do
+        expect(subject['has_model_ssim']).to eq ['ActiveFedora::Base']
+      end
+    end
+
+    context "when a block is passed" do
+      subject do
+        indexer.generate_solr_document do |solr_doc|
+          solr_doc['noid'] = '12345'
+        end
+      end
+
+      it "should produce and yield the document" do
+        expect(subject['has_model_ssim']).to eq ['ActiveFedora::Base']
+        expect(subject['noid']).to eq '12345'
+      end
+    end
+  end
 end

data/spec/unit/ntriples_datastream_spec.rb

@@ -75,8 +75,8 @@ describe ActiveFedora::NtriplesRDFDatastream do
       @two = ActiveFedora::RDFDatastream.new
     end
     it "should generate predictable prexies" do
-      expect(@one.apply_prefix("baz", 'myFoobar')).to eq 'my_foobar__baz'
-      expect(@two.apply_prefix("baz", 'myQuix')).to eq 'my_quix__baz'
+      expect(@one.send(:apply_prefix, "baz", 'myFoobar')).to eq 'my_foobar__baz'
+      expect(@two.send(:apply_prefix, "baz", 'myQuix')).to eq 'my_quix__baz'
     end
   end
 
@@ -199,22 +199,6 @@ describe ActiveFedora::NtriplesRDFDatastream do
         Object.send(:remove_const, :Foo)
       end
 
-
-      describe ".fields()" do
-        it "should return the right fields" do
-          expect(@obj.send(:fields).keys).to eq ["created", "title", "publisher", "based_near", "related_url"]
-        end
-        it "should return the right values" do
-          fields = @obj.send(:fields)
-          expect(fields[:related_url][:values]).to eq ["http://example.org/blogtastic/"]
-          expect(fields[:based_near][:values]).to eq ["Tacoma, WA", "Renton, WA"]
-        end
-        it "should return the right type information" do
-          fields = @obj.send(:fields)
-          expect(fields[:created][:type]).to eq :date
-        end
-      end
-
       describe ".to_solr()" do
         subject { @obj.to_solr({}, name: 'solrRdf') }
         it "should return the right fields" do

data/spec/unit/rdf/indexing_service_spec.rb

@@ -0,0 +1,88 @@
+require 'spec_helper'
+
+describe ActiveFedora::RDF::IndexingService do
+  before do
+    class MyDatastream < ActiveFedora::NtriplesRDFDatastream
+      property :created, predicate: ::RDF::DC.created do |index|
+        index.as :sortable, :displayable
+        index.type :date
+      end
+      property :title, predicate: ::RDF::DC.title do |index|
+        index.as :stored_searchable, :sortable
+        index.type :text
+      end
+      property :publisher, predicate: ::RDF::DC.publisher do |index|
+        index.as :facetable, :sortable, :stored_searchable
+      end
+      property :based_near, predicate: ::RDF::FOAF.based_near do |index|
+        index.as :facetable, :stored_searchable
+        index.type :text
+      end
+      property :related_url, predicate: ::RDF::RDFS.seeAlso do |index|
+        index.as :stored_searchable
+      end
+      property :rights, predicate: ::RDF::DC.rights
+    end
+  end
+
+  after do
+    Object.send(:remove_const, :MyDatastream)
+  end
+
+  let(:f2) do
+    MyDatastream.new.tap do |obj|
+      obj.created = Date.parse("2012-03-04")
+      obj.title = "Of Mice and Men, The Sequel"
+      obj.publisher = "Bob's Blogtastic Publishing"
+      obj.based_near = ["Tacoma, WA", "Renton, WA"]
+      obj.related_url = "http://example.org/blogtastic/"
+      obj.rights = "Totally open, y'all"
+    end
+  end
+
+  let(:indexer) { described_class.new(f2) }
+
+  describe "#generate_solr_document" do
+    subject { indexer.generate_solr_document(lambda { |key| "solr_rdf__#{key}" }) }
+    it "should return the right fields" do
+      expect(subject.keys).to include(ActiveFedora::SolrQueryBuilder.solr_name("solr_rdf__related_url", type: :string),
+            ActiveFedora::SolrQueryBuilder.solr_name("solr_rdf__publisher", type: :string),
+            ActiveFedora::SolrQueryBuilder.solr_name("solr_rdf__publisher", :sortable),
+            ActiveFedora::SolrQueryBuilder.solr_name("solr_rdf__publisher", :facetable),
+            ActiveFedora::SolrQueryBuilder.solr_name("solr_rdf__created", :sortable, type: :date),
+            ActiveFedora::SolrQueryBuilder.solr_name("solr_rdf__created", :displayable),
+            ActiveFedora::SolrQueryBuilder.solr_name("solr_rdf__title", type: :string),
+            ActiveFedora::SolrQueryBuilder.solr_name("solr_rdf__title", :sortable),
+            ActiveFedora::SolrQueryBuilder.solr_name("solr_rdf__based_near", type: :string),
+            ActiveFedora::SolrQueryBuilder.solr_name("solr_rdf__based_near", :facetable))
+
+    end
+
+    it "should return the right values" do
+      expect(subject[ActiveFedora::SolrQueryBuilder.solr_name("solr_rdf__related_url", type: :string)]).to eq ["http://example.org/blogtastic/"]
+      expect(subject[ActiveFedora::SolrQueryBuilder.solr_name("solr_rdf__based_near", type: :string)]).to eq ["Tacoma, WA","Renton, WA"]
+      expect(subject[ActiveFedora::SolrQueryBuilder.solr_name("solr_rdf__based_near", :facetable)]).to eq ["Tacoma, WA","Renton, WA"]
+      expect(subject[ActiveFedora::SolrQueryBuilder.solr_name("solr_rdf__publisher", type: :string)]).to eq ["Bob's Blogtastic Publishing"]
+      expect(subject[ActiveFedora::SolrQueryBuilder.solr_name("solr_rdf__publisher", :sortable)]).to eq "Bob's Blogtastic Publishing"
+      expect(subject[ActiveFedora::SolrQueryBuilder.solr_name("solr_rdf__publisher", :facetable)]).to eq ["Bob's Blogtastic Publishing"]
+    end
+  end
+
+  describe "#fields" do
+    let(:fields) { indexer.send(:fields) }
+
+    it "should return the right fields" do
+      expect(fields.keys).to eq ["created", "title", "publisher", "based_near", "related_url"]
+    end
+
+    it "should return the right values" do
+      expect(fields[:related_url][:values]).to eq ["http://example.org/blogtastic/"]
+      expect(fields[:based_near][:values]).to eq ["Tacoma, WA", "Renton, WA"]
+    end
+
+    it "should return the right type information" do
+      expect(fields[:created][:type]).to eq :date
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 9.0.0.beta8
+  version: 9.0.0.rc1
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-19 00:00:00.000000000 Z
+date: 2015-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -281,7 +281,7 @@ files:
 - config/solr_mappings_af_0.1.yml
 - config/solr_mappings_bl_2.4.yml
 - gemfiles/rails4.1.gemfile
-- gemfiles/rails4.2.beta.gemfile
+- gemfiles/rails4.2.gemfile
 - lib/active-fedora.rb
 - lib/active_fedora.rb
 - lib/active_fedora/association_relation.rb
@@ -357,7 +357,7 @@ files:
 - lib/active_fedora/rdf/datastream_indexing.rb
 - lib/active_fedora/rdf/fcrepo.rb
 - lib/active_fedora/rdf/fcrepo4.rb
-- lib/active_fedora/rdf/indexing.rb
+- lib/active_fedora/rdf/indexing_service.rb
 - lib/active_fedora/rdf/ldp.rb
 - lib/active_fedora/rdf/ntriples_rdf_datastream.rb
 - lib/active_fedora/rdf/persistence.rb
@@ -395,6 +395,8 @@ files:
 - lib/active_fedora/with_metadata/metadata_node.rb
 - lib/generators/active_fedora/config/USAGE
 - lib/generators/active_fedora/config/config_generator.rb
+- lib/generators/active_fedora/config/fedora/fedora_generator.rb
+- lib/generators/active_fedora/config/fedora/templates/fedora.yml
 - lib/generators/active_fedora/config/solr/solr_generator.rb
 - lib/generators/active_fedora/config/solr/templates/jetty.yml
 - lib/generators/active_fedora/config/solr/templates/solr.yml
@@ -445,6 +447,7 @@ files:
 - spec/integration/full_featured_model_spec.rb
 - spec/integration/has_and_belongs_to_many_associations_spec.rb
 - spec/integration/has_many_associations_spec.rb
+- spec/integration/indexing_spec.rb
 - spec/integration/json_serialization_spec.rb
 - spec/integration/model_spec.rb
 - spec/integration/nested_attribute_spec.rb
@@ -514,6 +517,7 @@ files:
 - spec/unit/qualified_dublin_core_datastream_spec.rb
 - spec/unit/query_result_builder_spec.rb
 - spec/unit/query_spec.rb
+- spec/unit/rdf/indexing_service_spec.rb
 - spec/unit/rdf_datastream_spec.rb
 - spec/unit/rdf_resource_datastream_spec.rb
 - spec/unit/rdf_vocab_spec.rb

data/lib/active_fedora/rdf/indexing.rb

@@ -1,71 +0,0 @@
-module ActiveFedora
-  module RDF
-    module Indexing
-      extend ActiveSupport::Concern
-      included do
-        include Solrizer::Common
-      end
-
-      def apply_prefix(name, file_path)
-        name.to_s
-      end
-
-      def to_solr(solr_doc={}, opts={}) # :nodoc:
-        super.tap do |solr_doc|
-          fields.each do |field_key, field_info|
-            values = resource.get_values(field_key)
-            Array(values).each do |val|
-              val = case val
-                when ::RDF::URI, ActiveTriples::Term
-                  val.to_s
-                when ActiveTriples::Resource
-                  val.solrize
-                else
-                  val
-              end
-              self.class.create_and_insert_terms(apply_prefix(field_key, opts[:name]), val, field_info[:behaviors], solr_doc)
-            end
-          end
-        end
-      end
-
-      # Gives the primary solr name for a column. If there is more than one indexer on the field definition, it gives the first
-      def primary_solr_name(field, file_path)
-        config = self.class.config_for_term_or_uri(field)
-        return nil unless config # punt on index names for deep nodes!
-        if behaviors = config.behaviors
-          behaviors.each do |behavior|
-            result = ActiveFedora::SolrQueryBuilder.solr_name(apply_prefix(field, file_path), behavior, type: config.type)
-            return result if Solrizer::DefaultDescriptors.send(behavior).evaluate_suffix(:text).stored?
-          end
-          raise RuntimeError "no stored fields were found"
-        end
-      end
-
-      module ClassMethods
-        # Gives the datatype for a column.
-        def type(field)
-          config_for_term_or_uri(field).type
-        end
-      end
-
-      private
-        # returns a Hash, e.g.: {field => {:values => [], :type => :something, :behaviors => []}, ...}
-        def fields
-          field_map = {}.with_indifferent_access
-
-          self.class.properties.each do |name, config|
-            type = config[:type]
-            behaviors = config[:behaviors]
-            next unless type and behaviors
-            next if config[:class_name] && config[:class_name] < ActiveFedora::Base
-            resource.query(:subject => 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
-          end
-          field_map
-        end
-    end
-  end
-end