active-fedora 4.0.0.rc16 → 4.0.0.rc17

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active-fedora (4.0.0.rc16)
+    active-fedora (4.0.0.rc17)
       activeresource (>= 3.0.0)
       activesupport (>= 3.0.0)
       equivalent-xml
@@ -9,7 +9,7 @@ PATH
       mime-types (>= 1.16)
       multipart-post (= 1.1.2)
       nokogiri
-      om (~> 1.6.0.rc1)
+      om (~> 1.6.0.rc3)
       rdf
       rdf-rdfxml (= 0.3.5)
       rsolr
@@ -56,19 +56,19 @@ GEM
     logger (1.2.8)
     mediashelf-loggable (0.4.9)
     metaclass (0.0.1)
-    mime-types (1.17.2)
+    mime-types (1.18)
     mocha (0.10.5)
       metaclass (~> 0.0.1)
     multi_json (1.1.0)
     multipart-post (1.1.2)
     nokogiri (1.5.2)
     nori (1.1.0)
-    om (1.6.0.rc1)
+    om (1.6.0.rc3)
       mediashelf-loggable
       nokogiri (>= 1.4.2)
     rack (1.4.1)
     rake (0.9.2.2)
-    rdf (0.3.5)
+    rdf (0.3.5.1)
       addressable (>= 2.2.6)
     rdf-rdfxml (0.3.5)
       nokogiri (>= 1.4.4)
@@ -77,14 +77,14 @@ GEM
       mime-types (>= 1.16)
     rsolr (1.0.7)
       builder (>= 2.1.2)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
     rubydora (0.5.7)
       activemodel
       activesupport
@@ -108,7 +108,7 @@ GEM
       om (>= 1.5.0)
       stomp
       xml-simple
-    stomp (1.2.1)
+    stomp (1.2.2)
     wasabi (2.1.0)
       nokogiri (>= 1.4.0)
     xml-simple (1.1.1)
@@ -123,5 +123,5 @@ DEPENDENCIES
   jettywrapper (>= 1.2.0)
   mocha (>= 0.9.8)
   rake
-  rspec (~> 2.0)
+  rspec (>= 2.9.0)
   yard

data/active-fedora.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.add_dependency('mime-types', '>= 1.16')
   s.add_dependency('multipart-post', "= 1.1.2")
   s.add_dependency('nokogiri')
-  s.add_dependency('om', '~> 1.6.0.rc1')
+  s.add_dependency('om', '~> 1.6.0.rc3')
   s.add_dependency('solrizer', '~>1.2.0')
   s.add_dependency("activeresource", '>= 3.0.0')
   s.add_dependency("activesupport", '>= 3.0.0')
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency("rake")
 #  s.add_development_dependency("rcov") # not ruby 1.9 compatible
   s.add_development_dependency("jettywrapper", ">=1.2.0")
-  s.add_development_dependency("rspec", "~> 2.0")
+  s.add_development_dependency("rspec", ">= 2.9.0")
   s.add_development_dependency("mocha", ">= 0.9.8")
   
   s.files         = `git ls-files`.split("\n")

data/lib/active_fedora.rb

@@ -5,6 +5,11 @@ 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 "solrizer"
+# require 'nokogiri'
+# require "loggable"
+
+
 
 SOLR_DOCUMENT_ID = ActiveFedora::SolrService.id_field unless defined?(SOLR_DOCUMENT_ID)
 ENABLE_SOLR_UPDATES = true unless defined?(ENABLE_SOLR_UPDATES)
@@ -22,7 +27,6 @@ module ActiveFedora #:nodoc:
 
   eager_autoload do
     autoload :Associations
-    autoload :AttributeMethods
     autoload :Base
     autoload :ContentModel
     autoload :Callbacks
@@ -33,6 +37,7 @@ module ActiveFedora #:nodoc:
     autoload :FileManagement
     autoload :RelationshipGraph
     autoload :Datastream
+    autoload :DatastreamHash
     autoload :Datastreams
     autoload :Delegating
     autoload :DigitalObject

data/lib/active_fedora/base.rb

@@ -1,9 +1,3 @@
-require "solrizer"
-require 'nokogiri'
-require "loggable"
-require 'active_fedora/datastream_hash'
-
-
 SOLR_DOCUMENT_ID = "id" unless (defined?(SOLR_DOCUMENT_ID) && !SOLR_DOCUMENT_ID.nil?)
 ENABLE_SOLR_UPDATES = true unless defined?(ENABLE_SOLR_UPDATES)
 
@@ -30,8 +24,9 @@ module ActiveFedora
   class Base
     include SemanticNode
 
-    class_attribute :fedora_connection 
+    class_attribute :fedora_connection, :profile_solr_name
     self.fedora_connection = {}
+    self.profile_solr_name = ActiveFedora::SolrService.solr_name("object_profile", :string, :displayable)
 
     def method_missing(name, *args)
       # if [:collection_members, :part_of, :parts, :part_of_append, :file_objects].include? name 
@@ -228,9 +223,10 @@ module ActiveFedora
     #system_create_date, system_modified_date, active_fedora_model_field, 
     #and the object id.
     def fields
+    # TODO this can likely be removed once find_by_fields_by_solr is removed
       fields = {:id => {:values => [pid]}, :system_create_date => {:values => [self.create_date], :type=>:date}, :system_modified_date => {:values => [self.modified_date], :type=>:date}, :active_fedora_model => {:values => [self.class.inspect], :type=>:symbol}}
       datastreams.values.each do |ds|        
-        fields.merge!(ds.fields) if ds.kind_of?(ActiveFedora::MetadataDatastream)
+        fields.merge!(ds.fields) if [ActiveFedora::MetadataDatastream, ActiveFedora::QualifiedDublinCoreDatastream].include?(ds.class)
       end
       return fields
     end
@@ -283,8 +279,8 @@ module ActiveFedora
         solrize_profile(solr_doc)
       end
       datastreams.each_value do |ds|
-        solr_doc = ds.solrize_profile(solr_doc)
         ds.ensure_xml_loaded if ds.respond_to? :ensure_xml_loaded  ### Can't put this in the model because it's often implemented in Solrizer::XML::TerminologyBasedSolrizer 
+        #puts "\n\nQDC #{ds.to_solr(solr_doc).inspect}" if ds.kind_of?(ActiveFedora::QualifiedDublinCoreDatastream)
         solr_doc = ds.to_solr(solr_doc) if ds.kind_of?(ActiveFedora::RDFDatastream) || ds.kind_of?(ActiveFedora::NokogiriDatastream) || ds.kind_of?(ActiveFedora::MetadataDatastream)
       end
       solr_doc = solrize_relationships(solr_doc) unless opts[:model_only]
@@ -292,16 +288,18 @@ module ActiveFedora
     end
 
     def solrize_profile(solr_doc = Hash.new) # :nodoc:
+      profile_hash = { 'datastreams' => {} }
       if inner_object.respond_to? :profile
         inner_object.profile.each_pair do |property,value|
           if property =~ /Date/
             value = Time.parse(value) unless value.is_a?(Time)
             value = value.xmlschema
           end
-          solr_doc[ActiveFedora::SolrService.solr_name("objProfile_#{property}", property =~ /Date/ ? :date : :symbol)] = value
+          profile_hash[property] = value
         end
       end
-      solr_doc
+      self.datastreams.each_pair { |dsid,ds| profile_hash['datastreams'][dsid] = ds.solrize_profile }
+      solr_doc[self.class.profile_solr_name] = profile_hash.to_json
     end
     
     # Serialize the datastream's RDF relationships to solr
@@ -378,12 +376,20 @@ module ActiveFedora
       else
         ActiveFedora::Base
       end
-     
-      obj = klass.allocate.init_with(SolrDigitalObject.new(solr_doc, klass))
+
+      profile_json = Array(solr_doc[ActiveFedora::Base.profile_solr_name]).first
+      unless profile_json.present?
+        raise ActiveFedora::ObjectNotFoundError, "Object #{pid} does not contain a solrized profile"
+      end
+      profile_hash = ActiveSupport::JSON.decode(profile_json)
+      obj = klass.allocate.init_with(SolrDigitalObject.new(solr_doc, profile_hash, klass))
       #set by default to load any dependent relationship objects from solr as well
       #need to call rels_ext once so it exists when iterating over datastreams
       obj.rels_ext
       obj.datastreams.each_value do |ds|
+        if ds.respond_to?(:profile_from_hash)
+          ds.profile_from_hash(profile_hash['datastreams'][ds.dsid])
+        end
         if ds.respond_to?(:from_solr)
           ds.from_solr(solr_doc) if ds.kind_of?(ActiveFedora::MetadataDatastream) || ds.kind_of?(ActiveFedora::NokogiriDatastream) || ( ds.kind_of?(ActiveFedora::RelsExtDatastream))
         end

data/lib/active_fedora/content_model.rb

@@ -16,10 +16,15 @@ module ActiveFedora
       klass.name.gsub(/(::)/, '_')
     end
     
+    # list all of the models asserted by the provided object
     def self.models_asserted_by(obj)
       obj.relationships(:has_model)
     end
     
+    # returns an array of the model classes that are defined in the current 
+    # application that the given object asserts (ie. if the object asserts 
+    # a StreamingVideo model but the application doesn't define a 
+    # StreamingVideo model, it will be excluded from this list.
     def self.known_models_for(obj)
       models_array = []
       models_asserted_by( obj ).each do |model_uri|

data/lib/active_fedora/datastream.rb

@@ -28,7 +28,7 @@ module ActiveFedora
     end
 
     def inspect
-      "#<#{self.class}:#{self.hash} @pid=\"#{pid}\" @dsid=\"#{dsid}\" @controlGroup=\"#{controlGroup}\" @dirty=\"#{dirty}\" @mimeType=\"#{mimeType}\" >"
+      "#<#{self.class}:#{self.hash} @pid=\"#{digital_object ? pid : nil}\" @dsid=\"#{dsid}\" @controlGroup=\"#{controlGroup}\" @dirty=\"#{dirty}\" @mimeType=\"#{mimeType}\" >"
     end
 
     #compatibility method for rails' url generators. This method will 
@@ -89,26 +89,21 @@ module ActiveFedora
       tmpl
     end
     
-    def solrize_profile(solr_doc = Hash.new) # :nodoc:
+    def solrize_profile # :nodoc:
+      profile_hash = {}
       profile.each_pair do |property,value|
         if property =~ /Date/
           value = Time.parse(value) unless value.is_a?(Time)
           value = value.xmlschema
         end
-        solr_doc[ActiveFedora::SolrService.solr_name("#{dsid}_dsProfile_#{property}", property =~ /Date/ ? :date : :symbol)] = value
+        profile_hash[property] = value
       end
-      solr_doc
+      profile_hash
     end
     
-    def from_solr(solr_doc)
-      profile_from_solr(solr_doc)
-    end
-    
-    def profile_from_solr(solr_doc)
-      profile_attrs = solr_doc.keys.select { |k| k =~ /^#{dsid}_dsProfile_/ }
-      profile_attrs.each do |key|
-        attr_name = key.split(/_/)[2..-2].join('_')
-        profile[attr_name] = solr_doc[key].to_s
+    def profile_from_hash(profile_hash)
+      profile_hash.each_pair do |key,value|
+        profile[key] = value.to_s
       end
     end
   end

data/lib/active_fedora/fixture_loader.rb

@@ -35,7 +35,7 @@ module ActiveFedora
     end
 
     def self.index(pid)
-        ActiveFedora::Base.find(pid).update_index
+        ActiveFedora::Base.find(pid, :cast=>true).update_index
     end
 
     def self.import_to_fedora(filename, pid='0')

data/lib/active_fedora/metadata_datastream.rb

@@ -45,7 +45,6 @@ module ActiveFedora
     def from_solr(solr_doc)
       @content = self.to_xml
       self.xml_loaded = true
-      profile_from_solr(solr_doc)
       fields.each do |field_key, field_info|
         field_symbol = ActiveFedora::SolrService.solr_name(field_key, field_info[:type])
         value = (solr_doc[field_symbol].nil? ? solr_doc[field_symbol.to_s]: solr_doc[field_symbol]) 

data/lib/active_fedora/model.rb

@@ -181,6 +181,7 @@ module ActiveFedora
       #   :field_list       => array, defaults to ["*", "score"]
       #
       def find_by_fields_by_solr(query_fields,opts={})
+        ActiveSupport::Deprecation.warn("find_by_fields_by_solr is deprecated and will be removed in the next release")
         #create solr_args from fields passed in, needs to be comma separated list of form field1=value1,field2=value2,...
         escaped_class_name = self.name.gsub(/(:)/, '\\:')
         query = "#{ActiveFedora::SolrService.solr_name(:active_fedora_model, :symbol)}:#{escaped_class_name}" 

data/lib/active_fedora/nokogiri_datastream.rb

@@ -40,8 +40,17 @@ module ActiveFedora
     end
 
     def ng_xml 
-      ensure_xml_loaded
-      return @ng_xml
+      @ng_xml ||= begin
+      self.dirty = false
+      self.xml_loaded = true
+
+      if new?
+        ## Load up the template
+        self.class.xml_template
+      else
+        Nokogiri::XML::Document.parse(content)
+      end
+      end
     end
     
     def ng_xml=(new_xml)
@@ -65,7 +74,6 @@ module ActiveFedora
     
     
     def to_xml(xml = nil)
-      ensure_xml_loaded
       xml = self.ng_xml if xml.nil?
       ng_xml = self.ng_xml
       if ng_xml.respond_to?(:root) && ng_xml.root.nil? && self.class.respond_to?(:root_property_ref) && !self.class.root_property_ref.nil?
@@ -100,7 +108,6 @@ module ActiveFedora
     # 
     # See ActiveFedora::Base.load_instance_from_solr and +get_values_from_solr+ for more information.
     def from_solr(solr_doc)
-      profile_from_solr(solr_doc)
       #just initialize internal_solr_doc since any value retrieval will be done via lazy loading on this doc on-demand
       @internal_solr_doc = solr_doc
     end
@@ -295,7 +302,6 @@ module ActiveFedora
       if self.class.terminology.nil?
         raise "No terminology is set for this NokogiriDatastream class.  Cannot perform update_indexed_attributes"
       end
-      ensure_xml_loaded
       # remove any fields from params that this datastream doesn't recognize    
       # make sure to make a copy of params so not to modify hash that might be passed to other methods
       current_params = params.clone
@@ -317,13 +323,11 @@ module ActiveFedora
     end
     
     def get_values(field_key,default=[])
-      ensure_xml_loaded
       term_values(*field_key)
     end
 
 
     def find_by_terms(*termpointer)
-      ensure_xml_loaded
       super
     end
 
@@ -349,7 +353,6 @@ module ActiveFedora
         #lazy load values from solr on demand
         get_values_from_solr(*term_pointer)
       else
-        ensure_xml_loaded
         om_term_values(*term_pointer)
       end
     end

data/lib/active_fedora/qualified_dublin_core_datastream.rb

@@ -5,87 +5,118 @@ module ActiveFedora
   #Fedora Dublin Core XML datastreams structure.
   #
   #Fields can still be overridden if more specificity is desired (see ActiveFedora::Datastream#fields method).
-  class QualifiedDublinCoreDatastream < MetadataDatastream
+  class QualifiedDublinCoreDatastream < NokogiriDatastream
+
+    class_attribute :class_fields
+    self.class_fields = []
+    attr_accessor :fields # TODO this can be removed when Model.find_by_fields_by_solr has been removed.
+    
+    
+    set_terminology do |t|
+      t.root(:path=>"dc", :xmlns=>"http://purl.org/dc/terms/")
+        t.contributor(:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms")
+        t.coverage(:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms")
+        t.creator(:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms")
+        t.date(:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms")
+        t.description(:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms")
+        t.format(:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms")
+        t.identifier(:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms")
+        t.language(:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms")
+        t.publisher(:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms")
+        t.relation(:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms")
+        t.rights(:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms")
+        t.source(:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms")
+        t.spatial(:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms")
+        t.type_(:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms")
+        t.medium(:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms")
+        t.rights(:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms")
+        t.subject(:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms")
+        t.title(:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms")
+    end
+
+    define_template :creator do |xml,name|
+      xml.creator() do
+        xml.text(name)
+      end
+    end
     
     #A frozen array of Dublincore Terms.
     DCTERMS = [
       :contributor, :coverage, :creator,  :description, :format, :identifier, :language, :publisher, :relation,  :source, :title, :abstract, :accessRights, :accrualMethod, :accrualPeriodicity, :accrualPolicy, :alternative, :audience, :available, :bibliographicCitation, :conformsTo, :contributor, :coverage, :created, :creator, :date, :dateAccepted, :dateCopyrighted, :dateSubmitted, :description, :educationLevel, :extent, :format, :hasFormat, :hasPart, :hasVersion, :identifier, :instructionalMethod, :isFormatOf, :isPartOf, :isReferencedBy, :isReplacedBy, :isRequiredBy, :issued, :isVersionOf, :language, :license, :mediator, :medium, :modified, :provenance, :publisher, :references, :relation, :replaces, :requires, :rights, :rightsHolder, :source, :spatial, :subject, :tableOfContents, :temporal, :type, :valid
     ]
     DCTERMS.freeze
-    
-    #Constructor. this class will call self.field for each DCTERM. In short, all DCTERMS fields will already exist
-    #when this method returns. Each term is marked as a multivalue string.
-    def initialize(digital_object, dsid )
-      super(digital_object, dsid)
-      DCTERMS.each do |el|
-        field el, :string, :multiple=>true
+
+    # This method generates the various accessor and mutator methods on self for the datastream metadata attributes.
+    # each field will have the 3 magic methods:
+    #   name_values=(arg) 
+    #   name_values 
+    #   name_append(arg)
+    #
+    #
+    # Calling any of the generated methods marks self as dirty.
+    #
+    # 'tupe' is a datatype, currently :string, :text and :date are supported.
+    #
+    # opts is an options hash, which  will affect the generation of the xml representation of this datastream.
+    #
+    # Currently supported modifiers: 
+    # For +QualifiedDublinCorDatastreams+:
+    #   :element_attrs =>{:foo=>:bar} -  hash of xml element attributes
+    #   :xml_node => :nodename  - The xml node to be used to represent this object (in dcterms namespace)
+    #   :encoding=>foo, or encodings_scheme  - causes an xsi:type attribute to be set to 'foo'
+    #   :multiple=>true -  mark this field as a multivalue field (on by default)
+    #
+    #At some point, these modifiers will be ported up to work for any +ActiveFedora::MetadataDatastream+.
+    #
+    #There is quite a good example of this class in use in spec/examples/oral_history.rb
+    #
+    #!! Careful: If you declare two fields that correspond to the same xml node without any qualifiers to differentiate them, 
+    #you will end up replicating the values in the underlying datastream, resulting in mysterious dubling, quadrupling, etc. 
+    #whenever you edit the field's values.
+    def field(name, tupe=nil, opts={})
+      fields ||= {}
+      @fields[name.to_s.to_sym]={:type=>tupe, :values=>[]}.merge(opts)
+      # add term to template
+      self.class.class_fields << name.to_s
+      # add term to terminology
+      unless self.class.terminology.has_term?(name.to_sym)
+        term = OM::XML::Term.new(name.to_sym, {:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms"}, self.class.terminology)
+        self.class.terminology.add_term(term)
+        term.generate_xpath_queries!
       end
-      self.class.from_xml(nil, self)
+      
     end
     
-    # Populate a QualifiedDublinCoreDatastream object based on the "datastream" node from a FOXML file
-    # @param [String] node the xml from the content.  Assumes that the content of this datastream is that of an ActiveFedora QualifiedDublinCoreDatastream 
-    # @param [ActiveFedora::Datastream] tmpl the Datastream object that you are building
-    def self.from_xml(xml, tmpl) # :nodoc:
-      return if !xml.present?
-      node = Nokogiri::XML::Document.parse(xml)
-      tmpl.fields.each do |z|
-        fname = z.first
-        fspec = z.last
-        node_name = "dcterms:#{fspec[:xml_node] ? fspec[:xml_node] : fname}"
-        attr_modifier= "[@xsi:type='#{fspec[:encoding]}']" if fspec[:encoding]
-        query = "/dc/#{node_name}#{attr_modifier}"
-
-        node.xpath(query).each do |f|
-           tmpl.send("#{fname}_append", f.text)
+    def update_indexed_attributes(params={}, opts={})
+      # if the params are just keys, not an array, make then into an array.
+      new_params = {}
+      params.each do |key, val|
+        if key.is_a? Array
+          new_params[key] = val
+        else
+          new_params[[key.to_sym]] = val
         end
-
       end
-      tmpl.instance_variable_set(:@dirty, false)
-      tmpl
-    end
-
-    def to_xml() 
-      to_dc_xml() 
+      super(new_params, opts)
     end
+    
 
     def self.xml_template
        Nokogiri::XML::Document.parse("<dc xmlns:dcterms='http://purl.org/dc/terms/' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'/>")
     end
 
-   #Render self as a Fedora DC xml document.
-   def to_dc_xml
-     #TODO: pull the modifiers up into MDDS
-     xml = REXML::Document.new("<dc xmlns:dcterms='http://purl.org/dc/terms/' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'/>")
-     fields.each do |field_name,field_info|
-       el = REXML::Element.new("dcterms:#{field_name.to_s}")
-       if field_info.class == Hash
-         field_info.each do |k, v|
-           case k
-           when :element_attrs
-            v.each{|k,v| el.add_attribute(k.to_s, v.to_s)}
-           when :values, :type
-             # do nothing to the :values array
-           when :xml_node
-             el.name = "dcterms:#{v}"
-           when :encoding, :encoding_scheme
-             el.add_attribute("xsi:type", v)
-           when :multiple
-             next
-           else
-             el.add_attribute(k.to_s, v)
-           end
-         end
-         field_info = field_info[:values]
-       end
-       field_info.each do |val|
-         el = el.clone
-         el.text = val.to_s
-         xml.root.elements.add(el)
-       end
-     end
-     return xml.to_s
-   end
+    def to_solr(solr_doc = Hash.new) # :nodoc:
+      @fields.each do |field_key, field_info|
+        things = send(field_key)
+        if things 
+          field_symbol = ActiveFedora::SolrService.solr_name(field_key, field_info[:type])
+          things.val.each do |val|    
+            ::Solrizer::Extractor.insert_solr_field_value(solr_doc, field_symbol, val )         
+          end
+        end
+      end
+      return solr_doc
+    end
 
   end
 end