thinking-sphinx 2.1.0 → 3.0.0.pre

data/lib/thinking_sphinx/auto_version.rb

@@ -1,40 +0,0 @@
-module ThinkingSphinx
-  class AutoVersion
-    def self.detect
-      version = ThinkingSphinx::Configuration.instance.version
-      case version
-      when '0.9.8', '0.9.9'
-        require "riddle/#{version}"
-      when /1.10/
-        require 'riddle/1.10'
-      when /2.0.[12]/
-        require 'riddle/2.0.1'
-      when /2.0.[^12]/, /2.1.\d/
-        require 'riddle/2.1.0'
-      else
-        documentation_link = %Q{
-For more information, read the documentation:
-http://pat.github.io/thinking-sphinx/advanced_config.html
-}
-
-        if version.nil? || version.empty?
-          STDERR.puts %Q{
-Sphinx cannot be found on your system. You may need to configure the following
-settings in your config/sphinx.yml file:
-  * bin_path
-  * searchd_binary_name
-  * indexer_binary_name
-
-#{documentation_link}
-}
-        else
-          STDERR.puts %Q{
-Unsupported version: #{version}
-
-#{documentation_link}
-}
-        end
-      end
-    end
-  end
-end

data/lib/thinking_sphinx/bundled_search.rb

@@ -1,40 +0,0 @@
-module ThinkingSphinx
-  class BundledSearch
-    def initialize
-      @searches = []
-    end
-
-    def search(*args)
-      @searches << ThinkingSphinx.search(*args)
-    end
-
-    def search_for_ids(*args)
-      @searches << ThinkingSphinx.search_for_ids(*args)
-    end
-
-    def searches
-      populate
-      @searches
-    end
-
-    private
-
-    def populated?
-      @populated
-    end
-
-    def populate
-      return if populated?
-
-      @populated = true
-
-      ThinkingSphinx::Connection.take do |client|
-        @searches.each { |search| search.append_to client }
-
-        client.run.each_with_index do |results, index|
-          searches[index].populate_from_queue results
-        end
-      end
-    end
-  end
-end

data/lib/thinking_sphinx/class_facet.rb

@@ -1,20 +0,0 @@
-module ThinkingSphinx
-  class ClassFacet < ThinkingSphinx::Facet
-    def name
-      :class
-    end
-    
-    def attribute_name
-      Riddle.loaded_version.to_i < 2 ? 'class_crc' : 'sphinx_internal_class'
-    end
-    
-    def value(object, attribute_hash)
-      if Riddle.loaded_version.to_i < 2
-        crc = attribute_hash['class_crc']
-        ThinkingSphinx::Configuration.instance.models_by_crc[crc]
-      else
-        attribute_hash['sphinx_internal_class']
-      end
-    end
-  end
-end

data/lib/thinking_sphinx/connection.rb

@@ -1,71 +0,0 @@
-class ThinkingSphinx::Connection
-  def self.pool
-    @pool ||= Innertube::Pool.new(
-      Proc.new { ThinkingSphinx::Connection.new },
-      Proc.new { |connection| connection.close }
-    )
-  end
-
-  def self.take
-    retries  = 0
-    original = nil
-    begin
-      pool.take do |connection|
-        connection.reset
-        begin
-          yield connection
-        rescue Riddle::ConnectionError, Riddle::ResponseError, SystemCallError => error
-          original = error
-          raise Innertube::Pool::BadResource
-        end
-      end
-    rescue Innertube::Pool::BadResource
-      retries += 1
-      retry if retries < 3
-      raise original
-    end
-  end
-
-  def initialize
-    client.open
-  end
-
-  def client
-    @client ||= begin
-      client = Riddle::Client.new shuffled_addresses, configuration.port,
-        client_key
-      client.max_matches = _max_matches
-      client.timeout     = configuration.timeout || 0
-      client
-    end
-  end
-
-  private
-
-  def client_key
-    configuration.configuration.searchd.client_key
-  end
-
-  def configuration
-    ThinkingSphinx::Configuration.instance
-  end
-
-  def _max_matches
-    configuration.configuration.searchd.max_matches || 1000
-  end
-
-  def method_missing(method, *arguments, &block)
-    client.send method, *arguments, &block
-  end
-
-  def shuffled_addresses
-    return configuration.address unless configuration.shuffle
-
-    addresses = Array(configuration.address)
-    if addresses.respond_to?(:shuffle)
-      addresses.shuffle
-    else
-      address.sort_by { rand }
-    end
-  end
-end

data/lib/thinking_sphinx/context.rb

@@ -1,81 +0,0 @@
-class ThinkingSphinx::Context
-  attr_reader :indexed_models
-
-  def initialize(*models)
-    @indexed_models = []
-  end
-
-  def prepare
-    ThinkingSphinx::Configuration.instance.indexed_models.each do |model|
-      add_indexed_model model
-    end
-
-    return unless indexed_models.empty?
-
-    load_models
-    add_indexed_models
-  end
-
-  def define_indexes
-    indexed_models.each { |model|
-      model.constantize.define_indexes
-    }
-  end
-
-  def add_indexed_model(model)
-    model = model.name if model.is_a?(Class)
-
-    indexed_models << model
-    indexed_models.uniq!
-    indexed_models.sort!
-  end
-
-  def superclass_indexed_models
-    klasses = indexed_models.collect { |name| name.constantize }
-    klasses.reject { |klass|
-      klass.superclass.ancestors.any? { |ancestor| klasses.include?(ancestor) }
-    }.collect { |klass| klass.name }
-  end
-
-  private
-
-  def add_indexed_models
-    ActiveRecord::Base.descendants.each do |klass|
-      add_indexed_model klass if klass.has_sphinx_indexes?
-    end
-  end
-
-  # Make sure all models are loaded - without reloading any that
-  # ActiveRecord::Base is already aware of (otherwise we start to hit some
-  # messy dependencies issues).
-  #
-  def load_models
-    ThinkingSphinx::Configuration.instance.model_directories.each do |base|
-      Dir["#{base}**/*.rb"].each do |file|
-        model_name = file.gsub(/^#{base}([\w_\/\\]+)\.rb/, '\1')
-
-        next if model_name.nil?
-        camelized_model = model_name.camelize
-        next if ::ActiveRecord::Base.descendants.detect { |model|
-          model.name == camelized_model
-        }
-
-        begin
-          camelized_model.constantize
-        rescue LoadError, NameError
-          # Make sure that STI subclasses in subfolders are loaded.
-          if camelized_model.gsub!(/.+::/, '').nil?
-            STDERR.puts "ThinkingSphinx: error loading #{file}"
-            next
-          else
-            retry
-          end
-        rescue Exception => err
-          STDERR.puts "Warning: Error loading #{file}:"
-          STDERR.puts err.message
-          STDERR.puts err.backtrace.join("\n"), ''
-        end
-      end
-    end
-  end
-end

data/lib/thinking_sphinx/core/string.rb

@@ -1,15 +0,0 @@
-require 'zlib'
-
-module ThinkingSphinx
-  module Core
-    module String
-      def to_crc32
-        Zlib.crc32 self
-      end
-    end
-  end
-end
-
-class String
-  include ThinkingSphinx::Core::String
-end

data/lib/thinking_sphinx/deltas/delete_job.rb

@@ -1,16 +0,0 @@
-class ThinkingSphinx::Deltas::DeleteJob
-  def initialize(indices, document_id)
-    @indices, @document_id = indices, document_id
-  end
-
-  def perform
-    ThinkingSphinx::Connection.take do |client|
-      @indices.each do |index|
-        client.update(index, ['sphinx_deleted'], {@document_id => [1]})
-      end
-    end
-  rescue Riddle::ConnectionError, Riddle::ResponseError,
-    ThinkingSphinx::SphinxError, Errno::ETIMEDOUT, Timeout::Error
-    # Not the end of the world if Sphinx isn't running.
-  end
-end

data/lib/thinking_sphinx/deltas/index_job.rb

@@ -1,17 +0,0 @@
-class ThinkingSphinx::Deltas::IndexJob
-  def initialize(indices)
-    @indices = indices
-    @indices << {:verbose => !ThinkingSphinx.suppress_delta_output?}
-  end
-
-  def perform
-    ThinkingSphinx::Configuration.instance.controller.index *@indices
-    ThinkingSphinx::Connection.pool.clear
-
-    true
-  end
-
-  def configuration
-    ThinkingSphinx::Configuration.instance
-  end
-end

data/lib/thinking_sphinx/deploy/capistrano.rb

@@ -1,99 +0,0 @@
-Capistrano::Configuration.instance(:must_exist).load do
-  namespace :thinking_sphinx do
-    namespace :install do
-      desc <<-DESC
-        Install Sphinx by source
-
-        If Postgres is available, Sphinx will use it.
-
-        If the variable :thinking_sphinx_configure_args is set, it will
-        be passed to the Sphinx configure script. You can use this to
-        install Sphinx in a non-standard location:
-
-          set :thinking_sphinx_configure_args, "--prefix=$HOME/software"
-DESC
-
-      task :sphinx do
-        with_postgres = false
-        begin
-          run "which pg_config" do |channel, stream, data|
-            with_postgres = !(data.nil? || data == "")
-          end
-        rescue Capistrano::CommandError => e
-          puts "Continuing despite error: #{e.message}"
-        end
-
-        args = []
-        if with_postgres
-          run "pg_config --pkgincludedir" do |channel, stream, data|
-            args << "--with-pgsql=#{data}"
-          end
-        end
-        args << fetch(:thinking_sphinx_configure_args, '')
-
-        commands = <<-CMD
-        wget -q http://sphinxsearch.com/downloads/sphinx-0.9.9.tar.gz >> sphinx.log
-        tar xzvf sphinx-0.9.9.tar.gz
-        cd sphinx-0.9.9
-        ./configure #{args.join(" ")}
-        make
-        #{try_sudo} make install
-        rm -rf sphinx-0.9.9 sphinx-0.9.9.tar.gz
-        CMD
-        run commands.split(/\n\s+/).join(" && ")
-      end
-
-      desc "Install Thinking Sphinx as a gem"
-      task :ts do
-        run "#{try_sudo} gem install thinking-sphinx"
-      end
-    end
-
-    desc "Generate the Sphinx configuration file"
-    task :configure do
-      rake "thinking_sphinx:configure"
-    end
-
-    desc "Index data"
-    task :index do
-      rake "thinking_sphinx:index"
-    end
-
-    desc "Start the Sphinx daemon"
-    task :start do
-      rake "thinking_sphinx:configure thinking_sphinx:start"
-    end
-
-    desc "Stop the Sphinx daemon"
-    task :stop do
-      rake "thinking_sphinx:configure thinking_sphinx:stop"
-    end
-
-    desc "Stop and then start the Sphinx daemon"
-    task :restart do
-      rake "thinking_sphinx:configure thinking_sphinx:stop \
-        thinking_sphinx:start"
-    end
-
-    desc "Stop, re-index and then start the Sphinx daemon"
-    task :rebuild do
-      rake "thinking_sphinx:configure thinking_sphinx:stop \
-        thinking_sphinx:reindex \
-        thinking_sphinx:start"
-    end
-
-    desc "Add the shared folder for sphinx files"
-    task :shared_sphinx_folder, :roles => :web do
-      rails_env = fetch(:rails_env, "production")
-      run "mkdir -p #{shared_path}/sphinx/#{rails_env}"
-    end
-
-    def rake(*tasks)
-      rails_env = fetch(:rails_env, "production")
-      rake = fetch(:rake, "rake")
-      tasks.each do |t|
-        run "if [ -d #{release_path} ]; then cd #{release_path}; else cd #{current_path}; fi; if [ -f Rakefile ]; then #{rake} RAILS_ENV=#{rails_env} #{t}; fi;"
-      end
-    end
-  end
-end

data/lib/thinking_sphinx/field.rb

@@ -1,98 +0,0 @@
-module ThinkingSphinx
-  # Fields - holding the string data which Sphinx indexes for your searches.
-  # This class isn't really useful to you unless you're hacking around with the
-  # internals of Thinking Sphinx - but hey, don't let that stop you.
-  #
-  # One key thing to remember - if you're using the field manually to
-  # generate SQL statements, you'll need to set the base model, and all the
-  # associations. Which can get messy. Use Index.link!, it really helps.
-  # 
-  class Field < ThinkingSphinx::Property
-    attr_accessor :sortable, :infixes, :prefixes
-    
-    # To create a new field, you'll need to pass in either a single Column
-    # or an array of them, and some (optional) options. The columns are
-    # references to the data that will make up the field.
-    #
-    # Valid options are:
-    # - :as       => :alias_name 
-    # - :sortable => true
-    # - :infixes  => true
-    # - :prefixes => true
-    # - :file     => true
-    # - :with     => :attribute # or :wordcount
-    #
-    # Alias is only required in three circumstances: when there's
-    # another attribute or field with the same name, when the column name is
-    # 'id', or when there's more than one column.
-    # 
-    # Sortable defaults to false - but is quite useful when set to true, as
-    # it creates an attribute with the same string value (which Sphinx converts
-    # to an integer value), which can be sorted by. Thinking Sphinx is smart
-    # enough to realise that when you specify fields in sort statements, you
-    # mean their respective attributes.
-    # 
-    # If you have partial matching enabled (ie: enable_star), then you can
-    # specify certain fields to have their prefixes and infixes indexed. Keep
-    # in mind, though, that Sphinx's default is _all_ fields - so once you
-    # highlight a particular field, no other fields in the index will have
-    # these partial indexes.
-    #
-    # Here's some examples:
-    #
-    #   Field.new(
-    #     Column.new(:name)
-    #   )
-    #
-    #   Field.new(
-    #     [Column.new(:first_name), Column.new(:last_name)],
-    #     :as => :name, :sortable => true
-    #   )
-    # 
-    #   Field.new(
-    #     [Column.new(:posts, :subject), Column.new(:posts, :content)],
-    #     :as => :posts, :prefixes => true
-    #   )
-    # 
-    def initialize(source, columns, options = {})
-      super
-      
-      @sortable = options[:sortable] || false
-      @infixes  = options[:infixes]  || false
-      @prefixes = options[:prefixes] || false
-      @file     = options[:file]     || false
-      @with     = options[:with]
-      
-      source.fields << self
-    end
-    
-    # Get the part of the SELECT clause related to this field. Don't forget
-    # to set your model and associations first though.
-    #
-    # This will concatenate strings if there's more than one data source or
-    # multiple data values (has_many or has_and_belongs_to_many associations).
-    # 
-    def to_select_sql
-      return nil unless available?
-      
-      clause = columns_with_prefixes.join(', ')
-      
-      clause = adapter.concatenate(clause)       if concat_ws?
-      clause = adapter.group_concatenate(clause) if is_many?
-      
-      "#{clause} AS #{quote_column(unique_name)}"
-    end
-    
-    def file?
-      @file
-    end
-    
-    def with_attribute?
-      @with == :attribute
-    end
-    
-    def with_wordcount?
-      @with == :wordcount
-    end
-  end
-end