sunspot 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 179de5f5261bdb69d21038a0b2e36fbd2812e1fc71ef4c1efd77979a03e58179
-  data.tar.gz: 1f7f40d9737400cf61c23515c61ebde70140b1c1bf9df800d7e19ce27c3cbd0d
+  metadata.gz: c13ef43c3d9e3c45ca9d1ccc170ba55947797e788911fda1982b817d34207c5d
+  data.tar.gz: 8a2dc3da8797d0ff4945c99732c9808e1ff9d06f94d0611b932a20cc49210d08
 SHA512:
-  metadata.gz: ad59d5868f3461648d29c77b6368d7c5145ef6247ecca38878bf4f03bb3d2ab73fea2decf629936d58282b8067345198f6bff82be1347bb0cc92cb4537722d28
-  data.tar.gz: 3c4fd67940331fbdacffd665ca624119038bf12da2aa2b041adbd8260aef3921660b83803a912cf81384c7269f6b46d3b7fad1c883c34e1a1ba2ccbade2fd6dc
+  metadata.gz: dbdf307d46210db9f3430a7a46d615709aa181c61c2400f6e42d23edd5dfa0c619ecb249cf148eb7215d4dd37d9907c630acf4d13ec83319cff1cbdd2652882e
+  data.tar.gz: f77be8b5ee7ea9226565214951f4af0930b994f9fe568b4c79ac7d0733d414644d32018b4bdfb0ebd23a19b30ecece2c45da5d29b8bd46e28aafaf33ff58796f

data/lib/sunspot/adapters.rb

@@ -55,6 +55,20 @@ module Sunspot
         @instance = instance
       end
 
+      #
+      # An ID prefix to be added to the index_id
+      #
+      # ==== Returns
+      #
+      # String:: ID prefix for use in index ID to determine
+      # the shard a document is sent to for indexing
+      #
+      def id_prefix
+        setup = Sunspot::Setup.for(@instance.class)
+
+        setup && setup.id_prefix_for(@instance)
+      end
+
       #
       # The universally-unique ID for this instance that will be stored in solr
       #
@@ -63,9 +77,6 @@ module Sunspot
       # String:: ID for use in Solr
       #
       def index_id #:nodoc:
-        setup     = Sunspot::Setup.for(@instance.class)
-        id_prefix = setup ? setup.id_prefix_for(@instance) : nil
-
         InstanceAdapter.index_id_for("#{id_prefix}#{@instance.class.name}", id)
       end
 

data/lib/sunspot/data_extractor.rb

@@ -9,7 +9,7 @@ module Sunspot
     # Abstract extractor to perform common actions on extracted values
     #
     class AbstractExtractor
-      BLACKLIST_REGEXP = /[\x0-\x8\xB\xC\xE-\x1F\x7f]/
+      BLACKLIST_REGEXP = /[\x0-\x8\xB\xC\xE-\x1F\x7f\uFFFE-\uFFFF]/
 
       def value_for(object)
         extract_value_from(object)

data/lib/sunspot/dsl/fulltext.rb

@@ -176,7 +176,7 @@ module Sunspot
           @query.add_additive_boost_function(factor_or_function)
         else
           Sunspot::Util.instance_eval_or_call(
-            Scope.new(@query.create_boost_query(factor_or_function), @setup),
+            Scope.new(@query.add_boost_query(factor_or_function), @setup),
             &block
           )
         end

data/lib/sunspot/dsl/standard_query.rb

@@ -9,7 +9,7 @@ module Sunspot
     # See Sunspot.search for usage examples
     #
     class StandardQuery < FieldQuery
-      include Paginatable, Adjustable, Spellcheckable
+      include Paginatable, Adjustable, Spellcheckable, Functional
 
       # Specify a phrase that should be searched as fulltext. Only +text+
       # fields are searched - see DSL::Fields.text
@@ -123,6 +123,34 @@ module Sunspot
         end
       end
 
+      #
+      # Defines a boost query
+      #
+      # === Examples
+      #
+      #   Sunspot.search(Post) do
+      #     with(:blog_id, 1)
+      #
+      #     boost(10) do
+      #       with(:category_id, 2)
+      #     end
+      #   end
+      #
+      def boost(factor_or_function, &block)
+        if factor_or_function.is_a?(Sunspot::Query::FunctionQuery)
+          @query.add_boost_function(factor_or_function)
+        else
+          Sunspot::Util.instance_eval_or_call(
+            Scope.new(@query.add_boost_query(factor_or_function), @setup),
+            &block
+          )
+        end
+      end
+
+      def boost_multiplicative(factor_or_function)
+        @query.add_multiplicative_boost_function(factor_or_function)
+      end
+
       private
 
       def add_fulltext(keywords, field_names)

data/lib/sunspot/dsl.rb

@@ -1,5 +1,5 @@
-%w(spellcheckable fields scope paginatable adjustable field_query
-   standard_query query_facet functional fulltext restriction
+%w(spellcheckable fields functional scope paginatable adjustable field_query
+   standard_query query_facet fulltext restriction
    restriction_with_near search more_like_this_query function
    group field_stats).each do |file|
   require File.join(File.dirname(__FILE__), 'dsl', file)

data/lib/sunspot/field.rb

@@ -195,7 +195,7 @@ module Sunspot
   # Could be of any type
   #
   class JoinField < Field #:nodoc:
-    attr_reader :default_boost, :target
+    attr_reader :default_boost
 
     def initialize(name, type, options = {})
       @multiple = !!options.delete(:multiple)
@@ -213,15 +213,21 @@ module Sunspot
     end
 
     def from
-      Sunspot::Setup.for(@target).field(@join[:from]).indexed_name
+      Sunspot::Setup.for(target).field(@join[:from]).indexed_name
     end
 
     def to
       Sunspot::Setup.for(@clazz).field(@join[:to]).indexed_name
     end
 
-    def local_params
-      "{!join from=#{from} to=#{to}}"
+    def local_params(value)
+      query = ["type:\"#{target.name}\""] | Util.Array(value)
+
+      "{!join from=#{from} to=#{to} v='#{query.join(' AND ')}'}"
+    end
+
+    def to_solr_conditional(value)
+      "\"#{value}\""
     end
 
     def eql?(field)
@@ -229,6 +235,11 @@ module Sunspot
     end
 
     alias_method :==, :eql?
+
+    def target
+      @target = Util.full_const_get(@target) if @target.is_a?(String)
+      @target
+    end
   end
 
   class TypeField #:nodoc:

data/lib/sunspot/indexer.rb

@@ -54,9 +54,24 @@ module Sunspot
     # Remove the model from the Solr index by specifying the class and ID
     #
     def remove_by_id(class_name, *ids)
+      if class_name.is_a?(String) and class_name.index("!")
+        partition  = class_name.rpartition("!")
+        id_prefix  = partition[0..1].join
+        class_name = partition[2]
+      else
+        clazz_setup = setup_for_class(Util.full_const_get(class_name))
+        id_prefix = if clazz_setup.id_prefix_defined?
+                      if clazz_setup.id_prefix_requires_instance?
+                        warn(Sunspot::RemoveByIdNotSupportCompositeIdMessage.call(class_name))
+                      else
+                        clazz_setup.id_prefix_for_class
+                      end
+                    end
+      end
+
       ids.flatten!
       @connection.delete_by_id(
-        ids.map { |id| Adapters::InstanceAdapter.index_id_for(class_name, id) }
+        ids.map { |id| Adapters::InstanceAdapter.index_id_for("#{id_prefix}#{class_name}", id) }
       )
     end
 
@@ -147,13 +162,27 @@ module Sunspot
       )
     end
 
-    def document_for_atomic_update(clazz, id)
-      if Adapters::InstanceAdapter.for(clazz)
-        RSolr::Xml::Document.new(
-            id: Adapters::InstanceAdapter.index_id_for(clazz.name, id),
-            type: Util.superclasses_for(clazz).map(&:name)
-        )
-      end
+    def document_for_atomic_update(clazz, key)
+      return unless Adapters::InstanceAdapter.for(clazz)
+
+      clazz_setup = setup_for_class(clazz)
+      id_prefix = if clazz_setup.id_prefix_defined?
+                    if clazz_setup.id_prefix_requires_instance?
+                      if key.respond_to?(:id)
+                        clazz_setup.id_prefix_for(key)
+                      else
+                        warn(Sunspot::AtomicUpdateRequireInstanceForCompositeIdMessage.call(clazz.name))
+                      end
+                    else
+                      clazz_setup.id_prefix_for_class
+                    end
+                  end
+
+      instance_id = key.respond_to?(:id) ? key.id : key
+      RSolr::Xml::Document.new(
+        id: Adapters::InstanceAdapter.index_id_for("#{id_prefix}#{clazz.name}", instance_id),
+        type: Util.superclasses_for(clazz).map(&:name)
+      )
     end
     # 
     # Get the Setup object for the given object's class.

data/lib/sunspot/query/abstract_fulltext.rb

@@ -10,7 +10,7 @@ module Sunspot
       #
       # Assign a new boost query and return it.
       #
-      def create_boost_query(factor)
+      def add_boost_query(factor)
         @boost_queries << boost_query = BoostQuery.new(factor)
         boost_query
       end
@@ -19,14 +19,18 @@ module Sunspot
       # Add a boost function
       #
       def add_additive_boost_function(function_query)
-        @additive_boost_functions << function_query
+        unless @additive_boost_functions.include?(function_query)
+          @additive_boost_functions << function_query
+        end
       end
 
       #
       # Add a multiplicative boost function
       #
       def add_multiplicative_boost_function(function_query)
-        @multiplicative_boost_functions << function_query
+        unless @multiplicative_boost_functions.include?(function_query)
+          @multiplicative_boost_functions << function_query
+        end
       end
 
       #

data/lib/sunspot/query/abstract_json_field_facet.rb

@@ -17,6 +17,9 @@ module Sunspot
         params[:sort] = { @options[:sort] => @options[:sort_type]||'desc' } unless @options[:sort].nil?
         params[:prefix] = @options[:prefix] unless @options[:prefix].nil?
         params[:offset] = @options[:offset] unless @options[:offset].nil?
+        params[:allBuckets] = @options[:all_buckets] unless @options[:all_buckets].nil?
+        params[:missing] = @options[:missing] unless @options[:missing].nil?
+        params[:method] = @options[:method] unless @options[:method].nil?
 
         if !@options[:distinct].nil?
           dist_opts = @options[:distinct]

data/lib/sunspot/query/composite_fulltext.rb

@@ -3,11 +3,30 @@ module Sunspot
     class CompositeFulltext
       def initialize
         @components = []
+        @dismax = nil
       end
 
       def add_fulltext(keywords)
-        @components << dismax = Dismax.new(keywords)
-        dismax
+        @components << @dismax = Dismax.new(keywords)
+        @dismax
+      end
+
+      def add_boost_query(factor)
+        @dismax ||= Dismax.new("*:*")
+        @components << @dismax unless @components.include?(@dismax)
+        @dismax.add_boost_query(factor)
+      end
+
+      def add_boost_function(function)
+        @dismax ||= Dismax.new("*:*")
+        @components << @dismax unless @components.include?(@dismax)
+        @dismax.add_additive_boost_function(function)
+      end
+
+      def add_multiplicative_boost_function(function)
+        @dismax ||= Dismax.new("*:*")
+        @components << @dismax unless @components.include?(@dismax)
+        @dismax.add_multiplicative_boost_function(function)
       end
 
       def add_join(keywords, target, from, to)

data/lib/sunspot/query/date_field_json_facet.rb

@@ -1,24 +1,10 @@
 module Sunspot
   module Query
-    class DateFieldJsonFacet < AbstractJsonFieldFacet
+    class DateFieldJsonFacet < RangeJsonFacet
 
       def initialize(field, options, setup)
-        raise Exception.new('Need to specify a time_range') if options[:time_range].nil?
-        @start = options[:time_range].first
-        @end = options[:time_range].last
-        @gap = "+#{options[:gap] || 86400}SECONDS"
         super
-      end
-
-      def field_name_with_local_params
-        params = {}
-        params[:type] = 'range'
-        params[:field] = @field.indexed_name
-        params[:start] = @field.to_indexed(@start)
-        params[:end] = @field.to_indexed(@end)
-        params[:gap] = @gap
-        params.merge!(init_params)
-        { @field.name => params }
+        @gap = "+#{@gap}#{options[:gap_unit] || 'SECONDS'}"
       end
     end
   end

data/lib/sunspot/query/dismax.rb

@@ -28,10 +28,16 @@ module Sunspot
       # The query as Solr parameters
       #
       def to_params
-        params = { :q => @keywords }
-        params[:fl] = '* score'
-        params[:qf] = @fulltext_fields.values.map { |field| field.to_boosted_field }.join(' ')
-        params[:defType] = 'edismax'
+        params = {
+          :q => @keywords,
+          :defType => 'edismax',
+          :fl => '* score'
+        }
+
+        if @fulltext_fields.any?
+          params[:qf] = @fulltext_fields.values.map { |field| field.to_boosted_field }.join(' ')
+        end
+
         params[:mm] = @minimum_match if @minimum_match
         params[:ps] = @phrase_slop if @phrase_slop
         params[:qs] = @query_phrase_slop if @query_phrase_slop

data/lib/sunspot/query/function_query.rb

@@ -3,18 +3,25 @@ module Sunspot
     # 
     # Abstract class for function queries.
     #
-    class FunctionQuery 
+    class FunctionQuery
+      attr_reader :boost_amount
 
       def ^(y)
         @boost_amount = y
         self
       end
+
+      def ==(other)
+        @boost_amount == other.boost_amount
+      end
     end
 
     #
     # Function query which represents a constant.
     #
     class ConstantFunctionQuery < FunctionQuery
+      attr_reader :constant
+
       def initialize(constant)
         @constant = constant
       end
@@ -22,12 +29,18 @@ module Sunspot
       def to_s
         Type.to_literal(@constant) << (@boost_amount ? "^#{@boost_amount}" : "")
       end
+
+      def ==(other)
+        super and @constant == other.constant
+      end
     end
 
     #
     # Function query which represents a field.
     #
     class FieldFunctionQuery < FunctionQuery
+      attr_reader :field
+
       def initialize(field)
         @field = field
       end
@@ -35,6 +48,10 @@ module Sunspot
       def to_s
         "#{Util.escape(@field.indexed_name)}" << (@boost_amount ? "^#{@boost_amount}" : "")
       end
+
+      def ==(other)
+        super and @field == other.field
+      end
     end
 
     #
@@ -43,6 +60,8 @@ module Sunspot
     # Arguments are in turn FunctionQuery objects.
     #
     class FunctionalFunctionQuery < FunctionQuery
+      attr_reader :function_name, :function_args
+
       def initialize(function_name, function_args)
         @function_name, @function_args = function_name, function_args
       end
@@ -51,6 +70,11 @@ module Sunspot
         params = @function_args.map { |arg| arg.to_s }.join(",")
         "#{@function_name}(#{params})" << (@boost_amount ? "^#{@boost_amount}" : "")
       end
+
+      def ==(other)
+        super and
+          @function_name == other.function_name and @function_args == other.function_args
+      end
     end
   end
 end

data/lib/sunspot/query/join.rb

@@ -52,7 +52,7 @@ module Sunspot
       #
       # Assign a new boost query and return it.
       #
-      def create_boost_query(factor)
+      def add_boost_query(factor)
       end
 
       #

data/lib/sunspot/query/range_json_facet.rb

@@ -5,10 +5,12 @@ module Sunspot
       SECONDS_IN_DAY = 86400
 
       def initialize(field, options, setup)
-        raise Exception.new("Need to specify a range") if options[:range].nil?
+        options[:range] ||= options[:time_range]
+        raise Exception.new("Need to specify a range") if options[:range].nil? && options[:time_range].nil?
         @start = options[:range].first
         @end = options[:range].last
         @gap = options[:gap] || SECONDS_IN_DAY
+        @other = options[:other]
         super
       end
 
@@ -19,7 +21,8 @@ module Sunspot
             field: @field.indexed_name,
             start: @field.to_indexed(@start),
             end: @field.to_indexed(@end),
-            gap: @gap
+            gap: @gap,
+            other: @other
           }.merge!(init_params)
         }
       end

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
 
         # 
@@ -208,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/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/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: update_format_generator
+        update_format: update_format
       )
     end
 
@@ -278,9 +278,11 @@ module Sunspot
       end
     end
 
-    def update_format_generator
-      if config.solr.update_format && RSolr.version.to_i > 1
-        config.solr.update_format.downcase.to_sym == :json ? RSolr::JSON::Generator : RSolr::Xml::Generator
+    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

data/lib/sunspot/setup.rb

@@ -302,6 +302,44 @@ module Sunspot
       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.5.0'
+  VERSION = '2.6.0'
 end