picky 3.6.10 → 3.6.11

data/lib/picky/backends/redis.rb

@@ -156,27 +156,35 @@ module Picky
 
                 result_id = generate_intermediate_result_id
 
-                # Intersect and store.
+                # Little optimization.
                 #
-                intersected = client.zinterstore result_id, identifiers
-
-                # Return clean and early if there has been no intersection.
+                # TODO Include in the scripting version as well.
                 #
-                if intersected.zero?
-                  client.del result_id
-                  return []
-                end
+                if identifiers.size > 1
+                  # Intersect and store.
+                  #
+                  intersected = client.zinterstore result_id, identifiers
 
-                # Get the stored result.
-                #
-                results = client.zrange result_id, offset, (offset + amount)
+                  # Return clean and early if there has been no intersection.
+                  #
+                  if intersected.zero?
+                    client.del result_id
+                    return []
+                  end
 
-                # Delete the stored result as it was only for temporary purposes.
-                #
-                # Note: I could also not delete it, but that
-                #       would not be clean at all.
-                #
-                client.del result_id
+                  # Get the stored result.
+                  #
+                  results = client.zrange result_id, offset, (offset + amount)
+
+                  # Delete the stored result as it was only for temporary purposes.
+                  #
+                  # Note: I could also not delete it, but that
+                  #       would not be clean at all.
+                  #
+                  client.del result_id
+                else
+                  results = client.zrange identifiers.first, offset, (offset + amount)
+                end
 
                 results
               end

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

@@ -25,9 +25,7 @@ module Picky
           res = db.execute "SELECT value FROM key_value WHERE key = ? LIMIT 1",
                            key.to_s
 
-          return nil unless res
-
-          array = res.empty? ? [] : Yajl::Parser.parse(res.first.first)
+          array = res.blank? ? [] : Yajl::Parser.parse(res.first.first)
           DirectlyManipulable.make self, array, key
           array
         end

data/lib/picky/bundle.rb

@@ -59,7 +59,7 @@ module Picky
       reset_backend
     end
     def identifier
-      "#{category.identifier}:#{name}"
+      :"#{category.identifier}:#{name}"
     end
 
     # If no specific backend has been set,
@@ -127,11 +127,13 @@ module Picky
     def similar text
       code = similarity_strategy.encoded text
       similar_codes = code && @similarity[code]
-      if similar_codes
-        similar_codes = similar_codes.dup # TODO
+      if similar_codes.blank?
+        [] # Return a simple array.
+      else
+        similar_codes = similar_codes.dup
         similar_codes.delete text
+        similar_codes
       end
-      similar_codes || []
     end
 
     # If a key format is set, use it, else delegate to the category.

data/lib/picky/bundle_realtime.rb

@@ -7,21 +7,24 @@ module Picky
     def remove id
       # Is it anywhere?
       #
-      syms = @realtime[id]
-      return unless syms
+      str_or_syms = @realtime[id]
 
-      syms.each do |sym|
-        ids = @inverted[sym]
+      return if str_or_syms.blank?
+
+      str_or_syms.each do |str_or_sym|
+        ids = @inverted[str_or_sym]
         ids.delete id
 
         if ids.empty?
-          @inverted.delete sym
-          @weights.delete  sym
+          @inverted.delete str_or_sym
+          @weights.delete  str_or_sym
+
           # Since no element uses this sym anymore, we can delete the similarity for it.
           # TODO Not really. Since multiple syms can point to the same encoded.
-          @similarity.delete self.similarity_strategy.encoded(sym)
+          #
+          @similarity.delete self.similarity_strategy.encoded(str_or_sym)
         else
-          @weights[sym] = self.weights_strategy.weight_for ids.size
+          @weights[str_or_sym] = self.weights_strategy.weight_for ids.size
         end
       end
 
@@ -31,7 +34,7 @@ module Picky
     # Returns a reference to the array where the id has been added.
     #
     def add id, str_or_sym, where = :unshift
-      str_or_syms = @realtime[id] || (@realtime[id] = [])
+      str_or_syms = @realtime[id] ||= []
 
       # Inverted.
       #
@@ -46,7 +49,7 @@ module Picky
 
         # TODO Introduce a new method?
         #
-        ids = @inverted[str_or_sym] || (@inverted[str_or_sym] = []) # Ensures that we get an extended Array
+        ids = @inverted[str_or_sym] ||= []
         ids.send where, id
       end
 
@@ -69,12 +72,12 @@ module Picky
     #
     def add_similarity str_or_sym, where = :unshift
       if encoded = self.similarity_strategy.encoded(str_or_sym)
-        similarity = @similarity[encoded] || (@similarity[encoded] = []) # Ensures that we get an extended Array
+        similars = @similarity[encoded] ||= []
 
         # Not completely correct, as others will also be affected, but meh.
         #
-        similarity.delete str_or_sym if similarity.include? str_or_sym
-        similarity.send where, str_or_sym
+        similars.delete str_or_sym if similars.include? str_or_sym
+        similars.send where, str_or_sym
       end
     end
 
@@ -96,8 +99,7 @@ module Picky
       clear_realtime
       @inverted.each_pair do |str_or_sym, ids|
         ids.each do |id|
-          str_or_syms = @realtime[id]
-          str_or_syms = (@realtime[id] = []) unless str_or_syms # TODO Nicefy.
+          str_or_syms = @realtime[id] ||= []
           @realtime[id] << str_or_sym unless str_or_syms.include? str_or_sym
         end
       end

data/lib/picky/category.rb

@@ -136,7 +136,7 @@ module Picky
     # Identifier for technical output.
     #
     def identifier
-      "#{@index.identifier}:#{name}"
+      :"#{@index.identifier}:#{name}"
     end
 
     #

data/lib/picky/console.rb

@@ -7,7 +7,7 @@ module Picky
   #
   class Console
 
-    def self.start *args
+    def self.start args = ARGV
       irb = 'irb'
 
       require 'optparse'

data/lib/picky/query/combination.rb

@@ -46,7 +46,7 @@ module Picky
       # The identifier for this combination.
       #
       def identifier
-        "#{category.bundle_for(token).identifier}:#{token.identifier}"
+        @identifier ||= "#{category.bundle_for(token).identifier}:inverted:#{token.text}"
       end
 
       # Note: Required for uniq!
@@ -54,7 +54,7 @@ module Picky
       # TODO Ok with category or is the bundle needed?
       #
       def hash
-        [token.to_s, category].hash
+        [token, category].hash
       end
 
       # Combines the category names with the original names.
@@ -71,7 +71,7 @@ module Picky
       #  "exact title:Peter*:peter"
       #
       def to_s
-        "#{category.bundle_for(token).identifier} #{to_result.join(':')}"
+        "#{category.bundle_for(token).identifier}(#{to_result.join(':')})"
       end
 
     end

data/lib/picky/query/combinations.rb

@@ -54,6 +54,12 @@ module Picky
         @combinations.map &:to_result
       end
 
+      #
+      #
+      def to_s
+        @combinations.to_s
+      end
+
     end
 
   end

data/lib/picky/wrappers/category/exact_first.rb

@@ -25,6 +25,9 @@ module Picky
                  :dump,
                  :load,
 
+                 :bundle_for,
+                 :build_realtime_mapping,
+
                  :to => :@category
 
         def initialize category

data/spec/functional/backends/memory_bundle_realtime_spec.rb

@@ -17,16 +17,16 @@ describe Picky::Bundle do
                                         backend: Picky::Backends::Memory.new
   end
 
-  it 'is by default an SQLite Array' do
+  it 'is by default a Hash' do
     @bundle.realtime.should be_kind_of(Hash)
   end
-  it 'is by default an SQLite Array' do
+  it 'is by default a Hash' do
     @bundle.inverted.should be_kind_of(Hash)
   end
-  it 'is by default an SQLite Value' do
+  it 'is by default a Hash' do
     @bundle.weights.should be_kind_of(Hash)
   end
-  it 'is by default an SQLite Array' do
+  it 'is by default a Hash' do
     @bundle.similarity.should be_kind_of(Hash)
   end
 

data/spec/functional/max_allocations_spec.rb

@@ -58,7 +58,7 @@ describe 'Search#max_allocations' do
 
     performance_of do
       try_again.search('hello world')
-    end.should < (threshold*2/3)
+    end.should < (threshold*7/9)
   end
 
 end

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

@@ -10,6 +10,18 @@ describe Picky::Backends::Redis::DirectlyManipulable do
     list
   end
 
+  context 'problem cases' do
+    it 'does not dup its special abilities' do
+      list = [1,2]
+      described_class.make backend, list, 'some:key'
+      dupped_list = list.dup
+
+      client.should_receive(:zadd).never
+
+      dupped_list << 1
+    end
+  end
+
   context 'stubbed backend' do
     before(:each) do
       backend.stub! :[]

data/spec/lib/bundle_spec.rb

@@ -16,7 +16,7 @@ describe Picky::Bundle do
 
   describe 'identifier' do
     it 'is correct' do
-      bundle.identifier.should == 'some_index:some_category:some_name'
+      bundle.identifier.should == :'some_index:some_category:some_name'
     end
   end
 

data/spec/lib/indexed/bundle_spec.rb

@@ -73,7 +73,7 @@ describe Picky::Bundle do
 
   describe 'identifier' do
     it 'should return a specific identifier' do
-      @bundle.identifier.should == 'some_index:some_category:some_name'
+      @bundle.identifier.should == :'some_index:some_category:some_name'
     end
   end
 

data/spec/lib/indexing/bundle_spec.rb

@@ -11,8 +11,8 @@ describe Picky::Bundle do
   let(:bundle) { described_class.new :some_name, @category, @weights, :some_partial, @similarity }
 
   describe 'identifier' do
-    it 'is correct' do
-      bundle.identifier.should == 'some_index:some_category:some_name'
+    it 'should return a specific identifier' do
+      bundle.identifier.should == :'some_index:some_category:some_name'
     end
   end
 
@@ -35,12 +35,6 @@ describe Picky::Bundle do
     end
   end
 
-  describe 'identifier' do
-    it 'should return a specific identifier' do
-      bundle.identifier.should == 'some_index:some_category:some_name'
-    end
-  end
-
   describe 'dump' do
     it 'should trigger dumps' do
       bundle.stub! :timed_exclaim

data/spec/lib/query/combination_spec.rb

@@ -19,13 +19,13 @@ describe Picky::Query::Combination do
     it "shows the combination's info" do
       @token.stub! :to_result => :token_result
 
-      @combination.to_s.should == 'bundle_name some_category_name:token_result'
+      @combination.to_s.should == 'bundle_name(some_category_name:token_result)'
     end
   end
 
   describe 'hash' do
     it 'should hash the token and the bundle' do
-      @combination.hash.should == [@token.to_s, @category].hash
+      @combination.hash.should == [@token, @category].hash
     end
   end
 
@@ -49,7 +49,7 @@ describe Picky::Query::Combination do
 
   describe 'identifier' do
     it 'should get the category name from the bundle' do
-      @combination.identifier.should == "bundle_name:similarity:some_text"
+      @combination.identifier.should == "bundle_name:inverted:some_text"
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 3.6.10
+  version: 3.6.11
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70314739778860 !ruby/object:Gem::Requirement
+  requirement: &70356380283200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70314739778860
+  version_requirements: *70356380283200
 - !ruby/object:Gem::Dependency
   name: picky-client
-  requirement: &70314739778280 !ruby/object:Gem::Requirement
+  requirement: &70356380282520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.6.10
+        version: 3.6.11
   type: :development
   prerelease: false
-  version_requirements: *70314739778280
+  version_requirements: *70356380282520
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70314739777820 !ruby/object:Gem::Requirement
+  requirement: &70356380282100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70314739777820
+  version_requirements: *70356380282100
 - !ruby/object:Gem::Dependency
   name: rack_fast_escape
-  requirement: &70314739777360 !ruby/object:Gem::Requirement
+  requirement: &70356380281640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70314739777360
+  version_requirements: *70356380281640
 - !ruby/object:Gem::Dependency
   name: text
-  requirement: &70314739776940 !ruby/object:Gem::Requirement
+  requirement: &70356380281200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70314739776940
+  version_requirements: *70356380281200
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70314739776520 !ruby/object:Gem::Requirement
+  requirement: &70356380280720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70314739776520
+  version_requirements: *70356380280720
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70314739776020 !ruby/object:Gem::Requirement
+  requirement: &70356380280220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70314739776020
+  version_requirements: *70356380280220
 - !ruby/object:Gem::Dependency
   name: unicorn
-  requirement: &70314739775600 !ruby/object:Gem::Requirement
+  requirement: &70356380279800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70314739775600
+  version_requirements: *70356380279800
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70314739775120 !ruby/object:Gem::Requirement
+  requirement: &70356380279340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70314739775120
+  version_requirements: *70356380279340
 description: Fast Ruby semantic text search engine with comfortable single field interface.
 email: florian.hanke+picky@gmail.com
 executables: