picky 2.1.0 → 2.1.1

data/lib/picky/auxiliary/terminal.rb

@@ -0,0 +1,147 @@
+class Terminal
+
+  attr_reader :client
+
+  def initialize given_uri
+    check_highline_gem
+    check_picky_client_gem
+
+    require 'uri'
+    uri = URI.parse given_uri
+    unless uri.path
+      uri = URI.parse "http://#{given_uri}"
+    end
+    unless uri.path =~ /^\//
+      uri.path = "/#{uri.path}"
+    end
+
+    @searches  = 0
+    @durations = 0
+    @client = Picky::Client.new :host => (uri.host || 'localhost'), :port => (uri.port || 8080), :path => uri.path
+
+    install_trap
+  end
+  def check_highline_gem # :nodoc:
+    require "highline/system_extensions"
+    extend HighLine::SystemExtensions
+  rescue LoadError
+    warn_gem_missing 'highline', 'the terminal interface'
+    exit 1
+  end
+  def check_picky_client_gem # :nodoc:
+    require 'picky-client'
+  rescue LoadError
+    warn_gem_missing 'picky-client', 'the terminal interface'
+    exit 1
+  end
+
+  def install_trap
+    Signal.trap('INT') do
+      print "\e[100D"
+      flush
+      puts "\n"
+      puts "You performed #{@searches} searches, totalling #{"%.3f" % @durations} seconds."
+      print "\e[100D"
+      flush
+      exit
+    end
+  end
+
+  def flush
+    STDOUT.flush
+  end
+  def left amount = 1
+    print "\e[#{amount}D"
+    flush
+  end
+  def right amount = 1
+    print "\e[#{amount}C"
+    flush
+  end
+  def move_to position
+    relative = position - @cursor_offset
+    if relative > 0
+      right relative
+    else
+      left relative
+    end
+    @cursor_offset = position
+    flush
+  end
+  def backspace
+    @current_text.chop!
+    print "\e[1D"
+    print " "
+    print "\e[1D"
+    flush
+  end
+  def write text
+    print text
+    @cursor_offset += text.size
+    flush
+  end
+  def type_search character
+    @current_text << character
+    write character
+  end
+  def write_results results
+    move_to 0
+    write "%9d" % (results && results.total || 0)
+    move_to 10 + @current_text.size
+  end
+  def move_to_ids
+    move_to 10 + @current_text.size + 2
+  end
+  def write_ids results
+    move_to_ids
+    write "=> #{results.total ? results.ids : []}"
+  end
+  def clear_ids
+    move_to_ids
+    write " "*200
+  end
+  def log results
+    @searches += 1
+    @durations += (results[:duration] || 0)
+  end
+  def search full = false
+    client.search @current_text, :ids => (full ? 20 : 0)
+  end
+  def search_and_write full = false
+    results = search full
+    results.extend Picky::Convenience
+
+    log results
+
+    full ? write_ids(results) : clear_ids
+
+    write_results results
+  end
+
+  def run
+    puts "Type and see the result count update. Press enter for the first 20 result ids."
+    puts "Break with Ctrl-C."
+
+    @current_text  = ''
+    @cursor_offset = 0
+    @last_ids      = ''
+    move_to 10
+    search_and_write
+
+    loop do
+      input = get_character
+
+      case input
+      when 127
+        backspace
+        search_and_write
+      when 13
+        search_and_write true
+      else
+        type_search input.chr
+        search_and_write
+      end
+    end
+  end
+
+end

data/lib/picky/indexing/indexes.rb

@@ -37,8 +37,6 @@ module Indexing # :nodoc:all
 
     # Runs the indexers in parallel (index + cache).
     #
-    # TODO Spec.
-    #
     def index randomly = true
       take_snapshot
 

data/lib/picky/internals/ext/ruby19/performant.c

@@ -2,7 +2,7 @@
 
 // Copying internal ruby methods.
 //
-static inline VALUE rb_ary_elt(ary, offset)
+inline VALUE rb_ary_elt(ary, offset)
     VALUE ary;
     long offset;
 {
@@ -12,7 +12,7 @@ static inline VALUE rb_ary_elt(ary, offset)
     }
     return RARRAY_PTR(ary)[offset];
 }
-static VALUE ary_make_hash(ary1, ary2)
+inline VALUE ary_make_hash(ary1, ary2)
     VALUE ary1, ary2;
 {
     VALUE hash = rb_hash_new();
@@ -28,48 +28,53 @@ static VALUE ary_make_hash(ary1, ary2)
     }
     return hash;
 }
+inline VALUE rb_ary_length(VALUE ary) {
+  long length = RARRAY_LEN(ary);
+  return LONG2NUM(length);
+}
 
-// This version just calls the & consecutively for all arrays.
-// 
-// The arrays need to be pre-sorted small to large.
-// 
-inline VALUE memory_efficient_intersect(VALUE self, VALUE length_sorted_array_of_arrays) {
+// This version:
+//  * orders the arrays by ascending size, small to large.
+//  * calls the & consecutively for all arrays.
+//
+inline VALUE memory_efficient_intersect(VALUE self, VALUE unsorted_array_of_arrays) {
   // Counters.
   //
   long i, j;
-  
+
   // Vars.
   //
   struct RArray *rb_array_of_arrays;
   VALUE smallest_array;
   VALUE current_array;
   VALUE hash;
-  
+
   // Temps.
   //
   VALUE v, vv;
-  
-  // Conversions.
+
+  // Conversions & presorting.
   //
-  rb_array_of_arrays = RARRAY(length_sorted_array_of_arrays);
+  rb_array_of_arrays = rb_block_call(unsorted_array_of_arrays, rb_intern("sort_by!"), 0, 0, rb_ary_length, 0);
   smallest_array     = (VALUE) RARRAY(rb_ary_dup(RARRAY_PTR(rb_array_of_arrays)[0]));
-  
+
   // Iterate through all arrays.
   //
   for (i = 1; i < RARRAY_LEN(rb_array_of_arrays); i++) {
     // Break if the smallest array is empty
+    //
     if (RARRAY_LEN(smallest_array) == 0) {
       break;
     }
-    
+
     // Make a hash from the currently smallest version.
     //
     hash = ary_make_hash(smallest_array, 0);
-    
+
     // Clear for use as temp array.
     //
     rb_ary_clear(smallest_array);
-    
+
     // Iterate through all array elements.
     //
     current_array = RARRAY_PTR(rb_array_of_arrays)[i];
@@ -80,7 +85,7 @@ inline VALUE memory_efficient_intersect(VALUE self, VALUE length_sorted_array_of
       }
     }
   }
-  
+
   return smallest_array;
 }
 

data/lib/picky/internals/index/redis/list_hash.rb

@@ -8,8 +8,6 @@ module Internals
 
         # Writes the hash into Redis.
         #
-        # TODO Performance: rpush as you get the values instead of putting it together in an array first.
-        #
         def dump hash
           hash.each_pair do |key, values|
             redis_key = "#{namespace}:#{key}"

data/lib/picky/internals/indexed/bundle/redis.rb

@@ -34,7 +34,7 @@ module Internals
         def weight sym
           @backend.weight sym
         end
-        # TODO Spec. Doc.
+        # Settings of this bundle can be accessed via [].
         #
         def [] sym
           @backend.setting sym

data/lib/picky/internals/indexed/category.rb

@@ -67,8 +67,6 @@ CATEGORY
       #
       # Note: The idea is not to run this while the search engine is running.
       #
-      # TODO Spec. Identifier is ok?
-      #
       def analyze collector
         collector[identifier] = {
           :exact   => Analyzer.new.analyze(exact),

data/lib/picky/internals/indexers/solr.rb

@@ -1,8 +1,10 @@
 # encoding: utf-8
 #
 require 'rsolr'
+
 module Indexers
-  # TODO Deprecated. This should be handled in a special bundle which goes through Solr.
+
+  # Deprecated. Only here as an example.
   #
   class Solr
 
@@ -19,19 +21,19 @@ module Indexers
     def index
       timed_exclaim "Indexing solr for #{type.name}:#{fields.join(', ')}"
       statement = "SELECT indexed_id, #{fields.join(',')} FROM #{type.snapshot_table_name}"
-      
+
       DB.connect
       results   = DB.connection.execute statement
-      
-      return unless results # TODO check
-      
+
+      return unless results
+
       type_name = @type.name.to_s
-      
+
       solr.delete_by_query "type:#{type_name}"
       solr.commit
-      
+
       documents = []
-      
+
       results.each do |indexed_id, *values|
         values.each &:downcase!
         documents << hashed(values).merge(id: indexed_id, type: type_name)

data/lib/picky/internals/indexing/bundle/base.rb

@@ -194,9 +194,6 @@ module Internals
           raise_cache_missing :similarity unless backend.similarity_cache_ok?
         end
 
-        # TODO Spec on down.
-        #
-
         # Warns the user if the core or weights indexes are small.
         #
         def warn_if_index_small

data/lib/picky/internals/indexing/bundle/super_base.rb

@@ -1,6 +1,6 @@
 module Internals
 
-  # FIXME Merge into Base, extract common with Indexed::Base.
+  # TODO Merge into Base, extract common with Indexed::Base.
   #
   module Indexing # :nodoc:all
     # A Bundle is a number of indexes
@@ -10,7 +10,7 @@ module Internals
     # * *core* index (always used)
     # * *weights* index (always used)
     # * *similarity* index (used with similarity)
-    # 
+    #
     # In Picky, indexing is separated from the index
     # handling itself through a parallel structure.
     #
@@ -24,27 +24,27 @@ module Internals
     #   memory and looking up search data as fast as possible.
     #
     module Bundle
-    
+
       class SuperBase
-    
+
         attr_reader   :identifier, :files
         attr_accessor :index, :weights, :similarity, :configuration, :similarity_strategy
-    
+
         delegate :clear,    :to => :index
         delegate :[], :[]=, :to => :configuration
-    
+
         def initialize name, configuration, similarity_strategy
           @identifier = "#{configuration.identifier}:#{name}"
           @files      = Internals::Index::Files.new name, configuration
-      
+
           @index         = {}
           @weights       = {}
           @similarity    = {}
           @configuration = {} # A hash with config options.
-      
+
           @similarity_strategy = similarity_strategy
         end
-    
+
         # Get a list of similar texts.
         #
         # Note: Does not return itself.
@@ -55,11 +55,11 @@ module Internals
           similar_codes.delete text if similar_codes
           similar_codes || []
         end
-    
+
       end
-    
+
     end
-  
+
   end
-  
+
 end

data/lib/picky/internals/indexing/category.rb

@@ -12,16 +12,17 @@ module Internals
       # Mandatory params:
       #  * name: Category name to use as identifier and file names.
       #  * index: Index to which this category is attached to.
+      #
       # Options:
       #  * partial: Partial::None.new, Partial::Substring.new(from:start_char, to:up_to_char) (defaults from:-3, to:-1)
       #  * similarity: Similarity::None.new (default), Similarity::DoubleMetaphone.new(amount_of_similarly_linked_words)
       #  * source: Use if the category should use a different source.
       #  * from: The source category identifier to take the data from.
       #
-      # Advanced Options (TODO):
+      # Advanced Options:
       #
-      #  * weights:
-      #  * tokenizer:
+      #  * weights: Query::Weights.new( [:category1, :category2] => +2, ... )
+      #  * tokenizer: Use a subclass of Tokenizers::Base that implements #tokens_for and #empty_tokens.
       #
       # TODO Should source be not optional, or taken from the index?
       #

data/lib/picky/internals/query/allocations.rb

@@ -42,8 +42,6 @@ module Internals
       #
       # Only those passed in are removed.
       #
-      # TODO Rewrite.
-      #
       def remove identifiers = []
         @allocations.each { |allocation| allocation.remove identifiers } unless identifiers.empty?
       end

data/lib/picky/internals/query/combinations/memory.rb

@@ -21,31 +21,25 @@ module Internals
         # 1. [2, 30, 400, 100_000]
         # 2. (100_000 & (400 & (30 & 2))) # => result
         #
-        # Note: Uses a C-optimized intersection routine for speed and memory efficiency.
+        # Note: Uses a C-optimized intersection routine (in performant.c)
+        #       for speed and memory efficiency.
         #
         # Note: In the memory based version we ignore the (amount) needed hint.
-        #       We might use the fact to optimize the algorithm.
+        #       We cannot use the information to speed up the algorithm, unfortunately.
         #
         def ids _, _
           return [] if @combinations.empty?
 
           # Get the ids for each combination.
           #
-          # TODO For combinations with Redis
-          #
           id_arrays = @combinations.inject([]) do |total, combination|
             total << combination.ids
           end
 
-          # Order by smallest size first such that the intersect can be performed faster.
-          #
-          # TODO Move into the memory_efficient_intersect such that
-          #      this precondition for a fast algorithm is always given.
-          #
-          id_arrays.sort! { |this_array, that_array| this_array.size <=> that_array.size }
-
           # Call the optimized C algorithm.
           #
+          # Note: It orders the passed arrays by size.
+          #
           Performant::Array.memory_efficient_intersect id_arrays
         end
 

data/lib/picky/internals/query/indexes.rb

@@ -25,11 +25,36 @@ module Internals
         @indexes           = index_definitions.map &:indexed
       end
 
-      # Returns a number of possible allocations for the given tokens.
+      # Returns a number of prepared (sorted, reduced etc.) allocations for the given tokens.
       #
-      def sorted_allocations_for tokens
+      def prepared_allocations_for tokens, weights = {}
+        allocations = allocations_for tokens
+
+        # Remove double allocations.
+        #
+        allocations.uniq
+
+        # Score the allocations using weights as bias.
+        #
+        allocations.calculate_score weights
+
+        # Sort the allocations.
+        # (allocations are sorted according to score, highest to lowest)
+        #
+        allocations.sort!
 
+        # Reduce the amount of allocations.
+        #
+        # allocations.reduce_to some_amount
+
+        # Remove identifiers from allocations.
+        #
+        # allocations.remove some_array_of_identifiers_to_remove
+
+        allocations
       end
+      # Returns a number of possible allocations for the given tokens.
+      #
       def allocations_for tokens
         Allocations.new allocations_ary_for(tokens)
       end

data/lib/picky/internals/query/tokens.rb

@@ -14,11 +14,17 @@ module Internals
       #
       self.delegate *[Enumerable.instance_methods, :slice!, :[], :uniq!, :last, :reject!, :length, :size, :empty?, :each, :exit, { :to => :@tokens }].flatten
 
-      #
+      # Create a new Tokens object with the array of tokens passed in.
       #
       def initialize tokens = []
         @tokens = tokens
       end
+
+      # Creates a new Tokens object from a number of Strings.
+      #
+      # Options:
+      #  * downcase: Whether to downcase the passed strings (default is true)
+      #
       def self.processed words, downcase = true
         new words.collect! { |word| Token.processed word, downcase }
       end

data/lib/picky/search.rb

@@ -14,8 +14,8 @@ class Search
   include Helpers::Measuring
 
   attr_reader   :indexes
-  attr_writer   :tokenizer, :identifiers_to_remove
-  attr_accessor :reduce_to_amount, :weights
+  attr_writer   :tokenizer
+  attr_accessor :weights
 
   # Takes:
   # * A number of indexes
@@ -23,6 +23,8 @@ class Search
   #   * tokenizer: Tokenizers::Query.default by default.
   #   * weights:   A hash of weights, or a Query::Weights object.
   #
+  # TODO Add identifiers_to_remove (rename) and reduce_allocations_to_amount (rename).
+  #
   def initialize *index_definitions
     options      = Hash === index_definitions.last ? index_definitions.pop : {}
 
@@ -113,58 +115,8 @@ class Search
 
   # Gets sorted allocations for the tokens.
   #
-  # This generates the possible allocations, sorted.
-  #
-  # TODO Smallify.
-  #
-  # TODO Rename: allocations
-  #
   def sorted_allocations tokens # :nodoc:
-    # Get the allocations.
-    #
-    # TODO Pass in reduce_to_amount (aka max_allocations)
-    #
-    # TODO uniq, score, sort in there
-    #
-    allocations = @indexes.allocations_for tokens
-
-    # Callbacks.
-    #
-    # TODO Reduce before sort?
-    #
-    reduce allocations
-    remove_from allocations
-
-    # Remove double allocations.
-    #
-    allocations.uniq
-
-    # Score the allocations using weights as bias.
-    #
-    allocations.calculate_score weights
-
-    # Sort the allocations.
-    # (allocations are sorted according to score, highest to lowest)
-    #
-    allocations.sort!
-
-    # Return the allocations.
-    #
-    allocations
-  end
-  def reduce allocations # :nodoc:
-    allocations.reduce_to reduce_to_amount if reduce_to_amount
-  end
-
-  #
-  #
-  def remove_from allocations # :nodoc:
-    allocations.remove identifiers_to_remove
-  end
-  #
-  #
-  def identifiers_to_remove # :nodoc:
-    @identifiers_to_remove ||= []
+    @indexes.prepared_allocations_for tokens, weights
   end
 
   # Display some nice information for the user.

data/lib/tasks/search.rake

@@ -0,0 +1,7 @@
+# Tasks for testing your engine configuration in the terminal.
+#
+task :search do
+  load File.expand_path '../../picky/auxiliary/terminal.rb', __FILE__
+  terminal = Terminal.new ARGV[1] || raise("Usage:\n  rake search <URL>\n  E.g. rake search /books\n       rake search localhost:8080/books")
+  terminal.run
+end

data/spec/ext/performant_spec.rb

@@ -5,44 +5,43 @@ describe Performant::Array do
   describe "memory_efficient_intersect" do
     it "should intersect empty arrays correctly" do
       arys = [[3,4], [1,2,3], []]
-
-      Performant::Array.memory_efficient_intersect(arys.sort_by(&:size)).should == []
+    
+      Performant::Array.memory_efficient_intersect(arys).should == []
     end
     it "should handle intermediate empty results correctly" do
       arys = [[5,4], [1,2,3], [3,4,5,8,9]]
-
-      Performant::Array.memory_efficient_intersect(arys.sort_by(&:size)).should == []
+    
+      Performant::Array.memory_efficient_intersect(arys).should == []
     end
     it "should intersect correctly" do
       arys = [[3,4], [1,2,3], [3,4,5,8,9]]
-
-      Performant::Array.memory_efficient_intersect(arys.sort_by(&:size)).should == [3]
+    
+      Performant::Array.memory_efficient_intersect(arys).should == [3]
     end
     it "should intersect correctly again" do
-      arys = [[3,4,5,6,7], [1,2,3,5,6,7], [3,4,5,6,7,8,9]]
-
-      Performant::Array.memory_efficient_intersect(arys.sort_by(&:size)).should == [3,5,6,7]
+      arys = [[1,2,3,5,6,7], [3,4,5,6,7,8,9], [3,4,5,6,7]]
+      Performant::Array.memory_efficient_intersect(arys).should == [3,5,6,7]
     end
     it "should intersect many arrays" do
       arys = [[3,4,5,6,7], [1,2,3,5,6,7], [3,4,5,6,7,8,9], [1,2,3,4,5,6,7,8,9,10], [2,3,5,6,7,19], [1,2,3,4,5,6,7,8,9,10], [2,3,5,6,7,19]]
-
-      Performant::Array.memory_efficient_intersect(arys.sort_by(&:size)).should == [3,5,6,7]
+    
+      Performant::Array.memory_efficient_intersect(arys).should == [3,5,6,7]
     end
     it "should handle random arrays" do
       proto = Array.new(100, 3_500_000)
       arys = [proto.map { |e| rand e }, proto.map { |e| rand e }, proto.map { |e| rand e }]
-
-      Performant::Array.memory_efficient_intersect(arys.sort_by(&:size)).should == arys.inject(arys.shift.dup) { |total, ary| total & arys }
+    
+      Performant::Array.memory_efficient_intersect(arys).should == arys.inject(arys.shift.dup) { |total, ary| total & arys }
     end
     it "should be optimal for 2 small arrays of 50/10_000" do
       arys = [(1..50).to_a, (10_000..20_000).to_a << 7]
-
+    
       # brute force
-      performance_of { Performant::Array.memory_efficient_intersect(arys.sort_by(&:size)) }.should < 0.001
+      performance_of { Performant::Array.memory_efficient_intersect(arys) }.should < 0.001
     end
     it "should be optimal for 2 small arrays of 50/10_000" do
       arys = [(1..50).to_a, (10_000..20_000).to_a << 7]
-
+    
       # &
       performance_of do
         arys.inject(arys.shift.dup) do |total, ary|
@@ -55,33 +54,33 @@ describe Performant::Array do
   describe "memory_efficient_intersect with symbols" do
     it "should intersect empty arrays correctly" do
       arys = [[:c,:d], [:a,:b,:c], []]
-
-      Performant::Array.memory_efficient_intersect(arys.sort_by(&:size)).should == []
+      
+      Performant::Array.memory_efficient_intersect(arys).should == []
     end
     it "should handle intermediate empty results correctly" do
       arys = [[:e,:d], [:a,:b,:c], [:c,:d,:e,:h,:i]]
-
-      Performant::Array.memory_efficient_intersect(arys.sort_by(&:size)).should == []
+      
+      Performant::Array.memory_efficient_intersect(arys).should == []
     end
     it "should intersect correctly" do
       arys = [[:c,:d], [:a,:b,:c], [:c,:d,:e,:h,:i]]
-
-      Performant::Array.memory_efficient_intersect(arys.sort_by(&:size)).should == [:c]
+      
+      Performant::Array.memory_efficient_intersect(arys).should == [:c]
     end
     it "should intersect many arrays" do
       arys = [[:c,:d,:e,:f,:g], [:a,:b,:c,:e,:f,:g], [:c,:d,:e,:f,:g,:h,:i], [:a,:b,:c,:d,:e,:f,:g,:h,:i,:j], [:b,:c,:e,:f,:g,:s], [:a,:b,:c,:d,:e,:f,:g,:h,:i,:j], [:b,:c,:e,:f,:g,:s]]
-
-      Performant::Array.memory_efficient_intersect(arys.sort_by(&:size)).should == [:c,:e,:f,:g]
+      
+      Performant::Array.memory_efficient_intersect(arys).should == [:c,:e,:f,:g]
     end
     it "should be optimal for 2 small arrays of 50/10_000" do
-      arys = [(:'1'..:'50').to_a, (:'10_000'..:'20_000').to_a << 7]
-
+      arys = [(:'1'..:'50').to_a, (:'10_000'..:'20_000').to_a]
+      
       # brute force
-      performance_of { Performant::Array.memory_efficient_intersect(arys.sort_by(&:size)) }.should < 0.001
+      performance_of { Performant::Array.memory_efficient_intersect(arys) }.should < 0.001
     end
     it "should be optimal for 2 small arrays of 50/10_000" do
       arys = [(:'1'..:'50').to_a, (:'10_000'..:'20_000').to_a << 7]
-
+      
       # &
       performance_of do
         arys.inject(arys.shift.dup) do |total, ary|

data/spec/lib/auxiliary/terminal_spec.rb

@@ -0,0 +1,56 @@
+# encoding: utf-8
+#
+require 'spec_helper'
+
+# We need to load the Statistics file explicitly as the Statistics
+# are not loaded with the Loader (not needed in the server, only for script runs).
+#
+require File.expand_path '../../../../lib/picky/auxiliary/terminal', __FILE__
+
+describe Terminal do
+  
+  let(:terminal) { described_class.new('/some/url') }
+  
+  before(:each) do
+    terminal.stub! :search => { :total => 0, :duration => 0.01 }
+  end
+  
+  describe 'left' do
+    it 'moves by amount' do
+      terminal.should_receive(:print).once.ordered.with "\e[13D"
+      terminal.should_receive(:flush).once.ordered
+      
+      terminal.left 13
+    end
+    it 'default is 1' do
+      terminal.should_receive(:print).once.ordered.with "\e[1D"
+      terminal.should_receive(:flush).once.ordered
+      
+      terminal.left
+    end
+  end
+  
+  describe 'right' do
+    it 'moves by amount' do
+      terminal.should_receive(:print).once.ordered.with "\e[13C"
+      terminal.should_receive(:flush).once.ordered
+      
+      terminal.right 13
+    end
+    it 'default is 1' do
+      terminal.should_receive(:print).once.ordered.with "\e[1C"
+      terminal.should_receive(:flush).once.ordered
+      
+      terminal.right
+    end
+  end
+  
+  describe 'flush' do
+    it 'flushes STDOUT' do
+      STDOUT.should_receive(:flush).once.with()
+      
+      terminal.flush
+    end
+  end
+  
+end

data/spec/lib/generators/aliases_spec.rb

@@ -1 +1,15 @@
-# TODO aliases spec.
+require 'spec_helper'
+
+describe 'aliases' do
+
+  it 'aliases correctly' do
+    Partial.should == Internals::Generators::Partial
+  end
+  it 'aliases correctly' do
+    Similarity.should == Internals::Generators::Similarity
+  end
+  it 'aliases correctly' do
+    Weights.should == Internals::Generators::Weights
+  end
+  
+end

data/spec/lib/internals/indexed/bundle/redis_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+describe Internals::Indexed::Bundle::Redis do
+
+  before(:each) do
+    @backend = stub :backend
+    
+    Internals::Index::Redis.stub! :new => @backend
+    
+    @category     = stub :category, :name => :some_category
+    @index        = stub :index, :name => :some_index
+    @configuration = Configuration::Index.new @index, @category
+    
+    @similarity   = stub :similarity
+    @bundle       = described_class.new :some_name, @configuration, @similarity
+  end
+  
+  describe 'ids' do
+    it 'delegates to the backend' do
+      @backend.should_receive(:ids).once.with :some_sym
+      
+      @bundle.ids :some_sym
+    end
+  end
+  
+  describe 'weight' do
+    it 'delegates to the backend' do
+      @backend.should_receive(:weight).once.with :some_sym
+      
+      @bundle.weight :some_sym
+    end
+  end
+  
+  describe '[]' do
+    it 'delegates to the backend' do
+      @backend.should_receive(:setting).once.with :some_sym
+      
+      @bundle[:some_sym]
+    end
+  end
+  
+end

data/spec/lib/query/indexes_spec.rb

@@ -77,5 +77,26 @@ describe Internals::Query::Indexes do
       performance_of { indexes.expand_combinations_from(combinations) }.should < 0.00045
     end
   end
+  
+  describe 'prepared_allocations_for' do
+    before(:each) do
+      @allocations = stub :allocations
+      indexes.stub! :allocations_for => @allocations
+    end
+    it 'calls the right method in order' do
+      @allocations.should_receive(:uniq).once.ordered.with()
+      @allocations.should_receive(:calculate_score).once.ordered.with(:some_weights)
+      @allocations.should_receive(:sort!).once.ordered.with()
+      
+      indexes.prepared_allocations_for :some_tokens, :some_weights
+    end
+    it 'calls the right method in order' do
+      @allocations.should_receive(:uniq).once.ordered.with()
+      @allocations.should_receive(:calculate_score).once.ordered.with({})
+      @allocations.should_receive(:sort!).once.ordered.with()
+      
+      indexes.prepared_allocations_for :some_tokens
+    end
+  end
 
 end

data/spec/lib/search_spec.rb

@@ -4,6 +4,11 @@ require 'spec_helper'
 
 describe Search do
   
+  before(:each) do
+    @type      = stub :type
+    @index     = stub :some_index, :indexed => @type
+  end
+  
   describe 'combinations_type_for' do
     let(:search) { described_class.new }
     it 'returns a specific Combination for a specific input' do
@@ -46,25 +51,6 @@ describe Search do
     end
   end
   
-  # describe "empty_results" do
-  #   before(:each) do
-  #     @search = search::Full.new
-  #     
-  #     @result_type = stub :result_type
-  #     @search.stub! :result_type => @result_type
-  #   end
-  #   it "returns a new result type" do
-  #     @result_type.should_receive(:new).once.with :some_offset
-  #     
-  #     @search.empty_results :some_offset
-  #   end
-  #   it "returns a new result type with default offset" do
-  #     @result_type.should_receive(:new).once.with 0
-  #     
-  #     @search.empty_results
-  #   end
-  # end
-  
   describe "search_with_text" do
     before(:each) do
       @search = Search.new
@@ -83,60 +69,6 @@ describe Search do
     end
   end
   
-  describe 'reduce' do
-    context 'real' do
-      before(:each) do
-        @allocations = stub :allocations
-        @search      = Search.new
-      end
-      context 'reduce_to_amount not set' do
-        it 'should not call anything on the allocations' do
-          @allocations.should_receive(:reduce_to).never
-          
-          @search.reduce @allocations
-        end
-      end
-      context 'reduce_to_amount set' do
-        before(:each) do
-          @search.reduce_to_amount = :some_amount
-        end
-        it 'should call reduce_to on the allocations' do
-          @allocations.should_receive(:reduce_to).once.with :some_amount
-          
-          @search.reduce @allocations
-        end
-      end
-    end
-    context 'stubbed' do
-      before(:each) do
-        @allocations = stub :allocations
-        @search      = Search.new
-      end
-      context 'reduce_to_amount not set' do
-        it 'should not call anything on the allocations' do
-          @allocations.should_receive(:reduce_to).never
-          
-          @search.reduce @allocations
-        end
-      end
-      context 'reduce_to_amount set' do
-        before(:each) do
-          @search.stub! :reduce_to_amount => :some_amount
-        end
-        it 'should call reduce_to on the allocations' do
-          @allocations.should_receive(:reduce_to).once.with :some_amount
-          
-          @search.reduce @allocations
-        end
-      end
-    end
-  end
-  
-  before(:each) do
-    @type      = stub :type
-    @index     = stub :some_index, :indexed => @type
-  end
-  
   describe 'initializer' do
     context 'with tokenizer' do
       before(:each) do

metadata

@@ -2,7 +2,7 @@
 name: picky
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors: 
 - Florian Hanke
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-07 00:00:00 +10:00
+date: 2011-04-11 00:00:00 +10:00
 default_executable: picky
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,6 +39,7 @@ files:
 - lib/picky/aliases.rb
 - lib/picky/analyzer.rb
 - lib/picky/application.rb
+- lib/picky/auxiliary/terminal.rb
 - lib/picky/character_substituters/west_european.rb
 - lib/picky/cli.rb
 - lib/picky/cores.rb
@@ -154,6 +155,7 @@ files:
 - lib/tasks/framework.rake
 - lib/tasks/index.rake
 - lib/tasks/routes.rake
+- lib/tasks/search.rake
 - lib/tasks/server.rake
 - lib/tasks/shortcuts.rake
 - lib/tasks/solr.rake
@@ -166,6 +168,7 @@ files:
 - spec/lib/aliases_spec.rb
 - spec/lib/analyzer_spec.rb
 - spec/lib/application_spec.rb
+- spec/lib/auxiliary/terminal_spec.rb
 - spec/lib/bundling_spec.rb
 - spec/lib/character_substituters/west_european_spec.rb
 - spec/lib/cli_spec.rb
@@ -211,6 +214,7 @@ files:
 - spec/lib/internals/index/redis/string_hash_spec.rb
 - spec/lib/internals/index/redis_spec.rb
 - spec/lib/internals/indexed/bundle/memory_spec.rb
+- spec/lib/internals/indexed/bundle/redis_spec.rb
 - spec/lib/internals/indexed/categories_spec.rb
 - spec/lib/internals/indexed/category_spec.rb
 - spec/lib/internals/indexed/index_spec.rb
@@ -290,6 +294,7 @@ test_files:
 - spec/lib/aliases_spec.rb
 - spec/lib/analyzer_spec.rb
 - spec/lib/application_spec.rb
+- spec/lib/auxiliary/terminal_spec.rb
 - spec/lib/bundling_spec.rb
 - spec/lib/character_substituters/west_european_spec.rb
 - spec/lib/cli_spec.rb
@@ -335,6 +340,7 @@ test_files:
 - spec/lib/internals/index/redis/string_hash_spec.rb
 - spec/lib/internals/index/redis_spec.rb
 - spec/lib/internals/indexed/bundle/memory_spec.rb
+- spec/lib/internals/indexed/bundle/redis_spec.rb
 - spec/lib/internals/indexed/categories_spec.rb
 - spec/lib/internals/indexed/category_spec.rb
 - spec/lib/internals/indexed/index_spec.rb