solrizer 3.0.0.pre3 → 3.0.0.pre4

data/History.txt

@@ -1,6 +1,6 @@
 h2. 3.0.0
 suffix changes:  
-  _s -> _si
+  _s -> _sim
   _t -> _tesim
   _dt -> _dtsi
   _i  -> _isim

data/lib/solrizer/default_descriptors.rb

@@ -51,7 +51,7 @@ module Solrizer
       lambda do |type|
         type = :text_en if [:string, :text].include?(type) # for backwards compatibility with old solr schema
         vals = [type, :indexed, :stored]
-        vals << :multivalued unless type == :date
+        vals << :multivalued unless [:date, :time].include? type
         vals
       end
     end
@@ -59,7 +59,7 @@ module Solrizer
     def self.searchable_converter
       lambda do |type|
         case type
-        when :date
+        when :date, :time
           lambda { |val| iso8601_date(val)}
         end
       end
@@ -80,7 +80,7 @@ module Solrizer
 
     def self.iso8601_date(value)
       begin 
-        if value.is_a?(Date) 
+        if value.is_a?(Date) || value.is_a?(Time)
           DateTime.parse(value.to_s).to_time.utc.iso8601 
         elsif !value.empty?
           DateTime.parse(value).to_time.utc.iso8601

data/lib/solrizer/descriptor.rb

@@ -33,7 +33,7 @@ module Solrizer
       index_datatype = evaluated_type.first
       raise Solrizer::InvalidIndexDescriptor, "Missing datatype for #{evaluated_type}" unless index_datatype
       type_suffix = config[:type_suffix].call(index_datatype)
-      raise Solrizer::InvalidIndexDescriptor, "Invalid datatype `#{index_datatype.inspect}'. Must be one of: :date, :text, :text_en, :string, :integer" unless type_suffix
+      raise Solrizer::InvalidIndexDescriptor, "Invalid datatype `#{index_datatype.inspect}'. Must be one of: :date, :time, :text, :text_en, :string, :integer" unless type_suffix
 
       suffix = [config[:suffix_delimiter], type_suffix, stored_suffix, index_suffix, multivalued_suffix].join
     end
@@ -54,7 +54,7 @@ module Solrizer
           't'
         when :text_en
           'te'
-        when :date
+        when :date, :time
           'dt'
         when :integer
           'i'

data/lib/solrizer/field_mapper.rb

@@ -165,8 +165,7 @@ module Solrizer
     def solr_names_and_values(field_name, field_value, index_types)
       return {} unless field_value
       
-      # Determine the set of index types, adding defaults and removing not_xyz
-      index_types ||= []
+      # Determine the set of index types
       index_types.uniq!
       index_types.dup.each do |index_type|
         if index_type.to_s =~ /^not_(.*)/
@@ -178,31 +177,36 @@ module Solrizer
       # Map names and values
       
       results = {}
+
+      # Time seems to extend enumerable, so wrap it so we don't interate over each of its elements.
+      field_value = [field_value] if field_value.kind_of? Time
       
       index_types.each do |index_type|
-        # Get mapping for field
-        name, converter = indexer(index_type).name_and_converter(field_name, type: extract_type(field_value))
-        #name, converter = solr_name_and_converter(field_name, index_type, field_type)
-        next unless name
-        
-        # Is there a custom converter?
-        # TODO instead of a custom converter, look for input data type and output data type. Create a few methods that can do that cast.
+        Array(field_value).each do |single_value|
+          # Get mapping for field
+          name, converter = indexer(index_type).name_and_converter(field_name, type: extract_type(single_value))
+          #name, converter = solr_name_and_converter(field_name, index_type, field_type)
+          next unless name
+          
+          # Is there a custom converter?
+          # TODO instead of a custom converter, look for input data type and output data type. Create a few methods that can do that cast.
 
-        value = if converter
-          if converter.arity == 1
-            converter.call(field_value)
+          value = if converter
+            if converter.arity == 1
+              converter.call(single_value)
+            else
+              converter.call(single_value, field_name)
+            end
           else
-            converter.call(field_value, field_name)
+            single_value.to_s
           end
-        else
-          field_value.to_s
+          
+          # Add mapped name & value, unless it's a duplicate
+          values = (results[name] ||= [])
+          values << value unless value.nil? || values.include?(value)
         end
-        
-        # Add mapped name & value, unless it's a duplicate
-        values = (results[name] ||= [])
-        values << value unless value.nil? || values.include?(value)
       end
-      
+        
       results
     end
   end

data/lib/solrizer/version.rb

@@ -1,3 +1,3 @@
 module Solrizer
-  VERSION = "3.0.0.pre3"
+  VERSION = "3.0.0.pre4"
 end

data/lib/solrizer.rb

@@ -22,4 +22,31 @@ module Solrizer
   def self.default_field_mapper=(field_mapper)
     @@default_field_mapper = field_mapper
   end
+
+  # @params [Hash] doc the hash to insert the value into
+  # @params [String] name the name of the field (without the suffix)
+  # @params [String,Date] value the value to be inserted
+  # @params [Array,Hash] indexer_args the arguments that find the indexer
+  # @returns [Hash] doc the document that was provided with the new field inserted
+  def self.insert_field(doc, name, value, *indexer_args)
+    # adding defaults indexer 
+    indexer_args = [:searchable] if indexer_args.empty?
+    default_field_mapper.solr_names_and_values(name, value, indexer_args).each do |k, v|
+      doc[k] ||= []
+      doc[k] += v
+    end
+    doc
+  end
+
+  # @params [Hash] doc the hash to insert the value into
+  # @params [String] name the name of the field (without the suffix)
+  # @params [String,Date] value the value to be inserted
+  # @params [Array,Hash] indexer_args the arguments that find the indexer
+  # @returns [Hash] doc the document that was provided with the new field (replacing any field with the same name) 
+  def self.set_field(doc, name, value, *indexer_args)
+    # adding defaults indexer 
+    indexer_args = [:searchable] if indexer_args.empty?
+    doc.merge! default_field_mapper.solr_names_and_values(name, value, indexer_args)
+    doc
+  end
 end

data/spec/units/field_mapper_spec.rb

@@ -145,6 +145,7 @@ describe Solrizer::FieldMapper do
       @mapper.extract_type(7).should == :integer
       @mapper.extract_type(nil).should == nil
       @mapper.extract_type(Date.today).should == :date
+      @mapper.extract_type(Time.now).should == :time
       @mapper.extract_type("Hi").should == :string
     end
   end
@@ -256,7 +257,7 @@ describe Solrizer::FieldMapper do
       @mapper.solr_names_and_values('foo', "6 Nov. 2012", [:dateable]).should == { 'foo_dtsi' =>["2012-11-06T00:00:00Z"] }
       @mapper.solr_names_and_values('foo', '', [:dateable]).should == { 'foo_dtsi' => [] }
     end
-    
+
     it "should support displayable, facetable, sortable, unstemmed" do
       @mapper.solr_names_and_values('foo', 'bar', [:searchable, :displayable, :facetable, :sortable, :unstemmed_searchable]).should == {
         "foo_tesim" => ["bar"], #searchable

data/spec/units/solrizer_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+require 'time'
+
+describe Solrizer do
+  describe ".insert_field" do
+    describe "on an empty document" do
+      let(:doc) { Hash.new }
+      it "should insert a field with the default (searchable) indexer" do
+        Solrizer.insert_field(doc, 'foo', 'A name')
+        doc.should == {'foo_tesim' => ['A name']}
+      end
+      it "should insert a field with multiple indexers" do
+        Solrizer.insert_field(doc, 'foo', 'A name', :sortable, :facetable)
+        doc.should == {'foo_ssi' => ['A name'], 'foo_sim' => ['A name']}
+      end
+      it "should insert Dates" do
+        Solrizer.insert_field(doc, 'foo', Date.parse('2013-01-13'))
+        doc.should == {'foo_dtsi' => ["2013-01-13T00:00:00Z"]}
+      end
+      it "should insert Times" do
+        Solrizer.insert_field(doc, 'foo', Time.parse('2013-01-13T22:45:56+06:00'))
+        doc.should == {'foo_dtsi' => ["2013-01-13T16:45:56Z"]}
+      end
+
+      it "should insert multiple values" do
+        Solrizer.insert_field(doc, 'foo', ['A name', 'B name'], :sortable, :facetable)
+        doc.should == {'foo_ssi' => ['A name', 'B name'], 'foo_sim' => ['A name', 'B name']}
+      end
+    end
+
+    describe "on a document with values" do
+      before{ @doc = {'foo_ssi' => ['A name'], 'foo_sim' => ['A name']}}
+
+      it "should not overwrite values that exist before" do
+        Solrizer.insert_field(@doc, 'foo', 'B name', :sortable, :facetable)
+        @doc.should == {'foo_ssi' => ['A name', 'B name'], 'foo_sim' => ['A name', 'B name']}
+      end
+    end
+  end
+  describe ".set_field" do
+    describe "on a document with values" do
+      before{ @doc = {'foo_ssi' => ['A name'], 'foo_sim' => ['A name']}}
+
+      it "should overwrite values that exist before" do
+        Solrizer.set_field(@doc, 'foo', 'B name', :sortable, :facetable)
+        @doc.should == {'foo_ssi' => ['B name'], 'foo_sim' => ['B name']}
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solrizer
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre3
+  version: 3.0.0.pre4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-25 00:00:00.000000000 Z
+date: 2013-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -236,6 +236,7 @@ files:
 - spec/units/common_spec.rb
 - spec/units/extractor_spec.rb
 - spec/units/field_mapper_spec.rb
+- spec/units/solrizer_spec.rb
 - spec/units/xml_extractor_spec.rb
 - spec/units/xml_terminology_based_solrizer_spec.rb
 homepage: http://github.com/projecthydra/solrizer
@@ -276,6 +277,7 @@ test_files:
 - spec/units/common_spec.rb
 - spec/units/extractor_spec.rb
 - spec/units/field_mapper_spec.rb
+- spec/units/solrizer_spec.rb
 - spec/units/xml_extractor_spec.rb
 - spec/units/xml_terminology_based_solrizer_spec.rb
 has_rdoc: