picky 4.5.9 → 4.5.10

data/lib/picky/query/tokens.rb

@@ -8,7 +8,7 @@ module Picky
     #
     class Tokens
 
-      attr_reader :ignore_unassigned
+      attr_reader :tokens, :ignore_unassigned
 
       # Basically delegates to its internal tokens array.
       #
@@ -74,10 +74,20 @@ module Picky
       def originals
         @tokens.map(&:original)
       end
-
+      
+      #
+      #
       def == other
         self.tokens == other.tokens
       end
+      
+      # Non destructive.
+      #
+      # TODO Make destructive?
+      #
+      def + other
+        self.class.new (@tokens + other.tokens), (self.ignore_unassigned || other.ignore_unassigned)
+      end
 
       # Just join the token original texts.
       #

data/lib/picky/search_facets.rb

@@ -17,10 +17,24 @@ module Picky
     def facets category_identifier, options = {}
       raise "#{__method__} cannot be used on searches with more than 1 index yet. Sorry!" if indexes.size > 1
       index = indexes.first
+      
+      # Get index-specific facet weights.
+      #
       weights = index.facets category_identifier, options
+      
+      # We're done if there is no filter.
+      #
       return weights unless filter_query = options[:filter]
+      
+      # Pre-tokenize filter for reuse.
+      #
+      tokenized_filter = tokenized filter_query
+      
+      # Filter out impossible facets.
+      #
       weights.select do |key, weight|
-        search("#{filter_query} #{category_identifier}:#{key}", 0, 0).total > 0
+        tokenized_query = tokenized "#{category_identifier}:#{key}"
+        search_with(tokenized_filter + tokenized_query, 0, 0).total > 0
       end
     end
 

data/spec/functional/facets_spec.rb

@@ -116,6 +116,11 @@ describe 'facets' do
     end
   
     describe 'facets' do
+      it 'is fast enough' do
+        performance_of {
+          10.times { finder.facets(:age_category, filter: 'surname:meier name:peter') }
+        }.should < 0.0025
+      end
       it 'filters them correctly' do
         # It has one facet.
         #

data/spec/lib/query/tokens_spec.rb

@@ -208,6 +208,23 @@ describe Picky::Query::Tokens do
       @tokens.to_s.should == 'Hello~ I~ Am A* Token~'
     end
   end
+  
+  describe '+' do
+    before(:each) do
+      @tokens = described_class.new [
+        Picky::Query::Token.processed('hello~', 'Hello~'),
+        Picky::Query::Token.processed('i~', 'I~')
+      ]
+      @other = described_class.new [
+        Picky::Query::Token.processed('am', 'Am'),
+        Picky::Query::Token.processed('a*', 'A*'),
+        Picky::Query::Token.processed('token~', 'Token~')
+      ]
+    end
+    it 'should work correctly' do
+      (@tokens + @other).to_s.should == 'Hello~ I~ Am A* Token~'
+    end
+  end
 
   def self.it_should_delegate name
     describe name do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 4.5.9
+  version: 4.5.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-21 00:00:00.000000000 Z
+date: 2012-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70136712695580 !ruby/object:Gem::Requirement
+  requirement: &70099253389300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70136712695580
+  version_requirements: *70099253389300
 - !ruby/object:Gem::Dependency
   name: picky-client
-  requirement: &70136712694400 !ruby/object:Gem::Requirement
+  requirement: &70099253388340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.5.9
+        version: 4.5.10
   type: :development
   prerelease: false
-  version_requirements: *70136712694400
+  version_requirements: *70099253388340
 - !ruby/object:Gem::Dependency
   name: text
-  requirement: &70136712708560 !ruby/object:Gem::Requirement
+  requirement: &70099253386400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70136712708560
+  version_requirements: *70099253386400
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70136712705380 !ruby/object:Gem::Requirement
+  requirement: &70099253385580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70136712705380
+  version_requirements: *70099253385580
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70136712703480 !ruby/object:Gem::Requirement
+  requirement: &70099253400520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70136712703480
+  version_requirements: *70099253400520
 - !ruby/object:Gem::Dependency
   name: procrastinate
-  requirement: &70136712720160 !ruby/object:Gem::Requirement
+  requirement: &70099253398380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70136712720160
+  version_requirements: *70099253398380
 - !ruby/object:Gem::Dependency
   name: rack_fast_escape
-  requirement: &70136712718840 !ruby/object:Gem::Requirement
+  requirement: &70099253396680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70136712718840
+  version_requirements: *70099253396680
 description: Fast Ruby semantic text search engine with comfortable single field interface.
 email: florian.hanke+picky@gmail.com
 executables: