picky 4.0.0pre1 → 4.0.0pre2

data/lib/picky/query/allocation.rb

@@ -26,22 +26,31 @@ module Picky
       def hash
         @combinations.hash
       end
-      def eql? other_allocation
-        true # FIXME
-        # @combinations.eql? other_allocation.combinations
-      end
+      # def eql? other
+      #   self.class == other.class && combinations.eql?(other.combinations)
+      # end
 
-      # Scores its combinations and caches the result.
+      # Asks the backend for the total score and
+      # adds the boosts to it.
+      #
+      # THINK Can the combinations be empty?
       #
       def calculate_score weights
-        @score ||= @combinations.calculate_score(weights)
+        @score ||= if @combinations.empty?
+          0
+        else
+          @backend.weight(@combinations) +
+            @combinations.weighted_score(weights)
+        end
       end
 
       # Asks the backend for the (intersected) ids.
       #
+      # THINK Can the combinations be empty?
+      #
       def calculate_ids amount, offset
-        return [] if combinations.empty?
-        @backend.ids combinations, amount, offset
+        return [] if @combinations.empty?
+        @backend.ids @combinations, amount, offset
       end
 
       # Ids return by default [].
@@ -82,8 +91,8 @@ module Picky
       #
       # Note: Delegates to to_result.
       #
-      def to_json
-        to_result.to_json
+      def to_json options = {}
+        Yajl::Encoder.encode to_result, options
       end
 
       #

data/lib/picky/query/combination.rb

@@ -27,6 +27,12 @@ module Picky
         @category_name ||= category.name
       end
 
+      #
+      #
+      def bundle
+        category.bundle_for token
+      end
+
       # Returns the weight of this combination.
       #
       # Note: Caching is most of the time useful.
@@ -46,7 +52,7 @@ module Picky
       # The identifier for this combination.
       #
       def identifier
-        @identifier ||= "#{category.bundle_for(token).identifier}:inverted:#{token.text}"
+        @identifier ||= "#{bundle.identifier}:inverted:#{token.text}"
       end
 
       # Note: Required for uniq!

data/lib/picky/query/combinations.rb

@@ -25,12 +25,7 @@ module Picky
         @combinations.hash
       end
 
-      # Uses user specific weights to calculate a score for the combinations.
-      #
-      def calculate_score weights
-        total_score + weighted_score(weights)
-      end
-      def total_score
+      def score
         @combinations.sum &:weight
       end
       def weighted_score weights

data/lib/picky/query/token.rb

@@ -11,19 +11,22 @@ module Picky
     #
     class Token # :nodoc:all
 
-      attr_reader :text, :original, :qualifiers, :user_defined_categories
+      attr_reader :text, :original
       attr_writer :similar
+      attr_accessor :user_defined_categories
 
-      delegate :blank?, :to => :text
+      delegate :blank?,
+               :to => :text
 
       # Normal initializer.
       #
       # Note:
       # Use this if you do not want a normalized token.
       #
-      def initialize text, original = nil
+      def initialize text, original = nil, category = nil
         @text     = text
         @original = original
+        @user_defined_categories = [category] if category
       end
 
       # Returns a qualified and normalized token.
@@ -89,10 +92,10 @@ module Picky
       # So "hello*" will not be partially searched.
       # So "hello"* will be partially searched.
       #
-      @@no_partial = /\"\Z/
-      @@partial    = /\*\Z/
+      @@no_partial = /\"\z/
+      @@partial    = /\*\z/
       def partialize
-        self.partial = false and return unless @text !~ @@no_partial
+        self.partial = false or return unless @text !~ @@no_partial
         self.partial = true unless @text !~ @@partial
       end
 
@@ -100,11 +103,11 @@ module Picky
       #
       # The latter wins.
       #
-      @@no_similar = /\"\Z/
-      @@similar    = /\~\Z/
+      @@no_similar = /\"\z/
+      @@similar    = /\~\z/
       def similarize
-        self.similar = false and return if @text =~ @@no_similar
-        self.similar = true if @text =~ @@similar
+        self.similar = false or return unless @text !~ @@no_similar
+        self.similar = true unless @text !~ @@similar
       end
 
       def similar?
@@ -124,33 +127,13 @@ module Picky
         index.possible_combinations self
       end
 
-      # Returns a token with the next similar text.
+      # Returns all similar tokens for the token.
       #
-      # THINK Rewrite this. It is hard to understand. Also spec performance.
-      #
-      def next_similar_token category
-        token = self.dup
-        token if token.next_similar category.bundle_for(token)
-      end
-      # Sets and returns the next similar word.
-      #
-      # Note: Also overrides the original.
-      #
-      def next_similar bundle
-        @text = @original = (similarity(bundle).shift || return) if similar?
-      end
-      # Lazy similar reader.
-      #
-      def similarity bundle = nil
-        @similarity || @similarity = generate_similarity_for(bundle)
-      end
-      # Returns an enumerator that traverses over the similar.
-      #
-      # Note: The dup isn't too nice – since it is needed on account of the shift, above.
-      #       (We avoid a StopIteration exception. Which of both is less evil?)
-      #
-      def generate_similarity_for bundle
-        bundle.similar(@text) || []
+      def similar_tokens_for category
+        similars = category.bundle_for(self).similar @text
+        similars.map do |similar|
+          self.class.new similar, similar, category
+        end
       end
 
       # Splits text into a qualifier and text.
@@ -166,6 +149,13 @@ module Picky
         end
       end
 
+      # Internally, qualifiers are nil if there are none.
+      # This returns an empty array in this case for a nicer API.
+      #
+      def qualifiers
+        @qualifiers || []
+      end
+
       #
       #
       def to_result

data/lib/picky/results.rb

@@ -30,6 +30,15 @@ module Picky
       results
     end
 
+    # This starts the actual processing.
+    #
+    # Without this, the allocations are not processed,
+    # and no ids are calculated.
+    #
+    def prepare! extra_allocations = nil
+      allocations.process! amount, offset, extra_allocations
+    end
+
     # Delegates to allocations.
     #
     def ids amount = 20
@@ -39,7 +48,7 @@ module Picky
     # The total results. Delegates to the allocations.
     #
     def total
-      @total || @total = allocations.total || 0
+      @total ||= allocations.total || 0
     end
 
     # Duration default is 0.
@@ -48,15 +57,6 @@ module Picky
       @duration || 0
     end
 
-    # This starts the actual processing.
-    #
-    # Without this, the allocations are not processed,
-    # and no ids are calculated.
-    #
-    def prepare! extra_allocations = nil
-      allocations.process! amount, offset, extra_allocations
-    end
-
     # Returns a hash with the allocations, offset, duration and total.
     #
     def to_hash
@@ -69,7 +69,14 @@ module Picky
     # Convert to json format.
     #
     def to_json options = {}
-      to_hash.to_json options
+      Yajl::Encoder.encode to_hash, options
+    end
+
+    # For logging.
+    #
+    @@log_time_format = "%Y-%m-%d %H:%M:%S".freeze
+    def to_s
+      "#{log_type}|#{Time.now.strftime @@log_time_format}|#{'%8f' % duration}|#{'%-50s' % query}|#{'%8d' % total}|#{'%4d' % offset}|#{'%2d' % allocations.size}|"
     end
 
     # The first character in the blog designates what type of query it is.
@@ -80,12 +87,6 @@ module Picky
       amount.zero?? :'.' : :'>'
     end
 
-    # For logging.
-    #
-    def to_s
-      "#{log_type}|#{Time.now.to_s(:db)}|#{'%8f' % duration}|#{'%-50s' % query}|#{'%8d' % total}|#{'%4d' % offset}|#{'%2d' % allocations.size}|"
-    end
-
   end
 
 end

data/lib/picky/scheduler.rb

@@ -6,6 +6,7 @@ module Picky
 
     def initialize options = {}
       @parallel = options[:parallel]
+      @factor   = options[:factor] || 2
 
       configure
     end
@@ -21,7 +22,7 @@ module Picky
         end
 
         def scheduler
-          @scheduler ||= Procrastinate::Scheduler.start Procrastinate::SpawnStrategy::Default.new(2)
+          @scheduler ||= Procrastinate::Scheduler.start Procrastinate::SpawnStrategy::Default.new(@factor)
         end
       else
         def schedule

data/lib/picky/search.rb

@@ -40,7 +40,7 @@ module Picky
 
       instance_eval(&Proc.new) if block_given?
 
-      @tokenizer ||= Tokenizer.query_default # THINK Not dynamic. Ok?
+      @tokenizer ||= Tokenizer.searching # THINK Not dynamic. Ok?
       @weights   ||= Query::Weights.new
       @ignore_unassigned = false if @ignore_unassigned.nil?
 

data/lib/picky/sinatra.rb

@@ -11,16 +11,16 @@ module Picky
       private :indexing, :searching
     end
 
-    # Delegates to Application.
+    # Sets tokenizer default indexing options.
     #
-    def indexing options
-      Application.indexing options
+    def indexing options = {}
+      Tokenizer.default_indexing_with options
     end
 
-    # Delegates to Application.
+    # Sets tokenizer default searching options.
     #
-    def searching options
-      Application.searching options
+    def searching options = {}
+      Tokenizer.default_searching_with options
     end
 
   end

data/lib/picky/statistics.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 #
+require_relative 'analyzer'
+
 module Picky
 
   # Gathers various statistics.

data/lib/picky/tokenizer.rb

@@ -6,18 +6,18 @@ module Picky
   #
   class Tokenizer
 
-    def self.index_default= new_default
-      @index_default = new_default
+    def self.default_indexing_with options = {}
+      @indexing = options.respond_to?(:tokenize) ? options : new(options)
     end
-    def self.index_default
-      @index_default ||= new
+    def self.indexing
+      @indexing ||= new
     end
 
-    def self.query_default= new_default
-      @query_default = new_default
+    def self.default_searching_with options = {}
+      @searching = options.respond_to?(:tokenize) ? options : new(options)
     end
-    def self.query_default
-      @query_default ||= new
+    def self.searching
+      @searching ||= new
     end
 
     def to_s

data/lib/picky/wrappers/bundle/calculation.rb

@@ -9,10 +9,6 @@ module Picky
       # Note: A calculation will try to find a float in the index,
       #       not a sym.
       #
-      # TODO I really need to allow integers as keys.
-      #      The code below is just not up to the needed quality.
-      #      Use key_format :to_i?
-      #
       class Calculation < Wrapper
 
         # API.
@@ -26,12 +22,16 @@ module Picky
 
         # TODO Symbols. Use a block here?
         #
+        # THINK Move the calculation elsewhere?
+        #
         def ids float_str
           @bundle.ids calculate(float_str.to_f).to_s
         end
 
         # TODO Symbols.
         #
+        # THINK Move the calculation elsewhere?
+        #
         def weight float_str
           @bundle.weight calculate(float_str.to_f).to_s
         end

data/lib/picky/wrappers/bundle/location.rb

@@ -8,10 +8,9 @@ module Picky
         #
         class Location < Calculation
 
-          def initialize bundle, options = {}
+          def initialize bundle, user_grid, options = {}
             super bundle
 
-            user_grid  = options[:grid]      || raise("Gridsize needs to be given for location #{bundle.identifier}.")
             anchor     = options[:anchor]    || 0.0
             precision  = options[:precision] || 1
 

data/lib/tasks/framework.rake

@@ -3,5 +3,5 @@
 # Note: This is used by tasks to load the framework as a dependency.
 #
 task :framework do
-  require File.expand_path '../../picky', __FILE__
+  require_relative '../picky'
 end

data/lib/tasks/statistics.rake

@@ -28,7 +28,7 @@ end
 namespace :stats do
 
   task :prepare => :application do
-    require File.expand_path('../../picky/statistics', __FILE__)
+    require_relative '../picky/statistics'
   end
 
 end

data/lib/tasks/try.rake

@@ -5,7 +5,7 @@ task :try, [:text, :index, :category] => :application do |_, options|
   puts
   fail "\x1b[31mrake try needs a text to try indexing and query preparation\x1b[m, e.g. rake 'try[yourtext]'." unless options.text
 
-  require File.expand_path '../try', __FILE__
+  require_relative 'try'
   try = Picky::Try.new options.text, options.index, options.category
   try.to_stdout
 end

data/lib/tasks/try.rb

@@ -16,7 +16,7 @@ module Picky
     end
 
     def searched
-      Picky::Tokenizer.query_default.tokenize(text.dup).first
+      Picky::Tokenizer.searching.tokenize(text.dup).first
     end
 
     def output

data/spec/aux/picky/cli_spec.rb

@@ -4,14 +4,14 @@ require 'spec_helper'
 
 # We need to load the CLI file explicitly as the CLI is not loaded with the Loader (not needed in the server, only for script runs).
 #
-require File.expand_path '../../../../aux/picky/cli', __FILE__
+require_relative '../../../aux/picky/cli'
 
 describe Picky::CLI do
-  
+
   describe '.mapping' do
     it 'returns the right mapping' do
       Picky::CLI.mapping.should == {
-        :generate => [Picky::CLI::Generate, :"{client,server,sinatra_client,unicorn_server,all_in_one}", :app_directory_name],
+        :generate => [Picky::CLI::Generate, :"{client,server,all_in_one}", :app_directory_name],
         :help     => [Picky::CLI::Help],
         :live     => [Picky::CLI::Live, "host:port/path (default: localhost:8080/admin)", "port (default: 4568)"],
         :search   => [Picky::CLI::Search, :url_or_path, 'amount of ids (default 20)'],
@@ -19,20 +19,20 @@ describe Picky::CLI do
       }
     end
   end
-  
+
   describe 'instance' do
     let(:cli) { described_class.new }
     describe 'execute' do
       it 'calls generate correctly' do
         Kernel.should_receive(:system).once.with 'picky-generate one two three'
-        
+
         cli.execute 'generate', 'one', 'two', 'three'
       end
       it 'calls help correctly' do
         Kernel.should_receive(:puts).once.with <<-HELP
 Possible commands:
-  picky generate {client,server,sinatra_client,unicorn_server,all_in_one} app_directory_name
-  picky help 
+  picky generate {client,server,all_in_one} app_directory_name
+  picky help
   picky live [host:port/path (default: localhost:8080/admin)] [port (default: 4568)]
   picky search url_or_path [amount of ids (default 20)]
   picky stats logfile (e.g. log/search.log) [port (default: 4567)]
@@ -51,7 +51,7 @@ HELP
         cli.executor_class_for.should == [Picky::CLI::Help]
       end
       it 'returns Generator for generate' do
-        cli.executor_class_for(:generate).should == [Picky::CLI::Generate, :'{client,server,sinatra_client,unicorn_server,all_in_one}', :"app_directory_name"]
+        cli.executor_class_for(:generate).should == [Picky::CLI::Generate, :'{client,server,all_in_one}', :"app_directory_name"]
       end
       it 'returns Help for help' do
         cli.executor_class_for(:help).should == [Picky::CLI::Help]
@@ -70,17 +70,17 @@ HELP
       end
     end
   end
-  
+
   describe Picky::CLI::Live do
     let(:executor) { Picky::CLI::Live.new }
   end
-  
+
   describe Picky::CLI::Base do
     let(:executor) { Picky::CLI::Base.new }
     describe 'usage' do
       it 'calls puts with an usage' do
         executor.should_receive(:puts).once.with "Usage:\n  picky some_name param1 [param2]"
-        
+
         executor.usage :some_name, [:param1, 'param2']
       end
     end
@@ -90,5 +90,5 @@ HELP
       end
     end
   end
-  
+
 end