multi-solr 01.07.07 → 01.08.00

data/lib/multi_solr/solr_filter_collection.rb

@@ -23,24 +23,27 @@ class MultiSolr::SolrFilterCollection < MultiSolr::SolrFilterSimple
     @collection_proc = options.delete(:collection_data)
     @after_collect_proc = options.delete(:after_collect)
     if options[:render_value].nil?
-      options[:render_value] = lambda{|value| compact_values(value).join(' oder ') }
+      options[:render_value] = lambda{|value| compact_values(value).join(', ') }
     end
-    if options[:solr_query].nil?
-      options[:solr_query] = lambda do |value|
-        if value.is_a?(Array)
-          values = compact_values(value)
-          if values.empty?
-            ''
-          else
-            q = values.map{|val| "#{@name}:#{val}"}.join(' OR ')
-            "(#{q})"
-          end
-        else
-          "#{@name}:#{value}"
-        end
+    super filter_name, options
+  end
+
+
+  # overwrite super for array handling
+  def build_solr_query value
+    return super(value) unless value.is_a? Array
+    values = compact_values(value)
+    return nil if values.empty?
+    sanitize_values! values
+    if @solr_query_proc
+      q = @solr_query_proc.call(values)
+    else
+      q = values.map{|val| "#{@name}:#{val}"}.join(' OR ')
+      if values.size > 1
+        q = "(#{q})"
       end
     end
-    super filter_name, options
+    q
   end
 
 
@@ -73,6 +76,12 @@ class MultiSolr::SolrFilterCollection < MultiSolr::SolrFilterSimple
   def compact_values value
     value = [value] unless value.is_a?(Array)
     value.delete_if(&:blank?)
+    value
+  end
+
+  # Sanitize solr query value in a array of values
+  def sanitize_values! values
+    values.map!{|val| sanitize_value(val) }
   end
 
 end

data/lib/multi_solr/solr_filter_simple.rb

@@ -22,7 +22,7 @@ class MultiSolr::SolrFilterSimple
     @name = name
     @field_name = options[:field_name] || @name
     @value_render_proc = options.delete(:render_value) || lambda{|value| value.to_s }
-    @solr_query_proc = options.delete(:solr_query) || lambda{|value| "#{@field_name}:#{value}"}
+    @solr_query_proc = options.delete(:solr_query)
     @options = options || {}
   end
 
@@ -37,9 +37,13 @@ class MultiSolr::SolrFilterSimple
   # returns: String in SOLR-Query-Syntax
   def build_solr_query value
     return nil if value.blank?
-    # wenn Leerzeichen vorkommen dann String in " einschliessen
-    value = "\"#{value}\"" if value =~ /\s+/
-    @solr_query_proc.call(value)
+    # wenn Leerzeichen vorkommen dann String in "" einschliessen
+    value = sanitize_value value
+    if @solr_query_proc
+      @solr_query_proc.call(value)
+    else
+      "#{@field_name}:#{value}"
+    end
   end
 
 
@@ -61,6 +65,14 @@ class MultiSolr::SolrFilterSimple
     I18n.t("solr_search.#{@name}", :default => [@name, @name.to_s])
   end
 
+  def sanitize_value value
+    if value =~ /\s+/
+      "\"#{value}\""
+    else
+      value
+    end
+  end
+
 end
 
 

data/lib/multi_solr/version.rb

@@ -1,3 +1,3 @@
 module MultiSolr
-  VERSION = "01.07.07"
+  VERSION = "01.08.00"
 end

data/spec/multi_solr/solr_filter_collection_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+require 'multi_solr/utils'
+
+describe MultiSolr::SolrFilterCollection do
+
+  subject{ MultiSolr::SolrFilterCollection.new('test') }
+
+
+  context 'build_solr_query' do
+    it "should return fieldnam:value for single value" do
+      subject.build_solr_query('111').should == 'test:111'
+    end
+
+    it "should return fieldnam:value for single value array" do
+      subject.build_solr_query(['111']).should == 'test:111'
+    end
+
+    it "should return 'OR' query for multiple values" do
+      subject.build_solr_query(['11', 'a 2']).should == '(test:11 OR test:"a 2")'
+    end
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: multi-solr
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 55
   prerelease: 
   segments: 
   - 1
-  - 7
-  - 7
-  version: 01.07.07
+  - 8
+  - 0
+  version: 01.08.00
 platform: ruby
 authors: 
 - Bernd Ledig
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-07-12 00:00:00 Z
+date: 2013-07-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -150,6 +150,7 @@ files:
 - spec/multi_solr/search_result_spec.rb
 - spec/multi_solr/single_core_handler_spec.rb
 - spec/multi_solr/solr_filter_boolean_spec.rb
+- spec/multi_solr/solr_filter_collection_spec.rb
 - spec/multi_solr/solr_filter_range_spec.rb
 - spec/multi_solr/timeline_core_handler_spec.rb
 - spec/multi_solr/utils_spec.rb