picky 4.0.0pre1 → 4.0.0pre2

data/spec/ext/performant_spec.rb

@@ -1,21 +1,21 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Performant::Array do
-  
+
   describe "memory_efficient_intersect" do
     it "should intersect empty arrays correctly" do
       arys = [[3,4], [1,2,3], []]
-    
+
       Performant::Array.memory_efficient_intersect(arys).should == []
     end
     it "should handle intermediate empty results correctly" do
       arys = [[5,4], [1,2,3], [3,4,5,8,9]]
-    
+
       Performant::Array.memory_efficient_intersect(arys).should == []
     end
     it "should intersect correctly" do
       arys = [[3,4], [1,2,3], [3,4,5,8,9]]
-    
+
       Performant::Array.memory_efficient_intersect(arys).should == [3]
     end
     it "should intersect correctly again" do
@@ -24,24 +24,24 @@ describe Performant::Array do
     end
     it "should intersect many arrays" do
       arys = [[3,4,5,6,7], [1,2,3,5,6,7], [3,4,5,6,7,8,9], [1,2,3,4,5,6,7,8,9,10], [2,3,5,6,7,19], [1,2,3,4,5,6,7,8,9,10], [2,3,5,6,7,19]]
-    
+
       Performant::Array.memory_efficient_intersect(arys).should == [3,5,6,7]
     end
     it "should handle random arrays" do
       proto = Array.new(100, 3_500_000)
       arys = [proto.map { |e| rand e }, proto.map { |e| rand e }, proto.map { |e| rand e }]
-    
+
       Performant::Array.memory_efficient_intersect(arys).should == arys.inject(arys.shift.dup) { |total, ary| total & arys }
     end
     it "should be optimal for 2 small arrays of 50/10_000" do
       arys = [(1..50).to_a, (10_000..20_000).to_a << 7]
-    
+
       # brute force
       performance_of { Performant::Array.memory_efficient_intersect(arys) }.should < 0.001
     end
     it "should be optimal for 2 small arrays of 50/10_000" do
       arys = [(1..50).to_a, (10_000..20_000).to_a << 7]
-    
+
       # &
       performance_of do
         arys.inject(arys.shift.dup) do |total, ary|
@@ -50,37 +50,37 @@ describe Performant::Array do
       end.should < 0.0015
     end
   end
-  
+
   describe "memory_efficient_intersect with symbols" do
     it "should intersect empty arrays correctly" do
       arys = [[:c,:d], [:a,:b,:c], []]
-      
+
       Performant::Array.memory_efficient_intersect(arys).should == []
     end
     it "should handle intermediate empty results correctly" do
       arys = [[:e,:d], [:a,:b,:c], [:c,:d,:e,:h,:i]]
-      
+
       Performant::Array.memory_efficient_intersect(arys).should == []
     end
     it "should intersect correctly" do
       arys = [[:c,:d], [:a,:b,:c], [:c,:d,:e,:h,:i]]
-      
+
       Performant::Array.memory_efficient_intersect(arys).should == [:c]
     end
     it "should intersect many arrays" do
       arys = [[:c,:d,:e,:f,:g], [:a,:b,:c,:e,:f,:g], [:c,:d,:e,:f,:g,:h,:i], [:a,:b,:c,:d,:e,:f,:g,:h,:i,:j], [:b,:c,:e,:f,:g,:s], [:a,:b,:c,:d,:e,:f,:g,:h,:i,:j], [:b,:c,:e,:f,:g,:s]]
-      
+
       Performant::Array.memory_efficient_intersect(arys).should == [:c,:e,:f,:g]
     end
     it "should be optimal for 2 small arrays of 50/10_000" do
       arys = [(:'1'..:'50').to_a, (:'10_000'..:'20_000').to_a]
-      
+
       # brute force
       performance_of { Performant::Array.memory_efficient_intersect(arys) }.should < 0.001
     end
     it "should be optimal for 2 small arrays of 50/10_000" do
       arys = [(:'1'..:'50').to_a, (:'10_000'..:'20_000').to_a << 7]
-      
+
       # &
       performance_of do
         arys.inject(arys.shift.dup) do |total, ary|

data/spec/functional/backends/file_spec.rb

@@ -18,7 +18,6 @@ describe Picky::Backends::File do
 
   let(:data) do
     Picky::Index.new(:books) do
-      key_format :to_s # TODO Also make to_i work.
       source []
       category :title, partial: Picky::Partial::Postfix.new(from: 1)
       category :author, similarity: Picky::Generators::Similarity::DoubleMetaphone.new(3)
@@ -26,7 +25,7 @@ describe Picky::Backends::File do
   end
   let(:books) { Picky::Search.new data }
 
-  its = ->(*) do
+  its_to_s = ->(*) do
     it 'searching for it' do
       books.search('title').ids.should == ['1']
     end
@@ -82,15 +81,87 @@ describe Picky::Backends::File do
     end
   end
 
-  context 'immediately indexing backend (no dump needed)' do
-    before(:each) do
-      data.backend described_class.new
+  its_to_i = ->(*) do
+    it 'searching for it' do
+      books.search('title').ids.should == [1]
+    end
+    it 'searching for it using multiple words' do
+      books.search('title author').ids.should == [1]
+    end
+    it 'searching for it using partial' do
+      books.search('tit').ids.should == [1]
+    end
+    it 'searching for it using similarity' do
+      books.search('aothor~').ids.should == [1]
+    end
+    it 'handles removing' do
+      data.remove 1
+
+      books.search('title').ids.should == []
+    end
+    it 'handles removing with more than one entry' do
+      data.add Book.new(2, 'title', 'author')
+
+      books.search('title').ids.should == [2, 1]
+
+      data.remove 1
+
+      books.search('title').ids.should == [2]
+    end
+    it 'handles removing with three entries' do
+      data.add Book.new(2, 'title', 'author')
+      data.add Book.new(3, 'title', 'author')
+
+      books.search('title').ids.should == [3, 2, 1]
+
+      data.remove 1
+
+      books.search('title').ids.should == [3, 2]
+    end
+    it 'handles replacing' do
+      data.replace Book.new(1, 'toitle', 'oithor')
+
+      books.search('title').ids.should == []
+      books.search('toitle').ids.should == [1]
+    end
+    it 'handles clearing' do
       data.clear
 
-      data.add Book.new(1, 'title', 'author')
+      books.search('title').ids.should == []
+    end
+    it 'handles dumping and loading' do
+      data.dump
+      data.load
+
+      books.search('title').ids.should == [1]
+    end
+  end
+
+  context 'to_s key format' do
+    context 'immediately indexing backend (no dump needed)' do
+      before(:each) do
+        data.key_format :to_s
+        data.backend described_class.new
+        data.clear
+
+        data.add Book.new(1, 'title', 'author')
+      end
+
+      instance_eval &its_to_s
     end
+  end
+  context 'to_i key format' do
+    context 'immediately indexing backend (no dump needed)' do
+      before(:each) do
+        data.key_format :to_i
+        data.backend described_class.new
+        data.clear
+
+        data.add Book.new(1, 'title', 'author')
+      end
 
-    instance_eval &its
+      instance_eval &its_to_i
+    end
   end
 
 end

data/spec/functional/backends/memory_spec.rb

@@ -18,7 +18,6 @@ describe Picky::Backends::Memory do
 
   let(:data) do
     Picky::Index.new(:books) do
-      key_format :to_s # TODO Also make to_i work.
       source []
       category :title, partial: Picky::Partial::Postfix.new(from: 1)
       category :author, similarity: Picky::Generators::Similarity::DoubleMetaphone.new(3)
@@ -26,7 +25,7 @@ describe Picky::Backends::Memory do
   end
   let(:books) { Picky::Search.new data }
 
-  its = ->(*) do
+  its_to_s = ->(*) do
     it 'searching for it' do
       books.search('title').ids.should == ['1']
     end
@@ -82,15 +81,87 @@ describe Picky::Backends::Memory do
     end
   end
 
-  context 'immediately indexing backend (no dump needed)' do
-    before(:each) do
-      data.backend described_class.new
+  its_to_i = ->(*) do
+    it 'searching for it' do
+      books.search('title').ids.should == [1]
+    end
+    it 'searching for it using multiple words' do
+      books.search('title author').ids.should == [1]
+    end
+    it 'searching for it using partial' do
+      books.search('tit').ids.should == [1]
+    end
+    it 'searching for it using similarity' do
+      books.search('aothor~').ids.should == [1]
+    end
+    it 'handles removing' do
+      data.remove 1
+
+      books.search('title').ids.should == []
+    end
+    it 'handles removing with more than one entry' do
+      data.add Book.new(2, 'title', 'author')
+
+      books.search('title').ids.should == [2, 1]
+
+      data.remove 1
+
+      books.search('title').ids.should == [2]
+    end
+    it 'handles removing with three entries' do
+      data.add Book.new(2, 'title', 'author')
+      data.add Book.new(3, 'title', 'author')
+
+      books.search('title').ids.should == [3, 2, 1]
+
+      data.remove 1
+
+      books.search('title').ids.should == [3, 2]
+    end
+    it 'handles replacing' do
+      data.replace Book.new(1, 'toitle', 'oithor')
+
+      books.search('title').ids.should == []
+      books.search('toitle').ids.should == [1]
+    end
+    it 'handles clearing' do
       data.clear
 
-      data.add Book.new(1, 'title', 'author')
+      books.search('title').ids.should == []
+    end
+    it 'handles dumping and loading' do
+      data.dump
+      data.load
+
+      books.search('title').ids.should == [1]
+    end
+  end
+
+  context 'to_s key format' do
+    context 'immediately indexing backend (no dump needed)' do
+      before(:each) do
+        data.key_format :to_s
+        data.backend described_class.new
+        data.clear
+
+        data.add Book.new(1, 'title', 'author')
+      end
+
+      instance_eval &its_to_s
     end
+  end
+  context 'to_i key format' do
+    context 'immediately indexing backend (no dump needed)' do
+      before(:each) do
+        data.key_format :to_i
+        data.backend described_class.new
+        data.clear
+
+        data.add Book.new(1, 'title', 'author')
+      end
 
-    instance_eval &its
+      instance_eval &its_to_i
+    end
   end
 
 end

data/spec/functional/backends/redis_spec.rb

@@ -18,7 +18,6 @@ describe Picky::Backends::Redis do
 
   let(:data) do
     Picky::Index.new(:books) do
-      key_format :to_s # TODO Also make to_i work.
       source []
       category :title, partial: Picky::Partial::Postfix.new(from: 1)
       category :author, similarity: Picky::Generators::Similarity::DoubleMetaphone.new(3)
@@ -26,7 +25,7 @@ describe Picky::Backends::Redis do
   end
   let(:books) { Picky::Search.new data }
 
-  its = ->(*) do
+  its_to_s = ->(*) do
     it 'searching for it' do
       books.search('title').ids.should == ['1']
     end
@@ -82,26 +81,87 @@ describe Picky::Backends::Redis do
     end
   end
 
-  context 'default backend (dump needed)' do
-    before(:each) do
-      data.backend Picky::Backends::Redis.new
+  its_to_i = ->(*) do
+    it 'searching for it' do
+      books.search('title').ids.should == [1]
+    end
+    it 'searching for it using multiple words' do
+      books.search('title author').ids.should == [1]
+    end
+    it 'searching for it using partial' do
+      books.search('tit').ids.should == [1]
+    end
+    it 'searching for it using similarity' do
+      books.search('aothor~').ids.should == [1]
+    end
+    it 'handles removing' do
+      data.remove 1
+
+      books.search('title').ids.should == []
+    end
+    it 'handles removing with more than one entry' do
+      data.add Book.new(2, 'title', 'author')
+
+      books.search('title').ids.should == [2, 1]
+
+      data.remove 1
+
+      books.search('title').ids.should == [2]
+    end
+    it 'handles removing with three entries' do
+      data.add Book.new(2, 'title', 'author')
+      data.add Book.new(3, 'title', 'author')
+
+      books.search('title').ids.should == [3, 2, 1]
+
+      data.remove 1
+
+      books.search('title').ids.should == [3, 2]
+    end
+    it 'handles replacing' do
+      data.replace Book.new(1, 'toitle', 'oithor')
+
+      books.search('title').ids.should == []
+      books.search('toitle').ids.should == [1]
+    end
+    it 'handles clearing' do
       data.clear
 
-      data.add Book.new(1, 'title', 'author')
+      books.search('title').ids.should == []
     end
+    it 'handles dumping and loading' do
+      data.dump
+      data.load
 
-    instance_eval &its
+      books.search('title').ids.should == [1]
+    end
   end
 
-  context 'immediately indexing backend (no dump needed)' do
-    before(:each) do
-      data.backend Picky::Backends::Redis.new(immediate: true)
-      data.clear
+  context 'to_s key format' do
+    context 'immediately indexing backend (no dump needed)' do
+      before(:each) do
+        data.key_format :to_s
+        data.backend described_class.new
+        data.clear
+
+        data.add Book.new(1, 'title', 'author')
+      end
 
-      data.add Book.new(1, 'title', 'author')
+      instance_eval &its_to_s
     end
+  end
+  context 'to_i key format' do
+    context 'immediately indexing backend (no dump needed)' do
+      before(:each) do
+        data.key_format :to_i
+        data.backend described_class.new
+        data.clear
 
-    instance_eval &its
+        data.add Book.new(1, 'title', 'author')
+      end
+
+      instance_eval &its_to_i
+    end
   end
 
 end

data/spec/functional/dynamic_weights_spec.rb

@@ -8,10 +8,9 @@ describe "Weights" do
   #
   it 'can handle dynamic weights' do
     index = Picky::Index.new :dynamic_weights do
-      source { [] }
-      category :text1, weights: Picky::Weights::Constant.new
-      category :text2, weights: Picky::Weights::Constant.new(3.14)
-      category :text3, weights: Picky::Weights::Dynamic.new { |str_or_sym| str_or_sym.size }
+      category :text1, weight: Picky::Weights::Constant.new
+      category :text2, weight: Picky::Weights::Constant.new(3.14)
+      category :text3, weight: Picky::Weights::Dynamic.new { |str_or_sym| str_or_sym.size }
       category :text4 # Default
     end