picky 4.12.8 → 4.12.10

data/lib/picky/backends/redis/directly_manipulable.rb

@@ -19,7 +19,7 @@ module Picky
         @@append_index = 0
         def << value
           super
-          zadd value, @@append_index+=1
+          zadd value, @@append_index += 1
         end
 
         # THINK Current implementation is very brittle.

data/lib/picky/backends/redis/list.rb

@@ -38,16 +38,14 @@ module Picky
         def dump hash
           unless @realtime
             clear
-            # client.pipelined do
-              hash.each_pair do |key, values|
-                redis_key = "#{namespace}:#{key}"
-                i = 0
-                values.each do |value|
-                  i += 1
-                  client.zadd redis_key, i, value
-                end
+            hash.each_pair do |key, values|
+              redis_key = "#{namespace}:#{key}"
+              i = 0
+              values.each do |value|
+                i += 1
+                client.zadd redis_key, i, value
               end
-            # end
+            end
           end
         end
 
@@ -57,7 +55,9 @@ module Picky
         #
         def [] key
           list = client.zrange "#{namespace}:#{key}", :'0', :'-1'
+          
           DirectlyManipulable.make self, list, key
+          
           list
         end
 
@@ -72,8 +72,9 @@ module Picky
             i += 1
             client.zadd redis_key, i, value
           end
-
+          
           DirectlyManipulable.make self, values, key
+          
           values
         end
 

data/lib/picky/backends/redis.rb

@@ -61,7 +61,7 @@ module Picky
       #   [id] # => [:sym1, :sym2]
       #
       def create_realtime bundle
-        List.new client, "#{bundle.identifier}:realtime", realtime: realtime
+        List.new client, "#{PICKY_ENVIRONMENT}:#{bundle.identifier}:realtime", realtime: realtime
       end
 
       # Does the Redis version already include
@@ -137,7 +137,7 @@ module Picky
         # else
         #   class << self
         #     def weight combinations
-              combinations.score
+            combinations.score
         #     end
         #   end
         # end
@@ -217,7 +217,7 @@ module Picky
       module Scripting
         def ids combinations, amount, offset
           identifiers = combinations.inject([]) do |identifiers, combination|
-            identifiers << "#{combination.identifier}"
+            identifiers << "#{PICKY_ENVIRONMENT}:#{combination.identifier}"
           end
 
           # Assume it's using EVALSHA.

data/lib/picky/backends/sqlite/basic.rb

@@ -18,11 +18,11 @@ module Picky
 
           lazily_initialize_client
         
-        # Note: If on OSX, too many files get opened during
-        #       the specs -> ulimit -n 3000
-        #  
-        # rescue SQLite3::CantOpenException => e
-        #  
+          # Note: If on OSX, too many files get opened during
+          #       the specs -> ulimit -n 3000
+          #  
+          # rescue SQLite3::CantOpenException => e
+          #  
         end
 
         def initial
@@ -45,9 +45,11 @@ module Picky
         def clear
           db.execute 'delete from key_value'
         end
-
+        
+        # TODO Replace with db method?
+        #
         def lazily_initialize_client
-          @db ||= SQLite3::Database.new cache_path
+          @db ||= (create_directory cache_path; SQLite3::Database.new cache_path)
         end
 
         def dump_sqlite internal
@@ -65,6 +67,8 @@ module Picky
         end
 
         def reset
+          # TODO Still necessary?
+          #
           create_directory cache_path
           lazily_initialize_client
 

data/lib/picky/bundle.rb

@@ -79,6 +79,8 @@ module Picky
 
     # Extract specific indexes from backend.
     #
+    # TODO Move @backend_ into the backend?
+    #
     def create_backends
       @backend_inverted      = backend.create_inverted self
       @backend_weights       = backend.create_weights self
@@ -144,6 +146,8 @@ module Picky
 
     # If a key format is set, use it, else forward to the category.
     #
+    # TODO What about setting the key_format per category?
+    #
     def key_format
       @key_format || @category.key_format
     end

data/lib/picky/bundle_realtime.rb

@@ -1,7 +1,12 @@
 module Picky
 
   class Bundle
-
+    
+    # TODO Push methods back into the backend, so that we
+    #      can apply more efficient methods tailored for
+    #      each specific backends.
+    #
+    
     # Removes the given id from the indexes.
     #
     def remove id
@@ -28,6 +33,9 @@ module Picky
           @similarity.delete self.similarity_strategy.encode(str_or_sym)
         else
           @weights[str_or_sym] = self.weight_strategy.weight_for ids.size
+          # @weights[str_or_sym] = self.weight_strategy.respond_to?(:[]) &&
+          #                        self.weight_strategy[str_or_sym] ||
+          #                        self.weight_strategy.weight_for(ids.size)
         end
       end
 
@@ -37,6 +45,8 @@ module Picky
     # Returns a reference to the array where the id has been added.
     #
     def add id, str_or_sym, where = :unshift
+      # Use a generalized strategy.
+      #
       str_or_syms = @realtime[id] ||= []
 
       # Inverted.
@@ -49,7 +59,6 @@ module Picky
         # Update the realtime index.
         #
         str_or_syms << str_or_sym
-
         ids = @inverted[str_or_sym] ||= []
         ids.send where, id
       end

data/spec/functional/realtime_spec.rb

@@ -473,5 +473,229 @@ describe "Realtime Indexing" do
       end
     end
   end
+  
+  context 'special index' do
+    let(:index) do
+      Picky::Index.new(:books) do
+        backend Picky::Backends::Redis.new(realtime: true)
+        key_format :to_s # TODO Make key format dependent on backend?
+        category :title
+        category :author, similarity: Picky::Generators::Similarity::DoubleMetaphone.new(3)
+      end
+    end
+    let(:books) { Picky::Search.new index }
+
+    before(:each) do
+      index.add Book.new('one', 'Title', 'Author')
+    end
+
+    context 'single category updating' do
+      it 'finds the first entry' do
+        books.search('title:Titl').ids.should == ['one']
+      end
+
+      it 'allows removing a single category and leaving the others alone' do
+        index[:title].remove 'one'
+
+        books.search('Title').ids.should == []
+        books.search('Author').ids.should == ['one']
+      end
+
+      it 'allows adding a single category and leaving the others alone' do
+        index[:title].add Book.new('two', 'Newtitle', 'Newauthor')
+
+        books.search('Title').ids.should == ['one']
+        books.search('Newtitle').ids.should == ['two']
+
+        books.search('Author').ids.should == ['one']
+        books.search('Newauthor').ids.should == []
+      end
+
+      it 'allows replacing a single category and leaving the others alone' do
+        index[:title].replace Book.new('one', 'Replaced', 'Notindexed')
+
+        books.search('Title').ids.should == []
+        books.search('Replaced').ids.should == ['one']
+
+        books.search('Notindexed').ids.should == []
+        books.search('Author').ids.should == ['one']
+      end
+    end
+
+    context 'with partial' do
+      it 'finds the first entry' do
+        books.search('Titl').ids.should == ['one']
+      end
+
+      it 'allows removing something' do
+        index.remove "one"
+      end
+      it 'is not findable anymore after removing' do
+        books.search('Titl').ids.should == ['one']
+
+        index.remove "one"
+
+        books.search('Titl').ids.should == []
+      end
+
+      it 'allows adding something' do
+        index.add Book.new('two', 'Title2', 'Author2')
+      end
+      it 'is findable after adding' do
+        books.search('Titl').ids.should == ['one']
+
+        index.add Book.new('two', 'Title New', 'Author New')
+
+        books.search('Titl').ids.should == ['two', 'one']
+      end
+
+      it 'allows replacing something' do
+        index.replace Book.new('one', 'Title New', 'Author New')
+      end
+      it 'is findable after replacing' do
+        books.search('Ne').ids.should == []
+
+        index.replace Book.new('one', 'Title New', 'Author New')
+
+        books.search('Ne').ids.should == ['one', 'one']
+      end
+      it 'handles more complex cases' do
+        books.search('Ne').ids.should == []
+
+        index.replace Book.new('one', 'Title New', 'Author New')
+
+        books.search('title:Ne').ids.should == ['one']
+      end
+      it 'handles more complex cases' do
+        index.remove "one"
+
+        books.search('Titl').ids.should == []
+
+        index.replace Book.new('one', 'Title New', 'Author New')
+
+        books.search('title:Ne').ids.should == ['one']
+      end
+    end
+
+    context 'non-partial' do
+      it 'finds the first entry' do
+        books.search('Titl').ids.should == ['one']
+      end
+
+      it 'allows removing something' do
+        index.remove "one"
+      end
+      it 'is not findable anymore after removing' do
+        books.search('Titl').ids.should == ['one']
+
+        index.remove :one
+
+        books.search('Titl').ids.should == []
+      end
+
+      it 'allows adding something' do
+        index.add Book.new("two", "Title2", "Author2")
+      end
+      it 'is findable after adding' do
+        books.search('Titl').ids.should == ['one']
+
+        index.add Book.new("two", "Title New", "Author New")
+
+        books.search('Titl').ids.should == ['two', 'one']
+      end
+
+      it 'allows replacing something' do
+        index.replace Book.new("one", "Title New", "Author New")
+      end
+      it 'is findable after replacing' do
+        books.search('Ne').ids.should == []
+
+        index.replace Book.new("one", "Title New", "Author New")
+
+        books.search('Ne').ids.should == ['one', 'one']
+      end
+      it 'handles more complex cases' do
+        books.search('Ne').ids.should == []
+
+        index.replace Book.new("one", "Title New", "Author New")
+
+        books.search('title:Ne').ids.should == ['one']
+      end
+      it 'handles more complex cases' do
+        index.remove "one"
+
+        books.search('Titl').ids.should == []
+
+        index.replace Book.new("one", "Title New", "Author New")
+
+        books.search('title:Ne').ids.should == ['one']
+      end
+    end
+
+    context 'similarity' do
+      it 'finds the first entry' do
+        books.search('Authr~').ids.should == ['one']
+      end
+
+      it 'allows removing something' do
+        index.remove "one"
+      end
+      it 'is not findable anymore after removing' do
+        books.search('Authr~').ids.should == ['one']
+
+        index.remove "one"
+
+        books.search('Authr~').ids.should == []
+      end
+
+      it 'allows adding something' do
+        index.add Book.new("two", "Title2", "Author2")
+      end
+      it 'is findable after adding' do
+        books.search('Authr~').ids.should == ['one']
+
+        index.add Book.new("two", "Title New", "Author New")
+
+        books.search('Authr~').ids.should == ['two', 'one']
+      end
+
+      it 'allows replacing something' do
+        index.replace Book.new("one", "Title New", "Author New")
+      end
+      it 'is findable after replacing' do
+        books.search('Nuw~').ids.should == []
+
+        index.replace Book.new("one", "Title New", "Author New")
+
+        books.search('Nuw~').ids.should == ['one']
+      end
+      it 'handles more complex cases' do
+        books.search('Now~').ids.should == []
+
+        index.replace Book.new("one", "Title New", "Author New")
+
+        books.search('author:Now~').ids.should == ['one']
+      end
+      it 'handles more complex cases' do
+        index.remove "one"
+
+        books.search('Athr~').ids.should == []
+
+        index.replace Book.new("one", "Title New", "Author New")
+
+        books.search('author:Athr~').ids.should == ['one']
+      end
+      it 'handles more complex cases' do
+        books.search('Athr~').ids.should == ['one']
+
+        index.replace Book.new("two", "Title New", "Author New")
+        index.add Book.new("three", "TTL", "AUTHR")
+
+        # Note: Allocations are [:two, :one], then [:three].
+        #
+        books.search('author:Athr~').ids.should == ['two', 'one', 'three']
+      end
+    end
+  end
 
 end

data/spec/lib/backends/sqlite/array_spec.rb

@@ -5,7 +5,7 @@ require 'sqlite3'
 describe Picky::Backends::SQLite::Array do
 
   context 'hash-based indexes' do
-    let(:db) { described_class.new 'spec/temp/some/cache/path/to/file' }
+    let(:db) { described_class.new 'spec/temp/some/other/cache/path/to/file' }
 
     describe 'dump' do
       it 'forwards to the given hash' do
@@ -67,13 +67,13 @@ describe Picky::Backends::SQLite::Array do
 
     describe 'to_s' do
       it 'returns the cache path with the default file extension' do
-        db.to_s.should == 'Picky::Backends::SQLite::Array(spec/temp/some/cache/path/to/file.sqlite3)'
+        db.to_s.should == 'Picky::Backends::SQLite::Array(spec/temp/some/other/cache/path/to/file.sqlite3)'
       end
     end
   end
 
   context 'hash-based indexes' do
-    let(:db) { described_class.new 'spec/temp/some/cache/path/to/file', realtime: true }
+    let(:db) { described_class.new 'spec/temp/some/other/cache/path/to/file', realtime: true }
 
     describe 'dump' do
       it 'forwards to the given hash' do
@@ -135,7 +135,7 @@ describe Picky::Backends::SQLite::Array do
 
     describe 'to_s' do
       it 'returns the cache path with the default file extension' do
-        db.to_s.should == 'Picky::Backends::SQLite::Array(spec/temp/some/cache/path/to/file.sqlite3)'
+        db.to_s.should == 'Picky::Backends::SQLite::Array(spec/temp/some/other/cache/path/to/file.sqlite3)'
       end
     end
   end

data/spec/lib/backends/sqlite/value_spec.rb

@@ -5,7 +5,7 @@ require 'sqlite3'
 describe Picky::Backends::SQLite::Value do
 
   context 'hash-based indexes' do
-    let(:db) { described_class.new 'spec/temp/some/cache/path/to/file' }
+    let(:db) { described_class.new 'spec/temp/some/other/cache/path/to/file' }
 
     describe 'dump' do
       it 'forwards to the given hash' do
@@ -67,7 +67,7 @@ describe Picky::Backends::SQLite::Value do
 
     describe 'to_s' do
       it 'returns the cache path with the default file extension' do
-        db.to_s.should == 'Picky::Backends::SQLite::Value(spec/temp/some/cache/path/to/file.sqlite3)'
+        db.to_s.should == 'Picky::Backends::SQLite::Value(spec/temp/some/other/cache/path/to/file.sqlite3)'
       end
     end
   end

data/spec/lib/bundle_indexed_spec.rb

@@ -102,6 +102,9 @@ describe Picky::Bundle do
   end
 
   describe 'load' do
+    before(:each) do
+      @bundle.dump # Create an index first.
+    end
     it 'should trigger loads' do
       @bundle.should_receive(:load_inverted).once.with
       @bundle.should_receive(:load_weights).once.with

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 4.12.8
+  version: 4.12.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-25 00:00:00.000000000 Z
+date: 2013-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.12.8
+        version: 4.12.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.12.8
+        version: 4.12.10
 - !ruby/object:Gem::Dependency
   name: text
   requirement: !ruby/object:Gem::Requirement