added adjust_solr_params dsl logic, you are now able to changed all p…

…arameters passed to solr

lib/sunspot/dsl/query.rb

@@ -97,6 +97,26 @@ def paginate(options = {})
         @query.paginate(page, per_page)
       end
 
+      # Adjust or reset the parameters passed to solr. The adjustment
+      # will take place just before talking to solr, after all other
+      # dsl-commands have modified the query parameters.
+      #
+      # Please bear in mind, that you are changing the parameters that
+      # will be passed to solr, and will not be checked for validity
+      # by sunspot.
+      #
+      # ==== Example
+      #
+      #   Sunspot.search(Post) do
+      #     adjust_solr_params do |params|
+      #       params[:q] += ' AND something_s:more'
+      #     end
+      #   end
+      # 
+      def adjust_solr_params( &block )
+        @query.set_solr_parameter_adjustment( block )
+      end
+
       # 
       # Scope the search by geographical distance from a given point.
       # +coordinates+ should either respond to #first and #last (e.g. a

lib/sunspot/query/query.rb

@@ -1,8 +1,7 @@
 module Sunspot
   module Query
     class Query
-      attr_accessor :scope
-      attr_accessor :fulltext
+      attr_accessor :scope, :fulltext, :parameter_adjustment
 
       def initialize(types)
         @scope = Scope.new
@@ -19,6 +18,10 @@ def initialize(types)
       def set_fulltext(keywords)
         @fulltext = Dismax.new(keywords)
       end
+
+      def set_solr_parameter_adjustment( block )
+        @parameter_adjustment = block
+      end
 
       def add_location_restriction(coordinates, radius)
         @local = Local.new(coordinates, radius)
@@ -73,6 +76,7 @@ def to_params
         Sunspot::Util.deep_merge!(params, @sort.to_params)
         Sunspot::Util.deep_merge!(params, @pagination.to_params) if @pagination
         Sunspot::Util.deep_merge!(params, @local.to_params) if @local
+        @parameter_adjustment.call(params) if @parameter_adjustment
         params[:q] ||= '*:*'
         params
       end

spec/api/query/adjust_params_spec.rb

@@ -0,0 +1,37 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+describe 'typed query' do
+  it "should send query to solr with adjusted parameters (keyword example)" do
+    session.search Post do
+      keywords 'keyword search'
+      adjust_solr_params do |params|
+        params[:q]    = 'new search'
+        params[:some] = 'param'
+      end
+    end
+    connection.should have_last_search_with(:q    => 'new search')
+    connection.should have_last_search_with(:some => 'param')
+  end
+
+  it "should work, even without another dsl command" do
+    session.search Post do
+      adjust_solr_params do |params|
+        params[:q]    = 'napoleon dynamite'
+        params[:qt]   = 'complicated'
+      end
+    end
+    connection.should have_last_search_with(:q  => 'napoleon dynamite')
+    connection.should have_last_search_with(:qt => 'complicated')
+  end
+
+  it "should be able to extend parameters" do
+    session.search Post do
+      keywords 'keyword search'
+      adjust_solr_params do |params|
+        params[:q]    += ' AND something_s:more'
+      end
+    end
+    connection.should have_last_search_with(:q => 'keyword search AND something_s:more')
+  end
+
+end