sunspot 0.10.5 → 0.10.6

data/spec/integration/keyword_search_spec.rb

@@ -128,21 +128,118 @@ describe 'keyword search' do
       Sunspot.index!(
         @posts = [
           Post.new(:title => 'Rhino', :featured => true),
-          Post.new(:title => 'Rhino', :featured => false)
+          Post.new(:title => 'Rhino', :ratings_average => 3.3),
+          Post.new(:title => 'Rhino')
         ]
       )
     end
 
-    it 'should assign a higher boost to the document matching the boost query' do
-      search = Sunspot.search(Post) do
-        keywords('rhino') do
+    it 'should assign a higher score to the document matching the boost query' do
+      search = Sunspot.search(Post) do |query|
+        query.keywords('rhino') do
           boost(2.0) do
             with(:featured, true)
           end
         end
+        query.without(@posts[1])
+      end
+      search.results.should == [@posts[0], @posts[2]]
+      search.hits[0].score.should > search.hits[1].score
+    end
+
+    it 'should assign scores in order of multiple boost query match' do
+      search = Sunspot.search(Post) do
+        keywords 'rhino' do
+          boost(2.0) { with(:featured, true) }
+          boost(1.5) { with(:average_rating).greater_than(3.0) }
+        end
       end
       search.results.should == @posts
       search.hits[0].score.should > search.hits[1].score
+      search.hits[1].score.should > search.hits[2].score
+    end
+  end
+
+  describe 'minimum match' do
+    before do
+      Sunspot.remove_all
+      @posts = [
+        Post.new(:title => 'Pepperoni Sausage Anchovies'),
+        Post.new(:title => 'Pepperoni Tomatoes Mushrooms')
+      ]
+      Sunspot.index!(@posts)
+      @search = Sunspot.search(Post) do
+        keywords 'pepperoni sausage extra cheese', :minimum_match => 2
+      end
+    end
+
+    it 'should match documents that contain the minimum_match number of search terms' do
+      @search.results.should include(@posts[0])
+    end
+
+    it 'should not match documents that do not contain the minimum_match number of search terms' do
+      @search.results.should_not include(@posts[1])
+    end
+  end
+
+  describe 'query phrase slop' do
+    before do
+      Sunspot.remove_all
+      @posts = [
+        Post.new(:title => 'One four'),
+        Post.new(:title => 'One three four'),
+        Post.new(:title => 'One two three four')
+      ]
+      Sunspot.index!(@posts)
+      @search = Sunspot.search(Post) do
+        keywords '"one four"', :query_phrase_slop => 1
+      end
+    end
+
+    it 'should match exact phrase' do
+      @search.results.should include(@posts[0])
+    end
+
+    it 'should match phrase divided by query phrase slop terms' do
+      @search.results.should include(@posts[1])
+    end
+
+    it 'should not match phrase divided by more than query phrase slop terms' do
+      @search.results.should_not include(@posts[2])
+    end
+  end
+
+  describe 'phrase field slop' do
+    before do
+      Sunspot.remove_all
+      @comments = [
+        Namespaced::Comment.new(:author_name => 'one four'),
+        Namespaced::Comment.new(:body => 'one four'),
+        Namespaced::Comment.new(:author_name => 'one three four'),
+        Namespaced::Comment.new(:body => 'one three four'),
+        Namespaced::Comment.new(:author_name => 'one two three four'),
+        Namespaced::Comment.new(:body => 'one two three four')
+      ]
+      Sunspot.index!(@comments)
+      @search = Sunspot.search(Namespaced::Comment) do
+        keywords 'one four' do
+          phrase_fields :author_name => 3.0
+          phrase_slop 1
+        end
+      end
+      @sorted_hits = @search.hits.sort_by { |hit| @comments.index(hit.instance) }
+    end
+
+    it 'should give phrase field boost to exact match' do
+      @sorted_hits[0].score.should > @sorted_hits[1].score
+    end
+
+    it 'should give phrase field boost to match within slop' do
+      @sorted_hits[2].score.should > @sorted_hits[3].score
+    end
+
+    it 'should not give phrase field boost to match beyond slop' do
+      @sorted_hits[4].score.should == @sorted_hits[5].score
     end
   end
 end

data/spec/mocks/photo.rb

@@ -1,8 +1,11 @@
 class Photo < MockRecord
   attr_accessor :caption
+  attr_accessor :lat
+  attr_accessor :lng
 end
 
 Sunspot.setup(Photo) do
   text :caption, :default_boost => 1.5
   boost 0.75
+  coordinates { [lat, lng] }
 end

data/tasks/gemspec.rake

@@ -14,7 +14,7 @@ TEXT
     s.authors = ['Mat Brown', 'Peer Allan', 'Dmitriy Dzema', 'Benjamin Krause', 'Marcel de Graaf', 'Brandon Keepers', 'Peter Berkenbosch', 'Brian Atkinson', 'Tom Coleman']
     s.rubyforge_project = 'sunspot'
     s.files = FileList['[A-Z]*', '{bin,lib,spec,tasks,templates}/**/*', 'solr/{etc,lib,webapps}/**/*', 'solr/solr/{conf,lib}/*', 'solr/start.jar']
-    s.add_dependency 'mwmitchell-rsolr', '= 0.9.6'
+    s.add_dependency 'rsolr', '= 0.9.6'
     s.add_dependency 'daemons', '~> 1.0'
     s.add_development_dependency 'rspec', '~> 1.1'
     s.add_development_dependency 'ruby-debug', '~> 0.10'
@@ -31,6 +31,12 @@ TEXT
 end
 
 namespace :release do
+  task :tag do
+    version = Jeweler::VersionHelper.new(File.join(File.dirname(__FILE__), '..')).to_s
+    `git tag -a -m "Version #{version}" v#{version}`
+    `git push origin v#{version}:v#{version}`
+  end
+
   desc "Release gem to RubyForge and GitHub"
-  task :all => [:release, :"rubyforge:release:gem", :"gemcutter:release"]
+  task :all => [:gemspec, :tag, :"rubyforge:release:gem", :"gemcutter:release"]
 end

data/tasks/rcov.rake

@@ -12,7 +12,7 @@ end
 namespace :rcov do
   desc 'run api specs with rcov'
   Spec::Rake::SpecTask.new('api') do |t|
-    t.spec_files = FileList['spec/api/*_spec.rb']
+    t.spec_files = FileList['spec/api/**/*_spec.rb']
     t.rcov = true
     t.rcov_dir = File.join('coverage', 'api')
     t.rcov_opts.concat(['--exclude', 'spec', '--sort', 'coverage', '--only-uncovered'])
@@ -20,7 +20,7 @@ namespace :rcov do
 
   desc 'run integration specs with rcov'
   Spec::Rake::SpecTask.new('integration') do |t|
-    t.spec_files = FileList['spec/integration/*_spec.rb']
+    t.spec_files = FileList['spec/integration/**/*_spec.rb']
     t.rcov = true
     t.rcov_dir = File.join('coverage', 'integration')
     t.rcov_opts.concat(['--exclude', 'spec', '--sort', 'coverage', '--only-uncovered'])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sunspot
 version: !ruby/object:Gem::Version 
-  version: 0.10.5
+  version: 0.10.6
 platform: ruby
 authors: 
 - Mat Brown
@@ -17,11 +17,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-22 00:00:00 -04:00
+date: 2009-11-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: mwmitchell-rsolr
+  name: rsolr
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -105,27 +105,21 @@ files:
 - lib/sunspot/dsl/restriction.rb
 - lib/sunspot/dsl/scope.rb
 - lib/sunspot/dsl/search.rb
-- lib/sunspot/facet.rb
-- lib/sunspot/facet_data.rb
-- lib/sunspot/facet_row.rb
 - lib/sunspot/field.rb
 - lib/sunspot/field_factory.rb
 - lib/sunspot/indexer.rb
-- lib/sunspot/instantiated_facet.rb
-- lib/sunspot/instantiated_facet_row.rb
 - lib/sunspot/query.rb
+- lib/sunspot/query/abstract_field_facet.rb
 - lib/sunspot/query/boost_query.rb
 - lib/sunspot/query/connective.rb
+- lib/sunspot/query/date_field_facet.rb
 - lib/sunspot/query/dismax.rb
 - lib/sunspot/query/field_facet.rb
-- lib/sunspot/query/fulltext_base_query.rb
 - lib/sunspot/query/highlighting.rb
 - lib/sunspot/query/local.rb
 - lib/sunspot/query/pagination.rb
 - lib/sunspot/query/query.rb
 - lib/sunspot/query/query_facet.rb
-- lib/sunspot/query/query_facet_row.rb
-- lib/sunspot/query/query_field_facet.rb
 - lib/sunspot/query/restriction.rb
 - lib/sunspot/query/scope.rb
 - lib/sunspot/query/sort.rb
@@ -133,8 +127,12 @@ files:
 - lib/sunspot/query/text_field_boost.rb
 - lib/sunspot/schema.rb
 - lib/sunspot/search.rb
+- lib/sunspot/search/date_facet.rb
+- lib/sunspot/search/facet_row.rb
+- lib/sunspot/search/field_facet.rb
 - lib/sunspot/search/highlight.rb
 - lib/sunspot/search/hit.rb
+- lib/sunspot/search/query_facet.rb
 - lib/sunspot/session.rb
 - lib/sunspot/setup.rb
 - lib/sunspot/text_field_setup.rb

data/lib/sunspot/facet.rb

@@ -1,24 +0,0 @@
-module Sunspot
-  class Facet
-    def initialize(facet_data) #:nodoc:
-      @facet_data = facet_data
-    end
-
-    # 
-    # For field facets, this is the field name. For query facets, this is the
-    # name given to the #facet method in the DSL.
-    #
-    def name
-      @facet_data.name
-    end
-    alias_method :field_name, :name
-
-    # 
-    # Collection of FacetRow objects containing the individual values returned
-    # by the facet.
-    #
-    def rows
-      @facet_data.rows { |value, count| FacetRow.new(value, count) }
-    end
-  end
-end

data/lib/sunspot/facet_data.rb

@@ -1,169 +0,0 @@
-require 'enumerator'
-
-module Sunspot
-  # 
-  # The FacetData classes encapsulate various sources of facet data (field
-  # facet, # date facet, query facet), presenting a polymorphic API to the Facet
-  # class.
-  #
-  module FacetData #:nodoc:all
-    # 
-    # Base class for facet data.
-    #
-    class Abstract
-      attr_reader :field #:nodoc:
-
-      # 
-      # The class that the field references, if any.
-      #
-      def reference
-        @field.reference if @field
-      end
-
-      # 
-      # Cast the given value to the field's type, if it has one; otherwise just
-      # return the string.
-      #
-      def cast(value)
-        if @field
-          @field.cast(value)
-        else
-          value
-        end
-      end
-
-      # 
-      # Given the raw facet row value, return what the Sunspot facet row object
-      # should present as the value. This can be overridden by subclasses.
-      #
-      def row_value(value)
-        cast(value)
-      end
-    end
-
-    # 
-    # FieldFacetData encapsulates the data returned by field facets
-    #
-    class FieldFacetData < Abstract
-      def initialize(facet_values, field)
-        @facet_values, @field = facet_values, field
-      end
-
-      # The name of the field that contains this facet's values
-      #
-      # ==== Returns
-      #
-      # Symbol:: The field name
-      # 
-      def name
-        @field.name
-      end
-
-      # The rows returned for this facet.
-      #
-      # ==== Returns
-      #
-      # Array:: Collection of FacetRow objects, in the order returned by Solr
-      # 
-      def rows
-        @rows ||=
-          begin
-            rows = []
-            @facet_values.each_slice(2) do |value, count|
-              rows << yield(row_value(value), count)
-            end
-            rows
-          end
-      end
-    end
-
-    # 
-    # DateFacetData encapsulates facet date for date-range facets.
-    #
-    class DateFacetData < FieldFacetData
-      def initialize(facet_values, field)
-        @gap = facet_values.delete('gap')[/\+(\d+)SECONDS/,1].to_i
-        %w(start end).each { |key| facet_values.delete(key) }
-        super(facet_values.to_a.flatten, field)
-      end
-
-      #
-      # Get the rows of this date facet, which are instances of DateFacetRow.
-      # The rows will always be sorted in chronological order.
-      #
-      #--
-      #
-      # The date facet info comes back from Solr as a hash, so we need to sort
-      # it manually. FIXME this currently assumes we want to do a "lexical"
-      # sort, but we should support count sort as well, even if it's not a
-      # common use case.
-      #
-      def rows(&block)
-        super(&block).sort { |a, b| a.value.first <=> b.value.first }
-      end
-
-      private
-
-      def row_value(value)
-        cast(value)..(cast(value) + @gap)
-      end
-    end
-
-    # 
-    # QueryFacetData encapsulates the data returned by a query facet.
-    #
-    class QueryFacetData < Abstract
-      def initialize(outgoing_query_facet, row_data) #:nodoc:
-        @outgoing_query_facet, @row_data = outgoing_query_facet, row_data
-        @field = @outgoing_query_facet.field
-      end
-
-      # 
-      # Use the name defined by the user
-      #
-      def name
-        outgoing_query_facet.name
-      end
-
-      # 
-      # Get the rows associated with this query facet. Returned rows are always
-      # ordered by count.
-      #
-      # ==== Returns
-      #
-      # Array:: Collection of QueryFacetRow objects, ordered by count
-      #
-      def rows
-        @rows ||=
-          begin
-            rows = []
-            options = @outgoing_query_facet.options
-            minimum_count =
-              if options[:zeros] then 0
-              elsif options[:minimum_count] then options[:minimum_count]
-              else 1
-              end
-            for outgoing_row in  @outgoing_query_facet.rows
-              row_query = outgoing_row.to_boolean_phrase
-              if @row_data.has_key?(row_query)
-                row = yield(outgoing_row.label, @row_data[row_query])
-                rows << row if row.count >= minimum_count
-              end
-            end
-            if options[:sort] == :index || !options[:limit] && options[:sort] != :count
-              if rows.all? { |row| row.value.respond_to?(:<=>) }
-                rows.sort! { |x, y| x.value <=> y.value }
-              end
-            else
-              rows.sort! { |x, y| y.count <=> x.count }
-            end
-            if limit = options[:limit]
-              rows[0, limit]
-            else
-              rows
-            end
-          end
-      end
-    end
-  end
-end

data/lib/sunspot/facet_row.rb

@@ -1,12 +0,0 @@
-module Sunspot
-  #
-  # This class encapsulates a facet row (value) for a facet.
-  #
-  class FacetRow
-    attr_reader :value, :count
-
-    def initialize(value, count) #:nodoc:
-      @value, @count = value, count
-    end
-  end
-end

data/lib/sunspot/instantiated_facet.rb

@@ -1,39 +0,0 @@
-module Sunspot
-  #
-  # InstantiatedFacet instances allow access to a model instance based on a
-  # primary key stored in facet rows' values. The rows are hydrated lazily, but
-  # all rows are hydrated the first time #instance is called on any of the rows.
-  #
-  # Instatiated facets are possible for fields which are defined with a
-  # :references option.
-  #
-  # The #rows method returns InstantiatedFacetRow objects.
-  #
-  class InstantiatedFacet < Facet
-    # 
-    # Hydrate all rows for the facet. For data accessors that can efficiently
-    # batch load, this is more efficient than individually lazy-loading
-    # instances for each row, but allows us to still stay lazy and not do work
-    # in the persistent store if the instances are not needed.
-    #
-    def populate_instances! #:nodoc:
-      ids = rows.map { |row| row.value }
-      reference_class = Sunspot::Util.full_const_get(@facet_data.reference.to_s)
-      accessor = Adapters::DataAccessor.create(reference_class)
-      instance_map = accessor.load_all(ids).inject({}) do |map, instance|
-        map[Adapters::InstanceAdapter.adapt(instance).id] = instance
-        map
-      end
-      for row in rows
-        row.instance = instance_map[row.value]
-      end
-    end
-
-    # 
-    # A collection of InstantiatedFacetRow objects
-    #
-    def rows
-      @facet_data.rows { |value, count| InstantiatedFacetRow.new(value, count, self) }
-    end
-  end
-end

data/lib/sunspot/instantiated_facet_row.rb

@@ -1,27 +0,0 @@
-module Sunspot
-  # 
-  # InstantiatedFacetRow objects represent a single value for an instantiated
-  # facet. As well as the usual FacetRow methods, InstantedFacetRow objects
-  # provide access to the persistent object referenced by the row's value.
-  #
-  class InstantiatedFacetRow < FacetRow
-    attr_writer :instance #:nodoc:
-
-    def initialize(value, count, facet) #:nodoc:
-      super(value, count)
-      @facet = facet
-    end
-
-    #
-    # Get the persistent object referenced by this row's value. Instances are
-    # batch-lazy-loaded, which means that for a given facet, all of the
-    # instances are loaded the first time any row's instance is requested.
-    #
-    def instance
-      unless defined?(@instance)
-        @facet.populate_instances!
-      end
-      @instance
-    end
-  end
-end

data/lib/sunspot/query/fulltext_base_query.rb

@@ -1,47 +0,0 @@
-module Sunspot
-  module Query
-    class FulltextBaseQuery < BaseQuery #:nodoc:
-      def initialize(keywords, options, types, setup)
-        super(types, setup)
-        @keywords = keywords
-
-        if highlight_options = options.delete(:highlight)
-          set_highlight(highlight_options == true ? [] : highlight_options)
-        end
-
-        if fulltext_fields = options.delete(:fields)
-          Array(fulltext_fields).each do |field|
-            add_fulltext_field(field)
-          end
-        end
-      end
-
-
-      private
-
-      def text_fields(field_names)
-        field_names.inject([]) do |fields, name|
-          fields.concat(@setup.text_fields(name))
-        end
-      end
-
-      # 
-      # Returns the names of text fields that should be queried in a keyword
-      # search. If specific fields are requested, use those; otherwise use the
-      # union of all fields configured for the types under search.
-      #
-      def query_fields
-        @query_fields ||=
-          begin
-            fulltext_fields =
-              @fulltext_fields || @setup.all_text_fields.map do |field|
-                TextFieldBoost.new(field)
-              end
-            fulltext_fields.map do |fulltext_field|
-              fulltext_field.to_boosted_field
-            end.join(' ')
-          end
-      end
-    end
-  end
-end

data/lib/sunspot/query/query_facet_row.rb

@@ -1,19 +0,0 @@
-module Sunspot
-  module Query
-    # 
-    # QueryFacetRow objects encapsulate restrictions for a particular
-    # QueryFacet. They also contain a label attribute, which is used as the
-    # value for the search result's corresponding facet row object.
-    #
-    # See Query::Scope for the API provided.
-    #
-    class QueryFacetRow < Connective::Conjunction #:nodoc:
-      attr_reader :label
-
-      def initialize(label, setup)
-        super(setup)
-        @label = label
-      end
-    end
-  end
-end

data/lib/sunspot/query/query_field_facet.rb

@@ -1,20 +0,0 @@
-module Sunspot
-  module Query
-    # 
-    # QueryFieldFacets are used for the "restricted field facet" feature, which
-    # allows an :only parameter for field facets, specifying a set of values in
-    # which the searcher is interested. Since Solr does not support this feature
-    # directly in field facets, build query facets that replicate field facet
-    # behavior.
-    #
-    class QueryFieldFacet < QueryFacet #:nodoc:
-      def initialize(field, values, options)
-        super(field.name, options)
-        @field = field
-        values.each do |value|
-          add_row(value).add_component(Restriction::EqualTo.new(field, value))
-        end
-      end
-    end
-  end
-end