picky 4.15.1 → 4.16.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2MxMTQxZjI1MDcwYzA1N2UzNWY2MTQ5ZGNkMTllYWFjYmI1MDk0Nw==
+    NjVkMTA4OTYyYzkyZTMzZjAxYjM3YWRlMGQwMGE2MDc4Zjc3NDA4Nw==
   data.tar.gz: !binary |-
-    NjA3MTc5MTEwMWUzZWQ1NGZjNWU0ZjRhZDJmMTJhZjhhYjdiZWIzNA==
+    NDBiYmEzNWJlNDE3OTNkMmVhODU3NWYyY2QyZTQ4ZTdiN2RmZTA5Mg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NjdhYmYyYTkwOGJlZmUzZjljYTA2MjIxNzg0NWEwYzZkZWE2ZmE3OTdmZGEz
-    Mjc4YjYwMWZlMTU4Zjk0NGQyNGE4NzM2MjA0ZWY2MGRkODlhM2Y5Y2ZhYWZk
-    MzFjOWM2ZTQ4MzQzYTFiYTA3ZjUyZmQyZTU1NGU0ZjExMGQyYTA=
+    YmQ3MzczYTdmZjFlOTMwYmQ3ZjY3ZTkwMzBiMjU2MTUzMGQyZmM1ZjNkODg2
+    NGFjMTc0NzQ3MDRiZGQ3ZjY1ZGY3MzNlYjMyY2FkNTJmZWNlMzg2YWE0NWEx
+    Njk5NWQzYmI2OWVmMWM0NTMyZTliZGUwMTE2NDdmZWI4NzVlMGQ=
   data.tar.gz: !binary |-
-    MzlhODU0NmZlNGRkOGM4YzlkZDY3MTQxYmJlYTA2MWJkYWEwMGI4MjEwNzA1
-    M2VhYjExNzQ2YzdhODcyZjE0ZWVlN2QzMDRmNTU0YTI0YjVjMjFkNzc1ODk2
-    ZjQ3OTQyNTVhNmY3ZjhiN2ZhZWY4MWM0OTcyMDYxYjIzMTQ1YTY=
+    NGRmYmE3OTMxOTE0NmY3OTY2NThhMTdhNDI1YzQ5OTQ3ZDhlZjhmNjEzMmEw
+    NjcyNGIyYTVjYjdkNzU3NTFhNTZkN2M1YzdiMDBiOWNlMmQ5YTBmZDFiMjRk
+    MTFkZGIwOThmNmEzOTRjODRlMDVlMzYyMTEyYjI5ZTcwOTkwYTA=

data/lib/picky/categories_indexed.rb

@@ -45,11 +45,10 @@ module Picky
     # Note: Returns [] if no categories matched (will produce no result).
     #
     def possible_for token, preselected_categories = nil
-      possible = (preselected_categories || possible_categories(token)).inject([]) do |combinations, category|
+      (preselected_categories || possible_categories(token)).inject([]) do |combinations, category|
         combination = category.combination_for token
         combination ? combinations << combination : combinations
       end
-      possible
     end
 
     # This returns the possible categories for this token.

data/lib/picky/category_realtime.rb

@@ -16,6 +16,8 @@ module Picky
     # Adds and indexes this category of the
     # given object.
     #
+    # TODO Don't do this super-dynamically.
+    #
     def add object, where = :unshift
       if from.respond_to? :call
         add_text object.id, from.call(object), where

data/lib/picky/search_facets.rb

@@ -53,32 +53,40 @@ module Picky
       # Get actual counts.
       #
       if no_counts
-        facets_without_counts counts, minimal_counts, tokenized_filter_query, key_token.text
+        facets_without_counts counts, minimal_counts, tokenized_filter_query, key_token.text, options
       else
-        facets_with_counts    counts, minimal_counts, tokenized_filter_query, key_token.text
+        facets_with_counts    counts, minimal_counts, tokenized_filter_query, key_token.text, options
       end
     end
-    def facets_without_counts counts, minimal_counts, tokenized_filter_query, last_token_text
+    def facets_without_counts counts, minimal_counts, tokenized_filter_query, last_token_text, options = {}
       counts.inject([]) do |result, (key, _)|
         # Replace only the key token text because that
         # is the only information that changes in between
         # queries.
         #
         last_token_text.replace key
-        total = search_with(tokenized_filter_query, 0, 0).total
+        
+        # Calculate up to 1000 facets using unique to show correct facet counts.
+        # TODO Redesign and deoptimize the whole process.
+        #
+        total = search_with(tokenized_filter_query, 1000, 0, nil, true).total
         
         next result unless total >= minimal_counts
         result << key
       end
     end
-    def facets_with_counts counts, minimal_counts, tokenized_filter_query, last_token_text
+    def facets_with_counts counts, minimal_counts, tokenized_filter_query, last_token_text, options = {}
       counts.inject({}) do |result, (key, _)|
         # Replace only the key token text because that
         # is the only information that changes in between
         # queries.
         #
         last_token_text.replace key
-        total = search_with(tokenized_filter_query, 0, 0).total
+        
+        # Calculate up to 1000 facets using unique to show correct facet counts.
+        # TODO Redesign and deoptimize the whole process.
+        #
+        total = search_with(tokenized_filter_query, 1000, 0, nil, true).total
         
         next result unless total >= minimal_counts
         result[key] = total

data/spec/functional/facets_spec.rb

@@ -189,5 +189,41 @@ describe 'facets' do
       end
     end
     
+    describe 'Search#facets with identical category text/filter text' do
+      it 'does not report the same thing multiple times up to a limit' do
+        require 'picky'
+ 
+        shoe = Struct.new(:id, :color, :name)
+ 
+        shoes_index = Picky::Index.new(:shoes) do
+          category :color
+          category :name
+        end
+ 
+        shoes_search = Picky::Search.new shoes_index
+        
+        shoes_index.add shoe.new(1, 'black', 'Outdoor Black')
+        
+        shoes_search.facets(:color).should == { 'black' => 1 }
+        shoes_search.facets(:color, filter: 'black').should == { 'black' => 1 }
+        
+        999.times do |i|
+          shoes_index.add shoe.new(i+2, 'black', 'Outdoor Black')
+        end
+ 
+        shoes_search.facets(:color).should == { 'black' => 1000 }
+        shoes_search.facets(:color, filter: 'black').should == { 'black' => 1000 }
+        
+        # But then, over 1000 the count is only a very rough estimate.
+        #
+        500.times do |i|
+          shoes_index.add shoe.new(i+1001, 'black', 'Outdoor Black')
+        end
+        
+        shoes_search.facets(:color).should == { 'black' => 1500 }
+        shoes_search.facets(:color, filter: 'black').should == { 'black' => 2000 }
+      end
+    end
+    
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 4.15.1
+  version: 4.16.0
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.15.1
+        version: 4.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.15.1
+        version: 4.16.0
 - !ruby/object:Gem::Dependency
   name: text
   requirement: !ruby/object:Gem::Requirement