thinking-sphinx 2.0.5 → 2.0.6

data/lib/thinking_sphinx/source/internal_properties.rb

@@ -1,51 +0,0 @@
-module ThinkingSphinx
-  class Source
-    module InternalProperties
-      def add_internal_attributes_and_facets
-        add_internal_attribute :sphinx_internal_id, nil,
-          @model.primary_key_for_sphinx.to_sym
-        add_internal_attribute :sphinx_deleted,     :integer, "0"
-        add_internal_attribute :class_crc,          :integer, crc_column, true
-        
-        unless Riddle.loaded_version.to_i < 2
-          add_internal_attribute :sphinx_internal_class, :string, internal_class_column, true
-          add_internal_facet :sphinx_internal_class
-        else
-          add_internal_facet :class_crc
-        end
-      end
-
-      def add_internal_attribute(name, type, contents, facet = false)
-        return unless attribute_by_alias(name).nil?
-
-        Attribute.new(self,
-          ThinkingSphinx::Index::FauxColumn.new(contents),
-          :type   => type,
-          :as     => name,
-          :facet  => facet,
-          :admin  => true
-        )
-      end
-
-      def add_internal_facet(name)
-        return unless facet_by_alias(name).nil?
-
-        @model.sphinx_facets << ClassFacet.new(attribute_by_alias(name))
-      end
-
-      def attribute_by_alias(attr_alias)
-        @attributes.detect { |attrib| attrib.alias == attr_alias }
-      end
-
-      def facet_by_alias(name)
-        @model.sphinx_facets.detect { |facet| facet.name == name }
-      end
-
-      def subclasses_to_s
-        "'" + (@model.send(:descendants).collect { |klass|
-          klass.to_crc32.to_s
-        } << @model.to_crc32.to_s).join(",") + "'"
-      end
-    end
-  end
-end

data/lib/thinking_sphinx/source/sql.rb

@@ -1,157 +0,0 @@
-module ThinkingSphinx
-  class Source
-    module SQL
-      # Generates the big SQL statement to get the data back for all the fields
-      # and attributes, using all the relevant association joins. If you want
-      # the version filtered for delta values, send through :delta => true in
-      # the options. Won't do much though if the index isn't set up to support a
-      # delta sibling.
-      # 
-      # Examples:
-      # 
-      #   source.to_sql
-      #   source.to_sql(:delta => true)
-      #
-      def to_sql(options={})
-        relation    = @model.unscoped
-        pre_select  = 'SQL_NO_CACHE ' if adapter.sphinx_identifier == "mysql"
-        relation    = relation.select(
-          pre_select.to_s + sql_select_clause(options[:offset])
-        )
-
-        all_associations.each do |assoc|
-          relation = relation.joins(assoc.arel_join)
-        end
-
-        relation = relation.where(sql_where_clause(options))
-        relation = relation.group(sql_group_clause)
-        relation = relation.order('NULL') if adapter.sphinx_identifier == "mysql"
-        relation.to_sql
-      end
-
-      # Simple helper method for the query range SQL - which is a statement that
-      # returns minimum and maximum id values. These can be filtered by delta -
-      # so pass in :delta => true to get the delta version of the SQL.
-      # 
-      def to_sql_query_range(options={})
-        return nil if @index.options[:disable_range]
-        
-        min_statement = adapter.convert_nulls(
-          "MIN(#{quote_column(@model.primary_key_for_sphinx)})", 1
-        )
-        max_statement = adapter.convert_nulls(
-          "MAX(#{quote_column(@model.primary_key_for_sphinx)})", 1
-        )
-
-        sql = "SELECT #{min_statement}, #{max_statement} " +
-              "FROM #{@model.quoted_table_name} "
-        if self.delta? && !@index.delta_object.clause(@model, options[:delta]).blank?
-          sql << "WHERE #{@index.delta_object.clause(@model, options[:delta])}"
-        end
-
-        sql
-      end
-
-      # Simple helper method for the query info SQL - which is a statement that
-      # returns the single row for a corresponding id.
-      # 
-      def to_sql_query_info(offset)
-        "SELECT * FROM #{@model.quoted_table_name} WHERE " +
-        "#{quote_column(@model.primary_key_for_sphinx)} = (($id - #{offset}) / #{ThinkingSphinx.context.indexed_models.size})"
-      end
-
-      def sql_select_clause(offset)
-        unique_id_expr = ThinkingSphinx.unique_id_expression(adapter, offset)
-
-        (
-          ["#{@model.quoted_table_name}.#{quote_column(@model.primary_key_for_sphinx)} #{unique_id_expr} AS #{quote_column(@model.primary_key_for_sphinx)} "] + 
-          @fields.collect     { |field|     field.to_select_sql     } +
-          @attributes.collect { |attribute| attribute.to_select_sql }
-        ).compact.join(", ")
-      end
-
-      def sql_where_clause(options)
-        logic = []
-        logic += [
-          "#{@model.quoted_table_name}.#{quote_column(@model.primary_key_for_sphinx)} >= $start",
-          "#{@model.quoted_table_name}.#{quote_column(@model.primary_key_for_sphinx)} <= $end"
-        ] unless @index.options[:disable_range]
-
-        if self.delta? && !@index.delta_object.clause(@model, options[:delta]).blank?
-          logic << "#{@index.delta_object.clause(@model, options[:delta])}"
-        end
-
-        logic += (@conditions || [])
-        logic.join(' AND ')
-      end
-
-      def sql_group_clause
-        internal_groupings = []
-        if @model.column_names.include?(@model.inheritance_column)
-           internal_groupings << "#{@model.quoted_table_name}.#{quote_column(@model.inheritance_column)}"
-        end
-
-        (
-          ["#{@model.quoted_table_name}.#{quote_column(@model.primary_key_for_sphinx)}"] + 
-          @fields.collect     { |field|     field.to_group_sql     }.compact +
-          @attributes.collect { |attribute| attribute.to_group_sql }.compact +
-          @groupings + internal_groupings
-        ).join(", ")
-      end
-
-      def sql_query_pre_for_core
-        if self.delta? && !@index.delta_object.reset_query(@model).blank?
-          [@index.delta_object.reset_query(@model)]
-        else
-          []
-        end
-      end
-
-      def sql_query_pre_for_delta
-        [""]
-      end
-
-      def quote_column(column)
-        @model.connection.quote_column_name(column)
-      end
-
-      def crc_column
-        if @model.table_exists? &&
-          @model.column_names.include?(@model.inheritance_column)
-          
-          types = types_to_crcs
-          return @model.to_crc32.to_s if types.empty?
-          
-          adapter.case(adapter.convert_nulls(
-            adapter.quote_with_table(@model.inheritance_column)),
-            types_to_crcs, @model.to_crc32)
-        else
-          @model.to_crc32.to_s
-        end
-      end
-      
-      def internal_class_column
-        if @model.table_exists? &&
-          @model.column_names.include?(@model.inheritance_column)
-          adapter.quote_with_table(@model.inheritance_column)
-        else
-          "'#{@model.name}'"
-        end
-      end
-      
-      def type_values
-        @model.connection.select_values <<-SQL
-SELECT DISTINCT #{@model.inheritance_column}
-FROM #{@model.table_name}
-        SQL
-      end
-      
-      def types_to_crcs
-        type_values.compact.inject({}) { |hash, type|
-          hash[type] = type.to_crc32
-          hash
-        }
-      end
-    end
-  end
-end

data/lib/thinking_sphinx/tasks.rb

@@ -1,130 +0,0 @@
-require 'fileutils'
-require 'timeout'
-
-namespace :thinking_sphinx do
-  task :app_env do
-    if defined?(Rails)
-      Rails.application.require_environment!
-      Rails.configuration.cache_classes = false
-    elsif defined?(Merb)
-      Rake::Task[:merb_env].invoke
-    elsif defined?(Sinatra)
-      Sinatra::Application.environment = ENV['RACK_ENV']
-    end
-  end
-  
-  desc "Output the current Thinking Sphinx version"
-  task :version => :app_env do
-    puts "Thinking Sphinx v" + ThinkingSphinx.version
-  end
-  
-  desc "Stop if running, then start a Sphinx searchd daemon using Thinking Sphinx's settings"
-  task :running_start => :app_env do
-    Rake::Task["thinking_sphinx:stop"].invoke if sphinx_running?
-    Rake::Task["thinking_sphinx:start"].invoke
-  end
-  
-  desc "Start a Sphinx searchd daemon using Thinking Sphinx's settings"
-  task :start => :app_env do
-    config = ThinkingSphinx::Configuration.instance
-    
-    FileUtils.mkdir_p config.searchd_file_path
-    raise RuntimeError, "searchd is already running." if sphinx_running?
-    
-    Dir["#{config.searchd_file_path}/*.spl"].each { |file| File.delete(file) }
-    
-    config.controller.start
-    
-    if sphinx_running?
-      puts "Started successfully (pid #{sphinx_pid})."
-    else
-      puts "Failed to start searchd daemon. Check #{config.searchd_log_file}"
-    end
-  end
-  
-  desc "Stop Sphinx using Thinking Sphinx's settings"
-  task :stop => :app_env do
-    unless sphinx_running?
-      puts "searchd is not running"
-    else
-      config = ThinkingSphinx::Configuration.instance
-      pid    = sphinx_pid
-      config.controller.stop
-      
-      # Ensure searchd is stopped, but don't try too hard
-      Timeout.timeout(5) do
-        sleep(1) until config.controller.stop
-      end
-      
-      puts "Stopped search daemon (pid #{pid})."
-    end
-  end
-  
-  desc "Restart Sphinx"
-  task :restart => [:app_env, :stop, :start]
-  
-  desc "Generate the Sphinx configuration file using Thinking Sphinx's settings"
-  task :configure => :app_env do
-    config = ThinkingSphinx::Configuration.instance
-    puts "Generating Configuration to #{config.config_file}"
-    config.build
-  end
-  
-  desc "Index data for Sphinx using Thinking Sphinx's settings"
-  task :index => :app_env do
-    config = ThinkingSphinx::Configuration.instance
-    unless ENV["INDEX_ONLY"] == "true"
-      puts "Generating Configuration to #{config.config_file}"
-      config.build
-    end
-    
-    FileUtils.mkdir_p config.searchd_file_path
-    config.controller.index :verbose => true
-  end
-  
-  desc "Reindex Sphinx without regenerating the configuration file"
-  task :reindex => :app_env do
-    config = ThinkingSphinx::Configuration.instance
-    FileUtils.mkdir_p config.searchd_file_path
-    puts config.controller.index
-  end
-  
-  desc "Stop Sphinx (if it's running), rebuild the indexes, and start Sphinx"
-  task :rebuild => :app_env do
-    Rake::Task["thinking_sphinx:stop"].invoke if sphinx_running?
-    Rake::Task["thinking_sphinx:index"].invoke
-    Rake::Task["thinking_sphinx:start"].invoke
-  end
-end
-
-namespace :ts do
-  desc "Output the current Thinking Sphinx version"
-  task :version => "thinking_sphinx:version"
-  desc "Stop if running, then start a Sphinx searchd daemon using Thinking Sphinx's settings"
-  task :run     => "thinking_sphinx:running_start"
-  desc "Start a Sphinx searchd daemon using Thinking Sphinx's settings"
-  task :start   => "thinking_sphinx:start"
-  desc "Stop Sphinx using Thinking Sphinx's settings"
-  task :stop    => "thinking_sphinx:stop"
-  desc "Index data for Sphinx using Thinking Sphinx's settings"
-  task :in      => "thinking_sphinx:index"
-  task :index   => "thinking_sphinx:index"
-  desc "Reindex Sphinx without regenerating the configuration file"
-  task :reindex => "thinking_sphinx:reindex"
-  desc "Restart Sphinx"
-  task :restart => "thinking_sphinx:restart"
-  desc "Generate the Sphinx configuration file using Thinking Sphinx's settings"
-  task :conf    => "thinking_sphinx:configure"
-  desc "Generate the Sphinx configuration file using Thinking Sphinx's settings"
-  task :config  => "thinking_sphinx:configure"
-  desc "Stop Sphinx (if it's running), rebuild the indexes, and start Sphinx"
-  task :rebuild => "thinking_sphinx:rebuild"
-end
-
-def sphinx_pid
-  ThinkingSphinx.sphinx_pid
-end
-
-def sphinx_running?
-  ThinkingSphinx.sphinx_running?
-end

data/lib/thinking_sphinx/test.rb

@@ -1,55 +0,0 @@
-class ThinkingSphinx::Test
-  def self.init(suppress_delta_output = true)
-    set_flags suppress_delta_output
-    create_indexes_folder
-  end
-  
-  def self.start
-    config.build
-    config.controller.index
-    config.controller.start
-  end
-  
-  def self.start_with_autostop
-    autostop
-    start
-  end
-  
-  def self.stop
-    config.controller.stop
-    sleep(0.5) # Ensure Sphinx has shut down completely
-  end
-  
-  def self.autostop
-    Kernel.at_exit do
-      ThinkingSphinx::Test.stop
-    end
-  end
-  
-  def self.run(&block)
-    begin
-      start
-      yield
-    ensure
-      stop
-    end
-  end
-  
-  def self.config
-    @config ||= ::ThinkingSphinx::Configuration.instance
-  end
-  
-  def self.index(*indexes)
-    config.controller.index *indexes
-  end
-  
-  def self.set_flags(suppress_delta_output)
-    ::ThinkingSphinx.deltas_enabled        = true
-    ::ThinkingSphinx.updates_enabled       = true
-    ::ThinkingSphinx.suppress_delta_output = suppress_delta_output
-  end
-  
-  def self.create_indexes_folder
-    FileUtils.mkdir_p config.searchd_file_path
-  end
-end

data/tasks/distribution.rb

@@ -1,33 +0,0 @@
-desc 'Generate documentation'
-YARD::Rake::YardocTask.new
-
-Jeweler::Tasks.new do |gem|
-  gem.name        = "thinking-sphinx"
-  gem.summary     = "ActiveRecord/Rails Sphinx library"
-  gem.description = "A concise and easy-to-use Ruby library that connects ActiveRecord to the Sphinx search daemon, managing configuration, indexing and searching."
-  gem.author      = "Pat Allan"
-  gem.email       = "pat@freelancing-gods.com"
-  gem.homepage    = "http://ts.freelancing-gods.com"
-    
-  # s.rubyforge_project = "thinking-sphinx"
-  gem.files     = FileList[
-    "rails/*.rb",
-    "lib/**/*.rb",
-    "LICENCE",
-    "README.textile",
-    "tasks/**/*.rb",
-    "VERSION"
-  ]
-  gem.test_files = FileList[
-    "features/**/*.rb",
-    "features/**/*.feature",
-    "features/**/*.example.yml",
-    "spec/**/*_spec.rb"
-  ]
-  
-  gem.post_install_message = <<-MESSAGE
-If you're upgrading, you should read this:
-http://freelancing-god.github.com/ts/en/upgrading.html
-
-MESSAGE
-end

data/tasks/testing.rb

@@ -1,80 +0,0 @@
-require 'rubygems'
-require 'rspec/core/rake_task'
-require 'cucumber/rake/task'
-
-desc "Run the specs under spec"
-RSpec::Core::RakeTask.new do |t|
-  t.pattern = 'spec/**/*_spec.rb'
-end
-
-desc "Run all feature-set configurations"
-task :features do |t|
-  databases = ENV['DATABASES'] || 'mysql,postgresql'
-  databases.split(',').each do |database|
-    puts   "rake features:#{database}"
-    system "rake features:#{database}"
-  end
-end
-
-namespace :features do
-  def add_task(name, description)
-    Cucumber::Rake::Task.new(name, description) do |t|
-      t.cucumber_opts = "--format pretty features/*.feature DATABASE=#{name} --exclude features/thinking_sphinx"
-    end
-  end
-  
-  add_task :mysql,      "Run feature-set against MySQL"
-  add_task :postgresql, "Run feature-set against PostgreSQL"
-end
-
-namespace :rcov do
-  desc "Generate RCov reports"
-  RSpec::Core::RakeTask.new(:rspec) do |t|
-    t.pattern = 'spec/**/*_spec.rb'
-    t.rcov = true
-    t.rcov_opts = [
-      '--exclude', 'spec',
-      '--exclude', 'gems',
-      '--exclude', 'riddle',
-      '--exclude', 'ruby',
-      '--aggregate coverage.data'
-    ]
-  end
-  
-  def add_task(name, description)
-    Cucumber::Rake::Task.new(name, description) do |t|
-      t.cucumber_opts = "--format pretty features/*.feature DATABASE=#{name}"
-      t.rcov = true
-      t.rcov_opts = [
-        '--exclude', 'spec',
-        '--exclude', 'gems',
-        '--exclude', 'riddle',
-        '--exclude', 'features',
-        '--aggregate coverage.data'
-      ]
-    end
-  end
-  
-  add_task :mysql,      "Run feature-set against MySQL with rcov"
-  add_task :postgresql, "Run feature-set against PostgreSQL with rcov"
-  
-  task :all do
-    rm 'coverage.data' if File.exist?('coverage.data')
-    rm 'rerun.txt'     if File.exist?('rerun.txt')
-    
-    Rake::Task['rcov:rspec'].invoke
-    Rake::Task['rcov:mysql'].invoke
-    Rake::Task['rcov:postgresql'].invoke
-  end
-end
-
-desc "Build cucumber.yml file"
-task :cucumber_defaults do
-  steps = FileList["features/step_definitions/**.rb"].collect { |path|
-    "--require #{path}"
-  }.join(" ")
-  
-  File.open('cucumber.yml', 'w') { |f|
-    f.write "default: \"--require features/support/env.rb #{steps}\"\n"
-  }
-end