picky 2.6.0 → 2.7.0

metadata

@@ -2,7 +2,7 @@
 name: picky
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors: 
 - Florian Hanke
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-04 00:00:00 +10:00
+date: 2011-07-07 00:00:00 +10:00
 default_executable: picky
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.6.0
+        version: 2.7.0
   type: :development
   version_requirements: *id002
 description: Fast Ruby semantic text search engine with comfortable single field interface.
@@ -54,7 +54,7 @@ files:
 - lib/picky/adapters/rack.rb
 - lib/picky/analyzer.rb
 - lib/picky/application.rb
-- lib/picky/backend/backend.rb
+- lib/picky/backend/base.rb
 - lib/picky/backend/file/basic.rb
 - lib/picky/backend/file/json.rb
 - lib/picky/backend/file/marshal.rb
@@ -64,6 +64,7 @@ files:
 - lib/picky/backend/redis/list_hash.rb
 - lib/picky/backend/redis/string_hash.rb
 - lib/picky/backend/redis.rb
+- lib/picky/bundle.rb
 - lib/picky/calculations/location.rb
 - lib/picky/categories.rb
 - lib/picky/categories_indexed.rb
@@ -119,14 +120,12 @@ files:
 - lib/picky/indexers/base.rb
 - lib/picky/indexers/parallel.rb
 - lib/picky/indexers/serial.rb
-- lib/picky/indexers/solr.rb
 - lib/picky/indexes.rb
 - lib/picky/indexes_indexed.rb
 - lib/picky/indexes_indexing.rb
 - lib/picky/indexing/bundle/base.rb
 - lib/picky/indexing/bundle/memory.rb
 - lib/picky/indexing/bundle/redis.rb
-- lib/picky/indexing/bundle/super_base.rb
 - lib/picky/indexing/wrappers/category/location.rb
 - lib/picky/interfaces/live_parameters.rb
 - lib/picky/loader.rb
@@ -150,7 +149,6 @@ files:
 - lib/picky/results.rb
 - lib/picky/search.rb
 - lib/picky/signals.rb
-- lib/picky/solr/schema_generator.rb
 - lib/picky/sources/base.rb
 - lib/picky/sources/couch.rb
 - lib/picky/sources/csv.rb
@@ -171,10 +169,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
 - lib/tasks/spec.rake
 - lib/tasks/statistics.rake
 - lib/tasks/todo.rake
@@ -201,6 +196,7 @@ files:
 - spec/lib/categories_indexed_spec.rb
 - spec/lib/category_indexed_spec.rb
 - spec/lib/category_indexing_spec.rb
+- spec/lib/category_spec.rb
 - spec/lib/character_substituters/west_european_spec.rb
 - spec/lib/cores_spec.rb
 - spec/lib/extensions/array_spec.rb
@@ -240,10 +236,10 @@ files:
 - spec/lib/indexes_indexed_spec.rb
 - spec/lib/indexes_indexing_spec.rb
 - spec/lib/indexes_spec.rb
+- spec/lib/indexing/bundle/base_spec.rb
 - spec/lib/indexing/bundle/memory_partial_generation_speed_spec.rb
 - spec/lib/indexing/bundle/memory_spec.rb
 - spec/lib/indexing/bundle/redis_spec.rb
-- spec/lib/indexing/bundle/super_base_spec.rb
 - spec/lib/interfaces/live_parameters_spec.rb
 - spec/lib/loader_spec.rb
 - spec/lib/loggers/search_spec.rb
@@ -263,6 +259,7 @@ files:
 - spec/lib/results_spec.rb
 - spec/lib/search_spec.rb
 - spec/lib/solr/schema_generator_spec.rb
+- spec/lib/sources/base_spec.rb
 - spec/lib/sources/couch_spec.rb
 - spec/lib/sources/csv_spec.rb
 - spec/lib/sources/db_spec.rb
@@ -326,6 +323,7 @@ test_files:
 - spec/lib/categories_indexed_spec.rb
 - spec/lib/category_indexed_spec.rb
 - spec/lib/category_indexing_spec.rb
+- spec/lib/category_spec.rb
 - spec/lib/character_substituters/west_european_spec.rb
 - spec/lib/cores_spec.rb
 - spec/lib/extensions/array_spec.rb
@@ -365,10 +363,10 @@ test_files:
 - spec/lib/indexes_indexed_spec.rb
 - spec/lib/indexes_indexing_spec.rb
 - spec/lib/indexes_spec.rb
+- spec/lib/indexing/bundle/base_spec.rb
 - spec/lib/indexing/bundle/memory_partial_generation_speed_spec.rb
 - spec/lib/indexing/bundle/memory_spec.rb
 - spec/lib/indexing/bundle/redis_spec.rb
-- spec/lib/indexing/bundle/super_base_spec.rb
 - spec/lib/interfaces/live_parameters_spec.rb
 - spec/lib/loader_spec.rb
 - spec/lib/loggers/search_spec.rb
@@ -388,6 +386,7 @@ test_files:
 - spec/lib/results_spec.rb
 - spec/lib/search_spec.rb
 - spec/lib/solr/schema_generator_spec.rb
+- spec/lib/sources/base_spec.rb
 - spec/lib/sources/couch_spec.rb
 - spec/lib/sources/csv_spec.rb
 - spec/lib/sources/db_spec.rb

data/lib/picky/indexers/solr.rb

@@ -1,56 +0,0 @@
-# encoding: utf-8
-#
-require 'rsolr'
-
-module Indexers
-
-  # Deprecated. Only here as an example.
-  #
-  class Solr # :nodoc:
-
-    attr_reader :type, :fields, :solr
-
-    # Takes a Configuration::Type.
-    #
-    def initialize type
-      @type   = type
-      @fields = type.solr_fields.map(&:name).map(&:to_sym)
-      @solr   = RSolr.connect
-    end
-
-    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
-
-      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)
-      end
-
-      solr.add documents
-      solr.commit
-      solr.optimize
-    end
-
-    def hashed values
-      result = {}
-      fields.zip(values).each do |field, value|
-        result[field] = value
-      end
-      result
-    end
-
-  end
-end

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

@@ -1,61 +0,0 @@
-# TODO Merge into Base, extract common with Indexed::Base.
-#
-module Indexing # :nodoc:all
-  # A Bundle is a number of indexes
-  # per [index, category] combination.
-  #
-  # At most, there are three indexes:
-  # * *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.
-  #
-  # Both use methods provided by this base class, but
-  # have very different goals:
-  #
-  # * *Indexing*::*Bundle* is just concerned with creating index files
-  #   and providing helper functions to e.g. check the indexes.
-  #
-  # * *Index*::*Bundle* is concerned with loading these index files into
-  #   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, category, similarity_strategy
-        @identifier    = "#{category.identifier}:#{name}"
-        @files         = Backend::Files.new name, category
-
-        @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.
-      #
-      def similar text
-        code = similarity_strategy.encoded text
-        similar_codes = code && @similarity[code]
-        similar_codes.delete text if similar_codes
-        similar_codes || []
-      end
-
-    end
-
-  end
-
-end

data/lib/picky/solr/schema_generator.rb

@@ -1,74 +0,0 @@
-module Solr # :nodoc:all
-  
-  class SchemaGenerator
-
-    attr_reader :types
-
-    # Takes an array of index type configs.
-    #
-    def initialize configuration
-      @types = configuration.types
-    end
-
-    #
-    #
-    def generate
-      generate_schema_for bound_field_names
-    end
-
-    # Returns a binding with the values needed for the schema xml.
-    #
-    def bound_field_names
-      field_names = combine_field_names
-      binding
-    end
-
-    # TODO
-    #
-    def combine_field_names
-      field_names = []
-      types.each do |type|
-        field_names += type.solr_fields.map(&:name)
-      end
-      field_names.uniq!
-      field_names
-    end
-
-    #
-    #
-    def generate_schema_for binding
-      template_text = read_template
-      result = evaluate_erb template_text, binding
-      write result
-    end
-
-    #
-    #
-    def evaluate_erb text, binding
-      require 'erb'
-      template = ERB.new text
-      template.result binding
-    end
-
-    #
-    #
-    def read_template
-      template_path = File.join PICKY_ROOT, 'solr', 'conf', 'schema.xml.erb'
-      schema = ''
-      File.open(template_path, 'r') do |file|
-        schema = file.read
-      end
-      schema
-    end
-
-    #
-    #
-    def write result
-      schema_path = File.join PICKY_ROOT, 'solr', 'conf', 'schema.xml'
-      File.open(schema_path, 'w') do |file|
-        file << result
-      end
-    end
-
-  end
-end

data/lib/tasks/search.rake

@@ -1,9 +0,0 @@
-# Tasks for testing your engine configuration in the terminal.
-#
-desc 'Simple terminal search - pass it an URL to search on, e.g. /books.'
-task :search do
-  puts <<-DEPRECATED
-Deprecated. New usage:
-  picky search <URL> [<result id amount = 20>]
-  DEPRECATED
-end

data/lib/tasks/shortcuts.rake

@@ -1,32 +0,0 @@
-# Shortcut tasks.
-#
-
-desc "Generate the index (random order)."
-task :index => :application do
-  Rake::Task[:'index:randomly'].invoke
-end
-
-desc "Try the given text in the indexer/query (index and category optional)."
-task :try, [:text, :index, :category] => :application do |_, options|
-  text, index, category = options.text, options.index, options.category
-
-  Rake::Task[:'try:both'].invoke text, index, category
-end
-
-desc "Application summary."
-task :stats do
-  Rake::Task[:'stats:app'].invoke
-end
-desc "Analyze your indexes (needs rake index)."
-task :analyze do
-  Rake::Task[:'stats:analyze'].invoke
-end
-
-desc "Start the server."
-task :start do
-  Rake::Task[:'server:start'].invoke
-end
-desc "Stop the server."
-task :stop do
-  Rake::Task[:'server:stop'].invoke
-end

data/lib/tasks/solr.rake

@@ -1,36 +0,0 @@
-# sunspot-solr start --solr-home=solr --data-directory=index/development/solr --pid-dir=solr/pids --log-file=log/solr.log
-
-namespace :solr do
-  
-  namespace :schema do
-    task :generate => :application do
-      generator = Solr::SchemaGenerator.new Indexes.configuration
-      generator.generate
-    end
-  end
-  
-  
-  task :index => :application do
-    Rake::Task[:"solr:start"].invoke
-    sleep 3
-    Indexes.index_solr
-  end
-  
-  
-  def action name
-    `sunspot-solr #{name} --solr-home=solr --data-directory=index/#{PICKY_ENVIRONMENT}/solr --pid-dir=solr/pids --log-file=log/solr.log`
-  end
-  task :start => :application do
-    Rake::Task['solr:schema:generate'].invoke
-    action :start
-  end
-  task :stop => :application do
-    action :stop
-  end
-  task :restart => :application do
-    action :stop
-    sleep 2
-    action :start
-  end
-  
-end