sunspot 2.0.0.pre.120417 → 2.0.0.pre.120720

data/.gitignore

@@ -1,5 +1,7 @@
 sunspot-solr.pid
 *.swp
+*.swo
+*~
 coverage
 pkg
 /doc

data/History.txt

@@ -12,6 +12,8 @@
 * Adds `Retry5xxSessionProxy` to retry requests when an internal server error
   occurs (Nick Zadrozny)
 * Adds support for range queries (Jan Ulrich)
+* Allows custom field names specified with :as to be symbols (David Oliver)
+* Add field exclusion when faceting (Cuong Hoang)
 
 == 1.3.0 2011-11-26
 * Requests to Solr use HTTP POST verb by default to avoid issues when the query string grows too large for GET (Johan Van Ryseghem)

data/lib/sunspot/adapters.rb

@@ -79,7 +79,11 @@ module Sunspot
         #   wraps the given instance
         #
         def adapt(instance) #:nodoc:
-          self.for(instance.class).new(instance)
+          @known_adapters ||= {}
+          clazz = instance.class
+          adapter = @known_adapters[clazz.name.to_sym] || self.for(clazz)
+          @known_adapters[clazz.name.to_sym] ||= adapter
+          adapter.new(instance)
         end
 
         # Register an instance adapter for a set of classes. When searching for

data/lib/sunspot/dsl/field_query.rb

@@ -249,15 +249,9 @@ module Sunspot
               "wrong number of arguments (#{field_names.length} for 1)"
             )
           end
-          if options.has_key?(:exclude)
-            raise(
-              ArgumentError,
-              "can't use :exclude with query facets"
-            )
-          end
           search_facet = @search.add_query_facet(field_names.first, options)
           Sunspot::Util.instance_eval_or_call(
-            QueryFacet.new(@query, @setup, search_facet),
+            QueryFacet.new(@query, @setup, search_facet, options),
             &block
           )
         elsif options[:only]

data/lib/sunspot/dsl/query_facet.rb

@@ -5,8 +5,8 @@ module Sunspot
     # method.
     #
     class QueryFacet
-      def initialize(query, setup, facet) #:nodoc:
-        @query, @setup, @facet = query, setup, facet
+      def initialize(query, setup, facet, options) #:nodoc:
+        @query, @setup, @facet, @options = query, setup, facet, options
       end
 
       # 
@@ -24,7 +24,7 @@ module Sunspot
       #   An object used to identify this facet row in the results.
       #
       def row(label, &block)
-        query_facet = Sunspot::Query::QueryFacet.new
+        query_facet = Sunspot::Query::QueryFacet.new(@options)
         Sunspot::Util.instance_eval_or_call(
           Scope.new(@query.add_query_facet(query_facet), @setup),
           &block

data/lib/sunspot/field.rb

@@ -104,7 +104,7 @@ module Sunspot
     def set_indexed_name(options)
       @indexed_name =
         if options[:as]
-          options.delete(:as)
+          options.delete(:as).to_s
         else
           "#{@type.indexed_name(@name).to_s}#{'m' if @multiple }#{'s' if @stored}#{'v' if more_like_this?}"
         end

data/lib/sunspot/query/query_facet.rb

@@ -1,6 +1,17 @@
 module Sunspot
   module Query
     class QueryFacet < Connective::Conjunction
+
+      def initialize(options = {}, negated = false)
+        if exclude_filters = options[:exclude]
+          @exclude_tag = Util.Array(exclude_filters).map do |filter|
+            filter.tag
+          end.join(',')
+        end
+        super(negated)
+      end
+
+
       def to_params
         if @components.empty?
           {}
@@ -11,6 +22,32 @@ module Sunspot
           }
         end
       end
+
+      def to_boolean_phrase
+        "#{to_local_params}#{super}"
+      end
+
+      private
+
+      def local_params
+        @local_params ||=
+          begin
+            local_params = {}
+            local_params[:ex] = @exclude_tag if @exclude_tag
+            local_params
+          end
+      end
+
+      def to_local_params
+        if local_params.empty?
+          ''
+        else
+          pairs = local_params.map do |key, value|
+            "#{key}=#{value}"
+          end
+          "{!#{pairs.join(' ')}}"
+        end
+      end 
     end
   end
 end

data/lib/sunspot/query/restriction.rb

@@ -184,6 +184,23 @@ module Sunspot
           solr_value
         end
 
+        def to_solr_conditional
+          "{* TO #{solr_value}}"
+        end
+      end
+
+      # 
+      # Results must have field with value less or equal to than given value
+      #
+      class LessThanOrEqualTo < Base
+        private
+
+        def solr_value(value = @value)
+          solr_value = super
+          solr_value = "\"#{solr_value}\"" if solr_value.index(' ')
+          solr_value
+        end
+
         def to_solr_conditional
           "[* TO #{solr_value}]"
         end
@@ -201,6 +218,23 @@ module Sunspot
           solr_value
         end
 
+        def to_solr_conditional
+          "{#{solr_value} TO *}"
+        end
+      end
+
+      # 
+      # Results must have field with value greater than or equal to given value
+      #
+      class GreaterThanOrEqualTo < Base
+        private
+
+        def solr_value(value = @value)
+          solr_value = super
+          solr_value = "\"#{solr_value}\"" if solr_value.index(' ')
+          solr_value
+        end
+
         def to_solr_conditional
           "[#{solr_value} TO *]"
         end

data/lib/sunspot/search/field_group.rb

@@ -1,3 +1,5 @@
+require 'sunspot/search/paginated_collection'
+
 module Sunspot
   module Search
     class FieldGroup
@@ -9,9 +11,11 @@ module Sunspot
         @groups ||=
           begin
             if solr_response
-              solr_response['groups'].map do |group|
-                Group.new(group['groupValue'], group['doclist'], @search)
-              end
+              paginate_collection(
+                solr_response['groups'].map do |group|
+                  Group.new(group['groupValue'], group['doclist'], @search)
+                end
+              )
             end
           end
       end
@@ -33,6 +37,10 @@ module Sunspot
       def solr_response
         @search.group_response[@field.indexed_name.to_s]
       end
+
+      def paginate_collection(collection)
+        PaginatedCollection.new(collection, @search.query.page, @search.query.per_page, total)
+      end
     end
   end
 end

data/lib/sunspot/version.rb

@@ -1,3 +1,3 @@
 module Sunspot
-  VERSION = '2.0.0.pre.120417'
+  VERSION = '2.0.0.pre.120720'
 end

data/spec/api/query/connectives_examples.rb

@@ -23,7 +23,7 @@ shared_examples_for "query with connective scope" do
     end
     connection.should have_last_search_including(
       :fq,
-      '(blog_id_i:2 OR (category_ids_im:1 AND average_rating_ft:[3\.0 TO *]))'
+      '(blog_id_i:2 OR (category_ids_im:1 AND average_rating_ft:{3\.0 TO *}))'
     )
   end
 
@@ -38,7 +38,7 @@ shared_examples_for "query with connective scope" do
       end
     end
     connection.should have_last_search_including(
-      :fq, '(category_ids_im:1 OR (-average_rating_ft:[3\.0 TO *] AND blog_id_i:1))'
+      :fq, '(category_ids_im:1 OR (-average_rating_ft:{3\.0 TO *} AND blog_id_i:1))'
     )
   end
 
@@ -62,7 +62,7 @@ shared_examples_for "query with connective scope" do
       end
     end
     connection.should have_last_search_including(
-      :fq, '-(-category_ids_im:1 AND average_rating_ft:[3\.0 TO *])'
+      :fq, '-(-category_ids_im:1 AND average_rating_ft:{3\.0 TO *})'
     )
   end
 
@@ -149,7 +149,7 @@ shared_examples_for "query with connective scope" do
       end
     end
     connection.should have_last_search_including(
-      :fq, '-(average_rating_ft:[* TO *] AND -average_rating_ft:[3\.0 TO *])'
+      :fq, '-(average_rating_ft:[* TO *] AND -average_rating_ft:{3\.0 TO *})'
     )
   end
 
@@ -162,7 +162,7 @@ shared_examples_for "query with connective scope" do
       end
     end
     connection.should have_last_search_including(
-      :fq, "(id:(Post\\ #{post.id}) OR average_rating_ft:[3\\.0 TO *])"
+      :fq, "(id:(Post\\ #{post.id}) OR average_rating_ft:{3\\.0 TO *})"
     )
   end
 

data/spec/api/query/dynamic_fields_examples.rb

@@ -14,7 +14,7 @@ shared_examples_for "query with dynamic field support" do
         with(:test).less_than(1)
       end
     end
-    connection.should have_last_search_including(:fq, 'custom_integer\:test_i:[* TO 1]')
+    connection.should have_last_search_including(:fq, 'custom_integer\:test_i:{* TO 1}')
   end
 
   it 'restricts by dynamic float field with between restriction' do

data/spec/api/query/faceting_examples.rb

@@ -179,17 +179,6 @@ shared_examples_for "facetable query" do
       connection.should have_last_search_with(:"f.blog.facet.sort" => 'true')
     end
 
-    it 'raises an ArgumentError if exclusion attempted on a query facet' do
-      lambda do
-        search do
-          blog_filter = with(:blog_id, 1)
-          facet(:bad, :exclude => blog_filter) do
-            row(:bogus) { with(:blog_id, 1) }
-          end
-        end
-      end.should raise_error(ArgumentError)
-    end
-
     it 'raises an ArgumentError if exclusion attempted on a restricted field facet' do
       lambda do
         search do
@@ -426,6 +415,58 @@ shared_examples_for "facetable query" do
       connection.searches.last[:"facet.query"].should be_a(String)
     end
 
+    it 'tags and excludes a scope filter in a query facet' do
+      search do
+        blog_filter = with(:blog_id, 1)
+        facet:foo, :exclude => blog_filter do
+          row(:bar) do
+            with(:category_ids, 1)
+          end
+        end
+      end
+      filter_tag = get_filter_tag('blog_id_i:1')
+      connection.should have_last_search_with(
+        :"facet.query" => "{!ex=#{filter_tag}}category_ids_im:1"
+      )
+    end
+
+    it 'tags and excludes a disjunction filter in a query facet' do
+      search do
+        blog_filter = any_of do
+          with(:blog_id, 1)
+          with(:blog_id, 2)
+        end
+        facet:foo, :exclude => blog_filter do
+          row(:bar) do
+            with(:category_ids, 1)
+          end
+        end
+      end
+      filter_tag = get_filter_tag('(blog_id_i:1 OR blog_id_i:2)')
+      connection.should have_last_search_with(
+        :"facet.query" => "{!ex=#{filter_tag}}category_ids_im:1"
+      )
+    end
+
+    it 'tags and excludes multiple filters in a query facet' do
+      search do
+        blog_filter = with(:blog_id, 1)
+        category_filter = with(:category_ids, 2)
+        facet:foo, :exclude => [blog_filter, category_filter] do
+          row(:bar) do
+            with(:category_ids, 1)
+          end
+        end
+      end
+      filter_tags = %w(blog_id_i:1 category_ids_im:2).map do |phrase|
+        get_filter_tag(phrase)
+      end.join(',')
+      connection.should have_last_search_with(
+        :"facet.query" => "{!ex=#{filter_tags}}category_ids_im:1"
+      )
+    end
+
+
     it 'ignores facet query with only empty rows' do
       search do
         facet :foo do

data/spec/api/query/fulltext_examples.rb

@@ -224,7 +224,7 @@ shared_examples_for 'fulltext query' do
         end
       end
     end
-    connection.should have_last_search_with(:bq => ['average_rating_ft:[2\.0 TO *]^2.0'])
+    connection.should have_last_search_with(:bq => ['average_rating_ft:{2\.0 TO *}^2.0'])
   end
 
   it 'creates multiple boost queries' do
@@ -240,7 +240,7 @@ shared_examples_for 'fulltext query' do
     end
     connection.should have_last_search_with(
       :bq => [
-        'average_rating_ft:[2\.0 TO *]^2.0',
+        'average_rating_ft:{2\.0 TO *}^2.0',
         'featured_bs:true^1.5'
       ]
     )

data/spec/api/query/scope_examples.rb

@@ -46,21 +46,21 @@ shared_examples_for "scoped query" do
     search do
       with(:average_rating).less_than 3.0
     end
-    connection.should have_last_search_including(:fq, 'average_rating_ft:[* TO 3\.0]')
+    connection.should have_last_search_including(:fq, 'average_rating_ft:{* TO 3\.0}')
   end
 
   it 'should quote string with space in a less than match' do
     search do
       with(:title).less_than('test value')
     end
-    connection.should have_last_search_including(:fq, 'title_ss:[* TO "test\ value"]')
+    connection.should have_last_search_including(:fq, 'title_ss:{* TO "test\ value"}')
   end
 
   it 'scopes by greater than match with float' do
     search do
       with(:average_rating).greater_than 3.0
     end
-    connection.should have_last_search_including(:fq, 'average_rating_ft:[3\.0 TO *]')
+    connection.should have_last_search_including(:fq, 'average_rating_ft:{3\.0 TO *}')
   end
 
   it 'scopes by short-form between match with integers' do
@@ -116,14 +116,14 @@ shared_examples_for "scoped query" do
     search do
       without(:average_rating).less_than 3.0
     end
-    connection.should have_last_search_including(:fq, '-average_rating_ft:[* TO 3\.0]')
+    connection.should have_last_search_including(:fq, '-average_rating_ft:{* TO 3\.0}')
   end
 
   it 'scopes by not greater than match with float' do
     search do
       without(:average_rating).greater_than 3.0
     end
-    connection.should have_last_search_including(:fq, '-average_rating_ft:[3\.0 TO *]')
+    connection.should have_last_search_including(:fq, '-average_rating_ft:{3\.0 TO *}')
   end
   
   it 'scopes by not between match with shorthand' do

data/spec/integration/faceting_spec.rb

@@ -166,24 +166,70 @@ describe 'search faceting' do
       )
     end
 
-    it 'should exclude filter from faceting' do
-      search = Sunspot.search(Post) do
-        with(:blog_id, 1)
-        category_filter = with(:category_ids, 1)
-        facet(:category_ids, :exclude => category_filter)
+    context 'field faceting' do
+      it 'should exclude filter from faceting' do
+        search = Sunspot.search(Post) do
+          with(:blog_id, 1)
+          category_filter = with(:category_ids, 1)
+          facet(:category_ids, :exclude => category_filter)
+        end
+        search.facet(:category_ids).rows.map { |row| row.value }.to_set.should == Set[1, 2]
+      end
+
+      it 'should use facet keys to facet more than once with different exclusions' do
+        search = Sunspot.search(Post) do
+          with(:blog_id, 1)
+          category_filter = with(:category_ids, 1)
+          facet(:category_ids)
+          facet(:category_ids, :exclude => category_filter, :name => :all_category_ids)
+        end
+        search.facet(:category_ids).rows.map { |row| row.value }.should == [1]
+        search.facet(:all_category_ids).rows.map { |row| row.value }.to_set.should == Set[1, 2]
       end
-      search.facet(:category_ids).rows.map { |row| row.value }.to_set.should == Set[1, 2]
     end
 
-    it 'should use facet keys to facet more than once with different exclusions' do
-      search = Sunspot.search(Post) do
-        with(:blog_id, 1)
-        category_filter = with(:category_ids, 1)
-        facet(:category_ids)
-        facet(:category_ids, :exclude => category_filter, :name => :all_category_ids)
+    context 'query faceting' do
+      it 'should exclude filter from faceting' do
+        search = Sunspot.search(Post) do
+          with(:blog_id, 1)
+          category_filter = with(:category_ids, 1)
+          facet :category_ids, :exclude => category_filter do
+            row(:category_1) do
+              with(:category_ids, 1)
+            end
+            row(:category_2) do
+              with(:category_ids, 2)
+            end
+          end
+        end
+        search.facet(:category_ids).rows.map { |row| [row.value, row.count] }.to_set.should == Set[[:category_1, 1], [:category_2, 1]]
+      end
+
+      it 'should use facet keys to facet more than once with different exclusions' do
+        search = Sunspot.search(Post) do
+          with(:blog_id, 1)
+          category_filter = with(:category_ids, 1)
+          facet :category_ids do
+            row(:category_1) do
+              with(:category_ids, 1)
+            end
+            row(:category_2) do
+              with(:category_ids, 2)
+            end
+          end
+
+          facet :all_category_ids, :exclude => category_filter do
+            row(:category_1) do
+              with(:category_ids, 1)
+            end
+            row(:category_2) do
+              with(:category_ids, 2)
+            end
+          end
+        end
+        search.facet(:category_ids).rows.map { |row| [row.value, row.count] }.to_set.should == Set[[:category_1, 1]]
+        search.facet(:all_category_ids).rows.map { |row| [row.value, row.count] }.to_set.should == Set[[:category_1, 1], [:category_2, 1]]
       end
-      search.facet(:category_ids).rows.map { |row| row.value }.should == [1]
-      search.facet(:all_category_ids).rows.map { |row| row.value }.to_set.should == Set[1, 2]
     end
   end
 

data/spec/integration/field_grouping_spec.rb

@@ -71,4 +71,30 @@ describe "field grouping" do
     title1_group = search.group(:title).groups.detect { |g| g.value == "Title1" }
     title1_group.hits.first.primary_key.to_i.should == highest_ranked_post.id
   end
+
+  it "allows pagination within groups" do
+    search = Sunspot.search(Post) do
+      group :title
+      paginate :per_page => 1, :page => 2
+    end
+
+    search.group(:title).groups.length.should eql(1)
+    search.group(:title).groups.first.results.should == [ @posts.last ]
+  end
+
+  context "returns a paginated collection" do
+    subject do
+      search = Sunspot.search(Post) do
+        group :title
+        paginate :per_page => 1, :page => 2
+      end
+      search.group(:title).groups
+    end
+
+    it { subject.per_page.should      eql(1)   }
+    it { subject.total_pages.should   eql(2)   }
+    it { subject.current_page.should  eql(2)   }
+    it { subject.first_page?.should   be_false }
+    it { subject.last_page?.should    be_true  }
+  end
 end

data/spec/integration/scoped_search_spec.rb

@@ -33,24 +33,48 @@ describe 'scoped_search' do
 
       it 'should filter by less than' do
         results = Sunspot.search(clazz) { with(field).less_than values[2] }.results
-        (0..2).each { |i| results.should include(@objects[i]) }
-        (3..4).each { |i| results.should_not include(@objects[i]) }
+        (0..1).each { |i| results.should include(@objects[i]) }
+        (2..4).each { |i| results.should_not include(@objects[i]) }
       end
 
       it 'should reject by less than' do
         results = Sunspot.search(clazz) { without(field).less_than values[2] }.results
+        (0..1).each { |i| results.should_not include(@objects[i]) }
+        (2..4).each { |i| results.should include(@objects[i]) }
+      end
+
+      it 'should filter by less than or equal to' do
+        results = Sunspot.search(clazz) { with(field).less_than_or_equal_to values[2] }.results
+        (0..2).each { |i| results.should include(@objects[i]) }
+        (3..4).each { |i| results.should_not include(@objects[i]) }
+      end
+
+      it 'should reject by less than or equal to' do
+        results = Sunspot.search(clazz) { without(field).less_than_or_equal_to values[2] }.results
         (0..2).each { |i| results.should_not include(@objects[i]) }
         (3..4).each { |i| results.should include(@objects[i]) }
       end
 
       it 'should filter by greater than' do
         results = Sunspot.search(clazz) { with(field).greater_than values[2] }.results
+        (3..4).each { |i| results.should include(@objects[i]) }
+        (0..2).each { |i| results.should_not include(@objects[i]) }
+      end
+
+      it 'should reject by greater than' do
+        results = Sunspot.search(clazz) { without(field).greater_than values[2] }.results
+        (3..4).each { |i| results.should_not include(@objects[i]) }
+        (0..2).each { |i| results.should include(@objects[i]) }
+      end
+
+      it 'should filter by greater than or equal to' do
+        results = Sunspot.search(clazz) { with(field).greater_than_or_equal_to values[2] }.results
         (2..4).each { |i| results.should include(@objects[i]) }
         (0..1).each { |i| results.should_not include(@objects[i]) }
       end
 
       it 'should reject by greater than' do
-        results = Sunspot.search(clazz) { without(field).greater_than values[2] }.results
+        results = Sunspot.search(clazz) { without(field).greater_than_or_equal_to values[2] }.results
         (2..4).each { |i| results.should_not include(@objects[i]) }
         (0..1).each { |i| results.should include(@objects[i]) }
       end
@@ -119,6 +143,14 @@ describe 'scoped_search' do
     end
   end
 
+  describe 'Legacy (static) fields' do
+    it "allows for using symbols in defining static field names" do
+      Sunspot.remove_all
+      Sunspot.index!(legacy = Post.new(:title => "foo"))
+      Sunspot.search(Post) { with(:legacy, "legacy foo") }.results.should == [legacy]
+    end
+  end
+
   describe 'reserved words' do
     %w(AND OR NOT TO).each do |word|
       it "should successfully search for #{word.inspect}" do

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: sunspot
 version: !ruby/object:Gem::Version 
-  hash: 2286627327
-  prerelease: 6
+  prerelease: true
   segments: 
   - 2
   - 0
   - 0
   - pre
-  - 120417
-  version: 2.0.0.pre.120417
+  - 120720
+  version: 2.0.0.pre.120720
 platform: ruby
 authors: 
 - Mat Brown
@@ -35,17 +34,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-17 00:00:00 Z
+date: 2012-07-20 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rsolr
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
         segments: 
         - 1
         - 0
@@ -57,11 +55,9 @@ dependencies:
   name: pr_geohash
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 1
         - 0
@@ -72,11 +68,9 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 2
         - 6
@@ -88,11 +82,9 @@ dependencies:
   name: hanna
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -288,6 +280,7 @@ files:
 - tasks/rdoc.rake
 - tasks/schema.rake
 - tasks/todo.rake
+has_rdoc: true
 homepage: http://outoftime.github.com/sunspot
 licenses: []
 
@@ -301,20 +294,16 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
-      hash: 25
       segments: 
       - 1
       - 3
@@ -323,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sunspot
-rubygems_version: 1.8.15
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Library for expressive, powerful interaction with the Solr search engine