rsolr-ext 0.11.1 → 0.11.2

data/lib/rsolr-ext/request.rb

@@ -2,7 +2,9 @@ module RSolr::Ext::Request
   
   module Params
     
-    def map input
+    def map input_params
+      input = input_params.dup
+      
       output = {}
       
       if input[:per_page]
@@ -16,6 +18,10 @@ module RSolr::Ext::Request
         output[:start] = page * output[:rows]
       end
       
+      # remove the input :q params
+      output[:q] = input.delete :q
+      output[:fq] = input.delete :fq
+      
       if queries = input.delete(:queries)
         output[:q] = append_to_param output[:q], build_query(queries, false)
       end

data/rsolr-ext.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   
   s.name = "rsolr-ext"
-  s.version = "0.11.1"
-  s.date = "2009-11-19"
+  s.version = "0.11.2"
+  s.date = "2010-01-07"
   
   s.summary = "An extension lib for RSolr"
   s.email = "goodieboy@gmail.com"

data/test/request_test.rb

@@ -23,8 +23,28 @@ class RSolrExtRequestTest < Test::Unit::TestCase
     solr_params = RSolr::Ext::Request.map(
       :phrase_filters=>{:manu=>['Apple', 'ASG'], :color=>['red', 'blue']}
     )
-    expected = {:fq=>["color:\"red\"", "color:\"blue\"", "manu:\"Apple\"", "manu:\"ASG\""]}
-    assert expected, solr_params
+    
+    assert_equal 4, solr_params[:fq].size
+    assert solr_params[:fq].include?("color:\"red\"")
+    assert solr_params[:fq].include?("color:\"blue\"")
+    assert solr_params[:fq].include?("manu:\"Apple\"")
+    assert solr_params[:fq].include?("manu:\"ASG\"")
+    
+  end
+  
+  test ':filters and :phrase_filters will play nice with :fq' do
+    solr_params = RSolr::Ext::Request.map(
+      :fq => 'blah blah',
+      :phrase_filters=>{:manu=>['Apple', 'ASG'], :color=>['red', 'blue']}
+    )
+    expected = {:fq=>["blah blah", "color:\"red\"", "color:\"blue\"", "manu:\"Apple\"", "manu:\"ASG\""]}
+    
+    assert_equal 5, solr_params[:fq].size
+    assert solr_params[:fq].include?("blah blah")
+    assert solr_params[:fq].include?("color:\"red\"")
+    assert solr_params[:fq].include?("color:\"blue\"")
+    assert solr_params[:fq].include?("manu:\"Apple\"")
+    assert solr_params[:fq].include?("manu:\"ASG\"")
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rsolr-ext
 version: !ruby/object:Gem::Version 
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors: 
 - Matt Mitchell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-19 00:00:00 -05:00
+date: 2010-01-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency