Merge branch 'excluded-end-range'

Author: njakobsen

sunspot/lib/sunspot/query/restriction.rb

@@ -7,14 +7,14 @@ class <<self
         # available to the DSL.
         #
         # ==== Returns
-        # 
+        #
         # Array:: Collection of restriction class names
         #
         def names
           constants - abstract_constants
         end
 
-        # 
+        #
         # Convenience method to access a restriction class by an underscored
         # symbol or string
         #
@@ -35,7 +35,7 @@ def abstract_constants
         end
       end
 
-      # 
+      #
       # Subclasses of this class represent restrictions that can be applied to
       # a Sunspot query. The Sunspot::DSL::Restriction class presents a builder
       # API for instances of this class.
@@ -57,7 +57,7 @@ def initialize(negated, field, value)
           @negated, @field, @value = negated, field, value
         end
 
-        # 
+        #
         # A hash representing this restriction in solr-ruby's parameter format.
         # All restriction implementations must respond to this method; however,
         # the base implementation delegates to the #to_positive_boolean_phrase method, so
@@ -72,7 +72,7 @@ def to_params
           { :fq => [to_filter_query] }
         end
 
-        # 
+        #
         # Return the boolean phrase associated with this restriction object.
         # Differentiates between positive and negated boolean phrases depending
         # on whether this restriction is negated.
@@ -88,7 +88,7 @@ def to_boolean_phrase
             @field.local_params(value) : value
         end
 
-        # 
+        #
         # Boolean phrase representing this restriction in the positive. Subclasses
         # may choose to implement this method rather than #to_params; however,
         # this method delegates to the abstract #to_solr_conditional method, which
@@ -105,7 +105,7 @@ def to_positive_boolean_phrase
           "#{Util.escape(@field.indexed_name)}:#{to_solr_conditional}"
         end
 
-        # 
+        #
         # Boolean phrase representing this restriction in the negated. Subclasses
         # may choose to implement this method, but it is not necessary, as the
         # base implementation delegates to #to_positive_boolean_phrase.
@@ -118,14 +118,14 @@ def to_negated_boolean_phrase
           "-#{to_positive_boolean_phrase}"
         end
 
-        # 
+        #
         # Whether this restriction should be negated from its original meaning
         #
         def negated? #:nodoc:
           !!@negated
         end
 
-        # 
+        #
         # Return a new restriction that is the negated version of this one. It
         # is used by disjunction denormalization.
         #
@@ -184,7 +184,7 @@ def to_solr_conditional
         end
       end
 
-      # 
+      #
       # Results must have field with value equal to given value. If the value
       # is nil, results must have no value for the given field.
       #
@@ -213,7 +213,7 @@ def to_solr_conditional
         end
       end
 
-      # 
+      #
       # Results must have field with value less than given value
       #
       class LessThan < Base
@@ -230,7 +230,7 @@ def to_solr_conditional
         end
       end
 
-      # 
+      #
       # Results must have field with value less or equal to than given value
       #
       class LessThanOrEqualTo < Base
@@ -247,7 +247,7 @@ def to_solr_conditional
         end
       end
 
-      # 
+      #
       # Results must have field with value greater than given value
       #
       class GreaterThan < Base
@@ -264,7 +264,7 @@ def to_solr_conditional
         end
       end
 
-      # 
+      #
       # Results must have field with value greater than or equal to given value
       #
       class GreaterThanOrEqualTo < Base
@@ -281,7 +281,7 @@ def to_solr_conditional
         end
       end
 
-      # 
+      #
       # Results must have field with value in given range
       #
       class Between < Base
@@ -294,11 +294,15 @@ def solr_value(value = @value)
         end
 
         def to_solr_conditional
-          "[#{solr_value(@value.first)} TO #{solr_value(@value.last)}]"
+          if @value.exclude_end?
+            "[#{solr_value(@value.first)} TO #{solr_value(@value.last)}}"
+          else
+            "[#{solr_value(@value.first)} TO #{solr_value(@value.last)}]"
+          end
         end
       end
 
-      # 
+      #
       # Results must have field with value included in given collection
       #
       class AnyOf < Base
@@ -339,7 +343,7 @@ def negated?
             super
           end
         end
-        
+
         private
 
         def to_solr_conditional
@@ -351,7 +355,7 @@ def to_solr_conditional
         end
       end
 
-      # 
+      #
       # Results must have a field with a value that begins with the argument.
       # Most useful for strings, but in theory will work with anything.
       #

sunspot/spec/api/query/scope_examples.rb

@@ -34,7 +34,7 @@
       'expire_date_d:1983\-07\-08T00\:00\:00Z'
     )
   end
-  
+
   it 'scopes by exact match with boolean' do
     search do
       with :featured, false
@@ -63,6 +63,13 @@
     expect(connection).to have_last_search_including(:fq, 'average_rating_ft:{3\.0 TO *}')
   end
 
+  it 'scopes by between match with excluded end float range' do
+    search do
+      with(:average_rating).between 2.0...3.0
+    end
+    expect(connection).to have_last_search_including(:fq, 'average_rating_ft:[2\.0 TO 3\.0}')
+  end
+
   it 'scopes by short-form between match with integers' do
     search do
       with :blog_id, 2..4
@@ -125,7 +132,7 @@
     end
     expect(connection).to have_last_search_including(:fq, '-average_rating_ft:{3\.0 TO *}')
   end
-  
+
   it 'scopes by not between match with shorthand' do
     search do
       without(:blog_id, 2..4)