sunspot 2.0.0.pre.120925 → 2.0.0.pre.130115

data/lib/sunspot/dsl/field_query.rb

@@ -70,8 +70,6 @@ module Sunspot
       #
       # field_name<Symbol>:: the field to use for grouping
       def group(*field_names, &block)
-        options = Sunspot::Util.extract_options_from(field_names)
-
         field_names.each do |field_name|
           field = @setup.field(field_name)
           group = @query.add_group(Sunspot::Query::FieldGroup.new(field))

data/lib/sunspot/dsl/fulltext.rb

@@ -5,8 +5,6 @@ module Sunspot
     # handler.
     #
     class Fulltext
-      attr_reader :exclude_fields #:nodoc:
-
       # accept function in boost
       include Functional
 

data/lib/sunspot/field.rb

@@ -12,6 +12,7 @@ module Sunspot
       @name, @type = name.to_sym, type
       @stored = !!options.delete(:stored)
       @more_like_this = !!options.delete(:more_like_this)
+      @multiple ||= false
       set_indexed_name(options)
       raise ArgumentError, "Field of type #{type} cannot be used for more_like_this" unless type.accepts_more_like_this? or !@more_like_this
     end
@@ -34,7 +35,7 @@ module Sunspot
     #
     def to_indexed(value)
       if value.is_a? Array
-        if @multiple
+        if multiple?
           value.map { |val| to_indexed(val) }
         else
           raise ArgumentError, "#{name} is not a multiple-value field, so it cannot index values #{value.inspect}"
@@ -106,7 +107,7 @@ module Sunspot
         if options[:as]
           options.delete(:as).to_s
         else
-          "#{@type.indexed_name(@name).to_s}#{'m' if @multiple }#{'s' if @stored}#{'v' if more_like_this?}"
+          "#{@type.indexed_name(@name).to_s}#{'m' if multiple? }#{'s' if @stored}#{'v' if more_like_this?}"
         end
     end
 

data/lib/sunspot/query/common_query.rb

@@ -10,6 +10,9 @@ module Sunspot
         else
           @scope.add_positive_restriction(TypeField.instance, Restriction::AnyOf, types)
         end
+
+        @pagination = nil
+        @parameter_adjustment = nil
       end
 
       def solr_parameter_adjustment=(block)

data/lib/sunspot/query/dismax.rb

@@ -15,6 +15,12 @@ module Sunspot
         @boost_queries = []
         @boost_functions = []
         @highlights = []
+
+        @minimum_match = nil
+        @phrase_fields = nil
+        @phrase_slop = nil
+        @query_phrase_slop = nil
+        @tie = nil
       end
 
       #

data/lib/sunspot/query/filter.rb

@@ -31,7 +31,7 @@ module Sunspot
       # to include a tag in the local params.
       #
       def tagged?
-        !!@tag
+        defined?(@tag) && !!@tag
       end
     end
   end

data/lib/sunspot/query/function_query.rb

@@ -5,6 +5,11 @@ module Sunspot
     #
     class FunctionQuery 
       include RSolr::Char
+
+      def ^(y)
+        @boost_amount = y
+        self
+      end
     end
 
     #
@@ -16,7 +21,7 @@ module Sunspot
       end
 
       def to_s
-        Type.to_literal(@constant)
+        Type.to_literal(@constant) << (@boost_amount ? "^#{@boost_amount}" : "")
       end
     end
 
@@ -29,7 +34,7 @@ module Sunspot
       end
 
       def to_s
-        "#{escape(@field.indexed_name)}"
+        "#{escape(@field.indexed_name)}" << (@boost_amount ? "^#{@boost_amount}" : "")
       end
     end
 
@@ -45,7 +50,7 @@ module Sunspot
 
       def to_s
         params = @function_args.map { |arg| arg.to_s }.join(",")
-        "#{@function_name}(#{params})"
+        "#{@function_name}(#{params})" << (@boost_amount ? "^#{@boost_amount}" : "")
       end
     end
   end

data/lib/sunspot/query/geo.rb

@@ -1,6 +1,6 @@
 begin
   require 'geohash'
-rescue LoadError => e
+rescue LoadError
   require 'pr_geohash'
 end
 

data/lib/sunspot/query/range_facet.rb

@@ -1,15 +1,49 @@
 module Sunspot
   module Query
+
     class RangeFacet < AbstractFieldFacet
+      def initialize(field, options)
+        if exclude_filters = options[:exclude]
+          @exclude_tag = Util.Array(exclude_filters).map do |filter|
+            filter.tag
+          end.join(',')
+        end
+        super
+      end
+
       def to_params
         params = super
-        params[:"facet.range"] = [@field.indexed_name]
+        params[:"facet.range"] = [field_name_with_local_params]
         params[qualified_param('range.start')] = @field.to_indexed(@options[:range].first)
         params[qualified_param('range.end')] = @field.to_indexed(@options[:range].last)
         params[qualified_param('range.gap')] = "#{@options[:range_interval] || 10}"
         params[qualified_param('range.include')] = @options[:include].to_s if @options[:include]
         params
       end
+
+      private
+
+      def local_params
+        @local_params ||=
+          begin
+            local_params = {}
+            local_params[:ex] = @exclude_tag if @exclude_tag
+            local_params[:key] = @options[:name] if @options[:name]
+            local_params
+          end
+      end
+
+      def field_name_with_local_params
+        if local_params.empty?
+          @field.indexed_name
+        else
+          pairs = local_params.map do |key, value|
+            "#{key}=#{value}"
+          end
+          "{!#{pairs.join(' ')}}#{@field.indexed_name}"
+        end
+      end
     end
+
   end
 end

data/lib/sunspot/query/sort.rb

@@ -76,8 +76,18 @@ module Sunspot
       # (usually) randomly.
       #
       class RandomSort < Abstract
+        def initialize(options_or_direction=nil)
+          if options_or_direction.is_a?(Hash)
+            @seed, @direction = options_or_direction[:seed], options_or_direction[:direction]
+					else
+            @direction = options_or_direction
+          end
+
+          @direction = (@direction || :asc).to_sym
+        end
+
         def to_param
-          "random_#{rand(1<<16)} #{direction_for_solr}"
+          "random_#{@seed || rand(1<<6)} #{direction_for_solr}"
         end
       end
 

data/lib/sunspot/search/paginated_collection.rb

@@ -1,8 +1,7 @@
 module Sunspot
   module Search
 
-    class PaginatedCollection
-      instance_methods.each { |m| undef_method m unless m =~ /^__|instance_eval|object_id/ }
+    class PaginatedCollection < Array
 
       attr_reader :current_page, :per_page
       attr_accessor :total_count
@@ -11,10 +10,10 @@ module Sunspot
       alias :limit_value :per_page
 
       def initialize(collection, page, per_page, total)
-        @collection   = collection
         @current_page = page
         @per_page     = per_page
         @total_count  = total
+        replace collection
       end
 
       def total_pages
@@ -45,12 +44,7 @@ module Sunspot
       def offset
         (current_page - 1) * per_page
       end
-
-      private
-
-      def method_missing(method, *args, &block)
-        @collection.send(method, *args, &block)
-      end
+      alias :offset_value :offset
 
     end
   end

data/lib/sunspot/setup.rb

@@ -14,6 +14,7 @@ module Sunspot
       @stored_field_factories_cache = Hash.new { |h, k| h[k] = [] }
       @more_like_this_field_factories_cache = Hash.new { |h, k| h[k] = [] }
       @dsl = DSL::Fields.new(self)
+      @document_boost_extractor = nil
       add_field_factory(:class, Type::ClassType.instance)
     end
 

data/lib/sunspot/type.rb

@@ -1,7 +1,7 @@
 require 'singleton'
 begin
   require 'geohash'
-rescue LoadError => e
+rescue LoadError
   require 'pr_geohash'
 end
 

data/lib/sunspot/util.rb

@@ -202,7 +202,7 @@ module Sunspot
       class <<self
         def instance_eval_with_context(receiver, &block)
           calling_context = eval('self', block.binding)
-          if parent_calling_context = calling_context.instance_eval{@__calling_context__}
+          if parent_calling_context = calling_context.instance_eval{@__calling_context__ if defined?(@__calling_context__)}
             calling_context = parent_calling_context
           end
           new(receiver, calling_context).instance_eval(&block)

data/lib/sunspot/version.rb

@@ -1,3 +1,3 @@
 module Sunspot
-  VERSION = '2.0.0.pre.120925'
+  VERSION = '2.0.0.pre.130115'
 end

data/spec/api/query/faceting_examples.rb

@@ -287,6 +287,17 @@ shared_examples_for "facetable query" do
       connection.should have_last_search_with(:"f.average_rating_ft.facet.range.gap" => "1")
     end
 
+    it 'tags and excludes a scope filter in a range facet' do
+      search do |query|
+        blog_filter = query.with(:blog_id, 1)
+        query.facet(:average_rating, :range => @range, :exclude => blog_filter)
+      end
+      filter_tag = get_filter_tag('blog_id_i:1')
+      connection.should have_last_search_with(
+        :"facet.range" => %W({!ex=#{filter_tag}}average_rating_ft)
+      )
+    end
+
     it 'sets the include if one is specified' do
       search do |query|
         query.facet :average_rating, :range => @range, :include => :edge

data/spec/api/query/function_spec.rb

@@ -10,6 +10,15 @@ describe 'function query' do
     connection.should have_last_search_including(:bf, 'average_rating_ft')
   end
 
+  it "should send query to solr with boost function and boost amount" do
+    session.search Post do
+      keywords('pizza') do
+        boost(function { :average_rating }^5)
+      end
+    end
+    connection.should have_last_search_including(:bf, 'average_rating_ft^5')
+  end
+
   it "should handle boost function with constant float" do
     session.search Post do
       keywords('pizza') do
@@ -19,6 +28,15 @@ describe 'function query' do
     connection.should have_last_search_including(:bf, '10.5')
   end
 
+  it "should handle boost function with constant float and boost amount" do
+    session.search Post do
+      keywords('pizza') do
+        boost(function { 10.5 }^5)
+      end
+    end
+    connection.should have_last_search_including(:bf, '10.5^5')
+  end
+
   it "should handle boost function with time literal" do
     session.search Post do
       keywords('pizza') do
@@ -45,6 +63,15 @@ describe 'function query' do
     end
     connection.should have_last_search_including(:bf, 'sub(average_rating_ft,10)')
   end
+
+  it "should handle boost amounts on function query block" do
+    session.search Post do
+      keywords('pizza') do
+        boost(function { sub(:average_rating, 10)^5 })
+      end
+    end
+    connection.should have_last_search_including(:bf, 'sub(average_rating_ft,10)^5')
+  end
  
   it "should handle nested functions in a function query block" do
     session.search Post do

data/spec/api/query/ordering_pagination_examples.rb

@@ -68,6 +68,27 @@ shared_examples_for 'sortable query' do
     connection.searches.last[:sort].should =~ /^random_\d+ asc$/
   end
 
+  it 'orders by random with declared direction' do
+    search do
+      order_by :random, :desc
+    end
+    connection.searches.last[:sort].should =~ /^random_\d+ desc$/
+  end
+
+  it 'orders by random with provided seed value' do
+    search do
+      order_by :random, :seed => 9001
+    end
+    connection.searches.last[:sort].should =~ /^random_9001 asc$/
+  end
+
+  it 'orders by random with provided seed value and direction' do
+    search do
+      order_by :random, :seed => 12345, :direction => :desc
+    end
+    connection.searches.last[:sort].should =~ /^random_12345 desc$/
+  end
+
   it 'orders by score' do
     search do
       order_by :score, :desc

data/spec/api/search/paginated_collection_spec.rb

@@ -5,6 +5,18 @@ describe "PaginatedCollection" do
 
   it { subject.should be_an(Array) }
 
+  describe "#send" do
+    it 'should allow send' do
+      expect { subject.send(:current_page) }.not_to raise_error(NoMethodError)
+    end
+  end
+
+  describe "#respond_to?" do
+    it 'should return true for current_page' do
+      subject.respond_to?(:current_page).should be_true
+    end
+  end
+
   context "behaves like a WillPaginate::Collection" do
     it { subject.total_entries.should eql(20) }
     it { subject.total_pages.should eql(2) }

data/spec/integration/scoped_search_spec.rb

@@ -372,9 +372,12 @@ describe 'scoped_search' do
   end
 
   describe 'ordering by random' do
-    it 'should order randomly (run this test again if it fails)' do
+    before do
       Sunspot.remove_all
       Sunspot.index!(Array.new(100) { Post.new })
+    end
+
+    it 'should order randomly (run this test again if it fails)' do
       result_sets = Array.new(2) do
         Sunspot.search(Post) { order_by_random }.results.map do |result|
           result.id
@@ -382,5 +385,38 @@ describe 'scoped_search' do
       end
       result_sets[0].should_not == result_sets[1]
     end
+
+    # This could fail if the random set returned just happens to be the same as the last random set (the nature of randomness)
+    it 'should order randomly using the order_by function and passing a direction' do
+      result_sets = Array.new(2) do
+        Sunspot.search(Post) { order_by(:random, :desc) }.results.map do |result|
+          result.id
+        end
+      end
+      result_sets[0].should_not == result_sets[1]
+    end
+
+    context 'when providing a custom seed value' do
+      before do
+        @first_results = Sunspot.search(Post) do
+          order_by(:random, :seed => 12345)
+        end.results.map { |result| result.id }
+      end
+
+      # This could fail if the random set returned just happens to be the same as the last random set (the nature of randomness)
+      it 'should return different results when passing a different seed value' do
+        next_results = Sunspot.search(Post) do
+          order_by(:random, :seed => 54321)
+        end.results.map { |result| result.id }
+        next_results.should_not == @first_results
+      end
+
+      it 'should return the same results when passing the same seed value' do
+        next_results = Sunspot.search(Post) do
+          order_by(:random, :seed => 12345)
+        end.results.map { |result| result.id }
+        next_results.should == @first_results
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunspot
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.120925
+  version: 2.0.0.pre.130115
   prerelease: 6
 platform: ruby
 authors:
@@ -27,52 +27,72 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000 Z
+date: 2013-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
-  requirement: &70302521090680 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.7
+    none: false
   type: :runtime
-  prerelease: false
-  version_requirements: *70302521090680
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.7
+    none: false
 - !ruby/object:Gem::Dependency
   name: pr_geohash
-  requirement: &70302521089300 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+    none: false
   type: :runtime
-  prerelease: false
-  version_requirements: *70302521089300
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    none: false
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70302521088380 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.0
+    none: false
   type: :development
-  prerelease: false
-  version_requirements: *70302521088380
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+    none: false
 - !ruby/object:Gem::Dependency
   name: hanna
-  requirement: &70302521086620 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
-  version_requirements: *70302521086620
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
 description: ! "    Sunspot is a library providing a powerful, all-ruby API for the
   Solr search engine. Sunspot manages the configuration of persistent\n    Ruby classes
   for search and indexing and exposes Solr's most powerful features through a collection
@@ -276,20 +296,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
+  none: false
 requirements: []
 rubyforge_project: sunspot
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Library for expressive, powerful interaction with the Solr search engine