sunspot 2.2.8 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 97232f93d9d1c5ce704e6249cd1afcec04f7f231
-  data.tar.gz: 9eb35de3e65284cdec3eb299d6085cc32e662590
+SHA256:
+  metadata.gz: 698b438f344a3e391c87d9f755dc227869fefad88555b261ef4dcd9cc9d9c1d1
+  data.tar.gz: 2ba1b782a43a5eafd6f1bc6397ef221fe94bbbb92f1036505530719a50f07882
 SHA512:
-  metadata.gz: 5bd0d81960ded04f07fdfa72811ddf959c5c97b0339e58246761469d3f9b4d9a82bf71ec69e8ee222b05ff9c07b5ff406f2702ef1ab8caeacbb1d219415b0044
-  data.tar.gz: b8adf8fc509ea65e460139687084832f8353e81e6ad1fd50f976db0a721545934761894ca42281962b19ce64b179a69b607dd3bb05b735b5fc53603aff0685a5
+  metadata.gz: 8f89e196fd125f6c0b2bd8eda2aecf7c288860ff14ab128d695f61252344fc07b0011ed8c10d8c5578227eae814df368fecf3332d306ae2a79e9b5da593dfc97
+  data.tar.gz: 780ca66b8d6e569a994670b2e6f990444333dc03f109bd015c7f26924673e801281f611f5d08b14b48afb35b6177099747113e0bbdc10a07aebe4cee5f93c8ea

data/lib/sunspot/configuration.rb

@@ -26,6 +26,7 @@ module Sunspot
             read_timeout nil
             open_timeout nil
             proxy nil
+            update_format :xml
           end
           master_solr do
             url nil

data/lib/sunspot/dsl/field_query.rb

@@ -333,6 +333,17 @@ module Sunspot
         end
       end
 
+      def json_facet(*field_names)
+        options = Sunspot::Util.extract_options_from(field_names)
+
+        field_names.each do |field_name|
+          field = @setup.field(field_name)
+          facet = Sunspot::Util.parse_json_facet(field_name, options, @setup)
+          @search.add_json_facet(field, options)
+          @query.add_query_facet(facet)
+        end
+      end
+
       def stats(*field_names, &block)
         options = Sunspot::Util.extract_options_from(field_names)
 

data/lib/sunspot/dsl/field_stats.rb

@@ -13,6 +13,13 @@ module Sunspot
           @search_stats.add_facet(field)
         end
       end
+
+      def json_facet(field_name, options = {})
+        field = @setup.field(field_name)
+        facet = Sunspot::Util.parse_json_facet(field_name, options, @setup)
+        @query_stats.add_json_facet(facet)
+      end
+
     end
   end
 end

data/lib/sunspot/query.rb

@@ -1,6 +1,6 @@
-%w(filter abstract_field_facet connective boost_query date_field_facet
-   range_facet abstract_fulltext dismax join field_list
-   field_facet highlighting pagination restriction common_query spellcheck
+%w(filter abstract_field_facet abstract_json_field_facet connective boost_query date_field_facet field_json_facet
+   range_facet range_json_facet date_field_json_facet abstract_fulltext dismax join
+   field_list field_facet highlighting pagination restriction common_query spellcheck
    standard_query more_like_this more_like_this_query geo geofilt bbox query_facet
    scope sort sort_composite text_field_boost function_query field_stats
    composite_fulltext group group_query).each do |file|

data/lib/sunspot/query/abstract_json_field_facet.rb

@@ -0,0 +1,70 @@
+module Sunspot
+  module Query
+    class AbstractJsonFieldFacet
+
+      attr_accessor :field
+
+      DISTINCT_STRATEGIES = [:unique, :hll]
+
+      def initialize(field, options, setup)
+        @field, @options, @setup = field, options, setup
+      end
+
+      def init_params
+        params = {}
+        params[:limit] = @options[:limit] unless @options[:limit].nil?
+        params[:mincount] = @options[:minimum_count] unless @options[:minimum_count].nil?
+        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?
+
+        if !@options[:distinct].nil?
+          dist_opts = @options[:distinct]
+          raise Exception.new("Need to specify a strategy") if dist_opts[:strategy].nil?
+          raise Exception.new("The strategy must be one of #{DISTINCT_STRATEGIES}") unless DISTINCT_STRATEGIES.include?(dist_opts[:strategy])
+          @stategy = dist_opts[:strategy]
+          @group_by = dist_opts[:group_by].nil? ? @field : @setup.field(dist_opts[:group_by])
+          params[:field] = @group_by.indexed_name
+          params[:facet] = {}
+          params[:facet][:distinct] = "#{@stategy}(#{@field.indexed_name})"
+        end
+
+        params
+      end
+
+      def get_params
+        query = field_name_with_local_params
+        nested_params = recursive_nested_params(@options)
+
+        if !nested_params.nil?
+          query[@field.name][:facet] ||= {}
+          query[@field.name][:facet].merge!(nested_params)
+        end
+        query
+      end
+
+      def to_params
+        { 'json.facet' => self.get_params.to_json }
+      end
+
+      private
+
+      def recursive_nested_params(options)
+        if !options[:nested].nil? && options[:nested].is_a?(Hash)
+          opts = options[:nested]
+          field_name = opts[:field]
+
+          options = Sunspot::Util.extract_options_from([opts])
+          params = Sunspot::Util.parse_json_facet(field_name, options, @setup).field_name_with_local_params
+          if !opts.nil?
+            nested_params = recursive_nested_params(opts)
+            params[field_name][:facet] = nested_params unless nested_params.nil?
+          end
+
+          params
+        end
+      end
+
+    end
+  end
+end

data/lib/sunspot/query/date_field_json_facet.rb

@@ -0,0 +1,25 @@
+module Sunspot
+  module Query
+    class DateFieldJsonFacet < AbstractJsonFieldFacet
+
+      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 }
+      end
+    end
+  end
+end

data/lib/sunspot/query/field_json_facet.rb

@@ -0,0 +1,19 @@
+module Sunspot
+  module Query
+    class FieldJsonFacet < AbstractJsonFieldFacet
+
+      def initialize(field, options, setup)
+        super
+      end
+
+      def field_name_with_local_params
+        {
+          @field.name => {
+            type: 'terms',
+            field: @field.indexed_name,
+          }.merge!(init_params)
+        }
+      end
+    end
+  end
+end

data/lib/sunspot/query/field_stats.rb

@@ -10,9 +10,42 @@ module Sunspot
         @facets << field
       end
 
+      def add_json_facet(json_facet)
+        @json_facet = json_facet
+      end
+
       def to_params
-        params = { :stats => true, :"stats.field" => [@field.indexed_name]}
-        params[facet_key] = @facets.map(&:indexed_name) unless @facets.empty?
+        params = {}
+        if !@json_facet.nil?
+          params['json.facet'] = recursive_add_stats(@json_facet.get_params).to_json
+        else
+          params.merge!(:stats => true, :"stats.field" => [@field.indexed_name])
+          params[facet_key] = @facets.map(&:indexed_name) unless @facets.empty?
+        end
+        params
+      end
+
+      STATS_FUNCTIONS = [:min, :max, :sum, :avg, :sumsq]
+
+      def recursive_add_stats(query)
+        query.keys.each do |k|
+          if !query[k][:facet].nil?
+            query[k][:facet] = recursive_add_stats(query[k][:facet])
+          end
+          query[k][:facet] ||= {}
+          query[k][:sort] = { @options[:sort] => @options[:sort_type]||'desc' } unless @options[:sort].nil?
+          query[k][:facet].merge!(json_stats_params)
+        end
+        query
+      end
+
+      def json_stats_params
+        params = {}
+        STATS_FUNCTIONS.each { |s| params[s] = "#{s.to_s}(#{@field.indexed_name})" }
+        unless @options[:stats].nil?
+          to_remove = STATS_FUNCTIONS - @options[:stats]
+          to_remove.map { |s| params.delete(s)}
+        end
         params
       end
 

data/lib/sunspot/query/range_json_facet.rb

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

data/lib/sunspot/schema.rb

@@ -88,8 +88,16 @@ module Sunspot
     # Return an XML representation of this schema using the ERB template
     #
     def to_xml
-      template = File.join(File.dirname(__FILE__), '..', '..', 'templates', 'schema.xml.erb')
-      ERB.new(File.read(template), nil, '-').result(binding)
+      template_path = File.join(File.dirname(__FILE__), '..', '..', 'templates', 'schema.xml.erb')
+      template_text = File.read(template_path)
+
+      erb = if RUBY_VERSION >= '2.6'
+        ERB.new(template_text, trim_mode: '-')
+      else
+        ERB.new(template_text, nil, '-')
+      end
+
+      erb.result(binding)
     end
 
     private

data/lib/sunspot/search.rb

@@ -1,6 +1,7 @@
-%w(abstract_search standard_search more_like_this_search query_facet field_facet
-   date_facet range_facet facet_row hit highlight field_group group hit_enumerable
-   stats_row field_stats stats_facet query_group).each do |file|
+%w(abstract_search standard_search more_like_this_search query_facet
+   field_facet field_json_facet date_facet range_facet json_facet_stats
+   facet_row json_facet_row hit highlight field_group group hit_enumerable
+   stats_row stats_json_row field_stats stats_facet query_group).each do |file|
   require File.join(File.dirname(__FILE__), 'search', file)
 end
 

data/lib/sunspot/search/abstract_search.rb

@@ -182,6 +182,10 @@ module Sunspot
         end
       end
 
+      def json_facet_stats(name, options = {})
+        JsonFacetStats.new(name, self, options)
+      end
+
       #
       # Deprecated in favor of optional second argument to #facet
       #
@@ -193,6 +197,10 @@ module Sunspot
         @solr_result['facet_counts']
       end
 
+      def json_facet_response #:nodoc:
+        @solr_result['facets']
+      end
+
       def stats_response #:nodoc:
         @solr_result['stats']['stats_fields']
       end
@@ -255,6 +263,11 @@ module Sunspot
         add_stats(field.name, FieldStats.new(field, self))
       end
 
+      def add_json_facet(field, options = {})
+        name = (options[:name] || field.name)
+        add_facet(name, FieldJsonFacet.new(field, self, options))
+      end
+
       def highlights_for(doc) #:nodoc:
         if @solr_result['highlighting']
           @solr_result['highlighting'][doc['id']]

data/lib/sunspot/search/field_json_facet.rb

@@ -0,0 +1,33 @@
+module Sunspot
+  module Search
+    class FieldJsonFacet
+
+      attr_reader :name
+
+      def initialize(field, search, options)
+        @name, @search, @options = 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']
+            rows = []
+            data.each do |d|
+              rows << JsonFacetRow.new(d, self)
+            end
+
+            if @options[:sort] == :count
+              rows.sort! { |lrow, rrow| rrow.count <=> lrow.count }
+            else
+              rows.sort! { |lrow, rrow| lrow.value <=> rrow.value }
+            end
+            rows
+          end
+
+      end
+    end
+  end
+end

data/lib/sunspot/search/json_facet_row.rb

@@ -0,0 +1,40 @@
+module Sunspot
+  module Search
+    class JsonFacetRow
+      attr_reader :value, :count, :nested
+      attr_writer :instance #:nodoc:
+
+      def initialize(data, facet) #:nodoc:
+        @value = data['val']
+        @count = data['distinct'] || data['count']
+        @facet = facet
+        @nested_key = data.keys.select { |k| data[k].is_a?(Hash) }.first
+        @nested = recursive_nested_initialization(data) unless @nested_key.nil?
+      end
+
+      # 
+      # Return the instance referenced by this facet row. Only valid for field
+      # facets whose fields are defined with the :references key.
+      #
+      def instance
+        if !defined?(@instance)
+          @facet.populate_instances
+        end
+        @instance
+      end
+
+      def inspect
+        "<Sunspot::Search::FacetRow:#{value.inspect} (#{count}) #{nested.nil? ? '' : " nested_count=#{nested.size}"}>"
+      end
+
+      private
+
+      def recursive_nested_initialization(data)
+        data[@nested_key]['buckets'].map do |d|
+          JsonFacetRow.new(d, @facet)
+        end
+      end
+
+    end
+  end
+end

data/lib/sunspot/search/json_facet_stats.rb

@@ -0,0 +1,23 @@
+module Sunspot
+  module Search
+    class JsonFacetStats
+      def initialize(field, search, options)
+        @field, @search, @options = field, search, options
+      end
+
+      def rows
+        @rows ||=
+          begin
+            json_facet_response = @search.json_facet_response[@field.to_s]
+            data = json_facet_response.nil? ? [] : json_facet_response['buckets']
+            rows = []
+            data.each do |d|
+              rows << StatsJsonRow.new(d, nil, d['val'])
+            end
+            rows
+          end
+
+      end
+    end
+  end
+end

data/lib/sunspot/search/stats_json_row.rb

@@ -0,0 +1,82 @@
+module Sunspot
+  module Search
+    class StatsJsonRow
+      attr_reader :data, :value, :nested
+      attr_writer :instance #:nodoc:
+
+      def initialize(data, facet = nil, value = nil) #:nodoc:
+        @data, @facet, @value = data, facet, value
+        @facet_fields = []
+        @nested_key = data.keys.select { |k| data[k].is_a?(Hash) }.first
+        @nested = recursive_nested_initialization(data) unless @nested_key.nil?
+      end
+
+      def min
+        data['min']
+      end
+
+      def max
+        data['max']
+      end
+
+      def count
+        data['count']
+      end
+
+      def sum
+        data['sum']
+      end
+
+      def missing
+        data['missing']
+      end
+
+      def sum_of_squares
+        data['sumsq']
+      end
+      alias :sumsq :sum_of_squares
+
+      def mean
+        data['avg']
+      end
+      alias :avg :mean
+
+      def standard_deviation
+        data['stddev']
+      end
+
+      def facet name
+        facets.find { |facet| facet.field.name == name.to_sym }
+      end
+
+      def facets
+        @facets ||= @facet_fields.map do |field|
+          StatsFacet.new(field, data['facets'][field.indexed_name])
+        end
+      end
+
+      def instance
+        if !defined?(@instance)
+          @facet.populate_instances
+        end
+        @instance
+      end
+
+      def inspect
+        "<Sunspot::Search::StatsJsonRow:#{value.inspect} min=#{min} max=#{max}"\
+        " count=#{count} sum=#{sum} missing=#{missing} sum_of_squares=#{sum_of_squares}"\
+        " mean=#{mean} standard_deviation=#{standard_deviation}"\
+        " #{nested.nil? ? '' : "nested_count=#{nested.size}"}>"
+      end
+
+      private
+
+      def recursive_nested_initialization(data)
+        data[@nested_key]['buckets'].map do |d|
+          StatsJsonRow.new(d, @facet, d['val'])
+        end
+      end
+
+    end
+  end
+end

data/lib/sunspot/search/stats_row.rb

@@ -59,7 +59,9 @@ module Sunspot
       end
 
       def inspect
-        "<Sunspot::Search::StatsRow:#{value.inspect} min=#{min} max=#{max} count=#{count}>"
+        "<Sunspot::Search::StatsRow:#{value.inspect} min=#{min} max=#{max}"\
+        " count=#{self.count} sum=#{sum} missing=#{missing} sum_of_squares=#{sum_of_squares}"\
+        " mean=#{mean} standard_deviation=#{standard_deviation}>"
       end
     end
   end

data/lib/sunspot/session.rb

@@ -254,11 +254,13 @@ module Sunspot
     # RSolr::Connection::Base:: The connection for this session
     #
     def connection
-      @connection ||=
-        self.class.connection_class.connect(:url          => config.solr.url,
-                                            :read_timeout => config.solr.read_timeout,
-                                            :open_timeout => config.solr.open_timeout,
-                                            :proxy        => config.solr.proxy)
+      @connection ||= self.class.connection_class.connect(
+        url: config.solr.url,
+        read_timeout: config.solr.read_timeout,
+        open_timeout: config.solr.open_timeout,
+        proxy: config.solr.proxy,
+        update_format: config.solr.update_format || :xml
+      )
     end
 
     def indexer

data/lib/sunspot/util.rb

@@ -188,6 +188,29 @@ module Sunspot
         RSolr.solr_escape(value).gsub(/([\s\.])/, '\\\\\1')
       end
 
+      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]
+          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'
+            )
+          end
+          Sunspot::Query::RangeJsonFacet.new(field, options, setup)
+        else
+          Sunspot::Query::FieldJsonFacet.new(field, options, setup)
+        end
+      end
+
       private
 
       #

data/lib/sunspot/version.rb

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

data/spec/api/query/fulltext_examples.rb

@@ -66,7 +66,9 @@ shared_examples_for 'fulltext query' do
     end
 
     it 'puts default dismax parameters in subquery' do
-      expect(subqueries(:q).last[:qf].split(' ').sort).to eq(%w(backwards_title_text body_textsv tags_textv title_text))
+      expect(subqueries(:q).last[:qf].split(' ').sort).to(
+        eq(%w(backwards_title_text body_textsv tags_textv text_array_text title_text))
+      )
     end
 
     it 'puts field list in main query' do
@@ -78,14 +80,18 @@ shared_examples_for 'fulltext query' do
     search = search do
       keywords 'keyword search'
     end
-    expect(connection.searches.last[:qf].split(' ').sort).to eq(%w(backwards_title_text body_textsv tags_textv title_text))
+    expect(connection.searches.last[:qf].split(' ').sort).to(
+      eq(%w(backwards_title_text body_textsv tags_textv text_array_text title_text))
+    )
   end
 
   it 'searches both stored and unstored text fields' do
     search Post, Namespaced::Comment do
       keywords 'keyword search'
     end
-    expect(connection.searches.last[:qf].split(' ').sort).to eq(%w(author_name_text backwards_title_text body_text body_textsv tags_textv title_text))
+    expect(connection.searches.last[:qf].split(' ').sort).to(
+      eq(%w(author_name_text backwards_title_text body_text body_textsv tags_textv text_array_text title_text))
+    )
   end
 
   it 'searches only specified text fields when specified' do
@@ -101,7 +107,7 @@ shared_examples_for 'fulltext query' do
         exclude_fields :backwards_title, :body_mlt
       end
     end
-    expect(connection.searches.last[:qf].split(' ').sort).to eq(%w(body_textsv tags_textv title_text))
+    expect(connection.searches.last[:qf].split(' ').sort).to eq(%w(body_textsv tags_textv text_array_text title_text))
   end
 
   it 'assigns boost to fields when specified' do
@@ -173,7 +179,9 @@ shared_examples_for 'fulltext query' do
         boost_fields :title => 1.5
       end
     end
-    expect(connection.searches.last[:qf].split(' ').sort).to eq(%w(backwards_title_text body_textsv tags_textv title_text^1.5))
+    expect(connection.searches.last[:qf].split(' ').sort).to(
+      eq(%w(backwards_title_text body_textsv tags_textv text_array_text title_text^1.5))
+    )
   end
 
   it 'ignores boost fields that do not apply' do
@@ -182,7 +190,9 @@ shared_examples_for 'fulltext query' do
         boost_fields :bogus => 1.2, :title => 1.5
       end
     end
-    expect(connection.searches.last[:qf].split(' ').sort).to eq(%w(backwards_title_text body_textsv tags_textv title_text^1.5))
+    expect(connection.searches.last[:qf].split(' ').sort).to(
+      eq(%w(backwards_title_text body_textsv tags_textv text_array_text title_text^1.5))
+    )
   end
 
   it 'sets default boost with default fields' do

data/spec/helpers/integration_helper.rb

@@ -2,6 +2,7 @@ module IntegrationHelper
   def self.included(base)
     base.before(:all) do
       Sunspot.config.solr.url = ENV['SOLR_URL'] || 'http://localhost:8983/solr/default'
+      Sunspot.config.solr.update_format = ENV['UPDATE_FORMAT'].to_sym if ENV['UPDATE_FORMAT']
       Sunspot.reset!(true)
     end
   end

data/spec/integration/faceting_spec.rb

@@ -156,6 +156,136 @@ describe 'search faceting' do
     end
   end
 
+  context 'json facet options' do
+    before :all do
+      Sunspot.remove_all
+      facet_values = %w(zero one two three four)
+      facet_values.each_with_index do |value, i|
+        i.times { Sunspot.index(Post.new(:title => value, :blog_id => 1)) }
+      end
+      Sunspot.index(Post.new(:blog_id => 1))
+      Sunspot.index(Post.new(:title => 'zero', :blog_id => 2))
+      Sunspot.commit
+    end
+
+    it 'should return indexed elements' do
+      search = Sunspot.search(Post) do
+         json_facet(:title)
+      end
+      expect(search.facet(:title).rows.size).to eq(5)
+    end
+
+    it 'should limit the number of facet rows' do
+      search = Sunspot.search(Post) do
+        json_facet :title, :limit => 3
+      end
+      expect(search.facet(:title).rows.size).to eq(3)
+    end
+
+    it 'should not return zeros by default' do
+      search = Sunspot.search(Post) do
+        with :blog_id, 1
+        json_facet :title
+      end
+      expect(search.facet(:title).rows.map { |row| row.value }).not_to include('zero')
+    end
+
+    it 'should return a specified minimum count' do
+      search = Sunspot.search(Post) do
+        with :blog_id, 1
+        json_facet :title, :minimum_count => 2
+      end
+      expect(search.facet(:title).rows.map { |row| row.value }).to eq(%w(four three two))
+    end
+
+    it 'should order facets lexically' do
+      search = Sunspot.search(Post) do
+        with :blog_id, 1
+        json_facet :title, :sort => :index
+      end
+      expect(search.facet(:title).rows.map { |row| row.value }).to eq(%w(four one three two))
+    end
+
+    it 'should order facets by count' do
+      search = Sunspot.search(Post) do
+        with :blog_id, 1
+        json_facet :title, :sort => :count
+      end
+      expect(search.facet(:title).rows.map { |row| row.value }).to eq(%w(four three two one))
+    end
+
+    it 'should limit facet values by prefix' do
+      search = Sunspot.search(Post) do
+        with :blog_id, 1
+        json_facet :title, :prefix => 't'
+      end
+      expect(search.facet(:title).rows.map { |row| row.value }.sort).to eq(%w(three two))
+    end
+
+  end
+
+  context 'nested json facet' do
+    before :all do
+      Sunspot.remove_all
+      facet_values = %w(zero one two three four)
+      nested_facet_values = %w(alfa bravo charlie delta)
+
+      facet_values.each do |value|
+        nested_facet_values.each do |v2|
+          Sunspot.index(Post.new(:title => value, :author_name => v2, :blog_id => 1))
+        end
+      end
+
+      0.upto(9) { |i| Sunspot.index(Post.new(:title => 'zero', :author_name => "another#{i}", :blog_id => 1)) }
+      
+      Sunspot.commit
+    end
+
+    it 'should get nested' do
+      search = Sunspot.search(Post) do
+        json_facet(:title, nested: { field: :author_name } )
+      end
+      expect(search.facet(:title).rows.first.nested.size).to eq(4)
+    end
+
+    it 'without limit take the first 10' do
+      search = Sunspot.search(Post) do
+        json_facet(:title, nested: { field: :author_name } )
+      end
+      expect(search.facet(:title).rows.last.nested.size).to eq(10)
+    end
+
+    it 'without limit' do
+      search = Sunspot.search(Post) do
+        json_facet(:title, nested: { field: :author_name, limit: -1 } )
+      end
+      expect(search.facet(:title).rows.last.nested.size).to eq(14)
+    end
+
+    it 'works with distinct' do
+      search = Sunspot.search(Post) do
+        json_facet(:title, nested: { field: :author_name, distinct: { strategy: :unique } } )
+      end
+      expect(search.facet(:title).rows.first.nested.map(&:count).uniq.size).to eq(1)
+    end
+
+    it 'should limit the nested facet' do
+      search = Sunspot.search(Post) do
+        json_facet(:title, nested: { field: :author_name, limit: 2 } )
+      end
+      expect(search.facet(:title).rows.first.nested.size).to eq(2)
+    end
+
+    it 'should work nested of nested' do
+      search = Sunspot.search(Post) do
+        json_facet(:title, nested: { field: :author_name, nested: { field: :title } } )
+      end
+      expect(search.facet(:title).rows.first.nested.first.nested.size).to eq(1)
+      expect(search.facet(:title).rows.first.nested.first.nested.first.nested).to eq(nil)
+    end
+
+  end
+
   context 'prefix escaping' do
     before do
       Sunspot.remove_all
@@ -259,6 +389,57 @@ describe 'search faceting' do
     end
   end
 
+  context 'distinct field facets' do
+    before :all do
+      Sunspot.remove_all
+
+      Sunspot.index!(
+          (0..5).map { |i| Post.new(:blog_id => i, :title => 'title') }
+      )
+
+      0.upto(3) { |i| Sunspot.index(Post.new(:blog_id => i, :title => 'title')) }
+
+      Sunspot.index!(Post.new(:blog_id => 4, :title => 'other title'))
+      Sunspot.index!(Post.new(:blog_id => 5, :title => 'other title'))
+
+      Sunspot.index!(Post.new(:blog_id => 40, :title => 'title'))
+      Sunspot.index!(Post.new(:blog_id => 40, :title => 'title'))
+
+      Sunspot.index!(Post.new(:blog_id => 40, :title => 'other title'))
+      Sunspot.index!(Post.new(:blog_id => 40, :title => 'other title'))
+    end
+
+    it 'should return unique indexed elements for a field' do
+      search = Sunspot.search(Post) do
+        json_facet(:blog_id, distinct: { strategy: :unique })
+      end
+
+      expect(search.facet(:blog_id).rows.size).to eq(7)
+      expect(search.facet(:blog_id).rows.map(&:count).uniq.size).to eq(1)
+    end
+
+    it 'should return unique indexed elements for a field and facet on a field' do
+      search = Sunspot.search(Post) do
+        json_facet(:blog_id, distinct: { group_by: :title, strategy: :unique })
+      end
+
+      expect(search.facet(:blog_id).rows.size).to eq(2)
+      expect(search.facet(:blog_id).rows[0].count).to eq(3)
+      expect(search.facet(:blog_id).rows[1].count).to eq(7)
+    end
+
+    it 'should return unique indexed elements for a field and facet on a field with hll' do
+      search = Sunspot.search(Post) do
+        json_facet(:blog_id, distinct: { group_by: :title, strategy: :hll })
+      end
+
+      expect(search.facet(:blog_id).rows.size).to eq(2)
+      expect(search.facet(:blog_id).rows[0].count).to eq(3)
+      expect(search.facet(:blog_id).rows[1].count).to eq(7)
+    end
+
+  end
+
   context 'date facets' do
     before :all do
       Sunspot.remove_all
@@ -278,6 +459,38 @@ describe 'search faceting' do
       expect(search.facet(:published_at).rows.last.value).to eq((time + 60*60*24)..(time + 60*60*24*2))
       expect(search.facet(:published_at).rows.last.count).to eq(1)
     end
+
+    it 'json facet should return time ranges' do
+      days_diff = 15
+      time_from = Time.utc(2009, 7, 8)
+      time_to = Time.utc(2009, 7, 8 + days_diff)
+      search = Sunspot.search(Post) do
+        json_facet(
+            :published_at,
+            :time_range => time_from..time_to
+        )
+      end
+
+      expect(search.facet(:published_at).rows.size).to eq(days_diff)
+      expect(search.facet(:published_at).rows[0].count).to eq(2)
+      expect(search.facet(:published_at).rows[1].count).to eq(1)
+    end
+
+    it 'json facet should return time ranges with custom gap' do
+      days_diff = 10
+      time_from = Time.utc(2009, 7, 8)
+      time_to = Time.utc(2009, 7, 8 + days_diff)
+      search = Sunspot.search(Post) do
+        json_facet(
+            :published_at,
+            :time_range => time_from..time_to,
+            gap: 60*60*24*2
+        )
+      end
+      expect(search.facet(:published_at).rows.size).to eq(days_diff / 2)
+      expect(search.facet(:published_at).rows[0].count).to eq(3)
+    end
+
   end
 
   context 'class facets' do

data/spec/integration/scoped_search_spec.rb

@@ -332,7 +332,7 @@ describe 'scoped_search' do
       expect(Sunspot.search(Post) do
         without(:blog_id, [])
       end.results).to eq(posts)
-    end 
+    end
 
     it 'should return results, ignoring any restriction in a conjunction that has been passed an empty array' do
       posts = (1..3).map { |i| Post.new(:blog_id => i)}

data/spec/integration/stats_spec.rb

@@ -3,9 +3,9 @@ require File.expand_path('../spec_helper', File.dirname(__FILE__))
 describe 'search stats' do
   before :each do
     Sunspot.remove_all
-    @posts = Post.new(:ratings_average => 4.0, :blog_id => 2),
-             Post.new(:ratings_average => 4.0, :blog_id => 1),
-             Post.new(:ratings_average => 3.0, :blog_id => 2)
+    @posts = Post.new(:ratings_average => 4.0, :author_name => 'plinio', :blog_id => 2),
+             Post.new(:ratings_average => 4.0, :author_name => 'caio', :blog_id => 1),
+             Post.new(:ratings_average => 3.0, :author_name => 'sempronio', :blog_id => 2)
     Sunspot.index!(@posts)
   end
 
@@ -44,4 +44,45 @@ describe 'search stats' do
       end.stats(:average_rating).facet(:blog_id).rows[1].max).to eq(4.0)
     end
   end
+
+  describe 'json facets' do
+    it 'returns minimum on facet row with two blog ids' do
+      expect(Sunspot.search(Post) do
+        stats :average_rating, sort: :min do
+          json_facet :blog_id
+        end
+      end.json_facet_stats(:blog_id).rows[1].min).to eq(3.0)
+    end
+
+    it 'returns maximum on facet row with two blog ids' do
+      expect(Sunspot.search(Post) do
+        stats :average_rating, sort: :max do
+          json_facet :blog_id
+        end
+      end.json_facet_stats(:blog_id).rows[1].max).to eq(4.0)
+    end
+
+    it 'returns only sum' do
+      search = Sunspot.search(Post) do
+        stats :average_rating, stats: [:sum] do
+          json_facet :blog_id
+        end
+      end
+      expect(search.json_facet_stats(:blog_id).rows[1].max).to eq(nil)
+      expect(search.json_facet_stats(:blog_id).rows[1].min).to eq(nil)
+      expect(search.json_facet_stats(:blog_id).rows[1].avg).to eq(nil)
+      expect(search.json_facet_stats(:blog_id).rows[1].sumsq).to eq(nil)
+      expect(search.json_facet_stats(:blog_id).rows[1].sum).to eq(4.0)
+    end
+
+    it 'works with nested facets' do
+      search = Sunspot.search(Post) do
+        stats :average_rating, sort: :min do
+          json_facet(:blog_id, nested: { field: :author_name, limit: 3, nested: { field: :average_rating } } )
+        end
+      end
+      expect(search.json_facet_stats(:blog_id).rows[1].nested.first.nested.first.min).to eq(4.0)
+    end
+
+  end
 end

data/spec/mocks/post.rb

@@ -37,12 +37,16 @@ end
 
 Sunspot.setup(Post) do
   text :title, :boost => 2
+  text :text_array, :boost => 3 do
+    [title, title]
+  end
   text :body, :stored => true, :more_like_this => true
   text :backwards_title do
     title.reverse if title
   end
   text :tags, :more_like_this => true
   string :title, :stored => true
+  string :author_name
   integer :blog_id, :references => Blog
   integer :category_ids, :multiple => true
   float :average_rating, :using => :ratings_average, :trie => true

data/spec/spec_helper.rb

@@ -23,14 +23,10 @@ RSpec.configure do |config|
   config.order = 'random'
 
   # Mock session available to all spec/api tests
-  config.include MockSessionHelper,
-                 :type => :api,
-                 :file_path => /spec[\\\/]api/
+  config.include MockSessionHelper, type: :api, file_path: /spec[\\\/]api/
 
   # Real Solr instance is available to integration tests
-  config.include IntegrationHelper,
-                 :type => :integration,
-                 :file_path => /spec[\\\/]integration/
+  config.include IntegrationHelper, type: :integration, file_path: /spec[\\\/]integration/
 
   # Nested under spec/api
   [:indexer, :query, :search].each do |spec_type|

data/sunspot.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'pr_geohash', '~>1.0'
 
   s.add_development_dependency 'rake', '< 12.3'
-  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rspec', '~> 3.7'
   s.add_development_dependency 'appraisal', '2.2.0'
 
   s.rdoc_options << '--webcvs=http://github.com/outoftime/sunspot/tree/master/%s' <<

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunspot
 version: !ruby/object:Gem::Version
-  version: 2.2.8
+  version: 2.3.0
 platform: ruby
 authors:
 - Mat Brown
@@ -30,7 +30,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-26 00:00:00.000000000 Z
+date: 2018-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -84,16 +84,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -159,14 +159,17 @@ files:
 - lib/sunspot/query.rb
 - lib/sunspot/query/abstract_field_facet.rb
 - lib/sunspot/query/abstract_fulltext.rb
+- lib/sunspot/query/abstract_json_field_facet.rb
 - lib/sunspot/query/bbox.rb
 - lib/sunspot/query/boost_query.rb
 - lib/sunspot/query/common_query.rb
 - lib/sunspot/query/composite_fulltext.rb
 - lib/sunspot/query/connective.rb
 - lib/sunspot/query/date_field_facet.rb
+- lib/sunspot/query/date_field_json_facet.rb
 - lib/sunspot/query/dismax.rb
 - lib/sunspot/query/field_facet.rb
+- lib/sunspot/query/field_json_facet.rb
 - lib/sunspot/query/field_list.rb
 - lib/sunspot/query/field_stats.rb
 - lib/sunspot/query/filter.rb
@@ -182,6 +185,7 @@ files:
 - lib/sunspot/query/pagination.rb
 - lib/sunspot/query/query_facet.rb
 - lib/sunspot/query/range_facet.rb
+- lib/sunspot/query/range_json_facet.rb
 - lib/sunspot/query/restriction.rb
 - lib/sunspot/query/scope.rb
 - lib/sunspot/query/sort.rb
@@ -197,11 +201,14 @@ files:
 - lib/sunspot/search/facet_row.rb
 - lib/sunspot/search/field_facet.rb
 - lib/sunspot/search/field_group.rb
+- lib/sunspot/search/field_json_facet.rb
 - lib/sunspot/search/field_stats.rb
 - lib/sunspot/search/group.rb
 - lib/sunspot/search/highlight.rb
 - lib/sunspot/search/hit.rb
 - lib/sunspot/search/hit_enumerable.rb
+- lib/sunspot/search/json_facet_row.rb
+- lib/sunspot/search/json_facet_stats.rb
 - lib/sunspot/search/more_like_this_search.rb
 - lib/sunspot/search/paginated_collection.rb
 - lib/sunspot/search/query_facet.rb
@@ -209,6 +216,7 @@ files:
 - lib/sunspot/search/range_facet.rb
 - lib/sunspot/search/standard_search.rb
 - lib/sunspot/search/stats_facet.rb
+- lib/sunspot/search/stats_json_row.rb
 - lib/sunspot/search/stats_row.rb
 - lib/sunspot/session.rb
 - lib/sunspot/session_proxy.rb
@@ -348,7 +356,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sunspot
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Library for expressive, powerful interaction with the Solr search engine