UnderpantsGnome-sunspot 0.9.1.1 → 0.9.8.1

data/lib/sunspot/query/field_facet.rb

@@ -28,6 +28,8 @@ module Sunspot
               )
             end
             DateFieldFacet.new(field, options)
+          elsif options.has_key?(:only)
+            QueryFieldFacet.new(field, options.delete(:only))
           else
             FieldFacet.new(field, options)
           end
@@ -86,8 +88,7 @@ module Sunspot
           :"facet.date" => [@field.indexed_name],
           param_key('date.start') => start_time.utc.xmlschema,
           param_key('date.end') => end_time.utc.xmlschema,
-          param_key('date.gap') => "+#{interval}SECONDS",
-          param_key('date.other') => others
+          param_key('date.gap') => "+#{interval}SECONDS"
         )
       end
 

data/lib/sunspot/query/field_query.rb

@@ -18,7 +18,14 @@ module Sunspot
       # FieldFacet:: The field facet object
       #
       def add_field_facet(field_name, options = nil)
-        add_component(FieldFacet.build(build_field(field_name), options || {}))
+        options ||= {}
+        facet =
+          if only = options.delete(:only)
+            query_facets[field_name.to_sym] = QueryFieldFacet.new(@setup.field(field_name), only) 
+          else
+            FieldFacet.build(build_field(field_name), options)
+          end
+        add_component(facet)
       end
 
       # 
@@ -38,7 +45,6 @@ module Sunspot
       def add_query_facet(name)
         add_component(facet = QueryFacet.new(name, setup))
         query_facets[name.to_sym] = facet
-        facet
       end
 
       # 

data/lib/sunspot/query/query_facet.rb

@@ -14,8 +14,9 @@ module Sunspot
     #
     class QueryFacet
       attr_reader :name #:nodoc:
+      attr_reader :field #:nodoc:
 
-      def initialize(name, setup) #:nodoc:
+      def initialize(name, setup = nil) #:nodoc:
         @name = name
         @setup = setup
         @components = []

data/lib/sunspot/query/query_field_facet.rb

@@ -0,0 +1,13 @@
+module Sunspot
+  module Query
+    class QueryFieldFacet < QueryFacet
+      def initialize(field, values)
+        super(field.name)
+        @field = field
+        values.each do |value|
+          add_row(value).add_component(Restriction::EqualTo.new(field, value))
+        end
+      end
+    end
+  end
+end

data/lib/sunspot/query/restriction.rb

@@ -26,17 +26,17 @@ module Sunspot
       # API for instances of this class.
       #
       # Implementations of this class must respond to #to_params and
-      # #to_negative_params. Instead of implementing those methods, they may
+      # #to_negated_params. Instead of implementing those methods, they may
       # choose to implement any of:
       #
-      # * #to_positive_boolean_phrase, and optionally #to_negative_boolean_phrase
+      # * #to_positive_boolean_phrase, and optionally #to_negated_boolean_phrase
       # * #to_solr_conditional
       #
       class Base #:nodoc:
         include RSolr::Char
 
-        def initialize(field, value, negative = false)
-          @field, @value, @negative = field, value, negative
+        def initialize(field, value, negated = false)
+          @field, @value, @negated = field, value, negated
         end
 
         # 
@@ -56,14 +56,14 @@ module Sunspot
 
         # 
         # Return the boolean phrase associated with this restriction object.
-        # Differentiates between positive and negative boolean phrases depending
+        # Differentiates between positive and negated boolean phrases depending
         # on whether this restriction is negated.
         #
         def to_boolean_phrase
-          unless negative?
+          unless negated?
             to_positive_boolean_phrase
           else
-            to_negative_boolean_phrase
+            to_negated_boolean_phrase
           end
         end
 
@@ -85,27 +85,31 @@ module Sunspot
         end
 
         # 
-        # Boolean phrase representing this restriction in the negative. Subclasses
+        # Boolean phrase representing this restriction in the negated. Subclasses
         # may choose to implement this method, but it is not necessary, as the
         # base implementation delegates to #to_positive_boolean_phrase.
         #
         # ==== Returns
         #
-        # String:: Boolean phrase for restriction in the negative
+        # String:: Boolean phrase for restriction in the negated
         #
-        def to_negative_boolean_phrase
+        def to_negated_boolean_phrase
           "-#{to_positive_boolean_phrase}"
         end
 
-        protected
-
         # 
         # Whether this restriction should be negated from its original meaning
         #
-        def negative?
-          !!@negative
+        def negated? #:nodoc:
+          !!@negated
+        end
+
+        def negate
+          self.class.new(@field, @value, !@negated)
         end
 
+        protected
+
         # 
         # Return escaped Solr API representation of given value
         #
@@ -132,15 +136,15 @@ module Sunspot
           unless @value.nil?
             super
           else
-            "-#{escape(@field.indexed_name)}:[* TO *]"
+            "#{escape(@field.indexed_name)}:[* TO *]"
           end
         end
 
-        def to_negative_boolean_phrase
-          unless @value.nil?
-            super
+        def negated?
+          if @value.nil?
+            !super
           else
-            "#{escape(@field.indexed_name)}:[* TO *]"
+            super
           end
         end
 
@@ -211,14 +215,18 @@ module Sunspot
       # Result must be the exact instance given (only useful when negated).
       #
       class SameAs < Base
-        def initialize(object, negative = false)
-          @object, @negative = object, negative
+        def initialize(object, negated = false)
+          @object, @negated = object, negated
         end
 
         def to_positive_boolean_phrase
           adapter = Adapters::InstanceAdapter.adapt(@object)
           "id:#{escape(adapter.index_id)}"
         end
+
+        def negate
+          SameAs.new(@object, !negated?)
+        end
       end
     end
   end

data/lib/sunspot/search.rb

@@ -90,15 +90,14 @@ module Sunspot
     def facet(field_name)
       (@facets_cache ||= {})[field_name.to_sym] ||=
         begin
-          query_facet(field_name) ||
+          facet_data = query_facet_data(field_name) ||
             begin
               field = field(field_name)
-              date_facet(field) ||
-                begin
-                  facet_class = field.reference ? InstantiatedFacet : Facet
-                  facet_class.new(@solr_result['facet_counts']['facet_fields'][field.indexed_name], field)
-                end
+              date_facet_data(field) ||
+                FacetData::FieldFacetData.new(@solr_result['facet_counts']['facet_fields'][field.indexed_name], field)
             end
+          facet_class = facet_data.reference ? InstantiatedFacet : Facet
+          facet_class.new(facet_data)
         end
     end
 
@@ -132,7 +131,7 @@ module Sunspot
       (@dynamic_facets_cache ||= {})[[base_name.to_sym, dynamic_name.to_sym]] ||=
         begin
           field = @setup.dynamic_field_factory(base_name).build(dynamic_name)
-          Facet.new(@solr_result['facet_counts']['facet_fields'][field.indexed_name], field)
+          Facet.new(FacetData::FieldFacetData.new(@solr_result['facet_counts']['facet_fields'][field.indexed_name], field))
         end
     end
 
@@ -159,16 +158,14 @@ module Sunspot
     end
 
     def populate_hits! #:nodoc:
-      type_hit_hash = Hash.new { |h, k| h[k] = [] }
-      id_hit_hash = {}
-      for hit in hits
-        type_hit_hash[hit.class_name] << hit
-        id_hit_hash[hit.primary_key] = hit
+      id_hit_hash = Hash.new { |h, k| h[k] = {} }
+      hits.each do |hit|
+        id_hit_hash[hit.class_name][hit.primary_key] = hit
       end
-      type_hit_hash.each_pair do |class_name, hits|
-        ids = hits.map { |hit| hit.primary_key }
-        for instance in data_accessor_for(Util.full_const_get(class_name)).load_all(ids)
-          hit = id_hit_hash[Adapters::InstanceAdapter.adapt(instance).id.to_s]
+      id_hit_hash.each_pair do |class_name, hits|
+        ids = hits.map { |id, hit| hit.primary_key }
+        data_accessor_for(Util.full_const_get(class_name)).load_all(ids).each do |instance|
+          hit = id_hit_hash[class_name][Adapters::InstanceAdapter.adapt(instance).id.to_s]
           hit.instance = instance
         end
       end
@@ -194,23 +191,23 @@ module Sunspot
       end || @solr_result['facet_counts']['facet_fields'][field.indexed_name]
     end
 
-    def date_facet(field)
+    def date_facet_data(field)
       if field.type == Type::TimeType
         if @solr_result['facet_counts'].has_key?('facet_dates')
           if facet_result = @solr_result['facet_counts']['facet_dates'][field.indexed_name]
-            DateFacet.new(facet_result, field)
+            FacetData::DateFacetData.new(facet_result, field)
           end
         end
       end
     end
 
-    def query_facet(name)
+    def query_facet_data(name)
       if query_facet = @query.query_facet(name.to_sym)
         if @solr_result['facet_counts'].has_key?('facet_queries')
-          QueryFacet.new(
-            query_facet,
-            @solr_result['facet_counts']['facet_queries']
-          )
+            FacetData::QueryFacetData.new(
+              query_facet,
+              @solr_result['facet_counts']['facet_queries']
+            )
         end
       end
     end

data/lib/sunspot/search/hit.rb

@@ -57,6 +57,10 @@ module Sunspot
         end
         @instance
       end
+
+      def inspect
+        "#<Sunspot::Search::Hit:#{@class_name} #{@primary_key}>"
+      end
     end
   end
 end

data/lib/sunspot/session.rb

@@ -15,7 +15,7 @@ module Sunspot
       # For testing purposes
       #
       def connection_class #:nodoc:
-        @connection_class ||= RSolr::Connection
+        @connection_class ||= RSolr
       end
     end
 
@@ -46,8 +46,8 @@ module Sunspot
           Setup.for(types.first)
         else
           CompositeSetup.for(types)
-        end
-      Search.new(connection, setup, Query::Query.new(setup, @config))
+          end
+      Search.new(connection, setup, Query::Query.new(types, setup, @config))
     end
 
     #
@@ -186,11 +186,12 @@ module Sunspot
     def connection
       @connection ||=
         begin
-          connection = self.class.connection_class.new(
-            RSolr::Adapter::HTTP.new(:url => config.solr.url)
-          )
-          connection.adapter.connector.adapter_name = config.http_client
-          connection
+          self.class.connection_class.connect(:url => config.solr.url, :adapter => config.http_client)
+          # connection = self.class.connection_class.new(
+          #   RSolr::Adapter::HTTP.new(:url => config.solr.url)
+          # )
+          # connection.adapter.connector.adapter_name = config.http_client
+          # connection
         end
     end
 

data/spec/api/build_search_spec.rb

@@ -27,6 +27,16 @@ describe 'Search' do
     connection.should have_last_search_with(:fq => 'type:Post')
   end
 
+  it 'should search types in main query if keywords not used' do
+    session.search Post
+    connection.should have_last_search_with(:q => 'type:Post')
+  end
+
+  it 'should search type of subclass when superclass is configured' do
+    session.search PhotoPost
+    connection.should have_last_search_with(:q => 'type:PhotoPost')
+  end
+
   it 'should search all text fields for searched class' do
     session.search Post do
       keywords 'keyword search'
@@ -288,7 +298,85 @@ describe 'Search' do
       end
     end
     connection.should have_last_search_with(
-      :fq => '(category_ids_im:1 OR -average_rating_f:[3\.0 TO *])'
+      :fq => '-(-category_ids_im:1 AND average_rating_f:[3\.0 TO *])'
+    )
+  end
+
+  it 'should create a disjunction with nested conjunction with negated restrictions' do
+    session.search Post do
+      any_of do
+        with :category_ids, 1
+        all_of do
+          without(:average_rating).greater_than(3.0)
+          with(:blog_id, 1)
+        end
+      end
+    end
+    connection.should have_last_search_with(
+      :fq => '(category_ids_im:1 OR (-average_rating_f:[3\.0 TO *] AND blog_id_i:1))'
+    )
+  end
+
+  it 'should create a disjunction with nested conjunction with nested disjunction with negated restriction' do
+    session.search(Post) do
+      any_of do
+        with(:title, 'Yes')
+        all_of do
+          with(:blog_id, 1)
+          any_of do
+            with(:category_ids, 4)
+            without(:average_rating, 2.0)
+          end
+        end
+      end
+    end
+    connection.should have_last_search_with(
+      :fq => '(title_ss:Yes OR (blog_id_i:1 AND -(-category_ids_im:4 AND average_rating_f:2\.0)))'
+    )
+  end
+
+  it 'should create a disjunction with a negated restriction and a nested disjunction in a conjunction with a negated restriction' do
+    session.search(Post) do
+      any_of do
+        without(:title, 'Yes')
+        all_of do
+          with(:blog_id, 1)
+          any_of do
+            with(:category_ids, 4)
+            without(:average_rating, 2.0)
+          end
+        end
+      end
+    end
+    connection.should have_last_search_with(
+      :fq => '-(title_ss:Yes AND -(blog_id_i:1 AND -(-category_ids_im:4 AND average_rating_f:2\.0)))'
+    )
+  end
+
+  #
+  # This is important because if a disjunction could be nested in another
+  # disjunction, then the inner disjunction could denormalize (and thus
+  # become negated) after the outer disjunction denormalized (checking to
+  # see if the inner one is negated). Since conjunctions never need to
+  # denormalize, if a disjunction can only contain conjunctions or restrictions,
+  # we can guarantee that the negation state of a disjunction's components will
+  # not change when #to_params is called on them.
+  #
+  # Since disjunction is associative, this behavior has no effect on the actual
+  # logical semantics of the disjunction.
+  #
+  it 'should create a single disjunction when disjunctions nested' do
+    session.search(Post) do
+      any_of do
+        with(:title, 'Yes')
+        any_of do
+          with(:blog_id, 1)
+          with(:category_ids, 4)
+        end
+      end
+    end
+    connection.should have_last_search_with(
+      :fq => '(title_ss:Yes OR blog_id_i:1 OR category_ids_im:4)'
     )
   end
 
@@ -301,7 +389,19 @@ describe 'Search' do
       end
     end
     connection.should have_last_search_with(
-      :fq => "(-id:Post\\ #{post.id} OR category_ids_im:1)"
+      :fq => "-(id:Post\\ #{post.id} AND -category_ids_im:1)"
+    )
+  end
+
+  it 'should create a disjunction with empty restriction' do
+    session.search Post do
+      any_of do
+        with(:average_rating, nil)
+        with(:average_rating).greater_than(3.0)
+      end
+    end
+    connection.should have_last_search_with(
+      :fq => '-(average_rating_f:[* TO *] AND -average_rating_f:[3\.0 TO *])'
     )
   end
 
@@ -608,28 +708,6 @@ describe 'Search' do
       connection.should have_last_search_with(:"f.published_at_d.facet.date.gap" => "+3600SECONDS")
     end
 
-    it 'should allow computation of one other time' do
-      session.search Post do |query|
-        query.facet :published_at, :time_range => @time_range, :time_other => :before
-      end
-      connection.should have_last_search_with(:"f.published_at_d.facet.date.other" => %w(before))
-    end
-
-    it 'should allow computation of two other times' do
-      session.search Post do |query|
-        query.facet :published_at, :time_range => @time_range, :time_other => [:before, :after]
-      end
-      connection.should have_last_search_with(:"f.published_at_d.facet.date.other" => %w(before after))
-    end
-
-    it 'should not allow computation of bogus other time' do
-      lambda do
-        session.search Post do |query|
-          query.facet :published_at, :time_range => @time_range, :time_other => :bogus
-        end
-      end.should raise_error(ArgumentError)
-    end
-
     it 'should not allow date faceting on a non-date field' do
       lambda do
         session.search Post do |query|
@@ -760,6 +838,27 @@ describe 'Search' do
     end
   end
 
+  it 'builds query facets when passed :only argument to field facet declaration' do
+    session.search Post do
+      facet :category_ids, :only => [1, 3]
+    end
+    connection.should have_last_search_with(
+      :"facet.query" => ['category_ids_im:1', 'category_ids_im:3']
+    )
+  end
+
+  it 'converts limited query facet values to the correct type' do
+    session.search Post do
+      facet :published_at, :only => [Time.utc(2009, 8, 28, 15, 33), Time.utc(2008,8, 28, 15, 33)]
+    end
+    connection.should have_last_search_with(
+      :"facet.query" => [
+        'published_at_d:2009\-08\-28T15\:33\:00Z',
+        'published_at_d:2008\-08\-28T15\:33\:00Z'
+    ]
+    )
+  end
+
   it 'should allow faceting by dynamic string field' do
     session.search Post do
       dynamic :custom_string do