picky 3.1.10 → 3.1.11

data/lib/picky/category_realtime.rb

@@ -19,7 +19,7 @@ module Picky
         text = text.to_sym
         indexed_exact.add id, text
 
-        # TODO Beautify.
+        # TODO Refactor.
         #
         indexed_partial.partial_strategy.each_partial text do |partial_text|
           indexed_partial.add id, partial_text

data/lib/picky/indexed/bundle_realtime.rb

@@ -16,9 +16,12 @@ module Picky
           ids = @inverted[sym]
           ids.delete id
 
+          encoded = self.similarity_strategy.encoded sym
+
           if ids.empty?
-            @inverted.delete sym
-            @weights.delete  sym
+            @inverted.delete   sym
+            @weights.delete    sym
+            @similarity.delete encoded # Since no element uses this sym anymore, we can delete the similarity for it.
           else
             @weights[sym] = self.weights_strategy.weight_for ids.size
           end
@@ -35,6 +38,8 @@ module Picky
         syms = @realtime_mapping[id]
         syms = (@realtime_mapping[id] = []) unless syms # TODO Nicefy.
 
+        # Inverted.
+        #
         ids = if syms.include? sym
           ids = @inverted[sym]
           ids.delete  id # Move id
@@ -45,7 +50,21 @@ module Picky
           inverted.unshift id
         end
 
+        # Weights.
+        #
         @weights[sym] = self.weights_strategy.weight_for ids.size
+
+        # Similarity.
+        #
+        if encoded = self.similarity_strategy.encoded(sym)
+          similarity = @similarity[encoded] ||= []
+          if similarity.include? sym
+            similarity.delete sym  # Not completely correct, as others will also be affected, but meh.
+            similarity.unshift sym #
+          else
+            similarity.unshift sym
+          end
+        end
       end
 
     end

data/spec/lib/indexed/bundle_realtime_spec.rb

@@ -8,7 +8,7 @@ describe Picky::Indexed::Bundle do
     
     @weights      = Picky::Generators::Weights::Default
     @partial      = Picky::Generators::Partial::Default
-    @similarity   = stub :similarity
+    @similarity   = Picky::Generators::Similarity::DoubleMetaphone.new 3
     @bundle       = described_class.new :some_name, @category, Picky::Backends::Memory.new, @weights, @partial, @similarity
   end
   
@@ -21,6 +21,9 @@ describe Picky::Indexed::Bundle do
   it 'is by default empty' do
     @bundle.inverted.should == {}
   end
+  it 'is by default empty' do
+    @bundle.similarity.should == {}
+  end
   
   describe 'combined' do
     it 'works correctly' do
@@ -29,7 +32,8 @@ describe Picky::Indexed::Bundle do
       
       @bundle.realtime_mapping.should == { 1 => [:title], 2 => [:title] }
       @bundle.inverted.should == { :title => [2,1] }
-      @bundle.weights.should  == { :title => 0.6931471805599453 }
+      @bundle.weights.should == { :title => 0.6931471805599453 }
+      @bundle.similarity.should == { :TTL => [:title] }
     end
     it 'works correctly' do
       @bundle.add 1, :title
@@ -38,8 +42,9 @@ describe Picky::Indexed::Bundle do
       @bundle.remove 2
       
       @bundle.realtime_mapping.should == {}
-      @bundle.weights.should  == {}
+      @bundle.weights.should == {}
       @bundle.inverted.should == {}
+      @bundle.similarity.should == {}
     end
     it 'works correctly' do
       @bundle.add 1, :title
@@ -48,8 +53,9 @@ describe Picky::Indexed::Bundle do
       @bundle.remove 1
       
       @bundle.realtime_mapping.should == {}
-      @bundle.weights.should  == {}
+      @bundle.weights.should == {}
       @bundle.inverted.should == {}
+      @bundle.similarity.should == {}
     end
     it 'works correctly' do
       @bundle.add 1, :title
@@ -58,8 +64,9 @@ describe Picky::Indexed::Bundle do
       @bundle.remove 1
       
       @bundle.realtime_mapping.should == { 2 => [:thing] }
-      @bundle.weights.should  == { :thing => 0.0 }
+      @bundle.weights.should == { :thing => 0.0 }
       @bundle.inverted.should == { :thing => [2] }
+      @bundle.similarity.should == { :"0NK" => [:thing] }
     end
     it 'works correctly' do
       @bundle.add 1, :title
@@ -68,6 +75,7 @@ describe Picky::Indexed::Bundle do
       @bundle.realtime_mapping.should == { 1 => [:title] }
       @bundle.weights.should  == { :title => 0.0 }
       @bundle.inverted.should == { :title => [1] }
+      @bundle.similarity.should  == { :TTL => [:title] }
     end
     it 'works correctly' do
       @bundle.add 1, :title
@@ -77,6 +85,7 @@ describe Picky::Indexed::Bundle do
       @bundle.realtime_mapping.should == {}
       @bundle.weights.should  == {}
       @bundle.inverted.should == {}
+      @bundle.similarity.should == {}
     end
   end
   
@@ -97,8 +106,9 @@ describe Picky::Indexed::Bundle do
     it 'works correctly' do
       @bundle.add 1, :title
       
-      @bundle.weights.should  == { :title => 0.0 }
+      @bundle.weights.should == { :title => 0.0 }
       @bundle.inverted.should == { :title => [1] }
+      @bundle.similarity.should == { :TTL => [:title] }
     end
   end
   

data/spec/specific/realtime_spec.rb

@@ -11,7 +11,13 @@ describe "Realtime Indexing" do
     end
   end
   
-  let(:index) { Picky::Index.new(:test) { source []; category :title; category :author } }
+  let(:index) do
+    Picky::Index.new(:test) do
+      source []
+      category :title
+      category :author, similarity: Picky::Generators::Similarity::DoubleMetaphone.new(3)
+    end
+  end
   let(:books) { Picky::Search.new index }
   
   before(:each) do
@@ -120,11 +126,74 @@ describe "Realtime Indexing" do
     it 'handles more complex cases' do
       index.remove 1
       
-      books.search('Title"').ids.should == []
+      books.search('Titl').ids.should == []
       
       index.replace Book.new(1, "Title New", "Author New")
 
-      books.search('title:New"').ids.should == [1]
+      books.search('title:Ne').ids.should == [1]
+    end
+  end
+  
+  context 'similarity' do
+    it 'finds the first entry' do
+      books.search('Authr~').ids.should == [1]
+    end
+
+    it 'allows removing something' do
+      index.remove 1
+    end
+    it 'is not findable anymore after removing' do
+      books.search('Authr~').ids.should == [1]
+
+      index.remove 1
+
+      books.search('Authr~').ids.should == []
+    end
+
+    it 'allows adding something' do
+      index.add Book.new(2, "Title2", "Author2")
+    end
+    it 'is findable after adding' do
+      books.search('Authr~').ids.should == [1]
+
+      index.add Book.new(2, "Title New", "Author New")
+
+      books.search('Authr~').ids.should == [2,1]
+    end
+
+    it 'allows replacing something' do
+      index.replace Book.new(1, "Title New", "Author New")
+    end
+    it 'is findable after replacing' do
+      books.search('Nuw~').ids.should == []
+
+      index.replace Book.new(1, "Title New", "Author New")
+
+      books.search('Nuw~').ids.should == [1, 1] # TODO FIXME Not really what I'd expect.
+    end
+    it 'handles more complex cases' do
+      books.search('Now~').ids.should == []
+
+      index.replace Book.new(1, "Title New", "Author New")
+
+      books.search('author:Now~').ids.should == [1]
+    end
+    it 'handles more complex cases' do
+      index.remove 1
+      
+      books.search('Athr~').ids.should == []
+      
+      index.replace Book.new(1, "Title New", "Author New")
+
+      books.search('author:Athr~').ids.should == [1]
+    end
+    it 'handles more complex cases' do
+      books.search('Athr~').ids.should == [1]
+      
+      index.replace Book.new(2, "Title New", "Author New")
+      index.add Book.new(3, "TTL", "AUTHR")
+
+      books.search('author:Athr~').ids.should == [2, 1, 3] # TODO Is that what I'd expect?
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 3.1.10
+  version: 3.1.11
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable: picky
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70166319035880 !ruby/object:Gem::Requirement
+  requirement: &70264818405600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,18 +22,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166319035880
+  version_requirements: *70264818405600
 - !ruby/object:Gem::Dependency
   name: picky-client
-  requirement: &70166319034820 !ruby/object:Gem::Requirement
+  requirement: &70264818404920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 3.1.10
+        version: 3.1.11
   type: :development
   prerelease: false
-  version_requirements: *70166319034820
+  version_requirements: *70264818404920
 description: Fast Ruby semantic text search engine with comfortable single field interface.
 email: florian.hanke+picky@gmail.com
 executables: