solrizer 2.0.0 → 2.1.0.rc1

data/History.txt

@@ -1,3 +1,9 @@
+h2. 2.1.0
+#11 There should only be one instance of the field mapper. It's now at Solrizer.default_field_mapper
+Extract create_and_insert_terms into Solrizer::Common.  This can be used for RDF datastreams
+Raise helpful error message if date can't be parsed.
+Don't add searchable terms when another kind of field is added (continuation of HYDRA-827)
+
 h2. 2.0.0
 HYDRA-827 DO NOT index terms by default
 HYDRA-863 Null pointer exception fixed.

data/config/solr_mappings.yml

@@ -1,5 +1,4 @@
 id: id
-default: searchable
 searchable: 
   default: _t
   date: _dt
@@ -14,4 +13,4 @@ searchable:
 displayable: _display
 facetable: _facet
 sortable: _sort
-unstemmed_searchable: _unstem_search
+unstemmed_searchable: _unstem_search

data/lib/solrizer.rb

@@ -1,12 +1,19 @@
-require 'rubygems'
 module Solrizer
   def self.version
     Solrizer::VERSION
   end
+
+  def self.default_field_mapper
+    @@default_field_mapper ||= Solrizer::FieldMapper::Default.new
+  end
+
+  def self.default_field_mapper=(field_mapper)
+    @@default_field_mapper = field_mapper
+  end
+
 end
 
 require "solrizer/extractor"
-# Dir[File.join(File.dirname(__FILE__),"solrizer","*.rb")].each {|file| require file }
 Dir[File.join(File.dirname(__FILE__),"solrizer","*.rb")].each do |file| 
   require "solrizer/"+File.basename(file, File.extname(file)) unless file.match(/railtie.rb$/)
 end

data/lib/solrizer/common.rb

@@ -0,0 +1,38 @@
+# The goal of this method is to have no dependency on OM, so that NOM or RDF datastreams could use this.
+
+module Solrizer
+  # Instructions on how to solrize the field (types and uses)
+  class Directive
+    attr_accessor :type, :index_as
+    def initialize(*args)
+      case args
+      when Hash
+        self.type = args[:type]
+        self.index_as = args[:index_as]
+      when Array
+        self.type = args[0]
+        self.index_as = args[1]
+      end
+    end
+  end
+
+  module Common
+    def self.included(klass)
+      klass.send(:extend, ClassMethods)
+    end
+
+    module ClassMethods
+      # @param [String] field_name_base the name of the solr field (without the type suffix)
+      # @param [Object] value the value to insert into the document
+      # @param [Directive] directive instructions on which fields to create
+      # @param [Hash] solr_doc the solr_doc to insert into.
+      def create_and_insert_terms(field_name_base, value, directive, solr_doc)
+        Solrizer.default_field_mapper.solr_names_and_values(field_name_base, value, directive.type, directive.index_as).each do |field_name, field_value|
+          unless field_value.join("").strip.empty?
+            ::Solrizer::Extractor.insert_solr_field_value(solr_doc, field_name, field_value)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/solrizer/field_mapper.rb

@@ -1,4 +1,5 @@
 require "loggable"
+require 'active_support'
 module Solrizer
   
   # Maps Term names and values to Solr fields, based on the Term's data type and any index_as options.
@@ -186,6 +187,12 @@ module Solrizer
         end
       end      
     end
+
+    # Reset all of the mappings
+    def self.clear_mappings
+      logger.debug "resetting mappings for #{self.to_s}"
+      @@instance_init_actions[self] = []
+    end
   
   private
   
@@ -204,11 +211,6 @@ module Solrizer
       end
     end
     
-    # Reset all of the mappings
-    def self.clear_mappings
-      logger.debug "resetting mappings for #{self.to_s}"
-      @@instance_init_actions[self] = []
-    end
   
   public
     
@@ -326,30 +328,61 @@ module Solrizer
   
   public
 
-    class Default < FieldMapper
-      id_field 'id'
-      index_as :searchable, :default => true do |t|
-        t.default :suffix => '_t'
-        t.date :suffix => '_dt' do |value|
-          if value.is_a?(Date) 
-            DateTime.parse(value.to_s).to_time.utc.iso8601 
-          elsif !value.empty?
-            DateTime.parse(value).to_time.utc.iso8601
+    module Defaults
+      extend ActiveSupport::Concern
+      included do 
+        id_field 'id'
+        index_as :searchable do |t|
+          t.default :suffix => '_t'
+          t.date :suffix => '_dt' do |value|
+            iso8601_date(value)
+          end
+          t.string  :suffix => '_t'
+          t.text    :suffix => '_t'
+          t.symbol  :suffix => '_s'
+          t.integer :suffix => '_i'
+          t.long    :suffix => '_l'
+          t.boolean :suffix => '_b'
+          t.float   :suffix => '_f'
+          t.double  :suffix => '_d'
+        end
+        index_as :displayable, :suffix => '_display' do |t|
+          t.date do |value|
+            value.to_s
           end
         end
-        t.string  :suffix => '_t'
-        t.text    :suffix => '_t'
-        t.symbol  :suffix => '_s'
-        t.integer :suffix => '_i'
-        t.long    :suffix => '_l'
-        t.boolean :suffix => '_b'
-        t.float   :suffix => '_f'
-        t.double  :suffix => '_d'
+        index_as :facetable, :suffix => '_facet' do |t|
+          t.date do |value|
+            value.to_s
+          end
+        end
+
+        index_as :sortable, :suffix => '_sort' do |t|
+          t.date do |value|
+            value.to_s
+          end
+        end
+
+        index_as :unstemmed_searchable, :suffix => '_unstem_search'
+      end
+    end
+
+    class Default < FieldMapper
+      include Defaults
+    end
+
+    protected
+
+    def self.iso8601_date(value)
+      begin 
+        if value.is_a?(Date) 
+          DateTime.parse(value.to_s).to_time.utc.iso8601 
+        elsif !value.empty?
+          DateTime.parse(value).to_time.utc.iso8601
+        end
+      rescue ArgumentError => e
+        raise ArgumentError, "Unable to parse `#{value}' as a date-time object"
       end
-      index_as :displayable,          :suffix => '_display'
-      index_as :facetable,            :suffix => '_facet'
-      index_as :sortable,             :suffix => '_sort'
-      index_as :unstemmed_searchable, :suffix => '_unstem_search'
     end
     
   end

data/lib/solrizer/field_name_mapper.rb

@@ -15,7 +15,10 @@ module Solrizer::FieldNameMapper
     # Re-loads solr mappings for the default field mapper's class 
     # and re-sets the default field mapper to an FieldMapper instance with those mappings.
     def load_mappings( config_path=nil)
-      self.default_field_mapper.class.load_mappings(config_path)
+      # Dynamically create a new class?
+      self.default_field_mapper.class.clear_mappings
+      self.default_field_mapper.class.send(:include, Solrizer::FieldMapper::Defaults)
+      self.default_field_mapper.class.load_mappings(config_path) if config_path
       self.default_field_mapper = self.default_field_mapper.class.new
     end
     
@@ -24,11 +27,11 @@ module Solrizer::FieldNameMapper
     end
     
     def default_field_mapper
-      @@default_field_mapper ||= Solrizer::FieldMapper::Default.new
+      Solrizer.default_field_mapper
     end
 
-    def default_field_mapper=(field_mapper)
-      @@default_field_mapper = field_mapper
+    def default_field_mapper=(obj)
+      Solrizer.default_field_mapper = obj
     end
   end
   
@@ -45,4 +48,4 @@ module Solrizer::FieldNameMapper
     self.class.solr_name(field_name, field_type, index_type)
   end
   
-end
+end

data/lib/solrizer/version.rb

@@ -1,3 +1,3 @@
 module Solrizer
-  VERSION = "2.0.0"
+  VERSION = "2.1.0.rc1"
 end

data/lib/solrizer/xml/terminology_based_solrizer.rb

@@ -1,101 +1,104 @@
 # This module is only suitable to mix into Classes that use the OM::XML::Document Module
 module Solrizer::XML::TerminologyBasedSolrizer
-  
-  def self.default_field_mapper
-    @@default_field_mapper ||= Solrizer::FieldMapper::Default.new
+  def self.included(klass)
+    klass.send(:include, Solrizer::Common)
+    klass.send(:extend, ClassMethods)
   end
   
   # Module Methods
+  module ClassMethods
   
-  # Build a solr document from +doc+ based on its terminology
-  # @param [OM::XML::Document] doc  
-  # @param [Hash] (optional) solr_doc (values hash) to populate
-  def self.solrize(doc, solr_doc=Hash.new, field_mapper = nil)
-    unless doc.class.terminology.nil?
-      doc.class.terminology.terms.each_pair do |term_name,term|
-        doc.solrize_term(term, solr_doc, field_mapper)
+    # Build a solr document from +doc+ based on its terminology
+    # @param [OM::XML::Document] doc  
+    # @param [Hash] (optional) solr_doc (values hash) to populate
+    def solrize(doc, solr_doc=Hash.new, field_mapper = nil)
+      unless doc.class.terminology.nil?
+        doc.class.terminology.terms.each_pair do |term_name,term|
+          doc.solrize_term(term, solr_doc, field_mapper)
+        end
       end
-    end
 
-    return solr_doc
-  end
-  
-  # Populate a solr document with fields based on nodes in +xml+ 
-  # Values for a term are gathered by to +term_pointer+ using OM::XML::TermValueOperators.term_values 
-  # and are deserialized by OM according to :type, as determined in its terminology.
-  # The content of the actual field in solr is each +node+ of the +nodeset+ returned by OM,
-  # rendered to a string.
-  # @param [OM::XML::Document] doc xml document to extract values from
-  # @param [OM::XML::Term] term corresponding to desired xml values
-  # @param [Hash] (optional) solr_doc (values hash) to populate
-  def self.solrize_term(doc, term, solr_doc = Hash.new, field_mapper = nil, opts={})
-    parents = opts.fetch(:parents, [])
-    term_pointer = parents+[term.name]
-    nodeset = doc.term_values(*term_pointer)
+      return solr_doc
+    end
     
-    nodeset.each do |n|
+    # Populate a solr document with fields based on nodes in +xml+ 
+    # Values for a term are gathered by to +term_pointer+ using OM::XML::TermValueOperators.term_values 
+    # and are deserialized by OM according to :type, as determined in its terminology.
+    # The content of the actual field in solr is each +node+ of the +nodeset+ returned by OM,
+    # rendered to a string.
+    # @param [OM::XML::Document] doc xml document to extract values from
+    # @param [OM::XML::Term] term corresponding to desired xml values
+    # @param [Hash] (optional) solr_doc (values hash) to populate
+    def solrize_term(doc, term, solr_doc = Hash.new, field_mapper = nil, opts={})
+      parents = opts.fetch(:parents, [])
+      term_pointer = parents+[term.name]
+      nodeset = doc.term_values(*term_pointer)
       
-      # TODO: Solrizer::FieldMapper::Default is supposed to translate dates into full ISO 8601 formatted strings.
-      # However, there an integration issue with ActiveFedora using OM: it ignores the default field mapper given
-      # in this gem that does this. So, the following is a workaround until it is fixed.
-      node = n.is_a?(Date) ? DateTime.parse(n.to_s).to_time.utc.iso8601 : n.to_s
-      
-      doc.solrize_node(node.to_s, term_pointer, term, solr_doc, field_mapper)
-      unless term.kind_of? OM::XML::NamedTermProxy
-        term.children.each_pair do |child_term_name, child_term|
-          doc.solrize_term(child_term, solr_doc, field_mapper, opts={:parents=>parents+[{term.name=>nodeset.index(node.to_s)}]})
+      nodeset.each do |n|
+        
+        # TODO: Solrizer::FieldMapper::Default is supposed to translate dates into full ISO 8601 formatted strings.
+        # However, there an integration issue with ActiveFedora using OM: it ignores the default field mapper given
+        # in this gem that does this. So, the following is a workaround until it is fixed.
+        node = n.is_a?(Date) ? DateTime.parse(n.to_s).to_time.utc.iso8601 : n.to_s
+        
+        doc.solrize_node(node.to_s, term_pointer, term, solr_doc, field_mapper)
+        unless term.kind_of? OM::XML::NamedTermProxy
+          term.children.each_pair do |child_term_name, child_term|
+            doc.solrize_term(child_term, solr_doc, field_mapper, opts={:parents=>parents+[{term.name=>nodeset.index(node.to_s)}]})
+          end
         end
       end
+      solr_doc
     end
-    solr_doc
-  end
-  
-  # Populate a solr document with solr fields corresponding to the given xml node
-  # Field names are generated using settings from the term in the +doc+'s terminology corresponding to +term_pointer+
-  # If the supplied term does not have an index_as attribute, no indexing will be performed.
-  # @param [Nokogiri::XML::Node] node to solrize
-  # @param [OM::XML::Document] doc document the node came from
-  # @param [Array] term_pointer Array pointing to the term that should be used for solrization settings
-  # @param [Term] term the term to be solrized
-  # @param [Hash] (optional) solr_doc (values hash) to populate
-  # @return [Hash] the solr doc
-  def self.solrize_node(node_value, doc, term_pointer, term, solr_doc = Hash.new, field_mapper = nil, opts = {})
-    return solr_doc unless term.index_as && !term.index_as.empty?
-    field_mapper ||= self.default_field_mapper
-    
-    generic_field_name_base = OM::XML::Terminology.term_generic_name(*term_pointer)
-    
-    field_mapper.solr_names_and_values(generic_field_name_base, node_value, term.type, term.index_as).each do |field_name, field_value|
-      unless field_value.join("").strip.empty?
-        ::Solrizer::Extractor.insert_solr_field_value(solr_doc, field_name, field_value)
+
+    # Populate a solr document with solr fields corresponding to the given xml node
+    # Field names are generated using settings from the term in the +doc+'s terminology corresponding to +term_pointer+
+    # If the supplied term does not have an index_as attribute, no indexing will be performed.
+    # @param [Nokogiri::XML::Node] node to solrize
+    # @param [OM::XML::Document] doc document the node came from
+    # @param [Array] term_pointer Array pointing to the term that should be used for solrization settings
+    # @param [Term] term the term to be solrized
+    # @param [Hash] (optional) solr_doc (values hash) to populate
+    # @return [Hash] the solr doc
+    def solrize_node(node_value, doc, term_pointer, term, solr_doc = Hash.new, field_mapper = nil, opts = {})
+      return solr_doc unless term.index_as && !term.index_as.empty?
+
+      directive = term_to_solrizer_directive(term)
+      
+      generic_field_name_base = OM::XML::Terminology.term_generic_name(*term_pointer)
+      create_and_insert_terms(generic_field_name_base, node_value, directive, solr_doc)
+
+      
+      if term_pointer.length > 1
+        hierarchical_field_name_base = OM::XML::Terminology.term_hierarchical_name(*term_pointer)
+        create_and_insert_terms(hierarchical_field_name_base, node_value, directive, solr_doc)
       end
+      solr_doc
     end
-    
-    if term_pointer.length > 1
-      hierarchical_field_name_base = OM::XML::Terminology.term_hierarchical_name(*term_pointer)
-      field_mapper.solr_names_and_values(hierarchical_field_name_base, node_value, term.type, term.index_as).each do |field_name, field_value|
-        unless field_value.join("").strip.empty?
-          ::Solrizer::Extractor.insert_solr_field_value(solr_doc, field_name, field_value)
-        end
-      end
+
+    private
+
+    def term_to_solrizer_directive(term)
+      Solrizer::Directive.new(term.type, term.index_as)
     end
-    solr_doc
+    
   end
+
   
   # Instance Methods
   
   attr_accessor :field_mapper
   
   def to_solr(solr_doc = Hash.new, field_mapper = self.field_mapper) # :nodoc:
-    Solrizer::XML::TerminologyBasedSolrizer.solrize(self, solr_doc, field_mapper)
+    self.class.solrize(self, solr_doc, field_mapper)
   end
   
   def solrize_term(term, solr_doc = Hash.new, field_mapper = self.field_mapper, opts={})
-    Solrizer::XML::TerminologyBasedSolrizer.solrize_term(self, term, solr_doc, field_mapper, opts)    
+    self.class.solrize_term(self, term, solr_doc, field_mapper, opts)    
   end
   
   def solrize_node(node, term_pointer, term, solr_doc = Hash.new, field_mapper = self.field_mapper, opts={})
-    Solrizer::XML::TerminologyBasedSolrizer.solrize_node(node, self, term_pointer, term, solr_doc, field_mapper, opts)
+    self.class.solrize_node(node, self, term_pointer, term, solr_doc, field_mapper, opts)
   end
   
 end

data/solrizer.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.add_dependency "mediashelf-loggable", "~>0.4.7"
   s.add_dependency "stomp"
   s.add_dependency "daemons"
+  s.add_dependency "activesupport"
   s.add_development_dependency 'rspec', '~>2.0'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'yard'

data/spec/fixtures/mods_article.rb

@@ -13,7 +13,7 @@ module Samples
         }
         t.french_title(:ref=>[:title_info,:main_title], :attributes=>{"xml:lang"=>"fre"})
         
-        t.language(:index_as=>[:facetable],:path=>{:attribute=>"lang"})
+        t.language(:index_as=>[:facetable, :searchable],:path=>{:attribute=>"lang"})
       } 
       t.language{
         t.lang_code(:index_as=>[:facetable], :path=>"languageTerm", :attributes=>{:type=>"code"})
@@ -22,7 +22,7 @@ module Samples
       t.subject {
         t.topic(:index_as=>[:facetable])
       }      
-      t.topic_tag(:proxy=>[:subject, :topic])    
+      t.topic_tag(:proxy=>[:subject, :topic], :index_as=>[:searchable])    
       # t.topic_tag(:index_as=>[:facetable],:path=>"subject", :default_content_path=>"topic")
       # This is a mods:name.  The underscore is purely to avoid namespace conflicts.
       t.name_ {

data/spec/units/common_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe Solrizer::Common do
+  before do
+    class Foo
+      include Solrizer::Common
+    end
+  end
+  after do
+     Object.send(:remove_const, :Foo)
+  end
+
+  it "should handle many field types" do
+    solr_doc = {}
+    directive = Solrizer::Directive.new(:string, [:displayable, :searchable, :sortable] )
+    Foo.create_and_insert_terms('my_name', 'value', directive, solr_doc)
+    solr_doc.should == {'my_name_t' => ['value'], 'my_name_sort' => ['value'], 'my_name_display' => ['value']}
+  end
+  it "should handle dates that are searchable" do
+    solr_doc = {}
+    directive = Solrizer::Directive.new(:date, [:searchable] )
+    Foo.create_and_insert_terms('my_name', Date.parse('2013-01-10'), directive, solr_doc)
+    solr_doc.should == {'my_name_dt' => ['2013-01-10T00:00:00Z']}
+  end
+
+  it "should handle dates that are displayable" do
+    solr_doc = {}
+    directive = Solrizer::Directive.new(:date, [:displayable])
+    Foo.create_and_insert_terms('my_name', Date.parse('2013-01-10'), directive, solr_doc)
+    solr_doc.should == {'my_name_display' => ['2013-01-10']}
+  end
+
+  it "should handle dates that are sortable" do
+    solr_doc = {}
+    directive = Solrizer::Directive.new(:date, [:sortable])
+    Foo.create_and_insert_terms('my_name', Date.parse('2013-01-10'), directive, solr_doc)
+    solr_doc.should == {'my_name_sort' => ['2013-01-10']}
+  end
+end

data/spec/units/field_mapper_spec.rb

@@ -198,21 +198,21 @@ describe Solrizer::FieldMapper do
       @mapper.id_field.should == 'id'
     end
     
-    it "should apply mappings for searchable by default" do
+    it "should not apply mappings for searchable by default" do
       # Just sanity check a couple; copy & pasting all data types is silly
-      @mapper.solr_names_and_values('foo', 'bar', :string, []).should == { 'foo_t' => ['bar'] }
-      @mapper.solr_names_and_values('foo', "1", :integer, []).should == { 'foo_i' =>["1"] }
+      @mapper.solr_names_and_values('foo', 'bar', :string, []).should == {  }
+      @mapper.solr_names_and_values('foo', "1", :integer, []).should == { }
     end
 
     it "should support full ISO 8601 dates" do
-      @mapper.solr_names_and_values('foo', "2012-11-06",              :date, []).should == { 'foo_dt' =>["2012-11-06T00:00:00Z"] }
-      @mapper.solr_names_and_values('foo', "November 6th, 2012",      :date, []).should == { 'foo_dt' =>["2012-11-06T00:00:00Z"] }
-      @mapper.solr_names_and_values('foo', Date.parse("6 Nov. 2012"), :date, []).should == { 'foo_dt' =>["2012-11-06T00:00:00Z"] }
-      @mapper.solr_names_and_values('foo', '', :date, []).should == { 'foo_dt' => [] }
+      @mapper.solr_names_and_values('foo', "2012-11-06",              :date, [:searchable]).should == { 'foo_dt' =>["2012-11-06T00:00:00Z"] }
+      @mapper.solr_names_and_values('foo', "November 6th, 2012",      :date, [:searchable]).should == { 'foo_dt' =>["2012-11-06T00:00:00Z"] }
+      @mapper.solr_names_and_values('foo', Date.parse("6 Nov. 2012"), :date, [:searchable]).should == { 'foo_dt' =>["2012-11-06T00:00:00Z"] }
+      @mapper.solr_names_and_values('foo', '', :date, [:searchable]).should == { 'foo_dt' => [] }
     end
     
     it "should support displayable, facetable, sortable, unstemmed" do
-      @mapper.solr_names_and_values('foo', 'bar', :string, [:displayable, :facetable, :sortable, :unstemmed_searchable]).should == {
+      @mapper.solr_names_and_values('foo', 'bar', :string, [:searchable, :displayable, :facetable, :sortable, :unstemmed_searchable]).should == {
         'foo_t' => ['bar'],
         'foo_display' => ['bar'],
         'foo_facet' => ['bar'],

data/spec/units/xml_terminology_based_solrizer_spec.rb

@@ -14,11 +14,6 @@ describe Solrizer::XML::TerminologyBasedSolrizer do
   
   describe ".to_solr" do
   
-    # after(:all) do
-    #   # Revert to default mappings after running tests
-    #   ActiveFedora::SolrService.load_mappings
-    # end
-  
     it "should provide .to_solr and return a SolrDocument" do
       @mods_article.should respond_to(:to_solr)
       @mods_article.to_solr.should be_kind_of(Hash)
@@ -30,8 +25,6 @@ describe Solrizer::XML::TerminologyBasedSolrizer do
     end
   
     it "should iterate through the terminology terms, calling .solrize_term on each and passing in the solr doc" do
-      # mock_terms = {:name1=>:term1, :name2=>:term2}
-      # ActiveFedora::NokogiriDatastream.stubs(:accessors).returns(mock_accessors)
       solr_doc = Hash.new
       @mods_article.field_mapper = Solrizer::FieldMapper::Default.new
       Samples::ModsArticle.terminology.terms.each_pair do |k,v|
@@ -43,8 +36,6 @@ describe Solrizer::XML::TerminologyBasedSolrizer do
     it "should use Solr mappings to generate field names" do
 
       solr_doc =  @mods_article.to_solr
-      #should have these
-      
       solr_doc["abstract"].should be_nil
       solr_doc["abstract_t"].should == ["ABSTRACT"]
       solr_doc["title_info_1_language_t"].should == ["finnish"]
@@ -68,13 +59,12 @@ describe Solrizer::XML::TerminologyBasedSolrizer do
       solr_doc = Hash.new
       result = @mods_article.solrize_term(Samples::ModsArticle.terminology.retrieve_term(:title_info), solr_doc)
       result.should == solr_doc
-      # @mods_article.solrize_term(:title_info, Samples::ModsArticle.terminology.retrieve_term(:title_info), :solr_doc=>solr_doc).should == ""
     end
 
     it "should add multiple fields based on index_as" do
       fake_solr_doc = {}
       term = Samples::ModsArticle.terminology.retrieve_term(:name)
-      term.children[:namePart].index_as = [:displayable, :facetable]
+      term.children[:namePart].index_as = [:searchable, :displayable, :facetable]
 
       @mods_article.solrize_term(term, fake_solr_doc)
       
@@ -102,7 +92,7 @@ describe Solrizer::XML::TerminologyBasedSolrizer do
     it "shouldn't index terms where index_as is an empty array" do
       fake_solr_doc = {}
       term = Samples::ModsArticle.terminology.retrieve_term(:name)
-      term.children[:namePart].index_as = []# [:displayable, :facetable]
+      term.children[:namePart].index_as = []
 
       @mods_article.solrize_term(term, fake_solr_doc)
       fake_solr_doc["name_0_namePart_t"].should be_nil
@@ -121,11 +111,7 @@ describe Solrizer::XML::TerminologyBasedSolrizer do
   end
 
   describe ".solrize_node" do
-    it "should optionally allow you to provide the Hash to add fields to and return that document when done" do
-      doc = Hash.new
-      # @mods_article.solrize_node(node, term_pointer, term, solr_doc).should equal(doc)
-    end
-    
+    it "should optionally allow you to provide the Hash to add fields to and return that document when done"
     it "should create a solr field containing node.text"
     it "should create hierarchical field entries if parents is not empty"
     it "should only create one node if parents is empty"

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: solrizer
 version: !ruby/object:Gem::Version
-  version: 2.0.0
-  prerelease: 
+  version: 2.1.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Matt Zumwalt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2013-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -107,6 +107,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -191,12 +207,10 @@ files:
 - SOLRIZING_OM_DOCUMENTS.textile
 - bin/solrizer
 - bin/solrizerd
-- config/fedora.yml
-- config/hydra_types.yml
-- config/solr.yml
 - config/solr_mappings.yml
 - config/solr_mappings_af_0.1.yml
 - lib/solrizer.rb
+- lib/solrizer/common.rb
 - lib/solrizer/extractor.rb
 - lib/solrizer/field_mapper.rb
 - lib/solrizer/field_name_mapper.rb
@@ -219,6 +233,7 @@ files:
 - spec/fixtures/mods_articles/hydrangea_article1.xml
 - spec/fixtures/test_solr_mappings.yml
 - spec/spec_helper.rb
+- spec/units/common_spec.rb
 - spec/units/extractor_spec.rb
 - spec/units/field_mapper_spec.rb
 - spec/units/field_name_mapper_spec.rb
@@ -239,9 +254,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -259,6 +274,7 @@ test_files:
 - spec/fixtures/mods_articles/hydrangea_article1.xml
 - spec/fixtures/test_solr_mappings.yml
 - spec/spec_helper.rb
+- spec/units/common_spec.rb
 - spec/units/extractor_spec.rb
 - spec/units/field_mapper_spec.rb
 - spec/units/field_name_mapper_spec.rb

data/config/fedora.yml

@@ -1,16 +0,0 @@
-development:
-  fedora:
-    url: http://fedoraAdmin:fedoraAdmin@127.0.0.1:8983/fedora
-  solr:
-    url: http://127.0.0.1:8983/solr/development
-test:
-  fedora:
-    url: http://fedoraAdmin:fedoraAdmin@127.0.0.1:8983/fedora
-  solr:
-    url: http://127.0.0.1:8983/solr/test
-production:
-  fedora:
-    url: http://fedoraAdmin:fedoraAdmin@127.0.0.1:8080/fedora
-  solr:
-    url: http://127.0.0.1:8080/solr
-    

data/config/hydra_types.yml

@@ -1,4 +0,0 @@
-info:fedora/afmodel:SaltDocument : salt_document
-info:fedora/afmodel:JP2Document : jp2_document
-info:fedora/afmodel:ModsDocument : mods_document
-info:fedora/afmodel:DCDocument : dc_document

data/config/solr.yml

@@ -1,7 +0,0 @@
-development:
-  url: http://localhost:8983/solr/development
-test: &TEST
-  url: http://localhost:8983/solr/test
-production:
-  url: http://localhost:8080/solr/production 
-