picky 4.30.0 → 4.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c258f99e445068d45ccb32d4ce15f091567b9e6
-  data.tar.gz: cf5d8bb9200d1e4b6deea865b97a9c4c16d5a59c
+  metadata.gz: 1399f4e15ee1e94d7ec6c91ab88b9721702524f6
+  data.tar.gz: 24e20ab22278fddf14d13a3ce5f22319aac4fe7b
 SHA512:
-  metadata.gz: 03347abb98159e3a9f5d1014f5d647b09dc47bbf8c4ad5ea65082dfbf5554c46b5736ecebc81a4d55354a3e86a7dc43a4dd18a994d36d4e5cb912143260d2d0a
-  data.tar.gz: f0feaaac50db053a2c8879d0a2f4613156f50a17c888bd55c10cc6fd694d79aa7f2423adfac9497a9a9c8615cd7aac1b69b3ec4ed387cbe9ab81238d499233fa
+  metadata.gz: f0948fcb8da05a7174713c5dae9e408eb69808173de4d55dacfba1bdfd024016b63d030293a929973b3c805b29c319afc59bb85959f10609b438c4058fa81897
+  data.tar.gz: 930e22468a92b53f87fa06c51c96b94e3142d6d33457bafa936bebd65f5e14ab5a089d90f4cafb295005c65e157230b3d4e1e2694cb0a0d801c1798e8cf9837b

data/lib/picky/backends/file/json.rb

@@ -52,8 +52,8 @@ module Picky
 
         # Loads the mapping hash from json format.
         #
-        def load
-          self.mapping = mapping_file.load
+        def load symbol_keys
+          self.mapping = mapping_file.load symbol_keys
           self
         end
 

data/lib/picky/backends/memory/json.rb

@@ -22,8 +22,8 @@ module Picky
         #
         # Also ensures all hash keys are frozen.
         #
-        def load
-          MultiJson.decode ::File.open(cache_path, 'r') # , symbolize_keys: true # SYMBOLS.
+        def load symbol_keys
+          MultiJson.decode ::File.open(cache_path, 'r'), symbolize_keys: symbol_keys # SYMBOLS.
           # index_hash && index_hash.each { |(key, value)| key.freeze }
           # index_hash
         end

data/lib/picky/backends/memory/marshal.rb

@@ -16,7 +16,7 @@ module Picky
 
         # Loads the index hash from marshal format.
         #
-        def load
+        def load _
           ::Marshal.load ::File.open(cache_path, 'r:binary')
         end
 

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

@@ -45,7 +45,7 @@ module Picky
 
         # Returns itself.
         #
-        def load
+        def load _
           self
         end
 

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

@@ -36,7 +36,7 @@ module Picky
           self
         end
 
-        def load
+        def load _
           self
         end
 

data/lib/picky/bundle.rb

@@ -131,10 +131,11 @@ module Picky
     #
     # Note: Also checks for itself.
     #
-    def similar text
-      code = similarity_strategy.encode text
+    def similar str_or_sym
+      code = similarity_strategy.encode str_or_sym
       return [] unless code
       @similarity[code] || []
+      
       # similar_codes = @similarity[code]
       # if similar_codes.blank?
       #   [] # Return a simple array.

data/lib/picky/bundle_indexed.rb

@@ -23,8 +23,8 @@ module Picky
     # Note: If the backend wants to return a special
     # enumerable, the backend should do so.
     #
-    def ids sym_or_string
-      @inverted[sym_or_string] || []
+    def ids str_or_sym
+      @inverted[str_or_sym] || []
       # THINK Place the key_format conversion here – or move into the backend?
       #
       # if @key_format
@@ -46,16 +46,16 @@ module Picky
     #
     # Returns a number, or nil.
     #
-    def weight sym_or_string
-      @weights[sym_or_string]
+    def weight str_or_sym
+      @weights[str_or_sym]
     end
 
     # Get settings for this bundle.
     #
     # Returns an object.
     #
-    def [] sym_or_string
-      @configuration[sym_or_string]
+    def [] str_or_sym
+      @configuration[str_or_sym]
     end
 
     # Loads all indexes.
@@ -63,38 +63,38 @@ module Picky
     # Loading loads index objects from the backend.
     # They should each respond to [] and return something appropriate.
     #
-    def load
-      load_inverted
-      load_weights
-      load_similarity
+    def load symbol_keys = false
+      load_inverted symbol_keys
+      load_weights symbol_keys
+      load_similarity symbol_keys
       load_configuration
       load_realtime
     end
 
     # Loads the core index.
     #
-    def load_inverted
-      self.inverted = @backend_inverted.load
+    def load_inverted symbol_keys
+      self.inverted = @backend_inverted.load symbol_keys
     end
     # Loads the weights index.
     #
-    def load_weights
-      self.weights = @backend_weights.load unless @weight_strategy.respond_to?(:saved?) && !@weight_strategy.saved?
+    def load_weights symbol_keys
+      self.weights = @backend_weights.load symbol_keys unless @weight_strategy.respond_to?(:saved?) && !@weight_strategy.saved?
     end
     # Loads the similarity index.
     #
-    def load_similarity
-      self.similarity = @backend_similarity.load unless @similarity_strategy.respond_to?(:saved?) && !@similarity_strategy.saved?
+    def load_similarity symbol_keys
+      self.similarity = @backend_similarity.load symbol_keys unless @similarity_strategy.respond_to?(:saved?) && !@similarity_strategy.saved?
     end
     # Loads the configuration.
     #
     def load_configuration
-      self.configuration = @backend_configuration.load
+      self.configuration = @backend_configuration.load false
     end
     # Loads the realtime mapping.
     #
     def load_realtime
-      self.realtime = @backend_realtime.load
+      self.realtime = @backend_realtime.load false
     end
 
     # Clears all indexes.

data/lib/picky/bundle_realtime.rb

@@ -9,6 +9,8 @@ module Picky
     
     # Removes the given id from the indexes.
     #
+    # TODO Simplify (and slow) this again – remove the realtime index.
+    #
     def remove id
       # Is it anywhere?
       #
@@ -46,13 +48,28 @@ module Picky
     #
     # Does not add to realtime if static.
     #
+    # TODO What does static do again?
+    # TODO Why the realtime index? Is it really necessary?
+    #      Not absolutely. It was for efficient deletion/replacement.
+    #
     def add id, str_or_sym, method: :unshift, static: false, force_update: false
       # If static, indexing will be slower, but will use less
       # space in the end.
       #
       if static
         ids = @inverted[str_or_sym] ||= []
-        ids.send method, id unless ids.include? id
+        if force_update
+          ids.delete id
+          ids.send method, id
+        else
+          # TODO Adding should not change the array if it's already in.
+          #
+          if ids.include?(id)
+            # Do nothing. Not forced, and already in.
+          else
+            ids.send method, id
+          end
+        end
       else
         # Use a generalized strategy.
         #
@@ -60,19 +77,19 @@ module Picky
 
         # Inverted.
         #
-        ids = if str_or_syms && str_or_syms.include?(str_or_sym)
+        ids = if str_or_syms.include?(str_or_sym)
           ids = @inverted[str_or_sym] ||= []
-          # If updates are not forced, then do not add it to the
-          # index if it's in there already.
-          unless force_update
-            return if ids.include? id
+          # If updates are forced or if it isn't in there already
+          # then remove and add to the index.
+          if force_update || !ids.include?(id)
+            ids.delete id
+            ids.send method, id
           end
-          ids.delete id
-          ids.send method, id
+          ids
         else
           # Update the realtime index.
           #
-          str_or_syms << str_or_sym # unless static
+          str_or_syms << str_or_sym
           # TODO Add has_key? to index backends.
           # ids = if @inverted.has_key?(str_or_sym)
           #   @inverted[str_or_sym]
@@ -129,11 +146,12 @@ module Picky
     #
     # THINK Maybe load it and just replace the arrays with the corresponding ones.
     #
-    def build_realtime
+    def build_realtime symbol_keys
       clear_realtime
       @inverted.each_pair do |str_or_sym, ids|
         ids.each do |id|
-          str_or_syms = @realtime[id] ||= []
+          str_or_syms = (@realtime[id] ||= [])
+          str_or_sym = str_or_sym.to_sym if symbol_keys
           @realtime[id] << str_or_sym unless str_or_syms.include? str_or_sym
         end
       end

data/lib/picky/category_indexed.rb

@@ -9,8 +9,8 @@ module Picky
     def load
       Picky.logger.load self
       clear_realtime # THINK Should we really explicitly clear the realtime? Or should it just be loaded?
-      exact.load
-      partial.load
+      exact.load @symbol_keys
+      partial.load @symbol_keys
     end
 
     # Gets the weight for this token's text.
@@ -21,14 +21,14 @@ module Picky
         # TODO We might be able to return early?
         #
         @ranger.new(*range).inject(nil) do |sum, text|
-          weight = bundle.weight text
+          weight = bundle.weight str_or_sym(text)
           weight && (weight + (sum || 0)) || sum
         end
       else
         if tokenizer && tokenizer.stemmer?
-          bundle.weight token.stem(tokenizer)
+          bundle.weight str_or_sym(token.stem(tokenizer))
         else
-          bundle.weight token.text
+          bundle.weight str_or_sym(token.text)
         end
       end
     end
@@ -45,18 +45,33 @@ module Picky
           # It is 30% faster using the empty check
           # than just << [].
           #
-          ids = bundle.ids text
+          ids = bundle.ids str_or_sym(text)
           ids.empty? ? result : result << ids
         end.flatten
       else
         # Optimization
         if tokenizer && tokenizer.stemmer?
-          bundle.ids token.stem(tokenizer)
+          bundle.ids str_or_sym(token.stem(tokenizer))
         else
-          bundle.ids token.text
+          bundle.ids str_or_sym(token.text)
         end
       end
     end
+    
+    # Gets the similars for this token's text.
+    #
+    def similar token
+      bundle = bundle_for token
+      bundle.similar str_or_sym(token.text)
+    end
+    
+    def str_or_sym text
+      if @symbol_keys
+        text.to_sym
+      else
+        text
+      end
+    end
 
     # Returns the right index bundle for this token.
     #

data/lib/picky/category_realtime.rb

@@ -30,6 +30,8 @@ module Picky
     # Removes the object's id, and then
     # adds it again.
     #
+    # TODO Is this the actual forced update?
+    #
     def replace object, method: :unshift
       remove object.send id
       add object, method: method
@@ -74,8 +76,9 @@ module Picky
       end
 
       format = key_format?
+      static = static?
       tokens.each do |text|
-        add_tokenized_token id, text, method: method, format: format, force_update: force_update
+        add_tokenized_token id, text, method: method, format: format, static: static, force_update: force_update
       end
     rescue NoMethodError => e
       show_informative_add_text_error_message_for e
@@ -115,8 +118,8 @@ module Picky
     # Builds the realtime mapping.
     #
     def build_realtime_mapping
-      exact.build_realtime
-      partial.build_realtime
+      exact.build_realtime @symbol_keys
+      partial.build_realtime @symbol_keys
     end
 
   end

data/lib/picky/query/token.rb

@@ -281,7 +281,7 @@ module Picky
       # Returns all similar tokens for the token.
       #
       def similar_tokens_for category
-        similars = category.bundle_for(self).similar @text
+        similars = category.similar self
         similars.map do |similar|
           # The array describes all possible categories. There is only one here.
           #
@@ -293,6 +293,7 @@ module Picky
       #
       @@qualifier_text_delimiter = /:/
       @@qualifiers_delimiter     = /,/
+      # TODO Think about making these instances.
       @@qualifier_text_splitter  = Splitter.new @@qualifier_text_delimiter
       @@qualifiers_splitter      = Splitter.new @@qualifiers_delimiter
       def qualify

data/spec/functional/backends/special_spec.rb

@@ -58,7 +58,7 @@ class InternalBackendInterfaceTester
 
   end
 
-  def load
+  def load _
     self
   end
 

data/spec/functional/facets_spec.rb

@@ -174,14 +174,14 @@ describe 'facets' do
       end
       it 'has two filtered facets' do
         finder.facets(:surname, filter: 'age:40 name:peter', counts: false).should == [
-          'hanke',
-          'kunz'
+          'kunz',
+          'hanke'
         ]
       end
       it 'has 2 facets >= count 1' do
         finder.facets(:surname, filter: 'age:40 name:peter', at_least: 1, counts: false).should == [
-          'hanke',
-          'kunz'
+          'kunz',
+          'hanke'
         ]
       end
       it 'has 0 facets >= counts 2' do

data/spec/functional/memory_usage_spec.rb

@@ -0,0 +1,67 @@
+# encoding: utf-8
+#
+require 'spec_helper'
+
+describe "Memory Usage" do
+  
+  before(:each) do
+    Picky::Indexes.clear_indexes
+  end
+  
+  let(:thing) { Struct.new(:id, :text) }
+  
+  # it 'is fine in String mode' do
+  #   index = Picky::Index.new :memory_usage do
+  #     category :text
+  #   end
+  #
+  #   require 'objspace'
+  #
+  #   GC.start
+  #   memsize_without_added_thing = ObjectSpace.memsize_of_all(String)
+  #   GC.start
+  #
+  #   index.add thing.new(1, 'one')
+  #
+  #   GC.start
+  #   memsize_with_added_thing = ObjectSpace.memsize_of_all(String)
+  #   GC.start
+  #
+  #   index.add thing.new(1, 'one')
+  #
+  #   GC.start
+  #   memsize_with_readded_thing = ObjectSpace.memsize_of_all(String)
+  #   GC.start
+  #
+  #   memsize_with_readded_thing.should == memsize_with_added_thing
+  # end
+  
+  it 'is fine with Symbols' do
+    index = Picky::Index.new :memory_usage do
+      symbol_keys true
+      
+      category :text
+    end
+    
+    require 'objspace'
+    
+    GC.start
+    memsize_without_added_thing = ObjectSpace.memsize_of_all(Symbol)
+    GC.start
+    
+    index.add thing.new(1, 'one')
+    
+    GC.start
+    memsize_with_added_thing = ObjectSpace.memsize_of_all(Symbol)
+    GC.start
+    
+    index.add thing.new(1, 'one')
+    
+    GC.start
+    memsize_with_readded_thing = ObjectSpace.memsize_of_all(Symbol)
+    GC.start
+    
+    memsize_with_readded_thing.should == memsize_with_added_thing
+  end
+
+end

data/spec/functional/realtime_force_update_spec.rb

@@ -6,33 +6,66 @@ require 'spec_helper'
 # already in the index.
 #
 describe 'ignoring updates' do
-
-  it 'does not update the index if the updated data stayed the same' do
-    index = Picky::Index.new :books do
-      category :title
-    end
-
-    thing = Struct.new :id, :title
-    index.add thing.new(1, 'some title')
-    index.add thing.new(2, 'some title')
+  
+  normal_index = Picky::Index.new :normal do
+    category :title
+  end
+  
+  symbol_keys_index = Picky::Index.new :symbol do
+    symbol_keys
+    
+    category :title
+  end
+  
+  static_index = Picky::Index.new :static do
+    static
+    
+    category :title
+  end
+  
+  [normal_index, symbol_keys_index, static_index].each do |index|
+    it 'does not update the index if the added data stayed the same' do
+      thing = Struct.new :id, :title
+      index.add thing.new(1, 'some title')
+      index.add thing.new(2, 'some title')
     
-    try = Picky::Search.new index
+      try = Picky::Search.new index
     
-    try.search('some').ids.should == [2, 1]
+      try.search('some').ids.should == [2, 1]
     
-    index.add thing.new(1, 'some title'), force_update: true
+      index.add thing.new(1, 'some title'), force_update: true
     
-    # Expected behavior.
-    try.search('some').ids.should == [1, 2]
+      # Expected behavior.
+      try.search('some').ids.should == [1, 2]
     
-    index.add thing.new(2, 'some title') # force_update: false is the default.
+      index.add thing.new(2, 'some title') # force_update: false is the default.
     
-    # Not updated, since it was the exact same data everywhere.
-    try.search('some').ids.should == [1, 2]
+      # Not updated, since it was the exact same data everywhere.
+      try.search('some').ids.should == [1, 2]
     
-    index.add thing.new(2, 'some title'), force_update: false
+      index.add thing.new(2, 'some title'), force_update: false
     
-    # Not updated, since it was the exact same data everywhere.
-    try.search('some').ids.should == [1, 2]
+      # Not updated, since it was the exact same data everywhere.
+      try.search('some').ids.should == [1, 2]
+    end
+  
+    it 'does always update the index if replace is used' do
+      index = Picky::Index.new :books do
+        category :title
+      end
+
+      thing = Struct.new :id, :title
+      index.add thing.new(1, 'some title')
+      index.add thing.new(2, 'some title')
+    
+      try = Picky::Search.new index
+    
+      try.search('some').ids.should == [2, 1]
+    
+      index.replace thing.new(1, 'some title')
+    
+      # Expected behavior.
+      try.search('some').ids.should == [1, 2]
+    end
   end
 end

data/spec/functional/realtime_spec.rb

@@ -11,241 +11,249 @@ describe "Realtime Indexing" do
     end
   end
 
-  context 'default index' do
-    let(:index) do
-      Picky::Index.new(:books) do
-        source []
-        category :title
-        category :author, similarity: Picky::Generators::Similarity::DoubleMetaphone.new(3)
-      end
-    end
-    let(:books) { Picky::Search.new index }
+  default_index = Picky::Index.new(:books) do
+    category :title
+    category :author, similarity: Picky::Generators::Similarity::DoubleMetaphone.new(3)
+  end
+  
+  symbol_keys_index = Picky::Index.new(:books) do
+    symbol_keys true
+    
+    category :title
+    category :author, similarity: Picky::Generators::Similarity::DoubleMetaphone.new(3)
+  end
 
-    before(:each) do
-      index.add Book.new(1, "Title", "Author")
-    end
+  [symbol_keys_index].each do |index|
+    context 'default index' do
+      before(:each) { index.clear }
+      let(:books) { Picky::Search.new index }
 
-    context 'dumping and loading' do
-      it "doesn't find books anymore after dumping and loading and updating" do
-        index.replace Book.new(2, "Title New", "Author New")
+      before(:each) do
+        index.add Book.new(1, "Title", "Author")
+      end
 
-        books.search("title").ids.should == [2, 1]
+      context 'dumping and loading' do
+        it "doesn't find books anymore after dumping and loading and updating" do
+          index.replace Book.new(2, "Title New", "Author New")
 
-        index.dump
-        index.load
-        index.build_realtime_mapping
+          books.search("title").ids.should == [2, 1]
 
-        index.replace Book.new(2, "Blah New", "Author New")
+          index.dump
+          index.load
+          index.build_realtime_mapping
 
-        books.search("title").ids.should == [1]
-      end
-    end
+          index.replace Book.new(2, "Blah New", "Author New")
 
-    context 'single category updating' do
-      it 'finds the first entry' do
-        books.search('title:Titl').ids.should == [1]
+          books.search("title").ids.should == [1]
+        end
       end
 
-      it 'allows removing a single category and leaving the others alone' do
-        index[:title].remove 1
+      context 'single category updating' do
+        it 'finds the first entry' do
+          books.search('title:Titl').ids.should == [1]
+        end
 
-        books.search('Title').ids.should == []
-        books.search('Author').ids.should == [1]
-      end
+        it 'allows removing a single category and leaving the others alone' do
+          index[:title].remove 1
 
-      it 'allows adding a single category and leaving the others alone' do
-        index[:title].add Book.new(2, "Newtitle", "Newauthor")
+          books.search('Title').ids.should == []
+          books.search('Author').ids.should == [1]
+        end
 
-        books.search('Title').ids.should == [1]
-        books.search('Newtitle').ids.should == [2]
+        it 'allows adding a single category and leaving the others alone' do
+          index[:title].add Book.new(2, "Newtitle", "Newauthor")
 
-        books.search('Author').ids.should == [1]
-        books.search('Newauthor').ids.should == []
-      end
+          books.search('Title').ids.should == [1]
+          books.search('Newtitle').ids.should == [2]
 
-      it 'allows replacing a single category and leaving the others alone' do
-        index[:title].replace Book.new(1, "Replaced", "Notindexed")
+          books.search('Author').ids.should == [1]
+          books.search('Newauthor').ids.should == []
+        end
 
-        books.search('Title').ids.should == []
-        books.search('Replaced').ids.should == [1]
+        it 'allows replacing a single category and leaving the others alone' do
+          index[:title].replace Book.new(1, "Replaced", "Notindexed")
 
-        books.search('Notindexed').ids.should == []
-        books.search('Author').ids.should == [1]
-      end
-    end
+          books.search('Title').ids.should == []
+          books.search('Replaced').ids.should == [1]
 
-    context 'with partial' do
-      it 'finds the first entry' do
-        books.search('Titl').ids.should == [1]
+          books.search('Notindexed').ids.should == []
+          books.search('Author').ids.should == [1]
+        end
       end
 
-      it 'allows removing something' do
-        index.remove 1
-      end
-      it 'is not findable anymore after removing' do
-        books.search('Titl').ids.should == [1]
+      context 'with partial' do
+        it 'finds the first entry' do
+          books.search('Titl').ids.should == [1]
+        end
 
-        index.remove 1
+        it 'allows removing something' do
+          index.remove 1
+        end
+        it 'is not findable anymore after removing' do
+          books.search('Titl').ids.should == [1]
 
-        books.search('Titl').ids.should == []
-      end
+          index.remove 1
 
-      it 'allows adding something' do
-        index.add Book.new(2, "Title2", "Author2")
-      end
-      it 'is findable after adding' do
-        books.search('Titl').ids.should == [1]
+          books.search('Titl').ids.should == []
+        end
 
-        index.add Book.new(2, "Title New", "Author New")
+        it 'allows adding something' do
+          index.add Book.new(2, "Title2", "Author2")
+        end
+        it 'is findable after adding' do
+          books.search('Titl').ids.should == [1]
 
-        books.search('Titl').ids.should == [2,1]
-      end
+          index.add Book.new(2, "Title New", "Author New")
 
-      it 'allows replacing something' do
-        index.replace Book.new(1, "Title New", "Author New")
-      end
-      it 'is findable after replacing' do
-        books.search('Ne').ids.should == []
+          books.search('Titl').ids.should == [2,1]
+        end
 
-        index.replace Book.new(1, "Title New", "Author New")
+        it 'allows replacing something' do
+          index.replace Book.new(1, "Title New", "Author New")
+        end
+        it 'is findable after replacing' do
+          books.search('Ne').ids.should == []
 
-        books.search('Ne').ids.should == [1, 1]
-      end
-      it 'handles more complex cases' do
-        books.search('Ne').ids.should == []
+          index.replace Book.new(1, "Title New", "Author New")
 
-        index.replace Book.new(1, "Title New", "Author New")
+          books.search('Ne').ids.should == [1, 1]
+        end
+        it 'handles more complex cases' do
+          books.search('Ne').ids.should == []
 
-        books.search('title:Ne').ids.should == [1]
-      end
-      it 'handles more complex cases' do
-        index.remove 1
+          index.replace Book.new(1, "Title New", "Author New")
 
-        books.search('Titl').ids.should == []
+          books.search('title:Ne').ids.should == [1]
+        end
+        it 'handles more complex cases' do
+          index.remove 1
 
-        index.replace Book.new(1, "Title New", "Author New")
+          books.search('Titl').ids.should == []
 
-        books.search('title:Ne').ids.should == [1]
-      end
-    end
+          index.replace Book.new(1, "Title New", "Author New")
 
-    context 'non-partial' do
-      it 'finds the first entry' do
-        books.search('Titl').ids.should == [1]
+          books.search('title:Ne').ids.should == [1]
+        end
       end
 
-      it 'allows removing something' do
-        index.remove 1
-      end
-      it 'is not findable anymore after removing' do
-        books.search('Titl').ids.should == [1]
+      context 'non-partial' do
+        it 'finds the first entry' do
+          books.search('Titl').ids.should == [1]
+        end
 
-        index.remove 1
+        it 'allows removing something' do
+          index.remove 1
+        end
+        it 'is not findable anymore after removing' do
+          books.search('Titl').ids.should == [1]
 
-        books.search('Titl').ids.should == []
-      end
+          index.remove 1
 
-      it 'allows adding something' do
-        index.add Book.new(2, "Title2", "Author2")
-      end
-      it 'is findable after adding' do
-        books.search('Titl').ids.should == [1]
+          books.search('Titl').ids.should == []
+        end
 
-        index.add Book.new(2, "Title New", "Author New")
+        it 'allows adding something' do
+          index.add Book.new(2, "Title2", "Author2")
+        end
+        it 'is findable after adding' do
+          books.search('Titl').ids.should == [1]
 
-        books.search('Titl').ids.should == [2,1]
-      end
+          index.add Book.new(2, "Title New", "Author New")
 
-      it 'allows replacing something' do
-        index.replace Book.new(1, "Title New", "Author New")
-      end
-      it 'is findable after replacing' do
-        books.search('Ne').ids.should == []
+          books.search('Titl').ids.should == [2,1]
+        end
 
-        index.replace Book.new(1, "Title New", "Author New")
+        it 'allows replacing something' do
+          index.replace Book.new(1, "Title New", "Author New")
+        end
+        it 'is findable after replacing' do
+          books.search('Ne').ids.should == []
 
-        books.search('Ne').ids.should == [1, 1]
-      end
-      it 'handles more complex cases' do
-        books.search('Ne').ids.should == []
+          index.replace Book.new(1, "Title New", "Author New")
 
-        index.replace Book.new(1, "Title New", "Author New")
+          books.search('Ne').ids.should == [1, 1]
+        end
+        it 'handles more complex cases' do
+          books.search('Ne').ids.should == []
 
-        books.search('title:Ne').ids.should == [1]
-      end
-      it 'handles more complex cases' do
-        index.remove 1
+          index.replace Book.new(1, "Title New", "Author New")
 
-        books.search('Titl').ids.should == []
+          books.search('title:Ne').ids.should == [1]
+        end
+        it 'handles more complex cases' do
+          index.remove 1
 
-        index.replace Book.new(1, "Title New", "Author New")
+          books.search('Titl').ids.should == []
 
-        books.search('title:Ne').ids.should == [1]
-      end
-    end
+          index.replace Book.new(1, "Title New", "Author New")
 
-    context 'similarity' do
-      it 'finds the first entry' do
-        books.search('Authr~').ids.should == [1]
+          books.search('title:Ne').ids.should == [1]
+        end
       end
 
-      it 'allows removing something' do
-        index.remove 1
-      end
-      it 'is not findable anymore after removing' do
-        books.search('Authr~').ids.should == [1]
+      context 'similarity' do
+        it 'finds the first entry' do
+          books.search('Authr~').ids.should == [1]
+        end
 
-        index.remove 1
+        it 'allows removing something' do
+          index.remove 1
+        end
+        it 'is not findable anymore after removing' do
+          books.search('Authr~').ids.should == [1]
 
-        books.search('Authr~').ids.should == []
-      end
+          index.remove 1
 
-      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]
+          books.search('Authr~').ids.should == []
+        end
 
-        index.add Book.new(2, "Title New", "Author New")
+        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]
 
-        books.search('Authr~').ids.should == [2,1]
-      end
+          index.add Book.new(2, "Title New", "Author New")
 
-      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 == []
+          books.search('Authr~').ids.should == [2,1]
+        end
 
-        index.replace Book.new(1, "Title New", "Author New")
+        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 == []
 
-        books.search('Nuw~').ids.should == [1]
-      end
-      it 'handles more complex cases' do
-        books.search('Now~').ids.should == []
+          index.replace Book.new(1, "Title New", "Author New")
 
-        index.replace Book.new(1, "Title New", "Author New")
+          books.search('Nuw~').ids.should == [1]
+        end
+        it 'handles more complex cases' do
+          books.search('Now~').ids.should == []
 
-        books.search('author:Now~').ids.should == [1]
-      end
-      it 'handles more complex cases' do
-        index.remove 1
+          index.replace Book.new(1, "Title New", "Author New")
 
-        books.search('Athr~').ids.should == []
+          books.search('author:Now~').ids.should == [1]
+        end
+        it 'handles more complex cases' do
+          index.remove 1
 
-        index.replace Book.new(1, "Title New", "Author New")
+          books.search('Athr~').ids.should == []
 
-        books.search('author:Athr~').ids.should == [1]
-      end
-      it 'handles more complex cases' do
-        books.search('Athr~').ids.should == [1]
+          index.replace Book.new(1, "Title New", "Author New")
 
-        index.replace Book.new(2, "Title New", "Author New")
-        index.add Book.new(3, "TTL", "AUTHR")
+          books.search('author:Athr~').ids.should == [1]
+        end
+        it 'handles more complex cases' do
+          books.search('Athr~').ids.should == [1]
 
-        # Note: [2, 1] are in one allocation, [3] in the other.
-        #
-        books.search('author:Athr~').ids.should == [2, 1, 3]
+          index.replace Book.new(2, "Title New", "Author New")
+          index.add Book.new(3, "TTL", "AUTHR")
+
+          # Note: [2, 1] are in one allocation, [3] in the other.
+          #
+          books.search('author:Athr~').ids.should == [2, 1, 3]
+        end
       end
     end
   end

data/spec/functional/static_spec.rb

@@ -24,7 +24,7 @@ describe "static option" do
     try.search("text:ohai").ids.should == [1, 2]
   end
   
-  it 'still adds to the realtime index' do
+  it 'does not add to the realtime index' do
     index = Picky::Index.new :static do
       static
       
@@ -34,7 +34,7 @@ describe "static option" do
     index.add OpenStruct.new id: 1, text: "ohai"
     index.add OpenStruct.new id: 2, text: "ohai kthxbye"
                      
-    index[:text].exact.realtime.should == { 1 => ["ohai"], 2 => ["ohai", "kthxbye"] }
+    index[:text].exact.realtime.should == {}
 
     try = Picky::Search.new index
     try.search("text:ohai").ids.should == [2, 1]

data/spec/lib/backends/redis/basic_spec.rb

@@ -11,7 +11,7 @@ describe Picky::Backends::Redis::Basic do
       it 'is nothing they do (at least on the backend)' do
         backend.should_receive(:client).never
 
-        backend.load
+        backend.load false
         backend.retrieve
       end
     end

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

@@ -46,7 +46,7 @@ describe Picky::Backends::SQLite::Array do
 
     describe 'load' do
       it 'returns a copy of itself' do
-        db.load.should == db
+        db.load(:anything).should == db
       end
     end
 
@@ -111,7 +111,7 @@ describe Picky::Backends::SQLite::Array do
 
     describe 'load' do
       it 'returns a copy of itself' do
-        db.load.should == db
+        db.load(:anything).should == db
       end
     end
 

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

@@ -49,7 +49,7 @@ describe Picky::Backends::SQLite::Value do
 
     describe 'load' do
       it 'returns a copy of itself' do
-        db.load.should == db
+        db.load(:anything).should == db
       end
     end
 

data/spec/lib/bundle_indexed_spec.rb

@@ -106,12 +106,12 @@ describe Picky::Bundle do
       @bundle.dump # Create an index first.
     end
     it 'should trigger loads' do
-      @bundle.should_receive(:load_inverted).once.with no_args
-      @bundle.should_receive(:load_weights).once.with no_args
-      @bundle.should_receive(:load_similarity).once.with no_args
+      @bundle.should_receive(:load_inverted).once.with :something
+      @bundle.should_receive(:load_weights).once.with :something
+      @bundle.should_receive(:load_similarity).once.with :something
       @bundle.should_receive(:load_configuration).once.with no_args
 
-      @bundle.load
+      @bundle.load :something
     end
   end
   describe "loading indexes" do
@@ -124,7 +124,7 @@ describe Picky::Bundle do
 
         File.should_receive(:open).once.with 'spec/temp/index/test/some_index/some_category_some_name_inverted.memory.json', 'r'
 
-        @bundle.load_inverted
+        @bundle.load_inverted :anything
       end
     end
     describe "load_weights" do
@@ -133,7 +133,7 @@ describe Picky::Bundle do
 
         File.should_receive(:open).once.with 'spec/temp/index/test/some_index/some_category_some_name_weights.memory.json', 'r'
 
-        @bundle.load_weights
+        @bundle.load_weights :anything
       end
     end
     describe "load_similarity" do
@@ -142,7 +142,7 @@ describe Picky::Bundle do
 
         File.should_receive(:open).once.with 'spec/temp/index/test/some_index/some_category_some_name_similarity.memory.dump', 'r:binary'
 
-        @bundle.load_similarity
+        @bundle.load_similarity :anything
       end
     end
     describe "load_configuration" do

data/spec/lib/query/token_spec.rb

@@ -75,8 +75,7 @@ describe Picky::Query::Token do
     let(:token) { described_class.processed 'similar~', 'Similar~' }
     context 'with similar' do
       before(:each) do
-        @bundle   = double :bundle, :similar => ['array', 'of', 'similar']
-        @category = double :category, :bundle_for => @bundle
+        @category = double :category, :similar => ['array', 'of', 'similar']
       end
       it 'returns a list of tokens' do
         token.similar_tokens_for(@category).each do |token|
@@ -102,8 +101,7 @@ describe Picky::Query::Token do
     end
     context 'without similar' do
       before(:each) do
-        @bundle   = double :bundle, :similar => []
-        @category = double :category, :bundle_for => @bundle
+        @category = double :category, :similar => []
       end
       it 'returns an empty list' do
         token.similar_tokens_for(@category).should == []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 4.30.0
+  version: 4.31.0
 platform: ruby
 authors:
 - Florian Hanke
@@ -238,6 +238,7 @@ files:
 - spec/functional/ignore_spec.rb
 - spec/functional/max_allocations_spec.rb
 - spec/functional/memory_leak_spec.rb
+- spec/functional/memory_usage_spec.rb
 - spec/functional/multi_index_qualifier_spec.rb
 - spec/functional/no_dump_hint_spec.rb
 - spec/functional/no_tokenize_spec.rb
@@ -396,7 +397,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: http://rubyforge.org/projects/picky
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: 'Picky: Semantic Search Engine. Clever Interface. Good Tools.'
@@ -425,6 +426,7 @@ test_files:
 - spec/functional/ignore_spec.rb
 - spec/functional/max_allocations_spec.rb
 - spec/functional/memory_leak_spec.rb
+- spec/functional/memory_usage_spec.rb
 - spec/functional/multi_index_qualifier_spec.rb
 - spec/functional/no_dump_hint_spec.rb
 - spec/functional/no_tokenize_spec.rb