picky 4.12.10 → 4.12.11

data/lib/picky/backends/redis.rb

@@ -164,10 +164,10 @@ module Picky
           # Just checked once on the first call.
           #
           if redis_with_scripting?
-            @@ids_script = "local intersected = redis.call('zinterstore', ARGV[1], #(KEYS), unpack(KEYS)); if intersected == 0 then redis.call('del', ARGV[1]); return {}; end local results = redis.call('zrange', ARGV[1], tonumber(ARGV[2]), tonumber(ARGV[3])); redis.call('del', ARGV[1]); return results;"
+            @ids_script = "local intersected = redis.call('zinterstore', ARGV[1], #(KEYS), unpack(KEYS)); if intersected == 0 then redis.call('del', ARGV[1]); return {}; end local results = redis.call('zrange', ARGV[1], tonumber(ARGV[2]), tonumber(ARGV[3])); redis.call('del', ARGV[1]); return results;"
 
             require 'digest/sha1'
-            @@ids_sent_once = nil
+            @ids_script_hash = nil
 
             # Overrides _this_ method.
             #
@@ -190,6 +190,15 @@ module Picky
         #
         ids combinations, amount, offset
       end
+      
+      # # TODO
+      # #
+      # def add id, str_or_sym, weight_strategy, similarity_strategy, where
+      #   
+      #   
+      #   weight  = weight_strategy.weight_for ids.size
+      #   similar = similarity_strategy.encode str_or_sym
+      # end
 
       # Generate a multiple host/process safe result id.
       #
@@ -224,27 +233,35 @@ module Picky
           #
           begin
             if identifiers.size > 1
-              client.evalsha @@ids_sent_once,
-                             identifiers.size,
-                             *identifiers,
-                             generate_intermediate_result_id,
-                             offset,
-                             (offset + amount)
+              if @ids_script_hash
+                # Reuse script already installed in Redis.
+                #
+                client.evalsha @ids_script_hash,
+                               identifiers,
+                               [
+                                 generate_intermediate_result_id,
+                                 offset,
+                                 (offset + amount)
+                               ]
+              else
+                # Install script in Redis.
+                #
+                @ids_script_hash = Digest::SHA1.hexdigest @ids_script
+                client.eval @ids_script,
+                            identifiers,
+                            [
+                              generate_intermediate_result_id,
+                              offset,
+                              (offset + amount)
+                            ]
+              end
             else
+              # No complex calculation necessary.
+              #
               client.zrange identifiers.first,
                             offset,
                             (offset + amount)
             end
-          rescue RuntimeError => e
-            # Make the server have a SHA-1 for the script.
-            #
-            @@ids_sent_once = Digest::SHA1.hexdigest @@ids_script
-            client.eval @@ids_script,
-                        identifiers.size,
-                        *identifiers,
-                        generate_intermediate_result_id,
-                        offset,
-                        (offset + amount)
           end
         end
       end

data/spec/functional/realtime_spec.rb

@@ -474,7 +474,7 @@ describe "Realtime Indexing" do
     end
   end
   
-  context 'special index' do
+  context 'with Redis backend' do
     let(:index) do
       Picky::Index.new(:books) do
         backend Picky::Backends::Redis.new(realtime: true)
@@ -493,6 +493,20 @@ describe "Realtime Indexing" do
       it 'finds the first entry' do
         books.search('title:Titl').ids.should == ['one']
       end
+      
+      it 'finds the first entry' do
+        books.search('author:author title:Titl').ids.should == ['one']
+      end
+      
+      it 'finds the first entry' do
+        books.search('Author Titl').ids.should == ['one']
+      end
+      
+      it 'finds the first entry the second time, too' do
+        books.search('author:author title:Titl')
+        
+        books.search('author:author title:Titl').ids.should == ['one']
+      end
 
       it 'allows removing a single category and leaving the others alone' do
         index[:title].remove 'one'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 4.12.10
+  version: 4.12.11
   prerelease: 
 platform: ruby
 authors:
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.12.10
+        version: 4.12.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.12.10
+        version: 4.12.11
 - !ruby/object:Gem::Dependency
   name: text
   requirement: !ruby/object:Gem::Requirement