+ various 4.0 things

history.textile

@@ -1,5 +1,7 @@
 h2. Upcoming Version
 
+* hanke: (server) Rake task @index@ now points to task @index:parallel@ by default. Call @rake:serial@ to index serially.
+
 h2. Version 4.0.0pre1
 
 * hanke: (server) BREAKING @Picky::Indexes.index@ does not index in parallel anymore.

server/lib/picky/category_realtime.rb

@@ -43,16 +43,17 @@ def unshift thing
     # strings to the index for the given id.
     #
     def add_tokenized id, tokens, where = :unshift
-      tokens.each { |text| add_tokenized_token id, text, where }
+      tokens.each { |text| add_tokenized_token id.send(key_format), text, where, false }
     end
 
     #
     #
-    def add_tokenized_token id, text, where = :unshift
+    def add_tokenized_token id, text, where = :unshift, format = true
       return unless text
-      id = id.send key_format # TODO Speed this up!
 
+      id = id.send key_format if format
       # text = text.to_sym if @symbols # TODO Symbols.
+
       exact.add id, text, where
       partial.add_partialized id, text, where
     end

server/lib/picky/console.rb

@@ -3,7 +3,7 @@
 #
 module Picky
 
-  # TODO Improve.
+  # Handles the IRB console for Picky.
   #
   class Console
 

server/lib/picky/index_indexing.rb

@@ -104,8 +104,6 @@ def source some_source = nil, &block
     # Extract the actual source if it is wrapped in a time
     # capsule, i.e. a block/lambda.
     #
-    # TODO Extract into module.
-    #
     def extract_source
       @source = @source.respond_to?(:call) ? @source.call : @source
     end

server/lib/picky/loader.rb

@@ -20,7 +20,6 @@ def self.reload
     # Loads this file anew.
     #
     def self.load_self
-      exclaim 'Loader loading itself.'
       load __FILE__
     end
 

server/picky.gemspec

@@ -26,8 +26,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'picky-client', "~> #{Picky::VERSION}"
 
-  s.add_runtime_dependency 'rack'
-  s.add_runtime_dependency 'rack_fast_escape'
   s.add_runtime_dependency 'text'
   s.add_runtime_dependency 'yajl-ruby'
   s.add_runtime_dependency 'activesupport', '~> 3.0'
@@ -37,6 +35,8 @@ Gem::Specification.new do |s|
   #
   s.add_runtime_dependency 'unicorn'
   s.add_runtime_dependency 'sinatra'
+  s.add_runtime_dependency 'rack'
+  s.add_runtime_dependency 'rack_fast_escape'
 
   # Optional dependencies.
   #

server/test_project_sinatra/config.ru

@@ -2,6 +2,6 @@ require File.expand_path '../app', __FILE__
 
 # Load all indexes.
 #
-Picky::Indexes.reload
+Picky::Indexes.load
 
 run BookSearch.new