picky 4.25.0 → 4.25.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d83031c692b720f4c0e208135d1a9132865f6db8
-  data.tar.gz: da41d6d9de9c1762e83aee7c8bb3e62447e24934
+  metadata.gz: 44a3b70f33fe644a7c9ab0cc519af8c182cf09c3
+  data.tar.gz: e74d3117c847a410ef852ad9d850179327cd0b97
 SHA512:
-  metadata.gz: f119107151b6848085eb65eb0cf1c52c4d30bcff59f05bf37c09599007f16d8394bec8fbdeecf0b80ae1465c75496789169055d84ff507f4be632fa21b085b32
-  data.tar.gz: 9ab9540294fb221af016c379eff38486b96f9b0752428ed88e0dad44d60748de52f8d13c0172f99e2ebe503f82c6e81a053c130071efbeae6af315858ab6adf7
+  metadata.gz: d1da0628b51f4678f645d25dc637208ab508b580d1fbe33e7609538df2b322626cddd48bf85283b2f05ec374f1c37af16bf141d7421b7178a9ec6aa2f3bf067b
+  data.tar.gz: 2d28bbc6d9d95e11fd2829ad6d6695746ee3b273b298826420311eeb7005087c4c28cd3f5e10a9c3fb8fe143dbb857e231f685247f059d06c108c03948c16f4a

data/lib/picky/query/token.rb

@@ -11,7 +11,7 @@ module Picky
     #
     class Token
       
-      attr_reader :text, :original
+      attr_accessor :text, :original
       attr_writer :similar
       attr_writer :predefined_categories
       

data/lib/picky/search_facets.rb

@@ -40,7 +40,8 @@ module Picky
       # key_token = Query::Token.new ''
       # key_token.predefined_categories = [index[category_identifier]]
       #
-      key_token = Query::Token.new '', nil, predefined_categories
+      empty = @symbol_keys ? :'' : ''
+      key_token = Query::Token.new empty, nil, predefined_categories
       
       # Pre-tokenize filter for reuse.
       #
@@ -55,9 +56,13 @@ module Picky
       # Get actual counts.
       #
       if no_counts
-        facets_without_counts counts, minimal_counts, tokenized_filter_query, key_token.text, options
+        facets_without_counts counts, minimal_counts, tokenized_filter_query, options do |last_text|
+          key_token.text = last_text # TODO Why is this necessary?
+        end
       else
-        facets_with_counts    counts, minimal_counts, tokenized_filter_query, key_token.text, options
+        facets_with_counts counts, minimal_counts, tokenized_filter_query, key_token.text, options do |last_text|
+          key_token.text = last_text # TODO Why is this necessary?
+        end
       end
     end
     def facets_without_counts counts, minimal_counts, tokenized_filter_query, last_token_text, options = {}
@@ -66,7 +71,9 @@ module Picky
         # is the only information that changes in between
         # queries.
         #
-        last_token_text.replace key
+        # Note: DOes not use replace anymore.
+        #
+        yield key
         
         # Calculate up to 1000 facets using unique to show correct facet counts.
         # TODO Redesign and deoptimize the whole process.
@@ -83,7 +90,7 @@ module Picky
         # is the only information that changes in between
         # queries.
         #
-        last_token_text.replace key
+        yield key
         
         # Calculate up to 1000 facets using unique to show correct facet counts.
         # TODO Redesign and deoptimize the whole process.

data/spec/functional/facets_spec.rb

@@ -226,4 +226,85 @@ describe 'facets' do
     end
     
   end
+  
+  describe 'simple example with symbols' do
+    let(:index) {
+      index = Picky::Index.new :facets do
+        symbol_keys true
+        category :name, partial: Picky::Partial::Substring.new(from: 1)
+        category :surname
+      end
+
+      thing = Struct.new :id, :name, :surname
+      index.add thing.new(1, 'fritz', 'hanke')
+      index.add thing.new(2, 'kaspar', 'schiess')
+      index.add thing.new(3, 'florian', 'hanke')
+    
+      index
+    }
+    let(:finder) do
+      Picky::Search.new(index) { symbol_keys }
+    end
+    
+    describe 'Index#facets' do
+      it 'is correct' do
+        # Picky has 2 facets with different counts for surname.
+        #
+        index.facets(:surname).should == {
+          hanke: 2,
+          schiess: 1
+        }
+    
+        # It has 3 facets with the same count for name.
+        #
+        index.facets(:name).should == {
+          fritz: 1,
+          kaspar: 1,
+          florian: 1
+        }
+        
+        # Picky only selects facets with a count >= the given one.
+        #
+        index.facets(:surname, at_least: 2).should == {
+          hanke: 2
+        }
+      end
+    end
+  
+    describe 'Search#facets' do
+      it 'filters them correctly' do
+        # Passing in no filter query just returns the facets
+        #
+        finder.facets(:surname).should == {
+          hanke: 2,
+          schiess: 1
+        }
+        
+        # It has two facets.
+        #
+        finder.facets(:name, filter: 'surname:hanke').should == {
+          fritz: 1,
+          florian: 1
+        }
+        
+        # It only uses exact matches (ie. the last token is not partialized).
+        #
+        finder.facets(:name, filter: 'surname:hank').should == {}
+        
+        # It allows explicit partial matches.
+        #
+        finder.facets(:name, filter: 'surname:hank*').should == {
+          fritz: 1,
+          florian: 1
+        }
+        
+        # It allows explicit partial matches.
+        #
+        finder.facets(:name, filter: 'surname:hank*').should == {
+          fritz: 1,
+          florian: 1
+        }
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 4.25.0
+  version: 4.25.1
 platform: ruby
 authors:
 - Florian Hanke