picky 4.0.0pre2 → 4.0.0pre3

data/lib/picky/indexers/base.rb

@@ -20,21 +20,22 @@ module Picky
       # Starts the indexing process.
       #
       def prepare categories, scheduler = Scheduler.new
-        check_source
+        source_for_prepare = source
+        check source_for_prepare
         categories.empty
-        process categories, scheduler do |prepared_file|
+        process source_for_prepare, categories, scheduler do |prepared_file|
           notify_finished prepared_file
         end
       end
 
       # Explicitly reset the source to avoid caching trouble.
       #
-      def reset_source
+      def reset source
         source.reset      if source.respond_to?(:reset)
         source.reconnect! if source.respond_to?(:reconnect!)
       end
 
-      def check_source # :nodoc:
+      def check source # :nodoc:
         raise "Trying to index without a source for #{@index_or_category.name}." unless source
       end
 

data/lib/picky/indexers/parallel.rb

@@ -15,7 +15,7 @@ module Picky
       # Parameters:
       #  * categories: An Enumerable of Category-s.
       #
-      def process categories, scheduler = Scheduler.new
+      def process source_for_prepare, categories, scheduler = Scheduler.new
         # Prepare a combined object - array.
         #
         combined = categories.map do |category|
@@ -26,9 +26,9 @@ module Picky
         #
         objects = []
 
-        reset_source
+        reset source_for_prepare
 
-        source.each do |object|
+        source_for_prepare.each do |object|
 
           # Accumulate objects.
           #

data/lib/picky/indexers/serial.rb

@@ -16,7 +16,7 @@ module Picky
       # Parameters:
       #  * categories: An enumerable of Category-s.
       #
-      def process categories, scheduler = Scheduler.new
+      def process source_for_prepare, categories, scheduler = Scheduler.new
         categories.each do |category|
 
           category.prepared_index_file do |file|
@@ -25,7 +25,7 @@ module Picky
             result = []
             tokenizer = category.tokenizer
 
-            reset_source
+            reset source_for_prepare
 
             source.harvest(category) do |*data|
 

data/lib/picky/wrappers/bundle/location.rb

@@ -40,7 +40,7 @@ module Picky
           # Save the config, then dump normally.
           #
           def dump
-            bundle[:location_anchor] = @calculation.anchor
+            bundle['location_anchor'] = @calculation.anchor
 
             bundle.dump
           end
@@ -50,10 +50,8 @@ module Picky
           def load
             bundle.load
 
-            # TODO Symbols (of the location_anchor!!!).
-            # It should always be a Symbol.
-            #
-            @calculation.anchor = bundle['location_anchor'] && bundle['location_anchor'].to_f || raise("Configuration 'location_anchor' for #{bundle.identifier} missing. Did you run rake index already?")
+            location_anchor     = bundle['location_anchor']
+            @calculation.anchor = location_anchor && location_anchor.to_f || raise("Configuration 'location_anchor' for #{bundle.identifier} missing. Did you run rake index already?")
           end
 
         end

data/spec/functional/backends/redis_bundle_realtime_spec.rb

@@ -14,7 +14,7 @@ describe Picky::Bundle do
                                         @weights,
                                         @partial,
                                         @similarity,
-                                        backend: Picky::Backends::Redis.new(immediate: true)
+                                        backend: Picky::Backends::Redis.new(realtime: true)
   end
 
   it 'is by default an SQLite Array' do

data/spec/functional/backends/redis_spec.rb

@@ -129,12 +129,14 @@ describe Picky::Backends::Redis do
 
       books.search('title').ids.should == []
     end
-    it 'handles dumping and loading' do
-      data.dump
-      data.load
-
-      books.search('title').ids.should == [1]
-    end
+    # TODO
+    #
+    # it 'handles dumping and loading' do
+    #   data.dump
+    #   data.load
+    #
+    #   books.search('title').ids.should == [1]
+    # end
   end
 
   context 'to_s key format' do
@@ -164,4 +166,25 @@ describe Picky::Backends::Redis do
     end
   end
 
+  describe 'special case' do
+    before(:each) do
+      data.key_format :to_i
+      data.backend described_class.new
+      data.clear
+    end
+    it 'handles direct manipulation and []= correctly' do
+      data.each_category do |category|
+        category.exact.dump
+        category.exact.load
+        category.exact.inverted['test'] = [1, 2, 3]
+        category.exact.inverted['test'] = [4, 5, 6]
+        category.exact.inverted['test'].should == ["4", "5", "6"]
+        category.exact.inverted['test'].delete "5"
+        category.exact.inverted['test'].should == ["4", "6"]
+        category.exact.inverted['test'].unshift "3"
+        category.exact.inverted['test'].should == ["3", "4", "6"]
+      end
+    end
+  end
+
 end

data/spec/functional/backends/special_spec.rb

@@ -0,0 +1,229 @@
+# encoding: utf-8
+#
+require 'spec_helper'
+
+# To test the interface definition.
+#
+class BackendInterfaceTester < Picky::Backends::Backend
+  def create_inverted _
+    InternalBackendInterfaceTester.new
+  end
+  def create_weights _
+    InternalBackendInterfaceTester.new
+  end
+  def create_similarity _
+    InternalBackendInterfaceTester.new
+  end
+  def create_configuration _
+    InternalBackendInterfaceTester.new
+  end
+  def create_realtime _
+    InternalBackendInterfaceTester.new
+  end
+end
+class InternalBackendInterfaceTester
+
+  def initialize
+    @hash = {}
+  end
+
+  def initial
+    self
+  end
+
+  def empty
+    self
+  end
+
+  def [] key
+    @hash[key]
+  end
+
+  def []= key, value
+    @hash[key] = value
+  end
+
+  def clear
+    @hash.clear
+  end
+
+  def delete key
+    @hash.delete key
+  end
+
+  # dump/load
+  #
+
+  def dump _
+
+  end
+
+  def load
+    self
+  end
+
+end
+
+# Describes a Picky index that uses the Memory backend
+# for data storage.
+#
+describe BackendInterfaceTester do
+
+  class Book
+    attr_reader :id, :title, :author
+    def initialize id, title, author
+      @id, @title, @author = id, title, author
+    end
+  end
+
+  attr_reader :data, :books
+
+  let(:data) do
+    Picky::Index.new(:books) do
+      source []
+      category :title, partial: Picky::Partial::Postfix.new(from: 1)
+      category :author, similarity: Picky::Generators::Similarity::DoubleMetaphone.new(3)
+    end
+  end
+  let(:books) { Picky::Search.new data }
+
+  its_to_s = ->(*) 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
+
+      books.search('title').ids.should == []
+    end
+    it 'handles dumping and loading' do
+      data.dump
+      data.load
+
+      books.search('title').ids.should == ['1']
+    end
+  end
+
+  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
+
+      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_to_i
+    end
+  end
+
+end

data/spec/functional/backends/sqlite_bundle_realtime_spec.rb

@@ -14,7 +14,7 @@ describe Picky::Bundle do
                                         @weights,
                                         @partial,
                                         @similarity,
-                                        backend: Picky::Backends::SQLite.new(self_indexed: true)
+                                        backend: Picky::Backends::SQLite.new(realtime: true)
   end
 
   it 'is by default an SQLite Array' do

data/spec/functional/backends/sqlite_spec.rb

@@ -92,7 +92,7 @@ describe Picky::Backends::SQLite do
 
   context 'immediately indexing backend (no dump needed)' do
     before(:each) do
-      data.backend described_class.new(self_indexed: true)
+      data.backend described_class.new(realtime: true)
       data.clear
 
       data.add Book.new(1, 'title', 'author')

data/spec/lib/backends/backend_spec.rb

@@ -4,34 +4,50 @@ describe Picky::Backends::Backend do
 
   let(:backend) { described_class.new }
 
-  describe 'extract_lambda_or' do
-    it 'returns a given non-lambda' do
-      backend.extract_lambda_or(:thing).should == :thing
-    end
-    it 'calls a given lambda with the given args' do
-      lam = ->() do
-        :lam
-      end
+  describe 'weight' do
+    it 'delegates to the parameter' do
+      combinations = stub :combinations
 
-      backend.extract_lambda_or(lam).should == :lam
-    end
-    it 'calls a given lambda with the given args' do
-      lam = ->(arg1) do
-        arg1.should == 1
-        :lam
-      end
+      combinations.should_receive(:score).once.with()
 
-      backend.extract_lambda_or(lam, 1).should == :lam
+      backend.weight combinations
     end
-    it 'calls a given lambda with the given args' do
-      lam = ->(arg1, arg2) do
-        arg1.should == 1
-        arg2.should == 2
-        :lam
-      end
-
-      backend.extract_lambda_or(lam, 1, 2).should == :lam
+  end
+
+  describe 'to_s' do
+    it 'is correct' do
+      backend.to_s.should == 'Picky::Backends::Backend'
     end
   end
 
+  # describe 'extract_lambda_or' do
+  #   it 'returns a given non-lambda' do
+  #     backend.extract_lambda_or(:thing).should == :thing
+  #   end
+  #   it 'calls a given lambda with the given args' do
+  #     lam = ->() do
+  #       :lam
+  #     end
+  #
+  #     backend.extract_lambda_or(lam).should == :lam
+  #   end
+  #   it 'calls a given lambda with the given args' do
+  #     lam = ->(arg1) do
+  #       arg1.should == 1
+  #       :lam
+  #     end
+  #
+  #     backend.extract_lambda_or(lam, 1).should == :lam
+  #   end
+  #   it 'calls a given lambda with the given args' do
+  #     lam = ->(arg1, arg2) do
+  #       arg1.should == 1
+  #       arg2.should == 2
+  #       :lam
+  #     end
+  #
+  #     backend.extract_lambda_or(lam, 1, 2).should == :lam
+  #   end
+  # end
+
 end

data/spec/lib/backends/file_spec.rb

@@ -2,31 +2,31 @@ require 'spec_helper'
 
 describe Picky::Backends::File do
 
-  context 'with options' do
-    before(:each) do
-      @backend = described_class.new inverted:      Picky::Backends::File::Basic.new(:unimportant),
-                                     weights:       Picky::Backends::File::Basic.new(:unimportant),
-                                     similarity:    Picky::Backends::File::Basic.new(:unimportant),
-                                     configuration: Picky::Backends::File::Basic.new(:unimportant)
-
-      @backend.stub! :timed_exclaim
-    end
-  
-    describe 'create_...' do
-      [
-        [:inverted,      Picky::Backends::File::Basic],
-        [:weights,       Picky::Backends::File::Basic],
-        [:similarity,    Picky::Backends::File::Basic],
-        [:configuration, Picky::Backends::File::Basic]
-      ].each do |type, kind|
-        it "creates and returns a(n) #{type} index" do
-          @backend.send(:"create_#{type}",
-                        stub(type, :index_path => "spec/test_directory/index/test/some_index/some_category_some_bundle_#{type}")
-          ).should be_kind_of(kind)
-        end
-      end
-    end
-  end
+  # context 'with options' do
+  #   before(:each) do
+  #     @backend = described_class.new inverted:      Picky::Backends::File::Basic.new(:unimportant),
+  #                                    weights:       Picky::Backends::File::Basic.new(:unimportant),
+  #                                    similarity:    Picky::Backends::File::Basic.new(:unimportant),
+  #                                    configuration: Picky::Backends::File::Basic.new(:unimportant)
+  #
+  #     @backend.stub! :timed_exclaim
+  #   end
+  #
+  #   describe 'create_...' do
+  #     [
+  #       [:inverted,      Picky::Backends::File::Basic],
+  #       [:weights,       Picky::Backends::File::Basic],
+  #       [:similarity,    Picky::Backends::File::Basic],
+  #       [:configuration, Picky::Backends::File::Basic]
+  #     ].each do |type, kind|
+  #       it "creates and returns a(n) #{type} index" do
+  #         @backend.send(:"create_#{type}",
+  #                       stub(type, :index_path => "spec/test_directory/index/test/some_index/some_category_some_bundle_#{type}")
+  #         ).should be_kind_of(kind)
+  #       end
+  #     end
+  #   end
+  # end
 
   context 'without options' do
     before(:each) do

data/spec/lib/backends/memory_spec.rb

@@ -2,57 +2,57 @@ require 'spec_helper'
 
 describe Picky::Backends::Memory do
 
-  context 'with options' do
-    before(:each) do
-      @backend = described_class.new inverted:      Picky::Backends::Memory::Marshal.new(:unimportant),
-                                     weights:       Picky::Backends::Memory::Marshal.new(:unimportant),
-                                     similarity:    Picky::Backends::Memory::JSON.new(:unimportant),
-                                     configuration: Picky::Backends::Memory::Marshal.new(:unimportant)
-
-      @backend.stub! :timed_exclaim
-    end
-  
-    describe 'create_...' do
-      [
-        [:inverted,      Picky::Backends::Memory::Marshal],
-        [:weights,       Picky::Backends::Memory::Marshal],
-        [:similarity,    Picky::Backends::Memory::JSON],
-        [:configuration, Picky::Backends::Memory::Marshal]
-      ].each do |type, kind|
-        it "creates and returns a(n) #{type} index" do
-          @backend.send(:"create_#{type}",
-                        stub(type, :index_path => "spec/test_directory/index/test/some_index/some_category_some_bundle_#{type}")
-          ).should be_kind_of(kind)
-        end
-      end
-    end
-  end
-  
-  context 'with lambda options' do
-    before(:each) do
-      @backend = described_class.new inverted:      ->(bundle){ Picky::Backends::Memory::Marshal.new(bundle.index_path(:inverted)) },
-                                     weights:       ->(bundle){ Picky::Backends::Memory::Marshal.new(bundle.index_path(:weights)) },
-                                     similarity:    ->(bundle){ Picky::Backends::Memory::JSON.new(bundle.index_path(:similarity)) },
-                                     configuration: ->(bundle){ Picky::Backends::Memory::Marshal.new(bundle.index_path(:configuration)) }
-
-      @backend.stub! :timed_exclaim
-    end
-  
-    describe 'create_...' do
-      [
-        [:inverted,      Picky::Backends::Memory::Marshal],
-        [:weights,       Picky::Backends::Memory::Marshal],
-        [:similarity,    Picky::Backends::Memory::JSON],
-        [:configuration, Picky::Backends::Memory::Marshal]
-      ].each do |type, kind|
-        it "creates and returns a(n) #{type} index" do
-          to_a_able_stub = Object.new
-          to_a_able_stub.stub! :index_path => "spec/test_directory/index/test/some_index/some_category_some_bundle_#{type}"
-          @backend.send(:"create_#{type}", to_a_able_stub).should be_kind_of(kind)
-        end
-      end
-    end
-  end
+  # context 'with options' do
+  #   before(:each) do
+  #     @backend = described_class.new inverted:      Picky::Backends::Memory::Marshal.new(:unimportant),
+  #                                    weights:       Picky::Backends::Memory::Marshal.new(:unimportant),
+  #                                    similarity:    Picky::Backends::Memory::JSON.new(:unimportant),
+  #                                    configuration: Picky::Backends::Memory::Marshal.new(:unimportant)
+  #
+  #     @backend.stub! :timed_exclaim
+  #   end
+  #
+  #   describe 'create_...' do
+  #     [
+  #       [:inverted,      Picky::Backends::Memory::Marshal],
+  #       [:weights,       Picky::Backends::Memory::Marshal],
+  #       [:similarity,    Picky::Backends::Memory::JSON],
+  #       [:configuration, Picky::Backends::Memory::Marshal]
+  #     ].each do |type, kind|
+  #       it "creates and returns a(n) #{type} index" do
+  #         @backend.send(:"create_#{type}",
+  #                       stub(type, :index_path => "spec/test_directory/index/test/some_index/some_category_some_bundle_#{type}")
+  #         ).should be_kind_of(kind)
+  #       end
+  #     end
+  #   end
+  # end
+  #
+  # context 'with lambda options' do
+  #   before(:each) do
+  #     @backend = described_class.new inverted:      ->(bundle){ Picky::Backends::Memory::Marshal.new(bundle.index_path(:inverted)) },
+  #                                    weights:       ->(bundle){ Picky::Backends::Memory::Marshal.new(bundle.index_path(:weights)) },
+  #                                    similarity:    ->(bundle){ Picky::Backends::Memory::JSON.new(bundle.index_path(:similarity)) },
+  #                                    configuration: ->(bundle){ Picky::Backends::Memory::Marshal.new(bundle.index_path(:configuration)) }
+  #
+  #     @backend.stub! :timed_exclaim
+  #   end
+  #
+  #   describe 'create_...' do
+  #     [
+  #       [:inverted,      Picky::Backends::Memory::Marshal],
+  #       [:weights,       Picky::Backends::Memory::Marshal],
+  #       [:similarity,    Picky::Backends::Memory::JSON],
+  #       [:configuration, Picky::Backends::Memory::Marshal]
+  #     ].each do |type, kind|
+  #       it "creates and returns a(n) #{type} index" do
+  #         to_a_able_stub = Object.new
+  #         to_a_able_stub.stub! :index_path => "spec/test_directory/index/test/some_index/some_category_some_bundle_#{type}"
+  #         @backend.send(:"create_#{type}", to_a_able_stub).should be_kind_of(kind)
+  #       end
+  #     end
+  #   end
+  # end
 
   context 'without options' do
     before(:each) do