picky 3.4.3 → 3.5.0

data/lib/picky/deployment.rb

@@ -2,14 +2,14 @@ require File.expand_path '../constants', __FILE__
 
 module Picky # :nodoc:
   module Capistrano # :nodoc:all
-    
-    # Include all 
+
+    # Include all
     #
     module All
       def self.extended cap_config
-        
+
         cap_config.instance_eval do
-          
+
           # Executes a rake task on the server.
           #
           # Options:
@@ -21,56 +21,56 @@ module Picky # :nodoc:
             env = env == false ? '' : "PICKY_ENV=#{env || 'production'}"
             run "cd #{current_path}; rake #{name} #{env}", options, &block
           end
-          
+
         end
-        
+
         cap_config.extend Standard
         cap_config.extend Deploy
         cap_config.extend Caching
         cap_config.extend Overrides
-        
+
       end
     end
-    
+
     # Removes unneeded Rails defaults.
     #
     module Overrides
       def self.extended cap_config
         cap_config.instance_eval do
-          
+
           namespace :deploy do
             tasks.delete :check
             tasks.delete :cold
             tasks.delete :migrations
             tasks.delete :migrate
             tasks.delete :upload
-            
+
             namespace :web do
               tasks.delete :enable
               tasks.delete :disable
             end
           end
-          
+
         end
       end
     end
-    
+
     module Standard
       def self.extended cap_config
         cap_config.load 'standard'
         cap_config.load 'deploy'
       end
     end
-    
+
     module Deploy
-      
+
       def self.extended cap_config
         cap_config.instance_eval do
-          
+
           namespace :deploy do
             %w(start stop).each do |action|
               desc "#{action} the Servers"
-              task action.to_sym, :roles => :app do
+              task action.intern, :roles => :app do
                 execute_rake_task "server:#{action}"
               end
             end
@@ -80,13 +80,13 @@ module Picky # :nodoc:
                 execute_rake_task "server:restart", :hosts => server.host
               end
             end
-            
+
             desc 'Hot deploy the code'
             task 'hot', :roles => :app do
               update
               execute_rake_task 'server:usr1', :env => false # No env needed.
             end
-            
+
             desc "Setup a GitHub-style deployment."
             task :setup, :roles => :app do
               cmd = "git clone #{repository} #{current_path}-clone-cache &&" +
@@ -94,13 +94,13 @@ module Picky # :nodoc:
                     "mv #{current_path}-clone-cache #{current_path}"
               run cmd
             end
-            
+
             desc "Deploy"
             task :default, :roles => :app do
               update
               restart
             end
-            
+
             desc "Update the deployed code."
             task :update_code do # code needs to be updated with all servers
               puts "updating code to branch #{branch}"
@@ -112,12 +112,12 @@ module Picky # :nodoc:
               run cmd
               symlink
             end
-            
+
             desc "Cleans up the git checkout"
             task :cleanup, :roles => :app do
               run "cd #{current_path} && git gc --aggressive"
             end
-            
+
             desc "create the symlinks to the shared dirs"
             task :symlink do
               set :user, 'deploy'
@@ -128,7 +128,7 @@ module Picky # :nodoc:
               # link unicorn.ru
               run "ln -sf #{shared_path}/unicorn.ru #{current_path}/unicorn.ru"
             end
-            
+
             namespace :rollback do
               desc "Rollback to last release."
               task :default, :roles => :app do
@@ -136,20 +136,20 @@ module Picky # :nodoc:
                 puts "rolling back to branch #{branch}"
                 deploy.update_code
               end
-              
+
               task :code, :roles => :app do
                 # implicit
               end
             end
           end
-          
+
         end
       end
-      
+
     end
-    
+
     module Caching
-      
+
       def self.extended cap_config
         cap_config.instance_eval do
           namespace :cache do
@@ -180,11 +180,11 @@ module Picky # :nodoc:
           end
         end
       end
-      
+
     end
-    
+
     module Statistics
-      
+
       def self.extended cap_config
         namespace :statistics do
           desc 'Start the statistics server'
@@ -204,8 +204,8 @@ module Picky # :nodoc:
           end
         end
       end
-      
+
     end
-    
+
   end
 end

data/lib/picky/generators/partial/substring.rb

@@ -21,12 +21,10 @@ module Picky
             if @from < 0 && @to < 0
               def each_subtoken token, &block
                 token.each_subtoken @from - @to - 1, (0..@to), &block
-                # token[0..@to].intern.each_subtoken @from - @to - 1, &block # TODO to_sym
               end
             else
               def each_subtoken token, &block
                 token.each_subtoken @from, (0..@to), &block
-                # token[0..@to].intern.each_subtoken @from, &block # TODO to_sym
               end
             end
           end

data/lib/picky/generators/similarity/double_metaphone.rb

@@ -20,7 +20,7 @@ module Picky
         #
         def encoded sym
           codes = Text::Metaphone.double_metaphone sym.to_s
-          codes.first.to_sym unless codes.empty?
+          codes.first.intern unless codes.empty?
         end
 
       end

data/lib/picky/generators/similarity/metaphone.rb

@@ -20,7 +20,7 @@ module Picky
         #
         def encoded sym
           code = Text::Metaphone.metaphone sym.to_s
-          code.to_sym if code
+          code.intern if code
         end
 
       end

data/lib/picky/generators/similarity/soundex.rb

@@ -20,7 +20,7 @@ module Picky
         #
         def encoded sym
           code = Text::Soundex.soundex sym.to_s
-          code.to_sym if code
+          code.intern if code
         end
 
       end

data/lib/picky/index.rb

@@ -115,7 +115,7 @@ module Picky
     #   end
     #
     def initialize name
-      @name       = name.to_sym
+      @name       = name.intern
       @categories = Categories.new
 
       # Centralized registry.
@@ -138,6 +138,21 @@ module Picky
       end
     end
 
+    # TODO Symbols.
+    #
+    # # API method.
+    # #
+    # # Tells Picky to use Symbols internally.
+    # #
+    # def use_symbols
+    #   @symbols = true
+    # end
+    # def use_symbols?
+    #   @symbols
+    # end
+
+    # API method.
+    #
     # Defines a searchable category on the index.
     #
     # === Parameters
@@ -152,7 +167,7 @@ module Picky
     # * from: Take the data from the data category with this name. Example: You have a source Sources::CSV.new(:title, file:'some_file.csv') but you want the category to be called differently. The you use from: define_category(:similar_title, :from => :title).
     #
     def category category_name, options = {}
-      new_category = Category.new category_name.to_sym, self, options
+      new_category = Category.new category_name.intern, self, options
       categories << new_category
 
       new_category = yield new_category if block_given?
@@ -222,17 +237,19 @@ module Picky
     #
     # === Options
     # * precision: Default is 1 (20% error margin, very fast), up to 5 (5% error margin, slower) makes sense.
+    # * anchor: Where to anchor the geo grid.
     # * ... all options of #define_category.
     #
     def ranged_category category_name, range, options = {}
-      precision = options[:precision] || 1 # THINK options.delete?
+      precision = options.delete(:precision) || 1
+      anchor    = options.delete(:anchor)    || 0.0
 
       # Note: :key_format => :to_f ?
       #
       options = { partial: Partial::None.new }.merge options
 
       define_category category_name, options do |category|
-        Wrappers::Category::Location.wrap category, range, precision
+        Wrappers::Category::Location.wrap category, range, precision, anchor
       end
     end
     alias define_ranged_category ranged_category
@@ -312,7 +329,7 @@ INDEX
     # Identifier used for technical output.
     #
     def identifier
-      "#{PICKY_ENVIRONMENT}:#{name}"
+      name
     end
 
     #

data/lib/picky/index_indexing.rb

@@ -93,7 +93,7 @@ module Picky
     #
     def source some_source = nil, &block
       some_source ||= block
-      some_source ? define_source(some_source) : (@source && extract_source || raise_no_source)
+      some_source ? define_source(some_source) : (@source && extract_source || warn_no_source)
     end
     # Extract the actual source if it is wrapped in a time
     # capsule, i.e. a block/lambda.
@@ -107,20 +107,8 @@ module Picky
       check_source source
       @source = source
     end
-    def raise_no_source
-      raise NoSourceSpecifiedException.new(<<-NO_SOURCE
-
-
-No source given for index #{name}. An index needs a source.
-Example:
-Index.new(:with_source) do
-  source   Sources::CSV.new(:title, file: 'data/books.csv')
-  category :title
-  category :author
-end
-
-      NO_SOURCE
-)
+    def warn_no_source
+      warn "No source given for index #{name}."
     end
     def check_source source # :nodoc:
       raise ArgumentError.new(<<-SOURCE

data/lib/picky/indexers/base.rb

@@ -19,9 +19,13 @@ module Picky
       # Starts the indexing process.
       #
       def index categories
-        start_indexing_message
-        process categories
-        finish_indexing_message
+        process categories do |file|
+          notify_finished file
+        end
+      end
+
+      def notify_finished file
+        timed_exclaim %Q{"#{@index_or_category.identifier}": Tokenized -> #{file.path.gsub("#{PICKY_ROOT}/", '')}.}
       end
 
     end

data/lib/picky/indexers/parallel.rb

@@ -60,7 +60,7 @@ module Picky
         end
         flush combined
         combined.each do |_, _, file, _|
-          timed_exclaim %Q{"#{@index_or_category.identifier}":   => #{file.path}.}
+          yield file
           file.close
         end
       end
@@ -73,15 +73,6 @@ module Picky
         end
       end
 
-      #
-      #
-      def start_indexing_message # :nodoc:
-        timed_exclaim %Q{"#{@index_or_category.identifier}": Starting parallel data preparation.}
-      end
-      def finish_indexing_message # :nodoc:
-        timed_exclaim %Q{"#{@index_or_category.identifier}": Finished parallel data preparation.}
-      end
-
     end
 
   end

data/lib/picky/indexers/serial.rb

@@ -36,7 +36,7 @@ module Picky
               file.write(result.join) && result.clear if result.size > 100_000
             end
 
-            timed_exclaim %Q{"#{@index_or_category.identifier}":   => #{file.path}.}
+            yield file
 
             file.write result.join
           end
@@ -45,15 +45,6 @@ module Picky
 
       end
 
-      #
-      #
-      def start_indexing_message # :nodoc:
-        timed_exclaim %Q{"#{@index_or_category.identifier}": Starting serial data preparation.}
-      end
-      def finish_indexing_message # :nodoc:
-        timed_exclaim %Q{"#{@index_or_category.identifier}": Finished serial data preparation.}
-      end
-
     end
   end
 

data/lib/picky/indexes.rb

@@ -61,7 +61,7 @@ module Picky
     # Extracts an index, given its identifier.
     #
     def [] identifier
-      index_name = identifier.to_sym
+      index_name = identifier.intern
       index_mapping[index_name] || raise_not_found(index_name)
     end
 

data/lib/picky/loader.rb

@@ -143,8 +143,8 @@ module Picky
       load_relative 'wrappers/bundle/location'
       load_relative 'wrappers/bundle/exact_partial'
 
-      load_relative 'wrappers/sources/base'
-      load_relative 'wrappers/sources/location'
+      # load_relative 'wrappers/sources/base'
+      # load_relative 'wrappers/sources/location'
 
       # Tokens.
       #
@@ -188,10 +188,6 @@ module Picky
       #
       load_relative 'rack/harakiri'
 
-      # Errors.
-      #
-      load_relative 'no_source_specified_exception'
-
       # Load analyzer.
       #
       load_relative 'analyzer'

data/lib/picky/query/qualifier_category_mapper.rb

@@ -20,7 +20,7 @@ module Picky
       #
       def add category
         category.qualifiers.each do |qualifier|
-          sym_qualifier = qualifier.to_sym
+          sym_qualifier = qualifier.intern
           warn %Q{Warning: Qualifier "#{qualifier}" already mapped to category #{mapping[sym_qualifier].identifier} (ambiguous qualifier mapping).} if mapping.has_key? sym_qualifier
           mapping[sym_qualifier] = category
         end
@@ -33,7 +33,7 @@ module Picky
       def map qualifier
         return nil if qualifier.empty?
 
-        @mapping[qualifier.to_sym]
+        @mapping[qualifier.intern]
       end
 
     end

data/lib/picky/query/token.rb

@@ -37,13 +37,12 @@ module Picky
         partialize # TODO Should this operate on the original?
         similarize # TODO Should this operate on the original?
         remove_illegals # TODO Remove?
-        symbolize # TODO to_sym
         self
       end
 
       #
       #
-      def symbolize
+      def symbolize!
         @text = @text.to_sym
       end
 

data/lib/picky/query/tokens.rb

@@ -61,6 +61,12 @@ module Picky
         end
       end
 
+      # Symbolizes each of the tokens.
+      #
+      def symbolize
+        @tokens.each &:symbolize!
+      end
+
       # Makes the last of the tokens partial.
       #
       def partialize_last

data/lib/picky/search.rb

@@ -175,6 +175,7 @@ module Picky
     def tokenized text
       tokens, originals = tokenizer.tokenize text
       tokens = Query::Tokens.processed tokens, originals || tokens, @ignore_unassigned
+      # tokens.symbolize # TODO Symbols.
       tokens.partialize_last # Note: In the standard Picky search, the last token is always partial.
       tokens
     end

data/lib/picky/sources/couch.rb

@@ -32,7 +32,7 @@ module Picky
         @db = RestClient::Resource.new options.delete(:url), options
 
         key_format   = options.delete :key_format
-        @key_format  = key_format && key_format.to_sym || :to_sym
+        @key_format  = key_format && key_format.intern || :to_sym
       end
 
       def to_s

data/lib/picky/sources/csv.rb

@@ -42,7 +42,7 @@ module Picky
         @file_name   = @csv_options.delete(:file) || raise_no_file_given(category_names)
 
         key_format   = options.delete :key_format
-        @key_format  = key_format && key_format.to_sym || :to_i
+        @key_format  = key_format && key_format.intern || :to_i
       end
 
       def to_s

data/lib/picky/sources/mongo.rb

@@ -37,7 +37,7 @@ module Picky
 
   		  @db         = RestClient::Resource.new options.delete(:url), options
   			@database   = options.delete(:db)
-  		  @key_format = options[:key_format] && options[:key_format].to_sym || :to_sym
+  		  @key_format = options[:key_format] && options[:key_format].intern || :to_sym
   		end
 
       # Tries to require the rest_client gem.

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

@@ -18,22 +18,22 @@ module Picky
         # API.
         #
         # By default, a calculation does not
-        # recalculate anything.
+        # calculate anything.
         #
-        def recalculate float
+        def calculate float
           float
         end
 
+        # TODO Symbols.
         #
-        #
-        def ids float_as_sym
-          @bundle.ids recalculate(float_as_sym.to_s.to_f).to_s.to_sym
+        def ids float_str
+          @bundle.ids calculate(float_str.to_f).to_s
         end
 
+        # TODO Symbols.
         #
-        #
-        def weight float_as_sym
-          @bundle.weight recalculate(float_as_sym.to_s.to_f).to_s.to_sym
+        def weight float_str
+          @bundle.weight calculate(float_str.to_f).to_s
         end
 
       end

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

@@ -6,7 +6,10 @@ module Picky
 
       module Delegator
 
-        delegate :inverted,
+        delegate :add,
+                 :clear_realtime_mapping,
+
+                 :inverted,
                  :weights,
                  :similarity,
                  :configuration,

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

@@ -23,7 +23,7 @@ module Picky
 
         def clear; end
         def dump; end
-        def empty_configuration; end
+        def empty; end
         def generate_caches_from_memory; end
         def generate_partial_from arg; end
         def index; end

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

@@ -11,32 +11,49 @@ module Picky
           def initialize bundle, 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
-            user_grid  = options[:grid] || raise("Gridsize needs to be given for location #{bundle.identifier}.")
 
-            @calculation = Calculations::Location.new user_grid, precision
+            @calculation = Calculations::Location.new user_grid, anchor, precision
           end
 
           #
           #
-          def recalculate float
-            @calculation.recalculate float
+          def calculate float
+            @calculation.calculate float
           end
 
+          # Recalculates the added location.
           #
-          #
-          def load
-            # Load first the bundle, then extract the config.
-            #
-            bundle.load
-            minimum = bundle[:location_minimum] && bundle[:location_minimum].to_f || raise("Configuration :location_minimum for #{bundle.identifier} missing. Did you run rake index already?")
-            @calculation.minimum = minimum
+          def add id, location, where = :unshift
+            @calculation.calculated_range(location.to_s.to_f).each do |new_location|
+              bundle.add id, new_location.to_s, where
+            end
           end
 
           # Do not generate a partial.
           #
-          def generate_partial_from unimportant
-            # Nothing.
+          def add_partialized does_not, matter, at_all
+            # Nothing
+          end
+
+          # Save the config, then dump normally.
+          #
+          def dump
+            bundle[:location_anchor] = @calculation.anchor
+
+            bundle.dump
+          end
+
+          # Load first the bundle, then extract the config.
+          #
+          def load
+            bundle.load
+
+            # TODO Symbols (of the location_anchor!!!).
+            #
+            @calculation.anchor = bundle['location_anchor'] && bundle['location_anchor'].to_f || raise("Configuration 'location_anchor' for #{bundle.identifier} missing. Did you run rake index already?")
           end
 
         end