sunspot 2.3.0 → 2.6.0

data/lib/sunspot/query/restriction.rb

@@ -78,14 +78,14 @@ module Sunspot
         # on whether this restriction is negated.
         #
         def to_boolean_phrase
-          phrase = []
-          phrase << @field.local_params if @field.respond_to? :local_params
-          unless negated?
-            phrase << to_positive_boolean_phrase
-          else
-            phrase << to_negated_boolean_phrase
-          end
-          phrase.join
+          value = if negated?
+                    to_negated_boolean_phrase
+                  else
+                    to_positive_boolean_phrase
+                  end
+
+          @field.respond_to?(:local_params) ?
+            @field.local_params(value) : value
         end
 
         # 
@@ -135,7 +135,7 @@ module Sunspot
 
         protected
 
-        # 
+        #
         # Return escaped Solr API representation of given value
         #
         # ==== Parameters
@@ -158,9 +158,13 @@ module Sunspot
       end
 
       class InRadius < Base
-        def initialize(negated, field, lat, lon, radius)
-          @lat, @lon, @radius = lat, lon, radius
-          super negated, field, [lat, lon, radius]
+        def initialize(negated, field, *value)
+          @lat, @lon, @radius = value
+          super negated, field, value
+        end
+
+        def negate
+          self.class.new(!@negated, @field, *@value)
         end
 
         private
@@ -204,7 +208,8 @@ module Sunspot
         private
 
         def to_solr_conditional
-          "#{solr_value}"
+          @field.respond_to?(:to_solr_conditional) ?
+            @field.to_solr_conditional(solr_value) : "#{solr_value}"
         end
       end
 

data/lib/sunspot/query/standard_query.rb

@@ -16,6 +16,18 @@ module Sunspot
         @fulltext.add_join(keywords, target, from, to)
       end
 
+      def add_boost_query(factor)
+        @fulltext.add_boost_query(factor)
+      end
+
+      def add_boost_function(function)
+        @fulltext.add_boost_function(function)
+      end
+
+      def add_multiplicative_boost_function(function)
+        @fulltext.add_multiplicative_boost_function(function)
+      end
+
       def disjunction
         parent_fulltext = @fulltext
         @fulltext = @fulltext.add_disjunction

data/lib/sunspot/search/abstract_search.rb

@@ -16,7 +16,7 @@ module Sunspot
       # Retrieve all facet objects defined for this search, in order they were
       # defined. To retrieve an individual facet by name, use #facet()
       #
-      attr_reader :facets, :groups, :stats
+      attr_reader :facets, :groups
       attr_reader :query #:nodoc:
       attr_accessor :request_handler
 

data/lib/sunspot/search/field_json_facet.rb

@@ -5,15 +5,14 @@ module Sunspot
       attr_reader :name
 
       def initialize(field, search, options)
-        @name, @search, @options = name, search, options
+        @name, @search, @options = (options[:name] || field.name), search, options
         @field = field
       end
 
       def rows
         @rows ||=
           begin
-            json_facet_response = @search.json_facet_response[@field.name.to_s]
-            data = json_facet_response.nil? ? [] : json_facet_response['buckets']
+            data = no_data? ? [] : @search.json_facet_response[@field.name.to_s]['buckets']
             rows = []
             data.each do |d|
               rows << JsonFacetRow.new(d, self)
@@ -28,6 +27,18 @@ module Sunspot
           end
 
       end
+
+      def no_data?
+        @search.json_facet_response[@field.name.to_s].nil?
+      end
+
+      def other_count(type)
+        json_facet_for_field = @search.json_facet_response[@field.name.to_s]
+        return 0 if json_facet_for_field.nil?
+
+        other = json_facet_for_field[type.to_s] || {}
+        other['count']
+      end
     end
   end
 end

data/lib/sunspot/search/hit.rb

@@ -17,6 +17,10 @@ module Sunspot
       # Class name of object associated with this hit, as string.
       #
       attr_reader :class_name
+      #
+      # ID prefix used for compositeId shard router
+      #
+      attr_reader :id_prefix
       # 
       # Keyword relevance score associated with this result. Nil if this hit
       # is not from a keyword search.
@@ -27,7 +31,8 @@ module Sunspot
       attr_writer :result #:nodoc:
 
       def initialize(raw_hit, highlights, search) #:nodoc:
-        @class_name, @primary_key = *raw_hit['id'].match(/([^ ]+) (.+)/)[1..2]
+        @id_prefix, @class_name, @primary_key =
+          *raw_hit['id'].match(/((?:[^!]+!)+)*([^\s]+)\s(.+)/)[1..3]
         @score = raw_hit['score']
         @search = search
         @stored_values = raw_hit

data/lib/sunspot/session.rb

@@ -259,7 +259,7 @@ module Sunspot
         read_timeout: config.solr.read_timeout,
         open_timeout: config.solr.open_timeout,
         proxy: config.solr.proxy,
-        update_format: config.solr.update_format || :xml
+        update_format: update_format
       )
     end
 
@@ -277,5 +277,13 @@ module Sunspot
         CompositeSetup.for(types)
       end
     end
+
+    def update_format
+      if config.solr.update_format && config.solr.update_format.to_s.match(/xml|json/i)
+        config.solr.update_format.downcase.to_sym
+      else
+        :xml
+      end
+    end
   end
 end

data/lib/sunspot/setup.rb

@@ -15,6 +15,7 @@ module Sunspot
       @more_like_this_field_factories_cache = Hash.new { |h, k| h[k] = [] }
       @dsl = DSL::Fields.new(self)
       @document_boost_extractor = nil
+      @id_prefix_extractor = nil
       add_field_factory(:class, Type::ClassType.instance)
     end
 
@@ -61,6 +62,7 @@ module Sunspot
       field_factory = FieldFactory::Static.new(name, Type::TextType.instance, options, &block)
       @text_field_factories[name] = field_factory
       @text_field_factories_cache[field_factory.name] = field_factory
+      @field_factories_cache[field_factory.name] = field_factory
       if stored
         @stored_field_factories_cache[field_factory.name] << field_factory
       end
@@ -81,6 +83,7 @@ module Sunspot
       field_factory = FieldFactory::Dynamic.new(name, type, options, &block)
       @dynamic_field_factories[field_factory.signature] = field_factory
       @dynamic_field_factories_cache[field_factory.name] = field_factory
+      @field_factories_cache[field_factory.name] = field_factory
       if stored
         @stored_field_factories_cache[field_factory.name] << field_factory
       end
@@ -107,6 +110,24 @@ module Sunspot
         end
     end
 
+    #
+    # Add id prefix for compositeId router
+    #
+    def add_id_prefix(attr_name, &block)
+      @id_prefix_extractor =
+        case attr_name
+        when Symbol
+          DataExtractor::AttributeExtractor.new(attr_name)
+        when String
+          DataExtractor::Constant.new(attr_name)
+        when nil
+          DataExtractor::BlockExtractor.new(&block) if block_given?
+        else
+          raise ArgumentError,
+            "The ID prefix has to be either a Symbol, a String or a Proc"
+        end
+    end
+
     # 
     # Builder method for evaluating the setup DSL
     #
@@ -271,6 +292,54 @@ module Sunspot
       end
     end
 
+    def id_prefix_for(model)
+      if @id_prefix_extractor
+        value = @id_prefix_extractor.value_for(model)
+
+        if value.is_a?(String) and value.size > 0
+          value[-1] == "!" ? value : "#{value}!"
+        end
+      end
+    end
+
+    #
+    # Get value for `id_prefix` defined as String
+    #
+    # ==== Returns
+    #
+    # String:: value for `id_prefix` defined as String
+    #
+    def id_prefix_for_class
+      return if !id_prefix_defined? || id_prefix_requires_instance?
+
+      @id_prefix_extractor.value_for(nil)
+    end
+
+    #
+    # Check if `id_prefix` is defined for class associated with this setup.
+    #
+    # ==== Returns
+    #
+    # Boolean:: True if class associated with this setup has defined `id_prefix`
+    #
+    def id_prefix_defined?
+      !@id_prefix_extractor.nil?
+    end
+
+    #
+    # Check if instance is required to get `id_prefix` value (instance is required for Proc and
+    # Symbol `id_prefix` only. Value for String `id_prefix` can be get on class level)
+    #
+    # ==== Returns
+    #
+    # Boolean:: True if instance is required to get `id_prefix` value
+    #
+    def id_prefix_requires_instance?
+      return false unless id_prefix_defined?
+
+      !@id_prefix_extractor.is_a?(DataExtractor::Constant)
+    end
+
     protected
 
     # 

data/lib/sunspot/util.rb

@@ -190,22 +190,15 @@ module Sunspot
 
       def parse_json_facet(field_name, options, setup)
         field = setup.field(field_name)
-        if options[:time_range]
-          unless field.type.is_a?(Sunspot::Type::TimeType)
-            raise(
-              ArgumentError,
-              ':time_range can only be specified for Date or Time fields'
-            )
-          end
-          Sunspot::Query::DateFieldJsonFacet.new(field, options, setup)
-        elsif options[:range]
+        if options[:range] || options[:time_range]
           unless [Sunspot::Type::TimeType, Sunspot::Type::FloatType, Sunspot::Type::IntegerType ].find{|type| field.type.is_a?(type)}
             raise(
               ArgumentError,
-              ':range can only be specified for date or numeric fields'
+              ':range can only be specified for date, time, or numeric fields'
             )
           end
-          Sunspot::Query::RangeJsonFacet.new(field, options, setup)
+          facet_klass = field.type.is_a?(Sunspot::Type::TimeType) ? Sunspot::Query::DateFieldJsonFacet : Sunspot::Query::RangeJsonFacet
+          facet_klass.new(field, options, setup)
         else
           Sunspot::Query::FieldJsonFacet.new(field, options, setup)
         end

data/lib/sunspot/version.rb

@@ -1,3 +1,3 @@
 module Sunspot
-  VERSION = '2.3.0'
+  VERSION = '2.6.0'
 end

data/lib/sunspot.rb

@@ -40,6 +40,12 @@ module Sunspot
   NoSetupError = Class.new(StandardError)
   IllegalSearchError = Class.new(StandardError)
   NotImplementedError = Class.new(StandardError)
+  AtomicUpdateRequireInstanceForCompositeIdMessage = lambda do |class_name|
+    "WARNING: `id_prefix` is defined for #{class_name}. Use instance as key for `atomic_update` instead of ID."
+  end
+  RemoveByIdNotSupportCompositeIdMessage = lambda do |class_name|
+    "WARNING: `id_prefix` is defined for #{class_name}. `remove_by_id` does not support it. Use `remove` instead."
+  end
 
   autoload :Installer, File.join(File.dirname(__FILE__), 'sunspot', 'installer')
 
@@ -208,6 +214,8 @@ module Sunspot
     #
     #   post1, post2 = new Array(2) { Post.create }
     #   Sunspot.atomic_update(Post, post1.id => {title: 'New Title'}, post2.id => {description: 'new description'})
+    #   Or
+    #   Sunspot.atomic_update(Post, post1 => {title: 'New Title'}, post2 => {description: 'new description'})
     #
     # Note that indexed objects won't be reflected in search until a commit is
     # sent - see Sunspot.index! and Sunspot.commit
@@ -223,7 +231,7 @@ module Sunspot
     # ==== Parameters
     #
     # clazz<Class>:: the class of the objects to be updated
-    # updates<Hash>:: hash of updates where keys are model ids
+    # updates<Hash>:: hash of updates where keys are models or model ids
     #                 and values are hash with property name/values to be updated
     #
     def atomic_update!(clazz, updates = {})

data/spec/api/adapters_spec.rb

@@ -20,6 +20,19 @@ describe Sunspot::Adapters::InstanceAdapter do
     Sunspot::Adapters::InstanceAdapter::for(UnseenModel)
     expect(Sunspot::Adapters::InstanceAdapter::registered_adapter_for(UnseenModel)).to be(AbstractModelInstanceAdapter)
   end
+
+  it "appends ID prefix when configured" do
+    expect(AbstractModelInstanceAdapter.new(ModelWithPrefixId.new).index_id).to eq "USERDATA!ModelWithPrefixId 1"
+  end
+
+  it "supports nested ID prefixes" do
+    expect(AbstractModelInstanceAdapter.
+      new(ModelWithNestedPrefixId.new).index_id).to eq "USER!USERDATA!ModelWithNestedPrefixId 1"
+  end
+
+  it "doesn't appends ID prefix when not configured" do
+    expect(AbstractModelInstanceAdapter.new(ModelWithoutPrefixId.new).index_id).to eq "ModelWithoutPrefixId 1"
+  end
 end
 
 describe Sunspot::Adapters::DataAccessor do

data/spec/api/data_extractor_spec.rb

@@ -0,0 +1,39 @@
+require File.expand_path('spec_helper', File.dirname(__FILE__))
+
+describe Sunspot::DataExtractor do
+  it "removes special characters from strings" do
+    extractor = Sunspot::DataExtractor::AttributeExtractor.new(:name)
+    blog      = Blog.new(:name => "Te\x0\x1\x7\x6\x8st\xB\xC\xE Bl\x1Fo\x7fg")
+
+    expect(extractor.value_for(blog)).to eq "Test Blog"
+  end
+
+  it "removes special characters from arrays" do
+    extractor = Sunspot::DataExtractor::BlockExtractor.new { tags }
+    post      = Post.new(:tags => ["Te\x0\x1\x7\x6\x8st Ta\x1Fg\x7f 1", "Test\xB\xC\xE Tag 2"])
+
+    expect(extractor.value_for(post)).to eq ["Test Tag 1", "Test Tag 2"]
+  end
+
+  it "removes special characters from hashes" do
+    extractor = Sunspot::DataExtractor::Constant.new({ "Te\x0\x1\x7\x6\x8st" => "Ta\x1Fg\x7f" })
+
+    expect(extractor.value_for(Post.new)).to eq({ "Test" => "Tag" })
+  end
+
+  it "skips other data types" do
+    [
+      :"Te\x0\x1\x7\x6\x8st",
+      123,
+      123.0,
+      nil,
+      false,
+      true,
+      Sunspot::Util::Coordinates.new(40.7, -73.5)
+    ].each do |value|
+      extractor = Sunspot::DataExtractor::Constant.new(value)
+
+      expect(extractor.value_for(Post.new)).to eq value
+    end
+  end
+end

data/spec/api/indexer/removal_spec.rb

@@ -60,4 +60,91 @@ describe 'document removal', :type => :indexer do
     end
     expect(connection).to have_delete_by_query("(type:Post AND title_ss:monkeys)")
   end
+
+  context 'when call #remove_by_id' do
+    let(:post) { clazz.new(title: 'A Title') }
+    before(:each) { index_post(post) }
+
+    context 'and `id_prefix` is defined on model' do
+      context 'as Proc' do
+        let(:clazz) { PostWithProcPrefixId }
+        let(:id_prefix) { lambda { |post| "USERDATA-#{post.id}!" } }
+
+        it 'prints warning' do
+          expect do
+            session.remove_by_id(clazz, post.id)
+          end.to output(Sunspot::RemoveByIdNotSupportCompositeIdMessage.call(clazz) + "\n").to_stderr
+        end
+
+        it 'does not remove record' do
+          session.remove_by_id(clazz, post.id)
+          expect(connection).to have_no_delete(post_solr_id)
+        end
+      end
+
+      context 'as Symbol' do
+        let(:clazz) { PostWithSymbolPrefixId }
+        let(:id_prefix) { lambda { |post| "#{post.title}!" } }
+
+        it 'prints warning' do
+          expect do
+            session.remove_by_id(clazz, post.id)
+          end.to output(Sunspot::RemoveByIdNotSupportCompositeIdMessage.call(clazz) + "\n").to_stderr
+        end
+
+        it 'does not remove record' do
+          session.remove_by_id(clazz, post.id)
+          expect(connection).to have_no_delete(post_solr_id)
+        end
+      end
+
+      context 'as String' do
+        let(:clazz) { PostWithStringPrefixId }
+        let(:id_prefix) { 'USERDATA!' }
+
+        it 'does not print warning' do
+          expect do
+            session.remove_by_id(clazz, post.id)
+          end.to_not output(Sunspot::RemoveByIdNotSupportCompositeIdMessage.call(clazz) + "\n").to_stderr
+        end
+
+        it 'removes record' do
+          session.remove_by_id(clazz, post.id)
+          expect(connection).to have_delete(post_solr_id)
+        end
+      end
+    end
+
+    context 'and `id_prefix` is not defined on model' do
+      let(:clazz) { PostWithoutPrefixId }
+      let(:id_prefix) { nil }
+
+      it 'does not print warning' do
+        expect do
+          session.remove_by_id(clazz, post.id)
+        end.to_not output(Sunspot::RemoveByIdNotSupportCompositeIdMessage.call(clazz) + "\n").to_stderr
+      end
+
+      it 'removes record' do
+        session.remove_by_id(clazz, post.id)
+        expect(connection).to have_delete(post_solr_id)
+      end
+    end
+
+    context 'and `id_prefix` is passed along with `class_name`' do
+      let(:clazz) { PostWithProcPrefixId }
+      let(:id_prefix) { lambda { |post| "USERDATA-#{post.id}!" } }
+
+      it 'does not print warning' do
+        expect do
+          session.remove_by_id("USERDATA-#{post.id}!#{clazz.name}", post.id)
+        end.to_not output(Sunspot::RemoveByIdNotSupportCompositeIdMessage.call(clazz) + "\n").to_stderr
+      end
+
+      it 'removes record' do
+        session.remove_by_id("USERDATA-#{post.id}!#{clazz.name}", post.id)
+        expect(connection).to have_delete(post_solr_id)
+      end
+    end
+  end
 end

data/spec/api/query/connective_boost_examples.rb

@@ -0,0 +1,85 @@
+shared_examples_for "query with connective scope and boost" do
+  it 'creates a boost query' do
+    search do
+      boost(10) do
+        any_of do
+          with(:coordinates_new).in_bounding_box([23, -46], [25, -44])
+          with(:coordinates_new).in_bounding_box([42, 56], [43, 58])
+        end
+      end
+    end
+
+    expect(connection).to have_last_search_including(
+      :bq, '(coordinates_new_ll:[23,-46 TO 25,-44] OR coordinates_new_ll:[42,56 TO 43,58])^10'
+    )
+
+    expect(connection).to have_last_search_including(
+      :defType, 'edismax'
+    )
+  end
+
+  it 'creates a boost function' do
+    search do
+      boost(function() { field(:average_rating) })
+    end
+
+    expect(connection).to have_last_search_including(
+      :bf, 'field(average_rating_ft)'
+    )
+
+    expect(connection).to have_last_search_including(
+      :defType, 'edismax'
+    )
+  end
+
+  it 'creates a multiplicative boost function' do
+    search do
+      boost_multiplicative(function() { field(:average_rating) })
+    end
+
+    expect(connection).to have_last_search_including(
+      :boost, 'field(average_rating_ft)'
+    )
+
+    expect(connection).to have_last_search_including(
+      :defType, 'edismax'
+    )
+  end
+
+  it 'creates combined boost search' do
+    search do
+      boost(10) do
+        any_of do
+          with(:coordinates_new).in_bounding_box([23, -46], [25, -44])
+          with(:coordinates_new).in_bounding_box([42, 56], [43, 58])
+        end
+      end
+
+      boost(function() { field(:average_rating) })
+      boost_multiplicative(function() { field(:average_rating) })
+    end
+
+    expect(connection).to have_last_search_including(
+      :bq, '(coordinates_new_ll:[23,-46 TO 25,-44] OR coordinates_new_ll:[42,56 TO 43,58])^10'
+    )
+
+    expect(connection).to have_last_search_including(
+      :bf, 'field(average_rating_ft)'
+    )
+
+    expect(connection).to have_last_search_including(
+      :boost, 'field(average_rating_ft)'
+    )
+  end
+
+  it 'avoids duplicate boost functions' do
+    search do
+      boost(function() { field(:average_rating) })
+      boost(function() { field(:average_rating) })
+      boost_multiplicative(function() { field(:average_rating) })
+    end
+
+    expect(connection.searches.last[:bf]).to eq ['field(average_rating_ft)']
+    expect(connection.searches.last[:boost]).to eq ['field(average_rating_ft)']
+  end
+end

data/spec/api/query/fulltext_examples.rb

@@ -418,11 +418,9 @@ shared_examples_for 'fulltext query' do
 
       obj_id = find_ob_id(srch)
       q_name = "qPhoto#{obj_id}"
-      fq_name = "f#{q_name}"
 
-      expect(connection.searches.last[:q]).to eq "(_query_:\"{!join from=photo_container_id_i to=id_i v=$#{q_name} fq=$#{fq_name}}\" OR _query_:\"{!edismax qf='description_text^1.2'}keyword2\")"
-      expect(connection.searches.last[q_name]).to eq "_query_:\"{!edismax qf='caption_text'}keyword1\""
-      expect(connection.searches.last[fq_name]).to eq "type:Photo"
+      expect(connection.searches.last[:q]).to eq "(_query_:\"{!join from=photo_container_id_i to=id_i v=$#{q_name}}\" OR _query_:\"{!edismax qf='description_text^1.2'}keyword2\")"
+      expect(connection.searches.last[q_name]).to eq "_query_:\"{!field f=type}Photo\"+_query_:\"{!edismax qf='caption_text'}keyword1\""
     end
 
     it "should be able to resolve name conflicts with the :prefix option" do
@@ -435,11 +433,9 @@ shared_examples_for 'fulltext query' do
 
       obj_id = find_ob_id(srch)
       q_name = "qPhoto#{obj_id}"
-      fq_name = "f#{q_name}"
 
-      expect(connection.searches.last[:q]).to eq "(_query_:\"{!edismax qf='description_text^1.2'}keyword1\" OR _query_:\"{!join from=photo_container_id_i to=id_i v=$#{q_name} fq=$#{fq_name}}\")"
-      expect(connection.searches.last[q_name]).to eq "_query_:\"{!edismax qf='description_text'}keyword2\""
-      expect(connection.searches.last[fq_name]).to eq "type:Photo"
+      expect(connection.searches.last[:q]).to eq "(_query_:\"{!edismax qf='description_text^1.2'}keyword1\" OR _query_:\"{!join from=photo_container_id_i to=id_i v=$#{q_name}}\")"
+      expect(connection.searches.last[q_name]).to eq "_query_:\"{!field f=type}Photo\"+_query_:\"{!edismax qf='description_text'}keyword2\""
     end
 
     it "should recognize fields when adding from DSL, e.g. when calling boost_fields" do
@@ -453,11 +449,9 @@ shared_examples_for 'fulltext query' do
 
       obj_id = find_ob_id(srch)
       q_name = "qPhoto#{obj_id}"
-      fq_name = "f#{q_name}"
 
-      expect(connection.searches.last[:q]).to eq "(_query_:\"{!edismax qf='description_text^1.5'}keyword1\" OR _query_:\"{!join from=photo_container_id_i to=id_i v=$#{q_name} fq=$#{fq_name}}\")"
-      expect(connection.searches.last[q_name]).to eq "_query_:\"{!edismax qf='description_text^1.3'}keyword1\""
-      expect(connection.searches.last[fq_name]).to eq "type:Photo"
+      expect(connection.searches.last[:q]).to eq "(_query_:\"{!edismax qf='description_text^1.5'}keyword1\" OR _query_:\"{!join from=photo_container_id_i to=id_i v=$#{q_name}}\")"
+      expect(connection.searches.last[q_name]).to eq "_query_:\"{!field f=type}Photo\"+_query_:\"{!edismax qf='description_text^1.3'}keyword1\""
     end
 
     private

data/spec/api/query/join_spec.rb

@@ -6,7 +6,7 @@ describe 'join' do
       with(:caption, 'blah')
     end
     expect(connection).to have_last_search_including(
-      :fq, "{!join from=photo_container_id_i to=id_i}caption_s:blah")
+      :fq, "{!join from=photo_container_id_i to=id_i v='type:\"Photo\" AND caption_s:\"blah\"'}")
   end
 
   it 'should greater_than search by join' do
@@ -14,6 +14,6 @@ describe 'join' do
       with(:photo_rating).greater_than(3)
     end
     expect(connection).to have_last_search_including(
-      :fq, "{!join from=photo_container_id_i to=id_i}average_rating_ft:{3\\.0 TO *}")
+      :fq, "{!join from=photo_container_id_i to=id_i v='type:\"Photo\" AND average_rating_ft:{3\\.0 TO *}'}")
   end
 end

data/spec/api/query/standard_spec.rb

@@ -4,6 +4,7 @@ describe 'standard query', :type => :query do
   it_should_behave_like "scoped query"
   it_should_behave_like "query with advanced manipulation"
   it_should_behave_like "query with connective scope"
+  it_should_behave_like "query with connective scope and boost"
   it_should_behave_like "query with dynamic field support"
   it_should_behave_like "facetable query"
   it_should_behave_like "fulltext query"
@@ -22,6 +23,15 @@ describe 'standard query', :type => :query do
     expect(connection).to have_last_search_with(:q => '*:*')
   end
 
+  it 'adds a no-op query to :q parameter when only a boost query provided' do
+    session.search Post do
+      boost(2) do
+        with :title, 'My Pet Post'
+      end
+    end
+    expect(connection).to have_last_search_with(:q => '*:*')
+  end
+
   private
 
   def search(*classes, &block)